fedora-rpmdevtools Makefile.am, NONE, 1.1 configure.ac, NONE, 1.1 .cvsignore, 1.1, 1.2 fedora-rpmdevtools.spec, 1.94, 1.95 rpminfo, 1.1, NONE
Ville Skytta (scop)
fedora-extras-commits at redhat.com
Mon Jun 5 18:29:42 UTC 2006
Author: scop
Update of /cvs/fedora/fedora-rpmdevtools
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11498
Modified Files:
.cvsignore fedora-rpmdevtools.spec
Added Files:
Makefile.am configure.ac
Removed Files:
rpminfo
Log Message:
Autotoolize, add extract and diffarchive man pages, pull rpminfo from upstream, trim changelog.
--- NEW FILE Makefile.am ---
AUTOMAKE_OPTIONS = foreign 1.5 dist-bzip2
SUBDIRS = devgpgkeys emacs test
pkgdatadir = $(datadir)/fedora
pkgsysconfdir = $(sysconfdir)/fedora
rpmlibdir = $(libdir)/rpm
dist_bin_SCRIPTS = fedora-buildrpmtree fedora-diffarchive fedora-extract \
fedora-installdevkeys fedora-kmodhelper fedora-md5 fedora-newrpmspec \
fedora-rmdevelrpms fedora-rpmchecksig fedora-rpminfo fedora-rpmvercmp \
fedora-wipebuildtree
dist_pkgdata_DATA = spectemplate-lib.spec spectemplate-minimal.spec \
spectemplate-perl.spec spectemplate-python.spec \
spectemplate-ruby.spec template.init
dist_man1_MANS = fedora-extract.1 fedora-diffarchive.1
dist_man8_MANS = fedora-rmdevelrpms.8
dist_rpmlib_SCRIPTS = check-buildroot check-rpaths check-rpaths-worker
dist_pkgsysconf_DATA = rmdevelrpms.conf
EXTRA_DIST = $(PACKAGE).spec
MAINTAINERCLEANFILES = $(dist_man1_MANS) $(dist_man8_MANS) fedora-rpminfo
all:
%.1: %
chmod +x $<
env PATH=$(top_srcdir):$$PATH \
$(HELP2MAN) --section=1 --no-info -h -h -v -v $< --output=$@
%.8: %
chmod +x $<
env PATH=$(top_srcdir):$$PATH \
$(HELP2MAN) --section=8 --no-info $< --output=$@
fedora-rpminfo:
$(WGET) -N http://people.redhat.com/twoerner/rpminfo/bin/rpminfo -O $@
--- NEW FILE configure.ac ---
AC_INIT(fedora-rpmdevtools, 1.6)
AM_INIT_AUTOMAKE
AC_PATH_PROG(HELP2MAN,help2man)
AC_PATH_PROG(WGET,wget)
AC_OUTPUT(
Makefile
devgpgkeys/Makefile
emacs/Makefile
test/Makefile
)
Index: .cvsignore
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 8 Feb 2004 19:31:16 -0000 1.1
+++ .cvsignore 5 Jun 2006 18:29:39 -0000 1.2
@@ -1 +1,12 @@
-*.tar.*
+*.1
+*.8
+*.m4
+Makefile
+Makefile.in
+autom4te.cache
+config.*
+configure
+fedora-rpmdevtools-*
+fedora-rpminfo
+install-sh
+missing
Index: fedora-rpmdevtools.spec
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/fedora-rpmdevtools.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- fedora-rpmdevtools.spec 15 May 2006 21:22:05 -0000 1.94
+++ fedora-rpmdevtools.spec 5 Jun 2006 18:29:39 -0000 1.95
@@ -10,7 +10,6 @@
Group: Development/Tools
License: GPL
URL: http://fedora.redhat.com/
-# rpminfo upstream: http://people.redhat.com/twoerner/rpminfo/bin/
Source0: %{name}-%{version}.tar.bz2
Source1: http://people.redhat.com/nphilipp/spectool/spectool-%{spectool_version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -50,50 +49,26 @@
%build
+%configure --libdir=%{_prefix}/lib
+make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
-install -dm 755 $RPM_BUILD_ROOT%{_bindir}
-install -pm 755 fedora-buildrpmtree $RPM_BUILD_ROOT%{_bindir}
-install -pm 755 fedora-installdevkeys $RPM_BUILD_ROOT%{_bindir}
-install -pm 755 fedora-kmodhelper $RPM_BUILD_ROOT%{_bindir}
-install -pm 755 fedora-md5 $RPM_BUILD_ROOT%{_bindir}
-install -pm 755 fedora-newrpmspec $RPM_BUILD_ROOT%{_bindir}
-install -pm 755 fedora-rmdevelrpms $RPM_BUILD_ROOT%{_bindir}
-install -pm 755 fedora-rpmchecksig $RPM_BUILD_ROOT%{_bindir}
-install -pm 755 rpminfo $RPM_BUILD_ROOT%{_bindir}/fedora-rpminfo
-install -pm 755 fedora-extract $RPM_BUILD_ROOT%{_bindir}
-install -pm 755 fedora-diffarchive $RPM_BUILD_ROOT%{_bindir}
-install -pm 755 fedora-rpmvercmp $RPM_BUILD_ROOT%{_bindir}
-install -pm 755 fedora-wipebuildtree $RPM_BUILD_ROOT%{_bindir}
-install -pm 755 spectool*/spectool $RPM_BUILD_ROOT%{_bindir}
-
-install -dm 755 $RPM_BUILD_ROOT%{_prefix}/lib/rpm
-install -pm 755 check-buildroot check-rpaths* \
- $RPM_BUILD_ROOT%{_prefix}/lib/rpm
-
-install -dm 755 $RPM_BUILD_ROOT%{_datadir}/fedora/devgpgkeys
-install -pm 644 spectemplate*.spec template.init \
- $RPM_BUILD_ROOT%{_datadir}/fedora
-install -pm 644 devgpgkeys/* $RPM_BUILD_ROOT%{_datadir}/fedora/devgpgkeys
+make install DESTDIR=$RPM_BUILD_ROOT
+
+install -pm 755 spectool*/spectool $RPM_BUILD_ROOT%{_bindir}
-install -dm 755 $RPM_BUILD_ROOT%{_datadir}/fedora/emacs
-install -pm 644 emacs/fedora-init.el $RPM_BUILD_ROOT%{_datadir}/fedora/emacs
for dir in %{emacs_sitestart_d} %{xemacs_sitestart_d} ; do
install -dm 755 $RPM_BUILD_ROOT$dir
ln -s %{_datadir}/fedora/emacs/fedora-init.el $RPM_BUILD_ROOT$dir
touch $RPM_BUILD_ROOT$dir/fedora-init.elc
done
-install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/fedora
-install -pm 644 rmdevelrpms.conf $RPM_BUILD_ROOT%{_sysconfdir}/fedora
-
%check
-env PATH="$RPM_BUILD_ROOT%{_bindir}:$PATH" sh test/fedora-kmodhelper-test.sh
-/bin/bash test/rpathtest.sh
+make check
%clean
@@ -124,9 +99,15 @@
%{_bindir}/spectool
%{_prefix}/lib/rpm/check-*
%ghost %{_datadir}/*emacs
+%{_mandir}/man?/fedora-*.?*
%changelog
+* Mon Jun 5 2006 Ville Skyttä <ville.skytta at iki.fi>
+- Add manual pages for rmdevelrpms and extract.
+- Trim pre-2005 changelog entries.
+- Autotoolize source tree.
+
* Tue May 16 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.6-1
- Add spec template for library packages (#185606, Ignacio Vazquez-Abrams).
@@ -204,220 +185,3 @@
- Install check-* to %%{_prefix}/lib/rpm instead of %%{_libdir}/rpm (bug 2351).
- Check both %%{_prefix}/lib and %%{_prefix}/lib64 in the xemacs trigger.
- Update rpminfo to 2004-07-07-01 and include it in the tarball.
-
-* Thu Oct 7 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.2.0-0.fdr.1
-- New generalized replacements for fedora-unrpm and fedora-diffrpm:
- fedora-extract and fedora-diffarchive.
-- Treat gcc4, gcc4-c++ and gcc4-gfortran as devel packages in rmdevelrpms.
-- Cosmetic spec template improvements.
-
-* Sat Sep 11 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.1.9-0.fdr.3
-- Make kmodhelper detect RH/FC 2.6 kernels (bug 1401, Thorsten Leemhuis).
-- Remove obsolete kernel module stuff from spectemplate.spec (bug 1401,
- Thorsten Leemhuis).
-- Fix "fedora-unrpm -Q".
-
-* Mon Aug 16 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.1.9-0.fdr.2
-- Treat perl-ExtUtils-* and perl-Module-Build as devel packages in rmdevelrpms.
-- Minor Perl spec template improvements.
-
-* Mon Aug 9 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.1.9-0.fdr.1
-- Treat gcc35, gcc35-c++, kernel-sourcecode, and any package matching
- "-devel\b" or "-debuginfo\b" (for version-in-name stuff) as devel
- packages in rmdevelrpms.
-- Prevent $CDPATH/cd from producing unexpected output in fedora-md5 and
- fedora-unrpm (bug 1401, bug 1953, Thorsten Leemhuis and Pekka Pietikainen).
-- Update kmodhelper to work with 2.6 kernels (bug 1401, Thorsten Leemhuis).
-- Fold -emacs into the main package, use triggers to install the site-start.d
- snippets.
-- Don't use distutils.sysconfig.get_python_version() in python spec template,
- it's available in Python >= 2.3 only.
-
-* Sun May 2 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.1.8-0.fdr.1
-- New script: Thomas Woerner's rpminfo (included here as fedora-rpminfo).
-- Split Requires(pre,postun) into two in spec template due to
- https://bugzilla.redhat.com/118780 (bug 1401/Michael Schwendt).
-- Make fedora-diffrpm work on < FC1, as well as with two different packages
- with the same NVR (bug 1401).
-- Add Aurelien Bompard's and Erik S. LaBianca's keys to devgpgkeys (bug 1401).
-- Include a trimmed-down version of my key, BCD241CB (bug 1401).
-- Improvements to Perl and Python spec templates (bug 1401, bug 1525).
-- Improvements to check-rpaths* (bug 1401/Enrico Scholz).
-- Add magic encoding comment to rmdevelrpms (bug 1401/Michael Schwendt).
-- Treat automake17 (bug 1401/Michael Schwendt), gcc-g77, gcc-gnat, gcc-java,
- gcc-objc, and gcc34* as devel packages in rmdevelrpms.
-- Add package summary to fedora-pkgannfmt's output (bug 1401).
-
-* Sun Mar 14 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.1.7-0.fdr.5
-- Ensure that the correct kmodhelper is tested and executable during build
- (bug 1167).
-
-* Sun Feb 22 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.1.7-0.fdr.4
-- Ignore *.py[co], *.elc and .packlist in check-buildroot (bug 1167).
-
-* Mon Feb 9 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.1.7-0.fdr.3
-- Revert back to the original fedora-md5 version which uses md5sum to
- calculate the checksums instead of using the rpm headers (bug 1167).
-
-* Sun Feb 8 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.1.7-0.fdr.2
-- Include more $TNV suggestions from bug 1167:
-- Include GConf schema installation examples in spectemplate.spec (bug 1178).
-- Add check-buildroot and check-rpaths rpm lib scripts, see
- fedora-buildrpmtree (or use it) for an example how to enable them.
-- Add Python spec template and (X)Emacs support for it.
-- Add more kmodhelper improvements, version 0.9.8 and a tiny test suite.
-
-* Thu Jan 29 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.1.7-0.fdr.1
-- Include $TNV suggestions from bug 1167:
-- Add -q, -Q and -C arguments to fedora-unrpm.
-- New script: fedora-diffrpm for diffing contents of two RPMs.
-- Treat compat-gcc* and perl-Devel-* as development packages in rmdevelrpms.
-- kmodhelper improvements, thanks to Thorsten Leemhuis and Michael Schwendt.
-
-* Sat Dec 27 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.1.6-0.fdr.1
-- Include $TNV suggestions from bug 1115:
-- Do not define %%make in ~/.rpmmacros in fedora-buildrpmtree.
-- Add %%_smp_mflags -j3 by default in ~/.rpmmacros in fedora-buildrpmtree
- to make it easier to catch packages with parallel build problems.
-- Improved %%description.
-- Check arguments in fedora-pkgannfmt, use sed instead of perl.
-- New script: fedora-kmodhelper.
-
-* Sat Dec 6 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.1.5-0.fdr.1
-- Incorporate $TNV suggestions from bug 1010:
-- Add unzip into the list of "assumed present" packages.
-- Treat gcc32, m4, *-debuginfo and perl-Test-* as development packages
- in rmdevelrpms.
-- Add sanity checks to fedora-wipebuildtree.
-- New tool: fedora-md5.
-- Include perl spec file template and add (X)Emacs support for it.
-
-* Sat Nov 8 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.1.4-0.fdr.2
-- Remove duplicate rawhide 2003 automated build key.
-
-* Sat Nov 8 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.1.4-0.fdr.1
-- Add Fedora Project keys.
-
-* Fri Oct 31 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.1.3-0.fdr.1
-- Add Nils Olav Selåsdal's key into devgpgkeys (bug 783).
-- fedora-wipebuildtree now cleans up both ~/redhat and ~/rpmbuild for
- consistency with fedora-buildrpmtree and backwards compatibility (bug 783).
-- Treat pkgconfig as a devel package in fedora-rmdevelrpms (bug 783).
-- New script: fedora-pkgannfmt (bug 783).
-- Make fedora-rmdevelrpms tolerate strings in devpkgs and nondevpkgs (bug 783).
-
-* Sat Oct 18 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.1.2-0.fdr.1
-- Skip removing packages in fedora-rmdevelrpms if it would cause
- unresolved dependencies (bug 783).
-
-* Wed Oct 8 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.1.1-0.fdr.1
-- Unobfuscate new devel pkg heuristics in fedora-rmdevelrpms (bug 783).
-
-* Wed Oct 8 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.1.0-0.fdr.1
-- Rewrite fedora-rmdevelrpms in Python.
- Note: configuration files have moved and changed format.
-
-* Sun Sep 28 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.0.22-0.fdr.1
-- Remove tetex-dvips from rmdevelrpms (bug 525).
-
-* Sun Sep 14 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.0.21-0.fdr.1
-- Add the new Rawhide package signing key.
-
-* Thu Sep 11 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.0.20-0.fdr.1
-- Use "make install DESTDIR=..." instead of %%makeinstall in spec templates.
-
-* Thu Sep 4 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.0.19-0.fdr.1
-- Add Andreas Bierfert's key to devgpgkeys.
-
-* Fri Aug 15 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.0.18-0.fdr.1
-- Change fallback case to exit 2 in init script template (bug 525).
-- Sync fedora-buildrpmtree with Russ's latest version (bug 594).
-- Add CVS Id keywords to applicable files.
-
-* Tue Aug 5 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.0.17-0.fdr.1
-- Require gzip and bzip2 (bug 525).
-- Read configs first in fedora-rmdevelrpms to prevent overriding internals.
-- Add autoconf, autoconf213, automake, automake14, automake15, automake16,
- dev86, doxygen and swig to packages treated as devel in rmdevelrpms.
-- Make rmdevelrpms work with non-English locales (bug 544).
-- 2 empty lines instead of # --------- separators in spec templates (bug 525).
-- Move non-config files under %%{_datadir}/fedora.
-- Change %%{_sysconfdir}/fedora-rpmdevtools to %%{_sysconfdir}/fedora.
-
-* Tue Jul 22 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.0.16-0.fdr.3
-- Require diffutils, make, patch and tar (bug 492).
-
-* Sat Jul 12 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.0.16-0.fdr.2
-- One more typo fix for init script template.
-
-* Sat Jul 12 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.0.16-0.fdr.1
-- Fix force-reload in init script template.
-
-* Thu Jul 10 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.0.15-0.fdr.1
-- Address init script issues in bug 342, comment 9.
-
-* Tue Jul 8 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.0.14-0.fdr.1
-- Add init script template.
-
-* Fri Jun 27 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.0.13-0.fdr.1
-- Address issues in #342:
-- Add Michael Schwendt's (0xB8AF1C54) and Adrian Reber's (0x3ED6F034) keys.
-- Treat libtool and qt-designer as devel packages in fedora-rmdevelrpms.
-
-* Wed May 14 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.0.12-0.fdr.2
-- Make install-info in spec template silent for --excludedocs (#234).
-
-* Tue May 13 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.0.12-0.fdr.1
-- Include a minimal spec template for use with editors (#234).
-- Split (X)Emacs stuff into -emacs subpackage (#234).
-
-* Wed May 7 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.0.11-0.fdr.1
-- #234 add (post,preun) install-info scriptlets to spec template.
-- Install Fedora rpm-spec-mode (X)Emacs init stuff. Needs a patched
- rpm-spec-mode.el (patch included in docs).
-- Include a copy of the GPL.
-
-* Sat May 03 2003 Warren Togami <warren at togami.com> - 0:0.0.10-0.fdr.1
-- Added Enrico's key 0xE421D146
-- #234 fedora-develrpms added docbook-utils-pdf, tetex-dvips
-- #234 Most of Thomas' spec changes
-- #234 %{buildroot} --> $RPM_BUILD_ROOT
-- #234 Ville + Adrian's BuildRoot
-- #234 Adrian's improved newrpmspec
-
-* Sat Apr 26 2003 Warren Togami <warren at togami.com> - 0:0.0.9-0.fdr.1
-- #224 fedora-installdevkeys added RH's key and beta key
-- #224 RH8 has redhat-rpm-config too
-- #224 -y option for fedora-rmdevelrpms
-
-* Mon Apr 22 2003 Warren Togami <warren at togami.com> - 0:0.0.8-0.fdr.1
-- #181 changes to rmdevelrpms
-- #181 added Requires
-- #181 rpmchecksig file not found crash
-
-* Mon Apr 14 2003 Warren Togami <warren at togami.com> - 0:0.0.7-0.fdr.1
-- Update Seth's rpmchecksig - non-zero exit codes with errors
-- Include Seth's key
-
-* Sun Apr 13 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.0.6-0.fdr.1
-- Make KEEP_DEVEL_RPMS actually work, include a sample develrpms.conf.
-- Mark stuff in %%{_sysconfdir}/fedora-rpmdevtools properly as %%config.
-- Some spectemplate.spec updates.
-
-* Sat Apr 12 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.0.5-0.fdr.1
-- Improved version of fedora-rmdevelrpms: configurable packages to keep.
-- Add fedora-unrpm.
-- Use whoami instead of $USER in fedora-installdevkeys.
-- Some spec file tweaks.
-
-* Thu Apr 10 2003 Warren Togami <warren at togami.com> 0.0.4-0.fdr.1
-- Replace rpmchecksig with Seth Vidal's python version with more verbose output
-
-* Wed Apr 09 2003 Warren Togami <warren at togami.com> 0.0.3-0.fdr.1
-- Update spec template
-- Add Ville Skyttä's fedora-rmdevelrpms script
-- Add Warren's installdevkeys and rpmchecksig
-- Add Warren's wipebuildtree
-
-* Thu Mar 27 2003 Warren Togami <warren at togami.com> 0.0.1-0.fdr.1
-- Initial RPM release.
--- rpminfo DELETED ---
More information about the fedora-extras-commits
mailing list