rpms/blogtk/FC-4 blogtk.spec,1.1,1.2

[Paul W. Frields (pfrields)]

Author: pfrields

Update of /cvs/extras/rpms/blogtk/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10580/FC-4

Modified Files:
	blogtk.spec 
Log Message:
Bring package in line with current fedora-rpmdevtools standards (1.1-5)


Index: blogtk.spec
===================================================================
RCS file: /cvs/extras/rpms/blogtk/FC-4/blogtk.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- blogtk.spec	27 Sep 2005 22:48:15 -0000	1.1
+++ blogtk.spec	13 Dec 2005 12:59:09 -0000	1.2
@@ -1,27 +1,29 @@
-# Note to Fedora Extras reviewers: The developer is very inconsistent
-# about the capitalization of the program name.  I have erred on the
-# conservative side.
-Name:		blogtk
-Version:	1.1
-Release:	4%{?dist}
-Summary:	Gnome application for editing/maintaining blogs
-Group:		Applications/Internet
-License:	BSD
-URL:		http://blogtk.sourceforge.net
-Source0:	http://dl.sf.net/blogtk/blogtk_%{version}.tar.bz2
+%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+
+Name:           blogtk
+Version:        1.1
+Release:        5%{?dist}
+Summary:        GNOME application for editing/maintaining blogs
+
+Group:          Applications/Internet
+License:        BSD
+URL:            http://blogtk.sourceforge.net
+Source0:        http://dl.sf.net/blogtk/blogtk_%{version}.tar.bz2
 Source1:	BSD
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:	noarch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildArch:      noarch
+BuildRequires:  pygtk2-devel >= 2.00
+BuildRequires:	glib2-devel
+BuildRequires:	desktop-file-utils
+Requires:   python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
 Requires:	gnome-python2 >= 2.00
 Requires:	pygtk2 >= 2.00
 Requires:	aspell
-BuildRequires:  pygtk2-devel >= 2.00
-BuildRequires:	glib2-devel
-BuildRequires:  desktop-file-utils
 # To make sure this doesn't inflict pain on CapNames users
 Provides:	BloGTK = %{version}-%{release}
 
-
 %description
 BloGTK is a weblog posting client written in Python for any platform that
 supports Python and the GTK widget set. BloGTK allows you to connect to your
@@ -34,17 +36,19 @@
 
 
 %build
+# Developer does not use setup.py
+#CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
+#%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 # Cope with developer's Makefile and Fedora standards
-%define pyver %(python -c "import sys; x = sys.version_info; print '%%s.%%s' %% (x[0], x[1])")
 install -m 755 -d $RPM_BUILD_ROOT/%{_bindir}
-install -m 755 -d $RPM_BUILD_ROOT/%{_libdir}/python%{pyver}/site-packages/%{name}
+install -m 755 -d $RPM_BUILD_ROOT/%{python_sitelib}/%{name}
 install -m 755 -d $RPM_BUILD_ROOT/%{_datadir}/{%{name},pixmaps/%{name}}
 install -m 755 src/* \
-	$RPM_BUILD_ROOT/%{_libdir}/python%{pyver}/site-packages/%{name}
+	$RPM_BUILD_ROOT/%{python_sitelib}/%{name}
 install -m 644 pixmaps/blogtk.glade \
 	$RPM_BUILD_ROOT/%{_datadir}/%{name}
 install -m 644 pixmaps/*.png $RPM_BUILD_ROOT/%{_datadir}/%{name}
@@ -55,7 +59,7 @@
 	$RPM_BUILD_ROOT/%{_datadir}/applications/blogtk.desktop
 cat << EOF > $RPM_BUILD_ROOT/%{_bindir}/blogtk
 #!/bin/sh
-exec %{_libdir}/python%{pyver}/site-packages/%{name}/BloGTK.py
+exec %{python_sitelib}/%{name}/BloGTK.py
 EOF
 chmod 755 $RPM_BUILD_ROOT/%{_bindir}/blogtk
 desktop-file-install --vendor=fedora \
@@ -65,7 +69,7 @@
 	--add-category=Network \
 	$RPM_BUILD_ROOT/%{_datadir}/applications/blogtk.desktop
 
-
+ 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -74,8 +78,8 @@
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog README BSD
 %{_bindir}/*
-%dir %{_libdir}/python%{pyver}/site-packages/%{name}
-%{_libdir}/python%{pyver}/site-packages/%{name}/*
+%dir %{python_sitelib}/%{name}
+%{python_sitelib}/%{name}/*
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/*
 %{_datadir}/applications/fedora-blogtk.desktop
@@ -83,6 +87,9 @@
 
 
 %changelog
+* Tue Dec 13 2005 Paul W. Frields <stickster at gmail.com> - 1.1-5
+- Bring package in line with current fedora-rpmdevtools standards
+
 * Mon Aug 29 2005 Paul W. Frields <stickster at gmail.com> - 1.1-4
 - Add BSD license file