diff options
29 files changed, 1344 insertions, 43 deletions
diff --git a/redhat/applications/amarok/amarok-3.5.13-enable_riokarma.patch b/redhat/applications/amarok/amarok-3.5.13-enable_riokarma.patch new file mode 100644 index 000000000..7bbd11fca --- /dev/null +++ b/redhat/applications/amarok/amarok-3.5.13-enable_riokarma.patch @@ -0,0 +1,19 @@ +--- amarok/amarok/src/mediadevice/riokarma/CMakeLists.txt.ORI 2011-11-28 21:59:41.607054279 +0100 ++++ amarok/amarok/src/mediadevice/riokarma/CMakeLists.txt 2011-11-28 21:59:50.413975791 +0100 +@@ -9,7 +9,7 @@ + # + ################################################# + +-tde_message_fatal( "riokarma support is not buildable, it needs to link to karma-sharp.dll" ) ++#tde_message_fatal( "riokarma support is not buildable, it needs to link to karma-sharp.dll" ) + + include( ConfigureChecks.cmake ) + +@@ -38,6 +38,6 @@ + + tde_add_kpart( libamarok_riokarma-mediadevice AUTOMOC + SOURCES riokarmamediadevice.cpp +- LINK amarok-shared ${KARMA_LIBRARIES} ++ LINK amarok-shared ${KARMA_LIBRARIES} karma + DESTINATION ${PLUGIN_INSTALL_DIR} + ) diff --git a/redhat/applications/amarok/trinity-amarok.spec b/redhat/applications/amarok/trinity-amarok.spec index a655c0794..35580490f 100644 --- a/redhat/applications/amarok/trinity-amarok.spec +++ b/redhat/applications/amarok/trinity-amarok.spec @@ -1,7 +1,7 @@ # Basic package informations %define kdecomp amarok %define version 1.4.10 -%define release 2 +%define release 3 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -16,9 +16,6 @@ BuildRequires: cmake >= 2.8 %define tde_libdir %{_libdir}/trinity -# TODO: -# Rio Karma support : libkarma - Name: trinity-%{kdecomp} Summary: A drop-down terminal emulator. Version: %{version} @@ -27,15 +24,18 @@ Release: %{release}%{?dist}%{?_variant} Group: Applications/Multimedia License: GPLv2+ Url: http://amarok.kde.org -Source0: amarok-3.5.13.tar.gz + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Source0: amarok-3.5.13.tar.gz + # RedHat / Fedora legacy patches Patch1: amarok-1.4.8-gcc43.patch # TDE 3.5.13 RHEL/Fedora patches Patch2: amarok-3.5.13-cmake_konqsidebar.patch Patch3: amarok-3.5.13-taglib_include.patch +Patch4: amarok-3.5.13-enable_riokarma.patch BuildRequires: alsa-lib-devel BuildRequires: desktop-file-utils @@ -66,6 +66,7 @@ BuildRequires: ruby-devel ruby BuildRequires: SDL-devel BuildRequires: taglib-devel BuildRequires: sqlite-devel +BuildRequires: libkarma-devel karma-sharp # not used anymore, in favor of libvisual ? -- Rex #%{?fedora:BuildRequires: xmms-devel} BuildRequires: dbus-devel @@ -128,6 +129,7 @@ use any of xmms' visualisation plugins with Amarok. %patch1 -p1 -b .gcc43 %patch2 -p0 %patch3 -p1 +%patch4 -p1 %build @@ -147,7 +149,7 @@ cd build -DWITH_IFP=ON \ -DWITH_NJB=ON \ -DWITH_MTP=ON \ - -DWITH_RIOKARMA=OFF \ + -DWITH_RIOKARMA=ON \ -DWITH_DAAP=ON \ -DBUILD_ALL=ON \ -DQT_LIBRARY_DIRS=${QTLIB} \ @@ -166,15 +168,23 @@ desktop-file-install --vendor "" \ $RPM_BUILD_ROOT%{_datadir}/applications/kde/amarok.desktop # unpackaged files -rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la +%__rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la # HTML -for lang_dir in $RPM_BUILD_ROOT%{_docdir}/HTML/* ; do +for lang_dir in $RPM_BUILD_ROOT%{tde_docdir}/HTML/* ; do if [ -d $lang_dir ]; then lang=$(basename $lang_dir) - [ "$lang" == "en" ] && d=en/%{name} || d=$lang - echo "%lang($lang) %doc %{_docdir}/HTML/$d" >> %{name}.lang + [ "$lang" == "en" ] && d=en/amarok || d=$lang + echo "%lang($lang) %doc %{tde_docdir}/HTML/$d" >> %{name}.lang + fi +done + +# Locales +for locale in $RPM_BUILD_ROOT%{_datadir}/locale/* ; do + if [ -r $locale/LC_MESSAGES/amarok.mo ]; then + lang=$(basename $locale) + echo "%lang($lang) %{_datadir}/locale/$lang/LC_MESSAGES/amarok.mo" >> %{name}.lang fi done @@ -194,7 +204,7 @@ xdg-desktop-menu forceupdate 2> /dev/null || : %__rm -fr $RPM_BUILD_ROOT -%files +%files -f %{name}.lang %defattr(-,root,root,-) %doc COPYING AUTHORS ChangeLog README %{_bindir}/amarok @@ -244,8 +254,8 @@ xdg-desktop-menu forceupdate 2> /dev/null || : %{_datadir}/services/amarok_mtp-mediadevice.desktop %{tde_libdir}/libamarok_mtp-mediadevice.* # Rio Karma -#%{_datadir}/services/amarok_riokarma-mediadevice.desktop -#%{tde_libdir}/libamarok_riokarma-mediadevice.* +%{_datadir}/services/amarok_riokarma-mediadevice.desktop +%{tde_libdir}/libamarok_riokarma-mediadevice.* # Void engine (noop) %{_datadir}/services/amarok_void-engine_plugin.desktop %{tde_libdir}/libamarok_void-engine_plugin.* @@ -260,9 +270,6 @@ xdg-desktop-menu forceupdate 2> /dev/null || : %{tde_libdir}/libamarok_yauap-engine_plugin.* -%{tde_docdir}/HTML/*/amarok -%{_datadir}/locale/*/LC_MESSAGES/amarok.mo - %files konqueror %defattr(-,root,root,-) %{_datadir}/apps/konqueror/servicemenus/*.desktop @@ -275,6 +282,10 @@ xdg-desktop-menu forceupdate 2> /dev/null || : %changelog +* Mon Nov 28 2011 Francois Andriot <francois.andriot@free.fr> - 1.4.10-3 +- Enable riokarma support +- Enhance localized files packaging + * Sat Nov 26 2011 Francois Andriot <francois.andriot@free.fr> - 1.4.10-2 - Enable RHEL 5 compilation - Add konqueror sidebar diff --git a/redhat/applications/bibletime/trinity-bibletime.spec b/redhat/applications/bibletime/trinity-bibletime.spec new file mode 100644 index 000000000..d18884140 --- /dev/null +++ b/redhat/applications/bibletime/trinity-bibletime.spec @@ -0,0 +1,121 @@ +# Default version for this component +%define kdecomp bibletime +%define version 1.6.6.0 +%define release 1 + +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?_prefix}" != "/usr" +%define _variant .opt +%define _docdir %{_prefix}/share/doc +%endif + +# TDE 3.5.13 specific building variables +BuildRequires: autoconf automake libtool m4 +%define tde_docdir %{_docdir}/kde +%define tde_includedir %{_includedir}/kde +%define tde_libdir %{_libdir}/trinity + + +Name: trinity-%{kdecomp} +Summary: A bible study tool for Trinity +Version: %{?version} +Release: %{?release}%{?dist}%{?_variant} + +License: GPLv2+ +Group: Applications/Utilities + +Vendor: Trinity Project +Packager: Francois Andriot <francois.andriot@free.fr> +URL: http://www.trinitydesktop.org + +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{kdecomp}-3.5.13.tar.gz + +BuildRequires: tqtinterface-devel +BuildRequires: trinity-kdelibs-devel +BuildRequires: trinity-kdebase-devel +BuildRequires: desktop-file-utils +BuildRequires: gettext + +BuildRequires: sword-devel +Requires: sword + +%description +BibleTime is a free and easy to use bible study tool for UNIX systems. +It requires a working KDE environment and the SWORD library. +BibleTime provides easy handling of digitized texts (Bibles, commentaries +and lexicons) and powerful features to work with these texts (search in +texts, write own notes, save, print etc.). + + +%prep +%setup -q -n applications/%{kdecomp} + +# Ugly hack to modify TQT include directory inside autoconf files. +# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! +%__sed -i admin/acinclude.m4.in \ + -e "s,/usr/include/tqt,%{_includedir}/tqt,g" \ + -e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',g" + +%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +%__make -f "admin/Makefile.common" + + +%build +export PATH="%{_bindir}:${PATH}" +export LDFLAGS="-L%{_libdir} -I%{_includedir}" + +%configure \ + --disable-rpath \ + --with-extra-includes=%{_includedir}/tqt + +# Not SMP safe ! +%__make -C bibletime/frontend + +# SMP safe ! +%__make %{?_smp_mflags} + + +%install +export PATH="%{_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} + +%__chmod 644 %{buildroot}%{_datadir}/apps/bibletime/pics/* +%__chmod 644 %{buildroot}%{_datadir}/apps/bibletime/bibletimeui.rc +%__chmod 644 %{buildroot}%{_datadir}/apps/bibletime/tips + + + + +%clean +%__rm -rf %{buildroot} + + +%post +touch --no-create %{_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +/sbin/ldconfig || : + +%postun +touch --no-create %{_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +/sbin/ldconfig || : + + +%files +%defattr(-,root,root,-) +%{_bindir}/bibletime +%{_includedir}/bibletimeinterface.h +%{_datadir}/applications/bibletime.desktop +%{_datadir}/apps/bibletime +%{tde_docdir}/HTML/en/bibletime/ +%{_datadir}/icons/hicolor/*/*/*.png + + +%Changelog +* Tue Nov 29 2011 Francois Andriot <francois.andriot@free.fr> - 1.6.6.0-1 +- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/kmymoney/kmymoney-3.5.13-default_money_crash.patch b/redhat/applications/kmymoney/kmymoney-3.5.13-default_money_crash.patch new file mode 100644 index 000000000..93cc35bf6 --- /dev/null +++ b/redhat/applications/kmymoney/kmymoney-3.5.13-default_money_crash.patch @@ -0,0 +1,12 @@ +--- ./kmymoney2/mymoney/mymoneyfile.cpp.ORI 2011-11-26 18:31:18.266423206 +0100 ++++ ./kmymoney2/mymoney/mymoneyfile.cpp 2011-11-26 18:31:26.417214675 +0100 +@@ -1940,7 +1940,8 @@ + + const MyMoneySecurity& curr = d->m_cache.security(id); + if(curr.id().isEmpty()) +- throw new MYMONEYEXCEPTION("Currency not found."); ++ return baseCurrency(); ++// throw new MYMONEYEXCEPTION("Currency not found."); + return curr; + } + diff --git a/redhat/applications/kmymoney/kmymoney-3.5.13-recode_ftbfs.patch b/redhat/applications/kmymoney/kmymoney-3.5.13-recode_ftbfs.patch new file mode 100644 index 000000000..522329f19 --- /dev/null +++ b/redhat/applications/kmymoney/kmymoney-3.5.13-recode_ftbfs.patch @@ -0,0 +1,22 @@ +--- kmymoney/doc/en/Makefile.am.ORI 2011-11-26 17:57:22.473298551 +0100 ++++ kmymoney/doc/en/Makefile.am 2011-11-26 17:58:18.611423284 +0100 +@@ -111,7 +111,7 @@ + kmymoney-user.pdf: $(DOCBOOK_FILES) $(SCREENSHOT_FILES) + $(MAKE) get-files + $(MEINPROC) --check --stylesheet `dirname $(KDE_XSL_STYLESHEET)`/kde-nochunk.xsl $(srcdir)/index.docbook -o index.html; +- recode utf8..latin1 index.html ++ recode utf8..latin1 index.html || : + html2ps -o kmymoney-user.ps -n index.html + ps2pdf kmymoney-user.ps kmymoney-user.pdf + rm index.html kmymoney-user.ps +--- kmymoney/developer-doc/phb/Makefile.am.ORI 2011-11-26 12:00:54.708855347 -0500 ++++ kmymoney/developer-doc/phb/Makefile.am 2011-11-26 12:01:01.683692300 -0500 +@@ -106,7 +106,7 @@ + kmymoney-phb.pdf: $(DOCBOOK_FILES) + $(MAKE) get-files + $(MEINPROC) --stylesheet `dirname $(KDE_XSL_STYLESHEET)`/kde-nochunk.xsl $(srcdir)/phb.docbook -o index.html +- recode utf8..latin1 index.html ++ recode utf8..latin1 index.html || : + html2ps -o kmymoney-phb.ps -n index.html + ps2pdf kmymoney-phb.ps kmymoney-phb.pdf + rm index.html kmymoney-phb.ps diff --git a/redhat/applications/kmymoney/kmymoneytitlelabel.png b/redhat/applications/kmymoney/kmymoneytitlelabel.png Binary files differnew file mode 100644 index 000000000..70d72ac98 --- /dev/null +++ b/redhat/applications/kmymoney/kmymoneytitlelabel.png diff --git a/redhat/applications/kmymoney/trinity-kmymoney-3.5.13.spec b/redhat/applications/kmymoney/trinity-kmymoney-3.5.13.spec new file mode 100644 index 000000000..db1c114ef --- /dev/null +++ b/redhat/applications/kmymoney/trinity-kmymoney-3.5.13.spec @@ -0,0 +1,199 @@ +# Default version for this component +%define kdecomp kmymoney +%define version 1.0.4 +%define release 1 + +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?_prefix}" != "/usr" +%define _variant .opt +%define _docdir %{_prefix}/share/doc +%endif + +# TDE 3.5.13 specific building variables +BuildRequires: autoconf automake libtool m4 +%define tde_docdir %{_docdir}/kde +%define tde_includedir %{_includedir}/kde +%define tde_libdir %{_libdir}/trinity + + +Name: trinity-%{kdecomp} +Summary: personal finance manager for TDE + +Version: %{?version} +Release: %{?release}%{?dist}%{?_variant} + +License: GPLv2+ +Group: Applications/Utilities + +Vendor: Trinity Project +Packager: Francois Andriot <francois.andriot@free.fr> +URL: http://www.trinitydesktop.org/ + +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{kdecomp}-3.5.13.tar.gz +Source1: kmymoneytitlelabel.png +Patch0: kmymoney-3.5.13-recode_ftbfs.patch +Patch1: kmymoney-3.5.13-default_money_crash.patch + +BuildRequires: tqtinterface-devel +BuildRequires: trinity-arts-devel +BuildRequires: trinity-kdelibs-devel +BuildRequires: trinity-kdebase-devel +BuildRequires: desktop-file-utils + +BuildRequires: recode +BuildRequires: html2ps +BuildRequires: opensp-devel +BuildRequires: libofx-devel + +Requires: %{name}-common == %{version} + +%description +KMyMoney is the Personal Finance Manager for TDE. It operates similar to +MS-Money and Quicken, supports different account types, categorisation of +expenses, QIF import/export, multiple currencies and initial online banking +support. + + +%package common +Summary: KMyMoney architecture independent files +Group: Applications/Utilities +Requires: %{name} == %{version} + +%description common +This package contains architecture independent files needed for KMyMoney to +run properly. It also provides KMyMoney documentation. Therefore, unless you +have '%{name}' package installed, you will hardly find this package useful. + + +%package devel +Summary: KMyMoney development files +Group: Development/Libraries +Requires: %{name} == %{version} + +%description devel +This package contains development files needed for KMyMoney plugins. + + +%prep +%setup -q -n applications/%{kdecomp} +%patch0 -p1 +#patch1 -p1 +%__install -m644 %{SOURCE1} kmymoney2/widgets/ + +# Ugly hack to modify TQT include directory inside autoconf files. +# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! +%__sed -i admin/acinclude.m4.in \ + -e "s,/usr/include/tqt,%{_includedir}/tqt,g" \ + -e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',g" + +%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +%__make -f "admin/Makefile.common" + + +%build +export PATH="%{_bindir}:${PATH}" +export LDFLAGS="-L%{_libdir} -I%{_includedir}" + +%configure \ + --disable-rpath \ + --with-extra-includes=%{_includedir}/tqt \ + --enable-closure \ + --enable-pdf-docs \ + --enable-ofxplugin \ + --enable-ofxbanking \ + --enable-qtdesigner \ + --enable-sqlite3 + +%__make %{?_smp_mflags} + + +%install +export PATH="%{_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} + + + +## File lists +# HTML (1.0) +HTML_DIR=$(kde-config --expandvars --install html) +if [ -d %{buildroot}$HTML_DIR ]; then + for lang_dir in %{buildroot}$HTML_DIR/* ; do + if [ -d $lang_dir ]; then + lang=$(basename $lang_dir) + echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang + # replace absolute symlinks with relative ones + pushd $lang_dir + for i in *; do + [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common + done + popd + fi + done +fi + +%clean +%__rm -rf %{buildroot} + + +%post +/sbin/ldconfig +touch --no-create %{_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : + +%postun +/sbin/ldconfig +touch --no-create %{_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : + +%files +%defattr(-,root,root,-) +%{_bindir}/kmymoney +%{_bindir}/kmymoney2 +%{_datadir}/applications/kde/kmymoney2.desktop +%{_datadir}/mimelnk/application/x-kmymoney2.desktop +%{_datadir}/servicetypes/kmymoneyimporterplugin.desktop +%{_datadir}/servicetypes/kmymoneyplugin.desktop +%{_libdir}/*.so.* +%{tde_libdir}/kmm_ofximport.la +%{tde_libdir}/kmm_ofximport.so + +%files common +%defattr(-,root,root,-) +%{_datadir}/apps/kmymoney2/html/ +%{_datadir}/apps/kmymoney2/icons/*/*/*/*.png +%{_datadir}/apps/kmymoney2/kmymoney2ui.rc +%{_datadir}/apps/kmymoney2/misc/financequote.pl +%{_datadir}/apps/kmymoney2/pics/*.png +%{_datadir}/apps/kmymoney2/templates/*/*.kmt +%{_datadir}/apps/kmymoney2/tips +%{_datadir}/config.kcfg/kmymoney2.kcfg +%{_datadir}/icons/*/*/*/*.png +%{_datadir}/icons/*/*/*.svgz +%{_datadir}/locale/*/LC_MESSAGES/*.mo +%{tde_docdir}/HTML/en/kmymoney2/*.docbook +%{tde_docdir}/HTML/en/kmymoney2/*.png +%{tde_docdir}/HTML/en/kmymoney2/common +%{tde_docdir}/HTML/en/kmymoney2/index.cache.bz2 +%{_mandir}/man1/kmymoney2.* +%{_datadir}/apps/kmm_ofximport/kmm_ofximport.rc +%{_datadir}/services/kmm_ofximport.desktop + + +%files devel +%defattr(-,root,root,-) +%{_includedir}/kmymoney/*.h +%{_libdir}/libkmm_kdchart.la +%{_libdir}/libkmm_mymoney.la +%{_libdir}/libkmm_plugin.la +%{_libdir}/*.so +%{_usr}/%{_lib}/qt-3.3/plugins/sqldrivers/libsqlite3.lib64.so +%{_usr}/%{_lib}/qt-3.3/plugins/designer/libkmymoney.so + +%Changelog +* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 1.0.4-1 +- Initial release for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15 diff --git a/redhat/applications/ktorrent/trinity-ktorrent.spec b/redhat/applications/ktorrent/trinity-ktorrent.spec new file mode 100644 index 000000000..3ca5c5958 --- /dev/null +++ b/redhat/applications/ktorrent/trinity-ktorrent.spec @@ -0,0 +1,144 @@ +# Default version for this component +%define kdecomp ktorrent +%define version 2.2.6 +%define release 1 + +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?_prefix}" != "/usr" +%define _variant .opt +%define _docdir %{_prefix}/share/doc +%endif + +# TDE 3.5.13 specific building variables +BuildRequires: autoconf automake libtool m4 +%define tde_docdir %{_docdir}/kde +%define tde_includedir %{_includedir}/kde +%define tde_libdir %{_libdir}/trinity + + +Name: trinity-%{kdecomp} +Summary: BitTorrent client for Trinity +Version: %{?version} +Release: %{?release}%{?dist}%{?_variant} + +License: GPLv2+ +Group: Applications/Utilities + +Vendor: Trinity Project +Packager: Francois Andriot <francois.andriot@free.fr> +URL: http://ktorrent.org + +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{kdecomp}-3.5.13.tar.gz + +BuildRequires: tqtinterface-devel +BuildRequires: trinity-kdelibs-devel +BuildRequires: trinity-kdebase-devel +BuildRequires: desktop-file-utils +BuildRequires: gettext + + +%description +KTorrent is a BitTorrent program for Trinity. Its features include speed capping +(both down and up), integrated searching, UDP tracker support, preview of +certain file types (video and audio) and integration into the KDE Panel +enabling background downloading. + + +%prep +%setup -q -n applications/%{kdecomp} + +# Ugly hack to modify TQT include directory inside autoconf files. +# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! +%__sed -i admin/acinclude.m4.in \ + -e "s,/usr/include/tqt,%{_includedir}/tqt,g" \ + -e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',g" + +%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +%__make -f "admin/Makefile.common" + + +%build +export PATH="%{_bindir}:${PATH}" +export LDFLAGS="-L%{_libdir} -I%{_includedir}" + +%configure \ + --disable-rpath \ + --with-extra-includes=%{_includedir}/tqt + + +# Not SMP safe ! +%__make + + +%install +export PATH="%{_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} + + +%find_lang %{kdecomp} + + +%clean +%__rm -rf %{buildroot} + + +%post +touch --no-create %{_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +/sbin/ldconfig || : + +%postun +touch --no-create %{_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +/sbin/ldconfig || : + + +%files -f %{kdecomp}.lang +%defattr(-,root,root,-) +%{_bindir}/ktcachecheck +%{_bindir}/ktorrent +%{_bindir}/ktshell +%{_bindir}/kttorinfo +%{_bindir}/ktupnptest +%{_libdir}/libktorrent-2.2.6.so +%{_libdir}/libktorrent.la +%{_libdir}/libktorrent.so +%{tde_libdir}/ktinfowidgetplugin.la +%{tde_libdir}/ktinfowidgetplugin.so +%{tde_libdir}/ktipfilterplugin.la +%{tde_libdir}/ktipfilterplugin.so +%{tde_libdir}/ktlogviewerplugin.la +%{tde_libdir}/ktlogviewerplugin.so +%{tde_libdir}/ktpartfileimportplugin.la +%{tde_libdir}/ktpartfileimportplugin.so +%{tde_libdir}/ktrssfeedplugin.la +%{tde_libdir}/ktrssfeedplugin.so +%{tde_libdir}/ktscanfolderplugin.la +%{tde_libdir}/ktscanfolderplugin.so +%{tde_libdir}/ktschedulerplugin.la +%{tde_libdir}/ktschedulerplugin.so +%{tde_libdir}/ktsearchplugin.la +%{tde_libdir}/ktsearchplugin.so +%{tde_libdir}/ktstatsplugin.la +%{tde_libdir}/ktstatsplugin.so +%{tde_libdir}/ktupnpplugin.la +%{tde_libdir}/ktupnpplugin.so +%{tde_libdir}/ktwebinterfaceplugin.la +%{tde_libdir}/ktwebinterfaceplugin.so +%{_datadir}/applications/kde/ktorrent.desktop +%{_datadir}/apps/ktorrent +%{_datadir}/config.kcfg/*.kcfg +%{_datadir}/icons/hicolor/*/*/*.png +%{_datadir}/icons/hicolor/*/*/*.svgz +%{_datadir}/services/*.desktop +%{_datadir}/servicetypes/ktorrentplugin.desktop + + +%Changelog +* Tue Nov 29 2011 Francois Andriot <francois.andriot@free.fr> - 2.2.6-1 +- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/rosegarden/rosegarden-3.5.13-ftbfs.patch b/redhat/applications/rosegarden/rosegarden-3.5.13-ftbfs.patch new file mode 100644 index 000000000..6967f300c --- /dev/null +++ b/redhat/applications/rosegarden/rosegarden-3.5.13-ftbfs.patch @@ -0,0 +1,10 @@ +--- rosegarden/src/CMakeLists.txt.ORI 2011-11-26 23:09:57.776046683 +0100 ++++ rosegarden/src/CMakeLists.txt 2011-11-26 23:10:07.534844583 +0100 +@@ -148,6 +148,7 @@ + + TARGET_LINK_LIBRARIES(rosegarden + dl ++ fontconfig + lo + ${QT_AND_KDECORE_LIBS} + ${LIBLO_LIBS} diff --git a/redhat/applications/rosegarden/trinity-rosegarden.spec b/redhat/applications/rosegarden/trinity-rosegarden.spec new file mode 100644 index 000000000..3c42931f9 --- /dev/null +++ b/redhat/applications/rosegarden/trinity-rosegarden.spec @@ -0,0 +1,164 @@ +# Default version for this component +%define kdecomp rosegarden +%define version 1.7.0 +%define release 1 + +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?_prefix}" != "/usr" +%define _variant .opt +%define _docdir %{_prefix}/share/doc +%endif + +# TDE 3.5.13 specific building variables +BuildRequires: autoconf automake libtool m4 +%define tde_docdir %{_docdir}/kde +%define tde_includedir %{_includedir}/kde +%define tde_libdir %{_libdir}/trinity + + +Name: trinity-%{kdecomp} +Summary: music editor and MIDI/audio sequencer [Trinity] +Version: %{?version} +Release: %{?release}%{?dist}%{?_variant} + +License: GPLv2+ +Group: Applications/Multimedia + +Vendor: Trinity Project +Packager: Francois Andriot <francois.andriot@free.fr> +URL: http://www.rosegardenmusic.com/ + +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{kdecomp}-3.5.13.tar.gz +Patch0: rosegarden-3.5.13-ftbfs.patch + +BuildRequires: tqtinterface-devel +BuildRequires: trinity-kdelibs-devel +BuildRequires: trinity-kdebase-devel +BuildRequires: desktop-file-utils +BuildRequires: gettext + +BuildRequires: fftw-devel +BuildRequires: dssi-devel +BuildRequires: liblo-devel +BuildRequires: liblrdf-devel +BuildRequires: fontconfig-devel + +Requires: lilypond +Requires: perl-XML-Twig +Requires: libsndfile-utils + +# LIRC does not exist on RHEL. +%if 0%{?fedora} > 0 +BuildRequires: lirc-devel +%endif + +Requires: %{name}-data == %{version}-%{release} + +%description +Rosegarden is a KDE application which provides a mixed Audio/MIDI +sequencer (for playback and recording), a multi-track editor, music +editing using both piano-roll and score notation, MIDI file IO, +lilypond and Csound files export, etc. + +%package data +Group: Applications/Multimedia +Requires: %{name} == %{version}-%{release} +Summary: music editor and MIDI/audio sequencer data files [Trinity] + +%description data +Rosegarden is a KDE application which provides a mixed Audio/MIDI +sequencer (for playback and recording), a multi-track editor, music +editing using both piano-roll and score notation, MIDI file IO, +lilypond and Csound files export, etc. + +This package provides the data files necessary for running Rosegarden + + +%prep +%setup -q -n applications/%{kdecomp} +%patch0 -p1 + +# Hard-coded path to TQT binaries spotted !!! +%__sed -i CMakeLists.txt \ + -e "s,/usr/bin/uic-tqt,%{_bindir}/uic-tqt,g" \ + -e "s,/usr/bin/tmoc,%{_bindir}/tmoc,g" \ + -e "s,/usr/include/tqt,%{_includedir}/tqt,g" + +%build +unset QTDIR && . %{_sysconfdir}/profile.d/qt.sh +export PATH="%{_bindir}:${PATH}" +export LDFLAGS="-L%{_libdir} -I%{_includedir}" +export CMAKE_INCLUDE_PATH="%{_includedir}:%{_includedir}/tqt" + +%__mkdir_p build +cd build +%cmake \ + -DWANT_DEBUG=OFF \ + -DWANT_FULLDBG=OFF \ + -DWANT_SOUND=ON \ + -DWANT_JACK=OFF \ + -DWANT_DSSI=ON \ +%if 0%{?fedora} > 0 + -DWANT_LIRC=ON \ +%else + -DWANT_LIRC=OFF \ +%endif + -DWANT_PCH=OFF \ + -DWANT_TEST=OFF \ + -DBUILD_ALL=ON \ + .. + +%__make %{?_smp_mflags} + + +%install +export PATH="%{_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} -C build + + +%find_lang %{kdecomp} + +%clean +%__rm -rf %{buildroot} + + +%post +touch --no-create %{_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : + +%postun +touch --no-create %{_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : + + +%files +%defattr(-,root,root,-) +%{_bindir}/rosegarden +%{_bindir}/rosegarden-audiofile-importer +%{_bindir}/rosegarden-lilypondview +%{_bindir}/rosegarden-project-package +%{_bindir}/rosegardensequencer + +%files data -f %{kdecomp}.lang +%defattr(-,root,root,-) +%{_datadir}/applications/kde/rosegarden.desktop +%{_datadir}/apps/profiles/rosegarden.profile.xml +%lang(en) %{tde_docdir}/HTML/en/rosegarden +%lang(es) %{tde_docdir}/HTML/es/rosegarden +%lang(ja) %{tde_docdir}/HTML/ja/rosegarden +%lang(sv) %{tde_docdir}/HTML/sv/rosegarden +%{_datadir}/apps/rosegarden +%{_datadir}/icons/*/*/*/* +%{_datadir}/mimelnk/audio/x-rosegarden-device.desktop +%{_datadir}/mimelnk/audio/x-rosegarden.desktop +%{_datadir}/mimelnk/audio/x-rosegarden21.desktop +%{_datadir}/mimelnk/audio/x-soundfont.desktop + + +%Changelog +* Sat Nov 26 2011 Francois Andriot <francois.andriot@free.fr> - 1.7.0-1 +- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/wlassistant/trinity-wlassistant.spec b/redhat/applications/wlassistant/trinity-wlassistant.spec new file mode 100644 index 000000000..85276e5ec --- /dev/null +++ b/redhat/applications/wlassistant/trinity-wlassistant.spec @@ -0,0 +1,123 @@ +# Default version for this component +%define kdecomp wlassistant +%define version 0.5.7 +%define release 1 + +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?_prefix}" != "/usr" +%define _variant .opt +%define _docdir %{_prefix}/share/doc +%endif + +# TDE 3.5.13 specific building variables +BuildRequires: autoconf automake libtool m4 +%define tde_docdir %{_docdir}/kde +%define tde_includedir %{_includedir}/kde +%define tde_libdir %{_libdir}/trinity + + +Name: trinity-%{kdecomp} +Summary: User friendly KDE frontend for wireless network connection [Trinity] +Version: %{?version} +Release: %{?release}%{?dist}%{?_variant} + +License: GPLv2+ +Group: Applications/Utilities + +Vendor: Trinity Project +Packager: Francois Andriot <francois.andriot@free.fr> +URL: http://wlassistant.sourceforge.net/ + +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{kdecomp}-3.5.13.tar.gz + +BuildRequires: tqtinterface-devel +BuildRequires: trinity-kdelibs-devel +BuildRequires: trinity-kdebase-devel +BuildRequires: desktop-file-utils +BuildRequires: gettext + +BuildRequires: python +BuildRequires: scons + +%description +Wireless Assistant scans for wireless access points and displays link quality, +encryption and other useful information. When user wants to connect to a +network, Wireless Assistant opens up its wizards and guides the user through +Wi-Fi settings. After a successful connection is made the settings are +remembered so next time the user won't have to enter them again. + + +%prep +%setup -q -n applications/%{kdecomp} + +# Ugly hack to modify TQT include directory inside SCONS files. +# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! +%__sed -i bksys/kde.py \ + -e "s,/usr/include/tqt,%{_includedir}/tqt,g" + + +%build +unset QTDIR; . /etc/profile.d/qt.sh +export PATH="%{_bindir}:${PATH}" +export LDFLAGS="-L%{_libdir} -I%{_includedir}" + +scons configure \ + prefix=%{_prefix} \ + execprefix=%{_bindir} \ + libdir=%{_libdir} \ + qtdir=${QTDIR} \ + kdedir=%{_prefix} \ + kdeincludes=%{_includedir} \ + qtincludes=${QTINC} \ + kdelibs=%{_libdir} \ + qtlibs=${QTLIB} \ + extraincludes=%{_includedir}:%{_includedir}/tqt:${QTINC} + +scons -j4 + + +%install +export PATH="%{_bindir}:${PATH}" +%__rm -rf %{buildroot} +scons install DESTDIR=%{buildroot} + +%clean +%__rm -rf %{buildroot} + + +%post +/sbin/ldconfig +touch --no-create %{_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : + +%postun +/sbin/ldconfig +touch --no-create %{_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : + + +%files +%defattr(-,root,root,-) +%doc ChangeLog VERSION +%{_bindir}/wlassistant +%{_datadir}/applnk/Utilities/wlassistant.desktop +%{_datadir}/icons/hicolor/16x16/apps/wlassistant.png +%{_datadir}/icons/hicolor/32x32/apps/wlassistant.png +%lang(ar) %{_datadir}/locale/ar/LC_MESSAGES/wlassistant.mo +%lang(ca) %{_datadir}/locale/ca/LC_MESSAGES/wlassistant.mo +%lang(es) %{_datadir}/locale/es/LC_MESSAGES/wlassistant.mo +%lang(fr) %{_datadir}/locale/fr/LC_MESSAGES/wlassistant.mo +%lang(nb) %{_datadir}/locale/nb/LC_MESSAGES/wlassistant.mo +%lang(pl) %{_datadir}/locale/pl/LC_MESSAGES/wlassistant.mo +%lang(pt) %{_datadir}/locale/pt_BR/LC_MESSAGES/wlassistant.mo +%lang(sv) %{_datadir}/locale/sv/LC_MESSAGES/wlassistant.mo +%lang(zh_CN) %{_datadir}/locale/zh_CN/LC_MESSAGES/wlassistant.mo +%lang(zh_TW) %{_datadir}/locale/zh_TW/LC_MESSAGES/wlassistant.mo + + +%Changelog +* Tue Nov 29 2011 Francois Andriot <francois.andriot@free.fr> - 0.5.7-1 +- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/components.txt b/redhat/components.txt index 982971db9..3ba0b44a4 100644 --- a/redhat/components.txt +++ b/redhat/components.txt @@ -1,3 +1,7 @@ +libraries/libkdcraw +libraries/libkexiv2 +libraries/libkipi +libraries/libksquirrel qt3 dependencies/libcaldav dependencies/libcarddav @@ -27,9 +31,9 @@ kdeedu kdeaddons kdewebdev kde-i18n -libraries/libkdcraw -libraries/libkexiv2 -libraries/libkipi +extras/ksensors +extras/libkarma +#extras/libkexif applications/k3b applications/abakus applications/dolphin @@ -43,15 +47,14 @@ applications/kdiff3 #applications/kuickshow applications/basket applications/katapult -#compizconfig-backend-kconfig +#applications/compizconfig-backend-kconfig applications/kbookreader applications/kdbusnotification -applications/kmymoney2 +applications/kmymoney applications/kstreamripper applications/kdesudo applications/digikam applications/konversation -extras/ksensors applications/amarok applications/kaffeine applications/knetworkmanager @@ -68,8 +71,6 @@ applications/kcpuload applications/fusion-icon applications/ksplash-engine-moodin applications/knights -libraries/libksquirrel -#extras/libkexif applications/ksquirrel applications/gtk-qt-engine applications/koffice @@ -82,3 +83,7 @@ applications/kdmtheme applications/knemo applications/kerry applications/kvirc +applications/rosegarden +applications/wlassistant +applications/ktorrent +applications/bibletime diff --git a/redhat/extras/libkarma/karma-sharp.dll.config b/redhat/extras/libkarma/karma-sharp.dll.config new file mode 100644 index 000000000..180d8b4fb --- /dev/null +++ b/redhat/extras/libkarma/karma-sharp.dll.config @@ -0,0 +1,3 @@ +<configuration> + <dllmap dll="karma" target="libkarma.so.0" /> +</configuration>
\ No newline at end of file diff --git a/redhat/extras/libkarma/libkarma-0.1.2.tar.gz b/redhat/extras/libkarma/libkarma-0.1.2.tar.gz Binary files differnew file mode 100644 index 000000000..3060acf72 --- /dev/null +++ b/redhat/extras/libkarma/libkarma-0.1.2.tar.gz diff --git a/redhat/extras/libkarma/libkarma.spec b/redhat/extras/libkarma/libkarma.spec new file mode 100644 index 000000000..cd7339145 --- /dev/null +++ b/redhat/extras/libkarma/libkarma.spec @@ -0,0 +1,131 @@ +%define major 0 + +Summary: Rio Karma tools +Name: libkarma +Version: 0.1.2 +Release: 1%{?dist} +License: GPLv2+ +Group: System/Libraries +Url: http://www.freakysoft.de/html/libkarma/ +Source: http://www.freakysoft.de/libkarma/libkarma-%{version}.tar.gz +Source2: http://bobcopeland.com/karma/banshee/preferences.fdi +Source3: http://bobcopeland.com/karma/banshee/multimedia-player-rio-karma.png +Source4: karma-sharp.dll.config +BuildRoot: %{_tmppath}/%name-root +BuildRequires: mono-devel +BuildRequires: taglib-devel +BuildRequires: libusb-devel +BuildRequires: zlib-devel +Requires: %{name}-libs >= %version +%define _requires_exceptions libkarma + +%description +Rio Karma access library + +%package libs +Summary: Rio Karma access library +Group: System/Libraries + +%description libs +Rio Karma access library + + +%package devel +Summary: Rio Karma development files +Group: Development/C +Requires: %{name}-libs = %version +Provides: %name-devel = %version-%release +Obsoletes: %name-devel + +%description devel +Rio Karma development files + + +%package -n karma-sharp +Summary: Rio Karma C# bindings +Group: Development/Other +Requires: %name = %version + +%description -n karma-sharp +Rio Karma C# bindings + + +%prep +%setup -q -n libkarma-%{version} + +%build +make PREFIX=$RPM_BUILD_ROOT/%_prefix + +%install +rm -rf $RPM_BUILD_ROOT installed-docs +mkdir -p $RPM_BUILD_ROOT +make install PREFIX=$RPM_BUILD_ROOT/%_prefix CHOWNPROG=/bin/true CHGRPPROG=/bin/true +perl -pi -e "s^%buildroot^^" %buildroot%_prefix/lib/pkgconfig/karma-sharp.pc +%if %_lib != lib +mv %buildroot%_prefix/lib %buildroot%_libdir +perl -pi -e "s^/lib^/%_lib^" %buildroot%_libdir/pkgconfig/karma-sharp.pc +%endif + + +install -m 644 -D libkarma.fdi %buildroot%_sysconfdir/hal/fdi/information/20-rio-karma.fdi +install -m 644 -D %SOURCE2 %buildroot%_sysconfdir/hal/fdi/policy/preferences.fdi +install -m 644 -D %SOURCE3 %buildroot%_datadir/icons/hicolor/32x32/devices/multimedia-player-rio-karma.png + +cat > README%{?dist} << EOF +For automatic mounting, add the following line to your +/etc/fstab. Otherwise gnome-volume-manager will refuse to mount the +device, as it doesn't know about the Karma's proprietary filesystem. + +/dev/disk/by-id/usb-Rio_Rio_Karma_0000000000000000-part2 /media/karma omfs user,noauto 0 0 + +EOF + +install -m 644 %SOURCE4 %buildroot%_libdir/karma-sharp/karma-sharp.dll.config + +%post libs -p /sbin/ldconfig +%postun libs -p /sbin/ldconfig + +%post +gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : + +%postun +gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root) +%doc THANKS TODO README%{?dist} +%config(noreplace) %_sysconfdir/hal/fdi/information/20-rio-karma.fdi +%config(noreplace) %_sysconfdir/hal/fdi/policy/preferences.fdi +%_bindir/riocp +%_bindir/chprop +%_mandir/man1/*.1* +%attr(4755,root,root) %_bindir/karma_helper +%_datadir/icons/hicolor/32x32/devices/multimedia-player-rio-karma.png +%_docdir/%{name} + +%files libs +%defattr(-,root,root) +%_libdir/libkarma.so.%{major}* + +%files devel +%defattr(-,root,root) +%_includedir/* +%_libdir/libkarma.a +%_libdir/libkarma.so + +%files -n karma-sharp +%defattr(-,root,root) +%_libdir/karma-sharp/* +%_libdir/pkgconfig/karma-sharp.pc + + + + +%changelog +* Mon Nov 28 2011 Francois Andriot <francois.andriot@free.fr> 0.1.2-1 +- Build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 +- Based on 'libkarma-0.1.2-1mdv2011.0' + diff --git a/redhat/extras/libkarma/multimedia-player-rio-karma.png b/redhat/extras/libkarma/multimedia-player-rio-karma.png Binary files differnew file mode 100644 index 000000000..79cc980ad --- /dev/null +++ b/redhat/extras/libkarma/multimedia-player-rio-karma.png diff --git a/redhat/extras/libkarma/preferences.fdi b/redhat/extras/libkarma/preferences.fdi new file mode 100644 index 000000000..7e1021711 --- /dev/null +++ b/redhat/extras/libkarma/preferences.fdi @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> <!-- -*- SGML -*- --> + +<deviceinfo version="0.2"> + <device> + <match key="info.udi" string="/org/freedesktop/Hal/devices/storage_serial_Rio_Rio_Karma_0000000000000000"> + <merge key="storage.policy.should_mount" type="bool">true</merge> + <merge key="storage.policy.is_removable" type="bool">true</merge> + <merge key="storage.policy.default.mount_root" type="string">/media</merge> + </match> +</device> + +<device> + <match key="info.udi" string="/org/freedesktop/Hal/devices/volume_part2_size_19919976960"> + <merge key="volume.policy.desired_mount_point" type="string">karma</merge> + <merge key="volume.policy.mount_filesystem" type="string">omfs</merge> + </match> +</device> +</deviceinfo> + diff --git a/redhat/kdebase/r1182808.diff b/redhat/kdebase/r1182808.diff new file mode 100644 index 000000000..6163d996f --- /dev/null +++ b/redhat/kdebase/r1182808.diff @@ -0,0 +1,29 @@ +Index: kdebase/kdesktop/init/My_Documents +=================================================================== +--- kdebase/kdesktop/init/My_Documents (revision 1182807) ++++ kdebase/kdesktop/init/My_Documents (revision 1182808) +@@ -1,10 +1,6 @@ + [Desktop Entry] + Encoding=UTF-8 +-Comment= +-Comment[en_US]= +-Exec=kxdglauncher --xdgname DOCUMENTS + Icon=folder_wordprocessing +-MimeType= + Name=My Documents + Name[af]=Dokument Gids + Name[ar]=مستنداتي +@@ -70,10 +66,12 @@ + Name[wa]=Ridant documints + Name[zh_CN]=文档文件夹 + Name[zh_TW]=文件目錄 ++URL=$( kxdglauncher --getpath --xdgname DOCUMENTS ) ++Type=Link + StartupNotify=true ++MimeType= + Terminal=false + TerminalOptions= +-Type=Application + X-DCOP-ServiceType= + X-KDE-SubstituteUID=false + X-KDE-Username= diff --git a/redhat/kdebase/r1201523.diff b/redhat/kdebase/r1201523.diff new file mode 100644 index 000000000..7272968b2 --- /dev/null +++ b/redhat/kdebase/r1201523.diff @@ -0,0 +1,31 @@ +Index: kdebase/kcontrol/crypto/crypto.cpp +=================================================================== +--- kdebase/kcontrol/crypto/crypto.cpp (revision 1201522) ++++ kdebase/kcontrol/crypto/crypto.cpp (revision 1201523) +@@ -2321,7 +2321,7 @@ + unsigned int i; + SSL_CTX *ctx; + SSL *ssl; +-SSL_METHOD *meth; ++const SSL_METHOD *meth; + + SSLv2Box->clear(); + SSLv3Box->clear(); +@@ -2337,7 +2337,7 @@ + CipherItem *item; + for (i=0; ; i++) { + int j, k; +- SSL_CIPHER *sc; ++ const SSL_CIPHER *sc; + sc = (meth->get_cipher)(i); + if (!sc) + break; +@@ -2365,7 +2365,7 @@ + + for (i=0; ; i++) { + int j, k; +- SSL_CIPHER *sc; ++ const SSL_CIPHER *sc; + sc = (meth->get_cipher)(i); + if (!sc) + break; diff --git a/redhat/kdebase/r1201705.diff b/redhat/kdebase/r1201705.diff new file mode 100644 index 000000000..c7dff1e6e --- /dev/null +++ b/redhat/kdebase/r1201705.diff @@ -0,0 +1,43 @@ +Index: kdebase/kcontrol/crypto/crypto.cpp +=================================================================== +--- kdebase/kcontrol/crypto/crypto.cpp (revision 1201704) ++++ kdebase/kcontrol/crypto/crypto.cpp (revision 1201705) +@@ -2316,12 +2316,19 @@ + + + #ifdef HAVE_SSL ++ ++#if OPENSSL_VERSION_NUMBER >= 0x10000000L ++#define SSL_CONST const ++#else ++#define SSL_CONST ++#endif ++ + // This gets all the available ciphers from OpenSSL + bool KCryptoConfig::loadCiphers() { + unsigned int i; + SSL_CTX *ctx; + SSL *ssl; +-const SSL_METHOD *meth; ++SSL_CONST SSL_METHOD *meth; + + SSLv2Box->clear(); + SSLv3Box->clear(); +@@ -2337,7 +2344,7 @@ + CipherItem *item; + for (i=0; ; i++) { + int j, k; +- const SSL_CIPHER *sc; ++ SSL_CONST SSL_CIPHER *sc; + sc = (meth->get_cipher)(i); + if (!sc) + break; +@@ -2365,7 +2372,7 @@ + + for (i=0; ; i++) { + int j, k; +- const SSL_CIPHER *sc; ++ SSL_CONST SSL_CIPHER *sc; + sc = (meth->get_cipher)(i); + if (!sc) + break; diff --git a/redhat/kdebase/r1221326.diff b/redhat/kdebase/r1221326.diff new file mode 100644 index 000000000..b164a4679 --- /dev/null +++ b/redhat/kdebase/r1221326.diff @@ -0,0 +1,13 @@ +Index: kdebase/kcontrol/randr/krandrbindings.cpp +=================================================================== +--- kdebase/kcontrol/randr/krandrbindings.cpp (revision 1221325) ++++ kdebase/kcontrol/randr/krandrbindings.cpp (revision 1221326) +@@ -28,7 +28,7 @@ + + keys->insert( "Program:krandrtray", i18n("Display Control") ); + +- DEF( I18N_NOOP("Switch Displays"), KShortcut::KShortcut(TQString("XF86Display")), KShortcut::KShortcut(TQString("XF86Display")), slotCycleDisplays() ); ++ DEF( I18N_NOOP("Switch Displays"), KShortcut(TQString("XF86Display")), KShortcut(TQString("XF86Display")), slotCycleDisplays() ); + + #undef DEF + #undef WIN diff --git a/redhat/kdenetwork/kdenetwork-3.5.13-dummy.cpp b/redhat/kdenetwork/kdenetwork-3.5.13-dummy.cpp new file mode 100644 index 000000000..6edd39faa --- /dev/null +++ b/redhat/kdenetwork/kdenetwork-3.5.13-dummy.cpp @@ -0,0 +1,3 @@ +#include "kdemacros.h" +extern "C" KDE_EXPORT void *init_libkopete_msn_shared(); +extern "C" KDE_EXPORT void *init_kopete_msn() { return init_libkopete_msn_shared(); } diff --git a/redhat/kdenetwork/kdenetwork-3.5.13-kopete_jabber_protocol.patch b/redhat/kdenetwork/kdenetwork-3.5.13-kopete_jabber_protocol.patch new file mode 100644 index 000000000..a01c8ab81 --- /dev/null +++ b/redhat/kdenetwork/kdenetwork-3.5.13-kopete_jabber_protocol.patch @@ -0,0 +1,30 @@ +--- kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/base/sigslot.h.ORI 2011-11-27 05:38:43.500726484 -0500 ++++ kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/base/sigslot.h 2011-11-27 05:39:19.901925857 -0500 +@@ -80,6 +80,7 @@ + + #include <set> + #include <list> ++#include <cstddef> + + // On our copy of sigslot.h, we force single threading + #define SIGSLOT_PURE_ISO +--- kdenetwork/kopete/protocols/jabber/CMakeLists.txt.ORI 2011-11-27 05:55:08.369780670 -0500 ++++ kdenetwork/kopete/protocols/jabber/CMakeLists.txt 2011-11-27 05:55:12.350662883 -0500 +@@ -80,6 +80,6 @@ + jabberclient-static kopetejabberui-static + iris_jabber-static iris_xmpp_core-static iris_xmpp_im-static iris-static + qca-static cutestuff_network-static cutestuff_util-static ${JINGLE_LIBRARIES} +- kopete-shared ++ kopete-shared idn + DESTINATION ${PLUGIN_INSTALL_DIR} + ) +--- kdenetwork/kopete/protocols/jabber/kioslave/CMakeLists.txt.ORI 2011-11-27 06:01:44.412062605 -0500 ++++ kdenetwork/kopete/protocols/jabber/kioslave/CMakeLists.txt 2011-11-27 06:01:56.658700254 -0500 +@@ -37,6 +37,6 @@ + LINK + jabberclient-static + iris_xmpp_core-static iris_xmpp_im-static iris_jabber-static iris-static +- qca-static cutestuff_network-static cutestuff_util-static kio-shared ++ qca-static cutestuff_network-static cutestuff_util-static kio-shared idn + DESTINATION ${PLUGIN_INSTALL_DIR} + ) diff --git a/redhat/kdenetwork/kdenetwork-3.5.13-kopete_motionawayplugin_ftbfs.patch b/redhat/kdenetwork/kdenetwork-3.5.13-kopete_motionawayplugin_ftbfs.patch new file mode 100644 index 000000000..a7e39357b --- /dev/null +++ b/redhat/kdenetwork/kdenetwork-3.5.13-kopete_motionawayplugin_ftbfs.patch @@ -0,0 +1,15 @@ +--- kdenetwork/kopete/plugins/motionautoaway/motionawayplugin.cpp.ORI 2011-11-27 13:27:13.236739020 -0500 ++++ kdenetwork/kopete/plugins/motionautoaway/motionawayplugin.cpp 2011-11-27 13:28:48.217257573 -0500 +@@ -75,7 +75,12 @@ + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,50) + #define _LINUX_TIME_H + #endif ++ ++#ifdef HAVE_LIBV4L1_VIDEODEV_H ++#include <libv4l1-videodev.h> ++#else + #include <linux/videodev.h> ++#endif + + #define DEF_WIDTH 352 + #define DEF_HEIGHT 288 diff --git a/redhat/kdenetwork/kdenetwork-3.5.13-kopete_msn_protocol.patch b/redhat/kdenetwork/kdenetwork-3.5.13-kopete_msn_protocol.patch new file mode 100644 index 000000000..160efd367 --- /dev/null +++ b/redhat/kdenetwork/kdenetwork-3.5.13-kopete_msn_protocol.patch @@ -0,0 +1,10 @@ +--- kdenetwork/kopete/protocols/msn/CMakeLists.txt.ORI 2011-11-27 05:05:56.814440165 -0500 ++++ kdenetwork/kopete/protocols/msn/CMakeLists.txt 2011-11-27 05:10:21.605900492 -0500 +@@ -28,6 +28,7 @@ + ${CMAKE_BINARY_DIR} + ${CMAKE_SOURCE_DIR}/kopete/libkopete + ${CMAKE_SOURCE_DIR}/kopete/libkopete/ui ++ ${CMAKE_SOURCE_DIR}/kopete/libkopete/private + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} + ) diff --git a/redhat/kdenetwork/kdenetwork-3.5.13-kopete_sms_protocol.patch b/redhat/kdenetwork/kdenetwork-3.5.13-kopete_sms_protocol.patch new file mode 100644 index 000000000..b338236f8 --- /dev/null +++ b/redhat/kdenetwork/kdenetwork-3.5.13-kopete_sms_protocol.patch @@ -0,0 +1,11 @@ +--- kdenetwork/kopete/protocols/sms/services/smsclient.cpp.ORI 2011-11-27 05:22:47.001212554 -0500 ++++ kdenetwork/kopete/protocols/sms/services/smsclient.cpp 2011-11-27 05:22:58.253085350 -0500 +@@ -67,7 +67,7 @@ + return; + } + +- TQString programName = c->readEntry(TQString("%1:%2").tqarg("SMSClient").tqarg("ProgramName"). TQString()); ++ TQString programName = c->readEntry(TQString("%1:%2").tqarg("SMSClient").tqarg("ProgramName"), TQString()); + if (programName.isNull()) + programName = "/usr/bin/sms_client"; + diff --git a/redhat/kdenetwork/kdenetwork-3.5.13-reference_to_qmake_h.patch b/redhat/kdenetwork/kdenetwork-3.5.13-reference_to_qmake_h.patch new file mode 100644 index 000000000..727b0967f --- /dev/null +++ b/redhat/kdenetwork/kdenetwork-3.5.13-reference_to_qmake_h.patch @@ -0,0 +1,108 @@ +diff -urN /dev/shm/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/p2p/client/sessionclient.cc /dev/shm/kdenetwork.new/kopete/protocols/jabber/jingle/libjingle/talk/p2p/client/sessionclient.cc +--- /dev/shm/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/p2p/client/sessionclient.cc 2011-06-21 20:37:08.000000000 -0500 ++++ /dev/shm/kdenetwork.new/kopete/protocols/jabber/jingle/libjingle/talk/p2p/client/sessionclient.cc 2011-11-28 18:20:03.852267846 -0600 +@@ -31,7 +31,7 @@ + #include "talk/p2p/client/sessionclient.h" + #include "talk/p2p/base/helpers.h" + #include "talk/base/logging.h" +-#include "talk/xmllite/tqname.h" ++#include "talk/xmllite/qname.h" + #include "talk/xmpp/constants.h" + #include "talk/xmllite/xmlprinter.h" + #include <iostream> +diff -urN /dev/shm/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/phonesessionclient.cc /dev/shm/kdenetwork.new/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/phonesessionclient.cc +--- /dev/shm/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/phonesessionclient.cc 2011-08-12 15:11:23.000000000 -0500 ++++ /dev/shm/kdenetwork.new/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/phonesessionclient.cc 2011-11-28 18:20:03.813268480 -0600 +@@ -30,7 +30,7 @@ + #include "talk/base/logging.h" + #include "talk/session/receiver.h" + #include "talk/session/phone/phonesessionclient.h" +-#include "talk/xmllite/tqname.h" ++#include "talk/xmllite/qname.h" + namespace { + + const std::string NS_PHONE("http://www.google.com/session/phone"); +diff -urN /dev/shm/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/qname.cc /dev/shm/kdenetwork.new/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/qname.cc +--- /dev/shm/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/qname.cc 2011-06-21 20:37:11.000000000 -0500 ++++ /dev/shm/kdenetwork.new/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/qname.cc 2011-11-28 18:20:04.262270904 -0600 +@@ -28,7 +28,7 @@ + #include <string> + #include "talk/base/common.h" + #include "talk/xmllite/xmlelement.h" +-#include "talk/xmllite/tqname.h" ++#include "talk/xmllite/qname.h" + #include "talk/xmllite/xmlconstants.h" + + //#define new TRACK_NEW +diff -urN /dev/shm/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlelement.cc /dev/shm/kdenetwork.new/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlelement.cc +--- /dev/shm/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlelement.cc 2011-06-21 20:37:11.000000000 -0500 ++++ /dev/shm/kdenetwork.new/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlelement.cc 2011-11-28 18:20:04.268270508 -0600 +@@ -32,7 +32,7 @@ + + #include "talk/base/common.h" + #include "talk/xmllite/xmlelement.h" +-#include "talk/xmllite/tqname.h" ++#include "talk/xmllite/qname.h" + #include "talk/xmllite/xmlparser.h" + #include "talk/xmllite/xmlbuilder.h" + #include "talk/xmllite/xmlprinter.h" +diff -urN /dev/shm/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlelement.h /dev/shm/kdenetwork.new/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlelement.h +--- /dev/shm/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlelement.h 2011-06-21 20:37:11.000000000 -0500 ++++ /dev/shm/kdenetwork.new/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlelement.h 2011-11-28 18:20:04.288018707 -0600 +@@ -31,7 +31,7 @@ + #include <iosfwd> + #include <string> + #include "talk/base/scoped_ptr.h" +-#include "talk/xmllite/tqname.h" ++#include "talk/xmllite/qname.h" + + namespace buzz { + +diff -urN /dev/shm/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlnsstack.h /dev/shm/kdenetwork.new/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlnsstack.h +--- /dev/shm/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlnsstack.h 2011-06-21 20:37:11.000000000 -0500 ++++ /dev/shm/kdenetwork.new/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlnsstack.h 2011-11-28 18:20:04.245270846 -0600 +@@ -31,7 +31,7 @@ + #include <string> + #include "talk/base/scoped_ptr.h" + #include "talk/base/stl_decl.h" +-#include "talk/xmllite/tqname.h" ++#include "talk/xmllite/qname.h" + + namespace buzz { + +diff -urN /dev/shm/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/constants.cc /dev/shm/kdenetwork.new/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/constants.cc +--- /dev/shm/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/constants.cc 2011-06-21 20:37:09.000000000 -0500 ++++ /dev/shm/kdenetwork.new/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/constants.cc 2011-11-28 18:20:03.076020148 -0600 +@@ -29,7 +29,7 @@ + #include "talk/base/basicdefs.h" + #include "talk/xmllite/xmlconstants.h" + #include "talk/xmllite/xmlelement.h" +-#include "talk/xmllite/tqname.h" ++#include "talk/xmllite/qname.h" + #include "talk/xmpp/jid.h" + #include "talk/xmpp/constants.h" + namespace buzz { +diff -urN /dev/shm/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/constants.h /dev/shm/kdenetwork.new/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/constants.h +--- /dev/shm/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/constants.h 2011-06-21 20:37:09.000000000 -0500 ++++ /dev/shm/kdenetwork.new/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/constants.h 2011-11-28 18:20:03.139020370 -0600 +@@ -29,7 +29,7 @@ + #define _CRICKET_XMPP_XMPPLIB_BUZZ_CONSTANTS_H_ + + #include <string> +-#include "talk/xmllite/tqname.h" ++#include "talk/xmllite/qname.h" + #include "talk/xmpp/jid.h" + + +diff -urN /dev/shm/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengine.h /dev/shm/kdenetwork.new/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengine.h +--- /dev/shm/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengine.h 2011-06-21 20:37:09.000000000 -0500 ++++ /dev/shm/kdenetwork.new/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengine.h 2011-11-28 18:20:03.059020250 -0600 +@@ -30,7 +30,7 @@ + + // also part of the API + #include "talk/xmpp/jid.h" +-#include "talk/xmllite/tqname.h" ++#include "talk/xmllite/qname.h" + #include "talk/xmllite/xmlelement.h" + + diff --git a/redhat/kdenetwork/trinity-kdenetwork-3.5.13.spec b/redhat/kdenetwork/trinity-kdenetwork-3.5.13.spec index f0d9f109f..a9171f867 100644 --- a/redhat/kdenetwork/trinity-kdenetwork-3.5.13.spec +++ b/redhat/kdenetwork/trinity-kdenetwork-3.5.13.spec @@ -2,7 +2,7 @@ %if "%{?version}" == "" %define version 3.5.13 %endif -%define release 3 +%define release 4 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -21,8 +21,6 @@ BuildRequires: cmake >= 2.8 ## Conditional build: # disabled, for now, doesn't build -- Rex -#define _enable_jingle --enable-jingle -#define _enable_slp --enable-slp # RHEL6: xmms is outdated ! #define _with_xmms --with-xmms %ifnarch s390 s390x @@ -60,6 +58,15 @@ Patch4: kdenetwork-3.2.3-resolv.patch # include more/proper ppp headers Patch6: kdenetwork-3.5.9-krfb_httpd.patch +# TDE 3.5.13 Fedora/RHEL patches +Patch10: kdenetwork-3.5.13-kopete_msn_protocol.patch +Patch11: kdenetwork-3.5.13-kopete_sms_protocol.patch +Patch12: kdenetwork-3.5.13-kopete_jabber_protocol.patch +Patch13: kdenetwork-3.5.13-kopete_motionawayplugin_ftbfs.patch +Patch14: kdenetwork-3.5.13-reference_to_qmake_h.patch +# WTF is this ? shitty hack in autotool was forgotten in CMAKE port ! +Source10: kdenetwork-3.5.13-dummy.cpp + Requires: %{name}-libs = %{version}-%{release} BuildRequires: gettext @@ -76,7 +83,7 @@ BuildRequires: wireless-tools-devel BuildRequires: wireless-tools %endif %endif -%{?_enable_slp:BuildRequires: openslp-devel} +BuildRequires: openslp-devel ## kopete: BuildRequires: libxml2-devel libxslt-devel %ifarch %{ix86} @@ -86,7 +93,7 @@ BuildRequires: valgrind #jabber BuildRequires: libidn-devel #jabber/jingle -%{?_enable_jingle:BuildRequires: expat-devel glib2-devel ortp-devel speex-devel} +BuildRequires: expat-devel glib2-devel ortp-devel speex-devel # jabber/ssl #{?fedora:Requires(hint): qca-tls} # sametime @@ -107,12 +114,8 @@ BuildRequires: avahi-qt3-devel BuildRequires: libv4l-devel %endif -# The following libraries are not available on RHEL -%if 0%{?fedora} >= 15 BuildRequires: libgadu-devel -BuildRequires: openslp-devel -BuildRequires: libjingle-devel -%endif +BuildRequires: speex-devel %if 0%{?console_helper} Requires: usermode-gtk @@ -178,8 +181,16 @@ Requires: %{name} = %{version}-%{release} %endif %patch4 -p1 -b .resolv %patch6 -p1 -b .krfb_httpd +%patch10 -p1 +%patch11 -p1 +%patch12 -p1 +%patch13 -p1 +%patch14 -p1 +# TDE 3.5.13: missing 'dummy.cpp' in MSN protocol +%__install -m 644 %{SOURCE10} kopete/protocols/msn/dummy.cpp + %build unset QTDIR || : ; . /etc/profile.d/qt.sh export PATH="%{_bindir}:${PATH}" @@ -193,12 +204,14 @@ cd build -DWITH_JINGLE=ON \ -DWITH_SPEEX=ON \ -DWITH_WEBCAM=ON \ - -DWITH_GSM=ON \ + -DWITH_GSM=OFF \ -DWITH_ARTS=ON \ -DBUILD_ALL=ON \ + -DBUILD_KOPETE_PROTOCOL_ALL=ON \ + -DBUILD_KOPETE_PLUGIN_ALL=ON \ .. -# Do not use '%{?_smp_mflags}' because it will fail to build ! +# kdenetwork building is not SMP safe %__make @@ -251,17 +264,21 @@ EOF %endif # ktalk -install -p -m 0644 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/xinetd.d/ktalk +%__install -p -m 0644 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/xinetd.d/ktalk # Add lisa startup script -install -p -m 0644 -D %{SOURCE4} %{buildroot}%{_sysconfdir}/lisarc -install -p -m 0755 -D %{SOURCE5} %{buildroot}%{_initrddir}/lisa +%__install -p -m 0644 -D %{SOURCE4} %{buildroot}%{_sysconfdir}/lisarc +%__install -p -m 0755 -D %{SOURCE5} %{buildroot}%{_initrddir}/lisa # RHEL 5: Avoids conflict with 'kdenetwork' %if 0%{?rhel} == 5 %__mv -f %{buildroot}%{_sysconfdir}/lisarc %{buildroot}%{_sysconfdir}/lisarc.tde %endif +# Avoids conflict with trinity-kvirc +%__mv -f %{buildroot}%{_datadir}/services/irc.protocol %{buildroot}%{_datadir}/apps/kopete/ + + %post /sbin/chkconfig --add lisa ||: for f in crystalsvg hicolor locolor ; do @@ -473,6 +490,11 @@ done %changelog +* Sun Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-4 +- Enable Kopete protocols & plugins compilation +- Enables all features (openslp, jingle, ...) on all distros +- Moves 'irc.protocol' file to prevent conflict with other packages + * Thu Nov 17 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-3 - Fix symbolic link to 'consolehelper' diff --git a/redhat/kdepim/trinity-kdepim-3.5.13.spec b/redhat/kdepim/trinity-kdepim-3.5.13.spec index a2fb37818..9482748e2 100644 --- a/redhat/kdepim/trinity-kdepim-3.5.13.spec +++ b/redhat/kdepim/trinity-kdepim-3.5.13.spec @@ -2,7 +2,7 @@ %if "%{?version}" == "" %define version 3.5.13 %endif -%define release 2 +%define release 3 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -46,6 +46,7 @@ BuildRequires: libgpg-error-devel BuildRequires: flex BuildRequires: libical-devel BuildRequires: boost-devel +BuildRequires: curl-devel BuildRequires: libcaldav-devel BuildRequires: libcarddav-devel @@ -143,8 +144,9 @@ export PATH="%{_bindir}:${PATH}" %{_datadir}/config.kcfg/* %{_libdir}/lib*.so.* %{tde_libdir}/*.so -#%{tde_libdir}/*.so.* +%{tde_libdir}/*.la %{tde_libdir}/plugins/designer/*.so +%{tde_libdir}/plugins/designer/*.la %{_datadir}/servicetypes/* %{_libdir}/kconf_update_bin/* %{_libdir}/libakregatorprivate.so @@ -157,14 +159,15 @@ export PATH="%{_bindir}:${PATH}" %{_libdir}/*.la %{_libdir}/*.so %{_includedir}/* -%{tde_libdir}/*.la -%{tde_libdir}/plugins/designer/*.la %exclude %{_libdir}/libakregatorprivate.so %exclude %{_libdir}/libkmailprivate.so %exclude %{_libdir}/libkmobiledevice.so %{_datadir}/cmake/*.cmake %changelog +* Sun Nov 27 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-3 +- Add missing files '*.la' + * Fri Nov 04 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-2 - Updates BuildRequires |
