packages: rpmdevtools/rpmdevtools.spec, rpmdevtools/spectool-1.0.10-problem...
glen
glen at pld-linux.org
Sun Oct 17 20:03:12 CEST 2010
Author: glen Date: Sun Oct 17 18:03:12 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- rename to rpmdevtools, version 7.10, spec refreshed from fc, emacs dropped as
i still don't use and know how to package it
---- Files affected:
packages/rpmdevtools:
rpmdevtools.spec (1.7 -> 1.8) , spectool-1.0.10-problemtags-637000.patch (NONE -> 1.1) (NEW), spectool-1.0.10-sourcenum.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/rpmdevtools/rpmdevtools.spec
diff -u packages/rpmdevtools/rpmdevtools.spec:1.7 packages/rpmdevtools/rpmdevtools.spec:1.8
--- packages/rpmdevtools/rpmdevtools.spec:1.7 Mon Feb 12 22:23:55 2007
+++ packages/rpmdevtools/rpmdevtools.spec Sun Oct 17 20:03:03 2010
@@ -1,155 +1,104 @@
# $Revision$, $Date$
-%define emacs_sitestart_d %{_datadir}/emacs/site-lisp/site-start.d
-%define xemacs_sitestart_d %{_datadir}/xemacs/site-packages/lisp/site-start.d
-%define spectool_version 1.0.7
-
-Summary: Fedora RPM Development Tools
-Summary(pl.UTF-8): Narzędzia do tworzenia RPM-ów Fedory
-Name: fedora-rpmdevtools
-Version: 1.5
-Release: 0.2
-License: GPL
+%define spectool_version 1.0.10
+Summary: RPM Development Tools
+Name: rpmdevtools
+Version: 7.10
+Release: 0.1
Group: Development/Tools
-# rpminfo upstream: http://people.redhat.com/twoerner/rpminfo/bin/
-Source0: %{name}-%{version}.tar.bz2
-# Source0-md5: 8b9e391f9da90a78ccb62db05e961bc3
+# rpmdev-setuptree is GPLv2, everything else GPLv2+
+License: GPL v2+ and GPL v2
+URL: https://fedorahosted.org/rpmdevtools/
+Source0: https://fedorahosted.org/released/rpmdevtools/%{name}-%{version}.tar.xz
+# Source0-md5: b2e7d7e8fbdbcae8c31b7249fd1dc615
Source1: http://people.redhat.com/nphilipp/spectool/spectool-%{spectool_version}.tar.bz2
-# Source1-md5: e2b1668f39c085807cae5a770c252dd5
-URL: http://fedoraproject.org/wiki/fedora-rpmdevtools
-# Required for tool operations
-Requires: cpio
+# Source1-md5: d193612122f297ee4b37f1b04f605768
+Patch0: spectool-1.0.10-sourcenum.patch
+Patch1: spectool-1.0.10-problemtags-637000.patch
+BuildRequires: %{_bindir}/pod2man
+BuildRequires: help2man
+BuildRequires: python >= 2.4
+BuildRequires: python-rpm
+Requires: %{_bindir}/man
+Requires: diffutils
+Requires: fakeroot
Requires: file
-Requires: perl-base
-Requires: python
+Requires: findutils
+Requires: gawk
+Requires: grep
+Requires: python >= 2.4
Requires: python-rpm
+Requires: rpm-build >= 4.4.2.3
Requires: sed
Requires: wget
-# Minimal RPM build requirements
-Requires: bzip2
-Requires: diffutils
-Requires: rpm-build
-Requires: tar
-Requires: unzip
-Provides: %{name}-emacs = %{version}-%{release}
Provides: spectool = %{spectool_version}
+Obsoletes: fedora-rpmdevtools
BuildArch: noarch
+# For _get_cword in bash completion snippet
+Conflicts: bash-completion < 20080705
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
-This package contains scripts and (X)Emacs support files to aid in
-development of Fedora RPM packages. These tools are designed for
-Fedora Core 2 and later.
-
-fedora-buildrpmtree Create RPM build tree within user's home directory
-fedora-installdevkeys Install GPG keys in alternate RPM keyring
-fedora-kmodhelper Helper script for building kernel module RPMs
-fedora-md5 Display the md5sum of all files in an RPM
-fedora-newrpmspec Creates new .spec from template
-fedora-rmdevelrpms Find (and optionally remove) "development" RPMs
-fedora-rpmchecksig Check package signatures using alternate RPM keyring
-fedora-rpminfo Prints information about executables and libraries
-fedora-rpmvercmp RPM version comparison checker
-fedora-extract Extract various archives, "tar xvf" style
-fedora-diffarchive Diff contents of two archives
-fedora-wipebuildtree Erase all files within dirs created by buildrpmtree
-spectool Expand and download sources and patches in specfiles
-
-%description -l pl.UTF-8
-Ten pakiet zawiera skrypty i pliki pomocnicze (X)Emacsa pomocne przy
-tworzeniu pakietów RPM Fedory. Narzędzia te są zaprojektowane dla
-Fedory Core 2 i nowszych.
-
-fedora-buildrpmtree Tworzy drzewo budowania RPM w katalogu domowym
-fedora-installdevkeys Instaluje klucze GPG w osobnym keyringu RPM-a
-fedora-kmodhelper Pomocniczy skrypt do budowania RPM-ów z modułami jądra
-fedora-md5 Wyświetla sumę md5 wszystkich plików w pakiecie RPM
-fedora-newrpmspec Tworzy nowy plik .spec z szablonu
-fedora-rmdevelrpms Znajduje (i opcjonalnie usuwa) pakiety RPM *-devel
-fedora-rpmchecksig Sprawdza podpisy pakietów przy użyciu osobnego keyringu RPM
-fedora-rpminfo Wypisuje informacje o plikach wykonywalnych i bibliotekach
-fedora-rpmvercmp Narzędzie do porównywania wersji RPM-ów
-fedora-extract Rozpakowuje różne archiwa podobnie do "tar xvf"
-fedora-diffarchive Porównuje zawartość dwóch archiwów
-fedora-wipebuildtree Usuwa wszystkie pliki z katalogów tworzonych przez buildrpmtree
-spectool Odczytuje i pobiera źródła i łaty z pliku spec
+This package contains scripts to aid in development of RPM packages.
%prep
%setup -q -a 1
-cp -p spectool*/README README.spectool
+cp -p spectool-%{spectool_version}/README README.spectool
+cd spectool-%{spectool_version}
+%patch0 -p1
+%patch1 -p1
+cd ..
+
+%build
+%configure \
+ --libdir=%{_prefix}/lib
+
+%{__make}
%install
rm -rf $RPM_BUILD_ROOT
+%{__make} install \
+ DESTDIR=$RPM_BUILD_ROOT
+
+# sane naming
+mv $RPM_BUILD_ROOT/etc/bash_completion.d/%{name}{.bash-completion,}
-install -dm 755 $RPM_BUILD_ROOT%{_bindir}
-install -pm 755 fedora-buildrpmtree $RPM_BUILD_ROOT%{_bindir}
-install -pm 755 fedora-installdevkeys $RPM_BUILD_ROOT%{_bindir}
-install -pm 755 fedora-kmodhelper $RPM_BUILD_ROOT%{_bindir}
-install -pm 755 fedora-md5 $RPM_BUILD_ROOT%{_bindir}
-install -pm 755 fedora-newrpmspec $RPM_BUILD_ROOT%{_bindir}
-install -pm 755 fedora-rmdevelrpms $RPM_BUILD_ROOT%{_bindir}
-install -pm 755 fedora-rpmchecksig $RPM_BUILD_ROOT%{_bindir}
-install -pm 755 rpminfo $RPM_BUILD_ROOT%{_bindir}/fedora-rpminfo
-install -pm 755 fedora-extract $RPM_BUILD_ROOT%{_bindir}
-install -pm 755 fedora-diffarchive $RPM_BUILD_ROOT%{_bindir}
-install -pm 755 fedora-rpmvercmp $RPM_BUILD_ROOT%{_bindir}
-install -pm 755 fedora-wipebuildtree $RPM_BUILD_ROOT%{_bindir}
-install -pm 755 spectool*/spectool $RPM_BUILD_ROOT%{_bindir}
-
-install -dm 755 $RPM_BUILD_ROOT%{_prefix}/lib/rpm
-install -pm 755 check-buildroot check-rpaths* \
- $RPM_BUILD_ROOT%{_prefix}/lib/rpm
-
-install -dm 755 $RPM_BUILD_ROOT%{_datadir}/fedora/devgpgkeys
-install -pm 644 spectemplate*.spec template.init \
- $RPM_BUILD_ROOT%{_datadir}/fedora
-install -pm 644 devgpgkeys/* $RPM_BUILD_ROOT%{_datadir}/fedora/devgpgkeys
-
-install -dm 755 $RPM_BUILD_ROOT%{_datadir}/fedora/emacs
-install -pm 644 emacs/fedora-init.el $RPM_BUILD_ROOT%{_datadir}/fedora/emacs
-for dir in %{emacs_sitestart_d} %{xemacs_sitestart_d} ; do
- install -dm 755 $RPM_BUILD_ROOT$dir
- ln -s %{_datadir}/fedora/emacs/fedora-init.el $RPM_BUILD_ROOT$dir
- touch $RPM_BUILD_ROOT$dir/fedora-init.elc
-done
-
-install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/fedora
-install -pm 644 rmdevelrpms.conf $RPM_BUILD_ROOT%{_sysconfdir}/fedora
-
-%check
-env PATH="$RPM_BUILD_ROOT%{_bindir}:$PATH" sh test/fedora-kmodhelper-test.sh
-/bin/bash test/rpathtest.sh
+install -p spectool-%{spectool_version}/spectool $RPM_BUILD_ROOT%{_bindir}
%clean
rm -rf $RPM_BUILD_ROOT
-# i don't use emacs, so dunno to check
-%if 0
-%triggerin -- emacs-common
-[ -d %{emacs_sitestart_d} ] && \
- ln -sf %{_datadir}/fedora/emacs/fedora-init.el %{emacs_sitestart_d} || :
-
-%triggerin -- xemacs-common
-[ -d %{xemacs_sitestart_d} ] && \
- ln -sf %{_datadir}/fedora/emacs/fedora-init.el %{xemacs_sitestart_d} || :
-
-%triggerun -- emacs-common
-[ $2 -eq 0 ] && rm -f %{emacs_sitestart_d}/fedora-init.el* || :
-
-%triggerun -- xemacs-common
-[ $2 -eq 0 ] && rm -f %{xemacs_sitestart_d}/fedora-init.el* || :
-%endif
-
%files
%defattr(644,root,root,755)
-%doc README*
-%dir %{_sysconfdir}/fedora
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/fedora/rmdevelrpms.conf
-%{_datadir}/fedora
-%attr(755,root,root) %{_bindir}/fedora-*
+%doc NEWS README*
+%dir %{_sysconfdir}/%{name}
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/devscripts.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/newspec.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/rmdevelrpms.conf
+
+# templates
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/spectemplate-*.spec
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/template.init
+
+%attr(755,root,root) %{_bindir}/annotate-output
+%attr(755,root,root) %{_bindir}/checkbashisms
+%attr(755,root,root) %{_bindir}/licensecheck
+%attr(755,root,root) %{_bindir}/manpage-alert
+%attr(755,root,root) %{_bindir}/rpmargs
+%attr(755,root,root) %{_bindir}/rpmdev-*
+%attr(755,root,root) %{_bindir}/rpmelfsym
+%attr(755,root,root) %{_bindir}/rpmfile
+%attr(755,root,root) %{_bindir}/rpminfo
+%attr(755,root,root) %{_bindir}/rpmls
+%attr(755,root,root) %{_bindir}/rpmpeek
+%attr(755,root,root) %{_bindir}/rpmsodiff
+%attr(755,root,root) %{_bindir}/rpmsoname
%attr(755,root,root) %{_bindir}/spectool
-%attr(755,root,root) %{_prefix}/lib/rpm/check-*
-%ghost %{emacs_sitestart_d}/fedora*.el*
-%ghost %{xemacs_sitestart_d}/fedora*.el*
+%{_mandir}/man1/*.1*
+%{_mandir}/man8/*.8*
+%{_datadir}/%{name}
+
+# bash-completion subpkg
+/etc/bash_completion.d/%{name}
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -157,6 +106,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.8 2010/10/17 18:03:03 glen
+- rename to rpmdevtools, version 7.10, spec refreshed from fc, emacs dropped as
+ i still don't use and know how to package it
+
Revision 1.7 2007/02/12 21:23:55 glen
- tabs in preamble
================================================================
Index: packages/rpmdevtools/spectool-1.0.10-problemtags-637000.patch
diff -u /dev/null packages/rpmdevtools/spectool-1.0.10-problemtags-637000.patch:1.1
--- /dev/null Sun Oct 17 20:03:12 2010
+++ packages/rpmdevtools/spectool-1.0.10-problemtags-637000.patch Sun Oct 17 20:03:03 2010
@@ -0,0 +1,14 @@
+https://bugzilla.redhat.com/637000
+
+diff -up spectool-1.0.10/spectool~ spectool-1.0.10/spectool
+--- spectool-1.0.10/spectool~ 2008-02-12 12:32:21.000000000 +0200
++++ spectool-1.0.10/spectool 2010-09-27 19:17:31.483281717 +0300
+@@ -108,7 +108,7 @@ sub eval_sources_patches {
+ last;
+ }
+ }
+- next if ($line =~ m/^\s*(BuildArch|Exclu(d|siv)e(Arch|OS))\s*:/i);
++ next if ($line =~ m/^\s*(BuildArch(itectures)?|Exclu(d|siv)e(Arch|OS)|Icon)\s*:/i);
+ $preamble .= $line;
+ if ($line !~ m/^\s*(?:source|patch)\d*\s*:/) {
+ print $tmpspec_fh $line;
================================================================
Index: packages/rpmdevtools/spectool-1.0.10-sourcenum.patch
diff -u /dev/null packages/rpmdevtools/spectool-1.0.10-sourcenum.patch:1.1
--- /dev/null Sun Oct 17 20:03:12 2010
+++ packages/rpmdevtools/spectool-1.0.10-sourcenum.patch Sun Oct 17 20:03:03 2010
@@ -0,0 +1,17 @@
+Fix for -s x,y, -p x,y from Todd Zullinger:
+https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00621.html
+
+diff -up spectool-1.0.10/spectool~ spectool-1.0.10/spectool
+--- spectool-1.0.10/spectool~ 2008-02-12 12:32:21.000000000 +0200
++++ spectool-1.0.10/spectool 2009-08-21 02:12:56.000000000 +0300
+@@ -269,8 +269,8 @@ GetOptions ('h|help' => sub { $command =
+ 'v|verbose' => sub { $verbose++; },
+ 'n|dryrun|dry-run' => sub { $dryrun = 1; },
+ 'V|version' => sub { $command = 'version'; },
+- 's|source=i' => \@sources,
+- 'p|patch=i' => \@patches,
++ 's|source=s' => \@sources,
++ 'p|patch=s' => \@patches,
+ 'S|sources' => sub { push @what, 'sources'; },
+ 'P|patches' => sub { push @what, 'patches'; },
+ 'A|all' => sub { push @what, 'all'; },
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpmdevtools/rpmdevtools.spec?r1=1.7&r2=1.8&f=u
More information about the pld-cvs-commit
mailing list