SPECS: openoffice.org.spec - fix install re-entrancy

[glen]

Author: glen                         Date: Sat Mar 17 22:39:13 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- fix install re-entrancy

---- Files affected:
SPECS:
   openoffice.org.spec (1.738 -> 1.739) 

---- Diffs:

================================================================
Index: SPECS/openoffice.org.spec
diff -u SPECS/openoffice.org.spec:1.738 SPECS/openoffice.org.spec:1.739
--- SPECS/openoffice.org.spec:1.738	Sat Mar 17 22:42:18 2007
+++ SPECS/openoffice.org.spec	Sat Mar 17 23:39:08 2007
@@ -72,13 +72,14 @@
 %define		upd			680
 %define		mws			OOE%{upd}
 %define		tag			%(echo %{mws} | tr '[A-Z]' '[a-z]')-%{milestone}
+%define		_tag		%(echo %{tag} | tr - _)
 %define		milestone	m6
 
 Summary:	OpenOffice.org - powerful office suite
 Summary(pl.UTF-8):	OpenOffice.org - potężny pakiet biurowy
 Name:		openoffice.org
 Version:	2.1.0
-Release:	0.%{tag}.%{_rel}
+Release:	0.%{_tag}.%{_rel}
 Epoch:		1
 License:	GPL/LGPL
 Group:		X11/Applications
@@ -192,7 +193,7 @@
 BuildRequires:	sed >= 4.0
 BuildRequires:	startup-notification-devel >= 0.5
 BuildRequires:	tcsh
-BuildRequires:	unixODBC-devel >= 2.2.12-2
+BuildRequires:	unixODBC-devel
 BuildRequires:	unzip
 %{?with_system_xalan:BuildRequires:	xalan-j}
 %{?with_system_xerces:BuildRequires:	xerces-j}
@@ -2031,7 +2032,7 @@
 bashowe uzupełnianie nazw dla Openoffice.org.
 
 %prep
-%setup -q -n %(basename %{SOURCE0} .tar.bz2)
+%setup -q -n %(set -x; basename %{SOURCE0} .tar.gz)
 install -d src
 cp %{SOURCE50} %{SOURCE51} src
 
@@ -2309,15 +2310,16 @@
 	touch $RPM_BUILD_ROOT%{_libdir}/%{name}/share/dict/ooo/dictionary.lst
 	%endif
 
-	# configs
-	install -d $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
-	mv $RPM_BUILD_ROOT{%{_libdir}/%{name}/program,%{_sysconfdir}/%{name}}/sofficerc
-
 	%if %{with mozilla}
 	install -d $RPM_BUILD_ROOT%{_browserpluginsdir}
 	ln -s %{_libdir}/%{name}/program/libnpsoplugin.so $RPM_BUILD_ROOT%{_browserpluginsdir}
 	%endif
 
+	# configs
+	install -d $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
+	mv $RPM_BUILD_ROOT{%{_libdir}/%{name}/program,%{_sysconfdir}/%{name}}/sofficerc
+	ln -s %{_sysconfdir}/%{name}/sofficerc $RPM_BUILD_ROOT%{_libdir}/%{name}/program
+
 	# is below comment true?
 	# OOo should not install the Vera fonts, they are Required: now
 	rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/share/fonts/truetype/*
@@ -2365,6 +2367,11 @@
 	rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/share/xslt
 	%endif
 
+	# put share to %{_datadir} so we're able to produce noarch packages
+	install -d $RPM_BUILD_ROOT%{_datadir}/%{name}
+	mv $RPM_BUILD_ROOT%{_libdir}/%{name}/share $RPM_BUILD_ROOT%{_datadir}/%{name}
+	ln -s ../../share/%{name}/share $RPM_BUILD_ROOT%{_libdir}/%{name}/share
+
 	touch installed.stamp
 fi
 
@@ -2440,10 +2447,6 @@
 	find_lang $lang
 done
 
-# put share to %{_datadir} so we're able to produce noarch packages
-install -d $RPM_BUILD_ROOT%{_datadir}/%{name}
-mv $RPM_BUILD_ROOT%{_libdir}/%{name}/share $RPM_BUILD_ROOT%{_datadir}/%{name}
-ln -s ../../share/%{name}/share $RPM_BUILD_ROOT%{_libdir}/%{name}/share
 %{__sed} -i -e 's,%{_libdir}/%{name}/share,%{_datadir}/%{name}/share,' *.lang
 
 %clean
@@ -3887,6 +3890,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.739  2007/03/17 22:39:08  glen
+- fix install re-entrancy
+
 Revision 1.738  2007/03/17 21:42:18  glen
 - nevermind now
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/openoffice.org.spec?r1=1.738&r2=1.739&f=u