rpms/koffice-kivio/F-13 config.ini, NONE, 1.1 create_tarball_kivio.rb, 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 23:56:08 UTC 2010
Author: kkofler
Update of /cvs/pkgs/rpms/koffice-kivio/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv21799/F-13
Modified Files:
.cvsignore sources
Added Files:
config.ini create_tarball_kivio.rb
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:
Sync new package koffice-kivio (a flowcharting application) from devel.
--- NEW FILE config.ini ---
[kivio]
mainmodule = koffice
kde_release = no
version = translations-20100511
docs = yes
translations = yes
custompo = kivio,koffice,kofficefilters
--- NEW FILE create_tarball_kivio.rb ---
#!/usr/bin/ruby
#
# Ruby script for generating amaroK tarball releases from KDE SVN
#
# (c) 2005 Mark Kretschmann <markey at web.de>
# (c) 2006-2008 Tom Albers <tomalbers at kde.nl>
# (c) 2007 Angelo Naselli <anaselli at linux.it> (command line parameters)
# Some parts of this code taken from cvs2dist
# License: GNU General Public License V2
require 'optparse'
require 'ostruct'
require 'find'
# check command line parameters
options = OpenStruct.new
options.help = false
options.https = false
options.ask = true
opts = OptionParser.new do |opts|
opts.on("-u", "--user USERNAME", "svn account") do |u|
options.username = u
end
opts.on("-w", "--https", "Using https instead of svn+ssh") do |w|
options.https = w
end
opts.on("-n", "--noaccount", "Using svn://anonsvn.kde.org/ instead of svn+ssh") do |n|
options.anonsvn = n
end
opts.on("-a", "--application APPL", "Application name (all for all, kde_release for apps that have kde_release=yes)") do |a|
options.application = a
options.ask = false
end
opts.on("-v", "--version VER", "Overwrite package version set in config.ini") do |v|
options.ver = v
end
opts.on_tail("-h", "--help", "Show this usage statement") do |h|
options.help = true
end
end
begin
opts.parse!(ARGV)
rescue Exception => e
puts e, "", opts
puts
exit
end
if (options.username)
username = options.username + "@"
end
if (options.application)
apps = Array.new
apps << options.application
end
if (options.https)
if (username)
svnbase = "https://#{username}svn.kde.org/home/kde"
else
puts opts
puts
puts "Username is mandatory with https"
exit
end
else
svnbase = "svn+ssh://#{username}svn.kde.org/home/kde"
end
if (options.anonsvn)
if (options.https)
puts opts
puts
puts "https or anonsvn please, not both"
exit
end
svnbase = "svn://anonsvn.kde.org/home/kde"
end
if (options.help)
puts opts
exit
end
############# START #############
svnroot = "#{svnbase}/branches/stable"
kde_version = `svn ls svn://anonsvn.kde.org/home/kde/tags/KDE | sort | tail -n1 | cut -d "/" -f1`.chomp
#kde_version = '4.0.4'
#----------------------------------------------------------------
# initiate.
#----------------------------------------------------------------
f = File.new("config.ini")
app = Array.new
begin
while (line = f.readline)
aline = line.chomp
if aline[0,1] == "["
app << aline[1,(aline.length-2)]
end
end
rescue EOFError
f.close
end
puts "Last KDE version found: " + kde_version
if (options.ask)
puts "Which apps (multiple sep by space, posibilities: all kde_release " + app.join(" ") + ")?"
apps = gets.split(" ")
end
kde_release = false;
if apps[0] == "all"
apps = app
elsif apps[0] == "kde_release"
apps = app
kde_release = true;
end
puts "-> Considering " + apps.join(" & ")
if kde_release
puts " -> Only applications which have kde_release = yes in config "
end
puts
#----------------------------------------------------------------
# retrieve apps.
#----------------------------------------------------------------
apps.each do |app|
puts
puts "-> Processing " + app
found = false;
appdata = Hash.new
f = File.new("config.ini")
begin
while (line = f.readline)
aline = line.chomp
if aline == "[" + app + "]"
found = true;
elsif aline.length > 0 && found
data = aline.split("=");
temp = { data[0].strip => data[1].strip }
appdata = appdata.merge(temp)
else
found = false
end
end
rescue EOFError
f.close
end
if (kde_release && appdata["kde_release"] != "yes")
puts " -> Skipping because kde_release is not set in the config.ini"
next
end
if (options.ver)
temp = { "version" => options.ver }
appdata = appdata.merge(temp)
else
if !appdata["version"]
temp = { "version" => kde_version }
appdata = appdata.merge(temp)
else
if kde_release
temp = { "version" => appdata["version"] + "-kde" + kde_version }
appdata = appdata.merge(temp)
end
end
end
if !appdata["name"]
temp = { "name" => app }
appdata = appdata.merge(temp)
end
if appdata["folder"]
app = appdata["folder"]
end
if !appdata["folder"] || appdata["name"]
temp = { "folder" => appdata["name"] + "-" + appdata["version"] }
else
temp = { "folder" => appdata["folder"] + "-" + appdata["version"] }
end
appdata = appdata.merge(temp)
if appdata["addPo"] && appdata["addPo"].length > 0
temp = { "addPo" => (appdata["addPo"]+" "+app).split(" ") }
else
temp = { "addPo" => app }
end
appdata = appdata.merge(temp)
if appdata["addDocs"] && appdata["addDocs"].length > 0
temp = { "addDocs" => (appdata["addDocs"]+" "+app).split(" ") }
else
temp = { "addDocs" => app }
end
appdata = appdata.merge(temp)
if appdata["submodule"] && appdata["submodule"].length > 0
temp = { "submodulepath" => appdata["submodule"] + "/", "l10nmodule" => appdata["mainmodule"] + "-" + appdata["submodule"] }
else
temp = { "submodulepath" => "", "l10nmodule" => appdata["mainmodule"] }
end
appdata = appdata.merge(temp)
# Preparing
puts "-> Fetching " + appdata["mainmodule"] + "/" + appdata["submodulepath"] + app + " into " + appdata["folder"] + "..."
# Remove old folder, if exists
`rm -rf #{appdata["folder"]} 2> /dev/null`
`rm -rf #{appdata["folder"]}.tar.bz2 2> /dev/null`
Dir.mkdir( appdata["folder"] )
Dir.chdir( appdata["folder"] )
# Do the main checkouts.
# if appdata["wholeModule"]
# `svn co #{svnroot}/#{appdata["mainmodule"]}/#{appdata["submodulepath"]} #{app}-tmp`
# else
# `svn co #{svnroot}/#{appdata["mainmodule"]}/#{appdata["submodulepath"]}#{app} #{app}-tmp`
# end
Dir.mkdir( app + "-tmp" )
Dir.chdir( app + "-tmp" )
# if appdata["docs"] != "no"
# `svn co #{svnroot}/#{appdata["mainmodule"]}/#{appdata["submodulepath"]}doc/#{app} doc`
# end
# Move them to the toplevel
`/bin/mv * ..`
Dir.chdir( ".." )
`find -name ".svn" | xargs rm -rf`
`rm -rf #{app}-tmp`
if appdata["translations"] != "no"
puts "-> Fetching l10n docs for #{appdata["submodulepath"]}#{app}..."
i18nlangs = `svn cat #{svnroot}/l10n/subdirs`.split
i18nlangsCleaned = []
for lang in i18nlangs
l = lang.chomp
if (l != "x-test")
i18nlangsCleaned += [l];
end
end
i18nlangs = i18nlangsCleaned
Dir.mkdir( "doc-translations" )
topmakefile = File.new( "doc-translations/CMakeLists.txt", File::CREAT | File::RDWR | File::TRUNC )
Dir.mkdir( "l10n" )
Dir.chdir( "l10n" )
# docs
for lang in i18nlangs
lang.chomp!
for dg in appdata["addDocs"].split
dg.chomp!
`rm -rf #{dg}`
docdirname = "l10n/#{lang}/docs/#{appdata["l10nmodule"]}/#{dg}"
if ( appdata["docs"] != "no" )
puts " -> Checking if #{lang} has translated documentation...\n"
`svn co -q #{svnroot}/#{docdirname} > /dev/null 2>&1`
end
next unless FileTest.exists?( dg + '/index.docbook' )
print " -> Copying #{lang}'s #{dg} documentation over... "
Dir.mkdir( "../doc-translations/#{lang}_#{dg}/" )
`cp -R #{dg}/ ../doc-translations/#{lang}_#{dg}/#{dg}`
topmakefile << "add_subdirectory( #{lang}_#{dg}/#{dg} )\n"
makefile = File.new( "../doc-translations/#{lang}_#{dg}/#{dg}/CMakeLists.txt", File::CREAT | File::RDWR | File::TRUNC )
makefile << "kde4_create_handbook( index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/#{lang}/)\n"
Dir.chdir( "../doc-translations/#{lang}_#{dg}/#{dg}")
`find -name ".svn" | xargs rm -rf`
Find.find( "." ) do |path|
if File.basename(path)[0] == ?.
# skip this one...
else
if FileTest.directory?(path)
makefile << "add_subdirectory( " + File.basename(path) + " )\n"
submakefile = File.new( File.basename(path) + "/CMakeLists.txt", File::CREAT | File::RDWR | File::TRUNC )
submakefile << "kde4_create_handbook( index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/#{lang}/#{dg}/)\n"
submakefile.close()
Find.prune
end
end
end
Dir.chdir( "../../../l10n")
makefile.close()
puts( "done.\n" )
end
end
topmakefile.close()
# app translations
puts "-> Fetching l10n po for #{appdata["submodulepath"]}#{app}...\n"
Dir.chdir( ".." ) # in submodule now
$subdirs = false
Dir.mkdir( "po" )
topmakefile = File.new( "po/CMakeLists.txt", File::CREAT | File::RDWR | File::TRUNC )
for lang in i18nlangs
lang.chomp!
dest = "po/#{lang}"
for dg in appdata["addPo"].split
dg.chomp!
if appdata["wholeModule"]
print " -> Copying #{lang}'s over ..\n"
pofolder = "l10n/#{lang}/messages/#{appdata["l10nmodule"]}"
`svn co #{svnroot}/#{pofolder} #{dest}`
if FileTest.exist?( dest )
topmakefile << "add_subdirectory( #{lang} )\n"
end
next if !FileTest.exist?( dest )
elsif appdata["custompo"]
valid = false
for sp in appdata["custompo"].split(/,/)
pofilename = "l10n/#{lang}/messages/#{appdata["l10nmodule"]}/#{sp}.po"
`svn cat #{svnroot}/#{pofilename} 2> /dev/null | tee l10n/#{sp}.po`
if not FileTest.size( "l10n/#{sp}.po" ) == 0
valid=true
if !FileTest.exist?( dest )
Dir.mkdir( dest )
topmakefile << "add_subdirectory( #{lang} )\n"
end
print "\n -> Copying #{lang}'s #{sp}.po over .. "
`mv l10n/#{sp}.po #{dest}`
end
end
next if not valid
else
pofilename = "l10n/#{lang}/messages/#{appdata["l10nmodule"]}/#{dg}.po"
`svn cat #{svnroot}/#{pofilename} 2> /dev/null | tee l10n/#{dg}.po`
next if FileTest.size( "l10n/#{dg}.po" ) == 0
if !FileTest.exist?( dest )
Dir.mkdir( dest )
topmakefile << "add_subdirectory( #{lang} )\n"
end
print " -> Copying #{lang}'s #{dg}.po over .. "
`mv l10n/#{dg}.po #{dest}`
puts( "done.\n" )
end
makefile = File.new( "#{dest}/CMakeLists.txt", File::CREAT | File::RDWR | File::TRUNC )
makefile << "file(GLOB _po_files *.po)\n"
makefile << "GETTEXT_PROCESS_PO_FILES( #{lang} ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} )\n"
makefile.close()
end
end
topmakefile.close()
`rm -rf l10n`
# add l10n to compilation.
`echo "find_package(Msgfmt REQUIRED)" >> CMakeLists.txt`
`echo "find_package(Gettext REQUIRED)" >> CMakeLists.txt`
`echo "add_subdirectory( po )" >> CMakeLists.txt`
`echo "add_subdirectory( doc-translations )" >> CMakeLists.txt`
if FileTest.exist?( "doc" )
`echo "add_subdirectory( doc )" >> CMakeLists.txt`
end
end
# Remove cruft
`find -name ".svn" | xargs rm -rf`
if ( appdata["remove"] != "")
`/bin/rm -rf #{appdata["remove"]}`
end
print "-> Compressing .. "
Dir.chdir( ".." ) # root folder
`tar -jcf #{appdata["folder"]}.tar.bz2 #{appdata["folder"]}`
#`rm -rf #{appdata["folder"]}`
puts " done."
end
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: 32.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/
# SVNDATE=20100511
# svn export \
# svn://anonsvn.kde.org/home/kde/branches/trinity/applications/koffice/ \
# koffice-trinity-${SVNDATE}
# tar cjf koffice-trinity-${SVNDATE}.tar.bz2 koffice-trinity-${SVNDATE}
Source0: koffice-trinity-%{svn}.tar.bz2
# collected from svn://anonsvn.kde.org/home/kde/branches/stable/l10n/
# ./create_tarball_kivio.rb -n -a kivio
Source1: %{translations}.tar.bz2
# script used to fetch translations (patched extragear-tarball script)
Source100: create_tarball_kivio.rb
# config file for the above script
Source101: config.ini
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
# koffice-langpack-2:2.1.91-1 included translated Kivio documentation, so force
# upgrading to 2:2.1.91-2 which fixes that to prevent file conflicts
Conflicts: koffice-langpack < 2:2.1.91-2
%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
* Tue May 18 2010 Kevin Kofler <Kevin at tigcc.ticalc.org>
- 3:1.6.3-32.trinity.20100511
- document tarball origin as requested in the review
- Conflicts: koffice-langpack < 2:2.1.91-2, documentation files conflict
* 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/F-13/.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 23:56:06 -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/F-13/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 23:56:07 -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