Author: glen Date: Sun Feb 12 21:15:28 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- install gmapbase.html (for google maps preview)
---- Files affected:
packages/gpsbabel:
gpsbabel.spec (1.14 -> 1.15) , gmapbase.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/gpsbabel/gpsbabel.spec
diff -u packages/gpsbabel/gpsbabel.spec:1.14
packages/gpsbabel/gpsbabel.spec:1.15
--- packages/gpsbabel/gpsbabel.spec:1.14 Sun Feb 12 21:59:38 2012
+++ packages/gpsbabel/gpsbabel.spec Sun Feb 12 22:15:22 2012
@@ -23,6 +23,7 @@
Source2: %{name}.png
Patch0: %{name}-auto.patch
Patch1: use-system-shapelib.patch
+Patch2: gmapbase.patch
URL: http://www.gpsbabel.org/
BuildRequires: autoconf
BuildRequires: automake
@@ -69,6 +70,7 @@
%setup -q
%patch0 -p1
%patch1 -p1
+%patch2 -p1
# Use system shapelib instead of bundled partial shapelib
mv shapelib{,.bundled}
@@ -98,12 +100,11 @@
DESTDIR=$RPM_BUILD_ROOT
%if %{with qt4}
-%{__make} -C gui install \
- DESTDIR=$RPM_BUILD_ROOT
-
-install -d $RPM_BUILD_ROOT{%{_bindir},%{translationdir}}
+install -d $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/%{name},%{translationdir}}
install -p gui/objects/gpsbabelfe-bin $RPM_BUILD_ROOT%{_bindir}
-install -p gui/gpsbabel*_*.qm $RPM_BUILD_ROOT%{translationdir}
+install -p gui/gpsbabel*_*.qm $RPM_BUILD_ROOT%{translationdir}
+cp -p gui/gmapbase.html $RPM_BUILD_ROOT%{_datadir}/%{name}
desktop-file-install \
--dir $RPM_BUILD_ROOT%{_desktopdir} \
@@ -146,6 +147,8 @@
%attr(755,root,root) %{_bindir}/gpsbabelfe-bin
%{_desktopdir}/*.desktop
%{_iconsdir}/hicolor/*/apps/*.png
+%dir %{_datadir}/%{name}
+%{_datadir}/%{name}/gmapbase.html
# XXX move to qt.spec?
%dir %{translationdir}
%endif
@@ -156,6 +159,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.15 2012/02/12 21:15:22 glen
+- install gmapbase.html (for google maps preview)
+
Revision 1.14 2012/02/12 20:59:38 glen
- up to 1.4.3
================================================================
Index: packages/gpsbabel/gmapbase.patch
diff -u /dev/null packages/gpsbabel/gmapbase.patch:1.1
--- /dev/null Sun Feb 12 22:15:28 2012
+++ packages/gpsbabel/gmapbase.patch Sun Feb 12 22:15:22 2012
@@ -0,0 +1,11 @@
+--- gpsbabel-1.4.3/gui/map.cpp~ 2009-08-28 20:08:55.000000000 +0300
++++ gpsbabel-1.4.3/gui/map.cpp 2012-02-12 23:10:09.498423153 +0200
+@@ -60,7 +60,7 @@
+ connect(this,SIGNAL(loadFinished(bool)),
+ this,SLOT(loadFinishedX(bool)));
+ this->logTimeX("Start map constuctor");
+- QString baseFile = QApplication::applicationDirPath() + "/gmapbase.html";
++ QString baseFile = "/usr/share/gpsbabel/gmapbase.html";
+ if (!QFile(baseFile).exists()) {
+ QMessageBox::critical(0, appName,
+ tr("Missing \"gmapbase.html\" file. Check
installation"));
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gpsbabel/gpsbabel.spec?r1=1.14&r2=1.15&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
