[gnome-clocks] Update to 0.1.6. Handle the move to autotools.

Yanko Kaneti yaneti at fedoraproject.org
Wed Feb 6 01:55:44 UTC 2013


commit 4e7a5239c77d5e262d5125d6a25139a15e12cb3e
Author: Yanko Kaneti <yaneti at declera.com>
Date:   Wed Feb 6 03:55:30 2013 +0200

    Update to 0.1.6. Handle the move to autotools.

 .gitignore                                |    1 +
 gnome-clocks-0.1.6-desktop-keywords.patch |   39 +++++++++++++++++++++++++++++
 gnome-clocks.spec                         |   38 +++++++++++++++++-----------
 sources                                   |    2 +-
 4 files changed, 64 insertions(+), 16 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d1d4e16..c08e033 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /gnome-clocks-0.1.3.tar.xz
 /gnome-clocks-0.1.4.tar.xz
 /gnome-clocks-0.1.5.tar.xz
+/gnome-clocks-0.1.6.tar.xz
diff --git a/gnome-clocks-0.1.6-desktop-keywords.patch b/gnome-clocks-0.1.6-desktop-keywords.patch
new file mode 100644
index 0000000..0fba96d
--- /dev/null
+++ b/gnome-clocks-0.1.6-desktop-keywords.patch
@@ -0,0 +1,39 @@
+diff --git a/po/ca.po b/po/ca.po
+index 10c2b58..770838e 100644
+--- a/po/ca.po
++++ b/po/ca.po
+@@ -34,7 +34,7 @@ msgstr ""
+ 
+ #: ../data/gnome-clocks.desktop.in.h:4
+ msgid "time;timer;alarm;world clock;stopwatch;time zone;"
+-msgstr "temps;temporitzador;alarma;rellotge global;cronòmetre;zona horària"
++msgstr "temps;temporitzador;alarma;rellotge global;cronòmetre;zona horària;"
+ 
+ #: ../gnomeclocks/alarm.py:93 ../gnomeclocks/alarm.py:451
+ msgid "Alarm"
+diff --git a/po/el.po b/po/el.po
+index 454a1bc..6bf26da 100644
+--- a/po/el.po
++++ b/po/el.po
+@@ -37,7 +37,7 @@ msgstr ""
+ 
+ #: ../data/gnome-clocks.desktop.in.h:4
+ msgid "time;timer;alarm;world clock;stopwatch;time zone;"
+-msgstr "χρόνος·χρονόμετρο·συναγερμός·παγκόσμιο ρολόι·χρονόμετρο·ώρα ζώνης·"
++msgstr "χρόνος;χρονόμετρο;συναγερμός;παγκόσμιο ρολόι;χρονόμετρο;ώρα ζώνης;"
+ 
+ #. Translators: "New" refers to an alarm
+ #: ../gnomeclocks/alarm.py:91 ../gnomeclocks/alarm.py:443
+diff --git a/po/ug.po b/po/ug.po
+index 53be856..05b0f51 100644
+--- a/po/ug.po
++++ b/po/ug.po
+@@ -32,7 +32,7 @@ msgstr "دۇنيا ۋاقىتلىرى، قوڭغۇراقلىق سائەت، ۋا
+ 
+ #: ../data/gnome-clocks.desktop.in.h:4
+ msgid "time;timer;alarm;world clock;stopwatch;time zone;"
+-msgstr "time;timer;alarm;world clock;stopwatch;time zone;ۋاقىت؛ئۆلچىگۈچ؛قوڭغۇراق؛دۇنيا سائىتى؛ۋاقىت رايونى؛"
++msgstr "time;timer;alarm;world clock;stopwatch;time zone;ۋاقىت؛ئۆلچىگۈچ؛قوڭغۇراق؛دۇنيا سائىتى؛ۋاقىت رايونى;"
+ 
+ #: ../gnomeclocks/alarm.py:93 ../gnomeclocks/alarm.py:455
+ msgid "Alarm"
diff --git a/gnome-clocks.spec b/gnome-clocks.spec
index af3cee7..d4d15bf 100644
--- a/gnome-clocks.spec
+++ b/gnome-clocks.spec
@@ -1,7 +1,5 @@
-%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
-
 Name:           gnome-clocks
-Version:        0.1.5
+Version:        0.1.6
 Release:        1%{?dist}
 Summary:        Clock application designed for GNOME 3
 
@@ -9,10 +7,13 @@ License:        GPLv2+
 URL:            https://live.gnome.org/GnomeClocks
 Source0:        http://download.gnome.org/sources/gnome-clocks/0.1/%{name}-%{version}.tar.xz
 
+# https://bugzilla.gnome.org/show_bug.cgi?id=693234
+Patch1:         gnome-clocks-0.1.6-desktop-keywords.patch
+
 BuildArch:      noarch
-BuildRequires:  python2-devel python-distutils-extra
-BuildRequires:  intltool desktop-file-utils
-Requires:       pygobject3 pyxdg clutter-gtk libgweather gnome-desktop3 libnotify
+BuildRequires:  python3-devel
+BuildRequires:  intltool desktop-file-utils glib2
+Requires:       pygobject3 clutter-gtk libgweather gnome-desktop3 libnotify
 Requires:       pycanberra
 
 %description
@@ -20,40 +21,47 @@ Clock application designed for GNOME 3
 
 %prep
 %setup -q
-rm -fv  gnomeclocks/pycanberra.py
+%patch1 -p1 -b .desktop-keywords
 
 %build
-%{__python} setup.py build
+%configure
+make V=1 %{?_smp_mflags}
 
 %install
-# with --skip-build some stuff is not installed, remove it for now
-%{__python} setup.py install --root $RPM_BUILD_ROOT
-rm -r $RPM_BUILD_ROOT/%{_datadir}/doc
+make install DESTDIR=$RPM_BUILD_ROOT
 desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/gnome-clocks.desktop
 %find_lang gnome-clocks
 
 %post
-/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+/bin/touch --no-create %{_datadir}/icons/hicolor %{_datadir}/icons/HighContrast &>/dev/null || :
 
 %postun
 if [ $1 -eq 0 ] ; then
-    /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    /bin/touch --no-create %{_datadir}/icons/hicolor %{_datadir}/icons/HighContrast &>/dev/null
     /usr/bin/gtk-update-icon-cache -f %{_datadir}/icons/hicolor &>/dev/null || :
+    /usr/bin/gtk-update-icon-cache -f %{_datadir}/icons/HighContrast &>/dev/null || :
+    /usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 fi
 
 %posttrans
 /usr/bin/gtk-update-icon-cache -f %{_datadir}/icons/hicolor &>/dev/null || :
+/usr/bin/gtk-update-icon-cache -f %{_datadir}/icons/HighContrast &>/dev/null || :
+/usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 
 %files -f gnome-clocks.lang
 %doc COPYING README NEWS
 %{_bindir}/gnome-clocks
-%{python_sitelib}/*
+%{python3_sitelib}/gnomeclocks
 %{_datadir}/gnome-clocks
-%{_datadir}/icons/hicolor/*/apps/clocks.png
+%{_datadir}/icons/*/*/apps/gnome-clocks.png
 %{_datadir}/applications/gnome-clocks.desktop
+%{_datadir}/glib-2.0/schemas/org.gnome.clocks.gschema.xml
 
 
 %changelog
+* Wed Feb  6 2013 Yanko Kaneti <yaneti at declera.com> - 0.1.6-1
+- Update to 0.1.6. Handle the move to autotools.
+
 * Tue Dec  4 2012 Yanko Kaneti <yaneti at declera.com> - 0.1.5-1
 - Update to 0.1.5.
 - Additionaly require gnome-desktop3 and libnotify
diff --git a/sources b/sources
index 04adad3..72df2f3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-619e4d1f8849d7ff7007f5775f148d30  gnome-clocks-0.1.5.tar.xz
+de943fe5b9562713188d01b47752f175  gnome-clocks-0.1.6.tar.xz


More information about the scm-commits mailing list