rpms/surfraw/devel import.log, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 surfraw.spec, 1.3, 1.4

[Thomas Moschny]

Author: thm

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

Modified Files:
	.cvsignore sources surfraw.spec 
Added Files:
	import.log 
Log Message:
Update to 2.2.5.


--- NEW FILE import.log ---
surfraw-2_2_5-1_fc11:HEAD:surfraw-2.2.5-1.fc11.src.rpm:1254241290


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/surfraw/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	23 May 2007 16:59:44 -0000	1.2
+++ .cvsignore	29 Sep 2009 16:22:35 -0000	1.3
@@ -1 +1 @@
-surfraw-1.0.7.tar.gz
+surfraw-2.2.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/surfraw/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	23 May 2007 16:59:44 -0000	1.2
+++ sources	29 Sep 2009 16:22:36 -0000	1.3
@@ -1 +1 @@
-0957382bbdebf3d678879fa5d2592c9d  surfraw-1.0.7.tar.gz
+e33fb6fe23b1ff60095a103272500672  surfraw-2.2.5.tar.gz


Index: surfraw.spec
===================================================================
RCS file: /cvs/pkgs/rpms/surfraw/devel/surfraw.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- surfraw.spec	27 Jul 2009 05:09:51 -0000	1.3
+++ surfraw.spec	29 Sep 2009 16:22:36 -0000	1.4
@@ -1,16 +1,28 @@
 Name:           surfraw
-Version:        1.0.7
-Release:        5%{?dist}
+Version:        2.2.5
+Release:        1%{?dist}
 Summary:        Shell Users Revolutionary Front Rage Against the Web
-
 Group:          Applications/Internet
 License:        Public Domain
-URL:            http://surfraw.sourceforge.net/
-Source0:        ftp://ftp.netbsd.org/pub/NetBSD/misc/proff/surfraw-%{version}.tar.gz
+URL:            http://surfraw.alioth.debian.org/
+Source0:        http://surfraw.alioth.debian.org/dist/surfraw-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 Requires:       screen
 
+# Surfraw searches for a text-mode broser at configuration time, not
+# at runtime. This is something probably to be changed upstream. We
+# could depend on 'text-www-browser', but then we are not sure that
+# this resolves to the same package at build and install time. So, for
+# now, we simply pick one.
+%global text_browser elinks
+BuildRequires:  %{text_browser}
+Requires:       %{text_browser}
+
+# For calling the graphical browser, we can rely on xdg-open.
+Requires:       xdg-utils
+
+
 %description
 Surfraw provides a fast unix command line interface to a variety of
 popular WWW search engines and other artifacts of power. It reclaims
@@ -34,71 +46,45 @@ and wonder.
 
 
 %build
-%configure
+%configure --with-elvidir=%{_libexecdir}/surfraw \
+           --with-graphical-browser=xdg-open \
+           --with-text-browser=%{text_browser} \
+           --disable-opensearch
 make %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot}
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README TODO
+%doc AUTHORS COPYING ChangeLog NEWS README TODO
 %config(noreplace) %{_sysconfdir}/surfraw.conf
-%config(noreplace) %{_sysconfdir}/surfraw_elvi.list
+%config(noreplace) %{_sysconfdir}/surfraw.bookmarks
+%{_bindir}/sr
 %{_bindir}/surfraw
-%{_bindir}/ftpfind
-%{_bindir}/fast
-%{_bindir}/currency
-%{_bindir}/scaleplus
-%{_bindir}/sourceforge
-%{_bindir}/raging
-%{_bindir}/debcontents
-%{_bindir}/wetandwild
-%{_bindir}/freshmeat
-%{_bindir}/netbsd
-%{_bindir}/debpackages
-%{_bindir}/webster
-%{_bindir}/xxx
-%{_bindir}/cite
-%{_bindir}/swhois
-%{_bindir}/amazon
-%{_bindir}/sundocs
-%{_bindir}/woffle
-%{_bindir}/freebsd
-%{_bindir}/W
-%{_bindir}/sunsolve
-%{_bindir}/yahoo
-%{_bindir}/ask
-%{_bindir}/appwatch
-%{_bindir}/altavista
-%{_bindir}/slinuxdoc
-%{_bindir}/debbugs
-%{_bindir}/filesearching
-%{_bindir}/google
-%{_bindir}/deja
-%{_bindir}/britannica
-%{_bindir}/austlii
-%{_bindir}/translate
-%{_bindir}/rhyme
-%{_bindir}/slashdot
-%{_bindir}/stockquote
-%{_bindir}/thesaurus
-%{_bindir}/openbsd
-%{_bindir}/cnn
-%{_bindir}/jake
-%{_bindir}/pubmed
-%{_bindir}/excite
-%{_bindir}/ftpsearch
+%{_bindir}/surfraw-update-path
+%{_libexecdir}/surfraw
+%{_mandir}/man1/*.1*
 
 
 %changelog
+* Sun Sep 27 2009 Thomas Moschny <thomas.moschny at gmx.de> - 2.2.5-1
+- Update to 2.2.5.
+- New upstream, and new upstream URL.
+- Elvi are now subcommands to the 'surfraw' command (or its 'sr'
+  alias), avoids conflicts with other packages (bz 472623).
+- Hard-code text browser to elinks, and graphical browser to xdg-open
+  for now.
+- Disable opensearch, needs perl(WWW::OpenSearch).
+- Include manpages in the filelist.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.7-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -115,4 +101,3 @@ rm -rf $RPM_BUILD_ROOT
 
 * Thu Mar 08 2007 Joe Rozner <livinded at deadbytes.net> 1.0.7-1
 - Initial specfile created.
-