Fix SPEC file and improve Makefile

unoconv · Jul 26, 2010 · dadd9fc · dadd9fc
1 parent beaf90d
commit dadd9fc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -35,7 +35,11 @@ $(filter %,$(bins)):
 ### Remove odp because size > 300kB
 dist: clean
 	$(MAKE) -C docs dist
-	svn list -R | grep -v '.odp$$' | pax -d -w -x ustar -s ',^.,$(name)-$(version),' | bzip2 >../$(name)-$(version).tar.bz2
+#	svn list -R | grep -v '.odp$$' | pax -d -w -x ustar -s ',^.,$(name)-$(version),' | bzip2 >../$(name)-$(version).tar.bz2
+	svn st -v --xml | \
+        xmlstarlet sel -t -m "/status/target/entry" -s A:T:U '@path' -i "wc-status[@revision]" -v "@path" -n | \
+        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

diff --git a/unoconv.spec b/unoconv.spec
@@ -2,8 +2,6 @@
 # Authority: dag
 # Upstream: Dag Wieers <dag$wieers,com>
 
-%{?dist: %{expand: %%define %dist 1}}
-
 %{?el4:%define _with_openoffice.org2 1}
 
 Summary: Tool to convert between any document format supported by OpenOffice
@@ -54,11 +52,11 @@ and many more...
 %files
 %defattr(-, root, root, 0755)
 %doc AUTHORS ChangeLog COPYING README TODO WISHLIST docs/ tests/
-%doc %{_mandir}/unoconv.1*
+%doc %{_mandir}/man1/unoconv.1*
 %{_bindir}/unoconv
 
 %changelog
-* Mon Jun 14 2010 Dag Wieers <dag@wieers.com> - 0.4-1
+* Mon Jul 26 2010 Dag Wieers <dag@wieers.com> - 0.4-1
 - Updated to release 0.4.
 
 * Fri Aug 31 2007 Dag Wieers <dag@wieers.com> - 0.3-1