rpms/qlandkarte/EL-5 qlandkarte-0.7.4-qt42.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 qlandkarte.spec, 1.1, 1.2 sources, 1.2, 1.3 qlandkarte.desktop, 1.1, NONE qlandkarte.xpm, 1.1, NONE
Dan Horák
sharkcz at fedoraproject.org
Thu Dec 25 10:19:47 UTC 2008
Author: sharkcz
Update of /cvs/pkgs/rpms/qlandkarte/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17084
Modified Files:
.cvsignore qlandkarte.spec sources
Added Files:
qlandkarte-0.7.4-qt42.patch
Removed Files:
qlandkarte.desktop qlandkarte.xpm
Log Message:
import into EL5 with a QT 4.2 backport
qlandkarte-0.7.4-qt42.patch:
--- NEW FILE qlandkarte-0.7.4-qt42.patch ---
Index: src/IDlgConfig.ui
===================================================================
--- src/IDlgConfig.ui (revision 521)
+++ src/IDlgConfig.ui (working copy)
@@ -16,18 +16,6 @@
<property name="spacing" >
<number>6</number>
</property>
- <property name="leftMargin" >
- <number>9</number>
- </property>
- <property name="topMargin" >
- <number>9</number>
- </property>
- <property name="rightMargin" >
- <number>9</number>
- </property>
- <property name="bottomMargin" >
- <number>9</number>
- </property>
<item>
<widget class="QTabWidget" name="tabWidget" >
<property name="currentIndex" >
@@ -41,18 +29,6 @@
<property name="spacing" >
<number>6</number>
</property>
- <property name="leftMargin" >
- <number>9</number>
- </property>
- <property name="topMargin" >
- <number>9</number>
- </property>
- <property name="rightMargin" >
- <number>9</number>
- </property>
- <property name="bottomMargin" >
- <number>9</number>
- </property>
<item>
<widget class="QGroupBox" name="groupBox" >
<property name="title" >
@@ -62,18 +38,6 @@
<property name="spacing" >
<number>6</number>
</property>
- <property name="leftMargin" >
- <number>9</number>
- </property>
- <property name="topMargin" >
- <number>9</number>
- </property>
- <property name="rightMargin" >
- <number>9</number>
- </property>
- <property name="bottomMargin" >
- <number>9</number>
- </property>
<item>
<widget class="QLabel" name="labelFontSample" >
<property name="text" >
@@ -100,18 +64,6 @@
<property name="spacing" >
<number>6</number>
</property>
- <property name="leftMargin" >
- <number>9</number>
- </property>
- <property name="topMargin" >
- <number>9</number>
- </property>
- <property name="rightMargin" >
- <number>9</number>
- </property>
- <property name="bottomMargin" >
- <number>9</number>
- </property>
<item>
<widget class="QRadioButton" name="radioMetric" >
<property name="text" >
@@ -141,18 +93,6 @@
<property name="spacing" >
<number>6</number>
</property>
- <property name="leftMargin" >
- <number>9</number>
- </property>
- <property name="topMargin" >
- <number>9</number>
- </property>
- <property name="rightMargin" >
- <number>9</number>
- </property>
- <property name="bottomMargin" >
- <number>9</number>
- </property>
<item>
<widget class="QLabel" name="label_4" >
<property name="text" >
@@ -229,18 +169,6 @@
<property name="spacing" >
<number>6</number>
</property>
- <property name="leftMargin" >
- <number>9</number>
- </property>
- <property name="topMargin" >
- <number>9</number>
- </property>
- <property name="rightMargin" >
- <number>9</number>
- </property>
- <property name="bottomMargin" >
- <number>9</number>
- </property>
<item>
<widget class="QGroupBox" name="groupBox_3" >
<property name="title" >
@@ -250,18 +178,6 @@
<property name="spacing" >
<number>6</number>
</property>
- <property name="leftMargin" >
- <number>9</number>
- </property>
- <property name="topMargin" >
- <number>9</number>
- </property>
- <property name="rightMargin" >
- <number>9</number>
- </property>
- <property name="bottomMargin" >
- <number>9</number>
- </property>
<item>
<widget class="QCheckBox" name="checkProxy" >
<property name="text" >
@@ -274,18 +190,6 @@
<property name="spacing" >
<number>6</number>
</property>
- <property name="leftMargin" >
- <number>0</number>
- </property>
- <property name="topMargin" >
- <number>0</number>
- </property>
- <property name="rightMargin" >
- <number>0</number>
- </property>
- <property name="bottomMargin" >
- <number>0</number>
- </property>
<item>
<widget class="QLabel" name="label" >
<property name="text" >
@@ -330,18 +234,6 @@
<property name="spacing" >
<number>6</number>
</property>
- <property name="leftMargin" >
- <number>9</number>
- </property>
- <property name="topMargin" >
- <number>9</number>
- </property>
- <property name="rightMargin" >
- <number>9</number>
- </property>
- <property name="bottomMargin" >
- <number>9</number>
- </property>
<item>
<widget class="QComboBox" name="comboBrowser" >
<item>
@@ -417,18 +309,6 @@
<property name="spacing" >
<number>6</number>
</property>
- <property name="leftMargin" >
- <number>9</number>
- </property>
- <property name="topMargin" >
- <number>9</number>
- </property>
- <property name="rightMargin" >
- <number>9</number>
- </property>
- <property name="bottomMargin" >
- <number>9</number>
- </property>
<item>
<widget class="QGroupBox" name="groupBox_6" >
<property name="title" >
@@ -438,18 +318,6 @@
<property name="spacing" >
<number>6</number>
</property>
- <property name="leftMargin" >
- <number>9</number>
- </property>
- <property name="topMargin" >
- <number>9</number>
- </property>
- <property name="rightMargin" >
- <number>9</number>
- </property>
- <property name="bottomMargin" >
- <number>9</number>
- </property>
<item>
<widget class="QCheckBox" name="checkUpMap" >
<property name="text" >
@@ -496,18 +364,6 @@
<property name="spacing" >
<number>6</number>
</property>
- <property name="leftMargin" >
- <number>9</number>
- </property>
- <property name="topMargin" >
- <number>9</number>
- </property>
- <property name="rightMargin" >
- <number>9</number>
- </property>
- <property name="bottomMargin" >
- <number>9</number>
- </property>
<item>
<widget class="QCheckBox" name="checkDnMap" >
<property name="text" >
@@ -554,18 +410,6 @@
<property name="spacing" >
<number>6</number>
</property>
- <property name="leftMargin" >
- <number>9</number>
- </property>
- <property name="topMargin" >
- <number>9</number>
- </property>
- <property name="rightMargin" >
- <number>9</number>
- </property>
- <property name="bottomMargin" >
- <number>9</number>
- </property>
<item>
<widget class="QLabel" name="label_7" >
<property name="text" >
@@ -578,18 +422,6 @@
<property name="spacing" >
<number>6</number>
</property>
- <property name="leftMargin" >
- <number>0</number>
- </property>
- <property name="topMargin" >
- <number>0</number>
- </property>
- <property name="rightMargin" >
- <number>0</number>
- </property>
- <property name="bottomMargin" >
- <number>0</number>
- </property>
<item>
<widget class="QLabel" name="label_6" >
<property name="text" >
@@ -632,18 +464,6 @@
<property name="spacing" >
<number>6</number>
</property>
- <property name="leftMargin" >
- <number>9</number>
- </property>
- <property name="topMargin" >
- <number>9</number>
- </property>
- <property name="rightMargin" >
- <number>9</number>
- </property>
- <property name="bottomMargin" >
- <number>9</number>
- </property>
<item>
<widget class="QComboBox" name="comboProjection" />
</item>
Index: src/IToolViewRoute.ui
===================================================================
--- src/IToolViewRoute.ui (revision 521)
+++ src/IToolViewRoute.ui (working copy)
@@ -16,18 +16,6 @@
<property name="spacing" >
<number>1</number>
</property>
- <property name="leftMargin" >
- <number>1</number>
- </property>
- <property name="topMargin" >
- <number>1</number>
- </property>
- <property name="rightMargin" >
- <number>1</number>
- </property>
- <property name="bottomMargin" >
- <number>1</number>
- </property>
<item>
<widget class="QTreeWidget" name="listRoutes" >
<property name="contextMenuPolicy" >
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qlandkarte/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 22 Oct 2007 19:41:21 -0000 1.1
+++ .cvsignore 25 Dec 2008 10:19:16 -0000 1.2
@@ -0,0 +1 @@
+QLandkarte_final.tar.gz
Index: qlandkarte.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qlandkarte/EL-5/qlandkarte.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qlandkarte.spec 23 Oct 2007 11:15:55 -0000 1.1
+++ qlandkarte.spec 25 Dec 2008 10:19:17 -0000 1.2
@@ -1,19 +1,19 @@
%define cap_name QLandkarte
-%define release_date 2007.09.18
Name: qlandkarte
-Version: 0.5.3
-Release: 4%{?dist}
+Version: 0.7.4
+%define cap_name_version %{cap_name}_final
+Release: 1%{?dist}.1
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
-Source1: %{name}.desktop
-Source2: %{name}.xpm
+Source0: http://downloads.sourceforge.net/%{name}/%{cap_name_version}.tar.gz
+Patch0: %{name}-0.7.4-qt42.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: autoconf
BuildRequires: qt4-devel proj-devel libusb-devel desktop-file-utils
%description
@@ -21,16 +21,17 @@
%prep
-%setup -q -n %{cap_name}
+%setup -q -n %{cap_name_version}
+%patch0 -p0 -b .qt42
-# fix plugin dir
-sed -i 's|/usr/lib|%{_libdir}|' common
-# remove additional compile flags
-sed -i 's|-O3||' common
+autoheader
+autoconf
%build
-qmake-qt4 QLandkarte.pro
+%configure --with-qt-dir=%{_libdir}/qt4
+# rerun qmake to include our C and CXX flags
+%{_libdir}/qt4/bin/qmake -unix QMAKE_CFLAGS="%{optflags}" QMAKE_CXXFLAGS="%{optflags}" "CONFIG+=debug" QLandkarte.pro
make
@@ -38,19 +39,37 @@
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
+for d in 16x16 32x32
+do
+ install -m 0644 -p -D src/icons/%{cap_name}$d.png %{buildroot}%{_datadir}/icons/hicolor/$d/apps/%{name}.png
+done
+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 \
- %{SOURCE1}
+ %{name}.desktop
%clean
rm -rf %{buildroot}
+%post
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+ %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+ %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+
+
%files
%defattr(-, root, root)
%doc copying changelog.txt
@@ -58,10 +77,36 @@
%dir %{_libdir}/%{name}
%{_libdir}/%{name}/*
%{_datadir}/applications/fedora-%{name}.desktop
-%{_datadir}/pixmaps/%{name}.xpm
+%{_datadir}/icons/hicolor/*/apps/%{name}.png
+%{_mandir}/man1/%{name}.*
%changelog
+* Tue Dec 23 2008 Dan Horak <dan[at]danny.cz> 0.7.4-1.1
+- backport to QT 4.2
+
+* Tue Dec 23 2008 Dan Horak <dan[at]danny.cz> 0.7.4-1
+- upgrade to 0.7.4, the final version
+
+* Fri Jul 4 2008 Dan Horak <dan[at]danny.cz> 0.7.3-1
+- upgrade to 0.7.3
+
+* Mon May 19 2008 Dan Horak <dan[at]danny.cz> 0.7.2-1
+- upgrade to 0.7.2
+- use supplied icons and desktop file
+
+* 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
+
* Mon Oct 22 2007 Douglas E. Warner <silfreed at silfreed.net> 0.5.3-4
- including icon for desktop file
- disabling parallel make flags
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qlandkarte/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 23 Oct 2007 11:15:55 -0000 1.2
+++ sources 25 Dec 2008 10:19:17 -0000 1.3
@@ -1 +1 @@
-ac787a7be7e1f0f6060f8ec6c31b78dc QLandkarte.2007.09.18.tar.gz
+3622329ff7b3ffc2ff9abd27e2dc9a5d QLandkarte_final.tar.gz
--- qlandkarte.desktop DELETED ---
--- qlandkarte.xpm DELETED ---
More information about the fedora-extras-commits
mailing list