[svn] r5428 - in trunk/tools/unoconv: . tests

packagers at lists.rpmforge.net packagers at lists.rpmforge.net
Sun May 20 15:38:57 CEST 2007


Author: dag
Date: 2007-05-20 15:38:56 +0200 (Sun, 20 May 2007)
New Revision: 5428

Added:
   trunk/tools/unoconv/tests/curriculum-vitae-example.odt
Removed:
   trunk/tools/unoconv/tests/curriculum-vitae-dag-wieers.odt
Modified:
   trunk/tools/unoconv/Makefile
   trunk/tools/unoconv/tests/Makefile
   trunk/tools/unoconv/unoconv.spec
Log:
Prepare 0.2 release.

Modified: trunk/tools/unoconv/Makefile
===================================================================
--- trunk/tools/unoconv/Makefile	2007-05-20 12:57:35 UTC (rev 5427)
+++ trunk/tools/unoconv/Makefile	2007-05-20 13:38:56 UTC (rev 5428)
@@ -19,8 +19,10 @@
 docs:
 	make -C docs
 
+### Remove odp because size > 300kB
 dist: clean
-	find . ! -path '*/.svn*' | pax -d -w -x ustar -s ',^.,$(name)-$(version),' | bzip2 >../$(name)-$(version).tar.bz2
+#	find . ! -path '*/.svn*' | pax -d -w -x ustar -s ',^.,$(name)-$(version),' | bzip2 >../$(name)-$(version).tar.bz2
+	find . ! -path '*/.svn*' -a ! -path '*.odp' | pax -d -w -x ustar -s ',^.,$(name)-$(version),' | bzip2 >../$(name)-$(version).tar.bz2
 
 rpm: dist
 	rpmbuild -tb --clean --rmsource --rmspec --define "_rpmfilename %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm" --define "_rpmdir ../" ../$(name)-$(version).tar.bz2

Modified: trunk/tools/unoconv/tests/Makefile
===================================================================
--- trunk/tools/unoconv/tests/Makefile	2007-05-20 12:57:35 UTC (rev 5427)
+++ trunk/tools/unoconv/tests/Makefile	2007-05-20 13:38:56 UTC (rev 5428)
@@ -1,4 +1,4 @@
-all: clean bib doc6 doc95 doc docbook gif html jpg ooxml pdb pdf psw rtf latex sdw3 sdw4 sdw sxw text txt xhtml
+all: clean bib doc6 doc95 doc docbook html ooxml pdb pdf psw rtf latex sdw3 sdw4 sdw sxw text txt xhtml
 
 #xml: curriculum-vitae-dag-wieers.txt
 #	asciidoc -b docbook -d article curriculum-vitae-dag-wieers.txt
@@ -8,7 +8,7 @@
 #	docbook2odf --params generate.meta=0 curriculum-vitae-dag-wieers.xml
 
 %:
-	-unoconv -f $@ curriculum-vitae-dag-wieers.odt
+	-unoconv -f $@ curriculum-vitae-example.odt
 #	-unoconv -f $@ dag.gif
 #	docbook2pdf -d curriculum-vitae.dsl#print curriculum-vitae-dag-wieers.xml
 

Deleted: trunk/tools/unoconv/tests/curriculum-vitae-dag-wieers.odt
===================================================================
(Binary files differ)

Copied: trunk/tools/unoconv/tests/curriculum-vitae-example.odt (from rev 5418, trunk/tools/unoconv/tests/curriculum-vitae-dag-wieers.odt)
===================================================================
(Binary files differ)

Modified: trunk/tools/unoconv/unoconv.spec
===================================================================
--- trunk/tools/unoconv/unoconv.spec	2007-05-20 12:57:35 UTC (rev 5427)
+++ trunk/tools/unoconv/unoconv.spec	2007-05-20 13:38:56 UTC (rev 5428)
@@ -4,7 +4,7 @@
 
 %{?dist: %{expand: %%define %dist 1}}
 
-%{el4:%define _with_openoffice.org2 1}
+%{?el4:%define _with_openoffice.org2 1}
 
 Summary: Tool to convert between any document format supported by OpenOffice
 Name: unoconv




More information about the commits mailing list