rpms/openjade/devel openjade-nola.patch, NONE, 1.1 openjade.spec, 1.43, 1.44
Ondrej Vasik
ovasik at fedoraproject.org
Fri Feb 13 12:42:32 UTC 2009
- Previous message (by thread): rpms/openoffice.org/devel openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch, 1.5, 1.6 openoffice.org-3.0.1.ooo97488.sw.ww8toc.patch, 1.2, 1.3 openoffice.org-3.1.0.oooXXXXX.gcc44.buildfixes.patch, 1.1, 1.2
- Next message (by thread): rpms/perl-MooseX-Role-Cmd/devel import.log, NONE, 1.1 perl-MooseX-Role-Cmd.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: ovasik
Update of /cvs/extras/rpms/openjade/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24139
Modified Files:
openjade.spec
Added Files:
openjade-nola.patch
Log Message:
do not require OpenSP libosp.la file for build(#485114)
openjade-nola.patch:
--- NEW FILE openjade-nola.patch ---
diff -urNp openjade-1.3.2-orig/jade/Makefile.sub openjade-1.3.2/jade/Makefile.sub
--- openjade-1.3.2-orig/jade/Makefile.sub 2002-11-15 23:46:50.000000000 +0100
+++ openjade-1.3.2/jade/Makefile.sub 2009-02-13 11:52:30.000000000 +0100
@@ -4,7 +4,7 @@ OBJS=jade.o SgmlFOTBuilder.o RtfFOTBuild
INCLUDE=-I$(srcdir)/../grove -I$(srcdir)/../spgrove -I$(srcdir)/../style
# XLIBS=../style/libostyle.a ../spgrove/libospgrove.a ../grove/libogrove.a \
# ../lib/libosp.a
-XLIBS=../style/libostyle.a ../spgrove/libospgrove.a ../grove/libogrove.a $(splibdir)/libosp.a
+XLIBS=../style/libostyle.a ../spgrove/libospgrove.a ../grove/libogrove.a $(splibdir)/libosp.so
GENSRCS=JadeMessages.h HtmlMessages.h RtfMessages.h TeXMessages.h \
HtmlFOTBuilder_inst.cxx RtfFOTBuilder_inst.cxx TeXFOTBuilder_inst.cxx \
TransformFOTBuilder_inst.cxx MifMessages.h MifFOTBuilder_inst.cxx
Index: openjade.spec
===================================================================
RCS file: /cvs/extras/rpms/openjade/devel/openjade.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- openjade.spec 11 Feb 2008 10:53:36 -0000 1.43
+++ openjade.spec 13 Feb 2009 12:42:02 -0000 1.44
@@ -1,12 +1,13 @@
Summary: A DSSSL implementation
Name: openjade
Version: 1.3.2
-Release: 31%{?dist}
+Release: 32%{?dist}
Prereq: sgml-common >= 0.5
Source: http://download.sourceforge.net/openjade/openjade-%{version}.tar.gz
Patch0: openjade-ppc64.patch
Patch1: openjade-1.3.1-nsl.patch
Patch2: openjade-deplibs.patch
+Patch3: openjade-nola.patch
License: BSD
Group: Applications/Text
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -30,6 +31,7 @@
%patch0 -p1
%patch1 -p1
%patch2 -p1 -b .deplibs
+%patch3 -p1 -b .nola
%build
@@ -51,7 +53,7 @@
ln -s openjade $RPM_BUILD_ROOT/%{_bindir}/jade
echo ".so man1/openjade.1" > $RPM_BUILD_ROOT/%{_mandir}/man1/jade.1
-# install jade/jade $RPM_BUILD_ROOT/%{prefix}/bin/jade
+# install jade/jade $RPM_BUILD_ROOT/%{prefix}/bin/jade
cp dsssl/catalog $RPM_BUILD_ROOT/%{_datadir}/sgml/%{name}-%{version}/
cp dsssl/{dsssl,style-sheet,fot}.dtd $RPM_BUILD_ROOT/%{_datadir}/sgml/%{name}-%{version}/
@@ -71,7 +73,7 @@
/sbin/ldconfig
/usr/bin/install-catalog --add /etc/sgml/%{name}-%{version}-%{release}.soc \
%{_datadir}/sgml/%{name}-%{version}/catalog >/dev/null 2>/dev/null || :
-
+
%preun
/usr/bin/install-catalog --remove /etc/sgml/%{name}-%{version}-%{release}.soc \
%{_datadir}/sgml/%{name}-%{version}/catalog >/dev/null 2>/dev/null || :
@@ -90,16 +92,19 @@
%{_datadir}/sgml/%{name}-%{version}
%changelog
+* Thu Sep 25 2008 Ondrej Vasik <ovasik at redhat.com> 1.3.2-32
+- do not require OpenSP libosp.la file for build(#485114)
+
* Mon Feb 11 2008 Ondrej Vasik <ovasik at redhat.com> 1.3.2-31
- gcc43 rebuild
* Mon Aug 27 2007 Ondrej Vasik <ovasik at redhat.com> 1.3.2-30
- changed license tag to BSD
-- rebuilt for F8
+- rebuilt for F8
* Mon Jul 23 2007 Ondrej Vasik <ovasik at redhat.com> 1.3.2-29
- improved dependent libs patch (bug #237500)
-- same done for libospgrove.so
+- same done for libospgrove.so
* Fri Feb 9 2007 Tim Waugh <twaugh at redhat.com> 1.3.2-28
- Don't ship .so or .la files (bug #203635).
- Previous message (by thread): rpms/openoffice.org/devel openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch, 1.5, 1.6 openoffice.org-3.0.1.ooo97488.sw.ww8toc.patch, 1.2, 1.3 openoffice.org-3.1.0.oooXXXXX.gcc44.buildfixes.patch, 1.1, 1.2
- Next message (by thread): rpms/perl-MooseX-Role-Cmd/devel import.log, NONE, 1.1 perl-MooseX-Role-Cmd.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list