Author: charles                      Date: Sun Sep 18 17:37:10 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- added -CAN-2005-0064.patch, -ui.patch (fixed build)
- BR: autoconf, automake; removed reduntant libstdc++-devel, perl-base

---- Files affected:
SPECS:
   koffice.spec (1.127 -> 1.128) 

---- Diffs:

================================================================
Index: SPECS/koffice.spec
diff -u SPECS/koffice.spec:1.127 SPECS/koffice.spec:1.128
--- SPECS/koffice.spec:1.127    Sat Sep 17 21:57:46 2005
+++ SPECS/koffice.spec  Sun Sep 18 19:37:04 2005
@@ -20,23 +20,24 @@
 Group:         X11/Applications
 Source0:       
ftp://ftp.kde.org/pub/kde/%{_state}/%{name}-%{version}/src/%{name}-%{version}.tar.bz2
 # Source0-md5: 91a7b68757addc5934c5a8209a4926d5
-#Patch100:     %{name}-branch.diff
+Patch0:                %{name}-CAN-2005-0064.patch
+Patch1:                %{name}-ui.patch
 URL:           http://www.koffice.org/
 BuildRequires: ImageMagick-c++-devel
 BuildRequires: arts-qt-devel >= %{artsver}
 BuildRequires: aspell-devel >= 2:0.50.2
+BuildRequires: autoconf
+BuildRequires: automake
 BuildRequires: gettext-devel
 BuildRequires: kdelibs-devel >= 9:3.2
 BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
 BuildRequires: libpqxx-devel
-BuildRequires: libstdc++-devel
 BuildRequires: libtiff-devel
 BuildRequires: libwpd-devel
 BuildRequires: libxml2-devel >= 0:2.4.8
 BuildRequires: libxslt-devel >= 1.0.7
 BuildRequires: mysql-devel
-BuildRequires: perl-base
 BuildRequires: pkgconfig
 BuildRequires: python-devel >= 2.2
 BuildRequires: rpmbuild(macros) >= 1.129
@@ -356,7 +357,8 @@
 
 %prep
 %setup -q
-#patch100 -p1
+%patch0 -p0
+%patch1 -p1
 
 %{__sed} -i 's/Categories=Qt;KDE;Office/Categories=Qt;KDE;Office;X-Misc;/' \
        tools/kthesaurus/KThesaurus.desktop
@@ -858,6 +860,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.128  2005/09/18 17:37:04  charles
+- added -CAN-2005-0064.patch, -ui.patch (fixed build)
+- BR: autoconf, automake; removed reduntant libstdc++-devel, perl-base
+
 Revision 1.127  2005/09/17 19:57:46  glen
 - epoch bump reverted, rel 2 instead
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/koffice.spec?r1=1.127&r2=1.128&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to