commit whohas for openSUSE:Factory

Hello community, here is the log from the commit of package whohas for openSUSE:Factory checked in at 2012-02-07 14:47:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/whohas (Old) and /work/SRC/openSUSE:Factory/.whohas.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "whohas", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/whohas/whohas.changes 2011-09-23 12:50:34.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.whohas.new/whohas.changes 2012-02-07 14:47:05.000000000 +0100 @@ -1,0 +2,60 @@ +Sat Feb 4 13:49:53 UTC 2012 - asterios.dramis@gmail.com + +- Rebased ubuntu-versions-510203.patch to apply cleanly. +- Removed opkg-repo.patch (repository doesn't respond). +- Readded openbsd-cache-results-557724.patch (problem not fixed upstream). +- Added fedora-search-619873.patch (taken from Debian) to support Fedora's + package listing. +- Fix compilation in SLE (don't use make_install macro). + +------------------------------------------------------------------- +Sun Dec 4 20:18:53 UTC 2011 - asterios.dramis@gmail.com + +- Update to version 0.29: + * fixed AUR module + * fixed Mandriva module + * fixed a problem with openBSD URL construction + * added new Slackware module to replace the previous one which queried a + now-defunct (third party) web interface + * code cleanup + * implemented functionality suggested by Guillaume Delacour and Steve Cotton + * updated to current version numbers of Ubuntu, Mandriva, openSUSE, OpenBSD, + Fedora, Slackware (13.1 not 13.37 as we're waiting on linuxpackages.net to + update their search interface) +- Rebased the following patches to apply cleanly: + * manpage-0.24.patch. + * debian-versions-511364.patch. + * help-param-513476.patch. + * strictness-510020-510524.patch. + * improve-fetchdoc.patch. + * opensuse-searchpath-585596.patch. +- Marked the following patches as PATCH-NEEDS-REBASE (not critical): + * ubuntu-versions-510203.patch. + * opkg-repo.patch. +- Removed the following patches: + * use-getopt-513473.patch (merged upstream). + * openbsd-cache-results.patch (fixed upstream). + * fedora-version.patch (fixed upstream). + * openbsd-url-586537.patch (fixed upstream). +- Spec file updates: + * Changes based on spec-cleaner run. + * Changed License: to GPL-2.0+ (SPDX style). + +------------------------------------------------------------------- +Wed Aug 24 14:48:11 UTC 2011 - Sascha.Manns@open-slx.de + +- fixed build + +------------------------------------------------------------------- +Sun Jul 24 20:30:51 UTC 2011 - asterios.dramis@gmail.com + +- Spec file updates: + * Removed find and perl-DateTime from Requires: (not needed). + * Added perl-XML-Simple in Requires:. + * Minor other updates. +- Added some patches (taken from Debian) that fix/improve various issues with + the package and add support for more recent distributions. +- Removed whohas-opensuse-fix.patch and replaced it with the Debian patch which + also shows the version number of a package. + +------------------------------------------------------------------- Old: ---- whohas-0.24.tar.bz2 whohas-opensuse-fix.patch New: ---- archlinux-url-561536.patch debian-versions-511364.patch dont-mask-vars-560891.patch fedora-search-619873 gentoo-result-url-516071.patch help-param-513476.patch improve-fetchdoc.patch manpage-0.23.patch manpage-0.24.patch openbsd-cache-results-557724 opensuse-searchpath-585596.patch strictness-510020-510524.patch ubuntu-versions-510203.patch whohas-0.29.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ whohas.spec ++++++ --- /var/tmp/diff_new_pack.Ko70n3/_old 2012-02-07 14:47:07.000000000 +0100 +++ /var/tmp/diff_new_pack.Ko70n3/_new 2012-02-07 14:47:07.000000000 +0100 @@ -1,8 +1,9 @@ # # spec file for package whohas # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. -# Copyright (c) 2010 Sascha Manns +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 8/2011 open-slx GmbH +# Copyright (c) 2010 - 7/2011 Sascha Manns # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,46 +17,80 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - - Name: whohas -Version: 0.24 -Release: 1 -License: GPLv2 or later +Version: 0.29 +Release: 0 Summary: Package list querying tool -Url: http://www.philippwesche.org/200811/whohas/intro.html +License: GPL-2.0+ Group: System/Console -Source: %{name}-%{version}.tar.bz2 -# PATCH-FIX-UPSTREAM -- saigkill@opensuse.org Fixed some minor things like the search URL of openSUSE Server -Patch0: whohas-opensuse-fix.patch -# PATCH-FIX-OPENSUSE -- pth@suse.de - Added a Makefile for Installation. -Patch1: whohas-fix_install.patch -Requires: find +Url: http://www.philippwesche.org/200811/whohas/intro.html +Source0: http://www.philippwesche.org/200811/%{name}/%{name}-%{version}.tar.gz +# PATCH-FIX-OPENSUSE whohas-fix_install.patch pth@suse.de -- Added a Makefile for Installation. +Patch0: whohas-fix_install.patch +# PATCH-FIX-UPSTREAM manpage-0.23.patch asterios.dramis@gmail.com -- Add the --shallow option to the syntax line in the manpage +Patch1: manpage-0.23.patch +# PATCH-FIX-UPSTREAM manpage-0.24.patch asterios.dramis@gmail.com -- Update the version number in the manual from 0.23 to 0.24 +Patch2: manpage-0.24.patch +# PATCH-FIX-UPSTREAM ubuntu-versions-510203.patch deb#510203 asterios.dramis@gmail.com -- Show all versions of a package from Ubuntu, not just the earliest +Patch3: ubuntu-versions-510203.patch +# PATCH-FIX-UPSTREAM debian-versions-511364.patch deb#511364 asterios.dramis@gmail.com -- Providing output for all Debian distributions +Patch4: debian-versions-511364.patch +# PATCH-FIX-UPSTREAM help-param-513476.patch deb#513476 asterios.dramis@gmail.com -- Handle the --help parameter instead of assuming it is a package name +Patch5: help-param-513476.patch +# PATCH-FIX-UPSTREAM strictness-510020-510524.patch deb#510020 deb#510524 asterios.dramis@gmail.com -- Add a --strict option to output only exactly matching package names +Patch6: strictness-510020-510524.patch +# PATCH-FIX-OPENSUSE gentoo-result-url-516071.patch deb#516071 asterios.dramis@gmail.com -- Return a more official link to the gentoo package, where more useful information can be found +Patch7: gentoo-result-url-516071.patch +# PATCH-FIX-OPENSUSE improve-fetchdoc.patch asterios.dramis@gmail.com -- Shift some of the burden in sub fetchdoc onto the LWP::UserAgent class. This also allows us to process XML files without breaking the first line +Patch8: improve-fetchdoc.patch +# PATCH-FIX-UPSTREAM openbsd-cache-results-557724 deb#557724 asterios.dramis@gmail.com -- For OpenBSD, use @name to loop through a cached list, not @repos which is never populated +Patch9: openbsd-cache-results-557724 +# PATCH-FIX-UPSTREAM dont-mask-vars-560891.patch deb#560891 asterios.dramis@gmail.com -- Remove a double-declaration of @dates +Patch10: dont-mask-vars-560891.patch +# PATCH-FIX-OPENSUSE opensuse-searchpath-585596.patch deb#585596 asterios.dramis@gmail.com -- Update search URL for openSUSE repositories +Patch11: opensuse-searchpath-585596.patch +# PATCH-FIX-OPENSUSE archlinux-url-561536.patch deb#561536 asterios.dramis@gmail.com -- Update search URL for Arch repositories +Patch12: archlinux-url-561536.patch +# PATCH-FIX-OPENSUSE fedora-search-619873 deb#619873 asterios.dramis@gmail.com -- Support Fedora's package listing +Patch13: fedora-search-619873 Requires: perl = %{perl_version} -Requires: perl-DateTime +Requires: perl-XML-Simple Requires: perl-libwww-perl BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %description -whohas is a command line tool that allows querying several package lists at once - currently -supported are Arch, Debian, Fedora, Gentoo, Mandriva, openSUSE, Slackware (and linuxpackages.net), -Source Mage, Ubuntu, FreeBSD, NetBSD, OpenBSD, Fink, MacPorts and Cygwin. whohas is written in -Perl and was designed to help package maintainers find ebuilds, pkgbuilds and similar package -definitions from other distributions to learn from. However, it can also be used by normal -users who want to know: +whohas is a command line tool that allows querying several package lists at +once - currently supported are Arch, Debian, Fedora, Gentoo, Mandriva, +openSUSE, Slackware (and linuxpackages.net), Source Mage, Ubuntu, FreeBSD, +NetBSD, OpenBSD, Fink, MacPorts, Cygwin and OpenMoko. whohas is written in Perl +and was designed to help package maintainers find ebuilds, pkgbuilds and +similar package definitions from other distributions to learn from. However, it +can also be used by normal users who want to know: * Which distribution provides packages on which the user depends. - * What version of a given package is in use in each distribution, or in each release of a - distribution (implemented only for Debian). + * What version of a given package is in use in each distribution, or in each + release of a distribution (not implemented for all distributions). %prep %setup -q -%patch0 -p1 -%patch1 +%patch0 +%patch1 -p1 +%patch2 +%patch3 -p1 +%patch4 +%patch5 +%patch6 +%patch7 -p1 +%patch8 -p1 +%patch9 -p1 +%patch10 -p1 +%patch11 +%patch12 -p1 +%patch13 -p1 -%__chmod go+rx html_assets -%__chmod -R 644 Changelog INSTALL LICENSE intro.html intro.txt html_assets/* +chmod go+rx html_assets +chmod -R 644 Changelog LICENSE intro.html intro.txt html_assets/* %build @@ -63,17 +98,14 @@ # install binary # INFO: From line 52 on you will find the searchable repositories. If you would like to # change them, just edit these lines. -%makeinstall - -%clean -%__rm -rf %{buildroot} +make DESTDIR=%{buildroot} install %files +%defattr(-,root,root,-) +%doc Changelog LICENSE intro.html intro.txt html_assets/ %attr(0755,root,root) %{_bindir}/%{name} -%defattr(-,root,root) -%dir %{_mandir}/de/man1 -%{_mandir}/man1/%{name}.1.gz -%{_mandir}/de/man1/%{name}.1.gz -%doc Changelog INSTALL LICENSE intro.html intro.txt html_assets/ +%doc %{_mandir}/man1/%{name}.1%{ext_man} +%doc %dir %{_mandir}/de/man1 +%doc %{_mandir}/de/man1/%{name}.1%{ext_man} %changelog ++++++ archlinux-url-561536.patch ++++++ Description: update search URL for Arch repositories Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=561536 Author: Guillaume Delacour Reviewed-by: Jonathan Wiltshire Last-Update: 2010-12-05 --- whohas-0.24.orig/program/whohas 2010-04-05 00:42:48.000000000 +0200 +++ whohas-0.24/program/whohas 2010-12-03 12:26:01.780263569 +0100 @@ -1115,7 +1124,8 @@ sub arch { my $archbase = "http://www.archlinux.org"; - my @lines = split /\n/, &fetchdoc($archbase."/packages/?arch=i686&repo=&q=".$_[0]."&last_update=&limit=all"); + # if we directly query i686, redirected to the specific package page + my @lines = split /\n/, &fetchdoc($archbase."/packages/?repo=&q=".$_[0]."&last_update=&limit=all"); my @repos; my @names; @@ -1124,7 +1134,7 @@ my @urls; my @sizes; for (my $i = 0; $i < @lines; $i++) { - if ($lines[$i] =~ /\|\<\/td\>//g; @@ -1132,15 +1142,16 @@ push @repos,$temp; } elsif ($a == 4) { push @urls, $archbase.&arch_site_get_url ($lines[$i+$a]); + } elsif ($a == 5) { push @names, &arch_site_ger_cont($lines[$i+$a]); - } elsif ($a == 6) { - $temp =~ s/|<\/span>//g; + } elsif ($a == 7) { + $temp =~ s/|<\/span>//g; push @versions, $temp; } elsif ($a == 10) { push @dates, $temp; } } - # 2 is package group, 5 is description + # 2 is package group push @sizes, ""; $i += 7; } @@ -1153,7 +1164,7 @@ sub arch_site_get_url { my $temp = $_[0]; - $temp =~ s/.*\.*//g; + $temp =~ s/.*\http://packages.debian.org','Debian',\@dists,$_[0]); return(); } ++++++ dont-mask-vars-560891.patch ++++++ Description: Remove a double-declaration of @dates Author: Jonathan Wiltshire Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=560891 Forwarded: phi1ipp@yahoo.com --- program/whohas | 1 - 1 file changed, 1 deletion(-) --- whohas-0.23.orig/program/whohas +++ whohas-0.23/program/whohas @@ -1085,7 +1085,6 @@ my @dates; my @urls; my @sizes; - my @dates; my $indicator = 0; for (my $i = 100; $i < @lines; $i++) { # 100 is a compromise between safety and efficiency if ($lines[$i] =~ /http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=619873 Index: whohas-0.24/program/whohas =================================================================== --- whohas-0.24.orig/program/whohas 2011-11-29 16:22:29.000000000 -0300 +++ whohas-0.24/program/whohas 2011-11-29 16:25:47.192778437 -0300 @@ -290,27 +290,26 @@ for (my $a = 0; $a < @fed_urls; $a++) { my @lines = split /\n/, &fetchdoc($baseurl.$fed_urls[0]); for (my $li = 0; $li < @lines; $li++) { - if ($lines[$li] =~ /\/icons\/unknown\.gif/) { - my @parts = split /\<|\>|\"/, $lines[$li]; - my $prev_release = $fedora_release - 1; - $parts[22] =~ s/\.fc($fedora_release|$prev_release).+//; - my ($name,$version) = &combos($parts[22]); - push @dates, &month_to_digits($parts[32]); - $parts[38] =~ s/^\s+//; - push @sizes, $parts[38]; + if ($lines[$li] =~ /\.rpm<\/a>/) { + my $line = trim($lines[$li]); + my @parts = split / +|<|>|"/, $line, 10; + $parts[5] =~ s/\.fc[0-9]+.+$//; + my ($name,$version) = &combos($parts[5]); + push @dates, &month_to_digits($parts[7])." ".$parts[8]; + push @sizes, $parts[9]; push @names, $name; push @versions, $version; push @repos, ""; - push @urls, ""; + push @urls, "$baseurl$fed_urls[0]/$parts[3]"; } } } + open OUT, ">$file"; + for (my $i = 0; $i < @urls;$i++) { + print OUT "$names[$i]\t$versions[$i]\t$sizes[$i]\t$dates[$i]\n"; + } + close OUT; } - open OUT, ">$file"; - for (my $i = 0; $i < @urls;$i++) { - print OUT "$names[$i]\t$versions[$i]\t$sizes[$i]\t$dates[$i]\n"; - } - close OUT; } for (my $i = 0; $i < @names; $i++) { if ($names[$i] =~ /$searchy/i) { ++++++ gentoo-result-url-516071.patch ++++++ #! /bin/sh /usr/share/dpatch/dpatch-run ## 35-gentoo-result-url-516071.dpatch by Jonathan Wiltshire ## ## All lines beginning with `## DP:' are a description of the patch. ## DP: Return a more official link to the gentoo package, where more useful ## DP: information can be found @DPATCH@ --- whohas-0.23.orig/program/whohas +++ whohas-0.23/program/whohas @@ -800,6 +800,7 @@ sub gentoo { my $gentoobase = "http://gentoo-portage.com"; + my $gentoobaseofficial = "http://packages.gentoo.org/package"; my $distroname = "Gentoo"; my @names; my @versions; @@ -821,6 +822,7 @@ my @dosparts = split /\//, $parts[1]; $dosparts[1] =~ / +$/; my $tempurl = $gentoobase."/".$dosparts[0]."/".$dosparts[1]; + my $officialurl = $gentoobaseofficial."/".$dosparts[0]."/".$dosparts[1]; my @newlines = split /\n/, &fetchdoc($tempurl); for (my $li = 0; $li < @newlines; $li++) { if ($newlines[$li] =~ /\