rpms/liferea/devel .cvsignore, 1.80, 1.81 liferea-fedorafeed.patch, 1.7, 1.8 liferea.spec, 1.132, 1.133 sources, 1.81, 1.82 liferea-1.4.23-webkit-fix.patch, 1.2, NONE

[Steven M. Parrish]

Author: tuxbrewr

Update of /cvs/pkgs/rpms/liferea/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12833

Modified Files:
	.cvsignore liferea-fedorafeed.patch liferea.spec sources 
Removed Files:
	liferea-1.4.23-webkit-fix.patch 
Log Message:
New upstream release - Drops support for xulrunner.  Now Webkit only


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/liferea/devel/.cvsignore,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81
--- .cvsignore	8 Mar 2009 15:36:47 -0000	1.80
+++ .cvsignore	8 Jun 2009 14:48:22 -0000	1.81
@@ -1 +1 @@
-liferea-1.4.26.tar.gz
+liferea-1.6.0-rc4.tar.gz

liferea-fedorafeed.patch:

Index: liferea-fedorafeed.patch
===================================================================
RCS file: /cvs/pkgs/rpms/liferea/devel/liferea-fedorafeed.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- liferea-fedorafeed.patch	15 Oct 2008 21:51:51 -0000	1.7
+++ liferea-fedorafeed.patch	8 Jun 2009 14:48:22 -0000	1.8
@@ -1,16 +1,19 @@
---- liferea-1.4.13/opml/feedlist.opml	2007-12-06 14:42:28.000000000 +0900
-+++ liferea-1.4.13-mod/opml/feedlist.opml	2008-03-17 22:38:12.000000000 +0900
-@@ -20,7 +20,12 @@
- 		</outline>	
- 	</outline>
- 	<!-- end of default block -->
--
-+	<outline text="Fedora">
-+               <outline text="FedoraNews.org" htmlUrl="http://fedoraproject.org/wiki/FWN" xmlUrl="http://fedoramagazine.wordpress.com/category/fedora-weekly-news/feed/" />
-+               <outline text="Red Hat Magazine" htmlUrl="http://www.redhat.com/magazine/" xmlUrl="http://feeds.feedburner.com/RedHatMagazine" />
-+               <outline text="Planet Fedora" htmlUrl="http://planet.fedoraproject.org/" xmlUrl="http://planet.fedoraproject.org/atom.xml" />
-+               <outline text="Fedora Info" htmlUrl="http://fedoraproject.org/infofeed/" xmlUrl="http://fedoraproject.org/infofeed/rss20.xml" />
-+       </outline>
- 	<!-- the following search folders should also be in sync for all feed lists -->
- 	<!-- Do only translate the @text attributes in all of the following <outline> tags! -->
- 	<outline text="Unread" title="Unread" description="Unread" type="vfolder" htmlUrl="" xmlUrl="vfolder">
+diff -crb liferea-1.6.0-rc2/opml/feedlist.opml liferea-1.6.0-rc2-fedora/opml/feedlist.opml
+*** liferea-1.6.0-rc2/opml/feedlist.opml	2009-05-01 14:53:21.000000000 -0400
+--- liferea-1.6.0-rc2-fedora/opml/feedlist.opml	2009-06-05 16:04:10.000000000 -0400
+***************
+*** 22,27 ****
+--- 22,34 ----
+  	</outline>
+  	<!-- end of default block -->
+  
++ 	<outline text="Fedora">
++                <outline text="FedoraNews.org" htmlUrl="http://fedoraproject.org/wiki/FWN" xmlUrl="http://fedoramagazine.wordpress.com/category/fedora-weekly-news/feed/" />
++                <outline text="Red Hat Magazine" htmlUrl="http://www.redhat.com/magazine/" xmlUrl="http://feeds.feedburner.com/RedHatMagazine" />
++                <outline text="Planet Fedora" htmlUrl="http://planet.fedoraproject.org/" xmlUrl="http://planet.fedoraproject.org/atom.xml" />
++                <outline text="Fedora Info" htmlUrl="http://fedoraproject.org/infofeed/" xmlUrl="http://fedoraproject.org/infofeed/rss20.xml" />
++        </outline>
++ 
+  	<!-- the following search folders should also be in sync for all feed lists -->
+  	<!-- Do only translate the @text attributes in all of the following <outline> tags! -->
+  	<outline text="Unread" title="Unread" description="Unread" type="vfolder" htmlUrl="" xmlUrl="vfolder">


Index: liferea.spec
===================================================================
RCS file: /cvs/pkgs/rpms/liferea/devel/liferea.spec,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -p -r1.132 -r1.133
--- liferea.spec	28 Apr 2009 03:27:37 -0000	1.132
+++ liferea.spec	8 Jun 2009 14:48:22 -0000	1.133
@@ -1,36 +1,41 @@
-%define gecko_ver 1.8.1.14
-
 Name:           liferea
-Version:        1.4.26
-Release:	2%{?dist}
+Version:        1.6.0
+Release:	0.1.rc4%{?dist}
 Summary:        An RSS/RDF feed reader
 
 Group:          Applications/Internet
 License:        GPLv2+
 URL:            http://liferea.sourceforge.net/
-Source0:        http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-Patch0:		%{name}-fedorafeed.patch
-#Patch1:		liferea-1.4.23-webkit-fix.patch
+Source0:        http://download.sourceforge.net/%{name}/%{name}-%{version}-rc4.tar.gz
+Patch0:	        %{name}-fedorafeed.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  GConf2-devel
-BuildRequires:	libX11-devel
-BuildRequires:	libSM-devel
-BuildRequires:	gnutls-devel
-BuildRequires:	libnotify-devel
-BuildRequires:  NetworkManager-glib-devel
-BuildRequires:	libxslt-devel >= 1.1.19
+BuildRequires:  libxml2-devel	
+BuildRequires:	libxslt-devel
 BuildRequires:	sqlite-devel
-BuildRequires:	dbus-devel
-BuildRequires:	dbus-glib-devel
-BuildRequires:	libglade2-devel
+BuildRequires:  webkitgtk-devel
+BuildRequires:  intltool
+BuildRequires:  libglade2-devel
 BuildRequires:  desktop-file-utils
-BuildRequires:  gettext
-BuildRequires:	perl-XML-Parser
-BuildRequires:  xulrunner-devel, xulrunner-devel-unstable
-BuildRequires:  intltool >= 0.35.0
-BuildRequires:  WebKit-gtk-devel
-BuildRequires:  prelink
+
+#BuildRequires:	libX11-devel
+#BuildRequires:	libSM-devel
+#BuildRequires:	gnutls-devel
+#BuildRequires:	libnotify-devel
+#BuildRequires:  NetworkManager-glib-devel
+#BuildRequires:	libxslt-devel >= 1.1.19
+#BuildRequires:	sqlite-devel
+#BuildRequires:	dbus-devel
+#BuildRequires:	dbus-glib-devel
+#BuildRequires:	libglade2-devel
+#BuildRequires:  desktop-file-utils
+#BuildRequires:  gettext
+#BuildRequires:	perl-XML-Parser
+#BuildRequires:  xulrunner-devel, xulrunner-devel-unstable
+#BuildRequires:  intltool >= 0.35.0
+#BuildRequires:  WebKit-gtk-devel
+#BuildRequires:  prelink
 Requires: 	sqlite
 
 Requires(pre): 	GConf2
@@ -43,30 +48,19 @@ It's intended to be a clone of the Windo
 It can be used to maintain a list of subscribed feeds, 
 browse through their items, and show their contents.
 
-%package WebKit
-Summary: 	WebKit support for Liferea
-Group:		Applications/Internet
-Requires: 	liferea = %{version}
-%description WebKit
-%{Summary}
-
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q -n %{name}-%{version}-rc4
 %patch0 -p1 -b .fedorafeed
-#patch1 -p1 -b .webkitfix
 
 %build
-%configure --disable-schemas-install --disable-gtkhtml2 --disable-lua --with-gecko=libxul --enable-webkit
-
-find . -name "Makefile" | xargs sed -i 's!-I/usr/include/xulrunner-sdk-1.9/stable!-I/usr/include/xulrunner-sdk-1.9/stable -I/usr/include/xulrunner-sdk-1.9/ -I/usr/include/xulrunner-sdk-1.9/gtkembedmoz/ -I/usr/include/xulrunner-sdk-1.9/xpcom -I /usr/include/xulrunner-sdk-1.9/necko/ -I/usr/include/xulrunner-sdk-1.9/dom/ -I/usr/include/nspr4/!g'
-
+%configure  --enable-nm  --enable-libnotify  --enable-lua
 make %{?_smp_mflags}
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
 make install DESTDIR=${RPM_BUILD_ROOT}
 
-execstack -c ${RPM_BUILD_ROOT}/usr/bin/liferea-bin
+#execstack -c ${RPM_BUILD_ROOT}/usr/bin/liferea-bin
 
 %find_lang %{name}
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
@@ -116,20 +110,24 @@ fi
 %{_mandir}/pl/man1/%{name}.1.gz
 %{_sysconfdir}/gconf/schemas/%{name}.schemas
 %{_bindir}/%{name}
-%{_bindir}/%{name}-bin
+#{_bindir}/%{name}-bin
 %{_bindir}/%{name}-add-feed
 %{_datadir}/%{name}/
+%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
+%{_datadir}/icons/hicolor/22x22/apps/%{name}.png
+%{_datadir}/icons/hicolor/24x24/apps/%{name}.png
+%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
 %{_datadir}/icons/hicolor/48x48/apps/%{name}.png
+%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
 %{_datadir}/applications/fedora-%{name}.desktop
 %dir %{_libdir}/%{name}
-%{_libdir}/%{name}/*.so*
-%exclude %{_libdir}/%{name}/liblihtmlw.so
-
-%files WebKit
-%defattr(-,root,root,-)
-%{_libdir}/%{name}/liblihtmlw.so
+#{_libdir}/%{name}/*.so*
 
 %changelog
+* Tue May 26 2009 Steven M. Parrish <tuxbrewr at fedoraproject.org> 1.6.0-0.1.rc4
+- New upstream release
+- Drops support for xulrunner.  Now WebKit only
+
 * Mon Apr 27 2009 Christopher Aillon <caillon at redhat.com> - 1.4.26-2
 - Rebuild against newer gecko
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/liferea/devel/sources,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -p -r1.81 -r1.82
--- sources	8 Mar 2009 15:36:47 -0000	1.81
+++ sources	8 Jun 2009 14:48:22 -0000	1.82
@@ -1 +1 @@
-d4ce9e710e3fb988bd5e4c2debe89331  liferea-1.4.26.tar.gz
+496a5dddc0063555110b13ad3c122d18  liferea-1.6.0-rc4.tar.gz


--- liferea-1.4.23-webkit-fix.patch DELETED ---