diff --git a/Makefile.in.patch b/Makefile.in.patch new file mode 100644 index 0000000..ab531fd --- /dev/null +++ b/Makefile.in.patch @@ -0,0 +1,131 @@ +--- fedora-packager-0.5.1.4/Makefile.in 2010-08-24 16:30:55.000000000 -0500 ++++ fedora-packager-0.5.1.4/Makefile.in 2010-09-24 11:31:09.917510470 -0500 +@@ -68,9 +68,10 @@ + am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +-am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(fedora_certdir)" \ +- "$(DESTDIR)$(pyfedpkgdir)" "$(DESTDIR)$(bashconfdir)" +-SCRIPTS = $(bin_SCRIPTS) ++am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)" \ ++ "$(DESTDIR)$(fedora_certdir)" "$(DESTDIR)$(pyfedpkgdir)" \ ++ "$(DESTDIR)$(bashconfdir)" ++SCRIPTS = $(bin_SCRIPTS) $(sbin_SCRIPTS) + SOURCES = + DIST_SOURCES = + py_compile = $(top_srcdir)/py-compile +@@ -181,13 +182,15 @@ + arm-koji \ + ppc-koji + +-CLEANFILES = $(bin_SCRIPTS) ++sbin_SCRIPTS = fedora-burn-yubikey ++CLEANFILES = $(bin_SCRIPTS) $(sbin_SCRIPTS) + EXTRA_DIST = src/fedora-cvs.py \ + src/fedora-packager-setup.py \ + src/fedoradev-pkgowners \ + src/fedora-cert.py \ + src/fedora-getsvn \ + src/fedora-hosted.py \ ++ src/fedora-burn-yubikey.py \ + src/rpmbuild-md5 \ + src/fedpkg.py \ + src/secondary-koji \ +@@ -270,6 +273,40 @@ + test -n "$$list" || exit 0; \ + echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(bindir)" && rm -f $$files ++install-sbinSCRIPTS: $(sbin_SCRIPTS) ++ @$(NORMAL_INSTALL) ++ test -z "$(sbindir)" || $(MKDIR_P) "$(DESTDIR)$(sbindir)" ++ @list='$(sbin_SCRIPTS)'; test -n "$(sbindir)" || list=; \ ++ for p in $$list; do \ ++ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ++ if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \ ++ done | \ ++ sed -e 'p;s,.*/,,;n' \ ++ -e 'h;s|.*|.|' \ ++ -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \ ++ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \ ++ { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ ++ if ($$2 == $$4) { files[d] = files[d] " " $$1; \ ++ if (++n[d] == $(am__install_max)) { \ ++ print "f", d, files[d]; n[d] = 0; files[d] = "" } } \ ++ else { print "f", d "/" $$4, $$1 } } \ ++ END { for (d in files) print "f", d, files[d] }' | \ ++ while read type dir files; do \ ++ if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ ++ test -z "$$files" || { \ ++ echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(sbindir)$$dir'"; \ ++ $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(sbindir)$$dir" || exit $$?; \ ++ } \ ++ ; done ++ ++uninstall-sbinSCRIPTS: ++ @$(NORMAL_UNINSTALL) ++ @list='$(sbin_SCRIPTS)'; test -n "$(sbindir)" || exit 0; \ ++ files=`for p in $$list; do echo "$$p"; done | \ ++ sed -e 's,.*/,,;$(transform)'`; \ ++ test -n "$$list" || exit 0; \ ++ echo " ( cd '$(DESTDIR)$(sbindir)' && rm -f" $$files ")"; \ ++ cd "$(DESTDIR)$(sbindir)" && rm -f $$files + install-fedora_certPYTHON: $(fedora_cert_PYTHON) + @$(NORMAL_INSTALL) + test -z "$(fedora_certdir)" || $(MKDIR_P) "$(DESTDIR)$(fedora_certdir)" +@@ -523,7 +560,7 @@ + check: check-am + all-am: Makefile $(SCRIPTS) $(DATA) + installdirs: +- for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(fedora_certdir)" "$(DESTDIR)$(pyfedpkgdir)" "$(DESTDIR)$(bashconfdir)"; do \ ++ for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(fedora_certdir)" "$(DESTDIR)$(pyfedpkgdir)" "$(DESTDIR)$(bashconfdir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done + install: install-am +@@ -580,7 +617,7 @@ + + install-dvi-am: + +-install-exec-am: install-binSCRIPTS ++install-exec-am: install-binSCRIPTS install-sbinSCRIPTS + + install-html: install-html-am + +@@ -621,7 +658,8 @@ + ps-am: + + uninstall-am: uninstall-bashconfDATA uninstall-binSCRIPTS \ +- uninstall-fedora_certPYTHON uninstall-pyfedpkgPYTHON ++ uninstall-fedora_certPYTHON uninstall-pyfedpkgPYTHON \ ++ uninstall-sbinSCRIPTS + + .MAKE: install-am install-strip + +@@ -635,11 +673,12 @@ + install-fedora_certPYTHON install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-pyfedpkgPYTHON \ +- install-strip installcheck installcheck-am installdirs \ +- maintainer-clean maintainer-clean-generic mostlyclean \ +- mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \ +- uninstall-bashconfDATA uninstall-binSCRIPTS \ +- uninstall-fedora_certPYTHON uninstall-pyfedpkgPYTHON ++ install-sbinSCRIPTS install-strip installcheck installcheck-am \ ++ installdirs maintainer-clean maintainer-clean-generic \ ++ mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \ ++ uninstall-am uninstall-bashconfDATA uninstall-binSCRIPTS \ ++ uninstall-fedora_certPYTHON uninstall-pyfedpkgPYTHON \ ++ uninstall-sbinSCRIPTS + + + fedora-cvs: $(srcdir)/src/fedora-cvs.py +@@ -666,6 +705,10 @@ + rm -f fedora-hosted + install -p -m 755 -T $(srcdir)/src/fedora-hosted.py fedora-hosted + ++fedora-burn-yubikey: $(srcdir)/src/fedora-burn-yubikey.py ++ rm -f fedora-burn-yubikey ++ install -p -m 755 -T $(srcdir)/src/fedora-burn-yubikey.py fedora-burn-yubikey ++ + rpmbuild-md5: $(srcdir)/src/rpmbuild-md5 + rm -f rpmbuild-md5 + install -p -m 755 -T $(srcdir)/src/rpmbuild-md5 rpmbuild-md5 diff --git a/fedora-packager.spec b/fedora-packager.spec index c8b5f42..03363df 100644 --- a/fedora-packager.spec +++ b/fedora-packager.spec @@ -14,6 +14,7 @@ Source0: https://fedorahosted.org/releases/f/e/fedora-packager/fedora-pac Patch0: 0001-add-fedora-burn-yubikey-script.patch Patch1: 0002-install-fedora-burn-yubikey-into-sbindir.patch Patch2: 0003-add-author-and-copyright-info-for-fedora-burn-yubike.patch +Patch3: Makefile.in.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel @@ -62,6 +63,7 @@ Provides fedora-cert and the fedora_cert python library %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build %configure @@ -85,14 +87,14 @@ rm -rf $RPM_BUILD_ROOT %exclude %{_bindir}/fedora-cert %files -n fedora-cert -%doc COPYING TODO AUTHORS ChangeLog %defattr(-,root,root,-) +%doc COPYING TODO AUTHORS ChangeLog %{_bindir}/fedora-cert %{python_sitelib}/fedora_cert %files -n fedpkg -%doc COPYING TODO AUTHORS ChangeLog %defattr(-,root,root,-) +%doc COPYING TODO AUTHORS ChangeLog %{_bindir}/fedpkg %{python_sitelib}/pyfedpkg %{_sysconfdir}/bash_completion.d