Compare commits

..

1 Commits

Author SHA1 Message Date
Ville Skyttä 888d65e18e - Remove check-{buildroot,rpaths*}, now included in rpm-build >= 4.4.2.1.
- Drop explicit dependency on patch, pulled in by recent rpm-build.
- Add cmake and scons to default devel package list in rpmdev-rmdevelrpms.
- Add LSB comment block to init script template.
Wed Jun 27 2007 Ville Skyttä <ville.skytta at iki.fi>
- Add 2-argument form for comparing EVR strings to rpmdev-vercmp (available
    only if rpmUtils.miscutils is available).
Sat Jun 16 2007 Ville Skyttä <ville.skytta at iki.fi>
- Include rpmsodiff and dependencies (rpmargs, rpmelfsym, rpmfile, rpmpeek,
    rpmsoname) from ALT Linux's qa-robot package.
- Include rpmls (#213778).
Fri Jun 15 2007 Ville Skyttä <ville.skytta at iki.fi>
- Update spectool to 1.0.9 (#243731).
Wed Apr 11 2007 Ville Skyttä <ville.skytta at iki.fi>
- Add --list-only option to rmdevelrpms (Thorsten Leemhuis).
Tue Mar 13 2007 Ville Skyttä <ville.skytta at iki.fi>
- BR perl(ExtUtils::MakeMaker) by default in perl spec template.
- Drop deprecated backwards compatibility with fedora-rpmdevtools.
- Update URL.
Wed Nov 8 2006 Ville Skyttä <ville.skytta at iki.fi>
- Arch-qualify output of matched packages in rmdevelrpms and allow
    arch-qualified packages in the config file.
2007-07-05 22:09:09 +00:00
5 changed files with 45 additions and 78 deletions
+2
View File
@@ -0,0 +1,2 @@
rpmdevtools-6.0.tar.bz2
spectool-1.0.9.tar.bz2
-2
View File
@@ -1,2 +0,0 @@
spectool-1.0.9.tar.bz2
rpmdevtools-6.4.tar.bz2
+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 $$/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)
+21 -75
View File
@@ -3,16 +3,12 @@
%define spectool_version 1.0.9
Name: rpmdevtools
Version: 6.4
# 0.x series is vanilla rpmdevtools 6.x except that it includes the
# fedora-rpmdevtools backwards compatibility features dropped in vanilla
# 6.x versions. 0.x series is intended to be shipped for Fedora <= 7 only.
Release: 0.1%{?dist}
Version: 6.0
Release: 1%{?dist}
Summary: RPM Development Tools
Group: Development/Tools
# rpmdev-setuptree is GPLv2, everything else GPLv2+
License: GPLv2+ and GPLv2
License: GPL
URL: http://fedoraproject.org/
Source0: %{name}-%{version}.tar.bz2
Source1: http://people.redhat.com/nphilipp/spectool/spectool-%{spectool_version}.tar.bz2
@@ -20,40 +16,27 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
Provides: spectool = %{spectool_version}
Provides: fedora-rpmdevtools = %{version}
Obsoletes: fedora-rpmdevtools < 5.0
# Minimal RPM build requirements
Requires: bash
Requires: bzip2
Requires: coreutils
# Required for tool operations
Requires: rpm-python
Requires: python
Requires: cpio
Requires: diffutils
Requires: findutils
Requires: gawk
Requires: sed
Requires: perl
Requires: wget
Requires: file
Requires: fakeroot
# Minimal RPM build requirements
Requires: rpm-build >= 4.4.2.1
Requires: gcc
Requires: gcc-c++
Requires: grep
Requires: gzip
Requires: info
Requires: make
Requires: patch
Requires: redhat-release
Requires: redhat-rpm-config
Requires: rpm-build >= 4.4.2.1
Requires: sed
Requires: make
Requires: tar
Requires: diffutils
Requires: gzip
Requires: bzip2
Requires: unzip
Requires: util-linux
Requires: which
# Additionally required for tool operations
#Requires: cpio
Requires: fakeroot
Requires: file
Requires: perl
Requires: python
Requires: rpm-python
#Requires: sed
Requires: wget
%description
This package contains scripts and (X)Emacs support files to aid in
@@ -95,32 +78,11 @@ for dir in %{emacs_sitestart_d} %{xemacs_sitestart_d} ; do
touch $RPM_BUILD_ROOT$dir/rpmdev-init.elc
done
# Backwards compatibility symlinks
ln -s rpmdev-checksig $RPM_BUILD_ROOT%{_bindir}/fedora-rpmchecksig
ln -s rpmdev-diff $RPM_BUILD_ROOT%{_bindir}/fedora-diffarchive
ln -s rpmdev-extract $RPM_BUILD_ROOT%{_bindir}/fedora-extract
ln -s rpmdev-md5 $RPM_BUILD_ROOT%{_bindir}/fedora-md5
ln -s rpmdev-newspec $RPM_BUILD_ROOT%{_bindir}/fedora-newrpmspec
ln -s rpmdev-rmdevelrpms $RPM_BUILD_ROOT%{_bindir}/fedora-rmdevelrpms
ln -s rpmdev-setuptree $RPM_BUILD_ROOT%{_bindir}/fedora-buildrpmtree
ln -s rpmdev-vercmp $RPM_BUILD_ROOT%{_bindir}/fedora-rpmvercmp
ln -s rpmdev-wipetree $RPM_BUILD_ROOT%{_bindir}/fedora-wipebuildtree
ln -s rpminfo $RPM_BUILD_ROOT%{_bindir}/fedora-rpminfo
%clean
rm -rf $RPM_BUILD_ROOT
%post
# Upgrade from fedora-rpmdevtools:
oldconf=%{_sysconfdir}/fedora/rmdevelrpms.conf
if [ $1 -eq 1 -a -f $oldconf ] ; then
echo "5615a64d80f6e6b4df77b3ab0ef1469c $oldconf" \
| md5sum -c --status - >/dev/null 2>&1 || \
cat $oldconf > %{_sysconfdir}/rpmdevtools/rmdevelrpms.conf || :
fi
%triggerin -- emacs-common
[ -d %{emacs_sitestart_d} ] && \
ln -sf %{_datadir}/rpmdevtools/rpmdev-init.el %{emacs_sitestart_d} || :
@@ -141,7 +103,6 @@ fi
%doc COPYING README*
%config(noreplace) %{_sysconfdir}/rpmdevtools/
%{_datadir}/rpmdevtools/
%{_bindir}/fedora-*
%{_bindir}/rpm*
%{_bindir}/spectool
%ghost %{_datadir}/*emacs
@@ -149,27 +110,9 @@ fi
%changelog
* Thu Nov 1 2007 Ville Skyttä <ville.skytta at iki.fi> - 6.4-0.1
- Update to 6.4:
- Fix paths in qa-robot tools (#361831, Lubomir Kundrak).
- Sync deps with Fedora's new "assumed present in buildroots" packages list.
- Init script template cleanups.
- Update rpminfo to version 2004-07-07-02.
* Mon Aug 13 2007 Ville Skyttä <ville.skytta at iki.fi> - 6.1-0.1
* Thu Jul 5 2007 Ville Skyttä <ville.skytta at iki.fi> - 6.0-1
- Remove check-{buildroot,rpaths*}, now included in rpm-build >= 4.4.2.1.
- Include rpmsodiff and dependencies (rpmargs, rpmelfsym, rpmfile, rpmpeek,
rpmsoname) from ALT Linux's qa-robot package.
- Drop explicit dependency on patch, pulled in by recent rpm-build.
- Sync COPYING with http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
- Work around #250990 in rpmls and rpmdev-extract.
- Clarify copyright info of rpmdev-* and rpmls.
* Sat Jul 7 2007 Ville Skyttä <ville.skytta at iki.fi> - 5.4-1
- Fix Epoch handling in the 2-arg form of rpmdev-vercmp with yum < 3.1.2.
- The long form of the list option in rmdevelrpms is --list-only, not --list.
* Thu Jul 5 2007 Ville Skyttä <ville.skytta at iki.fi>
- Add cmake and scons to default devel package list in rpmdev-rmdevelrpms.
- Add LSB comment block to init script template.
@@ -178,6 +121,8 @@ fi
(available only if rpmUtils.miscutils is available).
* Sat Jun 16 2007 Ville Skyttä <ville.skytta at iki.fi>
- Include rpmsodiff and dependencies (rpmargs, rpmelfsym, rpmfile, rpmpeek,
rpmsoname) from ALT Linux's qa-robot package.
- Include rpmls (#213778).
* Fri Jun 15 2007 Ville Skyttä <ville.skytta at iki.fi>
@@ -188,6 +133,7 @@ fi
* Tue Mar 13 2007 Ville Skyttä <ville.skytta at iki.fi>
- BR perl(ExtUtils::MakeMaker) by default in perl spec template.
- Drop deprecated backwards compatibility with fedora-rpmdevtools.
- Update URL.
* Wed Nov 8 2006 Ville Skyttä <ville.skytta at iki.fi>
+1 -1
View File
@@ -1,2 +1,2 @@
7582b4f7c8ab6121b57ae2807a40c6ec rpmdevtools-6.0.tar.bz2
b3563111a44656efd3a2d9b44b830562 spectool-1.0.9.tar.bz2
52c257170fb8de032196f04859bdee2c rpmdevtools-6.4.tar.bz2