sergiomb pushed to gdesklets (f21). "Added 8 patches from upstream. (..more)"

Thu Jun 11 01:30:52 UTC 2015

From fcdaa660d634f25a777cd246c87d522350a5fd48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= <sergio at serjux.com>
Date: Thu, 11 Jun 2015 01:05:40 +0100
Subject: Added 8 patches from upstream.

- Removed vfs.patch (https://bugs.launchpad.net/gdesklets/+bug/890817 , I
  agree with comment #2.)
- Removed gdesklets-aarch64.patch and use autoreconf instead.
- Added patch to fix obsoleted m4s.
- Added desktop-database scriptlet.
- Fix License tag and License macro.
- Spec clean up.
- Fix mixed-use-of-spaces-and-tabs.
- Added AppData https://fedoraproject.org/wiki/Packaging:AppData

diff --git a/gdesklets-desktop.patch b/gdesklets-desktop.patch
index d927955..bc9c4b2 100644
--- a/gdesklets-desktop.patch
+++ b/gdesklets-desktop.patch
@@ -1,6 +1,6 @@
-diff -ru rpmbuild/BUILD/gdesklets-0.36.3-orig/data/gdesklets.desktop.in rpmbuild/BUILD/gdesklets-0.36.3/data/gdesklets.desktop.in
---- rpmbuild/BUILD/gdesklets-0.36.3-orig/data/gdesklets.desktop.in	2010-06-07 00:41:57.000000000 -0700
-+++ rpmbuild/BUILD/gdesklets-0.36.3/data/gdesklets.desktop.in	2012-03-20 19:59:38.838192035 -0700
+diff -ru gdesklets-0.36.3-orig/data/gdesklets.desktop.in gdesklets-0.36.3/data/gdesklets.desktop.in
+--- gdesklets-0.36.3-orig/data/gdesklets.desktop.in	2010-06-07 00:41:57.000000000 -0700
++++ gdesklets-0.36.3/data/gdesklets.desktop.in	2012-03-20 19:59:38.838192035 -0700
 @@ -3,7 +3,7 @@
  Type=Application
  Encoding=UTF-8
diff --git a/gdesklets.spec b/gdesklets.spec
index 11aa84a..c51e0c3 100644
--- a/gdesklets.spec
+++ b/gdesklets.spec
@@ -1,18 +1,19 @@
 #%define alphatag beta
 
-Name:		gdesklets
-Version:	0.36.3
-Release:	18%{?dist}
-Summary:	Architecture for desktop applets
-
-Group:		User Interface/Desktops
-License:	GPL+
-
-URL:		https://launchpad.net/gdesklets
-Source0:	https://launchpad.net/gdesklets/0.3x/release-of-%{version}/+download/%{name}-%{version}.tar.bz2
-Patch0:		transition.patch
-Patch1:		gdesklets-desktop.patch
-Patch2:		vfs.patch
+Name:       gdesklets
+Version:    0.36.3
+Release:    18%{?dist}
+Summary:    Architecture for desktop applets
+Group:      User Interface/Desktops
+License:    GPLv2+
+URL:        https://launchpad.net/gdesklets
+Source0:    https://launchpad.net/gdesklets/0.3x/release-of-%{version}/+download/%{name}-%{version}.tar.bz2
+Source1:    gdesklets.appdata.xml
+
+# patch0 reported https://bugs.launchpad.net/gdesklets/+bug/1213232
+Patch0:     transition.patch
+Patch1:     gdesklets-desktop.patch
+Patch3:     gdesklets-m4.patch
 #Upstream patches
 Patch10:    174_173.diff
 Patch11:    175_174.diff
@@ -23,14 +24,13 @@ Patch15:    180_179.diff
 Patch16:    186_185.diff
 Patch17:    188_187.diff
 
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:  python-devel > 2.0.0, pyorbit-devel, pygtk2-devel > 2.4.0
-BuildRequires:  librsvg2-devel, libgtop2-devel >= 2.8.0, gettext, gvfs-devel   
+BuildRequires:  python2-devel > 2.0.0, pyorbit-devel, pygtk2-devel > 2.4.0
+BuildRequires:  librsvg2-devel, libgtop2-devel >= 2.8.0, gettext, gvfs-devel
 BuildRequires:  libXau-devel, libXdmcp-devel, intltool, gnome-python2-devel
 BuildRequires:  libgnome-devel > 2.6.0, desktop-file-utils, libcap-devel
 BuildRequires:  autoconf automake libtool
-Requires:	gnome-python2-gconf >= 2.6.0
+BuildRequires:  libappstream-glib
+Requires:   gnome-python2-gconf >= 2.6.0
 
 
 %description
@@ -42,8 +42,8 @@ bars, weather sensors, news tickers.
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p1 -b .transition
-%patch1 -p3 -b .gdesklets-desktop
-%patch2 -p0 -b .vfs
+%patch1 -p1 -b .gdesklets-desktop
+%patch3 -p1 -b .m4
 
 %patch10 -p0 -b .174
 %patch11 -p0 -b .175
@@ -62,40 +62,37 @@ autoreconf -fiv
 make %{?_smp_mflags}
 
 %install
-rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
 %find_lang %{name}
 desktop-file-install \
-%if 0%{?fedora} && 0%{?fedora} < 19
-    --vendor="fedora" \
-%endif
-	--delete-original									\
-	--dir=%{buildroot}%{_datadir}/applications			 	\
-		%{buildroot}%{_datadir}/applications/%{name}.desktop
+    --delete-original \
+    --dir=%{buildroot}%{_datadir}/applications \
+        %{buildroot}%{_datadir}/applications/%{name}.desktop
 
 mkdir -p  %{buildroot}{%{_bindir},%{_datadir}/%{name}/data/,%{_datadir}/%{name}/Displays/,%{_datadir}/%{name}/Controls/}
 
 # don't want libtool archives
 find %{buildroot} -name \*.la | xargs rm
 
+install -Dp %{SOURCE1} %{buildroot}/%{_datadir}/appdata/%{name}.appdata.xml
+appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.appdata.xml
+
 %post
-touch --no-create %{_datadir}/mime/packages &> /dev/null || :
+/bin/touch --no-create %{_datadir}/mime/packages &> /dev/null || :
+/usr/bin/update-desktop-database &> /dev/null || :
 
 %postun
 if [ $1 -eq 0 ] ; then
-update-mime-database %{_datadir}/mime &> /dev/null || :
+ /usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || :
 fi
+/usr/bin/update-desktop-database &> /dev/null || :
 
 %posttrans
-update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
-
-
-%clean
-rm -rf %{buildroot}
+/usr/bin/update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
 
 %files -f %{name}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog NEWS README
+%doc AUTHORS ChangeLog NEWS README
+%license COPYING
 %{_bindir}/%{name}
 %{_datadir}/mime/packages/%{name}.xml
 %{_datadir}/icons/gnome/48x48/mimetypes/*.png
@@ -105,12 +102,21 @@ rm -rf %{buildroot}
 %{_datadir}/%{name}/
 %{_libdir}/%{name}/
 %{_mandir}/man1/*
+%{_datadir}/appdata/%{name}.appdata.xml
 
 
 %changelog
 * Tue Jun 09 2015 Sérgio Basto <sergio at serjux.com> - 0.36.3-18
-- Add 8 patches from upstream.
-- Remove gdesklets-aarch64.patch and use autoreconf instead.
+- Added 8 patches from upstream.
+- Removed vfs.patch (https://bugs.launchpad.net/gdesklets/+bug/890817 , I
+  agree with comment #2.)
+- Removed gdesklets-aarch64.patch and use autoreconf instead.
+- Added patch to fix obsoleted m4s.
+- Added desktop-database scriptlet.
+- Fix License tag and License macro.
+- Spec clean up.
+- Fix mixed-use-of-spaces-and-tabs.
+- Added AppData https://fedoraproject.org/wiki/Packaging:AppData
 
 * Sat Sep 27 2014 Rex Dieter <rdieter at fedoraproject.org> 0.36.3-17
 - update mimeinfo scriptlets
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/gdesklets.git/commit/?h=f21&id=fcdaa660d634f25a777cd246c87d522350a5fd48
