From 8a35765de50512d55a64ceec0c8ef95e7095f564b13169f35b83b43091eecf3f Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Fri, 25 Jul 2014 07:31:27 +0000 Subject: [PATCH 1/3] Accepting request 242233 from home:dsterba:branches:Base:System SR: the static packages should not be used normally, but can be used by standalone rescue utilities (planned for btrfsprogs). - enable build of libmount-devel-static, libuuid-devel-static and libblkid-devel-static OBS-URL: https://build.opensuse.org/request/show/242233 OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=244 --- util-linux.changes | 6 ++++++ util-linux.spec | 40 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 45 insertions(+), 1 deletion(-) diff --git a/util-linux.changes b/util-linux.changes index cd771a6..eadf225 100644 --- a/util-linux.changes +++ b/util-linux.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Jul 24 18:45:53 CEST 2014 - dsterba@suse.cz + +- enable build of libmount-devel-static, libuuid-devel-static and + libblkid-devel-static + ------------------------------------------------------------------- Tue May 27 21:17:40 UTC 2014 - sweet_f_a@gmx.de diff --git a/util-linux.spec b/util-linux.spec index 42dc9a1..1d821aa 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -192,6 +192,15 @@ Requires: libblkid1 = %{version} Files needed to develop applications using the library for filesystem detection. +%package -n libblkid-devel-static +Summary: Development files for the filesystem detection library +Group: Development/Libraries/C and C++ +Requires: libblkid1 = %{version} + +%description -n libblkid-devel-static +Files needed to develop applications using the library for filesystem +detection. + %package -n uuidd Summary: Helper daemon to guarantee uniqueness of time-based UUIDs Group: System/Filesystems @@ -221,6 +230,15 @@ Requires: libuuid1 = %{version} Files to develop applications using the library to generate universally unique IDs (UUIDs). +%package -n libuuid-devel-static +Summary: Development files for libuuid1 +Group: Development/Libraries/C and C++ +Requires: libuuid-devel-static + +%description -n libuuid-devel-static +Files to develop applications using the library to generate universally +unique IDs (UUIDs). + %package -n libmount1 Summary: Device mount library Group: System/Filesystems @@ -237,6 +255,14 @@ Requires: libmount1 = %{version} %description -n libmount-devel Files to develop applications using the libmount library. +%package -n libmount-devel-static +Summary: Development files for libmount1 +Group: Development/Libraries/C and C++ +Requires: libmount-devel + +%description -n libmount-devel-static +Files to develop applications using the libmount library. + %lang_package %prep %if 0%{?VERIFY_SIG} @@ -340,7 +366,7 @@ export SUID_LDFLAGS="-pie" --disable-kill \ %endif --disable-use-tty-group \ - --disable-static \ + --enable-static \ --disable-silent-rules \ --disable-rpath # @@ -917,6 +943,10 @@ fi %{_libdir}/pkgconfig/blkid.pc %{_mandir}/man3/libblkid.3.gz +%files -n libblkid-devel-static +%defattr(-, root, root) +%{_libdir}/libblkid.a + %files -n libmount1 %defattr(-, root, root) /%{_libdir}/libmount.so.1 @@ -929,6 +959,10 @@ fi %{_includedir}/libmount/libmount.h %{_libdir}/pkgconfig/mount.pc +%files -n libmount-devel-static +%defattr(-, root, root) +%{_libdir}/libmount.a + %files -n uuidd %defattr(-, root, root) %verify(not mode) %attr(0755,root,root) %{_sbindir}/uuidd @@ -954,4 +988,8 @@ fi %{_libdir}/pkgconfig/uuid.pc %{_mandir}/man3/uuid* +%files -n libuuid-devel-static +%defattr(-, root, root) +%{_libdir}/libuuid.a + %changelog From 8470bfdd479739f07de7e1e72af8804500fa6593805bad6ed1e21ca806a99f31 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Sat, 26 Jul 2014 09:39:46 +0000 Subject: [PATCH 2/3] - fix requires of devel-static packages OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=245 --- util-linux.changes | 5 +++++ util-linux.spec | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/util-linux.changes b/util-linux.changes index eadf225..19ef51e 100644 --- a/util-linux.changes +++ b/util-linux.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Jul 26 09:39:30 UTC 2014 - coolo@suse.com + +- fix requires of devel-static packages + ------------------------------------------------------------------- Thu Jul 24 18:45:53 CEST 2014 - dsterba@suse.cz diff --git a/util-linux.spec b/util-linux.spec index 1d821aa..1b835fd 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -233,7 +233,7 @@ unique IDs (UUIDs). %package -n libuuid-devel-static Summary: Development files for libuuid1 Group: Development/Libraries/C and C++ -Requires: libuuid-devel-static +Requires: libuuid-devel = %{version} %description -n libuuid-devel-static Files to develop applications using the library to generate universally @@ -258,7 +258,7 @@ Files to develop applications using the libmount library. %package -n libmount-devel-static Summary: Development files for libmount1 Group: Development/Libraries/C and C++ -Requires: libmount-devel +Requires: libmount-devel = %{version} %description -n libmount-devel-static Files to develop applications using the libmount library. From ed823ddc3745478c680ab3e4c4bb6b3660e5b6b27bef582317327819dbb6cd3a Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Sat, 26 Jul 2014 11:53:59 +0000 Subject: [PATCH 3/3] Accepting request 242479 from home:dimstar:branches:Base:System Really fix it OBS-URL: https://build.opensuse.org/request/show/242479 OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=246 --- util-linux.changes | 5 +++++ util-linux.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/util-linux.changes b/util-linux.changes index 19ef51e..2936f09 100644 --- a/util-linux.changes +++ b/util-linux.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Jul 26 11:44:57 UTC 2014 - dimstar@opensuse.org + +- Really fix devel-static requires (libblkid-devel-static). + ------------------------------------------------------------------- Sat Jul 26 09:39:30 UTC 2014 - coolo@suse.com diff --git a/util-linux.spec b/util-linux.spec index 1b835fd..d42cffa 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -195,7 +195,7 @@ detection. %package -n libblkid-devel-static Summary: Development files for the filesystem detection library Group: Development/Libraries/C and C++ -Requires: libblkid1 = %{version} +Requires: libblkid-devel = %{version} %description -n libblkid-devel-static Files needed to develop applications using the library for filesystem