Hello community, here is the log from the commit of package systemd for openSUSE:Factory checked in at 2012-02-21 07:32:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/systemd (Old) and /work/SRC/openSUSE:Factory/.systemd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "systemd", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/systemd/systemd-gtk.changes 2012-02-16 16:24:06.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.systemd.new/systemd-gtk.changes 2012-02-21 07:32:52.000000000 +0100 @@ -1,0 +2,6 @@ +Sun Feb 19 07:56:05 UTC 2012 - jengelh@medozas.de + +- Use pkgconfig symbols for BuildRequires and specify version +- Add missing kmod BuildRequires for systemd-gtk + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/systemd/systemd.changes 2012-02-16 16:24:07.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.systemd.new/systemd.changes 2012-02-21 07:32:52.000000000 +0100 @@ -1,0 +2,12 @@ +Sun Feb 19 07:56:05 UTC 2012 - jengelh@medozas.de + +- Use pkgconfig symbols for BuildRequires and specify version + +------------------------------------------------------------------- +Fri Feb 17 09:22:50 UTC 2012 - tittiatcoke@gmail.com + +- Enable Plymouth integration. + * Bootsplash related files will be moved to the bootsplash + package + +------------------------------------------------------------------- Old: ---- bootsplash-quit.service bootsplash-shutdown.service bootsplash-startup.service systemd-bootsplash ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ systemd-gtk.spec ++++++ --- /var/tmp/diff_new_pack.TeTps3/_old 2012-02-21 07:32:55.000000000 +0100 +++ /var/tmp/diff_new_pack.TeTps3/_new 2012-02-21 07:32:55.000000000 +0100 @@ -15,33 +15,34 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - Name: systemd-gtk Url: http://www.freedesktop.org/wiki/Software/systemd Version: 42 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: audit-devel -BuildRequires: dbus-1-devel -BuildRequires: glib2-devel BuildRequires: gperf -BuildRequires: gtk2-devel BuildRequires: intltool BuildRequires: libacl-devel BuildRequires: libcap-devel -BuildRequires: libcryptsetup-devel -BuildRequires: libgee-devel -BuildRequires: libnotify-devel -BuildRequires: libselinux-devel -BuildRequires: libsepol-devel BuildRequires: libtool -BuildRequires: libudev-devel BuildRequires: pam-devel BuildRequires: pkg-config BuildRequires: tcpd-devel BuildRequires: udev BuildRequires: xz -BuildRequires: xz-devel +BuildRequires: pkgconfig(dbus-1) >= 1.5.2 +BuildRequires: pkgconfig(gee-1.0) +BuildRequires: pkgconfig(gio-unix-2.0) +BuildRequires: pkgconfig(glib-2.0) > 2.26 +BuildRequires: pkgconfig(gtk+-2.0) +BuildRequires: pkgconfig(libcryptsetup) +BuildRequires: pkgconfig(libkmod) >= 5 +BuildRequires: pkgconfig(liblzma) +BuildRequires: pkgconfig(libnotify) +BuildRequires: pkgconfig(libselinux) +BuildRequires: pkgconfig(libsepol) +BuildRequires: pkgconfig(udev) >= 172 Summary: Graphical front-end for systemd License: GPL-2.0+ Group: System/Base ++++++ systemd.spec ++++++ --- /var/tmp/diff_new_pack.TeTps3/_old 2012-02-21 07:32:55.000000000 +0100 +++ /var/tmp/diff_new_pack.TeTps3/_new 2012-02-21 07:32:55.000000000 +0100 @@ -15,9 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - -%define build_plymouth 0 - #don't require python, use recommends (bnc#716939) Name: systemd @@ -29,26 +26,26 @@ Group: System/Base BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: audit-devel -BuildRequires: dbus-1-devel BuildRequires: docbook-xsl-stylesheets BuildRequires: fdupes BuildRequires: gperf BuildRequires: intltool BuildRequires: libacl-devel BuildRequires: libcap-devel -BuildRequires: libcryptsetup-devel -BuildRequires: libkmod-devel -BuildRequires: libselinux-devel -BuildRequires: libsepol-devel BuildRequires: libtool -BuildRequires: libudev-devel BuildRequires: libxslt1 BuildRequires: pam-devel BuildRequires: pkg-config BuildRequires: tcpd-devel BuildRequires: udev BuildRequires: xz -BuildRequires: xz-devel +BuildRequires: pkgconfig(dbus-1) >= 1.3.2 +BuildRequires: pkgconfig(libcryptsetup) +BuildRequires: pkgconfig(libkmod) >= 5 +BuildRequires: pkgconfig(liblzma) +BuildRequires: pkgconfig(libselinux) +BuildRequires: pkgconfig(libsepol) +BuildRequires: pkgconfig(udev) >= 172 Requires: udev >= 172 Requires: dbus-1 >= 1.4.0 Requires: kbd @@ -65,10 +62,6 @@ Source4: macros.systemd Source5: systemd-insserv_conf Source6: baselibs.conf -Source7: systemd-bootsplash -Source8: bootsplash-startup.service -Source9: bootsplash-quit.service -Source10: bootsplash-shutdown.service # Stop-gap, just to ensure things work fine with rsyslog without having to change the package right-away Source11: listen.conf Patch1: 0001-Add-bootsplash-handling-for-password-dialogs.patch @@ -125,8 +118,6 @@ %description sysvinit Drop-in replacement of System V init tools. -%if %{build_plymouth} - %package plymouth Summary: Plymouth support for systemd Group: System/Base @@ -135,7 +126,6 @@ %description plymouth Plymouth integration for systemd -%endif %prep %setup -q @@ -187,12 +177,6 @@ install -m755 %{S:3} -D %{buildroot}%{_sbindir}/systemd-sysv-convert # do not install, code has been fixed, might be useful in the future #install -m755 %{S:5} %{buildroot}/lib/systemd/system-generators -install -m755 %{S:7} %{buildroot}/lib/systemd/ -install -m644 %{S:8} %{S:9} %{S:10} %{buildroot}/lib/systemd/system/ -ln -s ../bootsplash-startup.service %{buildroot}/lib/systemd/system/basic.target.wants/ -ln -s ../bootsplash-quit.service %{buildroot}/lib/systemd/system/multi-user.target.wants/ -ln -s ../bootsplash-shutdown.service %{buildroot}/lib/systemd/system/shutdown.target.wants/ -ln -s ../bootsplash-shutdown.service %{buildroot}/lib/systemd/system/reboot.target.wants/ ln -s ../lib/systemd/systemd %{buildroot}/bin/systemd ln -s ../lib/systemd/systemd %{buildroot}/sbin/init ln -s ../bin/systemctl %{buildroot}/sbin/reboot @@ -203,11 +187,8 @@ ln -s ../bin/systemctl %{buildroot}/sbin/runlevel rm -rf %{buildroot}/etc/systemd/system/*.target.wants rm -f %{buildroot}/etc/systemd/system/default.target -%if !%{build_plymouth} -rm -f %{buildroot}/lib/systemd/system/plymouth-*.service -rm -f %{buildroot}/lib/systemd/system/*.wants/plymouth-*.service -rm -f %{buildroot}/lib/systemd/system/systemd-ask-password-plymouth.* -%endif +# Don't activate the plymouth-quit services in order to get a smooth transistion to the DM +rm -f %{buildroot}/lib/systemd/system/*.wants/plymouth-quit*.service # aliases for /etc/init.d/* ln -s /dev/null %{buildroot}/lib/systemd/system/cgroup.service ln -s systemd-tmpfiles-setup.service %{buildroot}/lib/systemd/system/cleanup.service @@ -248,10 +229,6 @@ # Create the /var/log/journal directory to change the volatile journal to a persistent one mkdir -p %{buildroot}/var/log/journal -%if %{build_plymouth} -(cd %{buildroot} && find . -name '*plymouth*') > files.plymouth -%endif - %fdupes $RPM_BUILD_ROOT %post @@ -367,12 +344,10 @@ %{_datadir}/polkit-1/actions %{_datadir}/polkit-1/actions/org.freedesktop.systemd1.policy %{_datadir}/systemd -%if %{build_plymouth} # Packaged in plymouth subpackage %exclude /lib/systemd/system/plymouth-*.service %exclude /lib/systemd/system/*.wants/plymouth-*.service %exclude /lib/systemd/system/systemd-ask-password-plymouth.* -%endif # Packaged in gtk subpackage %exclude %{_mandir}/man1/systemadm.1* # Packaged in sysvinit subpackage @@ -423,14 +398,11 @@ %{_libdir}/pkgconfig/libsystemd-id128.pc %{_libdir}/pkgconfig/libsystemd-journal.pc -%if %{build_plymouth} - %files plymouth %defattr(-,root,root,-) /lib/systemd/system/plymouth-*.service /lib/systemd/system/*.wants/plymouth-*.service /lib/systemd/system/systemd-ask-password-plymouth.* -%endif %files sysvinit %defattr(-,root,root,-) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de