rpms/gnome-blog/devel gnome-blog-bonobo.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 gnome-blog.spec, 1.13, 1.14 sources, 1.3, 1.4 gnome-blog-poster.patch, 1.1, NONE gnome-blog_makefile.patch, 1.1, NONE
Brian Pepple (bpepple)
fedora-extras-commits at redhat.com
Thu Jun 22 00:02:45 UTC 2006
Author: bpepple
Update of /cvs/extras/rpms/gnome-blog/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16138
Modified Files:
.cvsignore gnome-blog.spec sources
Added Files:
gnome-blog-bonobo.patch
Removed Files:
gnome-blog-poster.patch gnome-blog_makefile.patch
Log Message:
* Wed Jun 21 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.9.1-2
- Update to 0.9.1.
- Add patch to fix bonobo.
- Bump version of pygtk2.
- Cleanup scriptlets.
- Drop poster patch & makefile patchs.
gnome-blog-bonobo.patch:
--- NEW FILE gnome-blog-bonobo.patch ---
diff -ur gnome-blog-0.9.1.OLD/GNOME_BlogApplet.server.in gnome-blog-0.9.1/GNOME_BlogApplet.server.in
--- gnome-blog-0.9.1.OLD/GNOME_BlogApplet.server.in 2006-06-21 15:48:30.000000000 -0400
+++ gnome-blog-0.9.1/GNOME_BlogApplet.server.in 2006-06-21 19:24:26.000000000 -0400
@@ -1,6 +1,6 @@
<oaf_info>
-<oaf_server iid="OAFIID:GNOME_BlogApplet_Factory" type="exe" location="/usr/local/libexec/blog_applet.py">
+<oaf_server iid="OAFIID:GNOME_BlogApplet_Factory" type="exe" location="/usr/libexec/blog_applet.py">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:Bonobo/GenericFactory:1.0"/>
<item value="IDL:Bonobo/Unknown:1.0"/>
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-blog/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 13 Mar 2005 02:02:33 -0000 1.3
+++ .cvsignore 22 Jun 2006 00:02:45 -0000 1.4
@@ -1 +1 @@
-gnome-blog-0.8.tar.gz
+gnome-blog-0.9.1.tar.bz2
Index: gnome-blog.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-blog/devel/gnome-blog.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gnome-blog.spec 26 Mar 2006 14:21:51 -0000 1.13
+++ gnome-blog.spec 22 Jun 2006 00:02:45 -0000 1.14
@@ -1,18 +1,16 @@
-%define gnome_python2_version 1.99.13
-%define pyver %(python -c 'import sys ; print sys.version[:3]')
+%define gnome_python2_version 2.6
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
Name: gnome-blog
-Version: 0.8
-Release: 13%{?dist}
+Version: 0.9.1
+Release: 2%{?dist}
Summary: GNOME panel object for posting blog entries
Group: Applications/Internet
License: GPL
URL: http://www.gnome.org/~seth/gnome-blog/
-Source0: http://ftp.gnome.org/pub/gnome/sources/%{name}/%{version}/%{name}-%{version}.tar.gz
-Patch1: %{name}_makefile.patch
-Patch2: %{name}-poster.patch
+Source0: http://ftp.gnome.org/pub/gnome/sources/%{name}/%{version}/%{name}-%{version}.tar.bz2
+Patch1: %{name}-bonobo.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -21,9 +19,9 @@
Requires: gnome-python2-gnomevfs >= %{gnome_python2_version}
Requires: gnome-python2-gtkspell
Requires: pygtk2 >= %{gnome_python2_version}
-Requires: python-abi = %{pyver}
-Requires(post): GConf2
+Requires(pre): GConf2
+Requires(post): GConf2
Requires(preun): GConf2
BuildRequires: pygtk2-devel >= %{gnome_python2_version}
@@ -33,19 +31,22 @@
BuildRequires: desktop-file-utils
BuildRequires: intltool
+
%description
GNOME panel object that allows convenient posting of blog entries to
any blog that supports the bloggerAPI.
+
%prep
%setup -q
-%patch1 -p1
-%patch2 -p1
+%patch1 -p1 -b .bonobo
+
%build
%configure
make %{?_smp_mflags}
+
%install
rm -rf $RPM_BUILD_ROOT
export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
@@ -53,30 +54,41 @@
%find_lang %{name}
unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
-# gnome-blog makefile installs this, but we have to add some extra stuff for
-# fedora compliance
-rm -f $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
-desktop-file-install --vendor=fedora \
+desktop-file-install --vendor=fedora --delete-original \
--dir=$RPM_BUILD_ROOT%{_datadir}/applications \
--add-category=X-Fedora --add-category=Network \
--remove-category=Utility \
- %{name}.desktop
+ $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
# This is a program file and doesn't need to be placed in the library path
rm -f $RPM_BUILD_ROOT/%{python_sitelib}/gnomeblog/%{name}-poster
+
%clean
rm -rf $RPM_BUILD_ROOT
+
+%pre
+if [ "$1" -gt 1 ]; then
+ export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+ gconftool-2 --makefile-uninstall-rule \
+ %{_sysconfdir}/gconf/schemas/gnomeblog.schemas >/dev/null || :
+fi
+
+
%post
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gnomeblog.schemas &> /dev/null || :
-unset GCONF_CONFIG_SOURCES
+gconftool-2 --makefile-install-rule \
+ %{_sysconfdir}/gconf/schemas/gnomeblog.schemas > /dev/null || :
+
%preun
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/gnomeblog.schemas &> /dev/null || :
-unset GCONF_CONFIG_SOURCES
+if [ "$1" -eq 0 ]; then
+ export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+ gconftool-2 --makefile-uninstall-rule \
+ %{_sysconfdir}/gconf/schemas/gnomeblog.schemas > /dev/null || :
+fi
+
%files -f %{name}.lang
%defattr(-,root,root,-)
@@ -94,6 +106,13 @@
%ghost %{python_sitelib}/gnomeblog/*.pyo
%changelog
+* Wed Jun 21 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.9.1-2
+- Update to 0.9.1.
+- Add patch to fix bonobo.
+- Bump version of pygtk2.
+- Cleanup scriptlets.
+- Drop poster patch & makefile patchs.
+
* Sun Mar 26 2006 Brian Pepple <bdpepple at ameritech.net> - 0.8-13
- Rebuild.
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-blog/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 13 Mar 2005 02:02:33 -0000 1.3
+++ sources 22 Jun 2006 00:02:45 -0000 1.4
@@ -1 +1 @@
-d8e8a451f8e7fd4b1af49a6346301e2a gnome-blog-0.8.tar.gz
+5eb8a04aadf33554a2087589a0025ecc gnome-blog-0.9.1.tar.bz2
--- gnome-blog-poster.patch DELETED ---
--- gnome-blog_makefile.patch DELETED ---
More information about the scm-commits
mailing list