Compare commits

..

5 Commits

Author SHA1 Message Date
Fedora Release Engineering 0d7a7c1a75 dist-git conversion 2010-07-29 11:38:26 +00:00
Ville Skyttä ba8f9b73f2 - Update to 7.8, fixes #562316. 2010-02-15 22:24:05 +00:00
Ville Skyttä 852e2a5e92 - Update to 7.7, fixes #558263.
Mon Dec 7 2009 Ville Skyttä <ville.skytta@iki.fi> - 7.6-1
- Update to 7.6, fixes #528907.
2010-02-03 20:11:42 +00:00
Bill Nottingham 7a4f915cf8 Fix typo that causes a failure to update the common directory. (releng
#2781)
2009-11-26 01:29:16 +00:00
Jesse Keating eddc9a8cc9 Initialize branch F-12 for rpmdevtools 2009-09-29 06:43:57 +00:00
4 changed files with 48 additions and 57 deletions
+2 -1
View File
@@ -1 +1,2 @@
/rpmdevtools-8.0.tar.xz
spectool-1.0.10.tar.bz2
rpmdevtools-7.8.tar.xz
+27 -55
View File
@@ -1,8 +1,10 @@
%global spectool_version 1.0.10
%global emacs_sitestart_d %{_datadir}/emacs/site-lisp/site-start.d
%global xemacs_sitestart_d %{_datadir}/xemacs/site-packages/lisp/site-start.d
%global spectool_version 1.0.10
Name: rpmdevtools
Version: 8.0
Release: 3%{?dist}
Version: 7.8
Release: 1%{?dist}
Summary: RPM Development Tools
Group: Development/Tools
@@ -10,6 +12,8 @@ Group: Development/Tools
License: GPLv2+ and GPLv2
URL: https://fedorahosted.org/rpmdevtools/
Source0: https://fedorahosted.org/released/rpmdevtools/%{name}-%{version}.tar.xz
Source1: http://people.redhat.com/nphilipp/spectool/spectool-%{spectool_version}.tar.bz2
Patch0: spectool-1.0.10-sourcenum.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -18,27 +22,19 @@ BuildRequires: help2man
BuildRequires: %{_bindir}/pod2man
BuildRequires: python >= 2.4
BuildRequires: rpm-python
# emacs-common >= 1:22.3-3 for macros.emacs
BuildRequires: emacs-common >= 1:22.3-3
# xemacs-common >= 21.5.29-8 for macros.xemacs
BuildRequires: xemacs-common >= 21.5.29-8
Provides: spectool = %{spectool_version}
Requires: curl
Requires: diffutils
Requires: fakeroot
Requires: file
Requires: findutils
Requires: gawk
Requires: grep
Requires: %{_bindir}/man
Requires: man
Requires: python >= 2.4
Requires: rpm-build >= 4.4.2.3
Requires: rpm-python
Requires: sed
%if 0%{?fedora} > 14
Requires: emacs-filesystem
Requires: xemacs-filesystem
%endif
Requires: wget
# For _get_cword in bash completion snippet
Conflicts: bash-completion < 20080705
@@ -61,7 +57,11 @@ rpmdev-bumpspec Bump revision in specfile
%prep
%setup -q
%setup -q -a 1
cp -p spectool-%{spectool_version}/README README.spectool
cd spectool-%{spectool_version}
%patch0 -p1
cd ..
%build
@@ -74,7 +74,9 @@ rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
for dir in %{_emacs_sitestartdir} %{_xemacs_sitestartdir} ; do
install -pm 755 spectool-%{spectool_version}/spectool $RPM_BUILD_ROOT%{_bindir}
for dir in %{emacs_sitestart_d} %{xemacs_sitestart_d} ; do
install -dm 755 $RPM_BUILD_ROOT$dir
ln -s %{_datadir}/rpmdevtools/rpmdev-init.el $RPM_BUILD_ROOT$dir
touch $RPM_BUILD_ROOT$dir/rpmdev-init.elc
@@ -85,63 +87,33 @@ done
rm -rf $RPM_BUILD_ROOT
%if 0%{?fedora} <= 14
%triggerin -- emacs-common
[ -d %{_emacs_sitestartdir} ] && \
ln -sf %{_datadir}/rpmdevtools/rpmdev-init.el %{_emacs_sitestartdir} || :
%triggerun -- emacs-common
[ $2 -eq 0 ] && rm -f %{_emacs_sitestartdir}/rpmdev-init.el* || :
[ -d %{emacs_sitestart_d} ] && \
ln -sf %{_datadir}/rpmdevtools/rpmdev-init.el %{emacs_sitestart_d} || :
%triggerin -- xemacs-common
[ -d %{_xemacs_sitestartdir} ] && \
ln -sf %{_datadir}/rpmdevtools/rpmdev-init.el %{_xemacs_sitestartdir} || :
[ -d %{xemacs_sitestart_d} ] && \
ln -sf %{_datadir}/rpmdevtools/rpmdev-init.el %{xemacs_sitestart_d} || :
%triggerun -- emacs-common
[ $2 -eq 0 ] && rm -f %{emacs_sitestart_d}/rpmdev-init.el* || :
%triggerun -- xemacs-common
[ $2 -eq 0 ] && rm -f %{_xemacs_sitestartdir}/rpmdev-init.el* || :
%endif
[ $2 -eq 0 ] && rm -f %{xemacs_sitestart_d}/rpmdev-init.el* || :
%files
%defattr(-,root,root,-)
%doc COPYING NEWS
%doc COPYING NEWS README*
%config(noreplace) %{_sysconfdir}/rpmdevtools/
%{_sysconfdir}/bash_completion.d/
%{_datadir}/rpmdevtools/
%{_bindir}/*
%if 0%{?fedora} > 14
%{_emacs_sitestartdir}/rpmdev-init.el
%ghost %{_emacs_sitestartdir}/rpmdev-init.elc
%{_xemacs_sitestartdir}/rpmdev-init.el
%ghost %{_xemacs_sitestartdir}/rpmdev-init.elc
%else
%ghost %{_datadir}/emacs
%ghost %{_datadir}/xemacs
%endif
%ghost %{_datadir}/*emacs
%{_mandir}/man[18]/*.[18]*
%changelog
* Tue Mar 1 2011 Ville Skyttä <ville.skytta@iki.fi> - 8.0-3
- Require xemacs-filesystem on F-15+ (#672093).
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 8.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
* Sun Feb 6 2011 Ville Skyttä <ville.skytta@iki.fi> - 8.0-1
- Update to 8.0, fixes #519061 and #657594.
* Mon Sep 27 2010 Ville Skyttä <ville.skytta@iki.fi> - 7.10-1
- Update to 7.10, fixes #595135 and #619867.
- Patch spectool to work with specfiles containing Icon or BuildArchitectures
(#637000).
* Thu May 20 2010 Ville Skyttä <ville.skytta@iki.fi> - 7.9-1
- Update to 7.9, fixes #588313 and #589705.
* Fri Apr 16 2010 Ville Skyttä <ville.skytta@iki.fi> - 7.8-2
- Require %%{_bindir}/man instead of man (#582932).
* Tue Feb 16 2010 Ville Skyttä <ville.skytta@iki.fi> - 7.8-1
- Update to 7.8, fixes #562316.
+2 -1
View File
@@ -1 +1,2 @@
506d498af400c9739a0fcb7f611b3c2a rpmdevtools-8.0.tar.xz
d193612122f297ee4b37f1b04f605768 spectool-1.0.10.tar.bz2
a495921f4c05cc92018f61cccf6fdfbf rpmdevtools-7.8.tar.xz
+17
View File
@@ -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'; },