packages: system-config-date/system-config-date-desktop.patch, system-confi...

glen glen at pld-linux.org
Sat Mar 3 12:51:11 CET 2012 

Author: glen                         Date: Sat Mar  3 11:51:11 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 1.9.67

---- Files affected:
packages/system-config-date:
   system-config-date-desktop.patch (1.1 -> 1.2) , system-config-date.spec (1.13 -> 1.14) 

---- Diffs:

================================================================
Index: packages/system-config-date/system-config-date-desktop.patch
diff -u packages/system-config-date/system-config-date-desktop.patch:1.1 packages/system-config-date/system-config-date-desktop.patch:1.2
--- packages/system-config-date/system-config-date-desktop.patch:1.1	Tue Dec 18 13:39:42 2007
+++ packages/system-config-date/system-config-date-desktop.patch	Sat Mar  3 12:51:06 2012
@@ -1,13 +1,11 @@
---- system-config-date-1.9.17/system-config-date.desktop.in~	2007-11-22 11:06:57.000000000 +0100
-+++ system-config-date-1.9.17/system-config-date.desktop.in	2007-12-18 13:23:40.724062888 +0100
-@@ -1,8 +1,8 @@
- [Desktop Entry]
- _Name=Date & Time
+--- system-config-date-1.9.67/system-config-date.desktop.in~	2011-10-18 13:49:29.000000000 +0300
++++ system-config-date-1.9.67/system-config-date.desktop.in	2012-03-03 13:37:50.852903093 +0200
+@@ -3,7 +3,7 @@
+ _GenericName=Set Date & Time
+ _X-GNOME-FullName=System-Config-Date (Set Date & Time)
  _Comment=Change system date and time
 -Categories=System;Settings;
--Icon=system-config-date.png
 +Categories=GTK;System;Settings;
-+Icon=system-config-date
+ Icon=system-config-date
  Exec=/usr/bin/system-config-date
  Type=Application
- Terminal=false

================================================================
Index: packages/system-config-date/system-config-date.spec
diff -u packages/system-config-date/system-config-date.spec:1.13 packages/system-config-date/system-config-date.spec:1.14
--- packages/system-config-date/system-config-date.spec:1.13	Fri Feb  4 19:24:04 2011
+++ packages/system-config-date/system-config-date.spec	Sat Mar  3 12:51:06 2012
@@ -2,13 +2,12 @@
 Summary:	A graphical interface for modifying system date and time
 Summary(pl.UTF-8):	Graficzny interfejs do zmiany daty i czasu systemowego
 Name:		system-config-date
-Version:	1.9.17
-Release:	4
+Version:	1.9.67
+Release:	0.2
 License:	GPL
 Group:		Base
-# https://fedorahosted.org/releases/s/y/system-config-date/ (not yet)
-Source0:	%{name}-%{version}.tar.bz2
-# Source0-md5:	6551690e7362a7d912e3a6a70cba1915
+Source0:	http://fedorahosted.org/released/system-config-date/%{name}-%{version}.tar.bz2
+# Source0-md5:	5af4caafb46a9c63a5fcc6e0e6e4d2e4
 Patch0:		%{name}-desktop.patch
 URL:		http://fedoraproject.org/wiki/SystemConfig/date
 BuildRequires:	desktop-file-utils
@@ -18,14 +17,15 @@
 Requires(post,postun):	gtk-update-icon-cache
 Requires(post,postun):	hicolor-icon-theme
 #Requires:	chkconfig
-Requires:	newt
-Requires:	ntp-client
-#Requires:	pygtk2-libglade
+Requires:	hicolor-icon-theme
+Requires:	ntpdate
 Requires:	python-gnome-canvas
+Requires:	python-pygtk-glade
 Requires:	python-rhpl
+Requires:	python-slip >= 0.2.11
 Requires:	python-snack
 Requires:	tzdata
-#Requires:	usermode >= 1.36
+Requires:	usermode-gtk >= 1.94
 Conflicts:	firstboot <= 1.3.26
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -55,7 +55,6 @@
 
 desktop-file-install --vendor system --delete-original \
 	--dir $RPM_BUILD_ROOT%{_desktopdir} \
-	--add-category X-Red-Hat-Base \
 	$RPM_BUILD_ROOT%{_desktopdir}/system-config-date.desktop
 
 %find_lang %{name} --with-gnome --with-omf
@@ -63,7 +62,7 @@
 rm $RPM_BUILD_ROOT%{_bindir}/system-config-date
 cat > $RPM_BUILD_ROOT%{_bindir}/system-config-date << EOF
 #!/bin/sh
-/usr/bin/python /usr/share/system-config-date/system-config-date.pyc
+%{__python} %{_datadir}/system-config-date/system-config-date.pyc
 EOF
 
 ln -sf system-config-date $RPM_BUILD_ROOT%{_bindir}/dateconfig
@@ -84,29 +83,29 @@
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc doc/*
 %attr(755,root,root) %{_bindir}/system-config-date
 %attr(755,root,root) %{_bindir}/system-config-time
 %attr(755,root,root) %{_bindir}/dateconfig
-%attr(755,root,root) %{_sbindir}/timeconfig
-%config(noreplace) %verify(not md5 mtime size) /etc/pam.d/dateconfig
 %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/system-config-date
-%config(noreplace) %verify(not md5 mtime size) /etc/pam.d/system-config-time
-%config(noreplace) %verify(not md5 mtime size) /etc/security/console.apps/dateconfig
 %config(noreplace) %verify(not md5 mtime size) /etc/security/console.apps/system-config-date
-%config(noreplace) %verify(not md5 mtime size) /etc/security/console.apps/system-config-time
 %dir %{_datadir}/system-config-date
-%config(noreplace) %verify(not md5 mtime size) %{_datadir}/system-config-date/ntp.template
+%config(noreplace) %verify(not md5 mtime size) %{_datadir}/system-config-date/ntp.conf.template
 %{_datadir}/system-config-date/*.py[co]
 %{_datadir}/system-config-date/*.glade
 %dir %{_datadir}/system-config-date/pixmaps
-%{_datadir}/system-config-date/pixmaps/system-config-date.png
 %{_datadir}/system-config-date/pixmaps/map1440.png
 %{_mandir}/man8/system-config-date*
 %lang(fr) %{_mandir}/fr/man8/system-config-date*
 %lang(ja) %{_mandir}/ja/man8/system-config-date*
 %{_desktopdir}/system-config-date.desktop
-%{_iconsdir}/hicolor/48x48/apps/system-config-date.png
+%{_iconsdir}/hicolor/*/apps/system-config-date.png
+%{_iconsdir}/hicolor/*/apps/system-config-date.svg
+
+%dir %{py_sitescriptdir}/scdate
+%{py_sitescriptdir}/scdate/*.py[co]
+%dir %{py_sitescriptdir}/scdate/core
+%{py_sitescriptdir}/scdate/core/*.py[co]
+%{py_sitescriptdir}/scdate-%{version}-py*.egg-info
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -114,6 +113,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.14  2012/03/03 11:51:06  glen
+- up to 1.9.67
+
 Revision 1.13  2011/02/04 18:24:04  wiget
 - Requires(post,postun): gtk-update-icon-cache
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/system-config-date/system-config-date-desktop.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/system-config-date/system-config-date.spec?r1=1.13&r2=1.14&f=u

More information about the pld-cvs-commit mailing list