rpms/gpa/FC-5 gpa-0.7.3-dt.patch, NONE, 1.1 gpa-0.7.3-keyservers.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 gpa.spec, 1.7, 1.8 sources, 1.2, 1.3 gpa-keyservers.patch, 1.1, NONE gpa-keytable-init.patch, 1.1, NONE gpa.desktop, 1.2, NONE

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	.cvsignore gpa.spec sources 
Added Files:
	gpa-0.7.3-dt.patch gpa-0.7.3-keyservers.patch 
Removed Files:
	gpa-keyservers.patch gpa-keytable-init.patch gpa.desktop 
Log Message:
* Thu May 11 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.7.3-2
- cleanup .dt patch
- update URL:, Source: tags


gpa-0.7.3-dt.patch:

--- NEW FILE gpa-0.7.3-dt.patch ---
--- gpa-0.7.3/gpa.desktop.dt	2005-10-06 10:17:35.000000000 -0500
+++ gpa-0.7.3/gpa.desktop	2006-05-11 14:07:53.000000000 -0500
@@ -1,8 +1,8 @@
 [Desktop Entry]
-Name=GNU Privacy Assistant
-Name[en_US.ISO8859-1]=GNU Privacy Assistant
+Name=GPA
+Comment=GNU Privacy Assistant
 Exec=gpa
-Icon=gpa.png
+Icon=gpa
 Terminal=false
 Encoding=UTF-8
 Type=Application

gpa-0.7.3-keyservers.patch:

--- NEW FILE gpa-0.7.3-keyservers.patch ---
--- gpa-0.7.3/src/keyserver.c.pgp.mit.edu	2006-01-30 03:37:34.000000000 -0600
+++ gpa-0.7.3/src/keyserver.c	2006-03-22 09:54:31.000000000 -0600
@@ -179,6 +179,7 @@
    
       add_server (&serverlist, "hkp://subkeys.pgp.net"); 
       add_server (&serverlist, "ldap://keyserver.pgp.com");
+      add_server (&serverlist, "hkp://pgp.mit.edu");
     }
 
   return rc;


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gpa/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:28:52 -0000	1.2
+++ .cvsignore	11 May 2006 19:21:32 -0000	1.3
@@ -1 +1,2 @@
-gpa-0.7.0.tar.gz
+gpa-0.7.3.tar.bz2
+gpa-0.7.3.tar.bz2.sig


Index: gpa.spec
===================================================================
RCS file: /cvs/extras/rpms/gpa/FC-5/gpa.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gpa.spec	27 Feb 2006 21:01:01 -0000	1.7
+++ gpa.spec	11 May 2006 19:21:32 -0000	1.8
@@ -1,24 +1,26 @@
 
-Name:           gpa
-Summary:        Graphical user interface for GnuPG
-Version:        0.7.0
-Release:       	5%{?dist} 
-
-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
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-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
+Name:	 gpa
+Summary: Graphical user interface for GnuPG
+Version: 0.7.3
+Release: 2%{?dist} 
+
+License: GPL
+Group:   Applications/System
+#URL:     http://www.gnupg.org/related_software/gpa/
+#Source0: ftp://ftp.gnupg.org/gcrypt/alpha/gpa/gpa-%{version}.tar.gz
+URL:	 http://gpa.wald.intevation.org/
+Source0: http://wald.intevation.org/frs/download.php/152/gpa-%{version}.tar.bz2
+Source1: http://wald.intevation.org/frs/download.php/152/gpa-%{version}.tar.bz2.sig
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Patch1:   gpa-0.7.3-keyservers.patch
+Patch2:   gpa-0.7.3-dt.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
@@ -29,8 +31,8 @@
 %prep
 %setup -q
 
-%patch0 -p0
-%patch1 -p1
+%patch1 -p1 -b .keyservers
+%patch2 -p1 -b .dt
 
 
 %build
@@ -44,12 +46,14 @@
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
-desktop-file-install --vendor fedora \
+desktop-file-install \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category X-Fedora \
-  %{SOURCE1}
+  --vendor="fedora" --add-category="X-Fedora" \
+  --delete-original \
+  $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop
 
-install -p -m644 -D gpa-logo-48x48.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/gpa.png
+install -p -m644 -D gpa.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/gpa.png
+rm -f $RPM_BUILD_ROOT%{_datadir}/pixmaps/gpa.png
 
 %find_lang %{name}
 
@@ -77,6 +81,13 @@
 
 
 %changelog
+* Thu May 11 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.7.3-2
+- cleanup .dt patch
+- update URL:, Source: tags
+
+* Wed Mar 22 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.7.3-1
+- 0.7.3
+
 * Mon Feb 27 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.7.0-5
 - follow fdo icon spec
 - drop superfluous BR: gnupg


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gpa/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:28:52 -0000	1.2
+++ sources	11 May 2006 19:21:32 -0000	1.3
@@ -1 +1,2 @@
-44cb60cba64a48837588ed27f8db08b2  gpa-0.7.0.tar.gz
+a3626266f9dda506445c7297c4172a65  gpa-0.7.3.tar.bz2
+68d7cafe71c21a386109878c206e4016  gpa-0.7.3.tar.bz2.sig


--- gpa-keyservers.patch DELETED ---


--- gpa-keytable-init.patch DELETED ---


--- gpa.desktop DELETED ---