Author: qboosh Date: Sun Feb 19 13:55:02 2012 GMT Module: packages Tag: HEAD ---- Log message: - added link patch - updated BRs - pl for -gui
---- Files affected: packages/gpsbabel: gpsbabel.spec (1.15 -> 1.16) , gpsbabel-link.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/gpsbabel/gpsbabel.spec diff -u packages/gpsbabel/gpsbabel.spec:1.15 packages/gpsbabel/gpsbabel.spec:1.16 --- packages/gpsbabel/gpsbabel.spec:1.15 Sun Feb 12 22:15:22 2012 +++ packages/gpsbabel/gpsbabel.spec Sun Feb 19 14:54:57 2012 @@ -1,18 +1,16 @@ # $Revision$, $Date$ -# TODO -# - fix as-needed fix needed # # 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.3 Release: 1 -License: GPL -Group: Applications +License: GPL v2+ +Group: Applications/Engineering # Source0Download via POST form at https://www.gpsbabel.org/download.html#downloading # token=$(curl -s http://www.gpsbabel.org/download.html | sed -rne 's/.*token.*value="([^"]+)".*/\1/p' | head -n1) # version=1.4.3 @@ -24,13 +22,17 @@ Patch0: %{name}-auto.patch Patch1: use-system-shapelib.patch Patch2: gmapbase.patch +Patch3: %{name}-link.patch URL: http://www.gpsbabel.org/ -BuildRequires: autoconf +BuildRequires: autoconf >= 2.59 BuildRequires: automake +BuildRequires: docbook-style-xsl BuildRequires: expat-devel -BuildRequires: libusb-devel +BuildRequires: libusb-compat-devel >= 0.1 +BuildRequires: libxslt-progs BuildRequires: rpmbuild(macros) >= 1.600 BuildRequires: shapelib-devel +BuildRequires: zlib-devel %if %{with qt4} BuildRequires: QtCore-devel >= %{qtver} BuildRequires: QtGui-devel >= %{qtver} @@ -44,9 +46,6 @@ %endif BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -# FIXME -%define filterout_ld -Wl,--as-needed - %define translationdir %{_datadir}/qt4/translations %description @@ -59,18 +58,22 @@ %package gui Summary: Qt GUI interface for GPSBabel -License: GPL v2+ +Summary(pl.UTF-8): Graficzny interfejs Qt do programu GPSBabel Group: Applications/Engineering Requires: %{name} = %{version}-%{release} %description gui -Qt GUI interface for GPSBabel +Qt GUI interface for GPSBabel. + +%description gui -l pl.UTF-8 +Graficzny interfejs Qt do programu GPSBabel. %prep %setup -q %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 # Use system shapelib instead of bundled partial shapelib mv shapelib{,.bundled} @@ -136,8 +139,7 @@ %files %defattr(644,root,root,755) -%doc AUTHORS README* -#%doc gpsbabel.html +%doc AUTHORS README* gpsbabel.html %attr(755,root,root) %{_bindir}/gpsbabel %if %{with qt4} @@ -145,8 +147,8 @@ %defattr(644,root,root,755) %doc gui/{AUTHORS,README*,TODO} %attr(755,root,root) %{_bindir}/gpsbabelfe-bin -%{_desktopdir}/*.desktop -%{_iconsdir}/hicolor/*/apps/*.png +%{_desktopdir}/gpsbabel.desktop +%{_iconsdir}/hicolor/*/apps/gpsbabel.png %dir %{_datadir}/%{name} %{_datadir}/%{name}/gmapbase.html # XXX move to qt.spec? @@ -159,6 +161,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.16 2012/02/19 13:54:57 qboosh +- added link patch +- updated BRs +- pl for -gui + Revision 1.15 2012/02/12 21:15:22 glen - install gmapbase.html (for google maps preview) ================================================================ Index: packages/gpsbabel/gpsbabel-link.patch diff -u /dev/null packages/gpsbabel/gpsbabel-link.patch:1.1 --- /dev/null Sun Feb 19 14:55:02 2012 +++ packages/gpsbabel/gpsbabel-link.patch Sun Feb 19 14:54:57 2012 @@ -0,0 +1,11 @@ +--- gpsbabel-1.4.3/Makefile.in.orig 2012-02-19 14:15:39.111366297 +0100 ++++ gpsbabel-1.4.3/Makefile.in 2012-02-19 14:28:38.421392392 +0100 +@@ -98,7 +98,7 @@ + uuid.o formspec.o xmltag.o cet.o cet_util.o fatal.o rgbcolors.o \ + inifile.o garmin_fs.o gbsleep.o units.o @GBSER@ gbser.o \ + gbfile.o parse.o avltree.o session.o \ +- $(PALM_DB) $(GARMIN) $(JEEPS) $(SHAPE) @ZLIB@ $(FMTS) $(FILTERS) ++ $(PALM_DB) $(GARMIN) $(JEEPS) $(FMTS) $(FILTERS) $(SHAPE) @ZLIB@ + OBJS = main.o globals.o $(LIBOBJS) @FILEINFO@ + + .c.o: ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gpsbabel/gpsbabel.spec?r1=1.15&r2=1.16&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
