rpms/python-pyblock/devel python-pyblock.spec,1.73,1.74

[Hans de Goede]

Author: jwrdegoede

Update of /cvs/pkgs/rpms/python-pyblock/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2540

Modified Files:
	python-pyblock.spec 
Log Message:
* Thu Jan  7 2010 Hans de Goede <hdegoede at redhat.com> - 0.45-2
- Change python_sitelib macro to use %global as the new rpm will break
  using %define here, see:
  https://www.redhat.com/archives/fedora-devel-list/2010-January/msg00093.html
- And rename python_sitelib macro to python_sitearch, as that is what it is
  in our case
- Mark our documentation files as %doc



Index: python-pyblock.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-pyblock/devel/python-pyblock.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- python-pyblock.spec	5 Jan 2010 10:24:23 -0000	1.73
+++ python-pyblock.spec	7 Jan 2010 14:04:14 -0000	1.74
@@ -1,12 +1,12 @@
 %define realname pyblock
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)[1:]")}
+%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 %define dmrver 1.0.0.rc15
 %define dmver 1.02.27
 
 Summary: Python modules for dealing with block devices
 Name: python-%{realname}
 Version: 0.45
-Release: 1%{?dist}
+Release: 2%{?dist}
 Source0: %{realname}-%{version}.tar.bz2
 License: GPLv2 or GPLv3
 Group: System Environment/Libraries
@@ -27,19 +27,25 @@ make
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make DESTDIR=${RPM_BUILD_ROOT} SITELIB=%{python_sitelib} install
+make DESTDIR=${RPM_BUILD_ROOT} SITELIB=%{python_sitearch} install
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root)
-%dir /%{python_sitelib}/block
-/%{python_sitelib}/block/*
-%dir %{_docdir}/pyblock-%{version}
-%{_docdir}/pyblock-%{version}/*
+%defattr(-,root,root,-)
+%doc %{_docdir}/pyblock-%{version}
+%{python_sitearch}/block
 
 %changelog
+* Thu Jan  7 2010 Hans de Goede <hdegoede at redhat.com> - 0.45-2
+- Change python_sitelib macro to use %%global as the new rpm will break
+  using %%define here, see:
+  https://www.redhat.com/archives/fedora-devel-list/2010-January/msg00093.html
+- And rename python_sitelib macro to python_sitearch, as that is what it is
+  in our case
+- Mark our documentation files as %%doc
+
 * Tue Jan  5 2010 Hans de Goede <hdegoede at redhat.com> - 0.45-1
 - Remove libbdevid-python usage and dependency (#549102)
 - Stop linking against zlib (unused)