rpms/koffice-kivio/devel import.log, NONE, 1.1 kivio-translations-20100511-standalone.patch, NONE, 1.1 koffice-kivio.spec, NONE, 1.1 koffice-trinity-20100511-kivio-desktop.patch, NONE, 1.1 koffice-trinity-20100511-only-kivio.patch, NONE, 1.1 koffice-trinity-20100511-rename-po.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Kevin Kofler kkofler at fedoraproject.org
Tue May 18 21:33:17 UTC 2010 

Author: kkofler

Update of /cvs/pkgs/rpms/koffice-kivio/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv6145/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log kivio-translations-20100511-standalone.patch 
	koffice-kivio.spec 
	koffice-trinity-20100511-kivio-desktop.patch 
	koffice-trinity-20100511-only-kivio.patch 
	koffice-trinity-20100511-rename-po.patch 
Log Message:
New package koffice-kivio - A flowcharting application



--- NEW FILE import.log ---
koffice-kivio-1_6_3-31_trinity_20100511svn_fc13:HEAD:koffice-kivio-1.6.3-31.trinity.20100511svn.fc13.src.rpm:1274218356

kivio-translations-20100511-standalone.patch:
 CMakeLists.txt |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE kivio-translations-20100511-standalone.patch ---
diff -ur kivio-translations-20100511/CMakeLists.txt kivio-translations-20100511-standalone/CMakeLists.txt
--- kivio-translations-20100511/CMakeLists.txt	2010-05-11 15:40:40.000000000 +0200
+++ kivio-translations-20100511-standalone/CMakeLists.txt	2010-05-11 15:45:02.000000000 +0200
@@ -1,3 +1,4 @@
+find_package(KDE4 REQUIRED)
 find_package(Msgfmt REQUIRED)
 find_package(Gettext REQUIRED)
 add_subdirectory( po )


--- NEW FILE koffice-kivio.spec ---

%define svn 20100511
%define translations kivio-translations-%{svn}

Name:           koffice-kivio
Epoch:          3
Version:        1.6.3
Release:        31.trinity.%{svn}svn%{?dist}
Summary:        A flowcharting application

Group:          Applications/Productivity
License:        GPLv2+
URL:            http://www.koffice.org/
# svn://anonsvn.kde.org/home/kde/branches/trinity/applications/koffice/
Source0:        koffice-trinity-%{svn}.tar.bz2
# collected from svn://anonsvn.kde.org/home/kde/branches/stable/l10n/
Source1:        %{translations}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

# disable some nested subdirectories which are not needed for Kivio
Patch0:         koffice-trinity-20100511-only-kivio.patch
# rename koffice.po and kofficefilters.po because they conflict with KOffice 2
Patch1:         koffice-trinity-20100511-rename-po.patch
# fix kivio.desktop to validate
Patch2:         koffice-trinity-20100511-kivio-desktop.patch

# build the translations standalone, using the KDE 4 CMake framework
Patch50:        kivio-translations-20100511-standalone.patch

BuildRequires:  kdelibs3-devel
# See http://bugzilla.redhat.com/244091
%global kdelibs3_ver %((kde-config --version 2>/dev/null || echo KDE 3.5.10) | grep '^KDE' | cut -d' ' -f2 | cut -d'-' -f1)
BuildRequires:  automake libtool
BuildRequires:  freetype-devel
BuildRequires:  fontconfig-devel
BuildRequires:  GraphicsMagick-devel
BuildRequires:  libart_lgpl-devel
BuildRequires:  libpng-devel
BuildRequires:  libtiff-devel
BuildRequires:  libjpeg-devel
BuildRequires:  bzip2-devel
BuildRequires:  zlib-devel
BuildRequires:  openssl-devel
BuildRequires:  gettext-devel
BuildRequires:  desktop-file-utils
BuildRequires:  perl

# for translations:
BuildRequires:  cmake kdelibs4-devel gettext kde-filesystem

# directory ownership
Requires:       hicolor-icon-theme

Provides:       kivio = %{version}-%{release}
Obsoletes:      kivio < %{version}-%{release}

Requires:       %{name}-libs = %{version}-%{release}

Conflicts:      koffice-core < 3:1.7

%description
%{summary}.

%package libs
Epoch:          0
Summary:        Runtime libraries for %{name}
Group:          System Environment/Libraries
Conflicts:      koffice-libs < 3:1.7
Requires:       kdelibs3 >= %{kdelibs3_ver}
License:        LGPLv2+
%description libs
%{summary}.


%prep
%setup -q -n koffice-trinity-%{svn} -a 1
%patch0 -p1 -b .only-kivio
%patch1 -p1 -b .rename-po
%patch2 -p1 -b .kivio-desktop

make -f admin/Makefile.common

pushd %{translations}
%patch50 -p1 -b .standalone
# rename koffice.po and kofficefilters.po because they conflict with KOffice 2
for i in po/* ; do
  if [ -f "$i/koffice.po" ] ; then
    mv -f "$i/koffice.po" "$i/koffice1.po"
  fi
  if [ -f "$i/kofficefilters.po" ] ; then
    mv -f "$i/kofficefilters.po" "$i/koffice1filters.po"
  fi
done
popd

# rename the KOffice README which conflicts with the Kivio one
mv README README.koffice


%build
unset QTDIR || : ; . /etc/profile.d/qt.sh

# build only the subdirectories needed for Kivio
echo "pics servicetypes lib kivio filters doc" >inst-apps

%configure \
  --disable-rpath --disable-dependency-tracking \
  --enable-new-ldflags \
  --disable-debug --disable-warnings \
  --with-pic --enable-shared --disable-static \
  --with-extra-libs=%{_libdir} \
  --disable-final

# workaround various libtool suckage
cp -f %{_bindir}/libtool libtool
sed -i 's|^build_old_libs=yes|build_old_libs=no|g' libtool
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool

make %{?_smp_mflags}

pushd %{translations}
%cmake_kde4 .
make %{?_smp_mflags}
popd


%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}

pushd %{translations}
make install/fast DESTDIR=%{buildroot}
popd

# Replace absolute symlinks with relative ones
pushd %{buildroot}%{_docdir}/HTML
for lang in *; do
  if [ -d $lang ]; then
    pushd $lang
    for i in */*; do
      [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../../common $i/common
    done
    popd
  fi
done
popd

desktop-file-validate %{buildroot}%{_datadir}/applications/kde/kivio.desktop

## unpackaged files
# libtool archives
rm -f %{buildroot}%{_libdir}/lib*.la
# devel headers
rm -rf %{buildroot}%{_includedir}
# devel symlinks
rm -f %{buildroot}%{_libdir}/libkiviocommon.so
rm -f %{buildroot}%{_libdir}/libko*.so
rm -f %{buildroot}%{_libdir}/libkstore.so
rm -f %{buildroot}%{_libdir}/libkwmf.so
# hyphenation dictionaries (Kivio doesn't support hyphenation)
rm -rf %{buildroot}%{_datadir}/apps/koffice/hyphdicts
# irrelevant general KOffice documentation files
rm -rf %{buildroot}%{_docdir}/HTML/en/koffice
rm -rf %{buildroot}%{_docdir}/HTML/en/koffice-apidocs

%find_lang kivio --with-kde
%find_lang koffice1
cat koffice1.lang >>kivio.lang
rm -f koffice1.lang
%find_lang koffice1filters
cat koffice1filters.lang >>kivio.lang
rm -f koffice1filters.lang

# dedupe translations, as find_lang queries both kde-config and kde4-config for
# the same documentation directory and takes files from both
sort -u kivio.lang >kivio-unique.lang
mv -f kivio-unique.lang kivio.lang


%clean
rm -rf %{buildroot}

%post
touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :

%postun
if [ $1 -eq 0 ]; then
  gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
  update-desktop-database -q &> /dev/null ||:
fi

%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
update-desktop-database -q &> /dev/null ||:

%post libs -p /sbin/ldconfig
%postun libs -p /sbin/ldconfig

%files -f kivio.lang
%defattr(-,root,root,-)
%doc kivio/AUTHORS kivio/LICENSE kivio/README README.koffice
%doc kivio/CHANGELOG kivio/CHANGES
%{_bindir}/kivio
%{_libdir}/libkdeinit_kivio.so
%{_libdir}/kde3/*
%{_datadir}/apps/kivio/
%{_datadir}/apps/koffice/
%{_datadir}/apps/kofficewidgets/
%{_datadir}/config.kcfg/kivio.kcfg
%{_datadir}/services/*.desktop
%{_datadir}/servicetypes/*.desktop
%{_datadir}/applications/kde/kivio.desktop
%{_datadir}/icons/hicolor/*/apps/kivio.png

%files libs
%defattr(-,root,root,-)
%doc COPYING.LIB
%{_libdir}/lib*.so.*


%changelog
* Sat May 15 2010 Kevin Kofler <Kevin at tigcc.ticalc.org>
- 3:1.6.3-31.trinity.20100511
- ship /usr/share/apps/koffice/koffice_shell.rc, Kivio needs it

* Thu May 13 2010 Kevin Kofler <Kevin at tigcc.ticalc.org>
- 3:1.6.3-30.trinity.20100511
- split out kivio from the koffice 1.6 packaging

koffice-trinity-20100511-kivio-desktop.patch:
 kivio.desktop |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE koffice-trinity-20100511-kivio-desktop.patch ---
diff -ur koffice-trinity-20100511/kivio/kiviopart/kivio.desktop koffice-trinity-20100511-kivio-desktop/kivio/kiviopart/kivio.desktop
--- koffice-trinity-20100511/kivio/kiviopart/kivio.desktop	2010-01-20 02:29:50.000000000 +0100
+++ koffice-trinity-20100511-kivio-desktop/kivio/kiviopart/kivio.desktop	2010-05-12 22:58:03.000000000 +0200
@@ -57,7 +57,7 @@
 GenericName[xh]=Umzobo wokulandelana kweenkqubo & Uhlelo lomzobo
 GenericName[zh_CN]=流程图和图表编辑
 GenericName[zh_TW]=流程圖與圖表編輯
-MimeType=application/x-kivio
+MimeType=application/x-kivio;
 Type=Application
 Icon=kivio
 X-KDE-NativeMimeType=application/x-kivio

koffice-trinity-20100511-only-kivio.patch:
 doc/Makefile.am     |    4 +---
 filters/Makefile.am |   42 +-----------------------------------------
 lib/Makefile.am     |   15 +--------------
 3 files changed, 3 insertions(+), 58 deletions(-)

--- NEW FILE koffice-trinity-20100511-only-kivio.patch ---
diff -ur koffice-trinity-20100511/doc/Makefile.am koffice-trinity-20100511-only-kivio/doc/Makefile.am
--- koffice-trinity-20100511/doc/Makefile.am	2010-01-20 02:29:50.000000000 +0100
+++ koffice-trinity-20100511-only-kivio/doc/Makefile.am	2010-05-11 17:26:38.000000000 +0200
@@ -2,6 +2,4 @@
 
 KDE_LANG = en
 KDE_DOCS = koffice
-SUBDIRS = $(AUTODIRS)
-
-xdg_apps_DATA = koffice.desktop
+SUBDIRS = kivio
diff -ur koffice-trinity-20100511/filters/Makefile.am koffice-trinity-20100511-only-kivio/filters/Makefile.am
--- koffice-trinity-20100511/filters/Makefile.am	2010-01-20 02:29:50.000000000 +0100
+++ koffice-trinity-20100511-only-kivio/filters/Makefile.am	2010-05-11 17:28:25.000000000 +0200
@@ -1,45 +1,5 @@
 
-if compile_filter_KARBON
-KARBONDIR = karbon
-endif
-
-if include_XSLTFILTERS
-XSLTFILTERDIR = xsltfilter
-endif
-
-if compile_filter_KWORD
-KWORDDIR = kword
-endif
-
-if compile_filter_KPRESENTER
-KPRESENTERDIR = kpresenter olefilters
-endif
-
-if compile_filter_KSPREAD
-KSPREADDIR = kspread
-endif
-
-if compile_filter_KCHART
-KCHARTDIR = kchart
-endif
-
-if compile_filter_KFORMULA
-KFORMULADIR = kformula
-endif
-
-if compile_filter_KUGAR
-KUGARDIR = kugar
-endif
-
-if compile_filter_KRITA
-KRITADIR = krita
-endif
-
-if compile_filter_KIVIO
-KIVIODIR = kivio
-endif
-
-SUBDIRS = generic_wrapper libdialogfilter liboofilter $(KSPREADDIR) $(KCHARTDIR) $(KWORDDIR) $(KPRESENTERDIR)  $(XSLTFILTERDIR) $(KFORMULADIR) $(KARBONDIR) $(KUGARDIR) $(KRITADIR) $(KIVIODIR)
+SUBDIRS = kivio
 
 messages:
 	$(EXTRACTRC) `find . -name \*.ui` > rc.cpp
diff -ur koffice-trinity-20100511/lib/Makefile.am koffice-trinity-20100511-only-kivio/lib/Makefile.am
--- koffice-trinity-20100511/lib/Makefile.am	2010-01-20 02:29:50.000000000 +0100
+++ koffice-trinity-20100511-only-kivio/lib/Makefile.am	2010-05-11 17:29:44.000000000 +0200
@@ -1,17 +1,4 @@
-if compile_lib_KOPAINTER
-KOPAINTERDIR = kopainter
-endif
-
-if compile_kross
-KROSSDIR = kross
-endif
-
-if compile_kexionly
-SUBDIRS = store kwmf kofficecore kofficeui koproperty $(KROSSDIR)
-else
-SUBDIRS = store kwmf kofficecore kofficeui kotext \
-          $(KOPAINTERDIR) kformula koproperty kopalette $(KROSSDIR)
-endif
+SUBDIRS = store kwmf kofficecore kofficeui kotext kopainter kopalette
 
 messages:
 #	$(MAKE) -C kformula -f Makefile.am symbolnames.cc

koffice-trinity-20100511-rename-po.patch:
 filters/kivio/imageexport/kivio_imageexport.cpp |    2 +-
 lib/kofficecore/KoDocument.cpp                  |    2 +-
 lib/kofficecore/KoGlobal.cpp                    |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE koffice-trinity-20100511-rename-po.patch ---
diff -ur koffice-trinity-20100511/filters/kivio/imageexport/kivio_imageexport.cpp koffice-trinity-20100511-rename-po/filters/kivio/imageexport/kivio_imageexport.cpp
--- koffice-trinity-20100511/filters/kivio/imageexport/kivio_imageexport.cpp	2010-01-20 02:29:50.000000000 +0100
+++ koffice-trinity-20100511-rename-po/filters/kivio/imageexport/kivio_imageexport.cpp	2010-05-11 17:44:32.000000000 +0200
@@ -52,7 +52,7 @@
 ImageExport::ImageExport(KoFilter *, const char *, const QStringList&)
   : KoFilter()
 {
-  KGlobal::locale()->insertCatalogue("kofficefilters");
+  KGlobal::locale()->insertCatalogue("koffice1filters");
 }
 
 KoFilter::ConversionStatus ImageExport::convert(const QCString& from, const QCString& to)
diff -ur koffice-trinity-20100511/lib/kofficecore/KoDocument.cpp koffice-trinity-20100511-rename-po/lib/kofficecore/KoDocument.cpp
--- koffice-trinity-20100511/lib/kofficecore/KoDocument.cpp	2010-01-20 02:29:50.000000000 +0100
+++ koffice-trinity-20100511-rename-po/lib/kofficecore/KoDocument.cpp	2010-05-11 17:43:44.000000000 +0200
@@ -168,7 +168,7 @@
     KoViewWrapperWidget( QWidget *parent, const char *name )
         : QWidget( parent, name )
     {
-        KGlobal::locale()->insertCatalogue("koffice");
+        KGlobal::locale()->insertCatalogue("koffice1");
         // Tell the iconloader about share/apps/koffice/icons
         KGlobal::iconLoader()->addAppDir("koffice");
         m_view = 0L;
diff -ur koffice-trinity-20100511/lib/kofficecore/KoGlobal.cpp koffice-trinity-20100511-rename-po/lib/kofficecore/KoGlobal.cpp
--- koffice-trinity-20100511/lib/kofficecore/KoGlobal.cpp	2010-01-20 02:29:50.000000000 +0100
+++ koffice-trinity-20100511-rename-po/lib/kofficecore/KoGlobal.cpp	2010-05-11 17:44:04.000000000 +0200
@@ -51,7 +51,7 @@
     setlocale( LC_NUMERIC, "C" );
 
     // Install the libkoffice* translations
-    KGlobal::locale()->insertCatalogue("koffice");
+    KGlobal::locale()->insertCatalogue("koffice1");
 
     KImageIO::registerFormats();
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/koffice-kivio/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	18 May 2010 20:48:20 -0000	1.1
+++ .cvsignore	18 May 2010 21:33:15 -0000	1.2
@@ -0,0 +1,2 @@
+kivio-translations-20100511.tar.bz2
+koffice-trinity-20100511.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/koffice-kivio/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	18 May 2010 20:48:20 -0000	1.1
+++ sources	18 May 2010 21:33:17 -0000	1.2
@@ -0,0 +1,2 @@
+96fe5dad99c95e56b8478d2922ab2157  kivio-translations-20100511.tar.bz2
+229db1d6699d0191c54f0129dbd8b1ba  koffice-trinity-20100511.tar.bz2

More information about the scm-commits mailing list