rpms/seahorse/devel gpgme-1.1.X-configure.patch, NONE, 1.1 seahorse.spec, 1.15, 1.16

[Seth Vidal (skvidal)]

Author: skvidal

Update of /cvs/extras/rpms/seahorse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28828/devel

Modified Files:
	seahorse.spec 
Added Files:
	gpgme-1.1.X-configure.patch 
Log Message:
auto-import seahorse-0.8-2%{dist} on branch devel from seahorse-0.8-2%{dist}.src.rpm
seahorse update

gpgme-1.1.X-configure.patch:

--- NEW FILE gpgme-1.1.X-configure.patch ---
--- configure~	2006-01-16 11:54:06.000000000 -0500
+++ configure	2006-01-16 11:54:06.000000000 -0500
@@ -19740,7 +19740,7 @@
 		 sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\3/'`
 
 	if test "$major" -eq "$req_major"; then
-	   if test "$minor" -eq "$req_minor"; then
+	   if test "$minor" -ge "$req_minor"; then
 	     if test "$micro" -ge "$req_micro"; then
 	       ok="yes"
 	     fi


Index: seahorse.spec
===================================================================
RCS file: /cvs/extras/rpms/seahorse/devel/seahorse.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- seahorse.spec	26 Oct 2005 21:57:37 -0000	1.15
+++ seahorse.spec	23 Feb 2006 17:26:28 -0000	1.16
@@ -1,16 +1,17 @@
 Name: 		seahorse
 Version: 	0.8
-Release:    1%{dist}
+Release:        2%{dist}
 Summary:	GNOME2 interface for gnupg
 Group: 		User Interface/Desktops
 License: 	GPL
 URL:        http://seahorse.sourceforge.net/
-Source:     http://ftp.gnome.org/pub/GNOME/sources/seahorse/0.7/%{name}-%{version}.tar.gz
+Source:     http://ftp.gnome.org/pub/GNOME/sources/seahorse/%{version}/%{name}-%{version}.tar.gz
+Patch0:		gpgme-1.1.X-configure.patch
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  eel2-devel
-BuildRequires:  gedit-devel
+#BuildRequires:  gedit-devel
 BuildRequires:  gettext
 BuildRequires:  gpgme-devel >= 1.0
 BuildRequires:  libgnomeui-devel
@@ -35,10 +36,10 @@
 %setup -q
 sed -i "s/update-mime-database/#update-mime-database/g" plugins/nautilus/Makefile.in
 sed -i "s/update-mime-database/#update-mime-database/g" plugins/nautilus/Makefile.am
-
+%patch0 -p0
 
 %build
-%configure --disable-schemas-install 
+%configure --disable-schemas-install --disable-gedit
 make %{?_smp_mflags}
 
 
@@ -113,15 +114,17 @@
 %{_datadir}/omf/%{name}/*
 %{_datadir}/pixmaps/*
 %{_libdir}/libseahorse-internal*
-%{_libdir}/gedit-2/plugins/*
+#%%{_libdir}/gedit-2/plugins/*
 %{_libdir}/nautilus/extensions-1.0/libnautilus-seahorse.so
 %{_sysconfdir}/gconf/schemas/*
 
 
 %changelog
+* Mon Jan 16 2006 Seth Vidal <skvidal at linux.duke.edu> - 0.8-2
+- added configure patch for it to build
+- disable gedit plugins until seahorse gets fixed to work with gedit 2.13+
+
 * Wed Oct 26 2005 Seth Vidal <skvidal at phy.duke.edu> - 0.8-1
-- remove changelog's in spec file from before this year
-- enable hkp (libsoup-devel buildreq)
 - 0.8
 
 * Thu Jul 28 2005 Seth Vidal <skvidal at phy.duke.edu> - 0.7.9-1
@@ -150,3 +153,44 @@
 * Fri Feb 25 2005 Phillip Compton <pcompton[AT]proteinmedia.com> 0.7.6-1
 - 0.7.6.
 
+* Mon Nov 09 2003 Phillip Compton <pcompton[AT]proteinmedia.com> 0:0.7.3-0.fdr.5
+- BuildReq scrollkeeper.
+
+* Wed Oct 22 2003 Phillip Compton <pcompton[AT]proteinmedia.com> 0:0.7.3-0.fdr.4
+- Uncommented .la removal.
+
+* Sun Sep 21 2003 Phillip Compton <pcompton[AT]proteinmedia.com> 0:0.7.3-0.fdr.3
+- Grabbed new copy os source from upstream.
+- Fixed path on Source0, to allow direct download.
+- BuildReq desktop-file-utils.
+
+* Sun Sep 21 2003 Phillip Compton <pcompton[AT]proteinmedia.com> 0:0.7.3-0.fdr.2
+- Fixed file permission on source tarball.
+- Fixed Group.
+- Removed aesthetic comments.
+- Brought more in line with current spec template.
+
+* Sun Aug 17 2003 Phillip Compton <pcompton[AT]proteinmedia.com> 0:0.7.3-0.fdr.1
+- Fedorification.
+- Added path to Source0.
+- Added URL.
+- buildroot -> RPM_BUILD_ROOT.
+- BuildReq libgnomeui-devel, eel2-devel, gpgme03-devel.
+- BuildReq gettext.
+- post Req GConf2.
+- post/postun Req scrollkeeper.
+- .la/.a removal.
+- cosmetic changes.
+
+* Fri May 02 2003 Matthew Hall <matt at ecsc.co.uk> 0.7.3-1
+- 0.7.3 Release
+
+* Wed Apr 23 2003 Matthew Hall <matt at ecsc.co.uk> 0.7.1-3
+- Rebuilt against gpgme 0.3.15
+
+* Sat Apr 12 2003 Matthew Hall <matt at ecsc.co.uk> 0.7.1-2
+- RedHat 9 Rebuild
+
+* Sun Jan 26 2003 Matthew Hall <matt at ecsc.co.uk>
+- New Spec File
+