rpms/blam/devel blam-aclocal.m4-ngettext.patch, NONE, 1.1 blam-gtk-sharp2-gecko-sharp2.patch, NONE, 1.1 blam.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Sun May 28 21:45:15 UTC 2006

Author: sindrepb

Update of /cvs/extras/rpms/blam/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2766/devel

Modified Files:
	.cvsignore sources 
Added Files:
	blam-aclocal.m4-ngettext.patch 
	blam-gtk-sharp2-gecko-sharp2.patch blam.spec 
Log Message:
auto-import blam-1.8.2-5 on branch devel from blam-1.8.2-5.src.rpm

blam-aclocal.m4-ngettext.patch:

--- NEW FILE blam-aclocal.m4-ngettext.patch ---
--- aclocal.m4.orig	2006-05-28 13:33:18.000000000 -0500
+++ aclocal.m4	2006-04-07 13:43:39.000000000 -0500
@@ -121,7 +121,7 @@
         [AC_TRY_LINK([
 #include <libintl.h>
 ],
-         [return (int) ngettext ("","", 1)],
+         [return !ngettext ("","", 1)],
 	  gt_cv_func_ngettext_libc=yes,
           gt_cv_func_ngettext_libc=no)
         ])
@@ -131,7 +131,7 @@
         	[AC_TRY_LINK([
 #include <libintl.h>
 ],
-	          [return (int) dgettext ("","")],
+	          [return !dgettext ("","")],
 		  gt_cv_func_dgettext_libc=yes,
 	          gt_cv_func_dgettext_libc=no)
         	])

blam-gtk-sharp2-gecko-sharp2.patch:

--- NEW FILE blam-gtk-sharp2-gecko-sharp2.patch ---
--- configure.in.orig	2006-05-18 14:37:06.000000000 -0500
+++ configure.in	2006-05-18 16:53:27.000000000 -0500
@@ -45,20 +45,20 @@
 
 dnl Find mono
 MONO_REQUIRED_VERSION=1.1.4
-GTKSHARP_REQUIRED_VERSION=1.0
+GTKSHARP_REQUIRED_VERSION=2.0
 GCONF_REQUIRED_VERSION=2.4
-GECKOSHARP_REQUIRED_VERSION=0.6
+GECKOSHARP_REQUIRED_VERSION=0.1
 
 PKG_CHECK_MODULES(BASE_DEPENDENCIES, 
 		  mono >= $MONO_REQUIRED_VERSION
-		  gtk-sharp >= $GTKSHARP_REQUIRED_VERSION
+		  gtk-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION
                   gconf-2.0 >= $GCONF_REQUIRED_VERSION)
 
 PKG_CHECK_MODULES(BLAM,
-		  gtk-sharp >= $GTKSHARP_REQUIRED_VERSION
-                  gecko-sharp >= $GECKOSHARP_REQUIRED_VERSION
-		  gconf-sharp >= $GTKSHARP_REQUIRED_VERSION
-		  glade-sharp >= $GTKSHARP_REQUIRED_VERSION)
+		  gtk-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION
+                  gecko-sharp-2.0 >= $GECKOSHARP_REQUIRED_VERSION
+		  gconf-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION
+		  glade-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION)
 
 AC_SUBST(BLAM_LIBS)
 


--- NEW FILE blam.spec ---
%define _libdir %{_exec_prefix}/lib

Name:           blam
Version:        1.8.2
Release:        5%{?dist}
Summary:        An RSS/RDF feed reader

Group:          Applications/Internet
License:        GPL
URL:            http://developer.imendio.com/wiki/Blam
Source0:        http://ftp.imendio.com/pub/imendio/blam/src/blam-%{version}.tar.gz
Patch0:         blam-gtk-sharp2-gecko-sharp2.patch
Patch1:         blam-aclocal.m4-ngettext.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  mono-devel, gtk-sharp2-gapi, gtk-sharp2, gecko-sharp2
BuildRequires:	mozilla-devel
BuildRequires:	libgnomeui-devel
BuildRequires:	desktop-file-utils, gettext
BuildRequires:  autoconf

Requires(pre):  GConf2
Requires(post): GConf2, 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
%patch1 -p0

%build
autoconf
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
make install DESTDIR=$RPM_BUILD_ROOT

# Do not need devel files
rm $RPM_BUILD_ROOT%{_libdir}/blam/libblam.{a,la}

%find_lang %{name}

desktop-file-install --vendor fedora --delete-original  \
        --dir $RPM_BUILD_ROOT%{_datadir}/applications   \
        --add-category X-Fedora                         \
        $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop

%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 ||:

%clean
rm -rf $RPM_BUILD_ROOT

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog NEWS README
%config %{_sysconfdir}/gconf/schemas/blam.schemas
%{_bindir}/*
%{_libdir}/blam
%{_datadir}/blam
%{_datadir}/applications/*
%{_datadir}/pixmaps/*


%changelog
*  Sun May 28 2006 John Mahowald  <jpmahowald at gmail.com> - 1.8.2-5
- fix ngettext autoconf macro for x86_64

* Sun May 21 2006 John Mahowald <jpmahowald at gmail.com> - 1.8.2-4
- readd .so
- reenable find_lang
- mark gconf schemea as config

* Thu May 18 2006 John Mahowald <jpmahowald at gmail.com> - 1.8.2-2
- gtk-sharp2 gecko-sharp2
- no .a, .la, .so

* Tue Mar 23 2006 Sindre Pedersen BjÃ¸rdal <foolish[AT]guezz.net> - 1.8.2-1
- Initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/blam/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	28 May 2006 21:37:17 -0000	1.1
+++ .cvsignore	28 May 2006 21:45:15 -0000	1.2
@@ -0,0 +1 @@
+blam-1.8.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/blam/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	28 May 2006 21:37:17 -0000	1.1
+++ sources	28 May 2006 21:45:15 -0000	1.2
@@ -0,0 +1 @@
+8cb05faedf60d895d94a5ecf9d10eb8f  blam-1.8.2.tar.gz


