rpms/moto4lin/devel moto4lin-0.3-qmake.patch, NONE, 1.1 moto4lin.spec, 1.3, 1.4

[Jesse Keating (jkeating)]

Author: jkeating

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

Modified Files:
	moto4lin.spec 
Added Files:
	moto4lin-0.3-qmake.patch 
Log Message:
* Tue Apr 08 2008 Rex Dieter <rdieter at fedoraproject.org> - 0.3-9
- BR: qt3-devel (#434135)
- License: GPLv2+


moto4lin-0.3-qmake.patch:

--- NEW FILE moto4lin-0.3-qmake.patch ---
diff -up moto4lin-0.3/moto4lin.pro.qmake moto4lin-0.3/moto4lin.pro
diff -up moto4lin-0.3/moto_ui/moto_ui.pro.qmake moto4lin-0.3/moto_ui/moto_ui.pro
--- moto4lin-0.3/moto_ui/moto_ui.pro.qmake	2005-03-02 12:26:08.000000000 -0600
+++ moto4lin-0.3/moto_ui/moto_ui.pro	2008-04-08 14:59:34.000000000 -0500
@@ -5,7 +5,7 @@
 
 TEMPLATE = app
 LANGUAGE = C++
-CONFIG += debug warn_on qt thread exceptions
+CONFIG += release warn_on qt thread exceptions
 LIBS += -lusb
 TARGET = moto4lin
 SOURCES += main.cpp \


Index: moto4lin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moto4lin/devel/moto4lin.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- moto4lin.spec	8 Apr 2008 02:48:23 -0000	1.3
+++ moto4lin.spec	8 Apr 2008 20:15:59 -0000	1.4
@@ -1,7 +1,7 @@
 Name:           moto4lin
 Version:        0.3
-Release:        8%{?dist}
-License:        GPL
+Release:        9%{?dist}
+License:        GPLv2+
 Summary:        Filemanager and seem editor for Motorola P2k phones
 Group:          Applications/Communications
 URL:            http://moto4lin.sourceforge.net/wiki/Main_Page
@@ -9,8 +9,9 @@
 Source1:        %{name}.desktop
 Source2:        %{name}.png
 Patch1:         %{name}-0.3-crossplatform.patch
+Patch2:         %{name}-0.3-qmake.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  qt-devel, desktop-file-utils, libusb-devel
+BuildRequires:  qt3-devel, desktop-file-utils, libusb-devel
 
 %description
 This software is Filemanager and seem editor for Motorola P2k phones
@@ -19,11 +20,12 @@
 %prep
 
 %setup -q
-%patch1 -p1 -b crossplatform
-qmake
+%patch1 -p1 -b .crossplatform
+%patch2 -p1 -b .qmake
 
 %build
-make CXX="g++ $RPM_OPT_FLAGS" %{_smp_mflags} all
+qmake
+make %{_smp_mflags} all
 
 %install
 rm -rf %{buildroot}
@@ -43,6 +45,10 @@
 %{_datadir}/applications/*
 
 %changelog
+* Tue Apr 08 2008 Rex Dieter <rdieter at fedoraproject.org> - 0.3-9
+- BR: qt3-devel (#434135)
+- License: GPLv2+
+
 * Mon Apr 07 2008 Jesse Keating <jkeating at redhat.com> - 0.3-8
 - Fix desktop file.