rpms/openoffice.org/devel openoffice.org.spec, 1.172, 1.173 sources, 1.57, 1.58

[fedora-cvs-commits at redhat.com]

Author: caolanm

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

Modified Files:
	openoffice.org.spec sources 
Log Message:
X


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -r1.172 -r1.173
--- openoffice.org.spec	28 Apr 2005 19:09:08 -0000	1.172
+++ openoffice.org.spec	29 Apr 2005 08:34:42 -0000	1.173
@@ -16,7 +16,7 @@
 Summary:        OpenOffice.org comprehensive office suite.
 Name:           openoffice.org
 Version:        1.9.%{ooo2ver}
-Release: 	2
+Release: 	3
 Epoch:		1
 License:	LGPL/SISSL
 Group:		Applications/Productivity
@@ -791,12 +791,6 @@
 #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}
 
@@ -2120,7 +2114,7 @@
 
 %post core
 update-desktop-database -q %{_datadir}/applications
-for theme in HighContrast gnome; do
+for theme in HighContrast hicolor; do
   touch --no-create %{_datadir}/icons/$theme
   if [ -x /usr/bin/gtk-update-icon-cache ]; then
     gtk-update-icon-cache -q %{_datadir}/icons/$theme
@@ -2129,7 +2123,7 @@
 
 %postun core
 update-desktop-database -q %{_datadir}/applications
-for theme in HighContrast gnome; do
+for theme in HighContrast hicolor; do
   touch --no-create %{_datadir}/icons/$theme
   if [ -x /usr/bin/gtk-update-icon-cache ]; then
     gtk-update-icon-cache -q %{_datadir}/icons/$theme
@@ -2422,7 +2416,7 @@
 %{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
+* Fri Apr 29 2005 Caolan McNamara <caolanm at redhat.com> - 1:1.9.97-3
 - respin and try out an alternative hack
 
 * Wed Apr 27 2005 Caolan McNamara <caolanm at redhat.com> - 1:1.9.97-1


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/sources,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- sources	27 Apr 2005 11:23:55 -0000	1.57
+++ sources	29 Apr 2005 08:34:42 -0000	1.58
@@ -5,5 +5,5 @@
 a66c6ab52b2eb2deaa7ff85595276b15  GSI_ta-IN.sdf
 acf1fd0931af26b8bb68003a8e31d5c5  db-3.2.9.patch
 4df5c7051b11411e0a970f6c91613942  db-3.2.9.tar.gz
-1d5770cdd847e21f19330960f438dfce  openoffice.org-jakubicons.tar.gz
 023b8ebae3574bc06ab695afab3e88c8  SRC680_m97.tar.bz2
+9ef5d23146edb5e00bc9403b196c37f6  openoffice.org-jakubicons.tar.gz