From 91a85fcfcbb830eba5ca9486851c2014f7e61dfd2e657d94dcb2588a81eeefc8 Mon Sep 17 00:00:00 2001 From: Lee Duncan Date: Tue, 1 Jun 2021 21:09:45 +0000 Subject: [PATCH 1/3] Accepting request 896777 from home:lee_duncan:branches:Base:System - Updated to version 2.1.1 from upstream, mostly build changes. Also, updated the SPEC file to match, and removed a patch that is no longer needed. OBS-URL: https://build.opensuse.org/request/show/896777 OBS-URL: https://build.opensuse.org/package/show/Base:System/sysfsutils?expand=0&rev=24 --- _service | 9 ++---- sysfsutils-2_1_1.tar.gz | 3 ++ sysfsutils-latest-changes.diff.gz | 3 -- sysfsutils-sysfsutils-2_1_0.tar.gz | 3 -- sysfsutils.changes | 46 ++++++++++++++++++++++++++++++ sysfsutils.spec | 25 ++++++++-------- 6 files changed, 63 insertions(+), 26 deletions(-) create mode 100644 sysfsutils-2_1_1.tar.gz delete mode 100644 sysfsutils-latest-changes.diff.gz delete mode 100644 sysfsutils-sysfsutils-2_1_0.tar.gz diff --git a/_service b/_service index 1d22e63..cd79ddb 100644 --- a/_service +++ b/_service @@ -2,12 +2,7 @@ https github.com - sysfsutils-sysfsutils-2_1_0.tar.gz - linux-ras/sysfsutils/archive/sysfsutils-2_1_0.tar.gz - - - sysfsutils-sysfsutils-2_1_0.tar.gz - sha256 - 035cd517c2465fa86e4f82d035ae5817d9a8b23ba2ba42fe623eb36d3d9b973f + sysfsutils-2_1_1.tar.gz + linux-ras/sysfsutils/archive/refs/tags/v2.1.1.tar.gz diff --git a/sysfsutils-2_1_1.tar.gz b/sysfsutils-2_1_1.tar.gz new file mode 100644 index 0000000..6682f10 --- /dev/null +++ b/sysfsutils-2_1_1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f7f669d27c997d3eb3f3e014b4c0aa1aa4d07ce4d6f9e41fa835240f2bf38810 +size 78823 diff --git a/sysfsutils-latest-changes.diff.gz b/sysfsutils-latest-changes.diff.gz deleted file mode 100644 index d5e28ed..0000000 --- a/sysfsutils-latest-changes.diff.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d40b0f1b906e3e99609797b9f56afcf189f21ccb0e1e5fd2fa1872381b1b18ab -size 95536 diff --git a/sysfsutils-sysfsutils-2_1_0.tar.gz b/sysfsutils-sysfsutils-2_1_0.tar.gz deleted file mode 100644 index 3c20d72..0000000 --- a/sysfsutils-sysfsutils-2_1_0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:035cd517c2465fa86e4f82d035ae5817d9a8b23ba2ba42fe623eb36d3d9b973f -size 398079 diff --git a/sysfsutils.changes b/sysfsutils.changes index e5f937b..7b92815 100644 --- a/sysfsutils.changes +++ b/sysfsutils.changes @@ -1,3 +1,49 @@ +------------------------------------------------------------------- +Tue Jun 1 18:52:15 UTC 2021 - Lee Duncan + +- Updated to version 2.1.1 from upstream, mostly build changes, + including: + * Bump the release version in missing file + * sysfsutils: bump to version 2.1.1 + * build: update the bug reporting URL to github + * Build: remove Changelog and NEWS files + * build: don't fail on missing standard files + * Rename dprintf() debugging macro do debugprintf() + * build: Fix out-of-tree builds + * build: Move test program into check_PROGRAMS + * build: Add silent rule support for test.h generation + * build: Add a pkg-config file + * test/libsysfs.conf: remove the obsolete build requirement + * build: Add missing dependencies for test.h + * build: Remove unused configure macros + * build: Use = instead of == in test + * Check that sysfs is actually mounted in sysfs_get_mnt_path() and fail if not + * test: Fix formatting + * man: Improve systool(1) man page + * build: Add support for specifying the pci.ids database pathname + * build: Include "config.h" as the first header in all source files + * build: Build the testlibsysfs program + * build: Enable silent build rules + * build: Quote m4 macro arguments + * build: Use AC_CONFIG_HEADERS instead of deprecated AM_CONFIG_HEADER + * build: Update libtool support + * build: Use *_CPPFLAGS instead of deprecated INCLUDES variables + * build: Update gitignore files + * build: Remove autogenerated files + * build: Remove obsolete CVS support in dist-hook + * build: Add new script to bootstrap the source + * build: Add missing declaration for m4 macro directory + * lib/sysfs_class: fix build failure reported on GCC-11 + * TravisCI: enable build test + * fix bug in sysfs_get_link - RHBZ #447220/Debian Bug #481015 + * use gnu.org license files to correct addresses etc + * GPLv2 applies not just to test dir + This removed the need for sysfsutils-latest-changes.diff.gz, since + all of the changes in that diff were from upstream, and we have + the latest from upstream, which has all of those fixes. +- Updated the SPEC file to add build requirements, change files + delivered, etc, as needed by this new version of sysfs utilities. + ------------------------------------------------------------------- Fri Jul 10 15:52:03 UTC 2020 - Lee Duncan diff --git a/sysfsutils.spec b/sysfsutils.spec index 036e2f2..8dff7d7 100644 --- a/sysfsutils.spec +++ b/sysfsutils.spec @@ -1,7 +1,7 @@ # # spec file for package sysfsutils # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,18 +20,15 @@ Name: sysfsutils Summary: System Utilities Package / Libsysfs License: LGPL-2.1-or-later Group: System/Libraries -Version: 2.1.0 +Version: 2.1.1 Release: 0 URL: https://github.com/linux-ras/sysfsutils -Source: %{name}-sysfsutils-2_1_0.tar.gz -Source2: baselibs.conf -Patch1: sysfsutils-latest-changes.diff.gz +Source: sysfsutils-2_1_1.tar.gz Provides: libsysfs -# bug437293 -%ifarch ppc64 -Obsoletes: sysfsutils-64bit -%endif -# +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: libtool +BuildRequires: make BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -62,11 +59,11 @@ for the current users, but no new software should use this library. This package contains the development files for libsysfs. %prep -%setup -n sysfsutils-sysfsutils-2_1_0 -%patch1 -p1 +%setup -n sysfsutils-2.1.1 %build %global optflags %{optflags} -fcommon +autoreconf -fi %configure --disable-static --with-pic %{__make} %{?_smp_mflags} @@ -92,7 +89,9 @@ rm -rf $RPM_BUILD_ROOT /usr/bin/systool %{_mandir}/man1/systool.1.gz %{_libdir}/libsysfs.so.* -%doc README ChangeLog +%{_libdir}/pkgconfig/libsysfs.pc +%doc README +%license COPYING %files devel %defattr(-,root,root) From 2866e38643eb593f3455d3c5329c47b024feb2a05d7ed26c5b8650ab503ac93f Mon Sep 17 00:00:00 2001 From: Lee Duncan Date: Tue, 1 Jun 2021 21:20:13 +0000 Subject: [PATCH 2/3] Accepting request 896779 from home:lee_duncan:branches:Base:System removed baselibs.conf from SPEC file and package: not used. OBS-URL: https://build.opensuse.org/request/show/896779 OBS-URL: https://build.opensuse.org/package/show/Base:System/sysfsutils?expand=0&rev=25 --- baselibs.conf | 1 - sysfsutils.changes | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 baselibs.conf diff --git a/baselibs.conf b/baselibs.conf deleted file mode 100644 index df5bd36..0000000 --- a/baselibs.conf +++ /dev/null @@ -1 +0,0 @@ -sysfsutils diff --git a/sysfsutils.changes b/sysfsutils.changes index 7b92815..5235528 100644 --- a/sysfsutils.changes +++ b/sysfsutils.changes @@ -43,6 +43,7 @@ Tue Jun 1 18:52:15 UTC 2021 - Lee Duncan the latest from upstream, which has all of those fixes. - Updated the SPEC file to add build requirements, change files delivered, etc, as needed by this new version of sysfs utilities. + Also, removed baselibs.conf from SPEC file and package: not used. ------------------------------------------------------------------- Fri Jul 10 15:52:03 UTC 2020 - Lee Duncan From ef898bcffd64d2bcc1595b11c856233e1be41e6472ea8ad26a874cc10f91acba Mon Sep 17 00:00:00 2001 From: Lee Duncan Date: Fri, 4 Jun 2021 00:29:31 +0000 Subject: [PATCH 3/3] Accepting request 896933 from home:jengelh:branches:Base:System - Drop old rpm constructs and sections. - Implement shared library packaging guideline. OBS-URL: https://build.opensuse.org/request/show/896933 OBS-URL: https://build.opensuse.org/package/show/Base:System/sysfsutils?expand=0&rev=26 --- sysfsutils.changes | 6 ++++++ sysfsutils.spec | 51 ++++++++++++++++++++++------------------------ 2 files changed, 30 insertions(+), 27 deletions(-) diff --git a/sysfsutils.changes b/sysfsutils.changes index 5235528..36c1b77 100644 --- a/sysfsutils.changes +++ b/sysfsutils.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jun 2 13:57:08 UTC 2021 - Jan Engelhardt + +- Drop old rpm constructs and sections. +- Implement shared library packaging guideline. + ------------------------------------------------------------------- Tue Jun 1 18:52:15 UTC 2021 - Lee Duncan diff --git a/sysfsutils.spec b/sysfsutils.spec index 8dff7d7..37cce50 100644 --- a/sysfsutils.spec +++ b/sysfsutils.spec @@ -17,11 +17,11 @@ Name: sysfsutils -Summary: System Utilities Package / Libsysfs -License: LGPL-2.1-or-later -Group: System/Libraries Version: 2.1.1 Release: 0 +Summary: System Utilities Package / Libsysfs +License: LGPL-2.1-or-later +Group: Development/Libraries/C and C++ URL: https://github.com/linux-ras/sysfsutils Source: sysfsutils-2_1_1.tar.gz Provides: libsysfs @@ -29,7 +29,6 @@ BuildRequires: autoconf BuildRequires: automake BuildRequires: libtool BuildRequires: make -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description This package's purpose is to provide a library for interfacing with the @@ -37,21 +36,23 @@ kernel's sys filesystem mounted at /sys. The library was an attempt to create a stable interface to sysfs, but it failed. It is still provided for the current users, but no new software should use this library. +%package -n libsysfs2 +Summary: Library for interfacing with the kernel's sysfs filesystem +Group: System/Libraries - -Authors: --------- - Ananth Mavinakayanahalli - Daniel Stekloff - Mohan Kumar +%description -n libsysfs2 +This package's purpose is to provide a library for interfacing with the +kernel's sys filesystem mounted at /sys. The library was an attempt to +create a stable interface to sysfs, but it failed. It is still provided +for the current users, but no new software should use this library. %package devel Summary: Development files for libsysfs Group: Development/Libraries/C and C++ -Requires: %{name} = %{version} +Requires: libsysfs2 = %{version} %description devel -Libsysfs' purpose is to provide a library for interfacing with the +Libsysfs's purpose is to provide a library for interfacing with the kernel's sys filesystem mounted at /sys. The library was an attempt to create a stable interface to sysfs, but it failed. It is still provided for the current users, but no new software should use this library. @@ -59,17 +60,17 @@ for the current users, but no new software should use this library. This package contains the development files for libsysfs. %prep -%setup -n sysfsutils-2.1.1 +%autosetup -p1 %build %global optflags %{optflags} -fcommon autoreconf -fi -%configure --disable-static --with-pic -%{__make} %{?_smp_mflags} +%configure --disable-static +%make_build %install -make install DESTDIR=%{buildroot} -%{__rm} -v %{buildroot}/%{_libdir}/libsysfs.la +%make_install +rm -v %{buildroot}/%{_libdir}/libsysfs.la # don't install the tools rm -f %{buildroot}/%{_bindir}/dlist_test rm -f %{buildroot}/%{_bindir}/get_device @@ -77,27 +78,23 @@ rm -f %{buildroot}/%{_bindir}/get_driver rm -f %{buildroot}/%{_bindir}/get_module rm -f %{buildroot}/%{_bindir}/testlibsysfs -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig - -%clean -rm -rf $RPM_BUILD_ROOT +%post -n libsysfs2 -p /sbin/ldconfig +%postun -n libsysfs2 -p /sbin/ldconfig %files -%defattr(-,root,root) -/usr/bin/systool +%{_bindir}/systool %{_mandir}/man1/systool.1.gz + +%files -n libsysfs2 %{_libdir}/libsysfs.so.* -%{_libdir}/pkgconfig/libsysfs.pc %doc README %license COPYING %files devel -%defattr(-,root,root) %dir %{_includedir}/sysfs %{_includedir}/sysfs/libsysfs.h %{_includedir}/sysfs/dlist.h %{_libdir}/libsysfs.so +%{_libdir}/pkgconfig/libsysfs.pc %changelog