packages: systemd/systemd.spec, systemd/target-pld.patch, systemd/pld-port....

megabajt megabajt at pld-linux.org
Mon May 2 15:34:25 CEST 2011 

Author: megabajt                     Date: Mon May  2 13:34:25 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 26

---- Files affected:
packages/systemd:
   systemd.spec (1.23 -> 1.24) , target-pld.patch (1.1 -> 1.2) , pld-port.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/systemd/systemd.spec
diff -u packages/systemd/systemd.spec:1.23 packages/systemd/systemd.spec:1.24
--- packages/systemd/systemd.spec:1.23	Fri Apr 29 09:10:21 2011
+++ packages/systemd/systemd.spec	Mon May  2 15:34:19 2011
@@ -1,43 +1,45 @@
 # $Revision$, $Date$
 #
 # Conditional build:
-%bcond_with		gtk	# build gtk tools (needs devel libnotify>=0.7 and gtk+3)
+%bcond_without	gtk		# build gtk tools (needs devel libnotify>=0.7 and gtk+2)
 %bcond_without	selinux		# without SELinux support
 %bcond_without	tcpd		# libwrap (tcp_wrappers) support
-%bcond_without	pam			# PAM authentication support
+%bcond_without	pam		# PAM authentication support
 %bcond_without	audit		# without audit support
 %bcond_without	cryptsetup	# without cryptsetup support
 
 Summary:	A System and Service Manager
 Summary(pl.UTF-8):	systemd - zarządca systemu i usług dla Linuksa
 Name:		systemd
-Version:	24
+Version:	26
 Release:	0.1
 License:	GPL v2+
 Group:		Base
 Source0:	http://www.freedesktop.org/software/systemd/%{name}-%{version}.tar.bz2
-# Source0-md5:	4a6b7d99f35bdae21d7f9b698792b8d3
+# Source0-md5:	b7c468aa400c64d02d533eba6359e283
 Patch0:		target-pld.patch
 Patch1:		pld-port.patch
 URL:		http://www.freedesktop.org/wiki/Software/systemd
 %{?with_audit:BuildRequires:	audit-libs-devel}
-BuildRequires:	autoconf
-BuildRequires:	automake
-%{?with_crypt:BuildRequires:	cryptsetup-luks-devel}
+BuildRequires:	autoconf >= 2.63
+BuildRequires:	automake >= 1:1.11
+%{?with_cryptsetup:BuildRequires:	cryptsetup-luks-devel}
 BuildRequires:	dbus-devel
 BuildRequires:	docbook-style-xsl
-%{?with_gtk:BuildRequires:	gtk+3-devel}
+%{?with_gtk:BuildRequires:	glib2-devel >= 1:2.26.1}
+%{?with_gtk:BuildRequires:	gtk+2-devel >= 2:2.24.0}
 BuildRequires:	libcap-devel
-%{?with_gtk:BuildRequires:	libnotify-devel >= 0.7}
+%{?with_gtk:BuildRequires:	libnotify-devel >= 0.7.0}
 %{?with_selinux:BuildRequires:	libselinux-devel}
 BuildRequires:	libtool >= 2:2.2
 %{?with_tcpd:BuildRequires:	libwrap-devel}
-BuildRequires:	libxslt
+BuildRequires:	m4
+BuildRequires:	libxslt-progs
 %{?with_pam:BuildRequires:	pam-devel}
 BuildRequires:	pkgconfig
 BuildRequires:	rpmbuild(macros) >= 1.527
 BuildRequires:	udev-devel >= 160
-BuildRequires:	vala >= 0.11
+BuildRequires:	vala >= 0.10.0
 Requires:	%{name}-units = %{version}-%{release}
 Requires:	dbus >= 1.3.2
 Requires:	rc-scripts
@@ -108,6 +110,7 @@
 %build
 %{__aclocal} -I m4
 %{__autoconf}
+%{__autoheader}
 %{__automake}
 %configure \
 	%{__enable_disable audit} \
@@ -118,7 +121,6 @@
 	%{__enable_disable tcpd tcpwrap} \
 	--disable-silent-rules \
 	--with-distro=pld \
-	--with-syslog-service=syslog-ng \
 	--with-rootdir=
 
 %{__make}
@@ -197,10 +199,9 @@
 %files
 %defattr(644,root,root,755)
 %doc DISTRO_PORTING README TODO
+/etc/dbus-1/system.d/org.freedesktop.hostname1.conf
 /etc/dbus-1/system.d/org.freedesktop.systemd1.conf
 %dir %{_sysconfdir}/systemd
-%{_sysconfdir}/tmpfiles.d/systemd.conf
-%{_sysconfdir}/tmpfiles.d/x11.conf
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/systemd/system.conf
 %dir /etc/xdg/systemd
 /etc/xdg/systemd/user
@@ -228,14 +229,20 @@
 %dir /lib/systemd/system-generators
 /lib/systemd/system-generators/systemd-getty-generator
 /lib/udev/rules.d/99-systemd.rules
+%{_prefix}/lib/tmpfiles.d/legacy.conf
+%{_prefix}/lib/tmpfiles.d/systemd.conf
+%{_prefix}/lib/tmpfiles.d/x11.conf
 %{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.*.xml
 %{_datadir}/dbus-1/services/org.freedesktop.systemd1.service
+%{_datadir}/dbus-1/system-services/org.freedesktop.hostname1.service
 %{_datadir}/dbus-1/system-services/org.freedesktop.systemd1.service
-#%{_datadir}/systemd
+%{_datadir}/polkit-1/actions/org.freedesktop.hostname1.policy
 %{_mandir}/man1/init.1
 %{_mandir}/man1/systemd.1*
+%{_mandir}/man1/systemd-ask-password.1*
 %{_mandir}/man1/systemd-cgls.1*
 %{_mandir}/man1/systemd-notify.1*
+%{_mandir}/man1/systemd-nspawn.1*
 %{_mandir}/man3/sd_booted.3*
 %{_mandir}/man3/sd_is_fifo.3*
 %{_mandir}/man3/sd_is_socket.3
@@ -245,11 +252,14 @@
 %{_mandir}/man3/sd_notify.3*
 %{_mandir}/man3/sd_notifyf.3
 %{_mandir}/man3/sd_readahead.3*
+%{_mandir}/man5/binfmt.d.5*
 %{_mandir}/man5/hostname.5*
 %{_mandir}/man5/locale.conf.5*
 %{_mandir}/man5/machine-id.5*
+%{_mandir}/man5/machine-info.5*
 %{_mandir}/man5/modules-load.d.5*
 %{_mandir}/man5/os-release.5*
+%{_mandir}/man5/sysctl.d.5*
 %{_mandir}/man5/systemd.automount.5*
 %{_mandir}/man5/systemd.conf.5*
 %{_mandir}/man5/systemd.device.5*
@@ -291,6 +301,7 @@
 %dir %{_sysconfdir}/tmpfiles.d
 %dir /lib/systemd
 /lib/systemd/system
+%dir %{_prefix}/lib/tmpfiles.d
 %attr(755,root,root) /bin/systemctl
 %attr(755,root,root) /bin/systemd-tmpfiles
 %{_mandir}/man5/tmpfiles.d.5*
@@ -316,6 +327,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.24  2011/05/02 13:34:19  megabajt
+- updated to 26
+
 Revision 1.23  2011/04/29 07:10:21  uzsolt
 - package some plus files
 

================================================================
Index: packages/systemd/target-pld.patch
diff -u packages/systemd/target-pld.patch:1.1 packages/systemd/target-pld.patch:1.2
--- packages/systemd/target-pld.patch:1.1	Sun Mar  6 22:28:28 2011
+++ packages/systemd/target-pld.patch	Mon May  2 15:34:19 2011
@@ -1,15 +1,15 @@
---- systemd-18/configure.ac~	2011-02-16 23:12:09.000000000 +0200
-+++ systemd-18/configure.ac	2011-03-06 23:24:39.486435579 +0200
-@@ -371,6 +371,12 @@
-                 AC_DEFINE(TARGET_ALTLINUX, [], [Target is ALTLinux])
-                 M4_DISTRO_FLAG=-DTARGET_ALTLINUX=1
+--- systemd-26/configure.ac.orig	2011-05-02 14:05:34.544253875 +0200
++++ systemd-26/configure.ac	2011-05-02 14:22:04.085559738 +0200
+@@ -369,6 +369,12 @@ case $with_distro in
+                 M4_DISTRO_FLAG=-DTARGET_MANDRIVA=1
+ 		have_plymouth=true
                  ;;
 +        pld)
-+                SYSTEM_SYSVINIT_PATH=/etc/rc.d/init.d
-+                SYSTEM_SYSVRCND_PATH=/etc/rc.d
-+                AC_DEFINE(TARGET_PLD, [], [Target is PLD Linux])
-+                M4_DISTRO_FLAG=-DTARGET_PLD=1
-+                ;;
-         other)
-                 AS_IF([test "x$with_syslog_service" = "x"],
-                         [AC_MSG_ERROR([With --distro=other, you must pass --with-syslog-service= to configure])])
++    		SYSTEM_SYSVINIT_PATH=/etc/rc.d/init.d
++    		SYSTEM_SYSVRCND_PATH=/etc/rc.d
++    		AC_DEFINE(TARGET_PLD, [], [Target is PLD Linux])
++    		M4_DISTRO_FLAG=-DTARGET_PLD=1
++    		;;
+         meego)
+                 SYSTEM_SYSVINIT_PATH=
+                 SYSTEM_SYSVRCND_PATH=

================================================================
Index: packages/systemd/pld-port.patch
diff -u packages/systemd/pld-port.patch:1.1 packages/systemd/pld-port.patch:1.2
--- packages/systemd/pld-port.patch:1.1	Wed Mar  9 19:19:55 2011
+++ packages/systemd/pld-port.patch	Mon May  2 15:34:19 2011
@@ -1,20 +1,20 @@
---- systemd-20/src/hostname-setup.c~	2011-03-08 20:47:29.000000000 +0200
-+++ systemd-20/src/hostname-setup.c	2011-03-09 20:15:21.063880615 +0200
+--- systemd-26/src/hostname-setup.c.orig	2011-05-02 14:45:05.518075875 +0200
++++ systemd-26/src/hostname-setup.c	2011-05-02 14:43:12.065357168 +0200
 @@ -30,7 +30,7 @@
  #include "util.h"
  #include "log.h"
  
--#if defined(TARGET_FEDORA) || defined(TARGET_ALTLINUX) || defined(TARGET_MANDRIVA)
-+#if defined(TARGET_FEDORA) || defined(TARGET_ALTLINUX) || defined(TARGET_MANDRIVA) || defined(TARGET_PLD)
+-#if defined(TARGET_FEDORA) || defined(TARGET_ALTLINUX) || defined(TARGET_MANDRIVA) || defined(TARGET_MEEGO)
++#if defined(TARGET_FEDORA) || defined(TARGET_ALTLINUX) || defined(TARGET_MANDRIVA) || defined(TARGET_MEEGO) || defined(TARGET_PLD)
  #define FILENAME "/etc/sysconfig/network"
  #elif defined(TARGET_SUSE) || defined(TARGET_SLACKWARE) || defined(TARGET_FRUGALWARE)
  #define FILENAME "/etc/HOSTNAME"
-@@ -87,7 +87,7 @@
+@@ -64,7 +64,7 @@ static int read_and_strip_hostname(const
  
  static int read_distro_hostname(char **hn) {
  
--#if defined(TARGET_FEDORA) || defined(TARGET_ARCH) || defined(TARGET_GENTOO) || defined(TARGET_ALTLINUX) || defined(TARGET_MANDRIVA)
-+#if defined(TARGET_FEDORA) || defined(TARGET_ARCH) || defined(TARGET_GENTOO) || defined(TARGET_ALTLINUX) || defined(TARGET_MANDRIVA) || defined(TARGET_PLD)
+-#if defined(TARGET_FEDORA) || defined(TARGET_ARCH) || defined(TARGET_GENTOO) || defined(TARGET_ALTLINUX) || defined(TARGET_MANDRIVA) || defined(TARGET_MEEGO)
++#if defined(TARGET_FEDORA) || defined(TARGET_ARCH) || defined(TARGET_GENTOO) || defined(TARGET_ALTLINUX) || defined(TARGET_MANDRIVA) || defined(TARGET_MEEGO) || defined(TARGET_PLD)
          int r;
          FILE *f;
  
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/systemd/systemd.spec?r1=1.23&r2=1.24&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/systemd/target-pld.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/systemd/pld-port.patch?r1=1.1&r2=1.2&f=u

More information about the pld-cvs-commit mailing list