rpms/evince/FC-4 .cvsignore, 1.15, 1.16 evince-0.4.0-old-doc-utils, 1.6, 1.7 evince.spec, 1.23, 1.24 sources, 1.15, 1.16

[fedora-cvs-commits redhat com]

Author: mpg

Update of /cvs/dist/rpms/evince/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv8910

Modified Files:
	.cvsignore evince-0.4.0-old-doc-utils evince.spec sources 
Log Message:
* Fri Aug 26 2005 Marco Pesenti Gritti <mpg redhat com> - 0.4.0-1.1
- Update to 0.4.0 and merge some fixes from devel
- Update poppler version req
- Adapt to old gnome-doc-utils




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/evince/FC-4/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	26 Aug 2005 17:08:37 -0000	1.15
+++ .cvsignore	31 Aug 2005 10:02:05 -0000	1.16
@@ -13,3 +13,4 @@
 evince-0.3.0.tar.bz2
 evince-0.3.1.tar.bz2
 evince-0.4.0.tar.bz2
+evince-0.4.0-old-help.tar.gz


Index: evince-0.4.0-old-doc-utils
===================================================================
RCS file: /cvs/dist/rpms/evince/FC-4/evince-0.4.0-old-doc-utils,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- evince-0.4.0-old-doc-utils	31 Aug 2005 09:44:07 -0000	1.6
+++ evince-0.4.0-old-doc-utils	31 Aug 2005 10:02:05 -0000	1.7
@@ -1,26 +1,3 @@
---- evince-0.4.0/help/Makefile.in.old-doc-utils	2005-08-30 07:29:30.000000000 -0400
-+++ evince-0.4.0/help/Makefile.in	2005-08-31 05:36:46.000000000 -0400
-@@ -311,10 +311,7 @@
- 
- 
- # FIXME
--_DOC_OMF_ALL = \
--	$(if $(findstring docbook,$(_DOC_REAL_FORMATS)),$(_DOC_OMF_DB))		\
--	$(if $(findstring html,$(_DOC_REAL_FORMATS)),$(_DOC_OMF_HTML))
--
-+_DOC_OMF_ALL =
- 
- 
- ################################################################################
-@@ -451,7 +448,7 @@
- DOC_INCLUDES = 
- DOC_FIGURES = figures/evince_start_window.png
- 
--DOC_LINGUAS = el es sr uk
-+DOC_LINGUAS =
- subdir = help
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 --- evince-0.4.0/configure.old-doc-utils	2005-08-29 13:47:52.000000000 -0400
 +++ evince-0.4.0/configure	2005-08-30 07:18:22.000000000 -0400
 @@ -21872,96 +21872,6 @@
@@ -120,28 +97,3 @@
  # Check whether --with-help-dir or --without-help-dir was given.
  if test "${with_help_dir+set}" = set; then
    withval="$with_help_dir"
---- /dev/null	2004-06-24 14:04:38.000000000 -0400
-+++ evince-0.4.0/help/evince-C.omf	2005-08-31 05:34:29.000000000 -0400
-@@ -0,0 +1,22 @@
-+<?xml version="1.0" encoding="utf-8"?>
-+<omf>
-+  <resource>
-+    <creator>(Sun GNOME Documentation Team)</creator>
-+    <creator>(Nickolay V.  Shmyrev)</creator>
-+    <title>Evince Document Viewer Manual V1.0</title>
-+    <date>2005-04-06</date>
-+    <version identifier="Evince Document Viewer Manual V1.0" date="2005-04-06"/>
-+    <subject category="GNOME|Applications|Graphics"/>
-+    <description>
-+      User manual for the Evince Document Viewer.
-+    </description>
-+    <type>
-+      user's guide
-+    </type>
-+    <format mime="" dtd="-//OASIS//DTD DocBook XML V4.1.2//EN"/>
-+    <identifier url="file:///home/marco/stable/share/gnome/help/evince/C/evince.xml"/>
-+    <language code="C"/>
-+    <relation seriesid="62118a88-a670-11d9-9d16-8c554140c753"/>
-+    <rights type="GNU FDL" license.version="1.1" holder="Nickolay V. Shmyrev"/>
-+  </resource>
-+</omf>


Index: evince.spec
===================================================================
RCS file: /cvs/dist/rpms/evince/FC-4/evince.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- evince.spec	29 Aug 2005 17:58:39 -0000	1.23
+++ evince.spec	31 Aug 2005 10:02:05 -0000	1.24
@@ -8,6 +8,7 @@
 License: GPL
 Group: Applications/Publishing
 Source0: %{name}-%{version}.tar.bz2
+Source1: evince-0.4.0-old-help.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: gtk2-devel >= %{gtk2_version}
 BuildRequires: poppler-devel >= %{poppler_version}
@@ -31,6 +32,9 @@
 %prep
 %setup -q
 
+%{__rm} -rf help
+%{__tar} -xzf %{SOURCE1}
+
 %patch0 -p1 -b .old-doc-utils
 
 %build


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/evince/FC-4/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	26 Aug 2005 17:08:37 -0000	1.15
+++ sources	31 Aug 2005 10:02:05 -0000	1.16
@@ -1 +1,2 @@
 cc41e30108bc54a345bd6ca2556ab857  evince-0.4.0.tar.bz2
+c37cbba828a367a080e96ee3241b624b  evince-0.4.0-old-help.tar.gz