packages: evolution-rss/evolution-rss.spec - fix xulrunner detection - drop...

[sparky]

Author: sparky                       Date: Tue Feb  2 23:36:28 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix xulrunner detection
- dropped BR: libpng12-devel - it is required because of half-way recompiled
  gnome

---- Files affected:
packages/evolution-rss:
   evolution-rss.spec (1.43 -> 1.44) 

---- Diffs:

================================================================
Index: packages/evolution-rss/evolution-rss.spec
diff -u packages/evolution-rss/evolution-rss.spec:1.43 packages/evolution-rss/evolution-rss.spec:1.44
--- packages/evolution-rss/evolution-rss.spec:1.43	Tue Feb  2 10:10:52 2010
+++ packages/evolution-rss/evolution-rss.spec	Wed Feb  3 00:36:23 2010
@@ -29,12 +29,11 @@
 BuildRequires:	intltool >= 0.40.0
 BuildRequires:	libglade2-devel >= 1:2.6.2
 BuildRequires:	libgnomeui-devel >= 2.24.0
-BuildRequires:	libpng12-devel
 BuildRequires:	libsoup-devel >= 2.4.0
 BuildRequires:	libstdc++-devel
 BuildRequires:	libtool
 BuildRequires:	pkgconfig
-BuildRequires:	rpmbuild(macros) >= 1.197
+BuildRequires:	rpmbuild(macros) >= 1.527
 %{?with_xulrunner:BuildRequires:	xulrunner-devel >= 1.9-5}
 Requires(post,postun):	GConf2
 Requires:	evolution >= 2.26.0
@@ -65,8 +64,9 @@
 %{__autoheader}
 %{__automake}
 %configure \
-	%{!?with_xulrunner:--disable-gecko} \
-	%{!?with_webkit:--disable-webkit}
+	%{__enable_disable xulrunner gecko} \
+	%{__with xulrunner gecko libxul} \
+	%{__enable_disable webkit}
 %{__make}
 
 %install
@@ -75,7 +75,7 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/evolution/*/plugins/liborg-gnome-evolution-rss.la
+rm $RPM_BUILD_ROOT%{_libdir}/evolution/*/plugins/liborg-gnome-evolution-rss.la
 
 %find_lang %{name}
 
@@ -107,6 +107,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.44  2010/02/02 23:36:23  sparky
+- fix xulrunner detection
+- dropped BR: libpng12-devel - it is required because of half-way recompiled
+  gnome
+
 Revision 1.43  2010/02/02 09:10:52  wolvverine
 - add received feeds patch, rel.8, BR: libpng12-devel, STBR
 
@@ -123,7 +128,7 @@
 - rel. 6
 
 Revision 1.38  2009/12/17 15:58:06  wolvverine
- rel.5, new xulrunner-libs, STBR
+- rel.5, new xulrunner-libs, STBR
 
 Revision 1.37  2009/11/08 19:50:01  megabajt
 - release 4
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/evolution-rss/evolution-rss.spec?r1=1.43&r2=1.44&f=u