release-notes Makefile,1.16,1.17

[Tommy Reynolds (jtr)]

Author: jtr

Update of /cvs/docs/release-notes
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10502

Modified Files:
	Makefile 
Log Message:
Removed "make rpm" cruft.



Index: Makefile
===================================================================
RCS file: /cvs/docs/release-notes/Makefile,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- Makefile	16 Jan 2006 22:01:39 -0000	1.16
+++ Makefile	24 Jan 2006 22:01:51 -0000	1.17
@@ -12,19 +12,34 @@
 #
 LANGUAGES      	= en it ja_JP zh_CN ru #ja_JP
                      # uncomment languages when you have all the same
-                     # fies localized as are listed in XMLEXTRAFILES
+                     # files localized as are listed in XMLEXTRAFILES
 DOCBASE        	= RELEASE-NOTES
 
 define XMLEXTRAFILES_template
-XMLEXTRAFILES-$(1)=ArchSpecific-$(1).xml ArchSpecificPPC-$(1).xml ArchSpecificx86_64-$(1).xml ArchSpecificx86-$(1).xml BackwardsCompatibility-$(1).xml Colophon-$(1).xml DatabaseServers-$(1).xml Desktop-$(1).xml DevelopmentTools-$(1).xml DevelopmentToolsGCC-$(1).xml DevelopmentToolsJava-$(1).xml Entertainment-$(1).xml Feedback-$(1).xml FileServers-$(1).xml FileSystems-$(1).xml I18n-$(1).xml Installer-$(1).xml Introduction-$(1).xml Kernel-$(1).xml Legacy-$(1).xml Multimedia-$(1).xml Networking-$(1).xml OverView-$(1).xml PackageChanges-$(1).xml PackageNotes-$(1).xml PackageNotesJava-$(1).xml Printing-$(1).xml ProjectOverview-$(1).xml RELEASE-NOTES-$(1).xml Samba-$(1).xml Security-$(1).xml SecuritySELinux-$(1).xml ServerTools-$(1).xml SystemDaemons-$(1).xml WebServers-$(1).xml Welcome-$(1).xml Xorg-$(1).xml
+XMLEXTRAFILES-$(1)=ArchSpecific-$(1).xml ArchSpecificPPC-$(1).xml       \
+        ArchSpecificx86-$(1).xml ArchSpecificx86_64-$(1).xml            \
+        BackwardsCompatibility-$(1).xml Colophon-$(1).xml               \
+        DatabaseServers-$(1).xml Desktop-$(1).xml                       \
+        DevelopmentTools-$(1).xml DevelopmentToolsGCC-$(1).xml          \
+        DevelopmentToolsJava-$(1).xml Entertainment-$(1).xml            \
+        Feedback-$(1).xml FileServers-$(1).xml FileSystems-$(1).xml     \
+        I18n-$(1).xml Installer-$(1).xml Introduction-$(1).xml          \
+        Kernel-$(1).xml Legacy-$(1).xml Multimedia-$(1).xml             \
+        Networking-$(1).xml OverView-$(1).xml PackageChanges-$(1).xml   \
+        PackageNotes-$(1).xml PackageNotesJava-$(1).xml                 \
+        Printing-$(1).xml ProjectOverview-$(1).xml                      \
+        RELEASE-NOTES-$(1).xml Samba-$(1).xml Security-$(1).xml         \
+        SecuritySELinux-$(1).xml ServerTools-$(1).xml                   \
+        SystemDaemons-$(1).xml WebServers-$(1).xml Welcome-$(1).xml     \
+        Xorg-$(1).xml
 endef
 
 $(foreach LANG,${LANGUAGES},$(eval $(call XMLEXTRAFILES_template,${LANG})))
 
 #
-######################################################
+########################################################################
 include ../docs-common/Makefile.common
-######################################################
+########################################################################
 #
 # If you want to add additional steps to any of the 
 # targets defined in "Makefile.common", be sure to use
@@ -34,68 +49,4 @@
 # line:
 #${DOCBASE}-en/index.html::
 #	echo FINISHED AT LAST
-######################################################
-# Some packaging specific vars
-VERSION=$(shell grep BOOKID $(DOCBASE)-en.xml | sed 's/<!ENTITY BOOKID "[^0-9\.]\+//' | sed 's/ .\+//')
-DATE=${shell grep BOOKID $(DOCBASE)-en.xml | sed 's/.\+(//' | sed 's/).\+//' }
-NOW=$(shell date +"%a %b %e %Y")
-SPECIN=../docs-common/packaging/fedora-doc.spec.in.common
-OMFIN=../docs-common/packaging/fedora-doc.omf.in.common
-DESKTOPIN=../docs-common/packaging/fedora-doc.desktop.in.common
-DOCSPEC=$(PWD)/SPECS/$(DOCBASE).spec
-DOCOMF=$(PWD)/SOURCES/fedora-doc-$(DOCBASE)-C.omf
-DOCDESKTOP=$(PWD)/SOURCES/fedora-doc-$(DOCBASE).desktop
-DOCSRCTAR=$(PWD)/SOURCES/$(DOCBASE)-$(VERSION).src.tar.gz
-TITLE=$(shell ../docs-common/packaging/titlegrab.py $(DOCBASE)-en.xml | sed 's/^ \+//')
-######################################################
-# Some RPM flags...
-######################################################
-RPMFLAGS=--define "docbase $(DOCBASE)" --define "version $(VERSION)" --define "_topdir $(PWD)"
-######################################################
-
-
-clean::
-	rm -rf fedora-doc-$(DOCBASE)*.rpm
-
-
-rpm: clean
-#
-# Make RPM-compliant tarball of source XML and other stuff
-	mkdir $(DOCBASE)-$(VERSION)
-	find . -maxdepth 1 -type f ! \( -name '*~' -o -name 'Makefile*' \) \
-		| cpio -pamdv $(DOCBASE)-$(VERSION)
-	find . -maxdepth 1 -type d ! \( -name '$(DOCBASE)-$(VERSION)' \
-		-o -name 'CVS' -o -name '*~' -o -name '$(DOCBASE)*' \) \
-		| cpio -pamdv $(DOCBASE)-$(VERSION)
-#
-# Make RPM build tree; don't rely on local user's setup
-	mkdir -p {BUILD,RPMS/noarch,SOURCES,SPECS,SRPMS}
-	tar -zcvf $(DOCSRCTAR) $(DOCBASE)-$(VERSION)
-	rm -rf $(DOCBASE)-$(VERSION)/
-#
-# Make rpmlint happy with a changelog entry
-# FIXME: Maybe more magic would make this stickier; pity
-#        I'm no magician...
-	sed 's/\(%changelog\)/\1\n* $(NOW) Fedora Docs Project <fedora-docs-list at redhat.com> - $(VERSION)-1\n- Update to version $(VERSION)\n/' \
-		$(SPECIN) > $(DOCSPEC)
-#
-# Fill in files
-# FIXME:  Needs to be multiplexed for LANGUAGES (see above)
-	cp $(OMFIN) $(DOCOMF)
-	cp $(DESKTOPIN) $(DOCDESKTOP)
-	sed -i 's/@VERSION@/$(VERSION)/g' $(DOCOMF)
-	sed -i 's/@DATE@/$(DATE)/g' $(DOCOMF)
-	sed -i 's/@TITLE@/$(TITLE)/g' $(DOCOMF)
-	sed -i 's/@DOCBASE@/$(DOCBASE)/g' $(DOCOMF)
-	sed -i 's/@VERSION@/$(VERSION)/g' $(DOCDESKTOP)
-	sed -i 's/@DATE@/$(DATE)/g' $(DOCDESKTOP)
-	sed -i 's/@TITLE@/$(TITLE)/g' $(DOCDESKTOP)
-	sed -i 's/@DOCBASE@/$(DOCBASE)/g' $(DOCDESKTOP)
-#
-# Do the build...
-#
-	rpmbuild -bb $(RPMFLAGS) $(DOCSPEC)
-	mv RPMS/noarch/*.rpm .
-	rpmbuild --clean --rmsource $(RPMFLAGS) $(DOCSPEC)
-	rm -rf {BUILD,RPMS,SOURCES,SPECS,SRPMS}
-	rm -rf $(DOCBASE)-$(VERSION)
+########################################################################