rpms/libwfut/F-13 libwfut.spec,1.10,1.11

[Michael Thomas]

Author: wart

Update of /cvs/pkgs/rpms/libwfut/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv17355

Modified Files:
	libwfut.spec 
Log Message:
Fix python_sitelib vs. python_sitearch mismatch; Update upstream url




Index: libwfut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libwfut/F-13/libwfut.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- libwfut.spec	25 Jul 2009 08:54:30 -0000	1.10
+++ libwfut.spec	20 Apr 2010 02:00:08 -0000	1.11
@@ -1,20 +1,22 @@
-# Architecture dependent python packages dir
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%if ! (0%{?fedora} > 12 || 0%{?rhel} > 5)
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
+%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
+%endif
 
 Name:           libwfut
 Version:        0.2.1
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Software updater tool for WorldForge applications
 
 Group:          Development/Libraries
 License:        LGPLv2+
-URL:            http://worldforge.org/
+URL:            http://www.worldforge.org/
 Source0:        http://downloads.sourceforge.net/worldforge/%{name}-%{version}.tar.gz
 Patch0:         libwfut-0.2.1-gcc43.patch
 Patch1:         libwfut-0.2.1-gcc44.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  libsigc++20-devel libcurl-devel zlib-devel tinyxml-devel python-devel swig
+BuildRequires:  libsigc++20-devel libcurl-devel zlib-devel tinyxml-devel python2-devel swig
 
 %description
 libwfut is the WorldForge Update Tool (WFUT) client side implementation in C++
@@ -63,7 +65,7 @@ make install DESTDIR=$RPM_BUILD_ROOT
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
 #rm -f $RPM_BUILD_ROOT%{python_sitelib}/%{name}/*.a
-rm -f $RPM_BUILD_ROOT%{python_sitelib}/%{name}/*.la
+rm -f $RPM_BUILD_ROOT%{python_sitearch}/%{name}/*.la
 
 ## cleaning up redundant docs
 rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-%{version}
@@ -100,10 +102,14 @@ rm -rf $RPM_BUILD_ROOT
 
 %files python
 %defattr(-,root,root,-)
-%{python_sitelib}/%{name}
+%{python_sitearch}/%{name}
 
 
 %changelog
+* Mon Apr 19 2010 Wart <wart at kobold.org> - 0.2.1-7
+- Fix python_sitelib vs. python_sitearch mismatch
+- Update upstream url
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.1-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild