rpms/fedora-rpmdevtools/devel .cvsignore, 1.6, 1.7 fedora-rpmdevtools.spec, 1.8, 1.9 sources, 1.6, 1.7

[Ville Skytta (scop)]

Author: scop

Update of /cvs/extras/rpms/fedora-rpmdevtools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7964/devel

Modified Files:
	.cvsignore fedora-rpmdevtools.spec sources 
Log Message:
1.0.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fedora-rpmdevtools/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	9 Feb 2005 22:12:33 -0000	1.6
+++ .cvsignore	24 Mar 2005 16:45:41 -0000	1.7
@@ -1 +1,2 @@
-fedora-rpmdevtools-0.3.1.tar.bz2
+fedora-rpmdevtools-1.0.tar.bz2
+spectool-1.0.4.tar.bz2


Index: fedora-rpmdevtools.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-rpmdevtools/devel/fedora-rpmdevtools.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- fedora-rpmdevtools.spec	3 Mar 2005 21:26:02 -0000	1.8
+++ fedora-rpmdevtools.spec	24 Mar 2005 16:45:41 -0000	1.9
@@ -1,20 +1,23 @@
 %define emacs_sitestart_d  %{_datadir}/emacs/site-lisp/site-start.d
-%define xemacs_sitestart_d %{_prefix}/lib/xemacs/xemacs-packages/lisp/site-start.d %{_prefix}/lib64/xemacs/site-packages/lisp/site-start.d %{_datadir}/xemacs/site-packages/lisp/site-start.d
+%define xemacs_sitestart_d %{_datadir}/xemacs/site-packages/lisp/site-start.d
+%define spectool_version   1.0.4
 
 Name:           fedora-rpmdevtools
-Version:        0.3.1
+Version:        1.0
 Release:        1
 Summary:        Fedora RPM Development Tools
 
 Group:          Development/Tools
 License:        GPL
-URL:            http://www.fedora.us/
+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)
 
 BuildArch:      noarch
 Provides:       %{name}-emacs = %{version}-%{release}
+Provides:       spectool = %{spectool_version}
 Obsoletes:      %{name}-emacs < 0.1.9
 # Required for tool operations
 Requires:       rpm-python, python, cpio, sed, perl
@@ -27,22 +30,23 @@
 development of Fedora RPM packages.  These tools are designed for Red
 Hat Linux 8.0 and higher.
 fedora-buildrpmtree     Create RPM build tree within user's home directory
-fedora-installdevkeys   Install developer keys in alternate RPM keyring
+fedora-installdevkeys   Install GPG keys in alternate RPM keyring
 fedora-kmodhelper       Helper script for building kernel module RPMs
 fedora-md5              Display the md5sum of all files in an RPM
 fedora-newrpmspec       Creates new .spec from template
-fedora-pkgannfmt        Produce output for fedora-package-announce
 fedora-rmdevelrpms      Find (and optionally remove) "development" RPMs
 fedora-rpmchecksig      Check package signatures using alternate RPM keyring
 fedora-rpminfo          Prints information about executables and libraries
 fedora-rpmvercmp        RPM version comparison checker
 fedora-extract          Extract various archives, "tar xvf" style
 fedora-diffarchive      Diff contents of two archives
-fedora-wipebuildtree    Erases all files within dirs created by buildrpmtree
+fedora-wipebuildtree    Erase all files within dirs created by buildrpmtree
+spectool                Expand and download sources and patches in specfiles
 
 
 %prep
-%setup -q
+%setup -q -a 1
+cp -p spectool*/README README.spectool
 
 
 %build
@@ -57,7 +61,6 @@
 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-pkgannfmt       $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
@@ -65,6 +68,7 @@
 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* \
@@ -81,7 +85,6 @@
   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
-  echo "%ghost $dir/fedora-init.el*" >> %{name}-%{version}.files
 done
 
 install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/fedora
@@ -95,39 +98,49 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%triggerin -- emacs
-if [ -d %{emacs_sitestart_d} ] ; then
-  ln -sf %{_datadir}/fedora/emacs/fedora-init.el %{emacs_sitestart_d}
-fi
-
-%triggerin -- xemacs
-for dir in %{xemacs_sitestart_d} ; do
-  if [ -d $dir ] ; then
-    ln -sf %{_datadir}/fedora/emacs/fedora-init.el $dir
-  fi
-done
 
-%triggerun -- emacs
-[ $2 -eq 0 ] && rm -f %{emacs_sitestart_d}/fedora-init.{el,elc} || :
+%triggerin -- emacs-common
+[ -d %{emacs_sitestart_d} ] && \
+  ln -sf %{_datadir}/fedora/emacs/fedora-init.el %{emacs_sitestart_d} || :
+
+%triggerin -- xemacs-common
+[ -d %{xemacs_sitestart_d} ] && \
+  ln -sf %{_datadir}/fedora/emacs/fedora-init.el %{xemacs_sitestart_d} || :
 
-%triggerun -- xemacs
-if [ $2 -eq 0 ] ; then
-  for dir in %{xemacs_sitestart_d} ; do
-    rm -f $dir/fedora-init.{el,elc} || :
-  done
-fi
+%triggerun -- emacs-common
+[ $2 -eq 0 ] && rm -f %{emacs_sitestart_d}/fedora-init.el* || :
 
+%triggerun -- xemacs-common
+[ $2 -eq 0 ] && rm -f %{xemacs_sitestart_d}/fedora-init.el* || :
 
-%files -f %{name}-%{version}.files
+
+%files
 %defattr(-,root,root,-)
-%doc COPYING emacs/*.patch
+%doc COPYING README*
 %config(noreplace) %{_sysconfdir}/fedora
 %{_datadir}/fedora
 %{_bindir}/fedora-*
+%{_bindir}/spectool
 %{_prefix}/lib/rpm/check-*
+%ghost %{_datadir}/*emacs
 
 
 %changelog
+* Thu Mar 24 2005 Ville Skyttä <ville.skytta at iki.fi> - 1.0-1
+- Make fedora-diffarchive work better with archives containing dirs without
+  read/execute permissions.
+- Sync "Epoch: 0" drops with Fedora Extras CVS.
+- Include Nils Philippsen's spectool.
+- Own (%%ghost'd) more dirs from the site-lisp dir hierarchies.
+- Drop trigger support pre-FC2 Emacs and XEmacs packages.
+- Drop rpm-spec-mode.el patch, no longer needed for FC2 Emacs and later.
+- Update URLs.
+- Drop developer GPG keys from the package, add Fedora Extras key.
+- Drop fedora-pkgannfmt, it's no longer relevant.
+- Remove pre-FC2 compatibility stuff from Perl spec template.
+- Don't try to remove gcc-java and related packages by default in rmdevelrpms.
+- Remove "full featured" spec template, convert newrpmspec to use -minimal.
+
 * Sun Feb  6 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:0.3.1-1
 - Make buildrpmtree and wipebuildtree less dependent on a specific
   configuration (#147014, Ignacio Vazquez-Abrams).


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fedora-rpmdevtools/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	9 Feb 2005 22:12:33 -0000	1.6
+++ sources	24 Mar 2005 16:45:41 -0000	1.7
@@ -1 +1,2 @@
-f602fb0535375b4591c67319de60040f  fedora-rpmdevtools-0.3.1.tar.bz2
+2f20b353cb5795cf01742f8ca08e8d29  fedora-rpmdevtools-1.0.tar.bz2
+f88484ff2a2d83f0cc1d37bc71300f7a  spectool-1.0.4.tar.bz2