From bf664e39c80a607d3aae00e7628e17a9fb1509ca Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Fri, 7 Nov 2008 05:08:00 +0000 Subject: [PATCH 1/8] Initialize branch F-10 for rpmdevtools --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..dc32377 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-10 From 50827de1769ea63a18e9454b8ffeb2be43d52ef4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Fri, 26 Dec 2008 12:17:55 +0000 Subject: [PATCH 2/8] =?UTF-8?q?-=207.0.=20-=20Drop=20fonts=20spec=20templa?= =?UTF-8?q?te,=20adapt=20to=20new=20ones=20from=20Fedora=20fonts=20SIG=20?= =?UTF-8?q?=20=20=20=20(#477055).=20-=20Add=20man=20page=20for=20rpmdev-ne?= =?UTF-8?q?wspec.=20Tue=20Dec=2016=202008=20Ville=20Skytt=C3=A4=20=20-=20Add=20imake=20and=20intltool=20to=20?= =?UTF-8?q?internal=20list=20of=20devel=20packages=20in=20rmdevelrpms.=20S?= =?UTF-8?q?at=20Dec=2013=202008=20Ville=20Skytt=C3=A4=20=20-=20Add=20rpmdev-sha*/*sum=20companions=20to=20rpm?= =?UTF-8?q?dev-md5=20(ticket=20#7).=20Wed=20Nov=2026=202008=20Ville=20Skyt?= =?UTF-8?q?t=C3=A4=20=20-=20Add=20vamp-plugin-?= =?UTF-8?q?sdk=20to=20internal=20list=20of=20non-devel=20packages=20in=20r?= =?UTF-8?q?mdevelrpms=20=20=20=20=20(#472641,=20Michael=20Schwendt).=20Thu?= =?UTF-8?q?=20Nov=2020=202008=20Ville=20Skytt=C3=A4=20=20-=20Drop=20"minimal=20buildroot"=20dependencies.?= =?UTF-8?q?=20-=20Drop=20fedora-rpmdevtools=20Obsoletes.=20Mon=20Oct=2013?= =?UTF-8?q?=202008=20Ville=20Skytt=C3=A4=20=20?= =?UTF-8?q?-=20Show=20available=20types=20in=20rpmdev-newspec=20--help=20(?= =?UTF-8?q?ticket=20#6,=20Todd=20=20=20=20=20Zullinger).=20Fri=20Sep=2026?= =?UTF-8?q?=202008=20Ville=20Skytt=C3=A4=20=20?= =?UTF-8?q?-=20Add=20-r/--rightmost=20option=20to=20rpmdev-bumpspec=20(tic?= =?UTF-8?q?ket=20#1,=20Thorsten=20=20=20=20=20Leemhuis).=20-=20Add=20%pack?= =?UTF-8?q?ager=20from=20rpm=20config=20to=20the=20set=20of=20defaults=20f?= =?UTF-8?q?or=20=20=20=20=20rpmdev-bumpspec's=20user=20string.=20Thu=20Sep?= =?UTF-8?q?=2025=202008=20Ville=20Skytt=C3=A4=20=20-=20Bring=20rpmdev-bumpspec=20copyright=20holder=20closer?= =?UTF-8?q?=20to=20truth=20(Michael=20=20=20=20=20Schwendt).=20Mon=20Sep?= =?UTF-8?q?=2022=202008=20Ville=20Skytt=C3=A4=20=20-=20Switch=20to=20lzma=20compressed=20tarball.=20Sun=20Sep?= =?UTF-8?q?=207=202008=20Ville=20Skytt=C3=A4=20=20-=20Improve=20arch=20specific=20%files=20in=20perl=20spec?= =?UTF-8?q?=20template=20(#461177,=20Chris=20Weyl).?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .cvsignore | 2 +- rpmdevtools.spec | 79 ++++++++++++++++++++++++++++-------------------- sources | 2 +- 3 files changed, 49 insertions(+), 34 deletions(-) diff --git a/.cvsignore b/.cvsignore index 6ca1d80..a85bf89 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ spectool-1.0.10.tar.bz2 -rpmdevtools-6.7.tar.bz2 +rpmdevtools-7.0.tar.lzma diff --git a/rpmdevtools.spec b/rpmdevtools.spec index 752a91c..81f53ad 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -3,7 +3,7 @@ %define spectool_version 1.0.10 Name: rpmdevtools -Version: 6.7 +Version: 7.0 Release: 1%{?dist} Summary: RPM Development Tools @@ -11,49 +11,28 @@ Group: Development/Tools # rpmdev-setuptree is GPLv2, everything else GPLv2+ License: GPLv2+ and GPLv2 URL: https://fedorahosted.org/rpmdevtools/ -Source0: http://scop.fedorapeople.org/rpmdevtools/%{name}-%{version}.tar.bz2 +Source0: https://fedorahosted.org/releases/r/p/rpmdevtools/%{name}-%{version}.tar.lzma Source1: http://people.redhat.com/nphilipp/spectool/spectool-%{spectool_version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -# All build deps for man page generation +# lzma for unpacking the tarball +BuildRequires: lzma +# help2man, pod2man, *python for creating man pages BuildRequires: help2man BuildRequires: %{_bindir}/pod2man BuildRequires: python BuildRequires: rpm-python Provides: spectool = %{spectool_version} -Obsoletes: fedora-rpmdevtools < 5.0 -# Minimal RPM build requirements -Requires: bash -Requires: bzip2 -Requires: coreutils -Requires: cpio Requires: diffutils -Requires: findutils -Requires: gawk -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: tar -Requires: unzip -Requires: util-linux -Requires: which -# Additionally required for tool operations -#Requires: cpio Requires: fakeroot Requires: file -Requires: perl -Requires: python +Requires: findutils +Requires: gawk +Requires: grep +Requires: rpm-build >= 4.4.2.1 Requires: rpm-python -#Requires: sed +Requires: sed Requires: wget %description @@ -65,7 +44,7 @@ rpmdev-newspec Creates new .spec from template rpmdev-rmdevelrpms Find (and optionally remove) "development" RPMs rpmdev-checksig Check package signatures using alternate RPM keyring rpminfo Print information about executables and libraries -rpmdev-md5 Display the md5sum of all files in an RPM +rpmdev-md5/sha* Display checksums of all files in an RPM package file rpmdev-vercmp RPM version comparison checker spectool Expand and download sources and patches in specfiles rpmdev-wipetree Erase all files within dirs created by rpmdev-setuptree @@ -129,6 +108,42 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Dec 26 2008 Ville Skyttä - 7.0-1 +- 7.0. +- Drop fonts spec template, adapt to new ones from Fedora fonts SIG (#477055). +- Add man page for rpmdev-newspec. + +* Tue Dec 16 2008 Ville Skyttä +- Add imake and intltool to internal list of devel packages in rmdevelrpms. + +* Sat Dec 13 2008 Ville Skyttä +- Add rpmdev-sha*/*sum companions to rpmdev-md5 (ticket #7). + +* Wed Nov 26 2008 Ville Skyttä +- Add vamp-plugin-sdk to internal list of non-devel packages in rmdevelrpms + (#472641, Michael Schwendt). + +* Thu Nov 20 2008 Ville Skyttä +- Drop "minimal buildroot" dependencies. +- Drop fedora-rpmdevtools Obsoletes. + +* Mon Oct 13 2008 Ville Skyttä +- Show available types in rpmdev-newspec --help (ticket #6, Todd Zullinger). + +* Fri Sep 26 2008 Ville Skyttä +- Add -r/--rightmost option to rpmdev-bumpspec (ticket #1, Thorsten Leemhuis). +- Add %%packager from rpm config to the set of defaults for rpmdev-bumpspec's + user string. + +* Thu Sep 25 2008 Ville Skyttä +- Bring rpmdev-bumpspec copyright holder closer to truth (Michael Schwendt). + +* Mon Sep 22 2008 Ville Skyttä +- Switch to lzma compressed tarball. + +* Sun Sep 7 2008 Ville Skyttä +- Improve arch specific %%files in perl spec template (#461177, Chris Weyl). + * Sun Aug 3 2008 Ville Skyttä - 6.7-1 - 6.7. - Make rpmdev-diff, rpmdev-md5 and rpminfo honor TMPDIR. diff --git a/sources b/sources index 646f6dc..548cc8e 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ d193612122f297ee4b37f1b04f605768 spectool-1.0.10.tar.bz2 -819ece90d6be10c4ed85cc4a6975589c rpmdevtools-6.7.tar.bz2 +ccdff99d03845ab8ea294a702b5f6681 rpmdevtools-7.0.tar.lzma From 748e12b06eed54131a895fc228429760a1631d90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Tue, 14 Apr 2009 12:32:39 +0000 Subject: [PATCH 3/8] =?UTF-8?q?-=207.1.=20-=20Make=20rpmdev-md5=20and=20fr?= =?UTF-8?q?iends=20work=20on=20non-srpm=20package=20files=20too.=20Sun=20M?= =?UTF-8?q?ar=2015=202009=20Ville=20Skytt=C3=A4=20=20-=20Add=20bash=20completion.=20Mon=20Mar=209=202009=20Vi?= =?UTF-8?q?lle=20Skytt=C3=A4=20=20-=20Add=20qu?= =?UTF-8?q?ery=20format=20option=20to=20rmdevelrpms,=20sort=20output=20by?= =?UTF-8?q?=20NEVRA.=20Sun=20Feb=2022=202009=20Ville=20Skytt=C3=A4=20=20-=20Use=20%global=20instead=20of=20%%?= =?UTF-8?q?define=20in=20spec=20templates.=20-=20Handle=20%global=20in=20a?= =?UTF-8?q?ddition=20to=20%%define=20in=20rpmdev-bumpspec.=20Mon=20Jan=202?= =?UTF-8?q?6=202009=20Ville=20Skytt=C3=A4=20?= =?UTF-8?q?=20-=20Add=20result=20dependent=20exit=20statuses=20to=20rpmdev?= =?UTF-8?q?-vercmp.=20Fri=20Dec=2026=202008=20Ville=20Skytt=C3=A4=20=20-=20Add=20minimum=20version=20to=20rpm?= =?UTF-8?q?-python=20dependency=20(for=20rpmdev-bumpspec).?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .cvsignore | 2 +- rpmdevtools.spec | 35 +++++++++++++++++++++++++++++------ sources | 2 +- 3 files changed, 31 insertions(+), 8 deletions(-) diff --git a/.cvsignore b/.cvsignore index a85bf89..bb6bc1d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ spectool-1.0.10.tar.bz2 -rpmdevtools-7.0.tar.lzma +rpmdevtools-7.1.tar.lzma diff --git a/rpmdevtools.spec b/rpmdevtools.spec index 81f53ad..8ced60c 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -1,9 +1,9 @@ -%define emacs_sitestart_d %{_datadir}/emacs/site-lisp/site-start.d -%define xemacs_sitestart_d %{_datadir}/xemacs/site-packages/lisp/site-start.d -%define 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: 7.0 +Version: 7.1 Release: 1%{?dist} Summary: RPM Development Tools @@ -11,7 +11,7 @@ Group: Development/Tools # rpmdev-setuptree is GPLv2, everything else GPLv2+ License: GPLv2+ and GPLv2 URL: https://fedorahosted.org/rpmdevtools/ -Source0: https://fedorahosted.org/releases/r/p/rpmdevtools/%{name}-%{version}.tar.lzma +Source0: https://fedorahosted.org/released/rpmdevtools/%{name}-%{version}.tar.lzma Source1: http://people.redhat.com/nphilipp/spectool/spectool-%{spectool_version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -31,9 +31,11 @@ Requires: findutils Requires: gawk Requires: grep Requires: rpm-build >= 4.4.2.1 -Requires: rpm-python +Requires: rpm-python >= 4.4.2.2 Requires: sed 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 @@ -100,6 +102,7 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %doc COPYING README* %config(noreplace) %{_sysconfdir}/rpmdevtools/ +%{_sysconfdir}/bash_completion.d/ %{_datadir}/rpmdevtools/ %{_bindir}/rpm* %{_bindir}/spectool @@ -108,6 +111,26 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Apr 4 2009 Ville Skyttä - 7.1-1 +- 7.1. +- Make rpmdev-md5 and friends work on non-srpm package files too. + +* Sun Mar 15 2009 Ville Skyttä +- Add bash completion. + +* Mon Mar 9 2009 Ville Skyttä +- Add query format option to rmdevelrpms, sort output by NEVRA. + +* Sun Feb 22 2009 Ville Skyttä +- Use %%global instead of %%define in spec templates. +- Handle %%global in addition to %%define in rpmdev-bumpspec. + +* Mon Jan 26 2009 Ville Skyttä +- Add result dependent exit statuses to rpmdev-vercmp. + +* Fri Dec 26 2008 Ville Skyttä +- Add minimum version to rpm-python dependency (for rpmdev-bumpspec). + * Fri Dec 26 2008 Ville Skyttä - 7.0-1 - 7.0. - Drop fonts spec template, adapt to new ones from Fedora fonts SIG (#477055). diff --git a/sources b/sources index 548cc8e..8dc3617 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ d193612122f297ee4b37f1b04f605768 spectool-1.0.10.tar.bz2 -ccdff99d03845ab8ea294a702b5f6681 rpmdevtools-7.0.tar.lzma +0d0e9fa78d3f5cfe09c25cf69d629ba2 rpmdevtools-7.1.tar.lzma From c7a5caeaa9bee9520a2bd26acb6e1f45b0c458a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Thu, 21 May 2009 14:48:29 +0000 Subject: [PATCH 4/8] =?UTF-8?q?-=20Release=207.2.=20Sun=20May=203=202009?= =?UTF-8?q?=20Ville=20Skytt=C3=A4=20=20-=20Add?= =?UTF-8?q?=20dummy=20spec=20template=20for=20ad-hoc=20testing.=20Sat=20Ma?= =?UTF-8?q?y=202=202009=20Ville=20Skytt=C3=A4=20=20-=20Improve=20newspec/newinit=20when=20only=20"-o=20foo"?= =?UTF-8?q?=20argument=20is=20given=20(#498588,=20=20=20=20=20thanks=20to?= =?UTF-8?q?=20Edwin=20ten=20Brink).=20-=20Try=20to=20get=20packager=20mail?= =?UTF-8?q?=20address=20for=20*Emacs=20rpm-spec-mode=20from=20=20=20=20=20?= =?UTF-8?q?~/.fedora.cert=20if=20rpm-spec-user-mail-address=20is=20not=20s?= =?UTF-8?q?et.=20-=20Add=20xz=20support=20to=20rpmdev-extract.=20Sat=20Apr?= =?UTF-8?q?=2018=202009=20Ville=20Skytt=C3=A4=20=20-=20Make=20bumpspec's=20use=20of=20"head"=20POSIX=20compli?= =?UTF-8?q?ant.=20Thu=20Apr=2016=202009=20Ville=20Skytt=C3=A4=20=20-=20Add=20rpmdev-newinit=20for=20easier=20?= =?UTF-8?q?access=20to=20the=20init=20script=20template,=20move=20=20=20?= =?UTF-8?q?=20=20the=20template=20to=20%{=5Fsysconfdir}/rpmdevtools,=20imp?= =?UTF-8?q?rove=20reload=20action=20=20=20=20=20example.=20Tue=20Apr=207?= =?UTF-8?q?=202009=20Ville=20Skytt=C3=A4=20=20?= =?UTF-8?q?-=20Speed=20up=20rpmls=20bash=20completion.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .cvsignore | 2 +- rpmdevtools.spec | 25 ++++++++++++++++++++++++- sources | 2 +- 3 files changed, 26 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index bb6bc1d..45ee3dc 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ spectool-1.0.10.tar.bz2 -rpmdevtools-7.1.tar.lzma +rpmdevtools-7.2.tar.lzma diff --git a/rpmdevtools.spec b/rpmdevtools.spec index 8ced60c..9d05a03 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -3,7 +3,7 @@ %global spectool_version 1.0.10 Name: rpmdevtools -Version: 7.1 +Version: 7.2 Release: 1%{?dist} Summary: RPM Development Tools @@ -111,6 +111,29 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed May 20 2009 Ville Skyttä - 7.2-1 +- Release 7.2. + +* Sun May 3 2009 Ville Skyttä +- Add dummy spec template for ad-hoc testing. + +* Sat May 2 2009 Ville Skyttä +- Improve newspec/newinit when only "-o foo" argument is given (#498588, + thanks to Edwin ten Brink). +- Try to get packager mail address for *Emacs rpm-spec-mode from ~/.fedora.cert + if rpm-spec-user-mail-address is not set. +- Add xz support to rpmdev-extract. + +* Sat Apr 18 2009 Ville Skyttä +- Make bumpspec's use of "head" POSIX compliant. + +* Thu Apr 16 2009 Ville Skyttä +- Add rpmdev-newinit for easier access to the init script template, move the + template to %%{_sysconfdir}/rpmdevtools, improve reload action example. + +* Tue Apr 7 2009 Ville Skyttä +- Speed up rpmls bash completion. + * Sat Apr 4 2009 Ville Skyttä - 7.1-1 - 7.1. - Make rpmdev-md5 and friends work on non-srpm package files too. diff --git a/sources b/sources index 8dc3617..c1fa63e 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ d193612122f297ee4b37f1b04f605768 spectool-1.0.10.tar.bz2 -0d0e9fa78d3f5cfe09c25cf69d629ba2 rpmdevtools-7.1.tar.lzma +a251d4bb5b65fcdabe59e8defc99235b rpmdevtools-7.2.tar.lzma From 527b5d79ac12e1d7e102fdd89f6be2d0d5a4762b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sun, 24 May 2009 21:29:49 +0000 Subject: [PATCH 5/8] =?UTF-8?q?-=20Release=207.3.=20Sat=20May=2023=202009?= =?UTF-8?q?=20Ville=20Skytt=C3=A4=20=20-=20Add?= =?UTF-8?q?=20rpmdev-packager=20-=20script=20for=20getting=20rpm=20package?= =?UTF-8?q?r=20info.=20-=20Use=20rpmdev-packager=20in=20rpmdev-bumpspec=20?= =?UTF-8?q?and=20rpmdev-init.el.=20-=20Fix=20rpmdev-extract=20MIME=20type?= =?UTF-8?q?=20comparisons=20with=20file(1)=20output=20containing=20=20=20?= =?UTF-8?q?=20=20parameters.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .cvsignore | 2 +- rpmdevtools.spec | 15 ++++++++++++--- sources | 2 +- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index 45ee3dc..593fabd 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ spectool-1.0.10.tar.bz2 -rpmdevtools-7.2.tar.lzma +rpmdevtools-7.3.tar.lzma diff --git a/rpmdevtools.spec b/rpmdevtools.spec index 9d05a03..3e03427 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -3,8 +3,8 @@ %global spectool_version 1.0.10 Name: rpmdevtools -Version: 7.2 -Release: 1%{?dist} +Version: 7.3 +Release: 1 Summary: RPM Development Tools Group: Development/Tools @@ -31,7 +31,7 @@ Requires: findutils Requires: gawk Requires: grep Requires: rpm-build >= 4.4.2.1 -Requires: rpm-python >= 4.4.2.2 +Requires: rpm-python Requires: sed Requires: wget # For _get_cword in bash completion snippet @@ -111,6 +111,15 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon May 25 2009 Ville Skyttä - 7.3-1 +- Release 7.3. + +* Sat May 23 2009 Ville Skyttä +- Add rpmdev-packager - script for getting rpm packager info. +- Use rpmdev-packager in rpmdev-bumpspec and rpmdev-init.el. +- Fix rpmdev-extract MIME type comparisons with file(1) output containing + parameters. + * Wed May 20 2009 Ville Skyttä - 7.2-1 - Release 7.2. diff --git a/sources b/sources index c1fa63e..28defc9 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ d193612122f297ee4b37f1b04f605768 spectool-1.0.10.tar.bz2 -a251d4bb5b65fcdabe59e8defc99235b rpmdevtools-7.2.tar.lzma +5475dc402a40356163e4a9b468f6497b rpmdevtools-7.3.tar.lzma From 62c653f4dd2b39e94298a48a09c290a69c557d05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sun, 24 May 2009 21:34:13 +0000 Subject: [PATCH 6/8] Doh. --- rpmdevtools.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpmdevtools.spec b/rpmdevtools.spec index 3e03427..c3e3393 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -4,7 +4,7 @@ Name: rpmdevtools Version: 7.3 -Release: 1 +Release: 1%{?dist} Summary: RPM Development Tools Group: Development/Tools From 4afc621516c385db8552151dcc63d30c6fcdb40a Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:29:16 +0000 Subject: [PATCH 7/8] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 3971401..5e3f83e 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ 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 +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)) From 248f7e2ce73e84525fdccf813ab463493344a90d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 11:38:27 +0000 Subject: [PATCH 8/8] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 5e3f83e..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# 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) diff --git a/branch b/branch deleted file mode 100644 index dc32377..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-10