packages: gpsbabel/gpsbabel.spec, gpsbabel/gpsbabel.desktop (NEW), gpsbabel...

[glen]

Author: glen                         Date: Thu Sep  1 21:06:28 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- add qt4 gui

---- Files affected:
packages/gpsbabel:
   gpsbabel.spec (1.9 -> 1.10) , gpsbabel.desktop (NONE -> 1.1)  (NEW), gpsbabel.png (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/gpsbabel/gpsbabel.spec
diff -u packages/gpsbabel/gpsbabel.spec:1.9 packages/gpsbabel/gpsbabel.spec:1.10
--- packages/gpsbabel/gpsbabel.spec:1.9	Thu Sep  1 21:31:38 2011
+++ packages/gpsbabel/gpsbabel.spec	Thu Sep  1 23:06:23 2011
@@ -1,25 +1,44 @@
 # $Revision$, $Date$
 # TODO
-# - Qt gui
 # - Use system shapelib instead of bundled partial shapelib
+#
+# Conditional build:
+%bcond_without	qt4		# build Qt4 GUI
+
+%define		qtver		4.7.1
 Summary:	GPSBabel - convert GPS waypoint, route and track data
 Summary(pl.UTF-8):	GPSBabel - konwertowanie danych GPS: waypointów, tras i śladów
 Name:		gpsbabel
 Version:	1.4.2
-Release:	1
+Release:	2
 License:	GPL
 Group:		Applications
 # Source0Download via POST form at https://www.gpsbabel.org/download.html#downloading
-Source0:	http://pkgs.fedoraproject.org/repo/pkgs/gpsbabel/%{name}-%{version}.tar.gz/76ea9f7852be2e98aa18976c4697ca93/%{name}-%{version}.tar.gz
+Source0:	http://pkgs.fedoraproject.org/repo/pkgs/gpsbabel/%{name}-%{version}.tar.gz/76ea9f7852be2e98aa18976c4697ca93/gpsbabel-%{version}.tar.gz
 # Source0-md5:	76ea9f7852be2e98aa18976c4697ca93
+Source1:	%{name}.desktop
+Source2:	%{name}.png
 Patch0:		%{name}-auto.patch
 URL:		http://www.gpsbabel.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	expat-devel
 BuildRequires:	libusb-devel
+BuildRequires:	rpmbuild(macros) >= 1.600
+%if %{with qt4}
+BuildRequires:	QtCore-devel >= %{qtver}
+BuildRequires:	QtGui-devel >= %{qtver}
+BuildRequires:	QtNetwork-devel >= %{qtver}
+BuildRequires:	QtWebKit-devel >= %{qtver}
+BuildRequires:	QtXml-devel >= %{qtver}
+BuildRequires:	desktop-file-utils
+BuildRequires:	qt4-build >= %{qtver}
+BuildRequires:	qt4-qmake >= %{qtver}
+%endif
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define		translationdir	%{_datadir}/qt4/translations
+
 %description
 Converts GPS waypoint, route and track data from one format type to
 another.
@@ -28,6 +47,15 @@
 GPSBabel konwertuje dane GPS: waypointy, trasy i ślady z jednego
 formatu na drugi.
 
+%package gui
+Summary:	Qt GUI interface for GPSBabel
+License:	GPL v2+
+Group:		Applications/Engineering
+Requires:	%{name} = %{version}-%{release}
+
+%description gui
+Qt GUI interface for GPSBabel
+
 %prep
 %setup -q
 %patch0 -p1
@@ -35,16 +63,60 @@
 %build
 %{__aclocal}
 %{__autoconf}
-%configure
+%configure \
+	--with-zlib=system \
+	--with-doc=./manual
 %{__make}
 
+%{__perl} xmldoc/makedoc
+%{__make} gpsbabel.html
+
+%if %{with qt4}
+cd gui
+qmake-qt4
+lrelease-qt4 *.ts
+%{__make}
+%endif
+
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_bindir}
-
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+%if %{with qt4}
+%{__make} -C gui install \
+	DESTDIR=$RPM_BUILD_ROOT
+
+install -d $RPM_BUILD_ROOT{%{_bindir},%{translationdir}}
+install -p gui/objects/gpsbabelfe-bin $RPM_BUILD_ROOT%{_bindir}
+install -p gui/gpsbabel*_*.qm         $RPM_BUILD_ROOT%{translationdir}
+
+desktop-file-install \
+	--dir $RPM_BUILD_ROOT%{_desktopdir} \
+	%{SOURCE1}
+
+install -d $RPM_BUILD_ROOT%{_iconsdir}/hicolor/256x256/apps
+cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_iconsdir}/hicolor/256x256/apps
+
+#%find_lang %{name} --with-qt --all-name
+# TODO: patch find lang
+cat <<EOF > %{name}.lang
+%lang(de) %{translationdir}/gpsbabel_de.qm
+%lang(es) %{translationdir}/gpsbabel_es.qm
+%lang(fr) %{translationdir}/gpsbabel_fr.qm
+%lang(hu) %{translationdir}/gpsbabel_hu.qm
+%lang(it) %{translationdir}/gpsbabel_it.qm
+%lang(de) %{translationdir}/gpsbabelfe_de.qm
+%lang(es) %{translationdir}/gpsbabelfe_es.qm
+%lang(fr) %{translationdir}/gpsbabelfe_fr.qm
+%lang(hu) %{translationdir}/gpsbabelfe_hu.qm
+%lang(it) %{translationdir}/gpsbabelfe_it.qm
+%lang(ru) %{translationdir}/gpsbabelfe_ru.qm
+EOF
+
+%endif
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -54,12 +126,26 @@
 #%doc gpsbabel.html
 %attr(755,root,root) %{_bindir}/gpsbabel
 
+%if %{with qt4}
+%files gui -f %{name}.lang
+%defattr(644,root,root,755)
+%doc gui/{AUTHORS,README*,TODO}
+%attr(755,root,root) %{_bindir}/gpsbabelfe-bin
+%{_desktopdir}/*.desktop
+%{_iconsdir}/hicolor/*/apps/*.png
+# XXX move to qt.spec?
+%dir %{translationdir}
+%endif
+
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.10  2011/09/01 21:06:23  glen
+- add qt4 gui
+
 Revision 1.9  2011/09/01 19:31:38  glen
 - up to 1.4.2
 
@@ -67,7 +153,7 @@
 - Source0 name fix
 
 Revision 1.7  2008/12/22 11:14:28  matkor
-Version 1.3.6. Release 1.
+- Version 1.3.6. Release 1.
 
 Revision 1.6  2008/08/19 20:34:44  arekm
 - up to 1.3.5

================================================================
Index: packages/gpsbabel/gpsbabel.desktop
diff -u /dev/null packages/gpsbabel/gpsbabel.desktop:1.1
--- /dev/null	Thu Sep  1 23:06:28 2011
+++ packages/gpsbabel/gpsbabel.desktop	Thu Sep  1 23:06:23 2011
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Type=Application
+Name=GPSBabel
+Comment=Qt GUI interface for GPSBabel
+GenericName=GPSBabel
+Icon=gpsbabel
+Exec=gpsbabelfe-bin
+Terminal=false
+Categories=Geography;Education;Utility;

================================================================
Index: packages/gpsbabel/gpsbabel.png
<<Binary file>>
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gpsbabel/gpsbabel.spec?r1=1.9&r2=1.10&f=u