rpms/sip/F-8 .cvsignore,1.18,1.19 sip.spec,1.39,1.40

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/sip/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13095

Modified Files:
	.cvsignore sip.spec 
Log Message:
* Mon Nov 12 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 4.7.1-2
- License: Python Software Foundation License v2
- fix/cleanup some macro usage
- fix Source, Url. 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sip/F-8/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	12 Apr 2007 10:28:17 -0000	1.18
+++ .cvsignore	12 Nov 2007 17:51:43 -0000	1.19
@@ -8,3 +8,4 @@
 sip-4.5.tar.gz
 sip-4.5.2.tar.gz
 sip-4.6.tar.gz
+sip-4.7.1.tar.gz


Index: sip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sip/F-8/sip.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- sip.spec	23 Oct 2007 09:11:06 -0000	1.39
+++ sip.spec	12 Nov 2007 17:51:43 -0000	1.40
@@ -1,18 +1,22 @@
-%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%{!?python_inc:%global python_inc %(%{__python} -c "from distutils.sysconfig import get_python_inc; print get_python_inc(1)")}
+
 %define minor .2
 
-%define qtver 3.3.8
+%define qtver 1:3.3.8
 %define qtpkg qt
 
 Summary: SIP - Python/C++ Bindings Generator
 Name: sip
 Version: 4.7.1
-Release: 1%{?dist}
-License: GPL
+Release: 2%{?dist}
+# http://www.riverbankcomputing.com/Docs/sip4/sipref.html#license
+License: Python Software Foundation License v2 
 Group: Development/Tools
-Url: http://www.riverbankcomputing.co.uk/
+Url: http://www.riverbankcomputing.co.uk/sip/
+Source0: http://www.riverbankcomputing.com/Downloads/sip4/sip-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source: http://www.riverbankcomputing.co.uk/download/sip/%{name}-%{version}.tar.gz
+
 
 Patch: sip-4.7-64bit.patch
 
@@ -41,11 +45,13 @@
 This package contains files needed to generate Python bindings for any C++
 classes library.
 
+
 %prep
 
 %setup -q
 %patch -p1 -b .64bit
 
+
 %build
 QTDIR="" && source /etc/profile.d/qt.sh
 
@@ -56,35 +62,45 @@
   fi
 done
 
-python configure.py -d %{python_sitearch} CXXFLAGS="%{optflags}" CFLAGS="%{optflags}"
+%{__python} configure.py -d %{python_sitearch} CXXFLAGS="%{optflags}" CFLAGS="%{optflags}"
 
 make %{?_smp_mflags} 
 
+
 %install
 rm -rf %{buildroot}
 
 make install DESTDIR=%{buildroot}
 mkdir -p %{buildroot}%{_datadir}/sip
 
+
 %clean
 rm -rf %{buildroot}
 
+
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
+
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc ChangeLog LICENSE NEWS README THANKS
 %{python_sitearch}/*
 %{_bindir}/*
 
 %files devel
-%defattr(-,root,root)
-%{_datadir}/sip
-%{_includedir}/python?.?/*
+%defattr(-,root,root,-)
+%{_datadir}/sip/
+%{python_inc}/*
+
 
 %changelog
+* Mon Nov 12 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 4.7.1-2
+- License: Python Software Foundation License v2
+- fix/cleanup some macro usage
+- fix Source, Url. 
+
 * Mon Oct 22 2007 Than Ngo <than at redhat.com> - 4.7.1-1
 - 4.7.1