release-notes/devel Makefile, 1.24, 1.25 about-gnome.desktop, 1.2, 1.3 fedora-release-notes.spec, 1.15, 1.16

[Paul W. Frields (pfrields)]

Author: pfrields

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

Modified Files:
	Makefile about-gnome.desktop fedora-release-notes.spec 
Log Message:
OK, builds and installs... time to put it away for test3 hopefully


Index: Makefile
===================================================================
RCS file: /cvs/docs/release-notes/devel/Makefile,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- Makefile	2 Sep 2006 01:58:19 -0000	1.24
+++ Makefile	2 Sep 2006 05:32:24 -0000	1.25
@@ -244,12 +244,17 @@
 
 define PKGOMF_DOC_template
 .PHONY: pkgomf-${1}-${2}
+ifneq "${2}" "${PRI_LANG}"
 pkgomf-${1}-${2}:: ${PKGNAME}-${VERSION}/${1}-${2}.omf
-
 ${PKGNAME}-${VERSION}/${1}-${2}.omf:: omf-${2}
 	mkdir -p ${PKGNAME}-${VERSION}
 	cp ${2}/${1}.omf $$@
-
+else
+pkgomf-${1}-${2}:: ${PKGNAME}-${VERSION}/${1}-C.omf
+${PKGNAME}-${VERSION}/${1}-C.omf:: omf-${2}
+	mkdir -p ${PKGNAME}-${VERSION}
+	cp ${2}/${1}.omf $$@
+endif
 endef
 
 $(foreach L,${LANGUAGES}, \
@@ -277,8 +282,7 @@
 
 define PKGTXT_template
 .PHONY: pkgtxt-${1}
-pkgtxt-${1}:: ${PKGNAME}-${VERSION}/${DOCBASE}-${1}.txt			\
-		${PKGNAME}-${VERSION}/README-${1}.txt
+pkgtxt-${1}:: ${PKGNAME}-${VERSION}/${DOCBASE}-${1}.txt	${PKGNAME}-${VERSION}/README-${1}.txt
 ${PKGNAME}-${VERSION}/${DOCBASE}-${1}.txt:: txt-${1}
 	mkdir -p ${PKGNAME}-${VERSION}
 	cp ${DOCBASE}-${1}.txt $$@
@@ -299,10 +303,15 @@
 
 .PHONY: release-pkg
 release-pkg:: ${PKGNAME}-${VERSION}.tar.gz
-${PKGNAME}-${VERSION}.tar.gz::  $(foreach LANG,${LANGUAGES},release-pkg-${LANG})
+${PKGNAME}-${VERSION}.tar.gz::  $(foreach L,${LANGUAGES},release-pkg-${L})
+	rm -f $@
 	cp -a --parents css/*css fedora.css img/*png stylesheet-images/*png ${PKGNAME}-${VERSION}
-	mkdir -p ${PKGNAME}-${VERSION}/about
-	$(foreach L,${LANGUAGES}, $(shell cp -pr ${L}/about-fedora.xml ${PKGNAME}-${VERSION}/about)
+	mkdir -p ${PKGNAME}-${VERSION}/about/C && \
+		cp ${PRI_LANG}/about-fedora.xml ${PKGNAME}-${VERSION}/about/C
+	$(foreach LN,${OTHERS},$(eval \
+		$(shell mkdir -p ${PKGNAME}-${VERSION}/about/${LN})))
+	$(foreach LN,${OTHERS},$(eval \
+		$(shell cp ${LN}/about-fedora.xml ${PKGNAME}-${VERSION}/about/${LN})))
 	cp -a about-* ${PKGNAME}-${VERSION}
 	cp -a README-Accessibility ${PKGNAME}-${VERSION}
 	tar czf ${PKGNAME}-${VERSION}.tar.gz ${PKGNAME}-${VERSION}


Index: about-gnome.desktop
===================================================================
RCS file: /cvs/docs/release-notes/devel/about-gnome.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- about-gnome.desktop	16 Jul 2006 21:10:09 -0000	1.2
+++ about-gnome.desktop	2 Sep 2006 05:32:24 -0000	1.3
@@ -2,7 +2,7 @@
 Encoding=UTF-8
 Name=About Fedora
 Comment=Learn more about Fedora
-Exec=yelp file:///usr/share/doc/fedora-release-@RELEASE@/about/C/about-fedora.xml
+Exec=yelp file:///usr/share/doc/fedora-release-notes-@RELEASE@/about/C/about-fedora.xml
 Icon=fedora-logo-icon
 Terminal=false
 Type=Application


Index: fedora-release-notes.spec
===================================================================
RCS file: /cvs/docs/release-notes/devel/fedora-release-notes.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- fedora-release-notes.spec	2 Sep 2006 01:58:19 -0000	1.15
+++ fedora-release-notes.spec	2 Sep 2006 05:32:24 -0000	1.16
@@ -48,7 +48,10 @@
   install -m 755 -D $F $RPM_BUILD_ROOT%{_defaultdocdir}/HTML/$F
 done
 find about/ -type f -exec install -m 644 -D {} $RPM_BUILD_ROOT%{_defaultdocdir}/fedora-release-notes-%{version}/{} \;
-install -m 644 -d *.omf $RPM_BUILD_ROOT%{_datadir}/omf/fedora-release-notes/
+install -m 755 -d $RPM_BUILD_ROOT%{_datadir}/omf/fedora-release-notes
+install -m 644 fedora-release-notes-*.omf $RPM_BUILD_ROOT%{_datadir}/omf/fedora-release-notes/
+install -m 755 -d $RPM_BUILD_ROOT%{_datadir}/omf/about-fedora
+install -m 644 about-*omf $RPM_BUILD_ROOT%{_datadir}/omf/about-fedora/
 install -m 644 -D about-gnome.desktop $RPM_BUILD_ROOT%{_datadir}/applications/about-fedora.desktop
 
 
@@ -70,7 +73,8 @@
 %{_defaultdocdir}/HTML
 %{_defaultdocdir}/fedora-release-notes-%{version}/about
 %{_datadir}/applications/about-fedora.desktop
-%{_datadir}/omf/fedora-release-notes/about-fedora.omf
+%{_datadir}/omf/fedora-release-notes/
+%{_datadir}/omf/about-fedora/
 
 
 %changelog