Architecture specific change in rpms/bpftrace.git
by githook-noreply@fedoraproject.org
The package rpms/bpftrace.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/bpftrace.git/commit/?id=78a2aa743....
Change:
+ExclusiveArch: x86_64 %{power64} aarch64
Thanks.
Full change:
============
commit 8c7c04cfd02574ef597b1bfce0201b3bfa6fedba
Merge: 4be8fb0 78a2aa7
Author: Augusto Caringi <acaringi(a)redhat.com>
Date: Tue Apr 14 17:21:49 2020 -0300
Merge branch 'master' into f31
diff --cc bpftrace.spec
index 9fda5d8,8b86be0..51889e5
--- a/bpftrace.spec
+++ b/bpftrace.spec
@@@ -75,9 -70,19 +70,13 @@@ find %{buildroot}%{_datadir}/%{name}/to
%changelog
+ * Tue Apr 14 2020 Augusto Caringi <acaringi(a)redhat.com> - 0.10.0-1
+ - Rebased to version 0.10.0
+ - Dropped support for s390x temporaly due to build error
+
-* Thu Feb 06 2020 Augusto Caringi <acaringi(a)redhat.com> - 0.9.4-1
+* Mon Feb 10 2020 Augusto Caringi <acaringi(a)redhat.com> - 0.9.4-1
- Rebased to version 0.9.4
-* Tue Jan 28 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.9.3-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Thu Nov 21 2019 Augusto Caringi <acaringi(a)redhat.com> - 0.9.3-1
-- Rebased to version 0.9.3
-
* Thu Aug 01 2019 Augusto Caringi <acaringi(a)redhat.com> - 0.9.2-1
- Rebased to version 0.9.2
commit 78a2aa743d3363d52b8b5ca33f1b6e2ad3ea1ed2
Author: Augusto Caringi <acaringi(a)redhat.com>
Date: Tue Apr 14 16:08:09 2020 -0300
Rebase to new release version: 0.10.0
Signed-off-by: Augusto Caringi <acaringi(a)redhat.com>
diff --git a/.gitignore b/.gitignore
index 4e59316..e33fd3d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
/bpftrace-0.9.2.tar.gz
/bpftrace-0.9.3.tar.gz
/bpftrace-0.9.4.tar.gz
+/bpftrace-0.10.0.tar.gz
diff --git a/0001-Add-missing-string-include-to-btf.h.patch b/0001-Add-missing-string-include-to-btf.h.patch
deleted file mode 100644
index b10988a..0000000
--- a/0001-Add-missing-string-include-to-btf.h.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 145041ec75eae1e58fcd3f784964303fb75c16d5 Mon Sep 17 00:00:00 2001
-From: Augusto Caringi <acaringi(a)redhat.com>
-Date: Wed, 5 Feb 2020 15:24:21 +0100
-Subject: [PATCH] Add missing <string> include to btf.h
-
-The missing include was causing building problems with gcc 10.0.1:
-
-In file included from
-/builddir/build/BUILD/bpftrace-0.9.4/src/btf.cpp:1:
-/builddir/build/BUILD/bpftrace-0.9.4/src/btf.h:26:8: error: 'string' in
-namespace 'std' does not name a type
- 26 | std::string c_def(std::unordered_set<std::string>& set);
- | ^~~~~~
-/builddir/build/BUILD/bpftrace-0.9.4/src/btf.h:7:1: note: 'std::string'
-is defined in header '<string>'; did you forget to '#include <string>'?
- 6 | #include <unordered_set>
- +++ |+#include <string>
- 7 |
----
- src/btf.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/btf.h b/src/btf.h
-index 05b56ff..8856bfc 100644
---- a/src/btf.h
-+++ b/src/btf.h
-@@ -1,6 +1,7 @@
- #pragma once
-
- #include <linux/types.h>
-+#include <string>
- #include <unistd.h>
- #include <unordered_set>
-
---
-2.21.1
-
diff --git a/bpftrace.spec b/bpftrace.spec
index 9c342c5..8b86be0 100644
--- a/bpftrace.spec
+++ b/bpftrace.spec
@@ -1,16 +1,15 @@
Name: bpftrace
-Version: 0.9.4
+Version: 0.10.0
Release: 1%{?dist}
Summary: High-level tracing language for Linux eBPF
License: ASL 2.0
URL: https://github.com/iovisor/bpftrace
-Patch0: 0001-Add-missing-string-include-to-btf.h.patch
Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
# Arches will be included as upstream support is added and dependencies are
# satisfied in the respective arches
-ExclusiveArch: x86_64 %{power64} aarch64 s390x
+ExclusiveArch: x86_64 %{power64} aarch64
BuildRequires: gcc-c++
BuildRequires: bison
@@ -56,10 +55,6 @@ and predecessor tracers such as DTrace and SystemTap
find %{buildroot}%{_datadir}/%{name}/tools -type f -exec \
sed -i -e '1s=^#!/usr/bin/env %{name}\([0-9.]\+\)\?$=#!%{_bindir}/%{name}=' {} \;
-# Move man pages to the right location
-mkdir -p %{buildroot}%{_mandir}
-mv %{buildroot}%{_prefix}/man/* %{buildroot}%{_mandir}/
-
%files
%doc README.md CONTRIBUTING-TOOLS.md
@@ -75,6 +70,10 @@ mv %{buildroot}%{_prefix}/man/* %{buildroot}%{_mandir}/
%changelog
+* Tue Apr 14 2020 Augusto Caringi <acaringi(a)redhat.com> - 0.10.0-1
+- Rebased to version 0.10.0
+- Dropped support for s390x temporaly due to build error
+
* Thu Feb 06 2020 Augusto Caringi <acaringi(a)redhat.com> - 0.9.4-1
- Rebased to version 0.9.4
diff --git a/sources b/sources
index 0db1bc7..ad2f466 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (bpftrace-0.9.4.tar.gz) = d2b32235fa81d6f06771df32877388a9105230adfc638b0d0ebf4f11a567246e8514d93c14da9c7008dbacd6b2c4108604fc5a2721ef831efa5c596cbe50b1da
+SHA512 (bpftrace-0.10.0.tar.gz) = da400efe78cea505a32deead594b047ec4394d3eefe86e7b6853fe2dc715c5847a3abcbd26c1fac39d0a534f1e57d6c0bc3625e0c3f1054b0d84b7b1d6eb69b9
commit 649b17b6528dad04e53d8bed05b6b52d5d16de6f
Author: Augusto Caringi <acaringi(a)redhat.com>
Date: Fri Feb 7 15:21:47 2020 +0100
Rebase to new release version: 0.9.4
Signed-off-by: Augusto Caringi <acaringi(a)redhat.com>
commit 96a2402e002fb1d35c6098ade63d70b23c74f00e
Author: Augusto Caringi <acaringi(a)redhat.com>
Date: Fri Feb 7 14:44:04 2020 +0100
Rebase to new release version: 0.9.1
Signed-off-by: Augusto Caringi <acaringi(a)redhat.com>
diff --git a/.gitignore b/.gitignore
index 21f043b..4e59316 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
/bpftrace-0.9.1.tar.gz
/bpftrace-0.9.2.tar.gz
/bpftrace-0.9.3.tar.gz
+/bpftrace-0.9.4.tar.gz
diff --git a/0001-Add-missing-string-include-to-btf.h.patch b/0001-Add-missing-string-include-to-btf.h.patch
new file mode 100644
index 0000000..b10988a
--- /dev/null
+++ b/0001-Add-missing-string-include-to-btf.h.patch
@@ -0,0 +1,37 @@
+From 145041ec75eae1e58fcd3f784964303fb75c16d5 Mon Sep 17 00:00:00 2001
+From: Augusto Caringi <acaringi(a)redhat.com>
+Date: Wed, 5 Feb 2020 15:24:21 +0100
+Subject: [PATCH] Add missing <string> include to btf.h
+
+The missing include was causing building problems with gcc 10.0.1:
+
+In file included from
+/builddir/build/BUILD/bpftrace-0.9.4/src/btf.cpp:1:
+/builddir/build/BUILD/bpftrace-0.9.4/src/btf.h:26:8: error: 'string' in
+namespace 'std' does not name a type
+ 26 | std::string c_def(std::unordered_set<std::string>& set);
+ | ^~~~~~
+/builddir/build/BUILD/bpftrace-0.9.4/src/btf.h:7:1: note: 'std::string'
+is defined in header '<string>'; did you forget to '#include <string>'?
+ 6 | #include <unordered_set>
+ +++ |+#include <string>
+ 7 |
+---
+ src/btf.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/btf.h b/src/btf.h
+index 05b56ff..8856bfc 100644
+--- a/src/btf.h
++++ b/src/btf.h
+@@ -1,6 +1,7 @@
+ #pragma once
+
+ #include <linux/types.h>
++#include <string>
+ #include <unistd.h>
+ #include <unordered_set>
+
+--
+2.21.1
+
diff --git a/bpftrace.spec b/bpftrace.spec
index f11ca68..9c342c5 100644
--- a/bpftrace.spec
+++ b/bpftrace.spec
@@ -1,10 +1,11 @@
Name: bpftrace
-Version: 0.9.3
-Release: 2%{?dist}
+Version: 0.9.4
+Release: 1%{?dist}
Summary: High-level tracing language for Linux eBPF
License: ASL 2.0
URL: https://github.com/iovisor/bpftrace
+Patch0: 0001-Add-missing-string-include-to-btf.h.patch
Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
# Arches will be included as upstream support is added and dependencies are
@@ -74,6 +75,9 @@ mv %{buildroot}%{_prefix}/man/* %{buildroot}%{_mandir}/
%changelog
+* Thu Feb 06 2020 Augusto Caringi <acaringi(a)redhat.com> - 0.9.4-1
+- Rebased to version 0.9.4
+
* Tue Jan 28 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.9.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
diff --git a/sources b/sources
index 5b42aef..0db1bc7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (bpftrace-0.9.3.tar.gz) = 49b12735fe2fbf4f72d3d0c0372a7a570c7abc92d1f626624d591a863009c8bfabdf86825f133885800c7ea293773651be66e4c792f9cd397f82d250a7af83be
+SHA512 (bpftrace-0.9.4.tar.gz) = d2b32235fa81d6f06771df32877388a9105230adfc638b0d0ebf4f11a567246e8514d93c14da9c7008dbacd6b2c4108604fc5a2721ef831efa5c596cbe50b1da
commit 505c997e58d6df75414f9c3cc1aed01a92412c94
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Tue Jan 28 13:15:36 2020 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/bpftrace.spec b/bpftrace.spec
index 8b5f5e1..f11ca68 100644
--- a/bpftrace.spec
+++ b/bpftrace.spec
@@ -1,6 +1,6 @@
Name: bpftrace
Version: 0.9.3
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: High-level tracing language for Linux eBPF
License: ASL 2.0
@@ -74,6 +74,9 @@ mv %{buildroot}%{_prefix}/man/* %{buildroot}%{_mandir}/
%changelog
+* Tue Jan 28 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.9.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
* Thu Nov 21 2019 Augusto Caringi <acaringi(a)redhat.com> - 0.9.3-1
- Rebased to version 0.9.3
commit 0fcd7c66e024e700ad724547364047681c27b099
Author: Augusto Caringi <acaringi(a)redhat.com>
Date: Mon Dec 9 17:47:17 2019 +0100
Rebase to new release version: 0.9.3
diff --git a/.gitignore b/.gitignore
index 36cb156..21f043b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
/bpftrace-0.9.tar.gz
/bpftrace-0.9.1.tar.gz
/bpftrace-0.9.2.tar.gz
+/bpftrace-0.9.3.tar.gz
diff --git a/bpftrace.spec b/bpftrace.spec
index a549247..8b5f5e1 100644
--- a/bpftrace.spec
+++ b/bpftrace.spec
@@ -1,5 +1,5 @@
Name: bpftrace
-Version: 0.9.2
+Version: 0.9.3
Release: 1%{?dist}
Summary: High-level tracing language for Linux eBPF
License: ASL 2.0
@@ -19,7 +19,10 @@ BuildRequires: elfutils-libelf-devel
BuildRequires: zlib-devel
BuildRequires: llvm-devel
BuildRequires: clang-devel
-BuildRequires: bcc-devel
+BuildRequires: bcc-devel >= 0.11.0-2
+BuildRequires: libbpf-devel
+BuildRequires: libbpf-static
+BuildRequires: binutils-devel
%description
@@ -40,7 +43,8 @@ and predecessor tracers such as DTrace and SystemTap
%cmake . \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DBUILD_TESTING:BOOL=OFF \
- -DBUILD_SHARED_LIBS:BOOL=OFF
+ -DBUILD_SHARED_LIBS:BOOL=OFF \
+ -DLIBBCC_LIBRARIES:PATH=/usr/lib64/libbcc-no-libbpf.so
%make_build
@@ -70,6 +74,9 @@ mv %{buildroot}%{_prefix}/man/* %{buildroot}%{_mandir}/
%changelog
+* Thu Nov 21 2019 Augusto Caringi <acaringi(a)redhat.com> - 0.9.3-1
+- Rebased to version 0.9.3
+
* Thu Aug 01 2019 Augusto Caringi <acaringi(a)redhat.com> - 0.9.2-1
- Rebased to version 0.9.2
diff --git a/sources b/sources
index 5798c07..5b42aef 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (bpftrace-0.9.2.tar.gz) = 5c6ee5fec690a907c370ed0bed85906d304215d7f97b99a2cae90453061f522fa6369627c9524a5a24e97c6cbb595a880a2a1b1d71095fffb693a4cef172a6f0
+SHA512 (bpftrace-0.9.3.tar.gz) = 49b12735fe2fbf4f72d3d0c0372a7a570c7abc92d1f626624d591a863009c8bfabdf86825f133885800c7ea293773651be66e4c792f9cd397f82d250a7af83be
4 years
Architecture specific change in rpms/bpftrace.git
by githook-noreply@fedoraproject.org
The package rpms/bpftrace.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/bpftrace.git/commit/?id=78a2aa743....
Change:
+ExclusiveArch: x86_64 %{power64} aarch64
Thanks.
Full change:
============
commit 78a2aa743d3363d52b8b5ca33f1b6e2ad3ea1ed2
Author: Augusto Caringi <acaringi(a)redhat.com>
Date: Tue Apr 14 16:08:09 2020 -0300
Rebase to new release version: 0.10.0
Signed-off-by: Augusto Caringi <acaringi(a)redhat.com>
diff --git a/.gitignore b/.gitignore
index 4e59316..e33fd3d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
/bpftrace-0.9.2.tar.gz
/bpftrace-0.9.3.tar.gz
/bpftrace-0.9.4.tar.gz
+/bpftrace-0.10.0.tar.gz
diff --git a/0001-Add-missing-string-include-to-btf.h.patch b/0001-Add-missing-string-include-to-btf.h.patch
deleted file mode 100644
index b10988a..0000000
--- a/0001-Add-missing-string-include-to-btf.h.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 145041ec75eae1e58fcd3f784964303fb75c16d5 Mon Sep 17 00:00:00 2001
-From: Augusto Caringi <acaringi(a)redhat.com>
-Date: Wed, 5 Feb 2020 15:24:21 +0100
-Subject: [PATCH] Add missing <string> include to btf.h
-
-The missing include was causing building problems with gcc 10.0.1:
-
-In file included from
-/builddir/build/BUILD/bpftrace-0.9.4/src/btf.cpp:1:
-/builddir/build/BUILD/bpftrace-0.9.4/src/btf.h:26:8: error: 'string' in
-namespace 'std' does not name a type
- 26 | std::string c_def(std::unordered_set<std::string>& set);
- | ^~~~~~
-/builddir/build/BUILD/bpftrace-0.9.4/src/btf.h:7:1: note: 'std::string'
-is defined in header '<string>'; did you forget to '#include <string>'?
- 6 | #include <unordered_set>
- +++ |+#include <string>
- 7 |
----
- src/btf.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/btf.h b/src/btf.h
-index 05b56ff..8856bfc 100644
---- a/src/btf.h
-+++ b/src/btf.h
-@@ -1,6 +1,7 @@
- #pragma once
-
- #include <linux/types.h>
-+#include <string>
- #include <unistd.h>
- #include <unordered_set>
-
---
-2.21.1
-
diff --git a/bpftrace.spec b/bpftrace.spec
index 9c342c5..8b86be0 100644
--- a/bpftrace.spec
+++ b/bpftrace.spec
@@ -1,16 +1,15 @@
Name: bpftrace
-Version: 0.9.4
+Version: 0.10.0
Release: 1%{?dist}
Summary: High-level tracing language for Linux eBPF
License: ASL 2.0
URL: https://github.com/iovisor/bpftrace
-Patch0: 0001-Add-missing-string-include-to-btf.h.patch
Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
# Arches will be included as upstream support is added and dependencies are
# satisfied in the respective arches
-ExclusiveArch: x86_64 %{power64} aarch64 s390x
+ExclusiveArch: x86_64 %{power64} aarch64
BuildRequires: gcc-c++
BuildRequires: bison
@@ -56,10 +55,6 @@ and predecessor tracers such as DTrace and SystemTap
find %{buildroot}%{_datadir}/%{name}/tools -type f -exec \
sed -i -e '1s=^#!/usr/bin/env %{name}\([0-9.]\+\)\?$=#!%{_bindir}/%{name}=' {} \;
-# Move man pages to the right location
-mkdir -p %{buildroot}%{_mandir}
-mv %{buildroot}%{_prefix}/man/* %{buildroot}%{_mandir}/
-
%files
%doc README.md CONTRIBUTING-TOOLS.md
@@ -75,6 +70,10 @@ mv %{buildroot}%{_prefix}/man/* %{buildroot}%{_mandir}/
%changelog
+* Tue Apr 14 2020 Augusto Caringi <acaringi(a)redhat.com> - 0.10.0-1
+- Rebased to version 0.10.0
+- Dropped support for s390x temporaly due to build error
+
* Thu Feb 06 2020 Augusto Caringi <acaringi(a)redhat.com> - 0.9.4-1
- Rebased to version 0.9.4
diff --git a/sources b/sources
index 0db1bc7..ad2f466 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (bpftrace-0.9.4.tar.gz) = d2b32235fa81d6f06771df32877388a9105230adfc638b0d0ebf4f11a567246e8514d93c14da9c7008dbacd6b2c4108604fc5a2721ef831efa5c596cbe50b1da
+SHA512 (bpftrace-0.10.0.tar.gz) = da400efe78cea505a32deead594b047ec4394d3eefe86e7b6853fe2dc715c5847a3abcbd26c1fac39d0a534f1e57d6c0bc3625e0c3f1054b0d84b7b1d6eb69b9
4 years
Architecture specific change in rpms/bpftrace.git
by githook-noreply@fedoraproject.org
The package rpms/bpftrace.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/bpftrace.git/commit/?id=78a2aa743....
Change:
+ExclusiveArch: x86_64 %{power64} aarch64
Thanks.
Full change:
============
commit 78a2aa743d3363d52b8b5ca33f1b6e2ad3ea1ed2
Author: Augusto Caringi <acaringi(a)redhat.com>
Date: Tue Apr 14 16:08:09 2020 -0300
Rebase to new release version: 0.10.0
Signed-off-by: Augusto Caringi <acaringi(a)redhat.com>
diff --git a/.gitignore b/.gitignore
index 4e59316..e33fd3d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
/bpftrace-0.9.2.tar.gz
/bpftrace-0.9.3.tar.gz
/bpftrace-0.9.4.tar.gz
+/bpftrace-0.10.0.tar.gz
diff --git a/0001-Add-missing-string-include-to-btf.h.patch b/0001-Add-missing-string-include-to-btf.h.patch
deleted file mode 100644
index b10988a..0000000
--- a/0001-Add-missing-string-include-to-btf.h.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 145041ec75eae1e58fcd3f784964303fb75c16d5 Mon Sep 17 00:00:00 2001
-From: Augusto Caringi <acaringi(a)redhat.com>
-Date: Wed, 5 Feb 2020 15:24:21 +0100
-Subject: [PATCH] Add missing <string> include to btf.h
-
-The missing include was causing building problems with gcc 10.0.1:
-
-In file included from
-/builddir/build/BUILD/bpftrace-0.9.4/src/btf.cpp:1:
-/builddir/build/BUILD/bpftrace-0.9.4/src/btf.h:26:8: error: 'string' in
-namespace 'std' does not name a type
- 26 | std::string c_def(std::unordered_set<std::string>& set);
- | ^~~~~~
-/builddir/build/BUILD/bpftrace-0.9.4/src/btf.h:7:1: note: 'std::string'
-is defined in header '<string>'; did you forget to '#include <string>'?
- 6 | #include <unordered_set>
- +++ |+#include <string>
- 7 |
----
- src/btf.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/btf.h b/src/btf.h
-index 05b56ff..8856bfc 100644
---- a/src/btf.h
-+++ b/src/btf.h
-@@ -1,6 +1,7 @@
- #pragma once
-
- #include <linux/types.h>
-+#include <string>
- #include <unistd.h>
- #include <unordered_set>
-
---
-2.21.1
-
diff --git a/bpftrace.spec b/bpftrace.spec
index 9c342c5..8b86be0 100644
--- a/bpftrace.spec
+++ b/bpftrace.spec
@@ -1,16 +1,15 @@
Name: bpftrace
-Version: 0.9.4
+Version: 0.10.0
Release: 1%{?dist}
Summary: High-level tracing language for Linux eBPF
License: ASL 2.0
URL: https://github.com/iovisor/bpftrace
-Patch0: 0001-Add-missing-string-include-to-btf.h.patch
Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
# Arches will be included as upstream support is added and dependencies are
# satisfied in the respective arches
-ExclusiveArch: x86_64 %{power64} aarch64 s390x
+ExclusiveArch: x86_64 %{power64} aarch64
BuildRequires: gcc-c++
BuildRequires: bison
@@ -56,10 +55,6 @@ and predecessor tracers such as DTrace and SystemTap
find %{buildroot}%{_datadir}/%{name}/tools -type f -exec \
sed -i -e '1s=^#!/usr/bin/env %{name}\([0-9.]\+\)\?$=#!%{_bindir}/%{name}=' {} \;
-# Move man pages to the right location
-mkdir -p %{buildroot}%{_mandir}
-mv %{buildroot}%{_prefix}/man/* %{buildroot}%{_mandir}/
-
%files
%doc README.md CONTRIBUTING-TOOLS.md
@@ -75,6 +70,10 @@ mv %{buildroot}%{_prefix}/man/* %{buildroot}%{_mandir}/
%changelog
+* Tue Apr 14 2020 Augusto Caringi <acaringi(a)redhat.com> - 0.10.0-1
+- Rebased to version 0.10.0
+- Dropped support for s390x temporaly due to build error
+
* Thu Feb 06 2020 Augusto Caringi <acaringi(a)redhat.com> - 0.9.4-1
- Rebased to version 0.9.4
diff --git a/sources b/sources
index 0db1bc7..ad2f466 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (bpftrace-0.9.4.tar.gz) = d2b32235fa81d6f06771df32877388a9105230adfc638b0d0ebf4f11a567246e8514d93c14da9c7008dbacd6b2c4108604fc5a2721ef831efa5c596cbe50b1da
+SHA512 (bpftrace-0.10.0.tar.gz) = da400efe78cea505a32deead594b047ec4394d3eefe86e7b6853fe2dc715c5847a3abcbd26c1fac39d0a534f1e57d6c0bc3625e0c3f1054b0d84b7b1d6eb69b9
4 years
Architecture specific change in rpms/json-c.git
by githook-noreply@fedoraproject.org
The package rpms/json-c.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/json-c.git/commit/?id=8cb40082a13....
Change:
+%ifarch %{valgrind_arches}
Thanks.
Full change:
============
commit 8cb40082a131d94271f020a45a5501ed0ab53890
Author: Bjrn Esser <besser82(a)fedoraproject.org>
Date: Tue Apr 14 17:53:22 2020 +0200
Update to recent git snapshot using forge macros
diff --git a/.gitignore b/.gitignore
index 71c0ef5..ddb3aeb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1 @@
-json-c.spec~
-clog
-/json-c-0.11-20130402.tar.gz
-/json-c-0.12-20140410.tar.gz
-/json-c-0.12.1-20160607.tar.gz
-/json-c-0.13-20171207.tar.gz
-/json-c-0.13.1-20180305.tar.gz
+/json-c-*.tar.gz
diff --git a/0001-Fix-CMake-tests-for-enforced-strict-prototypes.patch b/0001-Fix-CMake-tests-for-enforced-strict-prototypes.patch
new file mode 100644
index 0000000..014412e
--- /dev/null
+++ b/0001-Fix-CMake-tests-for-enforced-strict-prototypes.patch
@@ -0,0 +1,34 @@
+From 053eaa61d7f69dec0b9d744809b189c80583150b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <besser82(a)fedoraproject.org>
+Date: Tue, 14 Apr 2020 20:42:32 +0200
+Subject: [PATCH] Fix CMake tests for enforced strict prototypes.
+
+---
+ CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 04d21f9..c645d58 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -260,7 +260,7 @@ if (NOT ("${CMAKE_C_COMPILER_ID}" STREQUAL "MSVC"))
+ /* uClibc toolchains without threading barf when _REENTRANT is defined */
+ #define _REENTRANT 1
+ #include <sys/types.h>
+- int main ()
++ int main (void)
+ {
+ return 0;
+ }
+@@ -276,7 +276,7 @@ if (NOT ("${CMAKE_C_COMPILER_ID}" STREQUAL "MSVC"))
+ list(APPEND CMAKE_REQUIRED_LIBRARIES "-Wl,-Bsymbolic-functions")
+ check_c_source_compiles(
+ [=[
+- int main ()
++ int main (void)
+ {
+ return 0;
+ }
+--
+2.26.0
+
diff --git a/json-c.spec b/json-c.spec
index 6b41510..fedddbe 100644
--- a/json-c.spec
+++ b/json-c.spec
@@ -1,28 +1,33 @@
%{!?_pkgdocdir:%global _pkgdocdir %{_docdir}/%{name}-%{version}}
-%global so_ver 4
-%global reldate 20180305
+# We don't want accidental SONAME bumps.
+%global so_ver 4
+
+
+# Use 'commit' for snapshots and 'tag' for releases.
+%global commit ab5425a6a600807d2c17eaa7d1dc7b4093f794aa
+#global tag json-c-0.13.1-20180305
+%global forgeurl https://github.com/json-c/json-c
+%forgemeta
Name: json-c
-Version: 0.13.1
-Release: 11%{?dist}
+Version: 0.13.99
+Release: 0.1%{?dist}
Summary: JSON implementation in C
License: MIT
-URL: https://github.com/%{name}/%{name}
-Source0: %{url}/archive/%{name}-%{version}-%{reldate}.tar.gz
+URL: %{forgeurl}
+Source0: %{forgesource}
-# Cherry-picked from upstream.
-Patch0: %{url}/commit/da4b34355da023c439e96bc6ca31886cd69d6bdb.patch#/%{name}-0.13.1-parse_test_UTF8_BOM.patch
-Patch1: %{url}/commit/f8c632f579c71012f9aca81543b880a579f634fc.patch#/%{name}-0.13.1-fix_incorrect_casts_in_calls_to_ctype_functions.patch
-Patch2: %{url}/commit/8bd62177e796386fb6382db101c90b57b6138afe.patch#/%{name}-0.13.1-fix_typos.patch
+Patch0001: 0001-Fix-CMake-tests-for-enforced-strict-prototypes.patch
-BuildRequires: autoconf
-BuildRequires: automake
+BuildRequires: cmake
BuildRequires: gcc
-BuildRequires: libtool
BuildRequires: make
+%ifarch %{valgrind_arches}
+BuildRequires: valgrind
+%endif
%description
JSON-C implements a reference counting object model that allows you
@@ -33,7 +38,6 @@ of JSON objects. It aims to conform to RFC 7159.
%package devel
Summary: Development files for %{name}
-
Requires: %{name}%{?_isa} = %{version}-%{release}
%description devel
@@ -54,43 +58,37 @@ This package contains the reference manual for %{name}.
%prep
-%autosetup -n %{name}-%{name}-%{version}-%{reldate} -p 1
-
-for doc in ChangeLog; do
- iconv -f iso-8859-1 -t utf8 ${doc} > ${doc}.new
- touch -r ${doc} ${doc}.new
- mv -f ${doc}.new ${doc}
-done
-
-sed -i -e 's!#ACLOCAL_AMFLAGS!ACLOCAL_AMFLAGS!g' Makefile.am
-autoreconf -fiv
+%forgeautosetup -p 1
%build
-%configure \
- --disable-silent-rules \
- --disable-static \
- --disable-rdrand \
- --enable-Bsymbolic \
- --enable-shared \
- --enable-threading
-%make_build
-doxygen Doxyfile
+mkdir -p %{_vpath_builddir}
+%cmake \
+ -DCMAKE_BUILD_TYPE:STRING=RELEASE \
+ -DCMAKE_C_FLAGS_RELEASE:STRING="" \
+ -DDISABLE_BSYMBOLIC:BOOL=OFF \
+ -DDISABLE_WERROR:BOOL=OFF \
+ -DENABLE_RDRAND:BOOL=OFF \
+ -DENABLE_THREADING:BOOL=ON \
+ -B $PWD/%{_vpath_builddir} \
+ -S $PWD
+%make_build -C %{_vpath_builddir} all doc
%install
-%make_install
-
-find %{buildroot} -name '*.a' -delete -print
-find %{buildroot} -name '*.la' -delete -print
+%make_install -C %{_vpath_builddir}
+# Documentation
mkdir -p %{buildroot}%{_pkgdocdir}
-cp -pr doc/html ChangeLog README README.* %{buildroot}%{_pkgdocdir}
+cp -a %{_vpath_builddir}/doc/html ChangeLog README README.* \
+ %{buildroot}%{_pkgdocdir}
hardlink -cvf %{buildroot}%{_pkgdocdir}
%check
-%make_build check
+pushd %{_vpath_builddir}
+ctest %{_smp_mflags} --output-on-failure
+popd
%ldconfig_scriptlets
@@ -107,6 +105,7 @@ hardlink -cvf %{buildroot}%{_pkgdocdir}
%doc %{_pkgdocdir}/ChangeLog
%doc %{_pkgdocdir}/README*
%{_includedir}/%{name}
+%{_libdir}/cmake/%{name}
%{_libdir}/lib%{name}.so
%{_libdir}/pkgconfig/%{name}.pc
@@ -119,6 +118,9 @@ hardlink -cvf %{buildroot}%{_pkgdocdir}
%changelog
+* Tue Apr 14 2020 Bjrn Esser <besser82(a)fedoraproject.org> - 0.13.99-0.1.20200414gitab5425a
+- Update to recent git snapshot using forge macros
+
* Sun Apr 12 2020 Bjrn Esser <besser82(a)fedoraproject.org> - 0.13.1-11
- Drop bootstrap logic, as the package is no dependency of @build anymore
- Add some explicit BuildRequires, which were implicit
diff --git a/sources b/sources
index 1ee247c..a66a668 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (json-c-0.13.1-20180305.tar.gz) = 89c448eabe37d408491dd8730cb92c9f8e7463e868fb999eb40a94b47a41c9342231096b242fad891a8d80648439be8ed85cf1137f9f2089db3f656b84b2e6d8
+SHA512 (json-c-ab5425a6a600807d2c17eaa7d1dc7b4093f794aa.tar.gz) = 435fa8435d2fb5da33f09e5afb55a217d01bbae159b525be636078c20f5a5e714315c40bb820b9eedb4f5777a1b3992bdb8c77ad6a8604419240713a9a8239dd
commit 89b6155aab5209b5ea299094392f603e83be2abb
Author: Bjrn Esser <besser82(a)fedoraproject.org>
Date: Sun Apr 12 18:45:16 2020 +0200
Drop obsolete patches from repo
diff --git a/json-c-0.13.1-fix_incorrect_casts_in_calls_to_ctype_functions.patch b/json-c-0.13.1-fix_incorrect_casts_in_calls_to_ctype_functions.patch
deleted file mode 100644
index e88d6e2..0000000
--- a/json-c-0.13.1-fix_incorrect_casts_in_calls_to_ctype_functions.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From f8c632f579c71012f9aca81543b880a579f634fc Mon Sep 17 00:00:00 2001
-From: Eric Haszlakiewicz <erh+git(a)nimenees.com>
-Date: Sun, 25 Mar 2018 18:25:58 -0400
-Subject: [PATCH] Issue #407: fix incorrect casts in calls to ctype functions
- (isdigit and isspace) so we don't crash when asserts are enabled on certain
- platforms and characters > 128 are parsed.
-
----
- json_object.c | 2 +-
- json_pointer.c | 4 ++--
- json_tokener.c | 2 +-
- 3 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/json_object.c b/json_object.c
-index 8287163a1c..8a86bc6ea0 100644
---- a/json_object.c
-+++ b/json_object.c
-@@ -838,7 +838,7 @@ static int json_object_double_to_json_string_format(struct json_object* jso,
- format_drops_decimals = 1;
-
- if (size < (int)sizeof(buf) - 2 &&
-- isdigit((int)buf[0]) && /* Looks like *some* kind of number */
-+ isdigit((unsigned char)buf[0]) && /* Looks like *some* kind of number */
- !p && /* Has no decimal point */
- strchr(buf, 'e') == NULL && /* Not scientific notation */
- format_drops_decimals)
-diff --git a/json_pointer.c b/json_pointer.c
-index 2b2a9ef507..c7e34f76f3 100644
---- a/json_pointer.c
-+++ b/json_pointer.c
-@@ -44,7 +44,7 @@ static int is_valid_index(struct json_object *jo, const char *path, int32_t *idx
- /* this code-path optimizes a bit, for when we reference the 0-9 index range in a JSON array
- and because leading zeros not allowed */
- if (len == 1) {
-- if (isdigit((int)path[0])) {
-+ if (isdigit((unsigned char)path[0])) {
- *idx = (path[0] - '0');
- goto check_oob;
- }
-@@ -58,7 +58,7 @@ static int is_valid_index(struct json_object *jo, const char *path, int32_t *idx
- }
- /* RFC states base-10 decimals */
- for (i = 0; i < len; i++) {
-- if (!isdigit((int)path[i])) {
-+ if (!isdigit((unsigned char)path[i])) {
- errno = EINVAL;
- return 0;
- }
-diff --git a/json_tokener.c b/json_tokener.c
-index 449a82da6f..561f7303b2 100644
---- a/json_tokener.c
-+++ b/json_tokener.c
-@@ -295,7 +295,7 @@ struct json_object* json_tokener_parse_ex(struct json_tokener *tok,
-
- case json_tokener_state_eatws:
- /* Advance until we change state */
-- while (isspace((int)c)) {
-+ while (isspace((unsigned char)c)) {
- if ((!ADVANCE_CHAR(str, tok)) || (!PEEK_CHAR(c, tok)))
- goto out;
- }
diff --git a/json-c-0.13.1-fix_typos.patch b/json-c-0.13.1-fix_typos.patch
deleted file mode 100644
index 25301d7..0000000
--- a/json-c-0.13.1-fix_typos.patch
+++ /dev/null
@@ -1,163 +0,0 @@
-From 8bd62177e796386fb6382db101c90b57b6138afe Mon Sep 17 00:00:00 2001
-From: janczer <menshikov.ivn(a)gmail.com>
-Date: Tue, 24 Apr 2018 16:00:38 +0200
-Subject: [PATCH] Fixed typos
-
----
- STYLE.txt | 2 +-
- json_object.h | 18 +++++++++---------
- json_pointer.c | 2 +-
- tests/test_compare.c | 12 ++++++------
- tests/test_compare.expected | 6 +++---
- 5 files changed, 20 insertions(+), 20 deletions(-)
-
-diff --git a/STYLE.txt b/STYLE.txt
-index e5acd14820..195883c760 100755
---- a/STYLE.txt
-+++ b/STYLE.txt
-@@ -7,7 +7,7 @@ Official json-c style:
- Aim for readability, not strict conformance to fixed style rules.
- These rules are not comprehensive. Look to existing code for guidelines.
- Indentation is tab based, with continuations of long lines starting with tabs then spaces for alignment.
--Try to line up components of continuation lines with corresponding part of the line above (i.e. "indent -lp" effect), but avoid excessive identation tha causes extra line wraps.
-+Try to line up components of continuation lines with corresponding part of the line above (i.e. "indent -lp" effect), but avoid excessive indentation tha causes extra line wraps.
- e.g. (T=tab, S=space):
- TTTTsome_long_func_call(arg1, arg2,
- TTTTSSSSSSSSSSSSSSSSSSSarg3, arg4);
-diff --git a/json_object.h b/json_object.h
-index a3a86c0912..30341bcdb7 100644
---- a/json_object.h
-+++ b/json_object.h
-@@ -91,7 +91,7 @@ extern "C" {
- /**
- * A flag for the json_object_object_add_ex function which
- * causes the value to be added without a check if it already exists.
-- * Note: it is the responsibilty of the caller to ensure that no
-+ * Note: it is the responsibility of the caller to ensure that no
- * key is added multiple times. If this is done, results are
- * unpredictable. While this option is somewhat dangerous, it
- * permits potentially large performance savings in code that
-@@ -442,7 +442,7 @@ JSON_EXPORT int json_object_object_add_ex(struct json_object* obj,
- *
- * This returns NULL if the field is found but its value is null, or if
- * the field is not found, or if obj is not a json_type_object. If you
-- * need to distinguis between these cases, use json_object_object_get_ex().
-+ * need to distinguish between these cases, use json_object_object_get_ex().
- *
- * *No* reference counts will be changed. There is no need to manually adjust
- * reference counts through the json_object_put/json_object_get methods unless
-@@ -624,7 +624,7 @@ JSON_EXPORT int json_object_array_add(struct json_object *obj,
- JSON_EXPORT int json_object_array_put_idx(struct json_object *obj, size_t idx,
- struct json_object *val);
-
--/** Get the element at specificed index of the array (a json_object of type json_type_array)
-+/** Get the element at specified index of the array (a json_object of type json_type_array)
- * @param obj the json_object instance
- * @param idx the index to get the element at
- * @returns the json_object at the specified index (or NULL)
-@@ -671,7 +671,7 @@ JSON_EXPORT json_bool json_object_get_boolean(const struct json_object *obj);
- *
- * The type of obj is checked to be a json_type_boolean and 0 is returned
- * if it is not without any further actions. If type of obj is json_type_boolean
-- * the obect value is chaned to new_value
-+ * the object value is changed to new_value
- *
- * @param obj the json_object instance
- * @param new_value the value to be set
-@@ -718,7 +718,7 @@ JSON_EXPORT int32_t json_object_get_int(const struct json_object *obj);
- *
- * The type of obj is checked to be a json_type_int and 0 is returned
- * if it is not without any further actions. If type of obj is json_type_int
-- * the obect value is changed to new_value
-+ * the object value is changed to new_value
- *
- * @param obj the json_object instance
- * @param new_value the value to be set
-@@ -763,7 +763,7 @@ JSON_EXPORT int64_t json_object_get_int64(const struct json_object *obj);
- *
- * The type of obj is checked to be a json_type_int and 0 is returned
- * if it is not without any further actions. If type of obj is json_type_int
-- * the obect value is chaned to new_value
-+ * the object value is changed to new_value
- *
- * @param obj the json_object instance
- * @param new_value the value to be set
-@@ -880,7 +880,7 @@ JSON_EXPORT double json_object_get_double(const struct json_object *obj);
- *
- * The type of obj is checked to be a json_type_double and 0 is returned
- * if it is not without any further actions. If type of obj is json_type_double
-- * the obect value is chaned to new_value
-+ * the object value is changed to new_value
- *
- * @param obj the json_object instance
- * @param new_value the value to be set
-@@ -942,10 +942,10 @@ JSON_EXPORT int json_object_set_string(json_object* obj, const char* new_value);
- *
- * The type of obj is checked to be a json_type_string and 0 is returned
- * if it is not without any further actions. If type of obj is json_type_string
-- * the obect value is chaned to new_value
-+ * the object value is changed to new_value
- *
- * @param obj the json_object instance
-- * @param new_value the value to be set; Since string legth is given in len this need not be zero terminated
-+ * @param new_value the value to be set; Since string length is given in len this need not be zero terminated
- * @param len the length of new_value
- * @returns 1 if value is set correctly, 0 otherwise
- */
-diff --git a/json_pointer.c b/json_pointer.c
-index c7e34f76f3..9531c036c8 100644
---- a/json_pointer.c
-+++ b/json_pointer.c
-@@ -28,7 +28,7 @@
- static void string_replace_all_occurrences_with_char(char *s, const char *occur, char repl_char)
- {
- int slen = strlen(s);
-- int skip = strlen(occur) - 1; /* length of the occurence, minus the char we're replacing */
-+ int skip = strlen(occur) - 1; /* length of the occurrence, minus the char we're replacing */
- char *p = s;
- while ((p = strstr(p, occur))) {
- *p = repl_char;
-diff --git a/tests/test_compare.c b/tests/test_compare.c
-index c7e44f6ea6..cba328cf4b 100644
---- a/tests/test_compare.c
-+++ b/tests/test_compare.c
-@@ -18,19 +18,19 @@ int main()
- struct json_object *int3 = json_object_new_int(1);
-
- if (!json_object_equal(int1, int2))
-- printf("JSON integer comparision is correct\n");
-+ printf("JSON integer comparison is correct\n");
- else
-- printf("JSON integer comparision failed\n");
-+ printf("JSON integer comparison failed\n");
-
- if (json_object_equal(int1, int1))
-- printf("JSON same object comparision is correct\n");
-+ printf("JSON same object comparison is correct\n");
- else
-- printf("JSON same object comparision failed\n");
-+ printf("JSON same object comparison failed\n");
-
- if (json_object_equal(int2, int3))
-- printf("JSON same integer comparision is correct\n");
-+ printf("JSON same integer comparison is correct\n");
- else
-- printf("JSON same integer comparision failed\n");
-+ printf("JSON same integer comparison failed\n");
-
- json_object_put(int1);
- json_object_put(int2);
-diff --git a/tests/test_compare.expected b/tests/test_compare.expected
-index 46f03c4101..5468f83d2e 100644
---- a/tests/test_compare.expected
-+++ b/tests/test_compare.expected
-@@ -1,6 +1,6 @@
--JSON integer comparision is correct
--JSON same object comparision is correct
--JSON same integer comparision is correct
-+JSON integer comparison is correct
-+JSON same object comparison is correct
-+JSON same integer comparison is correct
- Comparing equal strings is correct
- Comparing different strings is correct
- Comparing equal doubles is correct
diff --git a/json-c-0.13.1-parse_test_UTF8_BOM.patch b/json-c-0.13.1-parse_test_UTF8_BOM.patch
deleted file mode 100644
index a8e047d..0000000
--- a/json-c-0.13.1-parse_test_UTF8_BOM.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From da4b34355da023c439e96bc6ca31886cd69d6bdb Mon Sep 17 00:00:00 2001
-From: Eric Haszlakiewicz <erh+git(a)nimenees.com>
-Date: Sun, 25 Mar 2018 18:23:42 -0400
-Subject: [PATCH] Add an parse test for content starting with a UTF8 BOM, which
- is _not_ a valid start to a JSON message.
-
----
- tests/test_parse.c | 16 +++++++++++++++-
- tests/test_parse.expected | 5 ++++-
- 2 files changed, 19 insertions(+), 2 deletions(-)
-
-diff --git a/tests/test_parse.c b/tests/test_parse.c
-index ee1f8387b3..f46651b0a1 100644
---- a/tests/test_parse.c
-+++ b/tests/test_parse.c
-@@ -9,6 +9,7 @@
- #include "json_visit.h"
-
- static void test_basic_parse(void);
-+static void test_utf8_parse(void);
- static void test_verbose_parse(void);
- static void test_incremental_parse(void);
-
-@@ -19,6 +20,8 @@ int main(void)
- static const char separator[] = "==================================";
- test_basic_parse();
- puts(separator);
-+ test_utf8_parse();
-+ puts(separator);
- test_verbose_parse();
- puts(separator);
- test_incremental_parse();
-@@ -107,6 +110,17 @@ static void test_basic_parse()
- single_basic_parse("[18446744073709551616]", 1);
- }
-
-+static void test_utf8_parse()
-+{
-+ // json_tokener_parse doesn't support checking for byte order marks.
-+ // It's the responsibility of the caller to detect and skip a BOM.
-+ // Both of these checks return null.
-+ char utf8_bom[] = { 0xEF, 0xBB, 0xBF, 0x00 };
-+ char utf8_bom_and_chars[] = { 0xEF, 0xBB, 0xBF, '{', '}', 0x00 };
-+ single_basic_parse(utf8_bom, 0);
-+ single_basic_parse(utf8_bom_and_chars, 0);
-+}
-+
- // Clear the re-serialization information that the tokener
- // saves to ensure that the output reflects the actual
- // values we parsed, rather than just the original input.
-@@ -145,7 +159,7 @@ static void test_verbose_parse()
- /* b/c the string starts with 'f' parsing return a boolean error */
- assert (error == json_tokener_error_parse_boolean);
-
-- puts("json_tokener_parse_versbose() OK");
-+ puts("json_tokener_parse_verbose() OK");
- }
-
- struct incremental_step {
-diff --git a/tests/test_parse.expected b/tests/test_parse.expected
-index ada61411fe..5d3976a745 100644
---- a/tests/test_parse.expected
-+++ b/tests/test_parse.expected
-@@ -51,7 +51,10 @@ new_obj.to_string([0e+])=[ 0.0 ]
- new_obj.to_string([0e+-1])=null
- new_obj.to_string([18446744073709551616])=[ 9223372036854775807 ]
- ==================================
--json_tokener_parse_versbose() OK
-+new_obj.to_string()=null
-+new_obj.to_string({})=null
-+==================================
-+json_tokener_parse_verbose() OK
- ==================================
- Starting incremental tests.
- Note: quotes and backslashes seen in the output here are literal values passed
4 years
Architecture specific change in rpms/java-1.8.0-openjdk.git
by githook-noreply@fedoraproject.org
The package rpms/java-1.8.0-openjdk.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/java-1.8.0-openjdk.git/commit/?id....
Change:
+%ifarch noarch
Thanks.
Full change:
============
commit 1b1cbf2cdfb8346f9e7d2fed4cf3a17e16def54e
Author: Andrew John Hughes <gnu.andrew(a)redhat.com>
Date: Tue Mar 31 20:19:21 2020 +0100
Introduce stapinstall variable to set SystemTap arch directory correctly (e.g. arm64 on aarch64)
Include support for noarch for when koji creates source RPMs
diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec
index cd286ae..f905c59 100644
--- a/java-1.8.0-openjdk.spec
+++ b/java-1.8.0-openjdk.spec
@@ -136,47 +136,61 @@
# In some cases, the arch used by the JDK does
# not match _arch.
# Also, in some cases, the machine name used by SystemTap
-# does not match that given by _build_cpu
+# does not match that given by _target_cpu
%ifarch x86_64
%global archinstall amd64
+%global stapinstall x86_64
%endif
%ifarch ppc
%global archinstall ppc
+%global stapinstall powerpc
%endif
%ifarch %{ppc64be}
%global archinstall ppc64
+%global stapinstall powerpc
%endif
%ifarch %{ppc64le}
%global archinstall ppc64le
+%global stapinstall powerpc
%endif
%ifarch %{ix86}
%global archinstall i386
+%global stapinstall i386
%endif
%ifarch ia64
%global archinstall ia64
+%global stapinstall ia64
%endif
%ifarch s390
%global archinstall s390
+%global stapinstall s390
%endif
%ifarch s390x
%global archinstall s390x
+%global stapinstall s390
%endif
%ifarch %{arm}
%global archinstall arm
+%global stapinstall arm
%endif
%ifarch %{aarch64}
%global archinstall aarch64
+%global stapinstall arm64
%endif
# 32 bit sparc, optimized for v9
%ifarch sparcv9
%global archinstall sparc
+%global stapinstall %{_target_cpu}
%endif
# 64 bit sparc
%ifarch sparc64
%global archinstall sparcv9
+%global stapinstall %{_target_cpu}
%endif
-%ifnarch %{jit_arches}
-%global archinstall %{_arch}
+# Need to support noarch for srpm build
+%ifarch noarch
+%global archinstall %{nil}
+%global stapinstall %{nil}
%endif
%ifarch %{jit_arches}
@@ -231,7 +245,7 @@
%global updatever %(VERSION=%{whole_update}; echo ${VERSION##*u})
# eg jdk8u60-b27 -> b27
%global buildver %(VERSION=%{version_tag}; echo ${VERSION##*-})
-%global rpmrelease 2
+%global rpmrelease 3
# Define milestone (EA for pre-releases, GA ("fcs") for releases)
# Release will be (where N is usually a number starting at 1):
# - 0.N%%{?extraver}%%{?dist} for EA releases,
@@ -285,10 +299,10 @@
# and 32 bit architectures we place the tapsets under the arch
# specific dir (note that systemtap will only pickup the tapset
# for the primary arch for now). Systemtap uses the machine name
-# aka build_cpu as architecture specific directory name.
+# aka target_cpu as architecture specific directory name.
%global tapsetroot /usr/share/systemtap
%global tapsetdirttapset %{tapsetroot}/tapset/
-%global tapsetdir %{tapsetdirttapset}/%{_build_cpu}
+%global tapsetdir %{tapsetdirttapset}/%{stapinstall}
%endif
# not-duplicated scriptlets for normal/debug packages
@@ -1462,6 +1476,14 @@ Set of links from OpenJDK-slowdebug (sdk) to normal OpenJFX. OpenJFX do not supp
%endif
%prep
+
+# Using the echo macro breaks rpmdev-bumpspec, as it parses the first line of stdout :-(
+%if 0%{?stapinstall:1}
+ echo "CPU: %{_target_cpu}, arch install directory: %{archinstall}, SystemTap install directory: %{stapinstall}"
+%else
+ %{error:Unrecognised architecture %{_target_cpu}}
+%endif
+
if [ %{include_normal_build} -eq 0 -o %{include_normal_build} -eq 1 ] ; then
echo "include_normal_build is %{include_normal_build}"
else
@@ -2212,6 +2234,10 @@ require "copy_jdk_configs.lua"
%endif
%changelog
+* Tue Mar 24 2020 Andrew John Hughes <gnu.andrew(a)redhat.com> - 1:1.8.0.242.b08-3
+- Introduce stapinstall variable to set SystemTap arch directory correctly (e.g. arm64 on aarch64)
+- Include support for noarch for when koji creates source RPMs
+
* Sun Mar 22 2020 Andrew John Hughes <gnu.andrew(a)redhat.com> - 1:1.8.0.242.b08-2
- Replace Bash 'if' with rpm '%if'
- Resolves: rhbz#1813550
4 years
Architecture specific change in rpms/yacpi.git
by githook-noreply@fedoraproject.org
The package rpms/yacpi.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/yacpi.git/commit/?id=5b08d2cd4415....
Change:
-ExcludeArch: ppc ppc64
Thanks.
Full change:
============
commit 5b08d2cd4415a0e695ab01da0bb343ed400a6caf
Author: Sven Lankes <slankes(a)fedoraproject.org>
Date: Tue Apr 14 17:15:50 2020 +0200
upstream is dead, no longer works with modern kernels
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index b6b2361..0000000
--- a/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-yacpi-3.0.1.tar.gz
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..ca545ce
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+upstream is dead, no longer works with modern kernels
diff --git a/sources b/sources
deleted file mode 100644
index 1fd78e8..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-1b03394ee3b916f686cdc3e2c05ddb7a yacpi-3.0.1.tar.gz
diff --git a/yacpi-3.0.1.patch b/yacpi-3.0.1.patch
deleted file mode 100644
index 21d11c4..0000000
--- a/yacpi-3.0.1.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff -Naur yacpi-3.0.1-orig/Makefile yacpi-3.0.1/Makefile
---- yacpi-3.0.1-orig/Makefile 2007-10-30 17:39:43.000000000 +0100
-+++ yacpi-3.0.1/Makefile 2008-08-02 11:21:21.000000000 +0200
-@@ -4,7 +4,7 @@
- # ---------------------------------------------
-
- BIN = yacpi
--prefix = /usr/local
-+prefix = /usr
- INSPATH = ${prefix}/bin/
- CFLAGS = -O2 -Wall -g -DVERSION=\"${VERSION}\"
- CC = cc
-@@ -21,8 +21,7 @@
- @${CC} -c ${CFLAGS} $<
-
- all : options ${OBJ_yacpi} ${OBJ_get_cpu}
-- @${CC} -Wall get_cpu.o yacpi.o -o ${BIN} -lncurses -lacpi
-- @strip ${BIN}
-+ @${CC} ${CFLAGS} get_cpu.o yacpi.o -o ${BIN} -lncurses -lacpi
- @echo built yacpi
-
- dist : clean
-@@ -40,12 +39,12 @@
- @echo "BIN = ${BIN}"
-
- install :
-- @mkdir -p ${DOCPATH}
-- @mkdir -p ${INSPATH}
-- @mkdir -p ${MANPATH}
-- install -m644 CHANGELOG README THANKS COPYING ${DOCPATH}
-- install -m644 yacpi.1 ${MANPATH}
-- install ${BIN} ${INSPATH}
-+ @mkdir -p ${DESTDIR}/${DOCPATH}
-+ @mkdir -p ${DESTDIR}/${INSPATH}
-+ @mkdir -p ${DESTDIR}/${MANPATH}
-+ install -p -m644 CHANGELOG README THANKS COPYING ${DESTDIR}/${DOCPATH}
-+ install -p -m644 yacpi.1 ${DESTDIR}/${MANPATH}
-+ install -p ${BIN} ${DESTDIR}/${INSPATH}
-
- uninstall :
- rm -f ${INSPATH}${BIN}
diff --git a/yacpi.spec b/yacpi.spec
deleted file mode 100644
index 3411be7..0000000
--- a/yacpi.spec
+++ /dev/null
@@ -1,143 +0,0 @@
-Name: yacpi
-Version: 3.0.1
-Release: 32%{?dist}
-Summary: Yet Another Configuration and Power Interface
-
-License: GPLv2+
-URL: http://www.ngolde.de/yacpi.html
-Source0: http://www.ngolde.de/download/%{name}-%{version}.tar.gz
-Patch0: %{name}-%{version}.patch
-
-BuildRequires: gcc
-BuildRequires: ncurses-devel
-BuildRequires: libacpi-devel
-ExcludeArch: ppc ppc64
-
-%description
-Yacpi is an acpi monitoring program for Linux. It displays acpi information
-like battery status, ac status, cpu frequency, remaining battery/charge
-time, temperature... It also supports the use of more than one battery and
-can display them.
-
-%prep
-%setup -q
-%patch0 -p1
-sed -i "s|CFLAGS = -O2 -Wall -g|CFLAGS = $RPM_OPT_FLAGS|" Makefile
-#fix convert changelog to UTF8
-iconv -f ISO_8859-1 -t UTF-8 -o CHANGELOG{.utf8,}
-mv CHANGELOG{.utf8,}
-
-
-%build
-make %{?_smp_mflags}
-
-
-%install
-make install DESTDIR=$RPM_BUILD_ROOT DOCPATH=%{_pkgdocdir}
-
-
-%files
-%{_bindir}/%{name}
-%dir %{_pkgdocdir}
-%doc %{_pkgdocdir}/CHANGELOG
-%doc %{_pkgdocdir}/COPYING
-%doc %{_pkgdocdir}/README
-%doc %{_pkgdocdir}/THANKS
-%{_mandir}/man1/%{name}.1.gz
-
-
-
-%changelog
-* Fri Jan 31 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.0.1-32
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Sat Jul 27 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.0.1-31
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Sun Feb 03 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.0.1-30
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Sat Jul 14 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.0.1-29
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Fri Feb 09 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.0.1-28
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Thu Aug 03 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.0.1-27
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Thu Jul 27 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.0.1-26
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Sat Feb 11 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.0.1-25
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Fri Feb 05 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.0.1-24
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Sat Jul 04 2015 Ralf Corspius <corsepiu(a)fedoraproject.org> - 3.0.1-23
-- Use '|' as pattern-delimiter in sed expression (Fix FTFBS).
-- Moderize spec.
-
-* Fri Jun 19 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 3.0.1-22
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Mon Aug 18 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 3.0.1-21
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-
-* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 3.0.1-20
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Sun Nov 3 2013 Ville Skytt <ville.skytta(a)iki.fi> - 3.0.1-19
-- Install docs to %%{_pkgdocdir} where available (#993880).
-
-* Sun Aug 04 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 3.0.1-18
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Fri Feb 15 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 3.0.1-17
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Sun Jul 22 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 3.0.1-16
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Sat Jan 14 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 3.0.1-15
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 3.0.1-14
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Mon Jul 27 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 3.0.1-13
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 3.0.1-12
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Tue Aug 19 2008 Sven Lankes <sven(a)lank.es> - 3.0.1-11
-- add ExcludeArch ppc ppc64
-
-* Sat Aug 2 2008 Sven Lankes <sven(a)lank.es> - 3.0.1-10
-- updated Makefile patch to:
-- actually use the set cflags
-- not strip the binary so that we get a -debuginfo package
-
-* Mon Jul 7 2008 slankes <sven(a)lank.es> - 3.0.1-9
-- minor specfile tweaks
-
-* Thu May 8 2008 slankes <sven(a)lank.es> - 3.0.1-8
-- save doc in name-version instead of version
-
-* Thu May 8 2008 slankes <sven(a)lank.es> - 3.0.1-7
-- drop explicit depencency on ncurses
-- rework Makefile-patch
-- Replace CFLAGS with RPM_OPT_FLAGS
-
-* Mon May 5 2008 slankes <sven(a)lank.es> - 3.0.1-6
-- Use correct license
-- Various specfile cleanups
-
-* Sat May 3 2008 slankes <sven(a)lank.es> - 3.0.1-5
-- Convert CHANGELOG to UTF-8
-
-* Sat May 3 2008 slankes <sven(a)lank.es> - 3.0.1-4
-- First package version
-
4 years
Architecture specific change in rpms/yacpi.git
by githook-noreply@fedoraproject.org
The package rpms/yacpi.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/yacpi.git/commit/?id=d6adef4822f3....
Change:
-ExcludeArch: ppc ppc64
Thanks.
Full change:
============
commit d6adef4822f37b07b0253af20890b6830cd0bcb6
Author: Sven Lankes <slankes(a)fedoraproject.org>
Date: Tue Apr 14 17:15:29 2020 +0200
upstream is dead, no longer works with modern kernels
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index b6b2361..0000000
--- a/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-yacpi-3.0.1.tar.gz
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..ca545ce
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+upstream is dead, no longer works with modern kernels
diff --git a/sources b/sources
deleted file mode 100644
index 1fd78e8..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-1b03394ee3b916f686cdc3e2c05ddb7a yacpi-3.0.1.tar.gz
diff --git a/yacpi-3.0.1.patch b/yacpi-3.0.1.patch
deleted file mode 100644
index 21d11c4..0000000
--- a/yacpi-3.0.1.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff -Naur yacpi-3.0.1-orig/Makefile yacpi-3.0.1/Makefile
---- yacpi-3.0.1-orig/Makefile 2007-10-30 17:39:43.000000000 +0100
-+++ yacpi-3.0.1/Makefile 2008-08-02 11:21:21.000000000 +0200
-@@ -4,7 +4,7 @@
- # ---------------------------------------------
-
- BIN = yacpi
--prefix = /usr/local
-+prefix = /usr
- INSPATH = ${prefix}/bin/
- CFLAGS = -O2 -Wall -g -DVERSION=\"${VERSION}\"
- CC = cc
-@@ -21,8 +21,7 @@
- @${CC} -c ${CFLAGS} $<
-
- all : options ${OBJ_yacpi} ${OBJ_get_cpu}
-- @${CC} -Wall get_cpu.o yacpi.o -o ${BIN} -lncurses -lacpi
-- @strip ${BIN}
-+ @${CC} ${CFLAGS} get_cpu.o yacpi.o -o ${BIN} -lncurses -lacpi
- @echo built yacpi
-
- dist : clean
-@@ -40,12 +39,12 @@
- @echo "BIN = ${BIN}"
-
- install :
-- @mkdir -p ${DOCPATH}
-- @mkdir -p ${INSPATH}
-- @mkdir -p ${MANPATH}
-- install -m644 CHANGELOG README THANKS COPYING ${DOCPATH}
-- install -m644 yacpi.1 ${MANPATH}
-- install ${BIN} ${INSPATH}
-+ @mkdir -p ${DESTDIR}/${DOCPATH}
-+ @mkdir -p ${DESTDIR}/${INSPATH}
-+ @mkdir -p ${DESTDIR}/${MANPATH}
-+ install -p -m644 CHANGELOG README THANKS COPYING ${DESTDIR}/${DOCPATH}
-+ install -p -m644 yacpi.1 ${DESTDIR}/${MANPATH}
-+ install -p ${BIN} ${DESTDIR}/${INSPATH}
-
- uninstall :
- rm -f ${INSPATH}${BIN}
diff --git a/yacpi.spec b/yacpi.spec
deleted file mode 100644
index 3411be7..0000000
--- a/yacpi.spec
+++ /dev/null
@@ -1,143 +0,0 @@
-Name: yacpi
-Version: 3.0.1
-Release: 32%{?dist}
-Summary: Yet Another Configuration and Power Interface
-
-License: GPLv2+
-URL: http://www.ngolde.de/yacpi.html
-Source0: http://www.ngolde.de/download/%{name}-%{version}.tar.gz
-Patch0: %{name}-%{version}.patch
-
-BuildRequires: gcc
-BuildRequires: ncurses-devel
-BuildRequires: libacpi-devel
-ExcludeArch: ppc ppc64
-
-%description
-Yacpi is an acpi monitoring program for Linux. It displays acpi information
-like battery status, ac status, cpu frequency, remaining battery/charge
-time, temperature... It also supports the use of more than one battery and
-can display them.
-
-%prep
-%setup -q
-%patch0 -p1
-sed -i "s|CFLAGS = -O2 -Wall -g|CFLAGS = $RPM_OPT_FLAGS|" Makefile
-#fix convert changelog to UTF8
-iconv -f ISO_8859-1 -t UTF-8 -o CHANGELOG{.utf8,}
-mv CHANGELOG{.utf8,}
-
-
-%build
-make %{?_smp_mflags}
-
-
-%install
-make install DESTDIR=$RPM_BUILD_ROOT DOCPATH=%{_pkgdocdir}
-
-
-%files
-%{_bindir}/%{name}
-%dir %{_pkgdocdir}
-%doc %{_pkgdocdir}/CHANGELOG
-%doc %{_pkgdocdir}/COPYING
-%doc %{_pkgdocdir}/README
-%doc %{_pkgdocdir}/THANKS
-%{_mandir}/man1/%{name}.1.gz
-
-
-
-%changelog
-* Fri Jan 31 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.0.1-32
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Sat Jul 27 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.0.1-31
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Sun Feb 03 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.0.1-30
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Sat Jul 14 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.0.1-29
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Fri Feb 09 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.0.1-28
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Thu Aug 03 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.0.1-27
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Thu Jul 27 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.0.1-26
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Sat Feb 11 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.0.1-25
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Fri Feb 05 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.0.1-24
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Sat Jul 04 2015 Ralf Corspius <corsepiu(a)fedoraproject.org> - 3.0.1-23
-- Use '|' as pattern-delimiter in sed expression (Fix FTFBS).
-- Moderize spec.
-
-* Fri Jun 19 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 3.0.1-22
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Mon Aug 18 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 3.0.1-21
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-
-* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 3.0.1-20
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Sun Nov 3 2013 Ville Skytt <ville.skytta(a)iki.fi> - 3.0.1-19
-- Install docs to %%{_pkgdocdir} where available (#993880).
-
-* Sun Aug 04 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 3.0.1-18
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Fri Feb 15 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 3.0.1-17
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Sun Jul 22 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 3.0.1-16
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Sat Jan 14 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 3.0.1-15
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 3.0.1-14
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Mon Jul 27 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 3.0.1-13
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 3.0.1-12
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Tue Aug 19 2008 Sven Lankes <sven(a)lank.es> - 3.0.1-11
-- add ExcludeArch ppc ppc64
-
-* Sat Aug 2 2008 Sven Lankes <sven(a)lank.es> - 3.0.1-10
-- updated Makefile patch to:
-- actually use the set cflags
-- not strip the binary so that we get a -debuginfo package
-
-* Mon Jul 7 2008 slankes <sven(a)lank.es> - 3.0.1-9
-- minor specfile tweaks
-
-* Thu May 8 2008 slankes <sven(a)lank.es> - 3.0.1-8
-- save doc in name-version instead of version
-
-* Thu May 8 2008 slankes <sven(a)lank.es> - 3.0.1-7
-- drop explicit depencency on ncurses
-- rework Makefile-patch
-- Replace CFLAGS with RPM_OPT_FLAGS
-
-* Mon May 5 2008 slankes <sven(a)lank.es> - 3.0.1-6
-- Use correct license
-- Various specfile cleanups
-
-* Sat May 3 2008 slankes <sven(a)lank.es> - 3.0.1-5
-- Convert CHANGELOG to UTF-8
-
-* Sat May 3 2008 slankes <sven(a)lank.es> - 3.0.1-4
-- First package version
-
4 years
Architecture specific change in rpms/libacpi.git
by githook-noreply@fedoraproject.org
The package rpms/libacpi.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/libacpi.git/commit/?id=a0f2a4763f....
Change:
-ExcludeArch: ppc ppc64
Thanks.
Full change:
============
commit a0f2a4763fcb59ec482ba8e98ec4d3031e919af8
Author: Sven Lankes <slankes(a)fedoraproject.org>
Date: Tue Apr 14 17:14:57 2020 +0200
upstream is dead, no longer works with modern kernels
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 53f712b..0000000
--- a/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-libacpi-0.2.tar.gz
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..ca545ce
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+upstream is dead, no longer works with modern kernels
diff --git a/libacpi-0.2-sysfs.patch b/libacpi-0.2-sysfs.patch
deleted file mode 100644
index 52fd463..0000000
--- a/libacpi-0.2-sysfs.patch
+++ /dev/null
@@ -1,265 +0,0 @@
-diff -Naur libacpi-0.2-orig/libacpi.c libacpi-0.2/libacpi.c
---- libacpi-0.2-orig/libacpi.c 2007-07-29 14:09:34.000000000 +0200
-+++ libacpi-0.2/libacpi.c 2008-08-02 10:41:11.000000000 +0200
-@@ -14,8 +14,9 @@
- #include "libacpi.h"
- #include "list.h"
-
--static int read_acpi_battinfo(const int num);
--static int read_acpi_battalarm(const int num);
-+
-+static int read_acpi_battinfo(const int num, const int sysstyle);
-+static int read_acpi_battalarm(const int num, const int sysstyle);
- static int read_acpi_battstate(const int num);
- static void read_acpi_thermalzones(global_t *globals);
-
-@@ -144,8 +145,15 @@
- int i = 0;
-
- globals->batt_count = 0;
-+ globals->sysstyle = 0;
- if((lst = dir_list(PROC_ACPI "battery")) == NULL || !lst->top)
-- return NOT_SUPPORTED;
-+ {
-+ /* check for new Linux 2.6.24+ layout */
-+ if((lst = dir_list(SYS_POWER)) == NULL || !lst->top)
-+ return NOT_SUPPORTED;
-+ else
-+ globals->sysstyle = 1;
-+ }
- for(node = lst->top; node; node=node->next){
- if((names[globals->batt_count] = strdup(node->name)) == NULL){
- delete_list(lst);
-@@ -174,11 +182,20 @@
- for (i=0; i < globals->batt_count && i < MAX_ITEMS; i++){
- binfo = &batteries[i];
- snprintf(binfo->name, MAX_NAME, "%s", names[i]);
-- snprintf(binfo->state_file, MAX_NAME, PROC_ACPI "battery/%s/state", names[i]);
-- snprintf(binfo->info_file, MAX_NAME, PROC_ACPI "battery/%s/info", names[i]);
-- snprintf(binfo->alarm_file, MAX_NAME, PROC_ACPI "battery/%s/alarm", names[i]);
-- read_acpi_battinfo(i);
-- read_acpi_battalarm(i);
-+ if(globals->sysstyle)
-+ {
-+ snprintf(binfo->state_file, MAX_NAME, "/%s/present", names[i]);
-+ snprintf(binfo->info_file, MAX_NAME, SYS_POWER "/%s", names[i]);
-+ snprintf(binfo->alarm_file, MAX_NAME, SYS_POWER "/%s/alarm", names[i]);
-+ }
-+ else
-+ {
-+ snprintf(binfo->state_file, MAX_NAME, PROC_ACPI "battery/%s/state", names[i]);
-+ snprintf(binfo->info_file, MAX_NAME, PROC_ACPI "battery/%s/info", names[i]);
-+ snprintf(binfo->alarm_file, MAX_NAME, PROC_ACPI "battery/%s/alarm", names[i]);
-+ }
-+ read_acpi_battinfo(i, globals->sysstyle);
-+ read_acpi_battalarm(i, globals->sysstyle);
- free(names[i]);
- }
- delete_list(lst);
-@@ -196,11 +213,22 @@
- ac->ac_state = P_ERR;
- return;
- }
-- if((tmp = scan_acpi_value(buf, "state:")) && !strncmp(tmp, "on-line", 7))
-- ac->ac_state = P_AC;
-- else if(tmp && !strncmp(tmp, "off-line", 8))
-- ac->ac_state = P_BATT;
-- else ac->ac_state = P_ERR;
-+ if(globals->sysstyle)
-+ {
-+ if(!strcmp(buf, "1"))
-+ ac->ac_state = P_AC;
-+ else if(!strcmp(buf, "0"))
-+ ac->ac_state = P_BATT;
-+ else ac->ac_state = P_ERR;
-+ }
-+ else
-+ {
-+ if((tmp = scan_acpi_value(buf, "state:")) && !strncmp(tmp, "on-line", 7))
-+ ac->ac_state = P_AC;
-+ else if(tmp && !strncmp(tmp, "off-line", 8))
-+ ac->ac_state = P_BATT;
-+ else ac->ac_state = P_ERR;
-+ }
- free(buf);
- free(tmp);
- }
-@@ -212,14 +240,22 @@
- list_t *lst = NULL;
- adapter_t *ac = &globals->adapt;
-
-+ globals->sysstyle = 0;
- if((lst = dir_list(PROC_ACPI "ac_adapter")) == NULL || !lst->top)
-- return NOT_SUPPORTED;
--
-+ {
-+ if((lst = dir_list(SYS_POWER "/AC")) == NULL || !lst->top)
-+ return NOT_SUPPORTED;
-+ else
-+ globals->sysstyle = 1;
-+ }
- if((!lst->top->name || ((ac->name = strdup(lst->top->name)) == NULL))){
- delete_list(lst);
- return ALLOC_ERR;
- }
-- snprintf(ac->state_file, MAX_NAME, PROC_ACPI "ac_adapter/%s/state", ac->name);
-+ if(globals->sysstyle)
-+ snprintf(ac->state_file, MAX_NAME, SYS_POWER "/AC/online");
-+ else
-+ snprintf(ac->state_file, MAX_NAME, PROC_ACPI "ac_adapter/%s/state", ac->name);
- delete_list(lst);
- read_acpi_acstate(globals);
- return SUCCESS;
-@@ -450,7 +486,7 @@
-
- /* read alarm capacity, return 0 on success, negative values on error */
- static int
--read_acpi_battalarm(const int num){
-+read_acpi_battalarm(const int num, const int sysstyle){
- char *buf = NULL;
- char *tmp = NULL;
- battery_t *info = &batteries[num];
-@@ -458,10 +494,22 @@
- if((buf = get_acpi_content(info->alarm_file)) == NULL)
- return NOT_SUPPORTED;
-
-- if((tmp = scan_acpi_value(buf, "alarm:")) && tmp[0] != 'u')
-- info->alarm = strtol(tmp, NULL, 10);
-+ if(sysstyle)
-+ {
-+ if(!strcmp(buf, "0"))
-+ info->alarm = 0;
-+ else if(!strcmp(buf, "1"))
-+ info->alarm = 1;
-+ else
-+ info->alarm = NOT_SUPPORTED;
-+ }
- else
-- info->alarm = NOT_SUPPORTED;
-+ {
-+ if((tmp = scan_acpi_value(buf, "alarm:")) && tmp[0] != 'u')
-+ info->alarm = strtol(tmp, NULL, 10);
-+ else
-+ info->alarm = NOT_SUPPORTED;
-+ }
- free(buf);
- free(tmp);
- return SUCCESS;
-@@ -469,11 +517,58 @@
-
- /* reads static values for a battery (info file), returns SUCCESS */
- static int
--read_acpi_battinfo(const int num){
-+read_acpi_battinfo(const int num, const int sysstyle){
- char *buf = NULL;
- char *tmp = NULL;
- battery_t *info = &batteries[num];
- int i = 0;
-+ char sysfile[MAX_NAME];
-+
-+ if(sysstyle)
-+ {
-+ snprintf(sysfile, MAX_NAME, "%s/present", info->info_file);
-+ if((buf = get_acpi_content(sysfile)) == NULL)
-+ return NOT_SUPPORTED;
-+ if(!strcmp(buf, "1")) {
-+ info->present = 1;
-+ } else {
-+ info->present = 0;
-+ return NOT_PRESENT;
-+ }
-+
-+ snprintf(sysfile, MAX_NAME, "%s/charge_full_design", info->info_file);
-+ if((buf = get_acpi_content(sysfile)) == NULL)
-+ return NOT_SUPPORTED;
-+ info->design_cap = strtol(buf, NULL, 10);
-+
-+ snprintf(sysfile, MAX_NAME, "%s/charge_full", info->info_file);
-+ if((buf = get_acpi_content(sysfile)) == NULL)
-+ return NOT_SUPPORTED;
-+ info->last_full_cap = strtol(buf, NULL, 10);
-+
-+ snprintf(sysfile, MAX_NAME, "%s/charge_now", info->info_file);
-+ if((buf = get_acpi_content(sysfile)) == NULL)
-+ return NOT_SUPPORTED;
-+ info->remaining_cap = strtol(buf, NULL, 10);
-+
-+ snprintf(sysfile, MAX_NAME, "%s/voltage_min_design", info->info_file);
-+ if((buf = get_acpi_content(sysfile)) == NULL)
-+ return NOT_SUPPORTED;
-+ info->design_voltage = strtol(buf, NULL, 10);
-+
-+ snprintf(sysfile, MAX_NAME, "%s/voltage_now", info->info_file);
-+ if((buf = get_acpi_content(sysfile)) == NULL)
-+ return NOT_SUPPORTED;
-+ info->present_voltage = strtol(buf, NULL, 10);
-+
-+ /* FIXME: is rate == current here? */
-+ snprintf(sysfile, MAX_NAME, "%s/current_now", info->info_file);
-+ if((buf = get_acpi_content(sysfile)) == NULL)
-+ return NOT_SUPPORTED;
-+ info->present_rate = strtol(buf, NULL, 10);
-+
-+ return SUCCESS;
-+ }
-
- if((buf = get_acpi_content(info->info_file)) == NULL)
- return NOT_SUPPORTED;
-@@ -608,7 +703,7 @@
- read_acpi_batt(const int num){
- if(num > MAX_ITEMS) return ITEM_EXCEED;
- read_acpi_battstate(num);
-- read_acpi_battalarm(num);
-+ read_acpi_battalarm(num, 0);
- calc_remain_perc(num);
- calc_remain_chargetime(num);
- calc_remain_time(num);
-diff -Naur libacpi-0.2-orig/libacpi.h libacpi-0.2/libacpi.h
---- libacpi-0.2-orig/libacpi.h 2007-07-29 14:09:34.000000000 +0200
-+++ libacpi-0.2/libacpi.h 2008-08-02 10:41:11.000000000 +0200
-@@ -12,6 +12,8 @@
- #define __LIBACPI_H__
-
- #define PROC_ACPI "/proc/acpi/"
-+#define SYS_POWER "/sys/class/power_supply"
-+
- #define LINE_MAX 256
- #define MAX_NAME 512
- #define MAX_BUF 1024
-@@ -177,6 +179,7 @@
- int fan_count; /**< number of found fans */
- int temperature; /**< system temperature if we only have on thermal zone */
- adapter_t adapt; /**< ac adapter */
-+ int sysstyle;
- } global_t;
-
- /**
-@@ -239,6 +242,7 @@
- * Looks up if the ac adapter is plugged in or not
- * and sets the values in a struct
- * @param globals pointer to the global acpi structure
-+ * @param sysstyle whether or not to use the /sys interface
- */
- void read_acpi_acstate(global_t *globals);
- /**
-diff -Naur libacpi-0.2-orig/test-libacpi.c libacpi-0.2/test-libacpi.c
---- libacpi-0.2-orig/test-libacpi.c 2007-07-29 14:09:34.000000000 +0200
-+++ libacpi-0.2/test-libacpi.c 2008-08-02 10:41:11.000000000 +0200
-@@ -46,6 +46,7 @@
- read_acpi_batt(i);
-
- if(binfo->present)
-+ {
- printf("\n%s:\tpresent: %d\n"
- "\tdesign capacity: %d\n"
- "\tlast full capacity: %d\n"
-@@ -65,6 +66,9 @@
- binfo->batt_state, binfo->percentage,
- binfo->charge_time / 60, binfo->charge_time % 60,
- binfo->remaining_time / 60, binfo->remaining_time % 60);
-+ if(binfo->alarm)
-+ printf("%s: Alarm!\n", binfo->name);
-+ }
- }
- } else printf("Battery information:\tnot supported\n");
-
diff --git a/libacpi-0.2.patch b/libacpi-0.2.patch
deleted file mode 100644
index a993095..0000000
--- a/libacpi-0.2.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -Naur libacpi-0.2.orig/Makefile libacpi-0.2/Makefile
---- libacpi-0.2.orig/Makefile 2007-07-29 14:09:34.000000000 +0200
-+++ libacpi-0.2/Makefile 2008-05-06 23:09:14.000000000 +0200
-@@ -40,25 +40,23 @@
- install: all
- @echo installing header to ${DESTDIR}${PREFIX}/include
- @mkdir -p ${DESTDIR}${PREFIX}/include
-- @cp -f libacpi.h ${DESTDIR}${PREFIX}/include
-+ @cp -f -p libacpi.h ${DESTDIR}${PREFIX}/include
- @chmod 644 ${DESTDIR}${PREFIX}/include/libacpi.h
-- @echo installing library to ${DESTDIR}${PREFIX}/lib
-- @mkdir -p ${DESTDIR}${PREFIX}/lib
-- @cp -f libacpi.a ${DESTDIR}${PREFIX}/lib
-- @chmod 644 ${DESTDIR}${PREFIX}/lib/libacpi.a
-- @cp -f ${SONAME} ${DESTDIR}${PREFIX}/lib/
-- @chmod 644 ${DESTDIR}${PREFIX}/lib/${SONAME}
-- @ln -s ${SONAME} ${DESTDIR}${PREFIX}/lib/libacpi.so
-+ @echo installing library to ${DESTDIR}${LIBDIR}
-+ @mkdir -p ${DESTDIR}${LIBDIR}
-+ @cp -f -p ${SONAME} ${DESTDIR}${LIBDIR}/
-+ @chmod 644 ${DESTDIR}${LIBDIR}/${SONAME}
-+ @ln -s ${SONAME} ${DESTDIR}${LIBDIR}/libacpi.so
- @echo installing test-libacpi to ${DESTDIR}${PREFIX}/bin
- @mkdir -p ${DESTDIR}${PREFIX}/bin
-- @cp -f test-libacpi ${DESTDIR}${PREFIX}/bin
-+ @cp -f -p test-libacpi ${DESTDIR}${PREFIX}/bin
- @chmod 755 ${DESTDIR}${PREFIX}/bin/test-libacpi
- @echo installing manual page to ${DESTDIR}${MANPREFIX}/man3
- @mkdir -p ${DESTDIR}${MANPREFIX}/man3
-- @cp libacpi.3 ${DESTDIR}${MANPREFIX}/man3
-+ @cp -p libacpi.3 ${DESTDIR}${MANPREFIX}/man3
- @echo installing documentation and misc files to ${DESTDIR}${PREFIX}/share/doc/libacpi
- @mkdir -p ${DESTDIR}${PREFIX}/share/doc/libacpi
-- @cp -r AUTHORS CHANGES README LICENSE doc ${DESTDIR}${PREFIX}/share/doc/libacpi
-+ @cp -r -p AUTHORS CHANGES README LICENSE doc ${DESTDIR}${PREFIX}/share/doc/libacpi
- @echo finished installation
-
- uninstall:
diff --git a/libacpi.spec b/libacpi.spec
deleted file mode 100644
index 4ad2bf0..0000000
--- a/libacpi.spec
+++ /dev/null
@@ -1,168 +0,0 @@
-Name: libacpi
-Version: 0.2
-Release: 33%{?dist}
-Summary: General purpose library for ACPI
-
-License: MIT
-URL: http://www.ngolde.de/libacpi.html
-Source0: http://www.ngolde.de/download/%{name}-%{version}.tar.gz
-Patch0: %{name}-%{version}.patch
-Patch1: %{name}-%{version}-sysfs.patch
-ExcludeArch: ppc ppc64
-
-%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
-
-BuildRequires: gcc
-%description
-libacpi is a general purpose shared library for programs gathering
-ACPI data on Linux. Features: Thermal zones support, Battery support,
-Fan support, AC support
-
-Note: This is no portable code, it will only run on i386/x86_64 Linux systems.
-
-%package devel
-Summary: Development files for %{name}
-Requires: %{name} = %{version}-%{release}
-
-%description devel
-The %{name}-devel package contains libraries and header files for
-developing applications that use %{name}.
-
-
-%prep
-%setup -q
-%patch0 -p1
-%patch1 -p1
-sed -i "s|CFLAGS += .*|CFLAGS += -fPIC $RPM_OPT_FLAGS|;s&usr/local&usr&" config.mk
-sed -i "s&\${PREFIX}/share/doc/%{name}&%{_pkgdocdir}&g" Makefile
-
-
-%build
-make %{?_smp_mflags}
-
-
-%install
-make install DESTDIR=$RPM_BUILD_ROOT LIBDIR=%_libdir
-chmod +x $RPM_BUILD_ROOT%{_libdir}/%{name}.so.*
-find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
-
-
-%ldconfig_scriptlets
-
-
-%files
-%{_mandir}/man3/*
-%dir %{_pkgdocdir}
-%doc %{_pkgdocdir}/AUTHORS
-%doc %{_pkgdocdir}/CHANGES
-%doc %{_pkgdocdir}/README
-%doc %{_pkgdocdir}/LICENSE
-%{_libdir}/*.so.*
-
-%files devel
-%dir %{_pkgdocdir}/doc
-%doc %{_pkgdocdir}/doc/*
-%{_bindir}/test-libacpi
-%{_includedir}/*
-%{_libdir}/*.so
-
-
-%changelog
-* Wed Jan 29 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.2-33
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.2-32
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Fri Feb 01 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.2-31
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.2-30
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.2-29
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Thu Aug 03 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.2-28
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.2-27
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Fri Feb 10 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.2-26
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Thu Feb 04 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.2-25
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Fri Jun 19 2015 Ralf Corspius <corsepiu(a)fedoraproject.org> - 0.2-24
-- Use '|' instead of '/' as sed-pattern delimiter (Fix FTBFS).
-- Modernize spec file.
-
-* Wed Jun 17 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.2-23
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Sun Aug 17 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.2-22
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-
-* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.2-21
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Thu Dec 05 2013 Ralf Corspius <corsepiu(a)fedoraproject.org> - 0.2-20
-- Install docs into %%_pkgdocdir (RHBZ#993954).
-
-* Sat Aug 03 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.2-19
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Thu Feb 14 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.2-18
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Thu Jul 19 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.2-17
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Fri Jan 13 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.2-16
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Mon Feb 07 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.2-15
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.2-14
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.2-13
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Tue Aug 19 2008 Sven Lankes <sven(a)lank.es> - 0.2-12
-- Add ExcludeArch for ppc/ppc64
-
-* Sat Aug 2 2008 Sven Lankes <sven(a)lank.es> - 0.2-11
-- redo sysfs patch to apply without fuzz
-- fix patch invocation
-
-* Mon Jul 7 2008 slankes <sven(a)lank.es> - 0.2-10
-- minor specfile-tweaks
-
-* Thu May 8 2008 slankes <sven(a)lank.es> - 0.2-9
-- save docs in name-version instead of name
-
-* Thu May 8 2008 slankes <sven(a)lank.es> - 0.2-8
-- add missing docdir
-
-* Tue May 6 2008 slankes <sven(a)lank.es> - 0.2-7
-- patch Makefile to preserve timestamps
-- only use sed to mangle config.mk
-- add patch from debian-package to use sysfs for battery readout
- needs at least kernel 2.6.24
-
-* Mon May 5 2008 slankes <sven(a)lank.es> - 0.2-6
-- Mark library as executable so that rpmbuild will strip it
-- replace upstream CFLAGS
-
-* Mon May 5 2008 slankes <sven(a)lank.es> - 0.2-5
-- Various SPECFILE cleanups
-- Remove .a
-- do not strip library
-
-* Sat May 3 2008 slankes <sven(a)lank.es> - 0.2-4
-- First version of the package
-
diff --git a/sources b/sources
deleted file mode 100644
index 89563cc..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-05b53dd7bead66dda35fec502b91066c libacpi-0.2.tar.gz
4 years
Architecture specific change in rpms/libacpi.git
by githook-noreply@fedoraproject.org
The package rpms/libacpi.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/libacpi.git/commit/?id=64f08f327f....
Change:
-ExcludeArch: ppc ppc64
Thanks.
Full change:
============
commit 64f08f327ff45e4b8887be6ab1fed9a8cfea8679
Author: Sven Lankes <slankes(a)fedoraproject.org>
Date: Tue Apr 14 17:14:32 2020 +0200
upstream is dead, no longer works with modern kernels
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 53f712b..0000000
--- a/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-libacpi-0.2.tar.gz
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..ca545ce
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+upstream is dead, no longer works with modern kernels
diff --git a/libacpi-0.2-sysfs.patch b/libacpi-0.2-sysfs.patch
deleted file mode 100644
index 52fd463..0000000
--- a/libacpi-0.2-sysfs.patch
+++ /dev/null
@@ -1,265 +0,0 @@
-diff -Naur libacpi-0.2-orig/libacpi.c libacpi-0.2/libacpi.c
---- libacpi-0.2-orig/libacpi.c 2007-07-29 14:09:34.000000000 +0200
-+++ libacpi-0.2/libacpi.c 2008-08-02 10:41:11.000000000 +0200
-@@ -14,8 +14,9 @@
- #include "libacpi.h"
- #include "list.h"
-
--static int read_acpi_battinfo(const int num);
--static int read_acpi_battalarm(const int num);
-+
-+static int read_acpi_battinfo(const int num, const int sysstyle);
-+static int read_acpi_battalarm(const int num, const int sysstyle);
- static int read_acpi_battstate(const int num);
- static void read_acpi_thermalzones(global_t *globals);
-
-@@ -144,8 +145,15 @@
- int i = 0;
-
- globals->batt_count = 0;
-+ globals->sysstyle = 0;
- if((lst = dir_list(PROC_ACPI "battery")) == NULL || !lst->top)
-- return NOT_SUPPORTED;
-+ {
-+ /* check for new Linux 2.6.24+ layout */
-+ if((lst = dir_list(SYS_POWER)) == NULL || !lst->top)
-+ return NOT_SUPPORTED;
-+ else
-+ globals->sysstyle = 1;
-+ }
- for(node = lst->top; node; node=node->next){
- if((names[globals->batt_count] = strdup(node->name)) == NULL){
- delete_list(lst);
-@@ -174,11 +182,20 @@
- for (i=0; i < globals->batt_count && i < MAX_ITEMS; i++){
- binfo = &batteries[i];
- snprintf(binfo->name, MAX_NAME, "%s", names[i]);
-- snprintf(binfo->state_file, MAX_NAME, PROC_ACPI "battery/%s/state", names[i]);
-- snprintf(binfo->info_file, MAX_NAME, PROC_ACPI "battery/%s/info", names[i]);
-- snprintf(binfo->alarm_file, MAX_NAME, PROC_ACPI "battery/%s/alarm", names[i]);
-- read_acpi_battinfo(i);
-- read_acpi_battalarm(i);
-+ if(globals->sysstyle)
-+ {
-+ snprintf(binfo->state_file, MAX_NAME, "/%s/present", names[i]);
-+ snprintf(binfo->info_file, MAX_NAME, SYS_POWER "/%s", names[i]);
-+ snprintf(binfo->alarm_file, MAX_NAME, SYS_POWER "/%s/alarm", names[i]);
-+ }
-+ else
-+ {
-+ snprintf(binfo->state_file, MAX_NAME, PROC_ACPI "battery/%s/state", names[i]);
-+ snprintf(binfo->info_file, MAX_NAME, PROC_ACPI "battery/%s/info", names[i]);
-+ snprintf(binfo->alarm_file, MAX_NAME, PROC_ACPI "battery/%s/alarm", names[i]);
-+ }
-+ read_acpi_battinfo(i, globals->sysstyle);
-+ read_acpi_battalarm(i, globals->sysstyle);
- free(names[i]);
- }
- delete_list(lst);
-@@ -196,11 +213,22 @@
- ac->ac_state = P_ERR;
- return;
- }
-- if((tmp = scan_acpi_value(buf, "state:")) && !strncmp(tmp, "on-line", 7))
-- ac->ac_state = P_AC;
-- else if(tmp && !strncmp(tmp, "off-line", 8))
-- ac->ac_state = P_BATT;
-- else ac->ac_state = P_ERR;
-+ if(globals->sysstyle)
-+ {
-+ if(!strcmp(buf, "1"))
-+ ac->ac_state = P_AC;
-+ else if(!strcmp(buf, "0"))
-+ ac->ac_state = P_BATT;
-+ else ac->ac_state = P_ERR;
-+ }
-+ else
-+ {
-+ if((tmp = scan_acpi_value(buf, "state:")) && !strncmp(tmp, "on-line", 7))
-+ ac->ac_state = P_AC;
-+ else if(tmp && !strncmp(tmp, "off-line", 8))
-+ ac->ac_state = P_BATT;
-+ else ac->ac_state = P_ERR;
-+ }
- free(buf);
- free(tmp);
- }
-@@ -212,14 +240,22 @@
- list_t *lst = NULL;
- adapter_t *ac = &globals->adapt;
-
-+ globals->sysstyle = 0;
- if((lst = dir_list(PROC_ACPI "ac_adapter")) == NULL || !lst->top)
-- return NOT_SUPPORTED;
--
-+ {
-+ if((lst = dir_list(SYS_POWER "/AC")) == NULL || !lst->top)
-+ return NOT_SUPPORTED;
-+ else
-+ globals->sysstyle = 1;
-+ }
- if((!lst->top->name || ((ac->name = strdup(lst->top->name)) == NULL))){
- delete_list(lst);
- return ALLOC_ERR;
- }
-- snprintf(ac->state_file, MAX_NAME, PROC_ACPI "ac_adapter/%s/state", ac->name);
-+ if(globals->sysstyle)
-+ snprintf(ac->state_file, MAX_NAME, SYS_POWER "/AC/online");
-+ else
-+ snprintf(ac->state_file, MAX_NAME, PROC_ACPI "ac_adapter/%s/state", ac->name);
- delete_list(lst);
- read_acpi_acstate(globals);
- return SUCCESS;
-@@ -450,7 +486,7 @@
-
- /* read alarm capacity, return 0 on success, negative values on error */
- static int
--read_acpi_battalarm(const int num){
-+read_acpi_battalarm(const int num, const int sysstyle){
- char *buf = NULL;
- char *tmp = NULL;
- battery_t *info = &batteries[num];
-@@ -458,10 +494,22 @@
- if((buf = get_acpi_content(info->alarm_file)) == NULL)
- return NOT_SUPPORTED;
-
-- if((tmp = scan_acpi_value(buf, "alarm:")) && tmp[0] != 'u')
-- info->alarm = strtol(tmp, NULL, 10);
-+ if(sysstyle)
-+ {
-+ if(!strcmp(buf, "0"))
-+ info->alarm = 0;
-+ else if(!strcmp(buf, "1"))
-+ info->alarm = 1;
-+ else
-+ info->alarm = NOT_SUPPORTED;
-+ }
- else
-- info->alarm = NOT_SUPPORTED;
-+ {
-+ if((tmp = scan_acpi_value(buf, "alarm:")) && tmp[0] != 'u')
-+ info->alarm = strtol(tmp, NULL, 10);
-+ else
-+ info->alarm = NOT_SUPPORTED;
-+ }
- free(buf);
- free(tmp);
- return SUCCESS;
-@@ -469,11 +517,58 @@
-
- /* reads static values for a battery (info file), returns SUCCESS */
- static int
--read_acpi_battinfo(const int num){
-+read_acpi_battinfo(const int num, const int sysstyle){
- char *buf = NULL;
- char *tmp = NULL;
- battery_t *info = &batteries[num];
- int i = 0;
-+ char sysfile[MAX_NAME];
-+
-+ if(sysstyle)
-+ {
-+ snprintf(sysfile, MAX_NAME, "%s/present", info->info_file);
-+ if((buf = get_acpi_content(sysfile)) == NULL)
-+ return NOT_SUPPORTED;
-+ if(!strcmp(buf, "1")) {
-+ info->present = 1;
-+ } else {
-+ info->present = 0;
-+ return NOT_PRESENT;
-+ }
-+
-+ snprintf(sysfile, MAX_NAME, "%s/charge_full_design", info->info_file);
-+ if((buf = get_acpi_content(sysfile)) == NULL)
-+ return NOT_SUPPORTED;
-+ info->design_cap = strtol(buf, NULL, 10);
-+
-+ snprintf(sysfile, MAX_NAME, "%s/charge_full", info->info_file);
-+ if((buf = get_acpi_content(sysfile)) == NULL)
-+ return NOT_SUPPORTED;
-+ info->last_full_cap = strtol(buf, NULL, 10);
-+
-+ snprintf(sysfile, MAX_NAME, "%s/charge_now", info->info_file);
-+ if((buf = get_acpi_content(sysfile)) == NULL)
-+ return NOT_SUPPORTED;
-+ info->remaining_cap = strtol(buf, NULL, 10);
-+
-+ snprintf(sysfile, MAX_NAME, "%s/voltage_min_design", info->info_file);
-+ if((buf = get_acpi_content(sysfile)) == NULL)
-+ return NOT_SUPPORTED;
-+ info->design_voltage = strtol(buf, NULL, 10);
-+
-+ snprintf(sysfile, MAX_NAME, "%s/voltage_now", info->info_file);
-+ if((buf = get_acpi_content(sysfile)) == NULL)
-+ return NOT_SUPPORTED;
-+ info->present_voltage = strtol(buf, NULL, 10);
-+
-+ /* FIXME: is rate == current here? */
-+ snprintf(sysfile, MAX_NAME, "%s/current_now", info->info_file);
-+ if((buf = get_acpi_content(sysfile)) == NULL)
-+ return NOT_SUPPORTED;
-+ info->present_rate = strtol(buf, NULL, 10);
-+
-+ return SUCCESS;
-+ }
-
- if((buf = get_acpi_content(info->info_file)) == NULL)
- return NOT_SUPPORTED;
-@@ -608,7 +703,7 @@
- read_acpi_batt(const int num){
- if(num > MAX_ITEMS) return ITEM_EXCEED;
- read_acpi_battstate(num);
-- read_acpi_battalarm(num);
-+ read_acpi_battalarm(num, 0);
- calc_remain_perc(num);
- calc_remain_chargetime(num);
- calc_remain_time(num);
-diff -Naur libacpi-0.2-orig/libacpi.h libacpi-0.2/libacpi.h
---- libacpi-0.2-orig/libacpi.h 2007-07-29 14:09:34.000000000 +0200
-+++ libacpi-0.2/libacpi.h 2008-08-02 10:41:11.000000000 +0200
-@@ -12,6 +12,8 @@
- #define __LIBACPI_H__
-
- #define PROC_ACPI "/proc/acpi/"
-+#define SYS_POWER "/sys/class/power_supply"
-+
- #define LINE_MAX 256
- #define MAX_NAME 512
- #define MAX_BUF 1024
-@@ -177,6 +179,7 @@
- int fan_count; /**< number of found fans */
- int temperature; /**< system temperature if we only have on thermal zone */
- adapter_t adapt; /**< ac adapter */
-+ int sysstyle;
- } global_t;
-
- /**
-@@ -239,6 +242,7 @@
- * Looks up if the ac adapter is plugged in or not
- * and sets the values in a struct
- * @param globals pointer to the global acpi structure
-+ * @param sysstyle whether or not to use the /sys interface
- */
- void read_acpi_acstate(global_t *globals);
- /**
-diff -Naur libacpi-0.2-orig/test-libacpi.c libacpi-0.2/test-libacpi.c
---- libacpi-0.2-orig/test-libacpi.c 2007-07-29 14:09:34.000000000 +0200
-+++ libacpi-0.2/test-libacpi.c 2008-08-02 10:41:11.000000000 +0200
-@@ -46,6 +46,7 @@
- read_acpi_batt(i);
-
- if(binfo->present)
-+ {
- printf("\n%s:\tpresent: %d\n"
- "\tdesign capacity: %d\n"
- "\tlast full capacity: %d\n"
-@@ -65,6 +66,9 @@
- binfo->batt_state, binfo->percentage,
- binfo->charge_time / 60, binfo->charge_time % 60,
- binfo->remaining_time / 60, binfo->remaining_time % 60);
-+ if(binfo->alarm)
-+ printf("%s: Alarm!\n", binfo->name);
-+ }
- }
- } else printf("Battery information:\tnot supported\n");
-
diff --git a/libacpi-0.2.patch b/libacpi-0.2.patch
deleted file mode 100644
index a993095..0000000
--- a/libacpi-0.2.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -Naur libacpi-0.2.orig/Makefile libacpi-0.2/Makefile
---- libacpi-0.2.orig/Makefile 2007-07-29 14:09:34.000000000 +0200
-+++ libacpi-0.2/Makefile 2008-05-06 23:09:14.000000000 +0200
-@@ -40,25 +40,23 @@
- install: all
- @echo installing header to ${DESTDIR}${PREFIX}/include
- @mkdir -p ${DESTDIR}${PREFIX}/include
-- @cp -f libacpi.h ${DESTDIR}${PREFIX}/include
-+ @cp -f -p libacpi.h ${DESTDIR}${PREFIX}/include
- @chmod 644 ${DESTDIR}${PREFIX}/include/libacpi.h
-- @echo installing library to ${DESTDIR}${PREFIX}/lib
-- @mkdir -p ${DESTDIR}${PREFIX}/lib
-- @cp -f libacpi.a ${DESTDIR}${PREFIX}/lib
-- @chmod 644 ${DESTDIR}${PREFIX}/lib/libacpi.a
-- @cp -f ${SONAME} ${DESTDIR}${PREFIX}/lib/
-- @chmod 644 ${DESTDIR}${PREFIX}/lib/${SONAME}
-- @ln -s ${SONAME} ${DESTDIR}${PREFIX}/lib/libacpi.so
-+ @echo installing library to ${DESTDIR}${LIBDIR}
-+ @mkdir -p ${DESTDIR}${LIBDIR}
-+ @cp -f -p ${SONAME} ${DESTDIR}${LIBDIR}/
-+ @chmod 644 ${DESTDIR}${LIBDIR}/${SONAME}
-+ @ln -s ${SONAME} ${DESTDIR}${LIBDIR}/libacpi.so
- @echo installing test-libacpi to ${DESTDIR}${PREFIX}/bin
- @mkdir -p ${DESTDIR}${PREFIX}/bin
-- @cp -f test-libacpi ${DESTDIR}${PREFIX}/bin
-+ @cp -f -p test-libacpi ${DESTDIR}${PREFIX}/bin
- @chmod 755 ${DESTDIR}${PREFIX}/bin/test-libacpi
- @echo installing manual page to ${DESTDIR}${MANPREFIX}/man3
- @mkdir -p ${DESTDIR}${MANPREFIX}/man3
-- @cp libacpi.3 ${DESTDIR}${MANPREFIX}/man3
-+ @cp -p libacpi.3 ${DESTDIR}${MANPREFIX}/man3
- @echo installing documentation and misc files to ${DESTDIR}${PREFIX}/share/doc/libacpi
- @mkdir -p ${DESTDIR}${PREFIX}/share/doc/libacpi
-- @cp -r AUTHORS CHANGES README LICENSE doc ${DESTDIR}${PREFIX}/share/doc/libacpi
-+ @cp -r -p AUTHORS CHANGES README LICENSE doc ${DESTDIR}${PREFIX}/share/doc/libacpi
- @echo finished installation
-
- uninstall:
diff --git a/libacpi.spec b/libacpi.spec
deleted file mode 100644
index 4ad2bf0..0000000
--- a/libacpi.spec
+++ /dev/null
@@ -1,168 +0,0 @@
-Name: libacpi
-Version: 0.2
-Release: 33%{?dist}
-Summary: General purpose library for ACPI
-
-License: MIT
-URL: http://www.ngolde.de/libacpi.html
-Source0: http://www.ngolde.de/download/%{name}-%{version}.tar.gz
-Patch0: %{name}-%{version}.patch
-Patch1: %{name}-%{version}-sysfs.patch
-ExcludeArch: ppc ppc64
-
-%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
-
-BuildRequires: gcc
-%description
-libacpi is a general purpose shared library for programs gathering
-ACPI data on Linux. Features: Thermal zones support, Battery support,
-Fan support, AC support
-
-Note: This is no portable code, it will only run on i386/x86_64 Linux systems.
-
-%package devel
-Summary: Development files for %{name}
-Requires: %{name} = %{version}-%{release}
-
-%description devel
-The %{name}-devel package contains libraries and header files for
-developing applications that use %{name}.
-
-
-%prep
-%setup -q
-%patch0 -p1
-%patch1 -p1
-sed -i "s|CFLAGS += .*|CFLAGS += -fPIC $RPM_OPT_FLAGS|;s&usr/local&usr&" config.mk
-sed -i "s&\${PREFIX}/share/doc/%{name}&%{_pkgdocdir}&g" Makefile
-
-
-%build
-make %{?_smp_mflags}
-
-
-%install
-make install DESTDIR=$RPM_BUILD_ROOT LIBDIR=%_libdir
-chmod +x $RPM_BUILD_ROOT%{_libdir}/%{name}.so.*
-find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
-
-
-%ldconfig_scriptlets
-
-
-%files
-%{_mandir}/man3/*
-%dir %{_pkgdocdir}
-%doc %{_pkgdocdir}/AUTHORS
-%doc %{_pkgdocdir}/CHANGES
-%doc %{_pkgdocdir}/README
-%doc %{_pkgdocdir}/LICENSE
-%{_libdir}/*.so.*
-
-%files devel
-%dir %{_pkgdocdir}/doc
-%doc %{_pkgdocdir}/doc/*
-%{_bindir}/test-libacpi
-%{_includedir}/*
-%{_libdir}/*.so
-
-
-%changelog
-* Wed Jan 29 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.2-33
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.2-32
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Fri Feb 01 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.2-31
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.2-30
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.2-29
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Thu Aug 03 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.2-28
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.2-27
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Fri Feb 10 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.2-26
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Thu Feb 04 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.2-25
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Fri Jun 19 2015 Ralf Corspius <corsepiu(a)fedoraproject.org> - 0.2-24
-- Use '|' instead of '/' as sed-pattern delimiter (Fix FTBFS).
-- Modernize spec file.
-
-* Wed Jun 17 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.2-23
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Sun Aug 17 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.2-22
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-
-* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.2-21
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Thu Dec 05 2013 Ralf Corspius <corsepiu(a)fedoraproject.org> - 0.2-20
-- Install docs into %%_pkgdocdir (RHBZ#993954).
-
-* Sat Aug 03 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.2-19
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Thu Feb 14 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.2-18
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Thu Jul 19 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.2-17
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Fri Jan 13 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.2-16
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Mon Feb 07 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.2-15
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.2-14
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.2-13
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Tue Aug 19 2008 Sven Lankes <sven(a)lank.es> - 0.2-12
-- Add ExcludeArch for ppc/ppc64
-
-* Sat Aug 2 2008 Sven Lankes <sven(a)lank.es> - 0.2-11
-- redo sysfs patch to apply without fuzz
-- fix patch invocation
-
-* Mon Jul 7 2008 slankes <sven(a)lank.es> - 0.2-10
-- minor specfile-tweaks
-
-* Thu May 8 2008 slankes <sven(a)lank.es> - 0.2-9
-- save docs in name-version instead of name
-
-* Thu May 8 2008 slankes <sven(a)lank.es> - 0.2-8
-- add missing docdir
-
-* Tue May 6 2008 slankes <sven(a)lank.es> - 0.2-7
-- patch Makefile to preserve timestamps
-- only use sed to mangle config.mk
-- add patch from debian-package to use sysfs for battery readout
- needs at least kernel 2.6.24
-
-* Mon May 5 2008 slankes <sven(a)lank.es> - 0.2-6
-- Mark library as executable so that rpmbuild will strip it
-- replace upstream CFLAGS
-
-* Mon May 5 2008 slankes <sven(a)lank.es> - 0.2-5
-- Various SPECFILE cleanups
-- Remove .a
-- do not strip library
-
-* Sat May 3 2008 slankes <sven(a)lank.es> - 0.2-4
-- First version of the package
-
diff --git a/sources b/sources
deleted file mode 100644
index 89563cc..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-05b53dd7bead66dda35fec502b91066c libacpi-0.2.tar.gz
4 years
Architecture specific change in rpms/oci-seccomp-bpf-hook.git
by githook-noreply@fedoraproject.org
The package rpms/oci-seccomp-bpf-hook.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/oci-seccomp-bpf-hook.git/commit/?....
Change:
+ExclusiveArch: x86_64 %{power64} aarch64 s390x
Thanks.
Full change:
============
commit 020a994cd650d1c6b77a88d0bd92e35057a8f705
Author: Lokesh Mandvekar <lsm5(a)fedoraproject.org>
Date: Tue Apr 14 10:51:08 2020 -0400
enhances podman and cri-o
Signed-off-by: Lokesh Mandvekar <lsm5(a)fedoraproject.org>
diff --git a/oci-seccomp-bpf-hook.spec b/oci-seccomp-bpf-hook.spec
index 73f3609..928c488 100644
--- a/oci-seccomp-bpf-hook.spec
+++ b/oci-seccomp-bpf-hook.spec
@@ -27,7 +27,7 @@
%global shortcommit0 %(c=%{commit0}; echo ${c:0:8})
# bcc is built only for these arches
-ExclusiveArch: x86_64 %{power64} aarch64 s390x
+ExclusiveArch: x86_64 %{power64} aarch64 s390x
Name: oci-seccomp-bpf-hook
Version: 0.0.1
@@ -37,8 +37,8 @@ License: ASL 2.0
URL: %{git0}
Source0: %{git0}/archive/%{commit0}/%{repo}-%{shortcommit0}.tar.gz
# If go_compiler is not set to 1, there is no virtual provide. Use golang instead.
-BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang}
-BuildRequires: golang-github-cpuguy83-md2man
+BuildRequires: golang
+BuildRequires: go-md2man
BuildRequires: glib2-devel
BuildRequires: glibc-devel
BuildRequires: bcc-devel
@@ -46,6 +46,8 @@ BuildRequires: git
BuildRequires: gpgme-devel
BuildRequires: libseccomp-devel
BuildRequires: make
+Enhances: podman
+Enhances: cri-o
%description
%{summary}
@@ -53,7 +55,7 @@ BuildRequires: make
the Container Pod concept popularized by Kubernetes.
%package remote
-Summary: Remote Oci-Seccomp-Bpf client
+Summary: Remote Oci-Seccomp-Bpf client
%description remote
%{summary}
4 years