rpms/merkaartor/devel .cvsignore, 1.8, 1.9 merkaartor.spec, 1.14, 1.15 sources, 1.8, 1.9 merkaartor-noqgtkstyle.patch, 1.2, NONE

[Sven Lankes]

Author: slankes

Update of /cvs/pkgs/rpms/merkaartor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8371

Modified Files:
	.cvsignore merkaartor.spec sources 
Removed Files:
	merkaartor-noqgtkstyle.patch 
Log Message:
* Wed Aug 12 2009 Sven Lankes <sven at lank.es> - 0.14-1
- 0.14
- Remove patch for gdal/qtgtkstyle-related crash - seems to be fixed in gdal



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/merkaartor/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	5 Jul 2009 20:41:51 -0000	1.8
+++ .cvsignore	12 Aug 2009 14:52:29 -0000	1.9
@@ -1 +1 @@
-merkaartor-0.14-pre2.tar.bz2
+merkaartor-0.14.tar.bz2


Index: merkaartor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/merkaartor/devel/merkaartor.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- merkaartor.spec	25 Jul 2009 12:03:58 -0000	1.14
+++ merkaartor.spec	12 Aug 2009 14:52:29 -0000	1.15
@@ -1,13 +1,12 @@
 Name:           merkaartor
 Version:        0.14
-Release:        0.2.pre2%{?dist}
+Release:        1%{?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}-pre2.tar.bz2
-Patch0:         merkaartor-noqgtkstyle.patch
+Source0:        http://www.merkaartor.org/downloads/source/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt4-devel >= 4.4
@@ -23,8 +22,8 @@ It has some unique features like anti-al
 transparent display of map features like roads and curved roads.
 
 %prep
-%setup -q -n merkaartor-0.14-pre2 
-%patch0 -p0
+%setup -q -n merkaartor-0.14 
+find \( -name "*.cpp" -o -name "*.h" \) -exec chmod -x {} \;
 
 %build
 lrelease-qt4 src/src.pro
@@ -59,6 +58,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS CHANGELOG HACKING LICENSE
 
 %changelog
+* Wed Aug 12 2009 Sven Lankes <sven at lank.es> - 0.14-1
+- 0.14
+- Remove patch for gdal/qtgtkstyle-related crash - seems to be fixed in gdal
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.14-0.2.pre2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/merkaartor/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	5 Jul 2009 20:41:51 -0000	1.8
+++ sources	12 Aug 2009 14:52:29 -0000	1.9
@@ -1 +1 @@
-c814d97a0b9d7b1a96e40d31dbe77242  merkaartor-0.14-pre2.tar.bz2
+61e01855f4fc99d0cb5bf1696534f5a0  merkaartor-0.14.tar.bz2


--- merkaartor-noqgtkstyle.patch DELETED ---