rpms/gpa/FC-4 gpa.desktop,1.1,1.2 gpa.spec,1.6,1.7

Rex Dieter (rdieter) fedora-extras-commits at redhat.com
Mon Feb 27 21:17:27 UTC 2006


Author: rdieter

Update of /cvs/extras/rpms/gpa/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30970

Modified Files:
	gpa.desktop gpa.spec 
Log Message:
* Mon Feb 27 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.7.0-5
- follow fdo icon spec
- drop superfluous BR: gnupg



Index: gpa.desktop
===================================================================
RCS file: /cvs/extras/rpms/gpa/FC-4/gpa.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gpa.desktop	8 Nov 2004 04:28:52 -0000	1.1
+++ gpa.desktop	27 Feb 2006 21:17:27 -0000	1.2
@@ -2,7 +2,7 @@
 Name=GPA
 Comment=The GNU Privacy Assistant
 Exec=gpa
-Icon=gpa.png
+Icon=gpa
 Terminal=false
 Type=Application
 Encoding=UTF-8


Index: gpa.spec
===================================================================
RCS file: /cvs/extras/rpms/gpa/FC-4/gpa.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gpa.spec	12 May 2005 07:39:24 -0000	1.6
+++ gpa.spec	27 Feb 2006 21:17:27 -0000	1.7
@@ -1,19 +1,24 @@
+
 Name:           gpa
-Version:        0.7.0
-Release:        4
 Summary:        Graphical user interface for GnuPG
+Version:        0.7.0
+Release:        5%{?dist} 
 
-Group:          Applications/System
 License:        GPL
+Group:          Applications/System
 URL:            http://www.gnupg.org/related_software/gpa/
 Source0:        ftp://ftp.gnupg.org/gcrypt/alpha/gpa/gpa-0.7.0.tar.gz
-Source1:        %{name}.desktop
-Patch0:         %{name}-keyservers.patch
-Patch1:         %{name}-keytable-init.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  gtk2-devel >= 2.0.0, zlib-devel, desktop-file-utils
-BuildRequires:  gnupg >= 1.2.1-3, gpgme-devel >= 0.4.3, gettext
+Source1:        gpa.desktop
+Patch0:         gpa-keyservers.patch
+Patch1:         gpa-keytable-init.patch
+
+BuildRequires:  gtk2-devel
+BuildRequires:  zlib-devel
+BuildRequires:  desktop-file-utils
+BuildRequires:  gpgme-devel
+BuildRequires:  gettext
 
 %description
 GNU Privacy Assistant (GPA) is a graphical frontend for the GNU
@@ -23,25 +28,29 @@
 
 %prep
 %setup -q
+
 %patch0 -p0
 %patch1 -p1
 
 
 %build
 %configure
+
 make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
 make install DESTDIR=$RPM_BUILD_ROOT
-desktop-file-install \
-  --vendor fedora \
-  --mode 644 \
+
+desktop-file-install --vendor fedora \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   --add-category X-Fedora \
   %{SOURCE1}
-install -Dpm 644 gpa-logo-48x48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/gpa.png
+
+install -p -m644 -D gpa-logo-48x48.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/gpa.png
+
 %find_lang %{name}
 
 
@@ -49,16 +58,29 @@
 rm -rf $RPM_BUILD_ROOT
 
 
+%post
+touch --no-create %{_datadir}/icons/hicolor 2> /dev/null ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+
+%postun 
+touch --no-create %{_datadir}/icons/hicolor 2> /dev/null ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README* THANKS TODO VERSION
 %{_bindir}/*
-%{_datadir}/gpa
+%{_datadir}/gpa/
 %{_datadir}/applications/*.desktop
-%{_datadir}/pixmaps/*.png
+%{_datadir}/icons/hicolor/*/*/*
 
 
 %changelog
+* Mon Feb 27 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.7.0-5
+- follow fdo icon spec
+- drop superfluous BR: gnupg
+
 * Thu May 12 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.7.0-4
 - Rebuild.
 




More information about the scm-commits mailing list