[blogtk/f13/master] Update to 2.0 using master as template

Tue Dec 21 13:10:46 UTC 2010

commit f66db9a66eb3c57ccabcdaf0843bccf7dbc35927
Author: Paul W. Frields <stickster at gmail.com>
Date:   Tue Dec 21 08:08:19 2010 -0500

    Update to 2.0 using master as template

 .gitignore                  |    1 +
 BSD                         |   26 --------
 blogtk-1.1-configname.patch |  149 -------------------------------------------
 blogtk-2.0-sharepath.patch  |   16 +++++
 blogtk.spec                 |   93 ++++++++++++++-------------
 sources                     |    2 +-
 6 files changed, 66 insertions(+), 221 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 494c762..3d44a23 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 blogtk_1.1.tar.bz2
+/blogtk-2.0.tar.gz
diff --git a/blogtk-2.0-sharepath.patch b/blogtk-2.0-sharepath.patch
new file mode 100644
index 0000000..598c551
--- /dev/null
+++ b/blogtk-2.0-sharepath.patch
@@ -0,0 +1,16 @@
+diff -uNr blogtk-2.0-original/share/blogtk2/lib/blogtk2/__init__.py blogtk-2.0/share/blogtk2/lib/blogtk2/__init__.py
+--- blogtk-2.0-original/share/blogtk2/lib/blogtk2/__init__.py	2009-11-19 18:20:31.000000000 -0500
++++ blogtk-2.0/share/blogtk2/lib/blogtk2/__init__.py	2010-12-18 14:42:41.852995437 -0500
+@@ -1,10 +1,11 @@
+ from os.path import abspath, dirname, join, pardir
++import sys
+ 
+ # here we define the path constants so that other modules can use it.
+ # this allows us to get access to the shared files without having to
+ # know the actual location, we just use the location of the current
+ # file and use paths relative to that.
+-SHARED_FILES = abspath(join(dirname(__file__), pardir, pardir))
++SHARED_FILES = abspath(join(sys.prefix, 'share', 'blogtk2'))
+ LOCALE_PATH = join(SHARED_FILES, 'i18n')
+ RESOURCE_PATH = join(SHARED_FILES, 'res')
+ 
diff --git a/blogtk.spec b/blogtk.spec
index 361477d..fdd2246 100644
--- a/blogtk.spec
+++ b/blogtk.spec
@@ -1,29 +1,29 @@
 %{!?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:        15%{?dist}
+Version:        2.0
+Release:        3%{?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
-Patch0:		blogtk-1.1-configname.patch
+Source0:        http://launchpad.net/%{name}/%{version}/%{version}/+download/%{name}-%{version}.tar.gz
+Patch0:         blogtk-2.0-sharepath.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  pygtk2-devel >= 2.00
-BuildRequires:	glib2-devel
-BuildRequires:	desktop-file-utils
-Requires:	gnome-python2-gnome >= 2.00
-Requires:	pygtk2 >= 2.00
-Requires:	aspell
-Requires:	gnome-python2-gtkhtml2
+BuildRequires:  glib2-devel
+BuildRequires:  desktop-file-utils
+Requires:       gnome-python2-gnome >= 2.00
+Requires:       pygtk2 >= 2.00
+Requires:       pywebkitgtk
+Requires:       python-feedparser
+Requires:       python-gdata
+Requires:       gnome-python2-gtkspell
 # To make sure this doesn't inflict pain on CapNames users
-Provides:	BloGTK = %{version}-%{release}
+Provides:       BloGTK = %{version}-%{release}
 
 %description
 BloGTK is a weblog posting client written in Python for any platform that
@@ -32,44 +32,39 @@ weblog with XML-RPC and create new posts.
 
 
 %prep
-%setup -q -n BloGTK-%{version}
-cp %{SOURCE1} $RPM_BUILD_DIR/BloGTK-%{version}
-%patch0 -p1 -b .configname
+%setup -q -n %{name}-%{version}
+%patch0 -p1 -b .sharepath
 
 
 %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
-install -m 755 -d $RPM_BUILD_ROOT/%{_bindir}
-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/%{python_sitelib}/%{name}
-install -m 644 pixmaps/blogtk.glade \
-	$RPM_BUILD_ROOT/%{_datadir}/%{name}
-install -m 644 pixmaps/*.png $RPM_BUILD_ROOT/%{_datadir}/%{name}
+# Cope with developer's over-specificity
+install -m 755 -D bin/blogtk2 $RPM_BUILD_ROOT%{_bindir}/blogtk2
+for F in share/blogtk2/lib/blogtk2/*.py ; do \
+  sed -i -e '/^#!\//, 1d' $F ; \
+  install -m 644 -D $F $RPM_BUILD_ROOT%{python_sitelib}/blogtk2/$(basename $F) ; \
+done
+install -m 644 -D share/blogtk2/glade/blogtk2.glade \
+  $RPM_BUILD_ROOT%{_datadir}/blogtk2/glade/blogtk2.glade
+for F in share/blogtk2/res/*.png ; do \
+  install -m 644 -D $F $RPM_BUILD_ROOT%{_datadir}/blogtk2/res/$(basename $F) ; \
+done
 install -m 644 -D data/blogtk-icon.png \
-	$RPM_BUILD_ROOT/%{_datadir}/pixmaps/blogtk-icon.png
-%{__sed} -i 's/Exec=BloGTK/Exec=blogtk/' data/blogtk.desktop
+  $RPM_BUILD_ROOT%{_datadir}/pixmaps/blogtk-icon.png
+sed -i 's/\.png$//' data/blogtk.desktop
 install -m 644 -D data/blogtk.desktop \
-	$RPM_BUILD_ROOT/%{_datadir}/applications/blogtk.desktop
-cat << EOF > $RPM_BUILD_ROOT/%{_bindir}/blogtk
-#!/bin/sh
-exec %{python_sitelib}/%{name}/BloGTK.py
-EOF
-chmod 755 $RPM_BUILD_ROOT/%{_bindir}/blogtk
+  $RPM_BUILD_ROOT%{_datadir}/applications/blogtk.desktop
 desktop-file-install --vendor=fedora \
         --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-	--add-category=X-Fedora \
-	--delete-original \
-	--add-category=Network \
-	$RPM_BUILD_ROOT/%{_datadir}/applications/blogtk.desktop
+        --add-category=X-Fedora \
+        --add-category=GTK \
+        --delete-original \
+        --add-category=Network \
+        $RPM_BUILD_ROOT%{_datadir}/applications/blogtk.desktop
 
  
 %clean
@@ -78,17 +73,25 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog README BSD
-%{_bindir}/*
-%dir %{python_sitelib}/%{name}
-%{python_sitelib}/%{name}/*
-%dir %{_datadir}/%{name}
-%{_datadir}/%{name}/*
+%doc AUTHORS ChangeLog README LICENSE
+%{_bindir}/blogtk2
+%{python_sitelib}/blogtk2
+%{_datadir}/blogtk2
 %{_datadir}/applications/fedora-blogtk.desktop
 %{_datadir}/pixmaps/blogtk-icon.png
 
 
 %changelog
+* Tue Dec 21 2010 Paul W. Frields <stickster at gmail.com> - 2.0-3
+- Fix missing requires
+
+* Sat Dec 18 2010 Paul W. Frields <stickster at gmail.com> - 2.0-2
+- Spec file and lint fixes
+
+* Sat Dec 18 2010 Paul W. Frields <stickster at gmail.com> - 2.0-1
+- Update to upstream 2.0
+- Provide new fixes for shared resource paths
+
 * Sat Dec 18 2010 Paul W. Frields <stickster at gmail.com> - 1.1-15
 - Fix gnome-python2-gnome requirement (#460028)
 
diff --git a/sources b/sources
index d236f5f..ee31419 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cd2d2521a261867cd9c830a81d3d4408  blogtk_1.1.tar.bz2
+f7fd77db6a8ba92898c03ef35f658e6f  blogtk-2.0.tar.gz
