Compare commits

..

3 Commits

Author SHA1 Message Date
Ville Skyttä bd58631c8d Merge branch 'master' into f13
Conflicts:
	.gitignore
2010-09-27 21:28:07 +03:00
Fedora Release Engineering 05d24d16cd dist-git conversion 2010-07-29 11:38:23 +00:00
Jesse Keating 818f757ad9 Initialize branch F-13 for rpmdevtools 2010-02-17 03:04:28 +00:00
5 changed files with 84 additions and 130 deletions
+2 -1
View File
@@ -1 +1,2 @@
/*.tar.*
/spectool-1.0.10.tar.bz2
/rpmdevtools-7.10.tar.xz
+49 -128
View File
@@ -1,60 +1,43 @@
%global spectool_version 1.0.10
%if 0%{?fedora} > 22
%bcond_without python3
%else
%bconf_with python3
%endif
%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.9
Version: 7.10
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
Patch1: spectool-1.0.10-problemtags-637000.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: perl-generators
%if %{with python3}
BuildRequires: python3
BuildRequires: rpm-python3
%else
BuildRequires: python >= 2.7
BuildRequires: python >= 2.4
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: rpm-build >= 4.4.2.3
%if %{with python3}
Requires: rpm-python3
%else
Requires: %{_bindir}/man
Requires: python >= 2.4
Requires: rpm-build >= 4.4.2.3
Requires: rpm-python
%endif
Requires: sed
Requires: emacs-filesystem
%if 0%{?fedora}
Requires: xemacs-filesystem
%endif
Requires: wget
# For _get_cword in bash completion snippet
Conflicts: bash-completion < 20080705
%description
This package contains scripts and (X)Emacs support files to aid in
@@ -75,126 +58,64 @@ rpmdev-bumpspec Bump revision in specfile
%prep
%setup -q
%if %{with python3}
grep -lF "%{_bindir}/python " * \
| xargs sed -i -e "s|%{_bindir}/python |%{_bindir}/python3 |"
%endif
%setup -q -a 1
cp -p spectool-%{spectool_version}/README README.spectool
cd spectool-%{spectool_version}
%patch0 -p1
%patch1 -p1
cd ..
%build
%configure --libdir=%{_prefix}/lib
%make_build
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
%make_install
make install DESTDIR=$RPM_BUILD_ROOT
echo %%{_datadir}/bash-completion > %{name}.files
[ -d $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d ] && \
echo %%{_sysconfdir}/bash_completion.d > %{name}.files
install -pm 755 spectool-%{spectool_version}/spectool $RPM_BUILD_ROOT%{_bindir}
%if 0%{?fedora}
for dir in %{_emacs_sitestartdir} %{_xemacs_sitestartdir} ; do
%else
for dir in %{_emacs_sitestartdir} ; do
%endif
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
done
%files -f %{name}.files
%license COPYING
%doc NEWS
%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*
%config(noreplace) %{_sysconfdir}/rpmdevtools/
%{_sysconfdir}/bash_completion.d/
%{_datadir}/rpmdevtools/
%{_bindir}/*
%{_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
%ghost %{_datadir}/*emacs
%{_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
+2 -1
View File
@@ -1 +1,2 @@
35bab0c28f2af544af53ac1aed598ac0 rpmdevtools-8.9.tar.xz
d193612122f297ee4b37f1b04f605768 spectool-1.0.10.tar.bz2
b2e7d7e8fbdbcae8c31b7249fd1dc615 rpmdevtools-7.10.tar.xz
+14
View File
@@ -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;
+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'; },