- Merge libudev-devel into systemd-devel

OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1236

baselibs.conf

@@ -8,6 +8,5 @@ systemd
   post "<prefix>%{_sbindir}/pam-config -a --systemd || :"
 libsystemd0
 libudev1
-libudev-devel
 nss-myhostname
 nss-mymachines

systemd.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Jan 27 10:50:50 UTC 2022 - Franck Bui <fbui@suse.com>
+
+- Merge libudev-devel into systemd-devel
+
 -------------------------------------------------------------------
 Thu Jan 27 07:50:07 UTC 2022 - Franck Bui <fbui@suse.com>
 

systemd.spec

@@ -191,6 +191,7 @@ Source200:      files.systemd
 Source201:      files.udev
 Source202:      files.container
 Source203:      files.network
+Source204:      files.devel
 
 # Patches listed below are SUSE specific and should be kept at its
 # minimum. We try hard to push our changes to upstream but sometimes
@@ -235,16 +236,23 @@ Supplements:    (systemd and patterns-base-documentation)
 The HTML documentation for systemd.
 
 %package devel
-Summary:        Development headers for systemd
+Summary:        Development files for libsystemd and libudev
 License:        LGPL-2.1-or-later
 Requires:       libsystemd0%{?mini} = %{version}-%{release}
+Requires:       libudev%{?mini}1 = %{version}-%{release}
 Requires:       systemd-rpm-macros
+Provides:       libudev%{?mini}-devel = %{version}-%{release}
+Obsoletes:      libudev%{?mini}-devel < %{version}-%{release}
 %if 0%{?bootstrap}
+Provides:       systemd-devel = %{version}-%{release}
 Conflicts:      systemd-devel
+Provides:       libudev-devel = %{version}-%{release}
+Conflicts:      libudev-devel
 %endif
 
 %description devel
-Development headers and auxiliary files for developing applications for systemd.
+Development headers and files for libsystemd and libudev libraries. These files
+are useful for developing applications linking to these libraries.
 
 %package sysvinit
 Summary:        System V init tools
@@ -335,20 +343,6 @@ Requires:       this-is-only-for-build-envs
 This package contains the dynamic library libudev, which provides
 access to udev device information
 
-%package -n libudev%{?mini}-devel
-Summary:        Development files for libudev
-License:        LGPL-2.1-or-later
-Requires:       libudev%{?mini}1 = %{version}-%{release}
-%if 0%{?bootstrap}
-Provides:       libudev-devel = %{version}-%{version}
-Conflicts:      libudev-devel
-Conflicts:      libudev1 = %{version}
-%endif
-
-%description -n libudev%{?mini}-devel
-This package contains the development files for the library libudev, a
-dynamic library, which provides access to udev device information.
-
 %if %{with coredump}
 %package coredump
 Summary:        Systemd tools for coredump management
@@ -1283,13 +1277,8 @@ fi
 
 %files devel
 %defattr(-,root,root,-)
-%{_libdir}/libsystemd.so
-%{_libdir}/pkgconfig/libsystemd.pc
-%{_includedir}/systemd/
-%if ! 0%{?bootstrap}
-%{_mandir}/man3/SD*.3*
-%{_mandir}/man3/sd*.3*
-%endif
+%license LICENSE.LGPL2.1
+%include %{SOURCE204}
 
 %files sysvinit
 %defattr(-,root,root,-)
@@ -1325,23 +1314,16 @@ fi
 
 %files -n libsystemd0%{?mini}
 %defattr(-,root,root)
+%license LICENSE.LGPL2.1
 %{_libdir}/libsystemd.so.0
 %{_libdir}/libsystemd.so.0.32.0
 
 %files -n libudev%{?mini}1
 %defattr(-,root,root)
+%license LICENSE.LGPL2.1
 %{_libdir}/libudev.so.1
 %{_libdir}/libudev.so.1.7.2
 
-%files -n libudev%{?mini}-devel
-%defattr(-,root,root)
-%{_includedir}/libudev.h
-%{_libdir}/libudev.so
-%{_libdir}/pkgconfig/libudev.pc
-%if ! 0%{?bootstrap}
-%{_mandir}/man3/*udev*.3*
-%endif
-
 %if %{with coredump}
 %files coredump
 %defattr(-,root,root)