rpms/qscintilla/FC-5 .cvsignore, 1.3, 1.4 qscintilla.spec, 1.5, 1.6 sources, 1.3, 1.4

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/extras/rpms/qscintilla/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14683

Modified Files:
	.cvsignore qscintilla.spec sources 
Log Message:
* Mon Dec 11 2006 Rex Dieter <rexdieter[AT]users.sf.net> - 1.7.1-1
- QScintilla-1.71-gpl-1.7.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qscintilla/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	28 Nov 2006 21:13:18 -0000	1.3
+++ .cvsignore	31 Jan 2007 03:04:52 -0000	1.4
@@ -1,2 +1 @@
-qscintilla-1.65-gpl-1.6.tar.gz
-QScintilla1-1.71-gpl-1.7.tar.gz
+QScintilla-1.71-gpl-1.7.1.tar.gz


Index: qscintilla.spec
===================================================================
RCS file: /cvs/extras/rpms/qscintilla/FC-5/qscintilla.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- qscintilla.spec	28 Nov 2006 21:13:18 -0000	1.5
+++ qscintilla.spec	31 Jan 2007 03:04:52 -0000	1.6
@@ -2,14 +2,14 @@
 %define         scintilla_ver   1.71
 
 Name:	        qscintilla 
-Version:        1.7
+Version:        1.7.1
 Release:        1%{?dist}
 Summary:        A Scintilla port to Qt
 
 License:        GPL
 Group:          Development/Tools
 Url:            http://www.riverbankcomputing.co.uk/qscintilla/
-Source0:	http://www.riverbankcomputing.com/Downloads/QScintilla1/QScintilla1-%{scintilla_ver}-gpl-%{version}.tar.gz
+Source0:	http://www.riverbankcomputing.com/Downloads/QScintilla1/QScintilla-%{scintilla_ver}-gpl-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch1: 	qscintilla-1.61-gpl-1.4-designer-incpath.patch
@@ -45,7 +45,7 @@
 
 
 %prep
-%setup -q -n QScintilla1-%{scintilla_ver}-gpl-%{version}
+%setup -q -n QScintilla-%{scintilla_ver}-gpl-%{version}
 
 %patch1 -p1 -b .designer-incpath
 
@@ -57,8 +57,6 @@
 
 
 %build
-export CFLAGS=$RPM_OPT_FLAGS
-export CXXFLAGS=$RPM_OPT_FLAGS
 pushd qt
 qmake qscintilla
 echo 'build: $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) $(OBJCOMP)' >> Makefile
@@ -74,12 +72,8 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-pushd qt
-make install INSTALL_ROOT=$RPM_BUILD_ROOT
-popd
-pushd designer
-make INSTALL_ROOT=$RPM_BUILD_ROOT
-popd
+make INSTALL_ROOT=$RPM_BUILD_ROOT -C qt install
+make INSTALL_ROOT=$RPM_BUILD_ROOT -C designer
 
 
 %clean
@@ -109,6 +103,9 @@
 
 
 %changelog
+* Mon Dec 11 2006 Rex Dieter <rexdieter[AT]users.sf.net> - 1.7.1-1
+- QScintilla-1.71-gpl-1.7.1
+
 * Thu Nov 09 2006 Rex Dieter <rexdieter[AT]users.sf.net> - 1.7-1
 - QScintilla1-1.71-gpl-1.7 (#214192)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qscintilla/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	28 Nov 2006 21:13:18 -0000	1.3
+++ sources	31 Jan 2007 03:04:52 -0000	1.4
@@ -1 +1 @@
-145321e9e3ae7d4edc7f2bf6954b6763  QScintilla1-1.71-gpl-1.7.tar.gz
+dfa047b45d4f09ae8d4a8a431ba88a5a  QScintilla-1.71-gpl-1.7.1.tar.gz