[gnome-tweak-tool] Update to 3.7.4

Mohamed ElMorabity melmorabity at fedoraproject.org
Wed Jan 16 14:18:27 UTC 2013


commit 9c82239355c049895875e9cc0f31213eed54d280
Author: Mohamed El Morabity <melmorabity at fedoraproject.org>
Date:   Wed Jan 16 14:24:02 2013 +0100

    Update to 3.7.4

 .gitignore                                         |    1 +
 ...weak-tool-3.6.1-remove_lid_close_settings.patch |   27 ------------
 gnome-tweak-tool.spec                              |   44 ++++++++++----------
 sources                                            |    2 +-
 4 files changed, 24 insertions(+), 50 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 160e5ea..c637ee0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /gnome-tweak-tool-3.5.5.tar.xz
 /gnome-tweak-tool-3.6.0.tar.xz
 /gnome-tweak-tool-3.6.1.tar.xz
+/gnome-tweak-tool-3.7.4.tar.xz
diff --git a/gnome-tweak-tool.spec b/gnome-tweak-tool.spec
index 41c389b..d9d1a62 100644
--- a/gnome-tweak-tool.spec
+++ b/gnome-tweak-tool.spec
@@ -1,28 +1,20 @@
-#global commit_date 20120717
-#global commit_hash 3869087
+%global major_version %%(cut -d "." -f 1-2 <<<%{version})
 
 Name:           gnome-tweak-tool
-Version:        3.6.1
-Release:        2%{?dist}
-#Release:        0.1.%%{commit_date}git%%{commit_hash}%%{?dist}
+Version:        3.7.4
+Release:        1%{?dist}
 Summary:        A tool to customize advanced GNOME 3 options
 
 License:        GPLv3
 URL:            http://live.gnome.org/GnomeTweakTool
-Source0:        http://ftp.gnome.org/pub/gnome/sources/gnome-tweak-tool/3.6/gnome-tweak-tool-%{version}.tar.xz
-# git archive --format=tar --prefix=%{name}-%{version}/ %{commit_hash} \
-# | xz > %{name}-%{version}-%{commit_hash}.tar.xz
-#Source0:        %{name}-%{version}-%{commit_hash}.tar.xz
-Patch0:         gnome-tweak-tool-3.6.1-remove_lid_close_settings.patch
+Source0:        http://ftp.gnome.org/pub/gnome/sources/%{name}/%{major_version}/gnome-tweak-tool-%{version}.tar.xz
 
 BuildArch:      noarch
 BuildRequires:  GConf2
 BuildRequires:  intltool
 BuildRequires:  pkgconfig(gsettings-desktop-schemas)
-BuildRequires:  pkgconfig(pygobject-2.0)
 BuildRequires:  pkgconfig(pygobject-3.0)
 BuildRequires:  desktop-file-utils
-BuildRequires:  gnome-common
 Requires:       gnome-shell
 Requires:       gnome-shell-extension-user-theme
 Requires:       nautilus
@@ -47,32 +39,35 @@ Features:
         * Font hinting and antialiasing 
 
 %prep
-%setup -q -n %{name}-%{version}
-%patch0 -p1 -b .remove_lid_close_settings
+%setup -q
 
 
 %build
-# NOCONFIGURE=1 ./autogen.sh
 %configure
 make %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
+
+# Leave the desktop file validation, but don't return an error value ("Phanteon"
+# value not supported yet in "OnlyShowIn" key by validator)
+desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop || true
+
 %find_lang %{name}
 
 
 %post
-/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+/bin/touch --no-create %{_datadir}/icons/hicolor/ &>/dev/null || :
+
 
 %postun
 if [ $1 -eq 0 ] ; then
-    /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
-    /usr/bin/gtk-update-icon-cache -f %{_datadir}/icons/hicolor &>/dev/null || :
+  /bin/touch --no-create %{_datadir}/icons/hicolor/ &>/dev/null
+  /usr/bin/gtk-update-icon-cache -f %{_datadir}/icons/hicolor/ &>/dev/null || :
 fi
 
+
 %posttrans
 /usr/bin/gtk-update-icon-cache -f %{_datadir}/icons/hicolor &>/dev/null || :
 
@@ -80,13 +75,18 @@ fi
 %files -f %{name}.lang
 %doc AUTHORS COPYING NEWS README
 %{_bindir}/%{name}
-%{python_sitelib}/gtweak
+%{python_sitelib}/gtweak/
 %{_datadir}/applications/%{name}.desktop
-%{_datadir}/%{name}
+%{_datadir}/%{name}/
 %{_datadir}/icons/hicolor/*/apps/%{name}.png
 
 
 %changelog
+* Wed Jan 16 2013 Mohamed El Morabity <melmorabity at fedoraproject.org> - 3.7.4-1
+- Update to 3.7.4
+- Drop remove_lid_close_settings patch, fixed upstream
+- Spec cleanup
+
 * Fri Nov  2 2012 Michel Salim <salimma at fedoraproject.org> - 3.6.1-2
 - Drop lid close configuration options that are now handled by systemd
 
diff --git a/sources b/sources
index 7efca81..f03692f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-82ea8aeb1a1d7fd8532695b743b3a437  gnome-tweak-tool-3.6.1.tar.xz
+4a87a61939872eb721983e7d3993891f  gnome-tweak-tool-3.7.4.tar.xz


More information about the scm-commits mailing list