7f4276 move more binaries and services from the main package to subpackages

Authored and Committed by Harald Hoyer 8 years ago
1 file changed. 69 lines added. 9 lines removed.
    move more binaries and services from the main package to subpackages
    
        
file modified
+69 -9
systemd.spec CHANGED
@@ -13,7 +13,7 @@
13
13
Name: systemd
14
14
Url: http://www.freedesktop.org/wiki/Software/systemd
15
15
Version: 229
16
- Release: 10%{?gitcommit:.git%{gitcommitshort}}%{?dist}
16
+ Release: 11%{?gitcommit:.git%{gitcommitshort}}%{?dist}
17
17
# For a breakdown of the licensing, see README
18
18
License: LGPLv2+ and MIT and GPLv2+
19
19
Summary: A System and Service Manager
@@ -722,8 +722,6 @@ getent passwd systemd-journal-upload >/dev/null 2>&1 || useradd -r -l -g systemd
722
722
%{_bindir}/hostnamectl
723
723
%{_bindir}/localectl
724
724
%{_bindir}/timedatectl
725
- %{_bindir}/bootctl
726
- %{_bindir}/kernel-install
727
725
%{pkgdir}/systemd
728
726
%{system_unit_dir}
729
727
%{pkgdir}/user
@@ -759,6 +757,9 @@ getent passwd systemd-journal-upload >/dev/null 2>&1 || useradd -r -l -g systemd
759
757
%exclude %{system_unit_dir}/*/systemd-modules-load.service
760
758
%exclude %{system_unit_dir}/systemd-modules-load.service
761
759
%exclude %{system_unit_dir}/systemd-timesyncd.service
760
+ %exclude %{system_unit_dir}/systemd-hibernate-resume@.service
761
+ %exclude %{system_unit_dir}/systemd-hibernate.service
762
+ %exclude %{system_unit_dir}/systemd-nspawn@.service
762
763
%exclude %{pkgdir}/systemd-udevd
763
764
%exclude %{pkgdir}/systemd-vconsole-setup
764
765
%exclude %{pkgdir}/systemd-machined
@@ -774,6 +775,9 @@ getent passwd systemd-journal-upload >/dev/null 2>&1 || useradd -r -l -g systemd
774
775
%exclude %{pkgdir}/systemd-quotacheck
775
776
%exclude %{pkgdir}/systemd-modules-load
776
777
%exclude %{pkgdir}/systemd-timesyncd
778
+ %exclude %{pkgdir}/systemd-cryptsetup
779
+ %exclude %{pkgdir}/systemd-hibernate-resume
780
+ %exclude %{pkgdir}/systemd-sleep
777
781
778
782
%{pkgdir}/systemd-*
779
783
%{_prefix}/lib/tmpfiles.d/systemd.conf
@@ -804,6 +808,27 @@ getent passwd systemd-journal-upload >/dev/null 2>&1 || useradd -r -l -g systemd
804
808
%{_mandir}/man5/*
805
809
%{_mandir}/man7/*
806
810
%{_mandir}/man8/*
811
+
812
+ %exclude %{_mandir}/man*/*udev*
813
+ %exclude %{_mandir}/man*/*hwdb*
814
+ %exclude %{_mandir}/man*/systemd-tmpfiles-setup-dev.service*
815
+ %exclude %{_mandir}/man*/systemd-journal-gateway*
816
+ %exclude %{_mandir}/man*/*journal-remote.*
817
+ %exclude %{_mandir}/man*/*modules-load.*
818
+ %exclude %{_mandir}/man*/*timesyncd.*
819
+ %exclude %{_mandir}/man*/systemd-hibernate*
820
+ %exclude %{_mandir}/man*/systemd-nspawn.*
821
+ %exclude %{_mandir}/man*/systemd-vconsole-setup*
822
+ %exclude %{_mandir}/man*/systemd-machined*
823
+ %exclude %{_mandir}/man*/systemd-journal-remote*
824
+ %exclude %{_mandir}/man*/systemd-journal-upload*
825
+ %exclude %{_mandir}/man*/systemd-backlight*
826
+ %exclude %{_mandir}/man*/systemd-rfkill*
827
+ %exclude %{_mandir}/man*/systemd-random-seed*
828
+ %exclude %{_mandir}/man*/systemd-quotacheck*
829
+ %exclude %{_mandir}/man*/systemd-cryptsetup*
830
+ %exclude %{_mandir}/man*/systemd-sleep*
831
+
807
832
%{_datadir}/factory/etc/nsswitch.conf
808
833
%{_datadir}/factory/etc/pam.d/other
809
834
%{_datadir}/factory/etc/pam.d/system-auth
@@ -829,18 +854,14 @@ getent passwd systemd-journal-upload >/dev/null 2>&1 || useradd -r -l -g systemd
829
854
%{_datadir}/bash-completion/completions/*
830
855
%exclude %{_datadir}/bash-completion/completions/udevadm
831
856
%exclude %{_datadir}/bash-completion/completions/machinectl
857
+ %exclude %{_datadir}/bash-completion/completions/systemd-nspawn
832
858
%{_datadir}/zsh/site-functions/*
833
859
%exclude %{_datadir}/zsh/site-functions/_udevadm
834
860
%exclude %{_datadir}/zsh/site-functions/_machinectl
861
+ %exclude %{_datadir}/zsh/site-functions/_systemd-nspawn
835
862
%{pkgdir}/catalog/systemd.*.catalog
836
863
%{pkgdir}/network/80-container-host0.network
837
864
%{pkgdir}/network/80-container-ve.network
838
- %ifarch %{ix86} x86_64 aarch64
839
- %dir %{pkgdir}/boot
840
- %dir %{pkgdir}/boot/efi
841
- %{pkgdir}/boot/efi/*.efi
842
- %{pkgdir}/boot/efi/*.stub
843
- %endif
844
865
845
866
%ghost %dir %{_localstatedir}/lib/rpm-state/systemd
846
867
@@ -910,9 +931,13 @@ getent passwd systemd-journal-upload >/dev/null 2>&1 || useradd -r -l -g systemd
910
931
%{system_unit_dir}/*/systemd-modules-load.service
911
932
%{system_unit_dir}/systemd-modules-load.service
912
933
%{system_unit_dir}/systemd-timesyncd.service
934
+ %{system_unit_dir}/systemd-hibernate-resume@.service
935
+ %{system_unit_dir}/systemd-hibernate.service
913
936
%{_bindir}/udevadm
914
937
%{_sbindir}/udevadm
915
938
%{_bindir}/systemd-hwdb
939
+ %{_bindir}/bootctl
940
+ %{_bindir}/kernel-install
916
941
%{pkgdir}/systemd-udevd
917
942
%{pkgdir}/systemd-vconsole-setup
918
943
%{pkgdir}/systemd-backlight
@@ -921,6 +946,9 @@ getent passwd systemd-journal-upload >/dev/null 2>&1 || useradd -r -l -g systemd
921
946
%{pkgdir}/systemd-quotacheck
922
947
%{pkgdir}/systemd-modules-load
923
948
%{pkgdir}/systemd-timesyncd
949
+ %{pkgdir}/systemd-cryptsetup
950
+ %{pkgdir}/systemd-hibernate-resume
951
+ %{pkgdir}/systemd-sleep
924
952
925
953
%{pkgdir}/network/99-default.link
926
954
%{_prefix}/lib/udev
@@ -931,6 +959,28 @@ getent passwd systemd-journal-upload >/dev/null 2>&1 || useradd -r -l -g systemd
931
959
%{pkgdir}/system-generators/systemd-hibernate-resume-generator
932
960
%config(noreplace) %{_sysconfdir}/systemd/timesyncd.conf
933
961
962
+ %ifarch %{ix86} x86_64 aarch64
963
+ %dir %{pkgdir}/boot
964
+ %dir %{pkgdir}/boot/efi
965
+ %{pkgdir}/boot/efi/*.efi
966
+ %{pkgdir}/boot/efi/*.stub
967
+ %endif
968
+
969
+ %{_mandir}/man[1578]/*udev*
970
+ %{_mandir}/man[1578]/*hwdb*
971
+ %{_mandir}/man[1578]/systemd-tmpfiles-setup-dev.service*
972
+ %{_mandir}/man[1578]/*modules-load.*
973
+ %{_mandir}/man[1578]/*timesyncd.*
974
+ %{_mandir}/man[1578]/systemd-hibernate*
975
+ %{_mandir}/man[1578]/systemd-nspawn.*
976
+ %{_mandir}/man[1578]/systemd-vconsole-setup*
977
+ %{_mandir}/man[1578]/systemd-backlight*
978
+ %{_mandir}/man[1578]/systemd-rfkill*
979
+ %{_mandir}/man[1578]/systemd-random-seed*
980
+ %{_mandir}/man[1578]/systemd-quotacheck*
981
+ %{_mandir}/man[1578]/systemd-cryptsetup*
982
+ %{_mandir}/man[1578]/systemd-sleep*
983
+
934
984
%files container
935
985
%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.machine1.conf
936
986
%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.import1.conf
@@ -949,6 +999,7 @@ getent passwd systemd-journal-upload >/dev/null 2>&1 || useradd -r -l -g systemd
949
999
%{system_unit_dir}/machines.target
950
1000
%{system_unit_dir}/var-lib-machines.mount
951
1001
%{system_unit_dir}/*/var-lib-machines.mount
1002
+ %{system_unit_dir}/systemd-nspawn@.service
952
1003
%{pkgdir}/systemd-journal-gatewayd
953
1004
%{pkgdir}/systemd-journal-remote
954
1005
%{pkgdir}/systemd-journal-upload
@@ -961,7 +1012,10 @@ getent passwd systemd-journal-upload >/dev/null 2>&1 || useradd -r -l -g systemd
961
1012
%{_datadir}/polkit-1/actions/org.freedesktop.import1.policy
962
1013
%{_datadir}/polkit-1/actions/org.freedesktop.machine1.policy
963
1014
%{_datadir}/bash-completion/completions/machinectl
1015
+ %{_datadir}/bash-completion/completions/systemd-nspawn
964
1016
%{_datadir}/zsh/site-functions/_machinectl
1017
+ %{_datadir}/zsh/site-functions/_systemd-nspawn
1018
+ %{_mandir}/man[1578]/systemd-machined*
965
1019
966
1020
%files journal-remote
967
1021
%config(noreplace) %{_sysconfdir}/systemd/journal-remote.conf
@@ -977,8 +1031,14 @@ getent passwd systemd-journal-upload >/dev/null 2>&1 || useradd -r -l -g systemd
977
1031
%dir %attr(0644,systemd-journal-upload,systemd-journal-upload) %{_localstatedir}/lib/systemd/journal-upload
978
1032
%{_datadir}/systemd/gatewayd
979
1033
/usr/lib/firewalld/services/*
1034
+ %{_mandir}/man[1578]/*journal-remote.*
1035
+ %{_mandir}/man[1578]/systemd-journal-upload*
1036
+ %{_mandir}/man[1578]/systemd-journal-gateway*
980
1037
981
1038
%changelog
1039
+ * Mon Apr 18 2016 Harald Hoyer <harald@redhat.com> - 229-11
1040
+ - move more binaries and services from the main package to subpackages
1041
+
982
1042
* Mon Apr 18 2016 Harald Hoyer <harald@redhat.com> - 229-10
983
1043
- move device dependant stuff to the udev subpackage
984
1044