docs-common Makefile.common,1.133,1.134
Paul W. Frields (pfrields)
fedora-docs-commits at redhat.com
Sat Aug 5 13:11:37 UTC 2006
Author: pfrields
Update of /cvs/docs/docs-common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15541
Modified Files:
Makefile.common
Log Message:
Get rid of really awful packaging scripts. Mea culpa, I promise the
new round will be better.
Index: Makefile.common
===================================================================
RCS file: /cvs/docs/docs-common/Makefile.common,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- Makefile.common 5 Aug 2006 04:39:18 -0000 1.133
+++ Makefile.common 5 Aug 2006 13:11:34 -0000 1.134
@@ -274,6 +274,11 @@
--specfile ${SPECFILE} | head -1)
endif
+showvars::
+ @echo "VERSION=$(VERSION)"
+ @echo "RELEASE=$(RELEASE)"
+ @echo "PWD=$(PWD)"
+
# CVS-safe version/release -- a package name like 4Suite screws things
# up, so we have to remove the leaving digits from the name
TAG_NAME := $(shell echo ${NAME} | sed -e s/\\\./_/g -e s/^[0-9]\\\+//g)
@@ -832,19 +837,6 @@
${RM} $(DOCBASE)*.src.tar.gz
help::
- @printf ${TFMT} 'spec' 'Creates RPM spec file from rpm-info.xml'
-
-spec:: ${SPECFILE}
-
-help::
- @printf ${TFMT} '${SPECFILE}' 'Creates RPM spec file from rpm-info.xml'
-
-${SPECFILE}:: ${RPMINFO}
- $(XSLTPROC) --stringparam docbase "${DOCBASE}" \
- ${FDPDIR}/docs-common/packaging/spec.xsl ${RPMINFO} \
- >$@.tmp && move-if-change $@.tmp $@
-
-help::
@printf ${TFMT} 'gnome-desktop' 'Outputs Gnome desktop description'
gnome.desktop:: fedora-doc-${DOCBASE}-gnome.desktop
@@ -911,76 +903,6 @@
omf:: $(foreach LANG,${LANGUAGES},omf-$(LANG)) fedora-doc-${DOCBASE}-C.omf
-help::
- @printf ${TFMT} 'src-tarball' 'Builds tar(1) archive of sources & desktop files'
-
-src-tarball $(DOCBASE)-$(VERSION).src.tar.gz:: xml-all
- ${MAKE} fdp-info
- ${MAKE} gnome.desktop
- ${MAKE} kde.desktop
- ${MAKE} khelp.desktop
- ${MAKE} omf
- ${RM} -r $(DOCBASE)-$(VERSION)
- mkdir -p $(DOCBASE)-$(VERSION)
- find . '(' \
- -name '*#*' \
- -o -name 'CVS' \
- -o -name 'rpm' \
- -o -name '*.rpm' \
- -o -name '*~' \
- -o -name '*.tar.gz' \
- -o -name '*.tmp' \
- -o -name '${DOCBASE}-${VERSION}' \
- -o -name '*.mo' \
- ')' -prune -o -print | cpio -pamdv $(DOCBASE)-$(VERSION)
- tar -zcvf $(DOCBASE)-$(VERSION).src.tar.gz $(DOCBASE)-$(VERSION)/
- ${RM} -r $(DOCBASE)-$(VERSION)
-
-package-prep::
- ${MAKE} distclean
- ${MAKE} ${DOCBASE}-${shell version doc}.src.tar.gz
- ${MAKE} ${SPECFILE}
- ${MAKE} omf
- ${MAKE} kde.desktop
- ${MAKE} khelp.desktop
- mkdir -p rpm/{BUILD,RPMS,SOURCES,SPECS,SRPMS}
- mkdir -p rpm/RPMS/{i386,i486,i586,i686,noarch,ppc,x86_64}
- cp -f $(DOCBASE)-$(shell version doc).src.tar.gz rpm/SOURCES/
- cp -f ${SPECFILE} rpm/SPECS
- cp -f *.omf *.desktop rpm/SOURCES
-
-rpm-common::
- if test $(shell get_latest_revision rpm) -eq 0 ; then \
- V=$(shell get_latest_revision doc) ; \
- echo "*** Creating revision log entry for rpm ***" ; \
- ROLE=rpm ID=1 DETAILS="Update to version $$V" \
- $(MAKE) clog ; \
- fi
- ${RM} *.rpm
- if test $(RPMPREP) != "no" ; then ${MAKE} package-prep ; fi
-
-noarch:: rpm-common
- rpmbuild -bb $(RPMDFLAG) $(RPMFLAGS) rpm/SPECS/$(SPECFILE)
- if test $(RPMPOST) != "no" ; then $(MAKE) package-post ; fi
-
-srpm:: rpm-common
- rpmbuild -bs $(RPMDFLAG) $(RPMFLAGS) rpm/SPECS/$(SPECFILE)
- if test $(RPMPOST) != "no" ; then $(MAKE) package-post ; fi
-
-rpm:: rpm-common
- rpmbuild -ba $(RPMDFLAG) $(RPMFLAGS) rpm/SPECS/$(SPECFILE)
- if test $(RPMPOST) != "no" ; then $(MAKE) package-post ; fi
-
-package-post::
- $(MAKE) clean # If needed, review materials in rpm/BUILD/
- find rpm/ -name '*.rpm' -exec ln '{}' . ';'
- ls *.rpm
-
-showvars::
- @echo "VERSION=$(VERSION)"
- @echo "RELEASE=$(RELEASE)"
- @echo "PWD=$(PWD)"
-
#########################################################################
define FDP_ENTITIES_template
More information about the Fedora-docs-commits
mailing list