rpms/koffice/devel admin-visibility.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 koffice.spec, 1.1, 1.2 sources, 1.2, 1.3 subdirs-koffice, 1.1, 1.2 koffice-1.3-menu.patch, 1.1, NONE koffice-1.3.1-rpath.patch, 1.1, NONE koffice-1.3.5-immodule.patch, 1.1, NONE post-1.3.5-koffice.diff, 1.1, NONE
Than Ngo (than)
fedora-extras-commits at redhat.com
Wed Jul 20 16:25:39 UTC 2005
Author: than
Update of /cvs/extras/rpms/koffice/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14619
Modified Files:
.cvsignore koffice.spec sources subdirs-koffice
Added Files:
admin-visibility.patch
Removed Files:
koffice-1.3-menu.patch koffice-1.3.1-rpath.patch
koffice-1.3.5-immodule.patch post-1.3.5-koffice.diff
Log Message:
update to 1.4.1
admin-visibility.patch:
--- NEW FILE admin-visibility.patch ---
--- arts-1.4.1/admin/acinclude.m4.in.gcc4 2005-05-23 13:28:33.000000000 +0200
+++ arts-1.4.1/admin/acinclude.m4.in 2005-05-24 18:46:07.000000000 +0200
@@ -3052,8 +3052,6 @@
AC_PROG_CXX
- KDE_CHECK_FOR_BAD_COMPILER
-
if test "$GXX" = "yes" || test "$CXX" = "KCC"; then
if test "$kde_use_debug_code" != "no"; then
if test "$CXX" = "KCC"; then
@@ -3282,14 +3280,7 @@
KDE_CHECK_COMPILER_FLAG(fno-exceptions,[CXXFLAGS="$CXXFLAGS -fno-exceptions"])
KDE_CHECK_COMPILER_FLAG(fno-check-new, [CXXFLAGS="$CXXFLAGS -fno-check-new"])
KDE_CHECK_COMPILER_FLAG(fno-common, [CXXFLAGS="$CXXFLAGS -fno-common"])
- KDE_CHECK_COMPILER_FLAG(fvisibility=hidden,
- [
- CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
- KDE_CHECK_VISIBILITY_GCC_BUG
-
- HAVE_GCC_VISIBILITY=1
- AC_DEFINE_UNQUOTED(__KDE_HAVE_GCC_VISIBILITY, "$HAVE_GCC_VISIBILITY", [define to 1 if -fvisibility is supported])
- ])
+ AC_DEFINE_UNQUOTED(__KDE_HAVE_GCC_VISIBILITY, "$HAVE_GCC_VISIBILITY", [define to 1 if -fvisibility is supported])
fi
])
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/koffice/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 20 Jul 2005 09:21:50 -0000 1.2
+++ .cvsignore 20 Jul 2005 16:25:37 -0000 1.3
@@ -1,2 +1,29 @@
koffice-1.3.5.tar.bz2
koffice-i18n-1.3.5.tar.bz2
+koffice-l10n-bg-1.4.1.tar.bz2
+koffice-l10n-ca-1.4.1.tar.bz2
+koffice-l10n-cs-1.4.1.tar.bz2
+koffice-l10n-cy-1.4.1.tar.bz2
+koffice-l10n-da-1.4.1.tar.bz2
+koffice-l10n-de-1.4.1.tar.bz2
+koffice-l10n-el-1.4.1.tar.bz2
+koffice-l10n-en_GB-1.4.1.tar.bz2
+koffice-l10n-es-1.4.1.tar.bz2
+koffice-l10n-et-1.4.1.tar.bz2
+koffice-l10n-fi-1.4.1.tar.bz2
+koffice-l10n-fr-1.4.1.tar.bz2
+koffice-l10n-hu-1.4.1.tar.bz2
+koffice-l10n-it-1.4.1.tar.bz2
+koffice-l10n-nb-1.4.1.tar.bz2
+koffice-l10n-nl-1.4.1.tar.bz2
+koffice-l10n-nn-1.4.1.tar.bz2
+koffice-l10n-pl-1.4.1.tar.bz2
+koffice-l10n-pt-1.4.1.tar.bz2
+koffice-l10n-pt_BR-1.4.1.tar.bz2
+koffice-l10n-ru-1.4.1.tar.bz2
+koffice-l10n-sl-1.4.1.tar.bz2
+koffice-l10n-sr-1.4.1.tar.bz2
+koffice-l10n-sv-1.4.1.tar.bz2
+koffice-l10n-ta-1.4.1.tar.bz2
+koffice-l10n-tg-1.4.1.tar.bz2
+koffice-l10n-zh_CN-1.4.1.tar.bz2
Index: koffice.spec
===================================================================
RCS file: /cvs/extras/rpms/koffice/devel/koffice.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- koffice.spec 20 Jul 2005 09:21:50 -0000 1.1
+++ koffice.spec 20 Jul 2005 16:25:37 -0000 1.2
@@ -1,8 +1,8 @@
%define debug 0
%define final 0
-%define qt_version 3.3.3
-%define kde_version 3.3.0
+%define qt_version 3.3.4
+%define kde_version 3.4.1
%define redhatify 1
@@ -11,29 +11,50 @@
%define buildall 0
Name: koffice
-Version: 1.3.5
-Release: 3
+Version: 1.4.1
+Release: 1
Epoch: 4
URL: http://koffice.kde.org/
Summary: A set of office applications for KDE.
Group: User Interface/Desktops
License: GPL
-BuildRoot: %{_tmppath}/%{name}-buildroot
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
-Source1: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-i18n-%{version}.tar.bz2
-Source2: koshell.png
-Source3: subdirs-koffice
+Source1: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/koffice-l10n-bg-1.4.1.tar.bz2
+Source2: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/koffice-l10n-ca-1.4.1.tar.bz2
+Source3: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/koffice-l10n-cs-1.4.1.tar.bz2
+Source4: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/koffice-l10n-cy-1.4.1.tar.bz2
+Source5: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/koffice-l10n-da-1.4.1.tar.bz2
+Source6: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/koffice-l10n-de-1.4.1.tar.bz2
+Source7: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/koffice-l10n-el-1.4.1.tar.bz2
+Source8: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/koffice-l10n-en_GB-1.4.1.tar.bz2
+Source9: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/koffice-l10n-es-1.4.1.tar.bz2
+Source10: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/koffice-l10n-et-1.4.1.tar.bz2
+Source11: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/koffice-l10n-fi-1.4.1.tar.bz2
+Source12: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/koffice-l10n-fr-1.4.1.tar.bz2
+Source13: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/koffice-l10n-hu-1.4.1.tar.bz2
+Source14: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/koffice-l10n-it-1.4.1.tar.bz2
+Source15: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/koffice-l10n-nb-1.4.1.tar.bz2
+Source16: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/koffice-l10n-nl-1.4.1.tar.bz2
+Source17: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/koffice-l10n-nn-1.4.1.tar.bz2
+Source18: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/koffice-l10n-pl-1.4.1.tar.bz2
+Source19: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/koffice-l10n-pt-1.4.1.tar.bz2
+Source20: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/koffice-l10n-pt_BR-1.4.1.tar.bz2
+Source21: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/koffice-l10n-ru-1.4.1.tar.bz2
+Source22: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/koffice-l10n-sl-1.4.1.tar.bz2
+Source23: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/koffice-l10n-sr-1.4.1.tar.bz2
+Source24: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/koffice-l10n-sv-1.4.1.tar.bz2
+Source25: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/koffice-l10n-ta-1.4.1.tar.bz2
+Source26: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/koffice-l10n-tg-1.4.1.tar.bz2
+Source27: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/koffice-l10n-zh_CN-1.4.1.tar.bz2
+Source100: koshell.png
+Source101: subdirs-koffice
Patch0: kde-libtool.patch
Patch1: koffice-1.2.94-fPIC.patch
-Patch2: koffice-1.3-menu.patch
-Patch3: koffice-1.3.1-rpath.patch
-Patch4: koffice-1.3.5-immodule.patch
-
-# security fixes
-# kpdf Buffer Overflow Vulnerability, CAN-2005-0064
-Patch100: post-1.3.5-koffice.diff
+Patch2: admin-visibility.patch
+Patch100: koffice-l10n-es-1.4.1-broken.patch
Prereq: kdelibs >= 6:%{kde_version}
@@ -87,23 +108,29 @@
%setup -q
%patch0 -p1 -b .libtool
%patch1 -p1 -b .fPIC
-%patch2 -p1 -b .menu
-%patch3 -p1 -b .rpath
-%patch4 -p1 -b .im
-%patch100 -p1 -b .CAN-2005-0064
+%patch2 -p1 -b .gcc4
-# Workaround for legacy auto* tools
%if %{libtool}
make -f admin/Makefile.common cvs
%endif
%build
unset QTDIR || : ; . /etc/profile.d/qt.sh
-FLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -DNO_DEBUG -DNDEBUG"
+FLAGS="$RPM_OPT_FLAGS"
export KDEDIR=%{_prefix}
export CFLAGS="$FLAGS"
export CXXFLAGS="$FLAGS"
+# i18n
+for i in $(cat %{SOURCE101}) ; do
+ tar jxf $RPM_SOURCE_DIR/%{name}-l10n-$i-%{version}.tar.bz2
+ pushd %{name}-l10n-$i-%{version}
+ [ "$i" == "es" ] && patch -p1 < %{PATCH100}
+ %configure
+ make %{?_smp_mflags}
+ popd
+done
+
# koffice
%configure \
%if %{final}
@@ -116,25 +143,13 @@
make %{?_smp_mflags}
-# koffice-i18n
-tar jxf %{SOURCE1}
-pushd %{name}-i18n-%{version}
-%if ! %{buildall}
- rm -rf ar bg bs eo eu fa lt ms mt se sr sq ta th ven vi xh zu
- cp %{SOURCE3} subdirs
-%endif
-%if %{libtool}
- make -f admin/Makefile.common cvs
-%endif
-%configure
-make %{?_smp_mflags}
-popd
-
%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install
-make DESTDIR=$RPM_BUILD_ROOT -C %{name}-i18n-%{version} install
+for i in $(cat %{SOURCE101}) ; do
+ make -C %{name}-l10n-$i-%{version} datadir=%{_datadir} DESTDIR=$RPM_BUILD_ROOT install
+done
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/
@@ -173,9 +188,14 @@
%{_libdir}/*.so
%{_libdir}/*.la
%{_libdir}/kde3/*
+%{_datadir}/applications/kde/*
+%{_datadir}/applnk/Utilities/*
%{_datadir}/applnk/Office
%{_datadir}/apps/*
+%{_datadir}/config.kcfg/*
+%{_datadir}/config/*
%{_datadir}/icons/*/*/*/*
+%{_datadir}/mimelnk/application/*
%{_datadir}/services/*
%{_datadir}/servicetypes/*
%{_datadir}/templates
@@ -188,17 +208,10 @@
%files i18n
%defattr(-,root,root)
%{_datadir}/apps/koffice/autocorrect
-
-%lang(af) %{_datadir}/locale/af/LC_MESSAGES/*
-
-%if %{buildall}
-%lang(ar) %{_datadir}/locale/ar/LC_MESSAGES/*
-%lang(bs) %{_datadir}/locale/bs/LC_MESSAGES/*
%lang(bg) %{_datadir}/locale/bg/LC_MESSAGES/*
-%endif
-
%lang(ca) %{_datadir}/locale/ca/LC_MESSAGES/*
%lang(cs) %{_datadir}/locale/cs/LC_MESSAGES/*
+%lang(cy) %{_datadir}/locale/cy/LC_MESSAGES/*
%lang(da) %{_datadir}/locale/da/LC_MESSAGES/*
%lang(da) %doc %{_docdir}/HTML/da/*
%lang(de) %{_datadir}/locale/de/LC_MESSAGES/*
@@ -206,92 +219,42 @@
%lang(el) %{_datadir}/locale/el/LC_MESSAGES/*
%lang(en_GB) %{_datadir}/locale/en_GB/LC_MESSAGES/*
%lang(en_GB) %doc %{_docdir}/HTML/en_GB/*
-
-%if %{buildall}
-%lang(eo) %{_datadir}/locale/eo/LC_MESSAGES/*
-%endif
-
%lang(es) %{_datadir}/locale/es/LC_MESSAGES/*
%lang(es) %doc %{_docdir}/HTML/es/*
%lang(et) %{_datadir}/locale/et/LC_MESSAGES/*
%lang(et) %doc %{_docdir}/HTML/et/*
-
-%if %{buildall}
-%lang(fa) %{_datadir}/locale/fa/LC_MESSAGES/*
-%endif
-
+%lang(fi) %{_datadir}/locale/fi/LC_MESSAGES/*
%lang(fr) %{_datadir}/locale/fr/LC_MESSAGES/*
%lang(fr) %doc %{_docdir}/HTML/fr/*
-%lang(he) %{_datadir}/locale/he/LC_MESSAGES/*
%lang(hu) %{_datadir}/locale/hu/LC_MESSAGES/*
%lang(it) %{_datadir}/locale/it/LC_MESSAGES/*
%lang(it) %doc %{_docdir}/HTML/it/*
-%lang(ja) %{_datadir}/locale/ja/LC_MESSAGES/*
-
-%if %{buildall}
-%lang(lo) %{_datadir}/locale/lo/LC_MESSAGES/*
-%lang(lt) %{_datadir}/locale/lt/LC_MESSAGES/*
-%lang(lv) %{_datadir}/locale/lv/LC_MESSAGES/*
-%lang(ms) %{_datadir}/locale/ms/LC_MESSAGES/*
-%lang(mt) %{_datadir}/locale/mt/LC_MESSAGES/*
-%endif
-
%lang(nb) %{_datadir}/locale/nb/LC_MESSAGES/*
%lang(nl) %{_datadir}/locale/nl/LC_MESSAGES/*
+%lang(nl) %doc %{_docdir}/HTML/nl/*
%lang(nn) %{_datadir}/locale/nn/LC_MESSAGES/*
%lang(pl) %{_datadir}/locale/pl/LC_MESSAGES/*
-%lang(pl) %doc %{_docdir}/HTML/pl/*
%lang(pt) %{_datadir}/locale/pt/LC_MESSAGES/*
%lang(pt) %doc %{_docdir}/HTML/pt/*
%lang(pt_BR) %{_datadir}/locale/pt_BR/LC_MESSAGES/*
%lang(pt_BR) %doc %{_docdir}/HTML/pt_BR/*
%lang(ru) %{_datadir}/locale/ru/LC_MESSAGES/*
%lang(ru) %doc %{_docdir}/HTML/ru/*
-
-%if %{buildall}
-%lang(se) %{_datadir}/locale/se/LC_MESSAGES/*
-%endif
-
-%lang(sk) %{_datadir}/locale/sk/LC_MESSAGES/*
-%lang(sk) %doc %{_docdir}/HTML/sk/*
%lang(sl) %{_datadir}/locale/sl/LC_MESSAGES/*
%lang(sl) %doc %{_docdir}/HTML/sl/*
-
-%if %{buildall}
-%lang(sq) %{_datadir}/locale/sq/LC_MESSAGES/*
%lang(sr) %{_datadir}/locale/sr/LC_MESSAGES/*
-%endif
-
%lang(sv) %{_datadir}/locale/sv/LC_MESSAGES/*
%lang(sv) %doc %{_docdir}/HTML/sv/*
-
-%if %{buildall}
-%lang(th) %{_datadir}/locale/th/LC_MESSAGES/*
-%endif
-
-%lang(tr) %{_datadir}/locale/tr/LC_MESSAGES/*
-
-%if %{buildall}
-%lang(ven) %{_datadir}/locale/ven/LC_MESSAGES/*
-%endif
-
-%if %{buildall}
-%lang(vi) %{_datadir}/locale/vi/LC_MESSAGES/*
-%endif
-
-%if %{buildall}
-%lang(xh) %{_datadir}/locale/xh/LC_MESSAGES/*
-%lang(xh) %doc %{_docdir}/HTML/xh/*
-%endif
-
+%lang(ta) %{_datadir}/locale/ta/LC_MESSAGES/*
+%lang(tg) %{_datadir}/locale/tg/LC_MESSAGES/*
%lang(zh_CN) %{_datadir}/locale/zh_CN/LC_MESSAGES/*
-%lang(zh_TW) %{_datadir}/locale/zh_TW/LC_MESSAGES/*
-%if %{buildall}
-%lang(zu) %{_datadir}/locale/zu/LC_MESSAGES/*
-%endif
%changelog
+* Wed Jul 20 2005 Than Ngo <than at redhat.com> 5:1.4.1-1
+- update to 1.4.1
+- drop some patches, which are included in upstream
+
* Sat Feb 12 2005 Than Ngo <than at redhat.com> 4:1.3.5-3
- backport from CVS for working with qt-immodule
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/koffice/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 20 Jul 2005 09:21:50 -0000 1.2
+++ sources 20 Jul 2005 16:25:37 -0000 1.3
@@ -1,2 +1,27 @@
-dbc7e76c86647709a3e74f57c0fcf7f5 koffice-1.3.5.tar.bz2
-7a4af78be2a9e09a148717079f44a7a7 koffice-i18n-1.3.5.tar.bz2
+445f35bf43b60c7799df116bd90957ad koffice-l10n-bg-1.4.1.tar.bz2
+f011aa527e4b476f18f1fda9a043f81b koffice-l10n-ca-1.4.1.tar.bz2
+8b56e381765bece8a32fec3b67e881c2 koffice-l10n-cs-1.4.1.tar.bz2
+e15377d70faef67a91a361b421b8be84 koffice-l10n-cy-1.4.1.tar.bz2
+3bcda6ccf32a2b0916f5de47981be655 koffice-l10n-da-1.4.1.tar.bz2
+b54a04db280a5b00f0105407c24ce49c koffice-l10n-de-1.4.1.tar.bz2
+a744de5d6e97a25257a809f7a0f79a11 koffice-l10n-el-1.4.1.tar.bz2
+deaaf836cce7efcd9c83d800a6b4e51b koffice-l10n-en_GB-1.4.1.tar.bz2
+b779db42a85037de1c464c1027093ffb koffice-l10n-es-1.4.1.tar.bz2
+0ecd275357b76d245b2367a1925bda59 koffice-l10n-et-1.4.1.tar.bz2
+a2e26094907dc77365266c215183c587 koffice-l10n-fi-1.4.1.tar.bz2
+37a18640975a8a1ba38044a6ea7dbd37 koffice-l10n-fr-1.4.1.tar.bz2
+95e046ab8097fda8b4f146b4a625b7a3 koffice-l10n-hu-1.4.1.tar.bz2
+cac43b60ea3d01cfa0ac337bc0a296be koffice-l10n-it-1.4.1.tar.bz2
+0d9c12a3881861377130801a3a431dd2 koffice-l10n-nb-1.4.1.tar.bz2
+a960e30b5bd883ed71ada339f238bb38 koffice-l10n-nl-1.4.1.tar.bz2
+7e55ada0f26bc0125ae26ab7c7b1eae2 koffice-l10n-nn-1.4.1.tar.bz2
+c6c38ec4a42d2c2abd289b83e2398c21 koffice-l10n-pl-1.4.1.tar.bz2
+af2c79e0694d913a749a9591598641c5 koffice-l10n-pt-1.4.1.tar.bz2
+96f2a0ba7a249078e64ea319b8f27dc9 koffice-l10n-pt_BR-1.4.1.tar.bz2
+d198b6cc3574ea9305701a48324085bb koffice-l10n-ru-1.4.1.tar.bz2
+3c27784f5630ca6f3b0cfbae89271176 koffice-l10n-sl-1.4.1.tar.bz2
+f49d2141aa8bd2c68f0ab892cdc4e1a8 koffice-l10n-sr-1.4.1.tar.bz2
+58ffb4991e48caa73f434f30ca2b4761 koffice-l10n-sv-1.4.1.tar.bz2
+43e954db7f2af6f4c4f34a85a31e33d2 koffice-l10n-ta-1.4.1.tar.bz2
+2e35a578c8afb853ef5c23e71c2d575e koffice-l10n-tg-1.4.1.tar.bz2
+02491c50d888600dccd1685a9ef7ed6c koffice-l10n-zh_CN-1.4.1.tar.bz2
Index: subdirs-koffice
===================================================================
RCS file: /cvs/extras/rpms/koffice/devel/subdirs-koffice,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- subdirs-koffice 20 Jul 2005 09:21:50 -0000 1.1
+++ subdirs-koffice 20 Jul 2005 16:25:37 -0000 1.2
@@ -1,27 +1,27 @@
-af
+bg
ca
cs
+cy
da
de
el
en_GB
es
et
+fi
fr
-he
hu
it
-ja
-nl
nb
+nl
nn
pl
pt
pt_BR
ru
-sk
sl
+sr
sv
-tr
+ta
+tg
zh_CN
-zh_TW
--- koffice-1.3-menu.patch DELETED ---
--- koffice-1.3.1-rpath.patch DELETED ---
--- koffice-1.3.5-immodule.patch DELETED ---
--- post-1.3.5-koffice.diff DELETED ---
More information about the fedora-extras-commits
mailing list