From 3e1c9a426ec021c85dd8fcb48f49383893b57aca Mon Sep 17 00:00:00 2001 From: Peter Gordon Date: Mar 08 2007 06:44:34 +0000 Subject: - Unorphan, since Carlos Martín Nieto has picked upstream development. - Update to new upstream release (1.8.3) - Lots of spec file cleanups: (1) Use macros instead of $RPM_* variables (2) Whitespace/formatting adjustments (3) Don't mark installed GConf schemas as %config - Drop unnecessary patches: - gtk-sharp2-gecko-sharp2.patch - aclocal.m4-ngettext.patch - Add a backported patch (from 1.8.4) to fix compilation error: fix-PrintJob-ambiguous-reference.patch - Add a backported patch (from 1.8.4) to fix the default theme base location: fix-default-theme-base-href.patch --- diff --git a/.cvsignore b/.cvsignore new file mode 100644 index 0000000..bd2aa5c --- /dev/null +++ b/.cvsignore @@ -0,0 +1 @@ +blam-1.8.3.tar.bz2 diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..d6b0d4d --- /dev/null +++ b/Makefile @@ -0,0 +1,21 @@ +# Makefile for source rpm: blam +# $Id: Makefile,v 1.1 2006/05/28 21:37:17 sindrepb Exp $ +NAME := blam +SPECFILE = $(firstword $(wildcard *.spec)) + +define find-makefile-common +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +endef + +MAKEFILE_COMMON := $(shell $(find-makefile-common)) + +ifeq ($(MAKEFILE_COMMON),) +# attept a checkout +define checkout-makefile-common +test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 +endef + +MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) +endif + +include $(MAKEFILE_COMMON) diff --git a/blam-fix-PrintJob-ambiguous-reference.patch b/blam-fix-PrintJob-ambiguous-reference.patch new file mode 100644 index 0000000..e6ede9b --- /dev/null +++ b/blam-fix-PrintJob-ambiguous-reference.patch @@ -0,0 +1,20 @@ +--- src/Printing.cs.old 2007-03-07 21:47:02.000000000 -0800 ++++ src/Printing.cs 2007-03-07 21:47:40.000000000 -0800 +@@ -14,7 +14,7 @@ + namespace Imendio.Blam { + public class PrintDialog { + private ItemView itemView; +- private PrintJob printJob; ++ private Gnome.PrintJob printJob; + + private static string printConfigFile = Application.BaseDir + "/print-config"; + +@@ -31,7 +31,7 @@ + return; + } + +- printJob = new PrintJob(LoadPrintConfig()); ++ printJob = new Gnome.PrintJob(LoadPrintConfig()); + Gnome.PrintDialog dialog = new Gnome.PrintDialog(printJob, + "Print - " + itemView.Widget.Title); + dialog.Icon = Gdk.Pixbuf.LoadFromResource("blam.png"); diff --git a/blam-fix-default-theme-base-href.patch b/blam-fix-default-theme-base-href.patch new file mode 100644 index 0000000..2a626b5 --- /dev/null +++ b/blam-fix-default-theme-base-href.patch @@ -0,0 +1,10 @@ +--- themes/blam/theme.html.old 2007-03-07 22:25:02.000000000 -0800 ++++ themes/blam/theme.html 2007-03-07 22:26:37.000000000 -0800 +@@ -2,6 +2,7 @@ + + + ${title} ++ + + + diff --git a/blam.spec b/blam.spec new file mode 100644 index 0000000..db53b43 --- /dev/null +++ b/blam.spec @@ -0,0 +1,146 @@ +## Hopefully Mono and multilib will play nicely soon, but until then... +%define _libdir %{_prefix}/lib + +Name: blam +Version: 1.8.3 +Release: 1%{?dist} +Summary: An RSS/RDF feed reader + +Group: Applications/Internet +License: GPL +URL: http://www.cmartin.tk/blam.html + +Source0: http://www.cmartin.tk/blam/%{name}-%{version}.tar.bz2 +Patch0: %{name}-fix-PrintJob-ambiguous-reference.patch +Patch1: %{name}-fix-default-theme-base-href.patch + +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: mono-devel +BuildRequires: gnome-sharp-devel +BuildRequires: gtk-sharp2-gapi +BuildRequires: gtk-sharp2-devel +BuildRequires: gecko-sharp2-devel +BuildRequires: gecko-devel +BuildRequires: libgnomeui-devel +BuildRequires: desktop-file-utils +BuildRequires: gettext + +Requires: gecko-sharp2 +Requires: firefox = %(rpm -q firefox-devel --qf '%%{version}' 2>/dev/null) + +Requires(pre): GConf2 + +Requires(post): GConf2 +Requires(post): desktop-file-utils + +Requires(preun): GConf2 + +Requires(postun): desktop-file-utils + +%description +Blam is a tool that helps you keep track of the growing +number of news feeds distributed as RSS. Blam lets you +subscribe to any number of feeds and provides an easy to +use and clean interface to stay up to date + + +%prep +%setup -q +%patch0 -p0 -b .fix-PrintJob-ambiguous-reference-compile-error +%patch1 -p0 -b .fix-default-theme-base-href + + +%build +export CFLAGS="%{optflags} -debug" +%configure --disable-static +make %{?_smp_mflags} + + +%install +rm -rf %{buildroot} +export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 +make install DESTDIR=%{buildroot} +%find_lang %{name} +desktop-file-install --vendor fedora \ + --delete-original \ + --dir %{buildroot}%{_datadir}/applications \ + %{buildroot}%{_datadir}/applications/%{name}.desktop + + +%clean +rm -rf %{buildroot} + + +%pre +if [ "$1" -gt 1 ]; then + export GCONF_CONFIG_SOURCE=$(gconftool-2 --get-default-source) + gconftool-2 --makefile-uninstall-rule \ + %{_sysconfdir}/gconf/schemas/%{name}.schemas >/dev/null ||: +fi + + +%post +update-desktop-database &> /dev/null ||: +export GCONF_CONFIG_SOURCE=$(gconftool-2 --get-default-source) +gconftool-2 --makefile-install-rule \ + %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null ||: + + +%preun +if [ "$1" -eq 0 ]; then + export GCONF_CONFIG_SOURCE=$(gconftool-2 --get-default-source) + gconftool-2 --makefile-uninstall-rule \ + %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null ||: +fi + + +%postun +update-desktop-database &> /dev/null ||: + + +%files -f %{name}.lang +%defattr(-,root,root,-) +%doc AUTHORS COPYING ChangeLog NEWS README +%{_sysconfdir}/gconf/schemas/%{name}.schemas +%{_bindir}/* +%exclude %{_libdir}/blam/*.la +%{_libdir}/blam +%{_datadir}/blam +%{_datadir}/applications/* +%{_datadir}/pixmaps/* +%{_mandir}/man?/%{name}.1* + +%changelog +* Wed Mar 07 2007 Peter Gordon - 1.8.3-1 +- Unorphan, since Carlos Martín Nieto has picked upstream development. +- Update to new upstream release (1.8.3) +- Lots of spec file cleanups: + (1) Use macros instead of $RPM_* variables + (2) Whitespace/formatting adjustments + (3) Don't mark installed GConf schemas as %%config +- Drop unnecessary patches: + - gtk-sharp2-gecko-sharp2.patch + - aclocal.m4-ngettext.patch +- Add a backported patch (from 1.8.4) to fix compilation error: + + fix-PrintJob-ambiguous-reference.patch +- Add a backported patch (from 1.8.4) to fix the default theme base location: + + fix-default-theme-base-href.patch + +* Fri Jul 14 2006 Sindre Pedersen Bjørdal - 1.8.2-6 +- Add missing gecko-sharp2 runtime dependency, fixes #196706 + +* Sun May 28 2006 John Mahowald - 1.8.2-5 +- fix gettext autoconf macro for x86_64 + +* Sun May 21 2006 John Mahowald - 1.8.2-4 +- readd .so +- reenable find_lang +- mark gconf schemea as config + +* Thu May 18 2006 John Mahowald - 1.8.2-2 +- gtk-sharp2 gecko-sharp2 +- no .a, .la, .so + +* Tue Mar 23 2006 Sindre Pedersen Bjørdal - 1.8.2-1 +- Initial build diff --git a/dead.package b/dead.package deleted file mode 100644 index 815fd29..0000000 --- a/dead.package +++ /dev/null @@ -1 +0,0 @@ -http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild diff --git a/sources b/sources new file mode 100644 index 0000000..5ee7977 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +884299d959dfc59589693aea9427807b blam-1.8.3.tar.bz2