Compare commits

..

3 Commits

Author SHA1 Message Date
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
7 changed files with 86 additions and 86 deletions
+2
View File
@@ -0,0 +1,2 @@
spectool-1.0.10.tar.bz2
rpmdevtools-7.7.tar.xz
-1
View File
@@ -1 +0,0 @@
/*.tar.*
+21
View File
@@ -0,0 +1,21 @@
# Makefile for source rpm: rpmdevtools
# $Id$
NAME := rpmdevtools
SPECFILE = $(firstword $(wildcard *.spec))
define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef
MAKEFILE_COMMON := $(shell $(find-makefile-common))
ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef
MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif
include $(MAKEFILE_COMMON)
+1
View File
@@ -0,0 +1 @@
F-12
+43 -84
View File
@@ -1,14 +1,20 @@
%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.4
Release: 2%{?dist}
Version: 7.7
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
@@ -16,28 +22,21 @@ 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
%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
Requires: rpm-python
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
@@ -58,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
@@ -71,90 +74,46 @@ rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
%if 0%{?fedora}
for dir in %{_emacs_sitestartdir} %{_xemacs_sitestartdir} ; do
%else
for dir in %{_emacs_sitestartdir} ; do
%endif
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
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
%doc COPYING NEWS
%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
* 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.
* Tue Feb 2 2010 Ville Skyttä <ville.skytta@iki.fi> - 7.7-1
- Update to 7.7, fixes #558263.
+2 -1
View File
@@ -1 +1,2 @@
9d1d3cc2f1108918be4766143162389a rpmdevtools-8.4.tar.xz
d193612122f297ee4b37f1b04f605768 spectool-1.0.10.tar.bz2
b6c935120963107693a252336f1b4db6 rpmdevtools-7.7.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'; },