rpms/openoffice.org/devel openoffice.org.spec,1.170,1.171

[fedora-cvs-commits at redhat.com]

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3865

Modified Files:
	openoffice.org.spec 
Log Message:
try this again


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -r1.170 -r1.171
--- openoffice.org.spec	28 Apr 2005 11:46:51 -0000	1.170
+++ openoffice.org.spec	28 Apr 2005 19:08:55 -0000	1.171
@@ -86,7 +86,7 @@
 Patch35: openoffice.org-1.9.97.ooo48362.checkzipresult.sc.patch
 Patch100: openoffice.org-1.9.97.rh156039.provides.patch
 
-%define __find_provides %{_tmppath}/find-provides.%{name}
+#%define __find_provides %{_tmppath}/find-provides.%{name}
 
 %define instdir %{_libdir}/openoffice.org%{version}
 
@@ -634,8 +634,8 @@
 Provides additional zulu translations for %{name}
 
 %prep
-cp -a /usr/lib/rpm/redhat/find-provides %{_tmppath}/find-provides.%{name}
-patch %{_tmppath}/find-provides.%{name} %{PATCH100}
+#cp -a /usr/lib/rpm/redhat/find-provides %{_tmppath}/find-provides.%{name}
+#patch %{_tmppath}/find-provides.%{name} %{PATCH100}
 
 %setup -q -n SRC680_m%{ooo2ver}
 %patch0  -p1 -b .skipuselessmodules.patch
@@ -791,6 +791,12 @@
 #if [ $origin == 1 ]; then false; fi
 #if [ $pic == 1 ]; then false; fi
 
+#rh#156039# disable autoprovides for some libs
+chmod -x $RPM_BUILD_ROOT/%{instdir}/program/libportaudio.so.0.0.18
+chmod -x $RPM_BUILD_ROOT/%{instdir}/program/libsndfile.so.1.0.9
+chmod -x $RPM_BUILD_ROOT/%{instdir}/program/libxmlsec1.so.1.2.6
+chmod -x $RPM_BUILD_ROOT/%{instdir}/program/libxmlsec1-nss.so.1.2.6
+
 #make up some /usr/bin scripts
 mkdir -p $RPM_BUILD_ROOT/%{_bindir}
 
@@ -840,7 +846,8 @@
 mv $RPM_BUILD_ROOT/%{instdir}/share/xdg/writer.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-1.9-writer.desktop
 rm -rf $RPM_BUILD_ROOT/%{instdir}/share/xdg
 cp -r sysui/unxlng*/misc/redhat/usr/share/application-registry $RPM_BUILD_ROOT/%{_datadir}
-cp -r sysui/unxlng*/misc/redhat/usr/share/icons $RPM_BUILD_ROOT/%{_datadir}
+mkdir $RPM_BUILD_ROOT/%{_datadir}/icons
+cp -r sysui/unxlng*/misc/redhat/usr/share/icons/HighContrast $RPM_BUILD_ROOT/%{_datadir}/icons
 tar -C $RPM_BUILD_ROOT/%{_datadir}/icons -xzf %{SOURCE1}
 cp -r sysui/unxlng*/misc/redhat/usr/share/mime-info $RPM_BUILD_ROOT/%{_datadir}
 cp -r sysui/unxlng*/misc/redhat/usr/share/mimelnk $RPM_BUILD_ROOT/%{_datadir}
@@ -2113,7 +2120,7 @@
 
 %post core
 update-desktop-database -q %{_datadir}/applications
-for theme in HighContrast gnome hicolor locolor; do
+for theme in HighContrast gnome; do
   touch --no-create %{_datadir}/icons/$theme
   if [ -x /usr/bin/gtk-update-icon-cache ]; then
     gtk-update-icon-cache -q %{_datadir}/icons/$theme
@@ -2122,7 +2129,7 @@
 
 %postun core
 update-desktop-database -q %{_datadir}/applications
-for theme in HighContrast gnome hicolor locolor; do
+for theme in HighContrast gnome; do
   touch --no-create %{_datadir}/icons/$theme
   if [ -x /usr/bin/gtk-update-icon-cache ]; then
     gtk-update-icon-cache -q %{_datadir}/icons/$theme
@@ -2415,6 +2422,9 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Thu Apr 27 2005 Caolan McNamara <caolanm at redhat.com> - 1:1.9.97-2
+- respin and try out an alternative hack
+
 * Wed Apr 27 2005 Caolan McNamara <caolanm at redhat.com> - 1:1.9.97-1
 - bump to next version
 - rh#156039# problems with the autoprovides apparently