rpms/openoffice.org/devel openoffice.org.spec,1.1568,1.1569
Caolan McNamara (caolanm)
fedora-extras-commits at redhat.com
Wed Jul 9 16:06:45 UTC 2008
- Previous message (by thread): rpms/comix/devel .cvsignore, 1.6, 1.7 comix.spec, 1.13, 1.14 sources, 1.6, 1.7 comix-3.6.4-command-argument-closure.patch, 1.1, NONE comix-3.6.4-tmpfile.patch, 1.2, NONE
- Next message (by thread): [pkgdb] gnome-do had acl change status
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31122
Modified Files:
openoffice.org.spec
Log Message:
Resolves: rhbz#452385 add postgress-jdbc to default classpath
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1568
retrieving revision 1.1569
diff -u -r1.1568 -r1.1569
--- openoffice.org.spec 8 Jul 2008 15:23:48 -0000 1.1568
+++ openoffice.org.spec 9 Jul 2008 16:05:55 -0000 1.1569
@@ -1,6 +1,6 @@
%define oootag DEV300
%define ooomilestone 23
-%define rh_rpm_release 1
+%define rh_rpm_release 2
# undef to get english only and no-langpacks for a faster smoketest build
%define langpacks 1
@@ -196,6 +196,7 @@
Summary: Database GUI libraries for %{name}
Group: Applications/Productivity
Requires: %{name}-core = %{epoch}:%{version}-%{release}
+Requires: postgresql-jdbc
%description base-core
GUI database libraries for %{name}.
@@ -1492,7 +1493,7 @@
# unpack presenter screen extension
install -d -m 755 $RPM_BUILD_ROOT%{baseinstdir}/extensions/presenter-screen.oxt
unzip solver/%{OFFICEUPD}/unxlng*/bin/presenter-screen.oxt -d $RPM_BUILD_ROOT%{baseinstdir}/extensions/presenter-screen.oxt
-%define presenter-screen-id %(grep identifier $RPM_BUILD_ROOT%{baseinstdir}/extensions/presenter-screen.oxt/description.xml | cut -d\" -f 2)
+%define presenterscreenid %(grep identifier %{_builddir}/%{?buildsubdir}/sdext/unxlng*.pro/misc/PresenterScreen/description.xml | cut -d\\\" -f 2)
# revoke ScriptProviders and make into extensions
pushd $RPM_BUILD_ROOT/%{basisinstdir}/program
@@ -1959,6 +1960,9 @@
cp -r psprint_config/configuration/ppds/SGENPRT.PS $RPM_BUILD_ROOT/%{basisinstdir}/share/psprint/driver/SGENPRT.PS
%endif
+# rhbz#452385
+sed -i -e "s#URE_MORE_JAVA_CLASSPATH_URLS.*#& file:///usr/share/java/postgresql-jdbc.jar#" $RPM_BUILD_ROOT/%{basisinstdir}/program/fundamentalbasisrc
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -2993,7 +2997,7 @@
%pre presenter-screen
if [ $1 -gt 1 ]; then
# Upgrade => deregister old extension
- unopkg remove --shared %{presenter-screen-id} || :
+ unopkg remove --shared %{presenterscreenid} || :
fi
%post presenter-screen
@@ -3003,7 +3007,7 @@
%preun presenter-screen
if [ $1 -eq 0 ]; then
# not upgrading => deregister
- unopkg remove --shared %{presenter-screen-id} || :
+ unopkg remove --shared %{presenterscreenid} || :
fi
%postun presenter-screen
@@ -3580,6 +3584,9 @@
unopkg list --shared > /dev/null 2>&1 || :
%changelog
+* Wed Jul 09 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.23-2
+- Resolves: rhbz#452385 add postgress-jdbc to default classpath
+
* Mon Jul 07 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.23-1
- next version
- drop integrated openoffice.org-3.0.0.ooo90612.sd.insertpasswordedfile.patch
- Previous message (by thread): rpms/comix/devel .cvsignore, 1.6, 1.7 comix.spec, 1.13, 1.14 sources, 1.6, 1.7 comix-3.6.4-command-argument-closure.patch, 1.1, NONE comix-3.6.4-tmpfile.patch, 1.2, NONE
- Next message (by thread): [pkgdb] gnome-do had acl change status
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list