rpms/koffice/devel koffice-kotext-lines.patch, NONE, 1.1 koffice.spec, 1.26, 1.27
Andreas Bierfert (awjb)
fedora-extras-commits at redhat.com
Sat Feb 4 00:36:59 UTC 2006
Author: awjb
Update of /cvs/extras/rpms/koffice/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6777
Modified Files:
koffice.spec
Added Files:
koffice-kotext-lines.patch
Log Message:
- different configure options (should speed up build)
- sane way of .so{,.*} handling...
koffice-kotext-lines.patch:
--- NEW FILE koffice-kotext-lines.patch ---
--- trunk/koffice/lib/kotext/KoComplexText.cpp 2005/12/02 00:53:59 484817
+++ trunk/koffice/lib/kotext/KoComplexText.cpp 2006/02/01 11:16:49 504496
@@ -855,8 +855,8 @@
}
#endif
-#define BIDI_DEBUG 0 // 2
-#if (BIDI_DEBUG >= 1)
+//#define BIDI_DEBUG
+#ifdef BIDI_DEBUG
#include <iostream>
#endif
@@ -933,7 +933,7 @@
dirCurrent = text.at(current).direction();
-#if (BIDI_DEBUG >= 2)
+#ifdef BIDI_DEBUG
cout << "directions: dir=" << dir << " current=" << dirCurrent << " last=" << status.last << " eor=" << status.eor << " lastStrong=" << status.lastStrong << " embedding=" << context->dir << " level =" << (int)context->level << endl;
#endif
@@ -1311,7 +1311,7 @@
++current;
}
-#if (BIDI_DEBUG >= 1)
+#ifdef BIDI_DEBUG
cout << "reached end of line current=" << current << ", eor=" << eor << endl;
#endif
eor = current - 1; // remove dummy char
@@ -1341,7 +1341,7 @@
// reversing is only done up to the lowest odd level
if(!(levelLow%2)) levelLow++;
-#if (BIDI_DEBUG >= 1)
+#ifdef BIDI_DEBUG
cout << "reorderLine: lineLow = " << (uint)levelLow << ", lineHigh = " << (uint)levelHigh << endl;
cout << "logical order is:" << endl;
QPtrListIterator<KoTextRun> it2(*runs);
@@ -1379,7 +1379,7 @@
levelHigh--;
}
-#if (BIDI_DEBUG >= 1)
+#ifdef BIDI_DEBUG
cout << "visual order is:" << endl;
QPtrListIterator<KoTextRun> it3(*runs);
KoTextRun *r3;
@@ -1468,7 +1468,7 @@
else if( dir == QChar::DirAN )
level += 2;
}
-#if (BIDI_DEBUG >= 1)
+#ifdef BIDI_DEBUG
printf("new run: dir=%d from %d, to %d level = %d\n", dir, _start, _stop, level);
#endif
}
Index: koffice.spec
===================================================================
RCS file: /cvs/extras/rpms/koffice/devel/koffice.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- koffice.spec 3 Feb 2006 13:01:43 -0000 1.26
+++ koffice.spec 4 Feb 2006 00:36:58 -0000 1.27
@@ -11,7 +11,8 @@
# stuff for the build configuration
Patch0: koffice-admin-gcc4isok.patch
-
+# Fix --enable-final
+Patch1: koffice-kotext-lines.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# BuildRequires: world-devel ;)
@@ -209,6 +210,7 @@
%prep
%setup -q
%patch0 -p1
+%patch1 -p2
# this will make sure that patch0 is considered
make -f admin/Makefile.common
@@ -220,7 +222,8 @@
--enable-fast-install --with-pic --disable-static \
--with-qt-libraries=$QTDIR/lib --with-extra-libs=%{_libdir} \
--with-pgsqllibdir=%{_libdir} --with-pgsqlincdir=%{_includedir} \
---with-pqxxlibdir=%{_libdir} --with-pqxxincdir=%{_includedir}
+--with-pqxxlibdir=%{_libdir} --with-pqxxincdir=%{_includedir} \
+--enable-final --enable-kexi-reports
make
@@ -260,14 +263,6 @@
--delete-original \
$RPM_BUILD_ROOT%{_datadir}/applnk/Office/koshell.desktop
-# kformdesigner
-# desktop-file-install \
-# --vendor=fedora \
-# --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-# --add-category=X-Fedora \
-# --delete-original \
-# $RPM_BUILD_ROOT%{_datadir}/applications/kde/kformdesigner.desktop
-
#kword
desktop-file-install \
--vendor=fedora \
@@ -414,8 +409,7 @@
$RPM_BUILD_ROOT%{_datadir}/applnk/Office/writeup.desktop
-# maybe we should try without la again...
-find $RPM_BUILD_ROOT -type f -name '*.la' -exec rm -f {} \;
+rm $RPM_BUILD_ROOT/%{_libdir}/*.la
%clean
rm -rf $RPM_BUILD_ROOT
@@ -468,22 +462,22 @@
%{_bindir}/koshell
%{_bindir}/kthesaurus
%{_bindir}/koconverter
-%{_libdir}/libkdeinit_koshell.*
-%{_libdir}/libkdeinit_kthesaurus.*
-%{_libdir}/libkdchart.*
-%{_libdir}/libkochart.*
-%{_libdir}/libkofficecore.*
-%{_libdir}/libkofficeui.*
-%{_libdir}/libkotext.*
-%{_libdir}/libkowmf.*
-%{_libdir}/libkopainter.*
-%{_libdir}/libkstore.*
-%{_libdir}/libkwmailmerge_interface.*
-%{_libdir}/libkwmf.*
-%{_libdir}/libkdeinit_kformula.*
-%{_libdir}/libkformulalib.*
-%{_libdir}/libkopalette.*
-%{_libdir}/libkoproperty.*
+%{_libdir}/libkdeinit_koshell.so
+%{_libdir}/libkdeinit_kthesaurus.so
+%{_libdir}/libkdchart.so.*
+%{_libdir}/libkochart.so.*
+%{_libdir}/libkofficecore.so.*
+%{_libdir}/libkofficeui.so.*
+%{_libdir}/libkotext.so.*
+%{_libdir}/libkowmf.so.*
+%{_libdir}/libkopainter.so.*
+%{_libdir}/libkstore.so.*
+%{_libdir}/libkwmailmerge_interface.so.*
+%{_libdir}/libkwmf.so.*
+%{_libdir}/libkdeinit_kformula.so
+%{_libdir}/libkformulalib.so.*
+%{_libdir}/libkopalette.so.*
+%{_libdir}/libkoproperty.so.*
%{_libdir}/kde3/kfile_koffice.*
%{_libdir}/kde3/kfile_ooo.*
%{_libdir}/kde3/kfile_abiword.*
@@ -535,7 +529,7 @@
%{_bindir}/writeup
%{_libdir}/kde3/libwriteup_part.*
%{_libdir}/kde3/writeup.*
-%{_libdir}/libkdeinit_writeup.*
+%{_libdir}/libkdeinit_writeup.so
%{_datadir}/applications/fedora-writeup.desktop
%{_datadir}/apps/writeup
%{_datadir}/services/writeuppart.desktop
@@ -543,12 +537,13 @@
%files devel
%{_includedir}/*
%{_datadir}/doc/HTML/en/koffice-apidocs
+%{_libdir}/*.so
%files kword
%defattr(-,root,root,-)
%{_bindir}/kword
-%{_libdir}/libkdeinit_kword.*
-%{_libdir}/libkwordprivate.*
+%{_libdir}/libkdeinit_kword.so
+%{_libdir}/libkwordprivate.so.*
%{_libdir}/kde3/libkwordpart.*
%{_libdir}/kde3/kword.*
%{_datadir}/apps/kword
@@ -562,8 +557,8 @@
%files kspread
%defattr(-,root,root,-)
%{_bindir}/kspread
-%{_libdir}/libkdeinit_kspread.*
-%{_libdir}/libkspreadcommon.*
+%{_libdir}/libkdeinit_kspread.so
+%{_libdir}/libkspreadcommon.so.*
%{_libdir}/kde3/kspread.*
%{_libdir}/kde3/libkspreadpart.*
%{_libdir}/kde3/kwmailmerge_kspread.*
@@ -587,9 +582,9 @@
%defattr(-,root,root,-)
%{_bindir}/kpresenter
%{_bindir}/kprconverter.pl
-%{_libdir}/libkdeinit_kpresenter.*
-%{_libdir}/libkpresenterimageexport.*
-%{_libdir}/libkpresenterprivate.*
+%{_libdir}/libkdeinit_kpresenter.so
+%{_libdir}/libkpresenterimageexport.so.*
+%{_libdir}/libkpresenterprivate.so.*
%{_libdir}/kde3/libkpresenterpart.*
%{_libdir}/kde3/kformula.*
%{_libdir}/kde3/kpresenter.*
@@ -610,8 +605,8 @@
%files karbon
%defattr(-,root,root,-)
%{_bindir}/karbon
-%{_libdir}/libkdeinit_karbon.*
-%{_libdir}/libkarboncommon.*
+%{_libdir}/libkdeinit_karbon.so
+%{_libdir}/libkarboncommon.so.*
%{_libdir}/kde3/karbon_defaulttools.*
%{_libdir}/kde3/karbon_flattenpathplugin.*
%{_libdir}/kde3/karbon_imagetoolplugin.*
@@ -642,20 +637,20 @@
%files krita
%defattr(-,root,root,-)
%{_bindir}/krita
-%{_libdir}/libkdeinit_krita.*
-%{_libdir}/libkrita_cmyk_u16.*
-%{_libdir}/libkrita_gray_u16.*
-%{_libdir}/libkrita_lms_f32.*
-%{_libdir}/libkrita_rgb_f16half.*
-%{_libdir}/libkrita_rgb_f32.*
-%{_libdir}/libkrita_rgb_u16.*
-%{_libdir}/libkritacolor.*
-%{_libdir}/libkritagrayscale.*
-%{_libdir}/libkritaimage.*
-%{_libdir}/libkritargb.*
-%{_libdir}/libkritascripting.*
-%{_libdir}/libkritaui.*
-%{_libdir}/libkritacommon.*
+%{_libdir}/libkdeinit_krita.so
+%{_libdir}/libkrita_cmyk_u16.so.*
+%{_libdir}/libkrita_gray_u16.so.*
+%{_libdir}/libkrita_lms_f32.so.*
+%{_libdir}/libkrita_rgb_f16half.so.*
+%{_libdir}/libkrita_rgb_f32.so.*
+%{_libdir}/libkrita_rgb_u16.so.*
+%{_libdir}/libkritacolor.so.*
+%{_libdir}/libkritagrayscale.so.*
+%{_libdir}/libkritaimage.so.*
+%{_libdir}/libkritargb.so.*
+%{_libdir}/libkritascripting.so.*
+%{_libdir}/libkritaui.so.*
+%{_libdir}/libkritacommon.so.*
%{_libdir}/kde3/kritacimg.*
%{_libdir}/kde3/kritacolorrange.*
%{_libdir}/kde3/kritacolorsfilters.*
@@ -728,10 +723,10 @@
%defattr(-,root,root,-)
%{_bindir}/kugar
%{_bindir}/kudesigner
-%{_libdir}/libkdeinit_kugar.*
-%{_libdir}/libkdeinit_kudesigner.*
-%{_libdir}/libkugarlib.*
-%{_libdir}/libkudesignercore.*
+%{_libdir}/libkdeinit_kugar.so
+%{_libdir}/libkdeinit_kudesigner.so
+%{_libdir}/libkugarlib.so.*
+%{_libdir}/libkudesignercore.so
%{_libdir}/kde3/kudesigner.*
%{_libdir}/kde3/kugar.*
%{_libdir}/kde3/libkudesignerpart.*
@@ -747,21 +742,24 @@
%defattr(-,root,root,-)
%{_bindir}/kexi
%{_bindir}/ksqlite*
-%{_libdir}/libkdeinit_kexi.*
-%{_libdir}/libkexicore.*
-%{_libdir}/libkexidatatable.*
-%{_libdir}/libkexidbparser.*
-%{_libdir}/libkexidb.*
-%{_libdir}/libkexiextendedwidgets.*
-%{_libdir}/libkexiformutils.*
-%{_libdir}/libkexiguiutils.*
-%{_libdir}/libkeximain.*
-%{_libdir}/libkeximigrate.*
-%{_libdir}/libkexirelationsview.*
-%{_libdir}/libkexisql2.*
-%{_libdir}/libkexisql3.*
-%{_libdir}/libkformdesigner.*
-%{_libdir}/libkexiutils.*
+%{_libdir}/libkdeinit_kexi.so
+%{_libdir}/libkexicore.so.*
+%{_libdir}/libkexidatatable.so.*
+%{_libdir}/libkexidbparser.so.*
+%{_libdir}/libkexidb.so.*
+%{_libdir}/libkexiextendedwidgets.so.*
+%{_libdir}/libkexiformutils.so.*
+%{_libdir}/libkexiguiutils.so.*
+%{_libdir}/libkeximain.so.*
+%{_libdir}/libkeximigrate.so.*
+%{_libdir}/libkexirelationsview.so.*
+%{_libdir}/libkexisql2.so.*
+%{_libdir}/libkexisql3.so.*
+%{_libdir}/libkformdesigner.so.*
+%{_libdir}/libkexiutils.so.*
+%{_libdir}/libkexireportutils.so.*
+%{_libdir}/kde3/kexihandler_report.*
+%{_libdir}/kde3/kexireportwidgets.*
%{_libdir}/kde3/kformdesigner_containers.*
%{_libdir}/kde3/kformdesigner_kexidbwidgets.*
%{_libdir}/kde3/kformdesigner_stdwidgets.*
@@ -784,8 +782,8 @@
%{_libdir}/kde3/krosskritacore.*
%{_libdir}/kde3/krosspython.*
#%{_libdir}/kde3/krossruby.*
-%{_libdir}/libkrossapi.*
-%{_libdir}/libkrossmain.*
+%{_libdir}/libkrossapi.so.*
+%{_libdir}/libkrossmain.so.*
%{_datadir}/config/kexirc
%{_datadir}/config/magic/kexi.magic
%{_datadir}/mimelnk/application/*
@@ -803,9 +801,9 @@
%files kchart
%defattr(-,root,root,-)
%{_bindir}/kchart
-%{_libdir}/libkchartcommon.*
-%{_libdir}/libkdeinit_kchart.*
-%{_libdir}/libkchartimageexport.*
+%{_libdir}/libkchartcommon.so.*
+%{_libdir}/libkdeinit_kchart.so
+%{_libdir}/libkchartimageexport.so.*
%{_libdir}/kde3/kchart.*
%{_libdir}/kde3/libkchartpart.*
%{_libdir}/kde3/libkchartpngexport.*
@@ -833,8 +831,8 @@
%files kivio
%defattr(-,root,root,-)
%{_bindir}/kivio
-%{_libdir}/libkdeinit_kivio.*
-%{_libdir}/libkiviocommon.*
+%{_libdir}/libkdeinit_kivio.so
+%{_libdir}/libkiviocommon.so.*
%{_libdir}/kde3/kivio.*
%{_libdir}/kde3/libkiviopart.*
%{_libdir}/kde3/straight_connector.*
@@ -852,7 +850,7 @@
%files filters
%defattr(-,root,root,-)
-%{_libdir}/libkwordexportfilters.*
+%{_libdir}/libkwordexportfilters.so.*
%{_libdir}/kde3/libabiwordexport.*
%{_libdir}/kde3/libabiwordimport.*
%{_libdir}/kde3/libamiproexport.*
@@ -906,7 +904,7 @@
%files kplato
%defattr(-,root,root,-)
%{_bindir}/kplato
-%{_libdir}/libkdeinit_kplato.*
+%{_libdir}/libkdeinit_kplato.so
%{_libdir}/kde3/kplato.*
%{_libdir}/kde3/libkplatopart.*
%{_datadir}/apps/kplato
@@ -918,6 +916,8 @@
* Wed Feb 01 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
1.4.90-1
- version upgrade
+- better split libdir/*.so -> -devel, libdir/*.so.* -> packages
+ libdir/*.la -> trash; libdir/.* -> packages
* Thu Dec 08 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
1.4.2-3
More information about the scm-commits
mailing list