rpms/qlandkarte/F-7 .cvsignore, 1.2, 1.3 qlandkarte.spec, 1.2, 1.3 sources, 1.3, 1.4 qlandkarte-gcc43.patch, 1.1, NONE

[Dan Horak (sharkcz)]

Author: sharkcz

Update of /cvs/pkgs/rpms/qlandkarte/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv886

Modified Files:
	.cvsignore qlandkarte.spec sources 
Removed Files:
	qlandkarte-gcc43.patch 
Log Message:
* Sun Feb 17 2008 Dan Horak <dan[at]danny.cz> 0.7.1-1
- upgrade to 0.7.1
- fixes RH #426807 (many thanks goes to Albrecht who did all the work
  and successfully integrated it in the the upstream code)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qlandkarte/F-7/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Jan 2008 15:09:36 -0000	1.2
+++ .cvsignore	17 Feb 2008 17:15:54 -0000	1.3
@@ -1 +1 @@
-QLandkarte.2007.12.22.tar.gz
+QLandkarte-0.7.1.tar.gz


Index: qlandkarte.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qlandkarte/F-7/qlandkarte.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- qlandkarte.spec	9 Jan 2008 15:09:36 -0000	1.2
+++ qlandkarte.spec	17 Feb 2008 17:15:54 -0000	1.3
@@ -1,18 +1,16 @@
 %define cap_name QLandkarte
-%define release_date 2007.12.22
 
 Name: qlandkarte
-Version: 0.6.0
+Version: 0.7.1
 Release: 1%{?dist}
 Summary: A tool to visualize maps and other GPS information for Garmin devices
 
 Group: Applications/Communications
 License: GPLv2+
 URL: http://qlandkarte.sourceforge.net/
-Source0: http://downloads.sourceforge.net/%{name}/%{cap_name}.%{release_date}.tar.gz
+Source0: http://downloads.sourceforge.net/%{name}/%{cap_name}-%{version}.tar.gz
 Source1: %{name}.desktop
 Source2: %{name}.xpm
-Patch0: %{name}-gcc43.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: qt4-devel proj-devel libusb-devel desktop-file-utils
@@ -22,15 +20,13 @@
 
 
 %prep
-%setup -q -n %{cap_name}
-%patch0 -p0 -b .gcc43
-
-# fix plugin dir
-sed -i 's|/usr/lib|%{_libdir}|' common
+%setup -q -n %{cap_name}-%{version}
 
 
 %build
-%{_qt4_qmake} QMAKE_CXXFLAGS_RELEASE="%{optflags}" QMAKE_CXXFLAGS_DEBUG="%{optflags}" QLandkarte.pro
+%configure
+# rerun qmake to include our C and CXX flags
+%{_qt4_qmake} -unix QMAKE_CFLAGS="%{optflags}" QMAKE_CXXFLAGS="%{optflags}" "CONFIG+=debug" QLandkarte.pro
 make
 
 
@@ -38,9 +34,11 @@
 rm -rf %{buildroot}
 make install INSTALL_ROOT=%{buildroot}
 
-%{__mv} %{buildroot}/%{_bindir}/%{cap_name} %{buildroot}/%{_bindir}/%{name}
-
 install -m 0644 -p -D %{SOURCE2} %{buildroot}%{_datadir}/pixmaps/%{name}.xpm
+rm -rf %{buildroot}%{_datadir}/menu
+rm  %{buildroot}%{_datadir}/applications/%{name}.desktop
+mkdir -p %{buildroot}%{_mandir}/man1
+mv %{buildroot}%{_mandir}/%{name}.1 %{buildroot}%{_mandir}/man1
 
 desktop-file-install --vendor fedora \
         --dir %{buildroot}%{_datadir}/applications \
@@ -59,9 +57,18 @@
 %{_libdir}/%{name}/*
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/pixmaps/%{name}.xpm
+%{_mandir}/man1/%{name}.*
 
 
 %changelog
+* Sun Feb 17 2008 Dan Horak <dan[at]danny.cz> 0.7.1-1
+- upgrade to 0.7.1
+- fixes RH #426807 (many thanks goes to Albrecht who did all the work
+  and successfully integrated it in the the upstream code)
+
+* Thu Feb 14 2008 Dan Horak <dan[at]danny.cz> 0.6.0-2
+- rebuild with gcc 4.3
+
 * Thu Jan  3 2008 Dan Horak <dan[at]danny.cz> 0.6.0-1
 - upgrade to 0.6.0
 - fix compile with gcc 4.3


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qlandkarte/F-7/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	9 Jan 2008 15:09:36 -0000	1.3
+++ sources	17 Feb 2008 17:15:54 -0000	1.4
@@ -1 +1 @@
-614cd25963e834fefcaea7137e2aa8d8  QLandkarte.2007.12.22.tar.gz
+f35ef02217d77ae203c33cdd25fd8c33  QLandkarte-0.7.1.tar.gz


--- qlandkarte-gcc43.patch DELETED ---