rpms/merkaartor/devel .cvsignore, 1.7, 1.8 merkaartor-noqgtkstyle.patch, 1.1, 1.2 merkaartor.spec, 1.12, 1.13 sources, 1.7, 1.8 merkaartor-eslang.patch, 1.1, NONE
Sven Lankes
slankes at fedoraproject.org
Sun Jul 5 20:42:21 UTC 2009
Author: slankes
Update of /cvs/pkgs/rpms/merkaartor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19073
Modified Files:
.cvsignore merkaartor-noqgtkstyle.patch merkaartor.spec
sources
Removed Files:
merkaartor-eslang.patch
Log Message:
* Sun Jul 05 2009 Sven Lankes <sven at lank.es> - 0.14-0.1-pre2
- 0.14-pre2
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/merkaartor/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore 26 Apr 2009 19:18:30 -0000 1.7
+++ .cvsignore 5 Jul 2009 20:41:51 -0000 1.8
@@ -1 +1 @@
-merkaartor-0.13.2.tar.bz2
+merkaartor-0.14-pre2.tar.bz2
merkaartor-noqgtkstyle.patch:
Index: merkaartor-noqgtkstyle.patch
===================================================================
RCS file: /cvs/pkgs/rpms/merkaartor/devel/merkaartor-noqgtkstyle.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- merkaartor-noqgtkstyle.patch 28 Apr 2009 21:48:40 -0000 1.1
+++ merkaartor-noqgtkstyle.patch 5 Jul 2009 20:41:51 -0000 1.2
@@ -1,11 +1,11 @@
---- Main.cpp.orig 2009-04-28 23:23:20.804816252 +0200
-+++ Main.cpp 2009-04-28 23:23:32.628816670 +0200
-@@ -9,6 +9,8 @@
+--- src/Main.cpp.orig 2009-07-05 19:43:07.450192605 +0200
++++ src/Main.cpp 2009-07-05 19:43:48.432727996 +0200
+@@ -92,6 +92,8 @@
int main(int argc, char** argv)
{
-+ QApplication::setStyle("plastique");
++ QApplication::setStyle("plastique");
+
QApplication app(argc,argv);
- QCoreApplication::setOrganizationName("BartVanhauwaert");
+ QString logFilename(qApp->applicationDirPath() + "/merkaartor.log");
Index: merkaartor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/merkaartor/devel/merkaartor.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- merkaartor.spec 28 Apr 2009 21:48:40 -0000 1.12
+++ merkaartor.spec 5 Jul 2009 20:41:51 -0000 1.13
@@ -1,15 +1,13 @@
Name: merkaartor
-Version: 0.13.2
-Release: 2%{?dist}
+Version: 0.14
+Release: 0.1.pre2%{?dist}
Summary: Qt-Based OpenStreetMap editor
Group: Applications/Productivity
License: GPLv2
URL: http://www.merkaartor.org
-Source0: http://www.merkaartor.org/downloads/source/%{name}-%{version}.tar.bz2
-# This fixes a typo wrt. the es-translation - a fix is already commited upstream for 0.14
-Patch0: merkaartor-eslang.patch
-Patch1: merkaartor-noqgtkstyle.patch
+Source0: http://www.merkaartor.org/downloads/source/%{name}-%{version}-pre2.tar.bz2
+Patch0: merkaartor-noqgtkstyle.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: qt4-devel >= 4.4
@@ -25,22 +23,19 @@ It has some unique features like anti-al
transparent display of map features like roads and curved roads.
%prep
-%setup -q
+%setup -q -n merkaartor-0.14-pre2
%patch0 -p0
-%patch1 -p0
%build
-lrelease-qt4 Merkaartor.pro
-qmake-qt4 Merkaartor.pro PREFIX=%{_prefix} NODEBUG=1 GEOIMAGE=1 GPSD=1 GDAL=1 NVIDIA_HACK=1 FORCE_CUSTOM_STYLE=1
+lrelease-qt4 src/src.pro
+qmake-qt4 Merkaartor.pro PREFIX=%{_prefix} LIBDIR=%{_libdir} NODEBUG=1 GEOIMAGE=1 GPSD=1 GDAL=1 NVIDIA_HACK=1 FORCE_CUSTOM_STYLE=1
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
make INSTALL_ROOT=${RPM_BUILD_ROOT} install
-install -p -m 644 -D Icons/Merkaartor.xpm $RPM_BUILD_ROOT/%{_datadir}/pixmaps/%{name}.xpm
-desktop-file-install --vendor="fedora" \
- --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{name}.desktop
+desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
%clean
rm -rf $RPM_BUILD_ROOT
@@ -49,20 +44,31 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%{_bindir}/%{name}
-%dir %{_datadir}/merkaartor
-%dir %{_datadir}/merkaartor/translations
-%dir %{_datadir}/merkaartor/world_shp
-%dir %{_datadir}/merkaartor/world_shp/*
-%{_datadir}/merkaartor/translations/%{name}_*.qm
-%{_datadir}/applications/fedora-%{name}.desktop
-%{_datadir}/pixmaps/%{name}.xpm
+%dir %{_datadir}/%{name}/
+%dir %{_datadir}/%{name}/translations/
+%{_datadir}/%{name}/translations/%{name}_??.qm
+%{_datadir}/%{name}/world_background.osb
+%{_datadir}/%{name}/*.xml
+%{_datadir}/applications/%{name}.desktop
+%dir %{_libdir}/%{name}/plugins
+%dir %{_libdir}/%{name}/plugins/background
+%{_libdir}/%{name}/plugins/background/*.so
+%dir %{_libdir}/%{name}/plugins/styles
+%{_libdir}/%{name}/plugins/styles/*.so
+%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
%doc AUTHORS CHANGELOG HACKING LICENSE
%changelog
+* Sun Jul 05 2009 Sven Lankes <sven at lank.es> - 0.14-0.1-pre2
+- 0.14-pre2
+
+* Thu Jul 02 2009 Sven Lankes <sven at lank.es> - 0.14-0.1-pre1
+- 0.14-pre1
+
* Tue Apr 28 2009 Sven Lankes <sven at lank.es> - 0.13.2-2
- disable use of qgtkstyle until gdal conflict (bz# 498111) is solved
-* Sun Apr 26 2009 Sven Lankes <sven at lank.es> - 0.13.2-1
+* Sun Apr 25 2009 Sven Lankes <sven at lank.es> - 0.13.2-1
- new upstream release
* Sat Apr 04 2009 Sven Lankes <sven at lank.es> - 0.13.1-1
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/merkaartor/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources 26 Apr 2009 19:18:30 -0000 1.7
+++ sources 5 Jul 2009 20:41:51 -0000 1.8
@@ -1 +1 @@
-0e6a65d723a7fa29f1e8c921a74d1893 merkaartor-0.13.2.tar.bz2
+c814d97a0b9d7b1a96e40d31dbe77242 merkaartor-0.14-pre2.tar.bz2
--- merkaartor-eslang.patch DELETED ---
More information about the fedora-extras-commits
mailing list