2003-10-18 Laszlo Peter <[email protected]>
authorre
Fri, 17 Oct 2003 13:03:15 +0000
changeset 1281 981e734832fd
parent 1280 9d3516e630cd
child 1282 2ab383856a9b
2003-10-18 Laszlo Peter <[email protected]> * gnome-user-docs.spec: update to 2.4.1
ChangeLog
gnome-user-docs.spec
patches/gnome-user-docs-01-add-l10n-online-help.diff
--- a/ChangeLog	Fri Oct 17 12:14:53 2003 +0000
+++ b/ChangeLog	Fri Oct 17 13:03:15 2003 +0000
@@ -1,5 +1,7 @@
 2003-10-18  Laszlo Peter  <[email protected]>
 
+	* gnome-user-docs.spec: update to 2.4.1
+
 	* gnome-utils.spec: update to 2.4.0
 
 2003-10-17  Michael Twomey  <[email protected]>
--- a/gnome-user-docs.spec	Fri Oct 17 12:14:53 2003 +0000
+++ b/gnome-user-docs.spec	Fri Oct 17 13:03:15 2003 +0000
@@ -5,8 +5,8 @@
 License:		FDL
 Group:			Documentation
 BuildArchitectures:	noarch
-Version:		2.0.6
-Release:		15
+Version:		2.4.1
+Release:		1
 Distribution:		Mercury
 Vendor:			Sun Microsystems, Inc.
 Summary:		User Documentation for the GNOME desktop
@@ -20,7 +20,7 @@
 BuildRoot:		%{_tmppath}/%{name}-%{version}-build
 Docdir:			%{_defaultdocdir}/doc
 
-%define			scrollkeeper_version 0.3.11
+%define			scrollkeeper_version 0.3.12
 
 Requires:		scrollkeeper >= %{scrollkeeper_version}
 
@@ -30,9 +30,9 @@
 
 %prep
 %setup -q -n gnome2-user-docs-%{version}
+tar jxf %SOURCE1
 %patch0
 %patch1
-tar jxf %SOURCE1
 rm -Rf gnome2-user-guide/C/figures
 tar jxf %SOURCE2
 tar jxf %SOURCE3
@@ -67,6 +67,8 @@
 %{_datadir}/omf/*
 
 %changelog
+* Sat Oct 18 2003 Laszlo Peter <[email protected]>
+- Update to 2.4.1
 * Fri Sep 26 2003 Laszlo Peter <[email protected]>
 - Updated the user's guide
 * Tue Aug 26 2003 Michael Twomey <[email protected]>
--- a/patches/gnome-user-docs-01-add-l10n-online-help.diff	Fri Oct 17 12:14:53 2003 +0000
+++ b/patches/gnome-user-docs-01-add-l10n-online-help.diff	Fri Oct 17 13:03:15 2003 +0000
@@ -1,9 +1,9 @@
 --- configure.in	2003-03-10 09:24:46.000000000 +0800
 +++ configure.in.new	2003-07-11 17:09:57.000000000 +0800
-@@ -41,6 +41,15 @@
+@@ -39,6 +39,15 @@
+ gnome-user-docs.spec
+ gnome2-user-guide/Makefile
  gnome2-user-guide/C/Makefile
- gnome2-user-guide/ro/Makefile
- gnome2-user-guide/hu/Makefile
 +gnome2-user-guide/de/Makefile
 +gnome2-user-guide/es/Makefile
 +gnome2-user-guide/fr/Makefile
@@ -19,8 +19,8 @@
 --- gnome2-user-guide/Makefile.am	2003-01-20 06:56:29.000000000 +0800
 +++ gnome2-user-guide/Makefile.am.new	2003-07-11 17:11:54.000000000 +0800
 @@ -1,2 +1,2 @@
--SUBDIRS = C ro hu
-+SUBDIRS = C ro hu de es fr it sv ja ko zh_CN zh_TW
+-SUBDIRS = C
++SUBDIRS = C de es fr it sv ja ko zh_CN zh_TW
  
 --- gnome2-user-guide/C/Makefile.am	2003-03-10 13:14:42.000000000 +0800
 +++ gnome2-user-guide/C/Makefile.am.new	2003-07-11 17:51:48.000000000 +0800
@@ -48,55 +48,3 @@
  
  dist-hook: app-dist-hook
  
---- gnome2-user-guide/hu/Makefile.am	2003-01-20 06:56:14.000000000 +0800
-+++ gnome2-user-guide/hu/Makefile.am.new	2003-07-11 17:56:59.000000000 +0800
-@@ -5,7 +5,7 @@
- omffile = user-guide-hu.omf
- entities = legal.xml front.xml gosbasic.xml goscustaccess.xml goscustdesk.xml goscustlookandfeel.xml gosdeskback.xml goseditmainmenu.xml gosmetacity.xml gosnautilus.xml gosoverview.xml gospanel.xml gosstartsession.xml part1.xml part2.xml wgoscustdesk.xml wgoscustlookandfeel.xml wgosnautilus.xml wgospanel.xml glossary.xml wgosbasic.xml wgosmetacity.xml wgosoverview.xml wgoseditmainmenu.xml wgoscustaccess.xml wgosdeskback.xml wgosstartsession.xml
- include $(top_srcdir)/xmldocs.make
--omf_dest_dir=$(datadir)/omf/$(docname)
-+omf_dest_dir1=$(datadir)/omf/$(docname)
- #
- # This is copy-paste from ../../omf.make and changed to actually 
- # do something sensible in this instance
-@@ -22,11 +22,11 @@
- # Oh, and this one aswell - they need to get installed. omf.make is so primitive 8-(
- #
- install-data-hook-omf:
--	$(mkinstalldirs) $(DESTDIR)$(omf_dest_dir)
-+	$(mkinstalldirs) $(DESTDIR)$(omf_dest_dir1)
- 	for file in $(extraomf); do \
--		$(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \
-+		$(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir1)/$$file; \
- 	done
--	-scrollkeeper-update -p $(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir)
-+	-scrollkeeper-update -p $(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir1)
- 
- dist-hook: app-dist-hook
- 
---- gnome2-user-guide/ro/Makefile.am	2003-03-10 13:15:05.000000000 +0800
-+++ gnome2-user-guide/ro/Makefile.am.new	2003-07-11 17:57:21.000000000 +0800
-@@ -5,7 +5,7 @@
- omffile = user-guide-ro.omf
- entities = legal.xml front.xml glossary.xml gosbasic.xml goscustaccess.xml goscustdesk.xml goscustlookandfeel.xml gosdeskback.xml goseditmainmenu.xml gosmetacity.xml gosnautilus.xml gosoverview.xml gospanel.xml gosstartsession.xml part1.xml part2.xml wgosbasic.xml wgoscustaccess.xml wgoscustdesk.xml wgoscustlookandfeel.xml wgosdeskback.xml wgoseditmainmenu.xml wgosmetacity.xml wgosnautilus.xml wgosoverview.xml wgospanel.xml wgosstartsession.xml
- include $(top_srcdir)/xmldocs.make
--omf_dest_dir=$(datadir)/omf/$(docname)
-+omf_dest_dir1=$(datadir)/omf/$(docname)
- #
- # This is copy-paste from ../../omf.make and changed to actually 
- # do something sensible in this instance
-@@ -22,11 +22,11 @@
- # Oh, and this one aswell - they need to get installed. omf.make is so primitive 8-(
- #
- install-data-hook-omf:
--	$(mkinstalldirs) $(DESTDIR)$(omf_dest_dir)
-+	$(mkinstalldirs) $(DESTDIR)$(omf_dest_dir1)
- 	for file in $(extraomf); do \
--		$(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \
-+		$(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir1)/$$file; \
- 	done
--	-scrollkeeper-update -p $(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir)
-+	-scrollkeeper-update -p $(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir1)
- 
- dist-hook: app-dist-hook
-