From be69f51d2c76a6299a4653417fa2dcaad4f554af Mon Sep 17 00:00:00 2001 From: Till Maas Date: Apr 18 2009 14:19:29 +0000 Subject: - Move icon installation into Makefile to get upstreamable patch --- diff --git a/.cvsignore b/.cvsignore index e69de29..a473193 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +gpscorrelate-1.6.0.tar.gz diff --git a/gpscorrelate-1.6.0-icon.patch b/gpscorrelate-1.6.0-icon.patch new file mode 100644 index 0000000..9e50495 --- /dev/null +++ b/gpscorrelate-1.6.0-icon.patch @@ -0,0 +1,33 @@ +diff -up gpscorrelate-1.6.0/Makefile.icon gpscorrelate-1.6.0/Makefile +--- gpscorrelate-1.6.0/Makefile.icon 2009-04-18 15:34:22.000000000 +0200 ++++ gpscorrelate-1.6.0/Makefile 2009-04-18 15:33:58.000000000 +0200 +@@ -10,9 +10,10 @@ OFLAGS = -Wall + override OFLAGS += $(shell pkg-config --libs libxml-2.0 gtk+-2.0) -lm -lexiv2 + prefix = /usr/local + bindir = $(prefix)/bin +-mandir = $(prefix)/share/man +-docdir = $(prefix)/share/doc/gpscorrelate +-applicationsdir = $(prefix)/share/applications ++datadir = $(prefix)/share ++mandir = $(datadir)/man ++docdir = $(datadir)/doc/gpscorrelate ++applicationsdir = $(datadir)/applications + + all: gpscorrelate gpscorrelate-gui gpscorrelate.1 + +@@ -41,6 +42,7 @@ install: all + + install-desktop-file: + desktop-file-install --vendor="" --dir="$(DESTDIR)$(applicationsdir)" gpscorrelate.desktop ++ install -p -m0644 -D gpscorrelate-gui.svg $(DESTDIR)$(datadir)/icons/hicolor/scalable/apps/gpscorrelate-gui.svg + + doc/gpscorrelate-manpage.xml: doc/gpscorrelate-manpage.xml.in + sed 's,@DOCDIR@,$(docdir),' $< > $@ +diff -up gpscorrelate-1.6.0/gpscorrelate.desktop.icon gpscorrelate-1.6.0/gpscorrelate.desktop +--- gpscorrelate-1.6.0/gpscorrelate.desktop.icon 2008-10-31 12:50:39.000000000 +0100 ++++ gpscorrelate-1.6.0/gpscorrelate.desktop 2009-04-18 15:34:11.000000000 +0200 +@@ -8,3 +8,4 @@ TryExec=gpscorrelate-gui + Exec=gpscorrelate-gui + Terminal=false + Categories=Graphics;ImageProcessing;Geography;GTK; ++Icon=gpscorrelate-gui diff --git a/gpscorrelate-gui.svg b/gpscorrelate-gui.svg new file mode 100644 index 0000000..3a3fa8e --- /dev/null +++ b/gpscorrelate-gui.svg @@ -0,0 +1,3419 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + gpscorrelate-gui Icon + 2009-04-18 + + + Till Maas <opensource@till.name> + + + + + The following cliparts from Open Clip Art Library were used: + +Anonymous: +http://openclipart.org/media/files/Anonymous/7187 + +najsbajs: +http://openclipart.org/media/files/najsbajs/3243 + + + Icon for the GUI of gpscorrelate: +http://freefoote.dview.net/linux_gpscorr.html + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + S 31° 57'E 115° 51' + + diff --git a/gpscorrelate.spec b/gpscorrelate.spec new file mode 100644 index 0000000..a3f9a0a --- /dev/null +++ b/gpscorrelate.spec @@ -0,0 +1,105 @@ +%define docdir_nv %{_docdir}/%{name}-%{version} + +Name: gpscorrelate +Version: 1.6.0 +Release: 2%{?dist} +Summary: A GPS photo correlation / geotagging tool + +Group: Applications/Productivity +License: GPLv2+ +URL: http://freefoote.dview.net/linux_gpscorr.html +Source0: http://freefoote.dview.net/linux/gpscorrelate-%{version}.tar.gz +Source1: gpscorrelate-gui.svg +Patch0: gpscorrelate-1.6.0-icon.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: exiv2-devel libxml2-devel gtk2-devel +# For the .desktop file +BuildRequires: desktop-file-utils +# For the manpage +BuildRequires: libxslt docbook-style-xsl +# For: %{_datadir}/icons/hicolor/scalable/apps/gpscorrelate-gui.svg +Requires: hicolor-icon-theme + + +%description +Gpscorrelate adds coordinates to the exif data of jpeg pictures based on a gpx +track file. The correlation is done by comparing the timestamp of the images +with the timestamp of the gps coordinates. + + +%prep +%setup -q +%patch0 -p1 -b .icon +cp -p %SOURCE1 gpscorrelate-gui.svg + + +%build +make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" OFLAGS="$RPM_OPT_FLAGS" docdir="%{docdir_nv}" + + +%install +rm -rf $RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT bindir=%{_bindir} mandir=%{_mandir} docdir="%{docdir_nv}" +make install-desktop-file DESTDIR=$RPM_BUILD_ROOT datadir=%{_datadir} + + +%clean +rm -rf $RPM_BUILD_ROOT + + +%post +touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : + + +%postun +if [ $1 -eq 0 ] ; then + touch --no-create %{_datadir}/icons/hicolor &>/dev/null + gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : +fi + + +%posttrans +gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : + + +%files +%defattr(-,root,root,-) +%doc COPYING RELEASES doc/*.html doc/*.png +%{_bindir}/%{name} +%{_bindir}/%{name}-gui +%{_datadir}/applications/gpscorrelate.desktop +%{_datadir}/icons/hicolor/scalable/apps/gpscorrelate-gui.svg +%{_mandir}/man1/gpscorrelate.1* + + +%changelog +* Sat Apr 18 2009 Till Maas - 1.6.0-2 +- Move icon installation into Makefile to get upstreamable patch + +* Sun Apr 12 2009 Till Maas - 1.6.0-1 +- Update to new upstream release +- Add svg icon using public domain cliparts by najsbajs and Anonymous from + Open Clip Art Library + +* Sun Feb 15 2009 Till Maas - 1.5.8-2 +- add RELEASES to %%doc + +* Sat Nov 01 2008 Till Maas - 1.5.8-1 +- Update to new upstream version +- Remove upstreamed patches + +* Thu Oct 30 2008 Till Maas - 1.5.7-2 +- add extended manpage based on manpage from debian +- fix help text (--no-write is useful with --verbose, not --show) + +* Thu Oct 30 2008 Till Maas - 1.5.7-1 +- Update to new version, remove upstreamed patch +- add patch to remove some compiler warnings +- add patch to include desktop file install in makefile + +* Wed Aug 13 2008 Till Maas - 1.5.6-2 +- add missing desktop file + +* Sat Aug 02 2008 Till Maas - 1.5.6-1 +- initial version for Fedora diff --git a/sources b/sources index e69de29..d03fb48 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +efb02f5f86f8598ac0bd7211a3c90b72 gpscorrelate-1.6.0.tar.gz