diff options
24 files changed, 1582 insertions, 114 deletions
diff --git a/redhat/components.txt b/redhat/components.txt index 9a4b4836d..2492fc6f5 100644 --- a/redhat/components.txt +++ b/redhat/components.txt @@ -5,3 +5,9 @@ dependencies/arts kdelibs kdebase kdebindings +kdeutils +kdepim +kdesdk +kdevelop +kdemultimedia +kdeartwork diff --git a/redhat/dependencies/arts/trinity-arts-3.5.12.spec b/redhat/dependencies/arts/trinity-arts-3.5.12.spec index 16ccd741e..8793f5d53 100755 --- a/redhat/dependencies/arts/trinity-arts-3.5.12.spec +++ b/redhat/dependencies/arts/trinity-arts-3.5.12.spec @@ -18,7 +18,9 @@ Version: %{?version} Release: %{?release}%{?dist}%{?_variant} License: GPL Summary: aRts (analog realtime synthesizer) - the KDE sound system + Vendor: Trinity Project +URL: http://www.trinitydesktop.org/ Packager: Francois Andriot <francois.andriot@free.fr> Source0: arts-%{version}.tar.gz @@ -29,6 +31,7 @@ BuildRequires: audiofile-devel BuildRequires: alsa-lib-devel BuildRequires: glib2-devel BuildRequires: libtool-ltdl-devel +BuildRequires: gsl-devel Requires: tqtinterface Requires: audiofile @@ -65,7 +68,7 @@ Development files for %{name} %__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 +%__make -f "admin/Makefile.common" %build export PATH="%{_bindir}:${PATH}" diff --git a/redhat/dependencies/arts/trinity-arts-3.5.13.spec b/redhat/dependencies/arts/trinity-arts-3.5.13.spec index 2a2cd2fba..fd2d6104d 100755 --- a/redhat/dependencies/arts/trinity-arts-3.5.13.spec +++ b/redhat/dependencies/arts/trinity-arts-3.5.13.spec @@ -18,7 +18,9 @@ Version: %{?version} Release: %{?release}%{?dist}%{?_variant} License: GPL Summary: aRts (analog realtime synthesizer) - the KDE sound system + Vendor: Trinity Project +URL: http://www.trinitydesktop.org/ Packager: Francois Andriot <francois.andriot@free.fr> Source0: arts-%{version}.tar.gz @@ -29,6 +31,7 @@ BuildRequires: audiofile-devel BuildRequires: alsa-lib-devel BuildRequires: glib2-devel BuildRequires: libtool-ltdl-devel +BuildRequires: gsl-devel Requires: tqtinterface Requires: audiofile @@ -69,6 +72,7 @@ unset QTDIR || : ; . /etc/profile.d/qt.sh %__mkdir build cd build %cmake \ + -DINCLUDE_INSTALL_DIR=%{_includedir}/arts \ -DPKGCONFIG_INSTALL_DIR=%{_libdir}/pkgconfig \ -DWITH_MAD=OFF \ .. diff --git a/redhat/dependencies/tqtinterface/tqtinterface-3.5.12.spec b/redhat/dependencies/tqtinterface/tqtinterface-3.5.12.spec index 10c5fd0d6..7532187c3 100755 --- a/redhat/dependencies/tqtinterface/tqtinterface-3.5.12.spec +++ b/redhat/dependencies/tqtinterface/tqtinterface-3.5.12.spec @@ -14,9 +14,9 @@ %define _includedir %{_prefix}/include/tqt # TDE 3.5.12 specific building variables -BuildRequires: autoconf automake libtool m4 +BuildRequires: autoconf automake libtool m4 BuildRequires: qt3-devel >= 3.3.8b -Requires: qt3 >= 3.3.8b +Requires: qt3 >= 3.3.8b Name: tqtinterface @@ -24,7 +24,9 @@ Version: %{version} Release: %{release}%{?dist}%{?_variant} License: GPL Summary: Trinity QT Interface + Vendor: Trinity Project +URL: http://www.trinitydesktop.org/ Packager: Francois Andriot <francois.andriot@free.fr> Prefix: %{_prefix} @@ -51,7 +53,7 @@ Development files for %{name} %__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 +%__make -f "admin/Makefile.common" %build unset QTDIR || : ; . /etc/profile.d/qt.sh diff --git a/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.spec b/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.spec index 3a35c6866..859afa0bd 100755 --- a/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.spec +++ b/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.spec @@ -7,6 +7,9 @@ # 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 cmake_modules_dir %{_datadir}/cmake +%else +%define cmake_modules_dir %{_datadir}/cmake/Modules %endif # TQT include files may conflict with QT4 includes, so we move them to a subdirectory. @@ -14,9 +17,9 @@ %define _includedir %{_prefix}/include/tqt # TDE 3.5.13 specific building variables -BuildRequires: cmake >= 2.8 +BuildRequires: cmake >= 2.8 BuildRequires: qt3-devel >= 3.3.8d -Requires: qt3 >= 3.3.8d +Requires: qt3 >= 3.3.8d Name: tqtinterface @@ -24,7 +27,9 @@ Version: %{version} Release: %{release}%{?dist}%{?_variant} License: GPL Summary: Trinity QT Interface + Vendor: Trinity Project +URL: http://www.trinitydesktop.org/ Packager: Francois Andriot <francois.andriot@free.fr> Prefix: %{_prefix} @@ -77,9 +82,9 @@ sed -i %{?buildroot}%{_libdir}/pkgconfig/tqt.pc \ -e '/^uic_executable=.*/ s,^\(uic_executable=\).*,\1%{_bindir}/uic-tqt,' # Install 'cmake' modules for a specific package (for later use) -%__mkdir_p %{?buildroot}%{_usr}/share/cmake/Modules +%__mkdir_p %{?buildroot}%{cmake_modules_dir} for i in cmake/modules/*.cmake; do - install -m 644 $i %{?buildroot}%{_usr}/share/cmake/Modules + install -m 644 $i %{?buildroot}%{cmake_modules_dir} done %clean @@ -94,7 +99,7 @@ done %{_libdir}/*.so %{_libdir}/*.la %{_libdir}/pkgconfig/*.pc -%{_usr}/share/cmake/Modules/*.cmake +%{cmake_modules_dir}/*.cmake %changelog diff --git a/redhat/kdeartwork/trinity-kdeartwork-3.5.12.spec b/redhat/kdeartwork/trinity-kdeartwork-3.5.12.spec new file mode 100644 index 000000000..909ca1a51 --- /dev/null +++ b/redhat/kdeartwork/trinity-kdeartwork-3.5.12.spec @@ -0,0 +1,179 @@ +# Default version for this component +%if "%{?version}" == "" +%define version 3.5.12 +%endif +%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" +%define _variant .opt +%define _docdir %{_prefix}/share/doc +%endif + +# TDE 3.5.12 specific building variables +BuildRequires: autoconf automake libtool m4 +%define tde_libdir %{_libdir}/kde3 + + +Name: trinity-kdeartwork +Summary: Additional artwork (themes, sound themes, ...) for KDE +Version: %{?version} +Release: %{?release}%{?dist}%{?_variant} + +License: GPLv2 +Group: User Interface/Desktops +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Vendor: Trinity Project +Packager: Francois Andriot <francois.andriot@free.fr> +Url: http://www.trinitydesktop.org/ + +Source: kdeartwork-%{version}.tar.gz + +# FIXME: this should go in kde-settings -- Rex +Source1: webcollagerc + +BuildRequires: gettext +BuildRequires: trinity-kdebase-devel +BuildRequires: libart_lgpl-devel +BuildRequires: nas-devel esound-devel jack-audio-connection-kit-devel + +Requires: trinity-kdebase + +%description +Additional artwork (themes, sound themes, screensavers ...) for KDE. + +# TODO: build this subpkg noarch +%package icons +Summary: Icon themes (kdeclassic, slick ....) for KDE +Group: User Interface/Desktops +%description icons +%{summary}. + + +%prep +%setup -q -n kdeartwork + +%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +%__make -f "admin/Makefile.common" + + +%build +unset QTDIR || : ; . /etc/profile.d/qt.sh +export PATH="%{_bindir}:${PATH}" +export LDFLAGS="-L%{_libdir} -I%{_includedir}" + + +%configure \ + --disable-rpath \ + --enable-new-ldflags \ + --disable-dependency-tracking \ + --disable-debug --disable-warnings \ + --enable-final \ + --with-extra-includes=%{_includedir}/tqt + +%__make %{?_smp_mflags} + + +%install +export PATH="%{_bindir}:${PATH}" +%__rm -rf %{buildroot} + +%make_install + +# webcollage -root -directory /usr/share/backgrounds/images #227683 + +# rpmdocs +for dir in IconThemes/* kworldclock kscreensaver/kxsconfig ; do + for file in AUTHORS ChangeLog COPYRIGHT README TODO ; do + test -s "$dir/$file" && install -p -m644 -D "$dir/$file" "rpmdocs/$dir/$file" + done +done + +# File lists +%find_lang %{name} || touch %{name}.lang +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 + +# kde vs xscreensaver based screensavers +for screensaver in %{buildroot}%{_datadir}/applnk/System/ScreenSavers/*.desktop ; do + if [ `grep '^TryExec=xscreensaver' $screensaver` ]; then + echo $screensaver | sed -e "s|%{buildroot}||" >> %{name}-extras.lang + else + echo $screensaver | sed -e "s|%{buildroot}||" >> %{name}.lang + fi +done + + + +%post icons +for i in locolor ikons kdeclassic kids slick ; do + touch --no-create %{_datadir}/icons/$i 2>/dev/null || : + %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/$i 2>/dev/null || : +done + +%postun icons +for i in locolor ikons kdeclassic kids slick ; do + touch --no-create %{_datadir}/icons/$i 2>/dev/null || : + %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/$i 2>/dev/null || : +done + +%clean +%__rm -rf %{buildroot} + +%files -f %{name}.lang +%defattr(-,root,root,-) +%doc kwin-styles/smooth-blend/COPYING +%doc rpmdocs/kworldclock +%{_bindir}/*.kss +%{tde_libdir}/plugins/styles/* +%{tde_libdir}/*.so +%{tde_libdir}/*.la +%{_datadir}/apps/kfiresaver/ +%{_datadir}/apps/kscreensaver/ +%{_datadir}/apps/kstyle/themes/* +%{_datadir}/apps/kwin/* +%{_datadir}/apps/kworldclock/ +%{_datadir}/sounds/* +%{_datadir}/wallpapers/* +%{_datadir}/emoticons/* +%{_bindir}/kxs* + +%files icons +%defattr(-,root,root,-) +%doc rpmdocs/IconThemes/* +%{_datadir}/icons/ikons/ +%{_datadir}/icons/kdeclassic/ +%{_datadir}/icons/kids/ +%{_datadir}/icons/Locolor/ +%{_datadir}/icons/slick/ + + + +%changelog +* Sun Sep 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-4 +- Import to GIT + +* Tue Aug 23 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-3 +- Add correction for Fedora 15 + +* Mon Aug 22 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-2 +- Correct macro to install under "/opt", if desired + +* Fri Aug 05 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-1 +- Initial version +- Spec file based on Fedora 8 "kdeartwork 3.5.10-1" diff --git a/redhat/kdeartwork/trinity-kdeartwork-3.5.13.spec b/redhat/kdeartwork/trinity-kdeartwork-3.5.13.spec new file mode 100644 index 000000000..6a0ef7146 --- /dev/null +++ b/redhat/kdeartwork/trinity-kdeartwork-3.5.13.spec @@ -0,0 +1,169 @@ +# Default version for this component +%if "%{?version}" == "" +%define version 3.5.13 +%endif +%define release 0 + +# 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_libdir %{_libdir}/trinity + + +Name: trinity-kdeartwork +Summary: Additional artwork (themes, sound themes, ...) for KDE +Version: %{?version} +Release: %{?release}%{?dist}%{?_variant} + +License: GPLv2 +Group: User Interface/Desktops +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Vendor: Trinity Project +Packager: Francois Andriot <francois.andriot@free.fr> +Url: http://www.trinitydesktop.org/ + +Source: kdeartwork-%{version}.tar.gz + +# FIXME: this should go in kde-settings -- Rex +Source1: webcollagerc + +BuildRequires: gettext +BuildRequires: trinity-kdebase-devel +BuildRequires: libart_lgpl-devel +BuildRequires: nas-devel esound-devel jack-audio-connection-kit-devel + +Requires: trinity-kdebase + +%description +Additional artwork (themes, sound themes, screensavers ...) for KDE. + +# TODO: build this subpkg noarch +%package icons +Summary: Icon themes (kdeclassic, slick ....) for KDE +Group: User Interface/Desktops +%description icons +%{summary}. + + +%prep +%setup -q -n kdeartwork + +%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +%__make -f "admin/Makefile.common" + + +%build +unset QTDIR || : ; . /etc/profile.d/qt.sh +export PATH="%{_bindir}:${PATH}" +export LDFLAGS="-L%{_libdir} -I%{_includedir}" + + +%configure \ + --disable-rpath \ + --enable-new-ldflags \ + --disable-dependency-tracking \ + --disable-debug --disable-warnings \ + --enable-final \ + --with-extra-includes=%{_includedir}/tqt + +%__make %{?_smp_mflags} + + +%install +export PATH="%{_bindir}:${PATH}" +%__rm -rf %{buildroot} + +%make_install + +# webcollage -root -directory /usr/share/backgrounds/images #227683 + +# rpmdocs +for dir in IconThemes/* kworldclock kscreensaver/kxsconfig ; do + for file in AUTHORS ChangeLog COPYRIGHT README TODO ; do + test -s "$dir/$file" && install -p -m644 -D "$dir/$file" "rpmdocs/$dir/$file" + done +done + +# File lists +%find_lang %{name} || touch %{name}.lang +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 + +# kde vs xscreensaver based screensavers +for screensaver in %{buildroot}%{_datadir}/applnk/System/ScreenSavers/*.desktop ; do + if [ `grep '^TryExec=xscreensaver' $screensaver` ]; then + echo $screensaver | sed -e "s|%{buildroot}||" >> %{name}-extras.lang + else + echo $screensaver | sed -e "s|%{buildroot}||" >> %{name}.lang + fi +done + + + +%post icons +for i in locolor ikons kdeclassic kids slick ; do + touch --no-create %{_datadir}/icons/$i 2>/dev/null || : + %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/$i 2>/dev/null || : +done + +%postun icons +for i in locolor ikons kdeclassic kids slick ; do + touch --no-create %{_datadir}/icons/$i 2>/dev/null || : + %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/$i 2>/dev/null || : +done + +%clean +rm -rf %{buildroot} + +%files -f %{name}.lang +%defattr(-,root,root,-) +%doc kwin-styles/smooth-blend/COPYING +%doc rpmdocs/kworldclock +%{_bindir}/*.kss +%{tde_libdir}/plugins/styles/* +%{tde_libdir}/*.so +%{tde_libdir}/*.la +%{_datadir}/apps/kfiresaver/ +%{_datadir}/apps/kscreensaver/ +%{_datadir}/apps/kstyle/themes/* +%{_datadir}/apps/kwin/* +%{_datadir}/apps/kworldclock/ +%{_datadir}/sounds/* +%{_datadir}/wallpapers/* +%{_datadir}/emoticons/* +%{_bindir}/kxs* + +%files icons +%defattr(-,root,root,-) +%doc rpmdocs/IconThemes/* +%{_datadir}/icons/ikons/ +%{_datadir}/icons/kdeclassic/ +%{_datadir}/icons/kids/ +%{_datadir}/icons/Locolor/ +%{_datadir}/icons/slick/ + + + +%changelog +* Sun Sep 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-0 +- Import to GIT diff --git a/redhat/kdebase/trinity-kdebase-3.5.12.spec b/redhat/kdebase/trinity-kdebase-3.5.12.spec index 8f2012085..79f260e10 100755 --- a/redhat/kdebase/trinity-kdebase-3.5.12.spec +++ b/redhat/kdebase/trinity-kdebase-3.5.12.spec @@ -1,21 +1,34 @@ +# Default version for this component +%if "%{?version}" == "" +%define version 3.5.12 +%endif +%define release 6 + # 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.12 specific building variables +BuildRequires: autoconf automake libtool m4 +%define tde_docdir %{_docdir} +%define tde_libdir %{_libdir}/kde3 + Name: trinity-kdebase -Version: 3.5.12 -Release: 9%{?dist}%{?_variant} +Version: %{?version} +Release: %{?release}%{?dist}%{?_variant} License: GPL -Vendor: Trinity Project -Packager: Thales Communications Summary: Trinity KDE Base Programs +Vendor: Trinity Project +Packager: Francois Andriot <francois.andriot@free.fr> +URL: http://www.trinitydesktop.org/ + Prefix: %{_prefix} -Source0: http://mirror3.tokra.lv/releases/3.5.12/kdebase-3.5.12.tar.gz +Source0: kdebase-%{version}.tar.gz # Wrapper script to prevent Plasma launch at Trinity Startup Source1: plasma-desktop @@ -159,7 +172,7 @@ Protocol handlers (KIOslaves) for personal information management, including: %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" -%__make -f admin/Makefile.common +%__make -f "admin/Makefile.common" %build unset QTDIR || : ; . /etc/profile.d/qt.sh @@ -298,7 +311,7 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %exclude %{_datadir}/icons/hicolor/*/apps/kpager.png %doc AUTHORS COPYING README -%{_docdir}/HTML/en/* +%{tde_docdir}/HTML/en/* %config(noreplace) %{_sysconfdir}/ksysguarddrc.tde %{_bindir}/genkdmconf %{_bindir}/kaccess @@ -408,7 +421,7 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %{_datadir}/servicetypes/* %{_datadir}/sounds/* %{_docdir}/kdm/README -%{_libdir}/kde3/* +%{tde_libdir}/* %{_libdir}/libkdeinit_*.* %{_sysconfdir}/xdg/menus/applications-merged/kde-essential.menu %{_sysconfdir}/xdg/menus/kde-information.menu @@ -423,10 +436,10 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %exclude %{_datadir}/config %endif # exclude pim-ioslaves files from main package -%exclude %{_libdir}/kde3/kio_ldap.* -%exclude %{_libdir}/kde3/kio_nntp.* -%exclude %{_libdir}/kde3/kio_pop3.* -%exclude %{_libdir}/kde3/kio_smtp.* +%exclude %{tde_libdir}/kio_ldap.* +%exclude %{tde_libdir}/kio_nntp.* +%exclude %{tde_libdir}/kio_pop3.* +%exclude %{tde_libdir}/kio_smtp.* %exclude %{_datadir}/services/ldap*.protocol %exclude %{_datadir}/services/nntp*.protocol %exclude %{_datadir}/services/pop3*.protocol @@ -440,10 +453,10 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %files pim-ioslaves %defattr(-,root,root,-) -%{_libdir}/kde3/kio_ldap.* -%{_libdir}/kde3/kio_nntp.* -%{_libdir}/kde3/kio_pop3.* -%{_libdir}/kde3/kio_smtp.* +%{tde_libdir}/kio_ldap.* +%{tde_libdir}/kio_nntp.* +%{tde_libdir}/kio_pop3.* +%{tde_libdir}/kio_smtp.* %{_datadir}/services/ldap*.protocol %{_datadir}/services/nntp*.protocol %{_datadir}/services/pop3*.protocol diff --git a/redhat/kdebase/trinity-kdebase-3.5.13.spec b/redhat/kdebase/trinity-kdebase-3.5.13.spec index e665696e7..c52d2f2b0 100755 --- a/redhat/kdebase/trinity-kdebase-3.5.13.spec +++ b/redhat/kdebase/trinity-kdebase-3.5.13.spec @@ -2,6 +2,7 @@ %if "%{?version}" == "" %define version 3.5.13 %endif +%define release 0 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -9,14 +10,21 @@ %define _docdir %{_prefix}/share/doc %endif +# TDE 3.5.13 specific building variables +BuildRequires: cmake >= 2.8 +%define tde_docdir %{_docdir}/kde +%define tde_libdir %{_libdir}/trinity + Name: trinity-kdebase -Version: %{version} -Release: 0%{?dist}%{?_variant} +Version: %{?version} +Release: %{?release}%{?dist}%{?_variant} License: GPL +Summary: Trinity KDE Base Programs + Vendor: Trinity Project Packager: Francois Andriot <francois.andriot@free.fr> -Summary: Trinity KDE Base Programs +URL: http://www.trinitydesktop.org/ Prefix: %{_prefix} @@ -136,6 +144,9 @@ Protocol handlers (KIOslaves) for personal information management, including: %patch5 -p1 %patch6 -p1 +# Gets the cmake modules in current build directory +%__mkdir_p cmake/modules +%__cp -f %{_datadir}/cmake/*.* cmake/modules %build unset QTDIR || : ; . /etc/profile.d/qt.sh @@ -278,7 +289,7 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %exclude %{_datadir}/icons/hicolor/*/apps/kpager.png %doc AUTHORS COPYING README -%{_docdir}/kde/HTML/en/* +%{tde_docdir}/HTML/en/* %config(noreplace) %{_sysconfdir}/ksysguarddrc.tde %{_bindir}/genkdmconf %{_bindir}/kaccess @@ -384,7 +395,7 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %{_datadir}/services/* %{_datadir}/servicetypes/* %{_datadir}/sounds/* -%{_libdir}/trinity/* +%{tde_libdir}/* %{_libdir}/libkdeinit_*.* %{_sysconfdir}/xdg/menus/applications-merged/kde-essential.menu %{_sysconfdir}/xdg/menus/kde-information.menu @@ -398,10 +409,10 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %exclude %{_datadir}/config %endif # exclude pim-ioslaves files from main package -%exclude %{_libdir}/trinity/kio_ldap.* -%exclude %{_libdir}/trinity/kio_nntp.* -%exclude %{_libdir}/trinity/kio_pop3.* -%exclude %{_libdir}/trinity/kio_smtp.* +%exclude %{tde_libdir}/kio_ldap.* +%exclude %{tde_libdir}/kio_nntp.* +%exclude %{tde_libdir}/kio_pop3.* +%exclude %{tde_libdir}/kio_smtp.* %exclude %{_datadir}/services/ldap*.protocol %exclude %{_datadir}/services/nntp*.protocol %exclude %{_datadir}/services/pop3*.protocol @@ -418,10 +429,10 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %files pim-ioslaves %defattr(-,root,root,-) -%{_libdir}/trinity/kio_ldap.* -%{_libdir}/trinity/kio_nntp.* -%{_libdir}/trinity/kio_pop3.* -%{_libdir}/trinity/kio_smtp.* +%{tde_libdir}/kio_ldap.* +%{tde_libdir}/kio_nntp.* +%{tde_libdir}/kio_pop3.* +%{tde_libdir}/kio_smtp.* %{_datadir}/services/ldap*.protocol %{_datadir}/services/nntp*.protocol %{_datadir}/services/pop3*.protocol diff --git a/redhat/kdebindings/trinity-kdebindings-3.5.12.spec b/redhat/kdebindings/trinity-kdebindings-3.5.12.spec index 09bb8658f..2dcdc061f 100644 --- a/redhat/kdebindings/trinity-kdebindings-3.5.12.spec +++ b/redhat/kdebindings/trinity-kdebindings-3.5.12.spec @@ -22,10 +22,11 @@ Version: %{?version} Release: %{?release}%{?dist}%{_variant} License: GPLv2 -URL: http://developer.kde.org/language-bindings/ +Group: User Interface/Desktops + Vendor: Trinity Project Packager: Francois Andriot <francois.andriot@free.fr> -Group: User Interface/Desktops +URL: http://developer.kde.org/language-bindings/ Source0: kdebindings-%{version}.tar.gz diff --git a/redhat/kdebindings/trinity-kdebindings-3.5.13.spec b/redhat/kdebindings/trinity-kdebindings-3.5.13.spec index 447db3d1e..f4ea50005 100644 --- a/redhat/kdebindings/trinity-kdebindings-3.5.13.spec +++ b/redhat/kdebindings/trinity-kdebindings-3.5.13.spec @@ -22,10 +22,11 @@ Version: %{?version} Release: %{?release}%{?dist}%{_variant} License: GPLv2 -URL: http://developer.kde.org/language-bindings/ +Group: User Interface/Desktops + Vendor: Trinity Project Packager: Francois Andriot <francois.andriot@free.fr> -Group: User Interface/Desktops +URL: http://developer.kde.org/language-bindings/ Source0: kdebindings-%{version}.tar.gz diff --git a/redhat/kdelibs/trinity-kdelibs-3.5.12.spec b/redhat/kdelibs/trinity-kdelibs-3.5.12.spec index 65c60a318..4604f78d8 100755 --- a/redhat/kdelibs/trinity-kdelibs-3.5.12.spec +++ b/redhat/kdelibs/trinity-kdelibs-3.5.12.spec @@ -1,22 +1,35 @@ +# Default version for this component +%if "%{?version}" == "" +%define version 3.5.12 +%endif +%define release 5 + # 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.12 specific variables +BuildRequires: autoconf automake libtool m4 +%define tde_docdir %{_docdir} +%define tde_libdir %{_libdir}/kde3 + Name: trinity-kdelibs -Version: 3.5.12 -Release: 5%{?dist}%{?_variant} +Version: %{version} +Release: %{?release}%{?dist}%{?_variant} License: GPL +Summary: Trinity KDE Libraries + Vendor: Trinity Project Packager: Francois Andriot <francois.andriot@free.fr> -Summary: Trinity KDE Libraries +URL: http://www.trinitydesktop.org/ Source0: kdelibs-%{version}.tar.gz Prefix: %{_prefix} -BuildRequires: autoconf automake libtool m4 +BuildRequires: libtool BuildRequires: tqtinterface-devel BuildRequires: trinity-arts-devel BuildRequires: qt3-devel @@ -59,15 +72,18 @@ format for easy browsing %prep %setup -q -n kdelibs + %__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 +%__make -f "admin/Makefile.common" + %build unset QTDIR || : ; . /etc/profile.d/qt.sh export PATH="%{_bindir}:${PATH}" export LD_LIBRARY_PATH="%{_libdir}" export LDFLAGS="-L%{_libdir} -I%{_includedir}" + %configure \ --disable-rpath \ --enable-new-ldflags \ @@ -94,18 +110,12 @@ export LDFLAGS="-L%{_libdir} -I%{_includedir}" # Do NOT use %{?_smp_mflags} for this package, or it will fail to build ! %__make + %install %__rm -rf %{?buildroot} %__mkdir_p %{?buildroot} %make_install -%__mkdir_p %{?buildroot}%{_sysconfdir}/ld.so.conf.d -cat <<EOF >%{?buildroot}%{_sysconfdir}/ld.so.conf.d/trinity.conf -%if "%{?_prefix}" != "/usr" -%{_libdir} -%endif -%{_libdir}/trinity -EOF %clean %__rm -rf %{?buildroot} @@ -179,7 +189,7 @@ EOF %{_libdir}/lib*.so.* %{_libdir}/libkdeinit_*.so %{_libdir}/lib*.la -%{_libdir}/kde3/ +%{tde_libdir}/ %{_datadir}/applications/kde/*.desktop %{_datadir}/autostart/kab2kabc.desktop %{_datadir}/applnk/kio_iso.desktop @@ -193,7 +203,7 @@ EOF %{_datadir}/services/* %{_datadir}/servicetypes/* %{_datadir}/icons/crystalsvg/ -%{_docdir}/HTML/en/kspell +%{tde_docdir}/HTML/en/kspell # remove conflicts with kdelibs-4 %if "%{?_prefix}" != "/usr" %{_bindir}/checkXML @@ -202,7 +212,7 @@ EOF %{_bindir}/preparetips %{_datadir}/icons/hicolor/index.theme %{_datadir}/locale/all_languages -%{_docdir}/HTML/en/common/* +%{tde_docdir}/HTML/en/common/* %else %exclude %{_bindir}/checkXML %exclude %{_bindir}/ksvgtopng @@ -215,9 +225,8 @@ EOF %exclude %{_datadir}/config/ui/ui_standards.rc %exclude %{_datadir}/icons/hicolor/index.theme %exclude %{_datadir}/locale/all_languages -%exclude %{_docdir}/HTML/en/common/* +%exclude %{tde_docdir}/HTML/en/common/* %endif -%{_sysconfdir}/ld.so.conf.d/trinity.conf # Provided by 'redhat-menus' package %exclude %{_sysconfdir}/xdg/menus/applications.menu @@ -236,7 +245,7 @@ EOF %files apidocs %defattr(-,root,root,-) %{_docdir}/%{name}-%{version}/ -%{_docdir}/HTML/en/kdelibs* +%{tde_docdir}/HTML/en/kdelibs* %changelog diff --git a/redhat/kdelibs/trinity-kdelibs-3.5.13.spec b/redhat/kdelibs/trinity-kdelibs-3.5.13.spec index efa1ae90a..4b98b33f9 100755 --- a/redhat/kdelibs/trinity-kdelibs-3.5.13.spec +++ b/redhat/kdelibs/trinity-kdelibs-3.5.13.spec @@ -2,6 +2,7 @@ %if "%{?version}" == "" %define version 3.5.13 %endif +%define release 0 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -9,19 +10,25 @@ %define _docdir %{_prefix}/share/doc %endif +# TDE 3.5.13 specific variables +BuildRequires: cmake >= 2.8 +%define tde_docdir %{_docdir}/kde +%define tde_libdir %{_libdir}/trinity + Name: trinity-kdelibs Version: %{version} -Release: 0%{?dist}%{?_variant} +Release: %{?release}%{?dist}%{?_variant} License: GPL +Summary: Trinity KDE Libraries + Vendor: Trinity Project Packager: Francois Andriot <francois.andriot@free.fr> -Summary: Trinity KDE Libraries +URL: http://www.trinitydesktop.org/ Source0: kdelibs-%{version}.tar.gz Prefix: %{_prefix} -BuildRequires: cmake >= 2.8 BuildRequires: libtool BuildRequires: tqtinterface-devel BuildRequires: trinity-arts-devel @@ -66,6 +73,11 @@ format for easy browsing %prep %setup -q -n kdelibs +# Gets the cmake modules in current build directory +%__mkdir_p cmake/modules +%__cp -f %{_datadir}/cmake/*.* cmake/modules + + %build unset QTDIR || : ; . /etc/profile.d/qt.sh export PATH="%{_bindir}:${PATH}" @@ -94,6 +106,7 @@ cd build %__make %{?_smp_mflags} + %install %__rm -rf %{?buildroot} %__mkdir_p %{?buildroot} @@ -179,7 +192,7 @@ EOF %{_libdir}/lib*.so.* %{_libdir}/libkdeinit_*.so %{_libdir}/lib*.la -%{_libdir}/trinity/ +%{tde_libdir}/ %{_datadir}/applications/kde/*.desktop %{_datadir}/autostart/kab2kabc.desktop %{_datadir}/applnk/kio_iso.desktop @@ -193,7 +206,7 @@ EOF %{_datadir}/services/* %{_datadir}/servicetypes/* %{_datadir}/icons/crystalsvg/ -%{_docdir}/kde/HTML/en/kspell +%{tde_docdir}/HTML/en/kspell # remove conflicts with kdelibs-4 %if "%{?_prefix}" != "/usr" %{_bindir}/checkXML @@ -202,7 +215,7 @@ EOF %{_bindir}/preparetips %{_datadir}/icons/hicolor/index.theme %{_datadir}/locale/all_languages -%{_docdir}/kde/HTML/en/common/* +%{tde_docdir}/HTML/en/common/* %else %exclude %{_bindir}/checkXML %exclude %{_bindir}/ksvgtopng @@ -215,7 +228,7 @@ EOF %exclude %{_datadir}/config/ui/ui_standards.rc %exclude %{_datadir}/icons/hicolor/index.theme %exclude %{_datadir}/locale/all_languages -%exclude %{_docdir}/kde/HTML/en/common/* +%exclude %{tde_docdir}/HTML/en/common/* %endif %{_sysconfdir}/ld.so.conf.d/trinity.conf @@ -242,7 +255,7 @@ EOF %files apidocs %defattr(-,root,root,-) %{_docdir}/%{name}-%{version}/ -#%{_docdir}/kde/HTML/en/kdelibs* +#%{tde_docdir}/HTML/en/kdelibs* %changelog diff --git a/redhat/kdemultimedia/kdemultimedia-3.4.0-xdg.patch b/redhat/kdemultimedia/kdemultimedia-3.4.0-xdg.patch new file mode 100644 index 000000000..445d88a40 --- /dev/null +++ b/redhat/kdemultimedia/kdemultimedia-3.4.0-xdg.patch @@ -0,0 +1,10 @@ +--- kdemultimedia-3.4.0/kappfinder-data/kde-multimedia-music.menu.tn 2005-04-25 16:16:32.000000000 +0200 ++++ kdemultimedia-3.4.0/kappfinder-data/kde-multimedia-music.menu 2005-04-25 16:17:51.000000000 +0200 +@@ -2,6 +2,7 @@ + "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd"> + + <Menu> ++<Name>Applications</Name> + <Menu> + <Name>Multimedia</Name> + <Exclude> diff --git a/redhat/kdemultimedia/kdemultimedia-3.5.7-pthread.patch b/redhat/kdemultimedia/kdemultimedia-3.5.7-pthread.patch new file mode 100644 index 000000000..70e2fe9c8 --- /dev/null +++ b/redhat/kdemultimedia/kdemultimedia-3.5.7-pthread.patch @@ -0,0 +1,11 @@ +--- kdemultimedia-3.5.7-patched/xine_artsplugin/Makefile.am.pthread 2006-07-22 03:10:54.000000000 -0500 ++++ kdemultimedia-3.5.7-patched/xine_artsplugin/Makefile.am 2007-06-28 06:50:53.000000000 -0500 +@@ -8,7 +8,7 @@ + xinePlayObject_impl.cpp \ + audio_fifo_out.c + libarts_xine_la_LDFLAGS = $(all_libraries) -module -no-undefined -pthread +-libarts_xine_la_LIBADD = $(XINE_LIBS) $(LIB_X11) $(LIB_XEXT) \ ++libarts_xine_la_LIBADD = $(XINE_LIBS) $(LIBPTHREAD) $(LIB_X11) $(LIB_XEXT) \ + -lkmedia2_idl -lsoundserver_idl -lartsflow + + libarts_xine_la_METASOURCES = AUTO diff --git a/redhat/kdemultimedia/kdemultimedia-svn.patch b/redhat/kdemultimedia/kdemultimedia-svn.patch new file mode 100644 index 000000000..669309d3f --- /dev/null +++ b/redhat/kdemultimedia/kdemultimedia-svn.patch @@ -0,0 +1,19 @@ +*** configure.in.in.ORI 2011-09-10 21:38:57.805533683 +0200 +--- configure.in.in 2011-09-10 21:39:08.687283728 +0200 +*************** +*** 542,548 **** + if test "x$build_arts" = "xyes" && test "x$ARTSCCONFIG" != "xno" ; then + LIB_ARTS="-lartskde" + ARTS_PREFIX=[`$ARTSCCONFIG --arts-prefix`] +! ARTS_CFLAGS="-I$ARTS_PREFIX/include/arts" + AC_DEFINE(HAVE_ARTS, 1, [have arts support in juk]) + else + build_arts="no" +--- 542,548 ---- + if test "x$build_arts" = "xyes" && test "x$ARTSCCONFIG" != "xno" ; then + LIB_ARTS="-lartskde" + ARTS_PREFIX=[`$ARTSCCONFIG --arts-prefix`] +! ARTS_CFLAGS="-I$ARTS_PREFIX/include" + AC_DEFINE(HAVE_ARTS, 1, [have arts support in juk]) + else + build_arts="no" diff --git a/redhat/kdemultimedia/trinity-kdemultimedia-3.5.12.spec b/redhat/kdemultimedia/trinity-kdemultimedia-3.5.12.spec new file mode 100644 index 000000000..502fe693f --- /dev/null +++ b/redhat/kdemultimedia/trinity-kdemultimedia-3.5.12.spec @@ -0,0 +1,389 @@ +# Default version for this component +%if "%{?version}" == "" +%define version 3.5.12 +%endif +%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.12 specific building variables +BuildRequires: autoconf automake libtool m4 +%define tde_docdir %{_docdir} +%define tde_includedir %{_includedir}/kde +%define tde_libdir %{_libdir}/kde3 + + +%define appdir %{_datadir}/applications/kde + +# former extras bits +#define _with_akode --with-akode +## not currently compatible with libtunepimp-0.5 (only libtunepimp-0.4) +#define _with_musicbrainz --with-musicbrainz +%define _with_taglib --with-taglib +%define _with_xine --with-xine + +Name: trinity-kdemultimedia +Summary: Multimedia applications for the K Desktop Environment (KDE) +Version: %{?version} +Release: %{?release}%{?dist}%{?_variant} + +License: GPLv2 +Group: Applications/Multimedia + +Vendor: Trinity Project +Packager: Francois Andriot <francois.andriot@free.fr> +URL: http://www.trinitydesktop.org/ + +Source0: kdemultimedia-%{version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Provides: kdemultimedia3 = %{version}-%{release} + +# RedHat Legacy patches (from Fedora 8) +Patch3: kdemultimedia-3.4.0-xdg.patch +Patch5: kdemultimedia-3.5.7-pthread.patch + +Requires: %{name}-libs = %{version}-%{release} + +BuildRequires: zlib-devel +BuildRequires: trinity-kdelibs-devel +BuildRequires: libvorbis-devel +BuildRequires: audiofile-devel +BuildRequires: desktop-file-utils +BuildRequires: libtheora-devel +BuildRequires: flac-devel +BuildRequires: alsa-lib-devel +BuildRequires: cdparanoia-devel cdparanoia +BuildRequires: gstreamer-devel +BuildRequires: automake libtool +%{?_with_akode:BuildRequires: akode-devel} +%{?_with_musicbrainz:BuildRequires: libmusicbrainz-devel libtunepimp-devel} +%{?_with_taglib:BuildRequires: taglib-devel} +%{?_with_xine:BuildRequires: xine-lib-devel} + +%description +The K Desktop Environment (KDE) is a GUI desktop for the X Window +System. The %{name} package contains multimedia applications for +KDE, including: + kmid, a midi player + kmix, an audio mixer + arts, additional functionality for the aRts sound system + krec, a recording tool + kscd, an Audio-CD player + kaudiocreator, a graphical frontend for audio file creation + +%package devel +Summary: Development files for %{name}, aRts and noatun plugins +Group: Development/Libraries +Provides: kdemultimedia3-devel = %{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} +# for noatun shlib(s) +Requires: %{name}-extras-libs = %{version}-%{release} +Requires: trinity-kdelibs-devel +%description devel +{summary}. +Install %{name}-devel if you wish to develop or compile any +applications using aRtsbuilder, aRtsmidi, aRtskde, aRts modules or +noatun plugins. + +%package extras +Summary: Extra applications from %{name} +Group: Applications/Multimedia +%if 0%{?libs} +Requires: %{name}-extras-libs = %{version}-%{release} +%else +Obsoletes: %{name}-extras-libs < %{version}-%{release} +Provides: %{name}-extras-libs = %{version}-%{release} +Requires(post): /sbin/ldconfig +Requires(postun): /sbin/ldconfig +%endif +%description extras +%{summary}, including: + * juk, a media player + * kaboodle, a media player + * noatun, a media player + +%package extras-libs +Summary: Extra %{name} runtime libraries +Group: System Environment/Libraries +Requires: %{name}-libs = %{version}-%{release} +%description extras-libs +%{summary}. + +%package libs +Summary: %{name} runtime libraries +Group: System Environment/Libraries +Requires: trinity-kdelibs +# include to be paranoid, installing libs-only is still mostly untested -- Rex +Requires: %{name} = %{version}-%{release} +%description libs +%{summary}. + + +%prep +%setup -q -n kdemultimedia +%patch3 -p1 -b .xdg +%patch5 -p1 -b .pthread + +%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +%__make -f "admin/Makefile.common" + + +%build +unset QTDIR || : ; . /etc/profile.d/qt.sh + +# just to be paranoid -- Rex +unset QTDIR || : ; . /etc/profile.d/qt.sh +export PATH="%{_bindir}:${PATH}" +export LDFLAGS="-L%{_libdir} -I%{_includedir}" + +%configure \ + --enable-new-ldflags \ + --disable-dependency-tracking \ + --includedir=%{tde_includedir} \ + --with-cdparanoia \ + --with-flac \ + --with-theora \ + --with-vorbis \ + --with-alsa \ + --with-gstreamer \ + --without-lame \ + --disable-debug \ + --disable-warnings \ + --enable-final \ + --disable-rpath \ + %{?_with_akode} %{!?_with_akode:--without-akode} \ + %{?_with_musicbrainz} %{!?_with_musicbrainz:--without-musicbrainz} \ + %{?_with_taglib} %{!?_with_taglib:--without-taglib} \ + %{?_with_xine} %{!?_with_xine:--without-xine} \ + --with-extra-includes=%{_usr}/include/cdda:%{_includedir}/tqt + +%__make %{?_smp_mflags} + + +%install +%__rm -rf %{buildroot} + +%make_install +%make_install -C kaudiocreator + +## Remove/uninstall (conflicting) bits we don't want +rm -f $RPM_BUILD_ROOT%{_libdir}/mcop/akode*MPEGPlayObject.mcopclass + +# only show in KDE, really? -- Rex (FIXME) +for f in %{buildroot}%{appdir}/*.desktop ; do + if [ -f %{buildroot}%{appdir}/*.desktop ] ; then + echo "OnlyShowIn=KDE;" >> $f + fi +done + +# don't make these world-writeable +chmod go-w %{buildroot}%{_datadir}/apps/kscd/* + +# locale's +%find_lang %{name} || touch %{name}.lang +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 ] && ln -nsf ../common $i/common + done + popd + fi +done +fi + +# rpmdocs +for dir in k* ; do + for file in AUTHORS ChangeLog README TODO ; do + if test -s "$dir/$file" ; then + install -p -m644 -D "$dir/$file" "rpmdocs/$dir/$file" + # exclude kaboodle, juk, noatun + if [ $dir != kaboodle -a $dir != juk -a $dir != noatun ] ; then + echo "%doc rpmdocs/$dir/" >> %{name}.lang + fi + fi + done +done + + +%post +%{?libs:/sbin/ldconfig} +for f in crystalsvg hicolor locolor ; do + touch --no-create %{_datadir}/icons/$f 2> /dev/null ||: + gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||: +done +update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : + +%postun +%{?libs:/sbin/ldconfig} +for f in crystalsvg hicolor locolor ; do + touch --no-create %{_datadir}/icons/$f 2> /dev/null ||: + gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||: +done +update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : + +%if 0%{?libs} +%post libs -p /sbin/ldconfig + +%postun libs -p /sbin/ldconfig + +%post extras-libs -p /sbin/ldconfig + +%postun extras-libs -p /sbin/ldconfig +%endif + +%post extras +%{?libs:/sbin/ldconfig} +for f in crystalsvg hicolor ; do + touch --no-create %{_datadir}/icons/$f 2> /dev/null ||: + gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||: +done +update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : + +%postun extras +%{?libs:/sbin/ldconfig} +for f in crystalsvg hicolor ; do + touch --no-create %{_datadir}/icons/$f 2> /dev/null ||: + gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||: +done +update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : + + +%clean +%__rm -rf %{buildroot} + + +%files extras +%defattr(-,root,root,-) + +# kaboodle +%doc rpmdocs/kaboodle/ +%doc %lang(en) %{_docdir}/HTML/en/kaboodle/ +%{_bindir}/kaboodle +%{tde_libdir}/libkaboodlepart.* +%{_datadir}/applications/kde/kaboodle.desktop +%{_datadir}/apps/kaboodle/ +%{_datadir}/icons/hicolor/*/apps/kaboodle.png +%{_datadir}/services/kaboodle* + +# noatun +%doc %lang(en) %{_docdir}/HTML/en/noatun/ +%{_bindir}/noatun +%{_libdir}/kconf_update_bin/noatun20update +%{tde_libdir}/noatun* +%{_libdir}/libartseffects.* +%{_libdir}/libwinskinvis.* +%{_libdir}/libkdeinit_noatun.* +%{_datadir}/applications/kde/noatun.desktop +%{_datadir}/apps/kconf_update/noatun.upd +%{_datadir}/apps/noatun/ +%{_datadir}/icons/hicolor/*/apps/noatun.png +%{_datadir}/mimelnk/interface/x-winamp-skin.desktop + +# juk +%doc %lang(en) %{_docdir}/HTML/en/juk/ +%{_bindir}/juk +%{_datadir}/applications/kde/juk.desktop +%{_datadir}/apps/juk/ +%{_datadir}/apps/konqueror/servicemenus/jukservicemenu.desktop +%{_datadir}/icons/crystalsvg/*/*/juk* +%{_datadir}/icons/hicolor/*/apps/juk.png + +%files extras-libs +%defattr(-,root,root,-) +%{_libdir}/libnoatun*.la +%{_libdir}/libnoatun*.so.* +%{_libdir}/libnoatunarts.so + +%files -f %{name}.lang +%defattr(-,root,root,-) +%doc COPYING + +# kaboodle +%exclude %{tde_docdir}/HTML/en/kaboodle/ +%exclude %{_bindir}/kaboodle +%exclude %{tde_libdir}/libkaboodlepart.* +%exclude %{_datadir}/applications/kde/kaboodle.desktop +%exclude %{_datadir}/apps/kaboodle/ +%exclude %{_datadir}/icons/hicolor/*/apps/kaboodle.png +%exclude %{_datadir}/services/kaboodle* + +# noatun +%exclude %{tde_docdir}/HTML/en/noatun/ +%exclude %{_bindir}/noatun +%exclude %{_libdir}/kconf_update_bin/noatun20update +%exclude %{tde_libdir}/noatun* +%exclude %{_libdir}/libartseffects.* +%exclude %{_libdir}/libkdeinit_noatun.* +%exclude %{_libdir}/libnoatunarts.* +%exclude %{_libdir}/libnoatuncontrols.* +%exclude %{_libdir}/libnoatun.* +%exclude %{_libdir}/libnoatuntags.* +%exclude %{_libdir}/libwinskinvis.* +%exclude %{_datadir}/applications/kde/noatun.desktop +%exclude %{_datadir}/apps/kconf_update/noatun.upd +%exclude %{_datadir}/apps/noatun/ +%exclude %{_datadir}/icons/hicolor/*/apps/noatun.png +%exclude %{_datadir}/mimelnk/interface/x-winamp-skin.desktop + +# juk +%exclude %{tde_docdir}/HTML/en/juk/ +%exclude %{_bindir}/juk +%exclude %{_datadir}/applications/kde/juk.desktop +%exclude %{_datadir}/apps/juk/ +%exclude %{_datadir}/apps/konqueror/servicemenus/jukservicemenu.desktop +%exclude %{_datadir}/icons/crystalsvg/*/*/juk* +%exclude %{_datadir}/icons/hicolor/*/apps/juk.png + +/etc/xdg/menus/applications-merged/* +%{_libdir}/mcop/* +%{_libdir}/libkdeinit_*.so +#%{_libdir}/liboggarts.so +%{tde_libdir}/* +%{_libdir}/kconf_update_bin/* +%{_bindir}/* +%{_datadir}/applications/kde/* +%{_datadir}/apps/* +%{_datadir}/autostart/* +%{_datadir}/config.kcfg/* +%{_datadir}/desktop-directories/* +%{_datadir}/icons/crystalsvg/*/*/* +%{_datadir}/icons/hicolor/*/*/* +%{_datadir}/icons/locolor/*/*/* +%{_datadir}/mimelnk/* +%{_datadir}/services/* +%{_datadir}/servicetypes/* + +%files libs +%defattr(-,root,root,-) +%exclude %{_libdir}/libnoatun*.* +%{_libdir}/lib*.so.* +%{_libdir}/lib*.la + + +%files devel +%defattr(-,root,root,-) +%{tde_includedir}/* +%{_libdir}/lib*.so +%exclude %{_libdir}/libkdeinit_*.so +%exclude %{_libdir}/libartseffects.so +%exclude %{_libdir}/libnoatunarts.* +#exclude %{_libdir}/liboggarts.so +%exclude %{_libdir}/libwinskinvis.so + + +%changelog +* Sat Sep 09 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-1 +- Initial build for RHEL 6 +- Spec file based on Fedora 8 "kdemultimedia-6:3.5.10-2" diff --git a/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec b/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec new file mode 100644 index 000000000..adcafccb5 --- /dev/null +++ b/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec @@ -0,0 +1,396 @@ +# Default version for this component +%if "%{?version}" == "" +%define version 3.5.13 +%endif +%define release 0 + +# 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: cmake >= 2.8 +%define tde_docdir %{_docdir} +%define tde_includedir %{_includedir}/kde +%define tde_libdir %{_libdir}/trinity + + +%define appdir %{_datadir}/applications/kde + +# former extras bits +#define _with_akode --with-akode +## not currently compatible with libtunepimp-0.5 (only libtunepimp-0.4) +#define _with_musicbrainz --with-musicbrainz +%define _with_taglib --with-taglib +%define _with_xine --with-xine + +Name: trinity-kdemultimedia +Summary: Multimedia applications for the K Desktop Environment (KDE) +Version: %{?version} +Release: %{?release}%{?dist}%{?_variant} + +License: GPLv2 +Group: Applications/Multimedia + +Vendor: Trinity Project +Packager: Francois Andriot <francois.andriot@free.fr> +URL: http://www.trinitydesktop.org/ + +Source0: kdemultimedia-%{version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Provides: kdemultimedia3 = %{version}-%{release} + +# RedHat Legacy patches (from Fedora 8) +Patch3: kdemultimedia-3.4.0-xdg.patch +Patch5: kdemultimedia-3.5.7-pthread.patch + +Requires: %{name}-libs = %{version}-%{release} + +BuildRequires: zlib-devel +BuildRequires: trinity-kdelibs-devel +BuildRequires: libvorbis-devel +BuildRequires: audiofile-devel +BuildRequires: desktop-file-utils +BuildRequires: libtheora-devel +BuildRequires: flac-devel +BuildRequires: alsa-lib-devel +BuildRequires: cdparanoia-devel cdparanoia +BuildRequires: gstreamer-devel +BuildRequires: automake libtool +%{?_with_akode:BuildRequires: akode-devel} +%{?_with_musicbrainz:BuildRequires: libmusicbrainz-devel libtunepimp-devel} +%{?_with_taglib:BuildRequires: taglib-devel} +%{?_with_xine:BuildRequires: xine-lib-devel} + +%description +The K Desktop Environment (KDE) is a GUI desktop for the X Window +System. The %{name} package contains multimedia applications for +KDE, including: + kmid, a midi player + kmix, an audio mixer + arts, additional functionality for the aRts sound system + krec, a recording tool + kscd, an Audio-CD player + kaudiocreator, a graphical frontend for audio file creation + +%package devel +Summary: Development files for %{name}, aRts and noatun plugins +Group: Development/Libraries +Provides: kdemultimedia3-devel = %{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} +# for noatun shlib(s) +Requires: %{name}-extras-libs = %{version}-%{release} +Requires: trinity-kdelibs-devel +%description devel +{summary}. +Install %{name}-devel if you wish to develop or compile any +applications using aRtsbuilder, aRtsmidi, aRtskde, aRts modules or +noatun plugins. + +%package extras +Summary: Extra applications from %{name} +Group: Applications/Multimedia +%if 0%{?libs} +Requires: %{name}-extras-libs = %{version}-%{release} +%else +Obsoletes: %{name}-extras-libs < %{version}-%{release} +Provides: %{name}-extras-libs = %{version}-%{release} +Requires(post): /sbin/ldconfig +Requires(postun): /sbin/ldconfig +%endif +%description extras +%{summary}, including: + * juk, a media player + * kaboodle, a media player + * noatun, a media player + +%package extras-libs +Summary: Extra %{name} runtime libraries +Group: System Environment/Libraries +Requires: %{name}-libs = %{version}-%{release} +%description extras-libs +%{summary}. + +%package libs +Summary: %{name} runtime libraries +Group: System Environment/Libraries +Requires: trinity-kdelibs +# include to be paranoid, installing libs-only is still mostly untested -- Rex +Requires: %{name} = %{version}-%{release} +%description libs +%{summary}. + + +%prep +%setup -q -n kdemultimedia +%patch3 -p1 -b .xdg +%patch5 -p1 -b .pthread + +# 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" + +%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +%__make -f "admin/Makefile.common" + + +%build +unset QTDIR || : ; . /etc/profile.d/qt.sh + +# just to be paranoid -- Rex +unset QTDIR || : ; . /etc/profile.d/qt.sh +export PATH="%{_bindir}:${PATH}" +export LDFLAGS="-L%{_libdir} -I%{_includedir}" + +export CXXFLAGS="${LDFLAGS} $(pkg-config --libs gsl)" + +%configure \ + --enable-new-ldflags \ + --disable-dependency-tracking \ + --includedir=%{tde_includedir} \ + --with-cdparanoia \ + --with-flac \ + --with-theora \ + --with-vorbis \ + --with-alsa \ + --with-gstreamer \ + --without-lame \ + --disable-debug \ + --disable-warnings \ + --enable-final \ + --disable-rpath \ + %{?_with_akode} %{!?_with_akode:--without-akode} \ + %{?_with_musicbrainz} %{!?_with_musicbrainz:--without-musicbrainz} \ + %{?_with_taglib} %{!?_with_taglib:--without-taglib} \ + %{?_with_xine} %{!?_with_xine:--without-xine} \ + --with-extra-includes=%{_usr}/include/cdda:%{_includedir}/tqt + +%__make %{?_smp_mflags} + + +%install +%__rm -rf %{buildroot} + +%make_install +%make_install -C kaudiocreator + +## Remove/uninstall (conflicting) bits we don't want +rm -f $RPM_BUILD_ROOT%{_libdir}/mcop/akode*MPEGPlayObject.mcopclass + +# only show in KDE, really? -- Rex (FIXME) +for f in %{buildroot}%{appdir}/*.desktop ; do + if [ -f %{buildroot}%{appdir}/*.desktop ] ; then + echo "OnlyShowIn=KDE;" >> $f + fi +done + +# don't make these world-writeable +chmod go-w %{buildroot}%{_datadir}/apps/kscd/* + +# locale's +%find_lang %{name} || touch %{name}.lang +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 ] && ln -nsf ../common $i/common + done + popd + fi +done +fi + +# rpmdocs +for dir in k* ; do + for file in AUTHORS ChangeLog README TODO ; do + if test -s "$dir/$file" ; then + install -p -m644 -D "$dir/$file" "rpmdocs/$dir/$file" + # exclude kaboodle, juk, noatun + if [ $dir != kaboodle -a $dir != juk -a $dir != noatun ] ; then + echo "%doc rpmdocs/$dir/" >> %{name}.lang + fi + fi + done +done + + +%post +%{?libs:/sbin/ldconfig} +for f in crystalsvg hicolor locolor ; do + touch --no-create %{_datadir}/icons/$f 2> /dev/null ||: + gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||: +done +update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : + +%postun +%{?libs:/sbin/ldconfig} +for f in crystalsvg hicolor locolor ; do + touch --no-create %{_datadir}/icons/$f 2> /dev/null ||: + gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||: +done +update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : + +%if 0%{?libs} +%post libs -p /sbin/ldconfig + +%postun libs -p /sbin/ldconfig + +%post extras-libs -p /sbin/ldconfig + +%postun extras-libs -p /sbin/ldconfig +%endif + +%post extras +%{?libs:/sbin/ldconfig} +for f in crystalsvg hicolor ; do + touch --no-create %{_datadir}/icons/$f 2> /dev/null ||: + gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||: +done +update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : + +%postun extras +%{?libs:/sbin/ldconfig} +for f in crystalsvg hicolor ; do + touch --no-create %{_datadir}/icons/$f 2> /dev/null ||: + gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||: +done +update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : + + +%clean +%__rm -rf %{buildroot} + + +%files extras +%defattr(-,root,root,-) + +# kaboodle +%doc rpmdocs/kaboodle/ +%doc %lang(en) %{_docdir}/HTML/en/kaboodle/ +%{_bindir}/kaboodle +%{tde_libdir}/libkaboodlepart.* +%{_datadir}/applications/kde/kaboodle.desktop +%{_datadir}/apps/kaboodle/ +%{_datadir}/icons/hicolor/*/apps/kaboodle.png +%{_datadir}/services/kaboodle* + +# noatun +%doc %lang(en) %{_docdir}/HTML/en/noatun/ +%{_bindir}/noatun +%{_libdir}/kconf_update_bin/noatun20update +%{tde_libdir}/noatun* +%{_libdir}/libartseffects.* +%{_libdir}/libwinskinvis.* +%{_libdir}/libkdeinit_noatun.* +%{_datadir}/applications/kde/noatun.desktop +%{_datadir}/apps/kconf_update/noatun.upd +%{_datadir}/apps/noatun/ +%{_datadir}/icons/hicolor/*/apps/noatun.png +%{_datadir}/mimelnk/interface/x-winamp-skin.desktop + +# juk +%doc %lang(en) %{_docdir}/HTML/en/juk/ +%{_bindir}/juk +%{_datadir}/applications/kde/juk.desktop +%{_datadir}/apps/juk/ +%{_datadir}/apps/konqueror/servicemenus/jukservicemenu.desktop +%{_datadir}/icons/crystalsvg/*/*/juk* +%{_datadir}/icons/hicolor/*/apps/juk.png + +%files extras-libs +%defattr(-,root,root,-) +%{_libdir}/libnoatun*.la +%{_libdir}/libnoatun*.so.* +%{_libdir}/libnoatunarts.so + +%files -f %{name}.lang +%defattr(-,root,root,-) +%doc COPYING + +# kaboodle +%exclude %{tde_docdir}/HTML/en/kaboodle/ +%exclude %{_bindir}/kaboodle +%exclude %{tde_libdir}/libkaboodlepart.* +%exclude %{_datadir}/applications/kde/kaboodle.desktop +%exclude %{_datadir}/apps/kaboodle/ +%exclude %{_datadir}/icons/hicolor/*/apps/kaboodle.png +%exclude %{_datadir}/services/kaboodle* + +# noatun +%exclude %{tde_docdir}/HTML/en/noatun/ +%exclude %{_bindir}/noatun +%exclude %{_libdir}/kconf_update_bin/noatun20update +%exclude %{tde_libdir}/noatun* +%exclude %{_libdir}/libartseffects.* +%exclude %{_libdir}/libkdeinit_noatun.* +%exclude %{_libdir}/libnoatunarts.* +%exclude %{_libdir}/libnoatuncontrols.* +%exclude %{_libdir}/libnoatun.* +%exclude %{_libdir}/libnoatuntags.* +%exclude %{_libdir}/libwinskinvis.* +%exclude %{_datadir}/applications/kde/noatun.desktop +%exclude %{_datadir}/apps/kconf_update/noatun.upd +%exclude %{_datadir}/apps/noatun/ +%exclude %{_datadir}/icons/hicolor/*/apps/noatun.png +%exclude %{_datadir}/mimelnk/interface/x-winamp-skin.desktop + +# juk +%exclude %{tde_docdir}/HTML/en/juk/ +%exclude %{_bindir}/juk +%exclude %{_datadir}/applications/kde/juk.desktop +%exclude %{_datadir}/apps/juk/ +%exclude %{_datadir}/apps/konqueror/servicemenus/jukservicemenu.desktop +%exclude %{_datadir}/icons/crystalsvg/*/*/juk* +%exclude %{_datadir}/icons/hicolor/*/apps/juk.png + +/etc/xdg/menus/applications-merged/* +%{_libdir}/mcop/* +%{_libdir}/libkdeinit_*.so +#%{_libdir}/liboggarts.so +%{tde_libdir}/* +%{_libdir}/kconf_update_bin/* +%{_bindir}/* +%{_datadir}/applications/kde/* +%{_datadir}/apps/* +%{_datadir}/autostart/* +%{_datadir}/config.kcfg/* +%{_datadir}/desktop-directories/* +%{_datadir}/icons/crystalsvg/*/*/* +%{_datadir}/icons/hicolor/*/*/* +%{_datadir}/icons/locolor/*/*/* +%{_datadir}/mimelnk/* +%{_datadir}/services/* +%{_datadir}/servicetypes/* + +%files libs +%defattr(-,root,root,-) +%exclude %{_libdir}/libnoatun*.* +%{_libdir}/lib*.so.* +%{_libdir}/lib*.la + + +%files devel +%defattr(-,root,root,-) +%{tde_includedir}/* +%{_libdir}/lib*.so +%exclude %{_libdir}/libkdeinit_*.so +%exclude %{_libdir}/libartseffects.so +%exclude %{_libdir}/libnoatunarts.* +#exclude %{_libdir}/liboggarts.so +%exclude %{_libdir}/libwinskinvis.so + + +%changelog +* Sat Sep 09 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-0 +- Initial build for RHEL 6 +- Spec file based on Fedora 8 "kdemultimedia-6:3.5.10-2" diff --git a/redhat/kdepim/trinity-kdepim-3.5.12.spec b/redhat/kdepim/trinity-kdepim-3.5.12.spec index 9a0361c86..01b349900 100644 --- a/redhat/kdepim/trinity-kdepim-3.5.12.spec +++ b/redhat/kdepim/trinity-kdepim-3.5.12.spec @@ -20,10 +20,12 @@ Name: trinity-kdepim Version: %{?version} Release: %{?release}%{?dist}%{?_variant} License: GPL +Group: Applications/Productivity + Vendor: Trinity Project Packager: Francois Andriot <francois.andriot@free.fr> Summary: PIM (Personal Information Manager) applications -Group: Applications/Productivity + Prefix: %{_prefix} Source0: kdepim-%{version}.tar.gz @@ -64,7 +66,7 @@ Development files for %{name}. %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" -%__make -f admin/Makefile.common +%__make -f "admin/Makefile.common" %build unset QTDIR || : ; . /etc/profile.d/qt.sh diff --git a/redhat/kdepim/trinity-kdepim-3.5.13.spec b/redhat/kdepim/trinity-kdepim-3.5.13.spec index 4ad751749..604dbd208 100644 --- a/redhat/kdepim/trinity-kdepim-3.5.13.spec +++ b/redhat/kdepim/trinity-kdepim-3.5.13.spec @@ -20,10 +20,12 @@ Name: trinity-kdepim Version: %{?version} Release: %{?release}%{?dist}%{?_variant} License: GPL +Group: Applications/Productivity + Vendor: Trinity Project Packager: Francois Andriot <francois.andriot@free.fr> Summary: PIM (Personal Information Manager) applications -Group: Applications/Productivity + Prefix: %{_prefix} Source0: kdepim-%{version}.tar.gz diff --git a/redhat/kdesdk/trinity-kdesdk-3.5.12.spec b/redhat/kdesdk/trinity-kdesdk-3.5.12.spec index 0da572d1d..91c574803 100644 --- a/redhat/kdesdk/trinity-kdesdk-3.5.12.spec +++ b/redhat/kdesdk/trinity-kdesdk-3.5.12.spec @@ -1,4 +1,4 @@ -# If _kde3_prefix is # Default version for this component +# Default version for this component %if "%{?version}" == "" %define version 3.5.12 %endif @@ -98,9 +98,9 @@ Summary: %{name} runtime libraries Group: System Environment/Libraries Requires: trinity-kdelibs >= %{version} # helps multilib upgrades -Obsoletes: %{name} < %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: %{name} < %{version}-%{release} # include to be paranoid, installing libs-only is still mostly untested -- Rex -Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name} = %{version}-%{release} %description libs %{summary}. diff --git a/redhat/kdesdk/trinity-kdesdk-3.5.13.spec b/redhat/kdesdk/trinity-kdesdk-3.5.13.spec index a9d1d3570..00d1d5f3b 100644 --- a/redhat/kdesdk/trinity-kdesdk-3.5.13.spec +++ b/redhat/kdesdk/trinity-kdesdk-3.5.13.spec @@ -1,4 +1,4 @@ -# If _kde3_prefix is # Default version for this component +# Default version for this component %if "%{?version}" == "" %define version 3.5.13 %endif @@ -11,18 +11,11 @@ %endif # TDE 3.5.13 specific building variables -BuildRequires: autoconf automake libtool m4 -%define tde_docdir %{_docdir} +BuildRequires: cmake >= 2.8 +%define tde_docdir %{_docdir}/kde %define tde_libdir %{_libdir}/trinity -%define _with_subversion --with-subversion -%if 0%{?fedora} > 6 || 0%{?rhel} > 4 -%define _with_apr_config --with-apr-config=apr-1-config -%define _with_apu_config --with-apu-config=apu-1-config -%endif - - Name: trinity-kdesdk Summary: The KDE Software Development Kit (SDK) Version: %{?version} @@ -43,7 +36,7 @@ Provides: kdesdk3 = %{version}-%{release} Requires: %{name}-libs = %{version}-%{release} -BuildRequires: automake libtool +BuildRequires: libtool BuildRequires: tqtinterface-devel BuildRequires: pcre-devel BuildRequires: trinity-kdelibs-devel @@ -55,11 +48,9 @@ BuildRequires: desktop-file-utils BuildRequires: flex # umbrello BuildRequires: libxslt-devel libxml2-devel -%if 0%{?fedora} > 5 || 0%{?rhel} > 4 BuildRequires: binutils-devel -%endif BuildRequires: perl -%{?_with_subversion:BuildRequires: subversion-devel neon-devel} +BuildRequires: subversion-devel neon-devel # Obsoletes/Provides %define cervisia_ver 2.4.7 @@ -94,9 +85,9 @@ Summary: %{name} runtime libraries Group: System Environment/Libraries Requires: trinity-kdelibs >= %{version} # helps multilib upgrades -Obsoletes: %{name} < %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: %{name} < %{version}-%{release} # include to be paranoid, installing libs-only is still mostly untested -- Rex -Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name} = %{version}-%{release} %description libs %{summary}. @@ -105,42 +96,29 @@ Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} %setup -q -n kdesdk %patch1 -p1 -b .subversion -# 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" - -%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" -%__make -f admin/Makefile.common - %build unset QTDIR || :; . /etc/profile.d/qt.sh export PATH="%{_bindir}:${PATH}" -export LDFLAGS="-L%{_libdir} -I%{_includedir}" -export LDFLAGS="${LDFLAGS} -lqt-mt -L${QTLIB}" +export LD_LIBRARY_PATH="%{_libdir}" +export PKG_CONFIG_PATH="%{_libdir}/pkgconfig" +export CMAKE_INCLUDE_PATH="%{_includedir}:%{_includedir}/tqt" -%configure \ - --includedir=%{_includedir}/kde \ - --disable-rpath \ - --enable-new-ldflags \ - --disable-debug --disable-warnings \ - --disable-dependancy-tracking --enable-final \ - %{?_with_subversion} %{?_with_apr_config} %{?_with_apu_config} \ - --with-extra-includes=%{_includedir}/tqt \ - --without-svn \ - --enable-closure +%__mkdir build +cd build +%cmake \ + -DWITH_DBSEARCHENGINE=OFF \ + -DBUILD_ALL=ON \ + .. -# Do not use %{?_smp_mflags} ! -%__make +%__make %{?_smp_mflags} %install export PATH="%{_bindir}:${PATH}" %__rm -rf %{buildroot} -%make_install +%make_install -C build desktop-file-install --vendor "" \ --dir %{buildroot}%{_datadir}/applications/kde \ diff --git a/redhat/kdeutils/trinity-kdeutils-3.5.12.spec b/redhat/kdeutils/trinity-kdeutils-3.5.12.spec new file mode 100755 index 000000000..4c73139e6 --- /dev/null +++ b/redhat/kdeutils/trinity-kdeutils-3.5.12.spec @@ -0,0 +1,127 @@ +# Default version for this component +%if "%{?version}" == "" +%define version 3.5.12 +%endif +%define release 5 + +# 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.12 specific building variables +BuildRequires: autoconf automake libtool m4 +%define tde_docdir %{_docdir} +%define tde_libdir %{_libdir}/kde3 + + +Name: trinity-kdeutils +Version: %{?version} +Release: %{?release}%{?dist}%{?_variant} +License: GPL +Vendor: Trinity Project +Packager: Francois Andriot <francois.andriot@free.fr> +Summary: Trinity KDE Utilities +Prefix: %{_prefix} + +Source0: kdeutils-%{version}.tar.gz + +BuildRequires: tqtinterface +BuildRequires: trinity-arts +BuildRequires: trinity-kdelibs + +Requires: tqtinterface +Requires: trinity-kdelibs + +%description +Trinity KDE Utilities. + + +%package devel +Requires: %{name} +Summary: %{name} - Development files +%description devel +Development files for %{name}. + + +%prep +%setup -q -n kdeutils + +%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +%__make -f admin/Makefile.common + +%build +unset QTDIR || : ; source /etc/profile.d/qt.sh +export PATH="%{_bindir}:${PATH}" +export LDFLAGS="-L%{_libdir} -I%{_includedir}" + +%configure \ + --disable-rpath \ + --enable-new-ldflags \ + --disable-dependency-tracking \ + --disable-debug --disable-warnings --enable-final \ + --with-xinerama \ + --with-extra-includes=%{_includedir}/tqt \ + --enable-closure + +%__make %{?_smp_mflags} + +%install +%__rm -rf %{?buildroot} +%__mkdir_p %{?buildroot} +export PATH="%{_bindir}:${PATH}" +%make_install + +%clean +%__rm -rf %{?buildroot} + +%files +%defattr(-,root,root,-) +%{_bindir}/* +%{_datadir}/applications/kde/*.desktop +%{_datadir}/apps/* +%{_datadir}/autostart/*.desktop +%{_datadir}/config/* +%{_datadir}/icons/* +%{_datadir}/services/* +%{_datadir}/config.kcfg/* +%{_datadir}/servicetypes/kmilo/kmilopluginsvc.desktop +%{_libdir}/lib*.so.* +%{_libdir}/libkdeinit*.so +%{tde_libdir}/*.so +%{tde_docdir}/HTML/en/* + +%if 0%{?rhel} >= 4 +%{_datadir}/applnk/*/* +%{_datadir}/mimelnk/application/* +%endif + +%files devel +%defattr(-,root,root,-) +%{_libdir}/*.la +%{_libdir}/*.so +%{_includedir}/* +%{tde_libdir}/*.la + +%changelog +* Sun Sep 04 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-5 +- Import to GIT + +* Mon Aug 22 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-4 +- Correct (again) macro to install under "/opt", if desired + +* Mon Aug 22 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-3 +- Correct macro to install under "/opt", if desired + +* Sun Dec 19 2010 Francois Andriot <francois.andriot@free.fr> - 3.5.12-2 +- Rebuilt + +* Fri Dec 17 2010 Francois Andriot <francois.andriot@free.fr> - 3.5.12-1 +- Add macro _kde3_prefix to define custom installation prefix (ex: /opt/kde3) +- Add '--with-extra-includes=%{_includedir}/tqt' + +* Wed Dec 15 2010 Francois Andriot <francois.andriot@free.fr> - 3.5.12-0 +- Initial version + diff --git a/redhat/kdeutils/trinity-kdeutils-3.5.13.spec b/redhat/kdeutils/trinity-kdeutils-3.5.13.spec new file mode 100755 index 000000000..17acde68e --- /dev/null +++ b/redhat/kdeutils/trinity-kdeutils-3.5.13.spec @@ -0,0 +1,118 @@ +# Default version for this component +%if "%{?version}" == "" +%define version 3.5.13 +%endif +%define release 0 + +# 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} +%define tde_libdir %{_libdir}/trinity + + +Name: trinity-kdeutils +Version: %{?version} +Release: %{?release}%{?dist}%{?_variant} +License: GPL +Vendor: Trinity Project +Packager: Francois Andriot <francois.andriot@free.fr> +Summary: Trinity KDE Utilities +Prefix: %{_prefix} + +Source0: kdeutils-%{version}.tar.gz + +BuildRequires: tqtinterface +BuildRequires: trinity-arts +BuildRequires: trinity-kdelibs + +Requires: tqtinterface +Requires: trinity-kdelibs + +%description +Trinity KDE Utilities. + + +%package devel +Requires: %{name} +Summary: %{name} - Development files +%description devel +Development files for %{name}. + + +%prep +%setup -q -n kdeutils + +# 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" + +%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +%__make -f admin/Makefile.common + +%build +unset QTDIR || : ; source /etc/profile.d/qt.sh +export PATH="%{_bindir}:${PATH}" +export LDFLAGS="-L%{_libdir} -I%{_includedir}" +export LDFLAGS="${LDFLAGS} -lqt-mt -lkdeui -L${QTLIB}" + +%configure \ + --disable-rpath \ + --enable-new-ldflags \ + --disable-dependency-tracking \ + --disable-debug --disable-warnings --enable-final \ + --with-xinerama \ + --with-extra-includes=%{_includedir}/tqt \ + --with-extra-libs=%{tde_libdir} \ + --enable-closure + +%__make %{?_smp_mflags} + +%install +%__rm -rf %{?buildroot} +%__mkdir_p %{?buildroot} +export PATH="%{_bindir}:${PATH}" +%make_install + +%clean +%__rm -rf %{?buildroot} + +%files +%defattr(-,root,root,-) +%{_bindir}/* +%{_datadir}/applications/kde/*.desktop +%{_datadir}/apps/* +%{_datadir}/autostart/*.desktop +%{_datadir}/config/* +%{_datadir}/icons/* +%{_datadir}/services/* +%{_datadir}/config.kcfg/* +%{_datadir}/servicetypes/kmilo/kmilopluginsvc.desktop +%{_libdir}/lib*.so.* +%{_libdir}/libkdeinit*.so +%{tde_libdir}/*.so +%{tde_docdir}/HTML/en/* + +%if 0%{?rhel} >= 4 +%{_datadir}/applnk/*/* +%{_datadir}/mimelnk/application/* +%endif + +%files devel +%defattr(-,root,root,-) +%{_libdir}/*.la +%{_libdir}/*.so +%{_includedir}/* +%{tde_libdir}/*.la + +%changelog +* Mon Sep 05 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-0 +- Import to GIT + |