Compare commits

..

40 Commits

Author SHA1 Message Date
Ville Skyttä 85d8faeb9b Update to 8.9 2016-06-25 15:48:40 +03:00
Ville Skyttä c257bf7df7 Update to 8.8 2016-06-25 13:10:18 +03:00
Petr Písař 6c092c945e Mandatory Perl build-requires added <https://fedoraproject.org/wiki/Changes/Build_Root_Without_Perl> 2016-06-24 10:14:18 +02:00
Ville Skyttä 314247a49a Work around bug in 8.7's rpmdev-bumpspec.1 build 2016-06-23 19:50:21 +03:00
Ville Skyttä e5fa722014 Upload source 2016-06-23 19:00:38 +03:00
Ville Skyttä 72a6c0f3cb Update to 8.7
- Specfile cleanups
2016-06-23 18:59:47 +03:00
Fedora Release Engineering 90de409997 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild 2016-02-04 22:18:41 +00:00
Ville Skyttä f5a5863426 Use python3 on > F-22 2015-06-17 13:57:43 +03:00
Ville Skyttä c00eb73a5b Update to 8.6 2015-05-10 20:53:27 +03:00
Ville Skyttä d09042a4c7 Update to 8.5
- Mark COPYING as %license where applicable
2014-10-20 21:37:39 +03:00
Dennis Gilmore 2e66162ac5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild 2014-06-07 21:56:03 -05:00
Ville Skyttä 1ca57fa989 Do not require devscripts in any scenario. 2013-10-19 09:24:12 +03:00
Ville Skyttä 946688ebc6 Update to 8.4. 2013-10-07 23:41:09 +03:00
Dennis Gilmore 81eb9a4614 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild 2013-08-04 07:59:05 -05:00
Petr Písař 69ac675da6 Perl 5.18 rebuild 2013-07-17 15:51:11 +02:00
Dennis Gilmore 0ed1cf6ca9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild 2013-02-14 15:52:53 -06:00
Thomas Woerner 432028f098 - xemacs is not available on RHEL (RHBZ#866841) 2012-10-17 13:23:16 +02:00
Ville Skyttä 62382c0bc5 Update to 8.3.
- Drop specfile constructs no longer needed with Fedora's rpm.
2012-09-03 00:13:02 +03:00
Dennis Gilmore b9735455ed - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild 2012-07-21 12:04:19 -05:00
Dennis Gilmore a3c470b7d7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild 2012-01-13 20:56:12 -06:00
Ville Skyttä ba8fba6d3f Update to 8.2. 2011-11-12 18:18:50 +02:00
Ville Skyttä c44d9fd00b Update to 8.1. 2011-04-26 10:58:37 +03:00
Ville Skyttä 155b05dfec Require xemacs-filesystem on F-15+ (#672093). 2011-03-22 18:19:17 +02:00
Dennis Gilmore d71ee8811c - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild 2011-02-09 02:42:46 -06:00
Ville Skyttä cd37a3e337 Update to 8.0, fixes #519061 and #657594. 2011-02-06 16:32:43 +02:00
Ville Skyttä 3dc51dea02 Add note why spectool is not updated to 1.0.11. 2010-12-09 22:12:50 +02:00
Ville Skyttä 65694a9c83 - Update to 7.10, fixes #595135 and #619867.
- Patch spectool to work with specfiles containing Icon and BuildArchitectures
  (#637000).
2010-09-27 21:26:31 +03:00
Fedora Release Engineering 73fdda6236 dist-git conversion 2010-07-29 11:38:30 +00:00
Ville Skyttä d983deaa69 - Update to 7.9, fixes #588313 and #589705. 2010-05-20 20:12:56 +00:00
Ville Skyttä 8ba17b07e0 - Require %{_bindir}/man instead of man (#582932). 2010-04-16 15:54:46 +00:00
Ville Skyttä b3408790ad - Update to 7.8, fixes #562316. 2010-02-15 22:14:22 +00:00
Ville Skyttä 6080e1381c - Update to 7.7, fixes #558263. 2010-02-01 22:51:52 +00:00
Ville Skyttä a435d7b2d4 - Update to 7.6, fixes #528907. 2009-12-07 20:50:04 +00:00
Bill Nottingham e7bedcff4e Fix typo that causes a failure to update the common directory. (releng
#2781)
2009-11-25 23:13:20 +00:00
Ville Skyttä d3f2e953ce - Update to 7.5, fixes #502403. 2009-09-17 21:09:36 +00:00
Ville Skyttä a33d3a18f2 - Update to 7.4, fixes #215927 and #466353.
- Patch spectool to make -s and -p to work as documented (Todd Zullinger).
2009-08-21 09:58:25 +00:00
Jesse Keating 1f405acaf3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild 2009-07-27 03:13:18 +00:00
Ville Skyttä f1a55044c0 Doh. 2009-05-24 21:34:15 +00:00
Ville Skyttä 61dbb79aed - Release 7.3.
Sat May 23 2009 Ville Skyttä <ville.skytta at iki.fi>
- Add rpmdev-packager - script for getting rpm packager info.
- Use rpmdev-packager in rpmdev-bumpspec and rpmdev-init.el.
- Fix rpmdev-extract MIME type comparisons with file(1) output containing
    parameters.
2009-05-24 21:29:51 +00:00
Ville Skyttä 9a552d4934 - Release 7.2.
Sun May 3 2009 Ville Skyttä <ville.skytta at iki.fi>
- Add dummy spec template for ad-hoc testing.
Sat May 2 2009 Ville Skyttä <ville.skytta at iki.fi>
- Improve newspec/newinit when only "-o foo" argument is given (#498588,
    thanks to Edwin ten Brink).
- Try to get packager mail address for *Emacs rpm-spec-mode from
    ~/.fedora.cert if rpm-spec-user-mail-address is not set.
- Add xz support to rpmdev-extract.
Sat Apr 18 2009 Ville Skyttä <ville.skytta at iki.fi>
- Make bumpspec's use of "head" POSIX compliant.
Thu Apr 16 2009 Ville Skyttä <ville.skytta at iki.fi>
- Add rpmdev-newinit for easier access to the init script template, move
    the template to %{_sysconfdir}/rpmdevtools, improve reload action
    example.
Tue Apr 7 2009 Ville Skyttä <ville.skytta at iki.fi>
- Speed up rpmls bash completion.
2009-05-21 14:48:30 +00:00
4 changed files with 141 additions and 68 deletions
+1 -2
View File
@@ -1,2 +1 @@
spectool-1.0.10.tar.bz2
rpmdevtools-7.8.tar.xz
/*.tar.*
+139 -47
View File
@@ -1,42 +1,60 @@
%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
%global spectool_version 1.0.10
%if 0%{?fedora} > 22
%bcond_without python3
%else
%bconf_with python3
%endif
Name: rpmdevtools
Version: 7.8
Version: 8.9
Release: 1%{?dist}
Summary: RPM Development Tools
Group: Development/Tools
# rpmdev-setuptree is GPLv2, everything else GPLv2+
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
# help2man, pod2man, *python for creating man pages
BuildRequires: help2man
BuildRequires: %{_bindir}/pod2man
BuildRequires: python >= 2.4
BuildRequires: perl-generators
%if %{with python3}
BuildRequires: python3
BuildRequires: rpm-python3
%else
BuildRequires: python >= 2.7
BuildRequires: rpm-python
%endif
# emacs-common >= 1:22.3-3 for macros.emacs
BuildRequires: emacs-common >= 1:22.3-3
BuildRequires: bash-completion
%if 0%{?fedora}
# xemacs-common >= 21.5.29-8 for macros.xemacs
BuildRequires: xemacs-common >= 21.5.29-8
%endif
Provides: spectool = %{spectool_version}
Requires: curl
Requires: diffutils
Requires: fakeroot
Requires: file
Requires: findutils
Requires: gawk
Requires: grep
Requires: man
Requires: python >= 2.4
Requires: rpm-build >= 4.4.2.3
%if %{with python3}
Requires: rpm-python3
%else
Requires: python >= 2.4
Requires: rpm-python
%endif
Requires: sed
Requires: wget
# For _get_cword in bash completion snippet
Conflicts: bash-completion < 20080705
Requires: emacs-filesystem
%if 0%{?fedora}
Requires: xemacs-filesystem
%endif
%description
This package contains scripts and (X)Emacs support files to aid in
@@ -57,63 +75,137 @@ rpmdev-bumpspec Bump revision in specfile
%prep
%setup -q -a 1
cp -p spectool-%{spectool_version}/README README.spectool
cd spectool-%{spectool_version}
%patch0 -p1
cd ..
%setup -q
%if %{with python3}
grep -lF "%{_bindir}/python " * \
| xargs sed -i -e "s|%{_bindir}/python |%{_bindir}/python3 |"
%endif
%build
%configure --libdir=%{_prefix}/lib
make %{?_smp_mflags}
%make_build
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
%make_install
install -pm 755 spectool-%{spectool_version}/spectool $RPM_BUILD_ROOT%{_bindir}
echo %%{_datadir}/bash-completion > %{name}.files
[ -d $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d ] && \
echo %%{_sysconfdir}/bash_completion.d > %{name}.files
for dir in %{emacs_sitestart_d} %{xemacs_sitestart_d} ; do
%if 0%{?fedora}
for dir in %{_emacs_sitestartdir} %{_xemacs_sitestartdir} ; do
%else
for dir in %{_emacs_sitestartdir} ; do
%endif
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
done
%clean
rm -rf $RPM_BUILD_ROOT
%triggerin -- emacs-common
[ -d %{emacs_sitestart_d} ] && \
ln -sf %{_datadir}/rpmdevtools/rpmdev-init.el %{emacs_sitestart_d} || :
%triggerin -- xemacs-common
[ -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_sitestart_d}/rpmdev-init.el* || :
%files
%defattr(-,root,root,-)
%doc COPYING NEWS README*
%files -f %{name}.files
%license COPYING
%doc NEWS
%config(noreplace) %{_sysconfdir}/rpmdevtools/
%{_sysconfdir}/bash_completion.d/
%{_datadir}/rpmdevtools/
%{_bindir}/*
%ghost %{_datadir}/*emacs
%{_emacs_sitestartdir}/rpmdev-init.el
%ghost %{_emacs_sitestartdir}/rpmdev-init.elc
%if 0%{?fedora}
%{_xemacs_sitestartdir}/rpmdev-init.el
%ghost %{_xemacs_sitestartdir}/rpmdev-init.elc
%endif
%{_mandir}/man[18]/*.[18]*
%changelog
* Sat Jun 25 2016 Ville Skyttä <ville.skytta@iki.fi> - 8.9-1
- Update to 8.9
* Sat Jun 25 2016 Ville Skyttä <ville.skytta@iki.fi> - 8.8-1
- Update to 8.8
* Fri Jun 24 2016 Petr Písař <ppisar@redhat.com>
- Add new mandatory perl build deps
* Thu Jun 23 2016 Ville Skyttä <ville.skytta@iki.fi> - 8.7-1
- Update to 8.7
- Specfile cleanups
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 8.6-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
* Fri Jun 5 2015 Ville Skyttä <ville.skytta@iki.fi> - 8.6-2
- Use python3 on > F-22
* Sun May 10 2015 Ville Skyttä <ville.skytta@iki.fi> - 8.6-1
- Update to 8.6
* Mon Oct 20 2014 Ville Skyttä <ville.skytta@iki.fi> - 8.5-1
- Update to 8.5
- Mark COPYING as %%license where applicable
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 8.4-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
* Thu Oct 17 2013 Ville Skyttä <ville.skytta@iki.fi> - 8.4-2
- Do not require devscripts in any scenario.
* Mon Oct 7 2013 Ville Skyttä <ville.skytta@iki.fi> - 8.4-1
- Update to 8.4.
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 8.3-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
* Wed Jul 17 2013 Petr Pisar <ppisar@redhat.com> - 8.3-4
- Perl 5.18 rebuild
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 8.3-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
* Tue Oct 16 2012 Thomas Woerner <twoerner@redhat.com> - 8.3-2
- xemacs is not available on RHEL (RHBZ#866841)
* Sun Sep 2 2012 Ville Skyttä <ville.skytta@iki.fi> - 8.3-1
- Update to 8.3.
- Drop specfile constructs no longer needed with Fedora's rpm.
* Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 8.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 8.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
* Sat Nov 12 2011 Ville Skyttä <ville.skytta@iki.fi> - 8.2-1
- Update to 8.2.
* Tue Apr 26 2011 Ville Skyttä <ville.skytta@iki.fi> - 8.1-1
- Update to 8.1.
* 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.
+1 -2
View File
@@ -1,2 +1 @@
d193612122f297ee4b37f1b04f605768 spectool-1.0.10.tar.bz2
a495921f4c05cc92018f61cccf6fdfbf rpmdevtools-7.8.tar.xz
35bab0c28f2af544af53ac1aed598ac0 rpmdevtools-8.9.tar.xz
-17
View File
@@ -1,17 +0,0 @@
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'; },