packages: tzdata/tzdata.spec, tzdata/timezone.service (NEW), tzdata/timezon...

[baggins]

Author: baggins                      Date: Fri Mar 16 10:55:31 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 2
- systemd support

---- Files affected:
packages/tzdata:
   tzdata.spec (1.114 -> 1.115) , timezone.service (NONE -> 1.1)  (NEW), timezone.sh (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/tzdata/tzdata.spec
diff -u packages/tzdata/tzdata.spec:1.114 packages/tzdata/tzdata.spec:1.115
--- packages/tzdata/tzdata.spec:1.114	Thu Mar  1 19:00:31 2012
+++ packages/tzdata/tzdata.spec	Fri Mar 16 11:55:25 2012
@@ -37,6 +37,8 @@
 Source5:	javazic.tar.gz
 # Source5-md5:	6a3392cd5f1594d13c12c1a836ac8d91
 Source6:	timezone.upstart
+Source7:	timezone.service
+Source8:	timezone.sh
 Patch1:		javazic-fixup.patch
 Patch2:		install.patch
 URL:		http://www.twinsun.com/tz/tz-link.htm
@@ -155,7 +157,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{/etc/{sysconfig,rc.d/init.d},%{_mandir}/man5,%{_includedir}}
+install -d $RPM_BUILD_ROOT{/etc/{sysconfig,rc.d/init.d},%{_mandir}/man5,%{_includedir},%{systemdunitdir}}
 %{__make} install
 
 %if %{with tests}
@@ -186,6 +188,9 @@
 install -d $RPM_BUILD_ROOT/etc/init
 cp -p %{SOURCE6} $RPM_BUILD_ROOT/etc/init/timezone.conf
 
+install -p %{SOURCE7} $RPM_BUILD_ROOT%{systemdunitdir}/timezone.service
+install -p %{SOURCE8} $RPM_BUILD_ROOT/lib/systemd/pld-timezone
+
 %if %{with java}
 cp -a zoneinfo/java $RPM_BUILD_ROOT%{_datadir}/javazi
 %endif
@@ -196,6 +201,7 @@
 %post
 /sbin/chkconfig --add timezone
 %service timezone restart
+%systemd_post timezone.service
 
 %preun
 if [ "$1" = "0" ]; then
@@ -204,6 +210,7 @@
 	# save for postun
 	cp -f /etc/localtime /etc/localtime.rpmsave
 fi
+%systemd_preun timezone.service
 
 %postun
 if [ "$1" = "0" ]; then
@@ -211,6 +218,7 @@
 		mv -f /etc/localtime{.rpmsave,}
 	fi
 fi
+%systemd_reload
 
 %triggerpostun -- rc-scripts < 0.4.1.4
 /sbin/chkconfig --add timezone
@@ -230,6 +238,9 @@
 	%service timezone restart
 fi
 
+%triggerpostun -- tzdata < 2012a-2
+%systemd_trigger timezone.service
+
 %files
 %defattr(644,root,root,755)
 %doc tzcode/README tzcode/Theory tzcode/tz-link.html
@@ -237,6 +248,8 @@
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/timezone
 %attr(754,root,root) /etc/rc.d/init.d/timezone
 %config(noreplace) %verify(not md5 mtime size) /etc/init/timezone.conf
+%{systemdunitdir}/timezone.service
+%attr(755,root,root) /lib/systemd/pld-timezone
 
 %{_datadir}/zoneinfo
 %exclude %{_datadir}/zoneinfo/right
@@ -263,6 +276,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.115  2012/03/16 10:55:25  baggins
+- rel 2
+- systemd support
+
 Revision 1.114  2012/03/01 18:00:31  glen
 - up to 2012a
 

================================================================
Index: packages/tzdata/timezone.service
diff -u /dev/null packages/tzdata/timezone.service:1.1
--- /dev/null	Fri Mar 16 11:55:31 2012
+++ packages/tzdata/timezone.service	Fri Mar 16 11:55:25 2012
@@ -0,0 +1,13 @@
+[Unit]
+Description=Set time zone information
+After=syslog.target local-fs.target
+ConditionPathExists=/etc/sysconfig/timezone
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+EnvironmentFile=/etc/sysconfig/timezone
+ExecStart=/lib/systemd/pld-timezone
+
+[Install]
+WantedBy=basic.target

================================================================
Index: packages/tzdata/timezone.sh
diff -u /dev/null packages/tzdata/timezone.sh:1.1
--- /dev/null	Fri Mar 16 11:55:31 2012
+++ packages/tzdata/timezone.sh	Fri Mar 16 11:55:25 2012
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+ZONE_FILE="$ZONE_INFO_DIR"
+
+if [ -n "$ZONE_INFO_SCHEME" -a "$ZONE_INFO_SCHEME" != "posix" ]; then
+	ZONE_FILE="$ZONE_FILE/$ZONE_INFO_SCHEME"
+fi
+
+ZONE_FILE="$ZONE_FILE/$TIMEZONE"
+
+[ -L /etc/localtime ] && [ "$(resolvesymlink /etc/localtime)" = "$ZONE_FILE" ] && exit 0
+[ -f "$ZONE_FILE" ] || exit 2
+
+rm -f /etc/localtime
+
+cp -af "$ZONE_FILE" /etc/localtime
+RETVAL=$?
+restorecon /etc/localtime >/dev/null 2>&1
+exit $RETVAL
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/tzdata/tzdata.spec?r1=1.114&r2=1.115&f=u