rpms/merkaartor/devel .cvsignore, 1.2, 1.3 merkaartor.spec, 1.1, 1.2 sources, 1.2, 1.3

[Sven Lankes (slankes)]

Author: slankes

Update of /cvs/pkgs/rpms/merkaartor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16108

Modified Files:
	.cvsignore merkaartor.spec sources 
Log Message:
Update to 0.0.11-rc1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/merkaartor/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	25 Jul 2008 17:16:52 -0000	1.2
+++ .cvsignore	28 Jul 2008 22:18:08 -0000	1.3
@@ -1 +1 @@
-Merkaartor-0.0.10.tgz
+Merkaartor-0.11rc1.tgz


Index: merkaartor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/merkaartor/devel/merkaartor.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- merkaartor.spec	25 Jul 2008 17:16:52 -0000	1.1
+++ merkaartor.spec	28 Jul 2008 22:18:08 -0000	1.2
@@ -1,17 +1,17 @@
 Name:           merkaartor
-Version:        0.0.10
-Release:        7%{?dist}
+Version:        0.0.11
+Release:        0.1.rc1%{?dist}
 Summary:        QT-Based OpenStreetMap editor
 
 Group:          Applications/Productivity
 License:        GPLv2
 URL:            http://www.irule.be/bvh/c++/merkaartor/ 
-Source0:        http://www.irule.be/bvh/c++/merkaartor/versions/Merkaartor-%{version}.tgz 
+Source0:        http://www.irule.be/pipe/Merkaartor-0.11rc1.tgz
 Source1:        %{name}.desktop
 Source2:        %{name}.xpm
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  qt4-devel >= 4.3
+BuildRequires:  qt4-devel >= 4.4
 BuildRequires:  desktop-file-utils
 
 %description
@@ -29,13 +29,14 @@
 find -name "*.cpp" -exec %{__chmod} -x '{}' \; 
 
 %build
-qmake-qt4 Merkaartor.pro PREFIX=%{_prefix}
+lrelease-qt4 Merkaartor.pro
+qmake-qt4 Merkaartor.pro PREFIX=%{_prefix} NODEBUG=1 NOWEBKIT=1
 make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -p -D release/%{name} $RPM_BUILD_ROOT/%{_bindir}/%{name}
+make INSTALL_ROOT=${RPM_BUILD_ROOT} install
 install -p -m 644 -D %{SOURCE2} $RPM_BUILD_ROOT/%{_datadir}/pixmaps/%{name}.xpm  
 desktop-file-install --vendor="fedora" \
   --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE1} 
@@ -47,6 +48,7 @@
 %files
 %defattr(-,root,root,-)
 %{_bindir}/%{name}
+%{_datadir}/merkaartor/translations/%{name}_*.qm
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/pixmaps/%{name}.xpm
 %doc AUTHORS CHANGELOG HACKING LICENSE
@@ -54,6 +56,9 @@
 
 
 %changelog
+* Mon Jul 28 2008 slankes <sven at lank.es> - 0.0.11-0.1.rc1
+- update to release candidate
+
 * Thu Jul 24 2008 slankes <sven at lank.es> - 0.0.10-7
 - fix executable source-files
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/merkaartor/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	25 Jul 2008 17:16:52 -0000	1.2
+++ sources	28 Jul 2008 22:18:08 -0000	1.3
@@ -1 +1 @@
-af231c7a6834ffa72ddb9983b344821f  Merkaartor-0.0.10.tgz
+85774d67bc977da26dff9db683db5e24  Merkaartor-0.11rc1.tgz