rpms/openoffice.org-ooolatex/devel openoffice.org-ooolatex.spec, 1.7, 1.8

Caolan McNamara caolanm at fedoraproject.org
Wed Jul 14 15:21:36 UTC 2010


Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org-ooolatex/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv24406

Modified Files:
	openoffice.org-ooolatex.spec 
Log Message:
rebuild for OOo 3.3


Index: openoffice.org-ooolatex.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org-ooolatex/devel/openoffice.org-ooolatex.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- openoffice.org-ooolatex.spec	25 Jul 2009 20:51:04 -0000	1.7
+++ openoffice.org-ooolatex.spec	14 Jul 2010 15:21:36 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           openoffice.org-ooolatex
 Version:        4.0.0
-Release:        0.7.beta2%{?dist}.1
+Release:        0.8.beta2%{?dist}.1
 Summary:        Support for embedded LaTeX in Impress/Writer documents
 
 Group:          Applications/Productivity
@@ -9,7 +9,6 @@ URL:            http://ooolatex.sourcefo
 Source0:        http://downloads.sourceforge.net/ooolatex/OOoLatex-%{version}-beta-2-linux.oxt
 Patch0:         ooolatex-fix-path.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:      noarch
 
 %if 0%{?fedora} >= 8 
 %define min_ooo 1:2.3.0-6.14
@@ -32,7 +31,7 @@ Requires: /usr/bin/latex, /usr/bin/dvips
 
 # The location of the installed extension. Apparently the directory name must
 # end with .uno.pkg or unopkg will fail.
-%define ooolatexext %{_datadir}/openoffice.org/extensions/ooolatex.oxt
+%define ooolatexext %{_libdir}/openoffice.org/extensions/ooolatex.oxt
 
 %description 
 This program allows the editing and display of LaTeX equations inside
@@ -66,24 +65,10 @@ rm -r $RPM_BUILD_ROOT%{ooolatexext}/READ
 
 %pre
 if [ $1 -gt 1 ]; then
-    # Upgrade => deregister old extension
+    # Upgrade => deregister old < 3.3 extension
     unopkg remove --shared net.sourceforge.ooolatex || :
 fi
 
-%post
-# register extension and agree to GPL license
-echo yes | unopkg add --shared --link %{ooolatexext} > /dev/null 2>&1 || :
-
-%preun
-if [ $1 -eq 0 ]; then
-    # not upgrading => deregister
-    unopkg remove --shared net.sourceforge.ooolatex || :
-fi
-
-%postun
-# clear disk cache
-unopkg list --shared > /dev/null 2>&1 || :
-
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -95,6 +80,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc README pkg-licence/gpl_GB.txt
 
 %changelog
+* Wed Jul 14 2010 Caolán McNamara <caolanm at redhat.com> - 4.0.0-0.8.beta2
+- rebuild for OOo 3.3, which unfortunately require arch-specific
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.0.0-0.7.beta2.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



More information about the scm-commits mailing list