Browse Source

system-config-date: update to 1.9.61, add R: python-slip

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@3368 ec354946-7b23-47d6-9f5a-488ba84defc7
daisuke 14 years ago
parent
commit
fc16290ba5
1 changed files with 23 additions and 38 deletions
  1. 23 38
      s/system-config-date/system-config-date-vl.spec

+ 23 - 38
s/system-config-date/system-config-date-vl.spec

@@ -2,17 +2,14 @@ Summary: A graphical interface for modifying system date and time
 Summary(ja): システムの時刻と日付を設定するグラフィカルインタフェース
 Summary(ja): システムの時刻と日付を設定するグラフィカルインタフェース
 
 
 Name: system-config-date
 Name: system-config-date
-Version: 1.8.12
+Version: 1.9.61
 Release: 1%{?_dist_release}
 Release: 1%{?_dist_release}
 URL: http://fedora.redhat.com/projects/config-tools/
 URL: http://fedora.redhat.com/projects/config-tools/
 License: GPL
 License: GPL
 ExclusiveOS: Linux
 ExclusiveOS: Linux
 Group: System Environment/Base
 Group: System Environment/Base
 Source0: %{name}-%{version}.tar.bz2
 Source0: %{name}-%{version}.tar.bz2
-Source1: system-config-date-1.8.12-doc.tar
-Patch0: system-config-date-1.8.12-doc.patch
 Patch100: system-config-date-vine.patch
 Patch100: system-config-date-vine.patch
-Patch110: system-config-date-1.8.12-desktop-file.patch
 
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch: noarch
 BuildArch: noarch
@@ -28,11 +25,12 @@ Requires: ntp
 Requires: python
 Requires: python
 Requires: pygtk2-libglade
 Requires: pygtk2-libglade
 Requires: gnome-python
 Requires: gnome-python
-Requires: usermode
+Requires: usermode-gtk
 Requires: chkconfig
 Requires: chkconfig
 Requires: rhpl
 Requires: rhpl
 Requires: newt
 Requires: newt
 Requires: yelp
 Requires: yelp
+Requires: python-slip
 Requires(post): hicolor-icon-theme
 Requires(post): hicolor-icon-theme
 Requires(postun): hicolor-icon-theme
 Requires(postun): hicolor-icon-theme
 
 
@@ -43,17 +41,15 @@ time, configuring the system time zone, and setting up the NTP daemon to
 synchronize the time of the system with an NTP time server.
 synchronize the time of the system with an NTP time server.
 
 
 %prep
 %prep
-%setup -q -a 1
-%patch0 -p1 -b .doc
+%setup -q
 
 
 %patch100 -p1 -b .vine
 %patch100 -p1 -b .vine
-%patch110 -p1 -b .desktop-file
 
 
 sed -i -e 's|/usr/bin/python2|/usr/bin/python|g' \
 sed -i -e 's|/usr/bin/python2|/usr/bin/python|g' \
-    system-config-date timeconfig src/*.py
+    system-config-date src/*.py
 
 
 %build
 %build
-make
+make CONSOLE_USE_CONFIG_UTIL=1
 
 
 %install
 %install
 rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
@@ -70,46 +66,35 @@ rm -rf $RPM_BUILD_ROOT
 %post
 %post
 touch --no-create %{_datadir}/icons/hicolor
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
-  gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
+  gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor ||:
 fi
 fi
 
 
 %postun
 %postun
 touch --no-create %{_datadir}/icons/hicolor
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
-  gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
+  gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor ||:
 fi
 fi
 
 
 %files -f %{name}.lang
 %files -f %{name}.lang
 %defattr(-,root,root)
 %defattr(-,root,root)
 %doc COPYING
 %doc COPYING
-%doc doc/*
-/usr/bin/system-config-date
-/usr/bin/system-config-time
-/usr/bin/dateconfig
-/usr/sbin/timeconfig
-%dir /usr/share/system-config-date
-/usr/share/system-config-date/*.py
-/usr/share/system-config-date/*.pyc
-/usr/share/system-config-date/*.glade
-%dir /usr/share/system-config-date/pixmaps/
-%attr(0644,root,root) %{_mandir}/man8/system-config-date*
-%attr(0644,root,root) %{_mandir}/fr/man8/system-config-date*
-%attr(0644,root,root) %{_mandir}/ja/man8/system-config-date*
-%attr(0644,root,root) %{_datadir}/applications/system-config-date.desktop
-%attr(0644,root,root) %{_datadir}/system-config-date/pixmaps/system-config-date.png
-%attr(0644,root,root) %{_datadir}/icons/hicolor/48x48/apps/system-config-date.png
-%attr(0644,root,root) %{_datadir}/system-config-date/pixmaps/map1440.png
-%attr(0644,root,root) %{_datadir}/system-config-date/regions
-%attr(0644,root,root) %config(noreplace) /etc/security/console.apps/system-config-date
-%attr(0644,root,root) %config(noreplace) /etc/pam.d/system-config-date
-%attr(0644,root,root) %config(noreplace) /etc/security/console.apps/system-config-time
-%attr(0644,root,root) %config(noreplace) /etc/pam.d/system-config-time
-%attr(0644,root,root) %config(noreplace) /etc/security/console.apps/dateconfig
-%attr(0644,root,root) %config(noreplace) /etc/pam.d/dateconfig
-%attr(0644,root,root) %config(noreplace) /etc/ntp/ntpservers
-%attr(0644,root,root) %config(noreplace) /usr/share/system-config-date/ntp.template
+%{_bindir}/system-config-date
+%{_datadir}/system-config-date
+%{_datadir}/applications/system-config-date.desktop
+%{_datadir}/icons/hicolor/*/apps/system-config-date.*
+%{_mandir}/man8/system-config-date*
+%{_mandir}/fr/man8/system-config-date*
+%{_mandir}/ja/man8/system-config-date*
+%config(noreplace) %{_sysconfdir}/security/console.apps/system-config-date
+%config(noreplace) %{_sysconfdir}/pam.d/system-config-date
+%{python_sitelib}/scdate
+%{python_sitelib}/scdate-%{version}-py%{python_version}.egg-info
 
 
 %changelog
 %changelog
+* Sat Apr 09 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 1.9.61-1
+- new upstream release
+- add R: python-slip
+
 * Wed Oct 01 2008 Daisuke SUZUKI <daisuke@linux.or.jp> 1.8.12-1
 * Wed Oct 01 2008 Daisuke SUZUKI <daisuke@linux.or.jp> 1.8.12-1
 - initial build for Vine Linux
 - initial build for Vine Linux