rpms/geoqo/F-10 geoqo-makefile.patch,NONE,1.1 geoqo.spec,1.6,1.7

[Wes Hardaker]

Author: hardaker

Update of /cvs/extras/rpms/geoqo/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30005

Modified Files:
	geoqo.spec 
Added Files:
	geoqo-makefile.patch 
Log Message:
update for 0.99

geoqo-makefile.patch:

--- NEW FILE geoqo-makefile.patch ---
Index: Makefile.PL
===================================================================
--- Makefile.PL	(revision 1013)
+++ Makefile.PL	(working copy)
@@ -24,16 +24,20 @@
 sub MY::postamble {
     return '
 
-DATADIR=$(DESTDIR)$(PREFIX)/share/geoqo/
-SCRIPTSDIR=$(DESTDIR)$(PREFIX)/share/geoqo/scripts
-ICONSDIR=$(DESTDIR)$(PREFIX)/share/geoqo/icons
+GQINSTALLDIR=$(DATADIR)$(PREFIX)
 
+DATADIR=$(GQINSTALLDIR)/share/geoqo/
+SCRIPTSDIR=$(GQINSTALLDIR)/share/geoqo/scripts
+ICONSDIR=$(GQINSTALLDIR)/share/geoqo/icons
+
 SCRIPTSUBDIRS=search-plugins search-modifiers
 
 INSTALL=$(PERL) "-MExtUtils::Command" -e cp
 
-install:: eraseoldscripts installscriptfiles installotherfiles
+install:: geoqoadditions
 
+geoqoadditions: eraseoldscripts installscriptfiles installotherfiles
+
 eraseoldscripts:
 	$(RM_RF) $(SCRIPTSDIR)
 


Index: geoqo.spec
===================================================================
RCS file: /cvs/extras/rpms/geoqo/F-10/geoqo.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- geoqo.spec	21 Jul 2008 16:05:53 -0000	1.6
+++ geoqo.spec	20 Nov 2008 00:40:32 -0000	1.7
@@ -1,7 +1,7 @@
 Summary: GeoCaching and General Waypoint Database
 Name: geoqo
-Version: 0.97
-Release: 3%{?dist}
+Version: 0.99
+Release: 1%{?dist}
 License: GPLv2
 Group: Amusements/Games
 URL: http://www.geoqo.org/
@@ -19,10 +19,11 @@
 BuildRequires: perl(XML::Simple)
 BuildRequires: perl(DBD::SQLite2)
 BuildRequires: perl(Text::Balanced)
+Patch0: geoqo-makefile.patch
 
 %description
-geoqo is a perl script and support modules for manipulating a database
-of geocaching and other waypoints.
+geoqo is an application and support modules for manipulating a database
+of geocaching and other types of waypoints.
 
 The homepage for GeoQO is the best place to read about it, and can be
 found at:
@@ -32,13 +33,15 @@
 %prep
 %setup -q -n geoqo-%{version}
 
+%patch0 -p0
+
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
 make %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
-make pure_install PERL_INSTALL_ROOT=%{buildroot}
+make pure_install PERL_INSTALL_ROOT=%{buildroot} GQINSTALLDIR=%{buildroot}/usr geoqoadditions
 
 find %{buildroot} -type f -name .packlist -exec rm -f {} \;
 find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \;
@@ -69,7 +72,18 @@
 %{perl_vendorlib}/*
 %{_mandir}/man3/*
 
+%{_datadir}/geoqo
+%{_datadir}/geoqo/icons
+%{_datadir}/geoqo/icons/*
+%{_datadir}/geoqo/classify-ignore-words
+%{_datadir}/geoqo/scripts
+%{_datadir}/geoqo/scripts/*
+%{_datadir}/geoqo/scripts/*/*
+
 %changelog
+* Wed Nov 19 2008 Wes Hardaker <wjhns174 at hardakers.net> - 0.99-1
+- Update to version 0.99
+
 * Mon Jul 21 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.97-3
 - fix license tag (nothing is Artistic in here)