rpms/openoffice.org/devel openoffice.org.spec, 1.605, 1.606 sources, 1.148, 1.149
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Fri Jan 13 16:21:42 UTC 2006
Author: caolanm
Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30570
Modified Files:
openoffice.org.spec sources
Log Message:
try this
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.605
retrieving revision 1.606
diff -u -r1.605 -r1.606
--- openoffice.org.spec 12 Jan 2006 13:52:56 -0000 1.605
+++ openoffice.org.spec 13 Jan 2006 16:21:40 -0000 1.606
@@ -1,6 +1,6 @@
%define oootag OOA680
%define ooomilestone 1
-%define rh_rpm_release 5
+%define rh_rpm_release 5.cmctest
%define build_fc5 1
%define build_fc4 0
@@ -127,15 +127,14 @@
URL: http://www.openoffice.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-root
Source: %{ooo_base_name}.tar.bz2
-Source1: openoffice.org-jakubicons.tar.gz
-Source2: openoffice.org-myspell-contrib.tar.gz
-Source3: GSI_ta-IN.sdf
-Source4: openoffice.org-simple-crash_report.sh
-Source5: RegisterAndLicence.xcu
-Source6: opens___.ttf
-Source7: GSI_ga.sdf
-Source8: gcj-sed.sh
-Source9: evolocal.odb
+Source1: openoffice.org-myspell-contrib.tar.gz
+Source2: GSI_ta-IN.sdf
+Source3: openoffice.org-simple-crash_report.sh
+Source4: RegisterAndLicence.xcu
+Source5: opens___.ttf
+Source6: GSI_ga.sdf
+Source7: gcj-sed.sh
+Source8: evolocal.odb
BuildRequires: tcsh, perl, sed, zip, bzip2, unzip, tar, findutils
BuildRequires: autoconf, make >= 3.79.1, ant, flex, bison, perl-Compress-Zlib
BuildRequires: gcc >= 3.4.3, gcc-c++ >= 3.4.3, binutils, perl-Archive-Zip
@@ -879,7 +878,9 @@
%if %{build_fc4}
%patch47 -p1 -b .gcc25199.bitfieldaccess.patch
%endif
+%if %{build_fc5}
%patch48 -p1 -b .ooo59537.config_office.nss.patch
+%endif
%patch49 -p1 -b .ooo59666.vcl.animatedtheme.patch
%patch50 -p1 -b .ooo59675.sysui.rtfmimetype.patch
%patch51 -p1 -b .ooo59997.sw.defaultbullets.patch
@@ -905,9 +906,9 @@
#end ludicrous workaround
%endif
-tar xzf %{SOURCE2}
+tar xzf %{SOURCE1}
-cp %{SOURCE9} extras/source/database/evolocal.odb
+cp %{SOURCE8} extras/source/database/evolocal.odb
%build
echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -974,7 +975,7 @@
# gcc#19870# gcj access problems, monsterous hack to force all java through
# a sed script which replaces private and protected with public, shudder!
-cp %{SOURCE8} solenv/bin/gcj
+cp %{SOURCE7} solenv/bin/gcj
chmod u+x solenv/bin/gcj
export TRUEJAVACOMPILER=$JAVACOMPILER
export JAVACOMPILER=`pwd`/solenv/bin/gcj
@@ -994,8 +995,8 @@
cd transex3/prj
build --dlv_switch link --all -P$MAXBUILDS
deliver
-localize -m -x -l ta-IN -f %{SOURCE3}
-localize -m -x -l ga -f %{SOURCE7}
+localize -m -x -l ta-IN -f %{SOURCE2}
+localize -m -x -l ga -f %{SOURCE6}
cd ../..
cd instsetoo_native/util
@@ -1053,7 +1054,7 @@
%install
#add our custom configuration options
-$RPM_BUILD_ROOT/%{instdir}/program/configimport -e file://$RPM_BUILD_ROOT/%{instdir}/share/registry %{SOURCE5}
+$RPM_BUILD_ROOT/%{instdir}/program/configimport -e file://$RPM_BUILD_ROOT/%{instdir}/share/registry %{SOURCE4}
# rh#163147# convert non AMT to AMT fonts
sed -i -e "s/Thorndale/Thorndale AMT/g" $RPM_BUILD_ROOT/%{instdir}/share/registry/data/org/openoffice/VCL.xcu
@@ -1136,11 +1137,11 @@
if [ $executable == 1 ]; then false; fi
#add in a simple crash reporter replacement
-cp -f %{SOURCE4} $RPM_BUILD_ROOT/%{instdir}/program/crash_report
+cp -f %{SOURCE3} $RPM_BUILD_ROOT/%{instdir}/program/crash_report
chmod a+x $RPM_BUILD_ROOT/%{instdir}/program/crash_report
#use ooo-build opens___.ttf with greater coverage
-cp -f %{SOURCE6} $RPM_BUILD_ROOT/%{instdir}/share/fonts/truetype/opens___.ttf
+cp -f %{SOURCE5} $RPM_BUILD_ROOT/%{instdir}/share/fonts/truetype/opens___.ttf
#make up some /usr/bin scripts
mkdir -p $RPM_BUILD_ROOT/%{_bindir}
@@ -1205,8 +1206,7 @@
mv $RPM_BUILD_ROOT/%{instdir}/share/xdg/draw.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-1.9-draw.desktop
%endif
rm -rf $RPM_BUILD_ROOT/%{instdir}/share/xdg
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}/icons
-tar -C $RPM_BUILD_ROOT/%{_datadir}/icons -xzf %{SOURCE1}
+cp -r sysui/unxlng*/misc/redhat/usr/share/icons $RPM_BUILD_ROOT/%{_datadir}
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}
rm -f $RPM_BUILD_ROOT/%{_datadir}/mimelnk/application.flag
@@ -2885,7 +2885,7 @@
%post core
update-desktop-database -q %{_datadir}/applications
-for theme in hicolor; do
+for theme in hicolor locolor gnome; do
if [ -x /usr/bin/gtk-update-icon-cache ]; then
if test -f "%{_datadir}/icons/$theme"; then
if test -f "%{_datadir}/icons/$theme/index.theme"; then
@@ -2898,7 +2898,7 @@
%postun core
update-desktop-database -q %{_datadir}/applications
-for theme in hicolor; do
+for theme in hicolor locolor gnome; do
if [ -x /usr/bin/gtk-update-icon-cache ]; then
if test -f "%{_datadir}/icons/$theme"; then
if test -f "%{_datadir}/icons/$theme/index.theme"; then
@@ -3342,6 +3342,9 @@
%{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
%changelog
+* Fri Jan 13 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.1.1-5.cmctest
+- icons
+
* Wed Jan 04 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.1.1-5
- spinbutton factory needs to be uneditable as well as combobox
- add openoffice.org-2.0.1-ooo19976.framework.nofocussteal.patch for jrb
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/sources,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -r1.148 -r1.149
--- sources 15 Dec 2005 14:00:49 -0000 1.148
+++ sources 13 Jan 2006 16:21:40 -0000 1.149
@@ -1,5 +1,4 @@
a66c6ab52b2eb2deaa7ff85595276b15 GSI_ta-IN.sdf
-176aa81d51a6ed28c5e9a14696a8d208 openoffice.org-jakubicons.tar.gz
a4a22f6b80a4f02c01bbe0400e131e57 RegisterAndLicence.xcu
66ee360bd11d33b0ba2283922d853706 opens___.ttf
2cd37ed5f2ac9fa129f6aaaa3491988f openoffice.org-myspell-contrib.tar.gz
More information about the fedora-cvs-commits
mailing list