Mageia 2: add support for MGA2 build in redhat packages

pull/3/head
Francois Andriot 12 years ago
parent 14b5a10d92
commit 2b16f5c5f9

@ -1,5 +1,6 @@
dependencies/qt3 dependencies/qt3
dependencies/tqtinterface dependencies/tqtinterface
dependencies/avahi-tqt
dependencies/dbus-tqt dependencies/dbus-tqt
dependencies/dbus-1-tqt dependencies/dbus-1-tqt
dependencies/libcaldav dependencies/libcaldav

@ -3,6 +3,12 @@
%define _variant .opt %define _variant .opt
%endif %endif
%define tde_bindir %{_prefix}/bin
%define tde_includedir %{_prefix}/include
%define tde_libdir %{_prefix}/%{_lib}
%define _docdir %{_prefix}/share/doc
Name: trinity-arts Name: trinity-arts
Version: 3.5.13 Version: 3.5.13
Release: 4%{?dist}%{?_variant} Release: 4%{?dist}%{?_variant}
@ -29,11 +35,17 @@ BuildRequires: tqtinterface-devel
BuildRequires: audiofile-devel BuildRequires: audiofile-devel
BuildRequires: alsa-lib-devel BuildRequires: alsa-lib-devel
BuildRequires: glib2-devel BuildRequires: glib2-devel
BuildRequires: libtool-ltdl-devel
BuildRequires: gsl-devel BuildRequires: gsl-devel
BuildRequires: libvorbis-devel BuildRequires: libvorbis-devel
BuildRequires: esound-devel BuildRequires: esound-devel
%if 0%{?mgaversion}
BuildRequires: %{_lib}jack-devel
BuildRequires: %{_lib}ltdl-devel
%else
BuildRequires: jack-audio-connection-kit-devel BuildRequires: jack-audio-connection-kit-devel
BuildRequires: libtool-ltdl-devel
%endif
# TDE 3.5.13 specific building variables # TDE 3.5.13 specific building variables
BuildRequires: cmake >= 2.8 BuildRequires: cmake >= 2.8
@ -76,18 +88,20 @@ Development files for %{name}
%build %build
unset QTDIR || : ; . /etc/profile.d/qt.sh unset QTDIR || : ; . /etc/profile.d/qt.sh
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
%__mkdir build %{?!mgaversion:%__mkdir build; cd build}
cd build
%cmake \ %cmake \
-DINCLUDE_INSTALL_DIR=%{_includedir}/arts \ -DINCLUDE_INSTALL_DIR=%{tde_includedir}/arts \
-DPKGCONFIG_INSTALL_DIR=%{_libdir}/pkgconfig \ -DLIB_INSTALL_DIR=%{tde_libdir} \
-DPKGCONFIG_INSTALL_DIR=%{tde_libdir}/pkgconfig \
-DWITH_ALSA=ON \ -DWITH_ALSA=ON \
-DWITH_AUDIOFILE=ON \ -DWITH_AUDIOFILE=ON \
-DWITH_VORBIS=ON \ -DWITH_VORBIS=ON \
-DWITH_MAD=OFF \ -DWITH_MAD=OFF \
-DWITH_ESOUND=ON \ -DWITH_ESOUND=ON \
-DWITH_JACK=ON \ -DWITH_JACK=ON \
-DCMAKE_SKIP_RPATH="OFF" \
.. ..
@ -103,30 +117,30 @@ cd build
%files %files
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc COPYING.LIB %doc COPYING.LIB
%dir %{_libdir}/mcop %dir %{tde_libdir}/mcop
%dir %{_libdir}/mcop/Arts %dir %{tde_libdir}/mcop/Arts
%{_libdir}/mcop/Arts/* %{tde_libdir}/mcop/Arts/*
%{_libdir}/mcop/*.mcopclass %{tde_libdir}/mcop/*.mcopclass
%{_libdir}/mcop/*.mcoptype %{tde_libdir}/mcop/*.mcoptype
%{_libdir}/lib*.so.* %{tde_libdir}/lib*.so.*
%{_libdir}/lib*.la %{tde_libdir}/lib*.la
%{_bindir}/artscat %{tde_bindir}/artscat
%{_bindir}/artsd %{tde_bindir}/artsd
%{_bindir}/artsdsp %{tde_bindir}/artsdsp
%{_bindir}/artsplay %{tde_bindir}/artsplay
%{_bindir}/artsrec %{tde_bindir}/artsrec
%{_bindir}/artsshell %{tde_bindir}/artsshell
%{_bindir}/artswrapper %{tde_bindir}/artswrapper
%files devel %files devel
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{_bindir}/mcopidl %{tde_bindir}/mcopidl
%dir %{_includedir} %dir %{tde_includedir}
%{_includedir}/*/ %{tde_includedir}/*/
%{_bindir}/artsc-config %{tde_bindir}/artsc-config
%{_libdir}/lib*.so %{tde_libdir}/lib*.so
%{_libdir}/pkgconfig/*.pc %{tde_libdir}/pkgconfig/*.pc
%{_libdir}/*.a %{tde_libdir}/*.a
%changelog %changelog

@ -0,0 +1,124 @@
# 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
%endif
# TDE 3.5.13 specific building variables
%define tde_bindir %{_prefix}/bin
%define tde_includedir %{_prefix}/include
%define tde_datadir %{_prefix}/share
%define tde_docdir %{tde_datadir}/doc
%define tde_tdedocdir %{tde_docdir}/kde
%define tde_libdir %{_prefix}/%{_lib}
Name: avahi-tqt
Version: 3.5.13
Release: 1%{?dist}%{?_variant}
License: GPL
Summary: Avahi TQT Interface
Group: System Environment/Libraries
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: %{name}-%{version}.tar.gz
BuildRequires: gcc-c++
BuildRequires: cmake >= 2.8
BuildRequires: qt3-devel >= 3.3.8.d
BuildRequires: tqtinterface-devel >= 3.5.13
BuildRequires: gettext-devel
BuildRequires: dbus-devel
%if 0%{?mgaversion}
BuildRequires: %{_lib}avahi-client-devel
BuildRequires: %{_lib}expat1-devel
Provides: %{_lib}avahi-qt3
%else
BuildRequires: avahi-devel
BuildRequires: expat-devel
%endif
Requires: qt3 >= 3.3.8.d
Requires: tqtinterface >= 3.5.13
Provides: avahi-qt3
%description
Avahi TQT Interface
%package devel
Requires: %{name}
Summary: %{name} - Development files
Group: Development/Libraries
%if 0%{?mgaversion}
Provides: %{_lib}avahi-qt3-devel
%endif
%description devel
Development files for %{name}
%prep
%setup -q -n dependencies/%{name}
# Ugly hack to modify TQT include directory inside autoconf files.
# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
%__sed -i "acinclude.m4" \
-e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
%__cp -f "/usr/share/libtool/config/ltmain.sh" "./ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "./ltmain.sh"
# Removes stale libtool stuff
%__rm -f common/libtool.m4 common/ltoptions.m4 common/lt~obsolete.m4 common/ltsugar.m4 common/ltversion.m4
%build
unset QTDIR || : ; . /etc/profile.d/qt.sh
export PATH="%{tde_bindir}:${PATH}"
export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir} -I%{tde_includedir}/tqt"
export CXXFLAGS="${CXXFLAGS} ${LDFLAGS}"
./autogen.sh
%configure \
--exec-prefix=%{_prefix} \
--bindir=%{tde_bindir} \
--datadir=%{tde_datadir} \
--docdir=%{tde_docdir} \
--includedir=%{tde_includedir} \
--libdir=%{tde_libdir} \
--enable-compat-libdns_sd \
--with-systemdsystemunitdir=/lib/systemd/system \
MOC_QT3=%{tde_bindir}/moc-tqt
%__make %{?_smp_mflags}
%install
%__rm -rf %{?buildroot}
%__make install DESTDIR=%{?buildroot}
%clean
%__rm -rf %{?buildroot}
%files
%{tde_libdir}/*.so.*
%files devel
%{tde_includedir}/%{name}
%{tde_libdir}/*.so
%{tde_libdir}/*.la
%{tde_libdir}/pkgconfig/*.pc
%exclude %{tde_libdir}/libavahi-tqt.a
%changelog
* Mon Jul 30 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1
- Initial build for TDE 3.5.13

@ -3,6 +3,10 @@
%define _variant .opt %define _variant .opt
%endif %endif
%define tde_bindir %{_prefix}/bin
%define tde_includedir %{_prefix}/include
%define tde_libdir %{_prefix}/%{_lib}
Name: dbus-1-tqt Name: dbus-1-tqt
Version: 3.5.13 Version: 3.5.13
Release: 1%{?dist}%{?_variant} Release: 1%{?dist}%{?_variant}
@ -46,10 +50,14 @@ Development files for %{name}
%build %build
unset QTDIR || : ; . /etc/profile.d/qt.sh unset QTDIR || : ; . /etc/profile.d/qt.sh
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
%{?!mgaversion:%__mkdir build; cd build}
%cmake \
-DINCLUDE_INSTALL_DIR=%{tde_includedir} \
-DLIB_INSTALL_DIR=%{tde_libdir} \
..
%__mkdir build
cd build
%cmake ..
%__make %{?_smp_mflags} %__make %{?_smp_mflags}
@ -62,14 +70,14 @@ cd build
%__rm -rf %{?buildroot} %__rm -rf %{?buildroot}
%files %files
%{_bindir}/dbusxml2qt3 %{tde_bindir}/dbusxml2qt3
%{_libdir}/*.so.* %{tde_libdir}/*.so.*
%files devel %files devel
%{_includedir}/*.h %{tde_includedir}/*.h
%{_libdir}/*.so %{tde_libdir}/*.so
%{_libdir}/*.la %{tde_libdir}/*.la
%{_libdir}/pkgconfig/*.pc %{tde_libdir}/pkgconfig/*.pc
%changelog %changelog
* Tue Nov 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1 * Tue Nov 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1

@ -3,6 +3,9 @@
%define _variant .opt %define _variant .opt
%endif %endif
%define tde_includedir %{_prefix}/include
%define tde_libdir %{_prefix}/%{_lib}
Name: dbus-tqt Name: dbus-tqt
Version: 3.5.13 Version: 3.5.13
Release: 3%{?dist}%{?_variant} Release: 3%{?dist}%{?_variant}
@ -28,7 +31,6 @@ BuildRequires: qt3-devel >= 3.3.8.d
Requires: qt3 >= 3.3.8.d Requires: qt3 >= 3.3.8.d
#Provides: dbus-qt
%description %description
Dbus TQT Interface Dbus TQT Interface
@ -49,10 +51,13 @@ Development files for %{name}
%build %build
unset QTDIR || : ; . /etc/profile.d/qt.sh unset QTDIR || : ; . /etc/profile.d/qt.sh
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
%__mkdir build %{?!mgaversion:%__mkdir build; cd build}
cd build %cmake \
%cmake .. -DINCLUDE_INSTALL_DIR=%{tde_includedir} \
-DLIB_INSTALL_DIR=%{tde_libdir} \
..
%__make %{?_smp_mflags} %__make %{?_smp_mflags}
@ -66,13 +71,13 @@ cd build
%__rm -rf %{?buildroot} %__rm -rf %{?buildroot}
%files %files
%{_libdir}/*.so.* %{tde_libdir}/*.so.*
%files devel %files devel
%{_includedir}/dbus-1.0/* %{tde_includedir}/dbus-1.0/*
%{_libdir}/*.so %{tde_libdir}/*.so
%{_libdir}/*.la %{tde_libdir}/*.la
%{_libdir}/pkgconfig/*.pc %{tde_libdir}/pkgconfig/*.pc
%changelog %changelog
* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-3 * Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-3

@ -3,9 +3,14 @@
%define _variant .opt %define _variant .opt
%endif %endif
Name: libcaldav %define tde_datadir %{_prefix}/share
%define tde_docdir %{tde_datadir}/doc
%define tde_includedir %{_prefix}/include
%define tde_libdir %{_prefix}/%{_lib}
Name: trinity-libcaldav
Version: 0.6.5 Version: 0.6.5
Release: 2debian2.2%{?dist}%{?_variant} Release: 3%{?dist}%{?_variant}
Vendor: Trinity Project Vendor: Trinity Project
URL: http://www.trinitydesktop.org/ URL: http://www.trinitydesktop.org/
@ -24,12 +29,19 @@ BuildRequires: glib2-devel
BuildRequires: gtk2-devel BuildRequires: gtk2-devel
BuildRequires: make BuildRequires: make
Obsoletes: libcaldav < %{version}-%{release}
Provides: libcaldav = %{version}-%{release}
%if 0%{?fedora} || 0%{?rhel} >= 6 %if 0%{?fedora} || 0%{?rhel} >= 6
BuildRequires: libcurl-devel BuildRequires: libcurl-devel
%else %else
%if 0%{?mgaversion}
BuildRequires: %{_lib}curl-devel
%else
# Specific CURL version for TDE on RHEL 5 (and older) # Specific CURL version for TDE on RHEL 5 (and older)
BuildRequires: trinity-libcurl-devel BuildRequires: trinity-libcurl-devel
%endif %endif
%endif
%description %description
libcaldev is a client library that adds support for the CalDAV protocol (rfc4791). libcaldev is a client library that adds support for the CalDAV protocol (rfc4791).
@ -39,18 +51,24 @@ easy to integrate CalDAV support into any PIM application.
%package devel %package devel
Summary: Development files for %{name} Summary: Development files for %{name}
Group: Development/Libraries Group: Development/Libraries
Requires: %{name} Requires: %{name} = %{version}-%{release}
Obsoletes: libcaldav-devel < %{version}-%{release}
Provides: libcaldav-devel = %{version}-%{release}
%description devel %description devel
%{summary} %{summary}
%prep %prep
%setup -q %setup -q -n libcaldav-%{version}
%build %build
autoreconf --force --install --symlink autoreconf --force --install --symlink
%configure %configure \
--docdir=%{tde_docdir}/libcaldav \
--includedir=%{tde_includedir} \
--libdir=%{tde_libdir} \
%__make %{?_smp_mflags} %__make %{?_smp_mflags}
%install %install
@ -58,26 +76,30 @@ autoreconf --force --install --symlink
%__make install DESTDIR=%{buildroot} %__make install DESTDIR=%{buildroot}
# The include files do not go in the correct directory # The include files do not go in the correct directory
%__mv -f %{buildroot}%{_includedir}/%{name}-0.6.2/*.h %{buildroot}%{_includedir} %__mv -f %{buildroot}%{tde_includedir}/libcaldav-0.6.2/*.h %{buildroot}%{tde_includedir}
%__rm -rf %{buildroot}%{_includedir}/%{name}-0.6.2 %__rm -rf %{buildroot}%{tde_includedir}/libcaldav-0.6.2
%clean %clean
%__rm -rf %{buildroot} %__rm -rf %{buildroot}
%files %files
%{_libdir}/*.so.* %{tde_libdir}/*.so.*
%{_datadir}/doc/%{name} %{tde_docdir}/libcaldav
%files devel %files devel
%{_includedir}/*.h %{tde_includedir}/*.h
%{_libdir}/*.a %{tde_libdir}/*.a
%{_libdir}/*.la %{tde_libdir}/*.la
%{_libdir}/*.so %{tde_libdir}/*.so
%{_libdir}/pkgconfig/%{name}.pc %{tde_libdir}/pkgconfig/libcaldav.pc
%Changelog %Changelog
* Sun Jul 28 2012 Francois Andriot <francois.andriot@free.fr> - 0.6.5-3
- Renames to 'trinity-libcaldav'
- Build on MGA2
* Thu Nov 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.6.5-2debian2.2 * Thu Nov 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.6.5-2debian2.2
- Add missing BuildRequires - Add missing BuildRequires

@ -3,9 +3,12 @@
%define _variant .opt %define _variant .opt
%endif %endif
Name: libcarddav %define tde_includedir %{_prefix}/include
%define tde_libdir %{_prefix}/%{_lib}
Name: trinity-libcarddav
Version: 0.6.2 Version: 0.6.2
Release: 2debian2.1%{?dist}%{?_variant} Release: 3%{?dist}%{?_variant}
Vendor: Trinity Project Vendor: Trinity Project
URL: http://www.trinitydesktop.org/ URL: http://www.trinitydesktop.org/
@ -22,8 +25,16 @@ Source0: libcarddav_0.6.2-2debian2.tar.gz
%if 0%{?fedora} || 0%{?rhel} >= 6 %if 0%{?fedora} || 0%{?rhel} >= 6
BuildRequires: libcurl-devel BuildRequires: libcurl-devel
%else %else
%if 0%{?mgaversion}
BuildRequires: %{_lib}curl-devel
%else
# Specific CURL version for TDE on RHEL 5 (and older)
BuildRequires: trinity-libcurl-devel BuildRequires: trinity-libcurl-devel
%endif %endif
%endif
Obsoletes: libcarddav < %{version}-%{release}
Provides: libcarddav = %{version}-%{release}
%description %description
Libcarddav is a portable CardDAV client implementation originally developed for the Trinity PIM suite. Libcarddav is a portable CardDAV client implementation originally developed for the Trinity PIM suite.
@ -35,16 +46,22 @@ Summary: Development files for %{name}
Group: Development/Libraries Group: Development/Libraries
Requires: %{name} Requires: %{name}
Obsoletes: libcarddav-devel < %{version}-%{release}
Provides: libcarddav-devel = %{version}-%{release}
%description devel %description devel
%{summary} %{summary}
%prep %prep
%setup -q %setup -q -n libcarddav-%{version}
%build %build
autoreconf --force --install --symlink autoreconf --force --install --symlink
%configure %configure \
--includedir=%{tde_includedir} \
--libdir=%{tde_libdir} \
%__make %{?_smp_mflags} %__make %{?_smp_mflags}
%install %install
@ -52,24 +69,28 @@ autoreconf --force --install --symlink
%__make install DESTDIR=%{buildroot} %__make install DESTDIR=%{buildroot}
# The include files do not go in the correct directory # The include files do not go in the correct directory
%__mv -f %{buildroot}%{_includedir}/%{name}-0.6.1/*.h %{buildroot}%{_includedir} %__mv -f %{buildroot}%{tde_includedir}/libcarddav-0.6.1/*.h %{buildroot}%{tde_includedir}
%__rm -rf %{buildroot}%{_includedir}/%{name}-0.6.1 %__rm -rf %{buildroot}%{tde_includedir}/libcarddav-0.6.1
%clean %clean
%__rm -rf %{buildroot} %__rm -rf %{buildroot}
%files %files
%{_libdir}/*.so.* %{tde_libdir}/*.so.*
%files devel %files devel
%{_includedir}/*.h %{tde_includedir}/*.h
%{_libdir}/*.a %{tde_libdir}/*.a
%{_libdir}/*.la %{tde_libdir}/*.la
%{_libdir}/*.so %{tde_libdir}/*.so
%{_libdir}/pkgconfig/%{name}.pc %{tde_libdir}/pkgconfig/libcarddav.pc
%Changelog %Changelog
* Sun Jul 28 2012 Francois Andriot <francois.andriot@free.fr> - 0.6.5-3
- Renames to 'trinity-libcaldav'
- Build on MGA2
* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.6.5-2debian2 .1 * Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.6.5-2debian2 .1
- Initial build for RHEL 6, RHEL 5, and Fedora 15 - Initial build for RHEL 6, RHEL 5, and Fedora 15

@ -8,7 +8,9 @@
# TQT include files may conflict with QT4 includes, so we move them to a subdirectory. # TQT include files may conflict with QT4 includes, so we move them to a subdirectory.
# Later compiled Trinity products should be aware of that ! # Later compiled Trinity products should be aware of that !
%define _includedir %{_prefix}/include/tqt %define tde_bindir %{_prefix}/bin
%define tde_includedir %{_prefix}/include
%define tde_libdir %{_prefix}/%{_lib}
Name: tqtinterface Name: tqtinterface
Version: 3.5.13 Version: 3.5.13
@ -34,8 +36,12 @@ BuildRequires: qt3-devel >= 3.3.8.d
Requires: qt3 >= 3.3.8.d Requires: qt3 >= 3.3.8.d
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: libXi-devel
BuildRequires: pth-devel BuildRequires: pth-devel
%if 0%{?mgaversion}
BuildRequires: %{_lib}xi-devel
%else
BuildRequires: libXi-devel
%endif
%description %description
@ -57,16 +63,15 @@ Development files for %{name}
%build %build
unset QTDIR || : ; . /etc/profile.d/qt.sh unset QTDIR || : ; . /etc/profile.d/qt.sh
%__mkdir build %{?!mgaversion:%__mkdir build; cd build}
cd build %cmake \
%__cmake \
-DQT_PREFIX_DIR=${QTDIR} \ -DQT_PREFIX_DIR=${QTDIR} \
-DQT_VERSION=3 \ -DQT_VERSION=3 \
-DCMAKE_INSTALL_PREFIX=%{_prefix} \ -DCMAKE_INSTALL_PREFIX=%{_prefix} \
-DPKGCONFIG_INSTALL_DIR=%{_libdir}/pkgconfig \ -DINCLUDE_INSTALL_DIR=%{tde_includedir}/tqt \
-DBIN_INSTALL_DIR=%{_bindir} \ -DLIB_INSTALL_DIR=%{tde_libdir} \
-DINCLUDE_INSTALL_DIR=%{_includedir} \ -DPKGCONFIG_INSTALL_DIR=%{tde_libdir}/pkgconfig \
-DLIB_INSTALL_DIR=%{_libdir} \ -DBIN_INSTALL_DIR=%{tde_bindir} \
.. ..
%__make %{?_smp_mflags} %__make %{?_smp_mflags}
@ -87,21 +92,21 @@ done
# Install 'cmake' modules for development use # Install 'cmake' modules for development use
%__mkdir_p %{?buildroot}%{cmake_modules_dir} %__mkdir_p %{?buildroot}%{cmake_modules_dir}
for i in cmake/modules/*.cmake; do for i in cmake/modules/*.cmake; do
install -m 644 $i %{?buildroot}%{cmake_modules_dir} %__install -m 644 $i %{?buildroot}%{cmake_modules_dir}
done done
%clean %clean
%__rm -rf %{?buildroot} %__rm -rf %{?buildroot}
%files %files
%{_bindir}/* %{tde_bindir}/*
%{_libdir}/*.so.* %{tde_libdir}/*.so.*
%files devel %files devel
%{_includedir} %{tde_includedir}/tqt
%{_libdir}/*.so %{tde_libdir}/*.so
%{_libdir}/*.la %{tde_libdir}/*.la
%{_libdir}/pkgconfig/*.pc %{tde_libdir}/pkgconfig/*.pc
%{cmake_modules_dir}/*.cmake %{cmake_modules_dir}/*.cmake

@ -1,10 +1,27 @@
%define _prefix /opt/trinity # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%define _docdir %{_datadir}/doc %if "%{?_prefix}" != "/usr"
%define _variant .opt
%endif
# TDE 3.5.13 specific building variables
%define tde_bindir %{_prefix}/bin
%define tde_datadir %{_prefix}/share
%define tde_docdir %{tde_datadir}/doc
%define tde_includedir %{_prefix}/include
%define tde_libdir %{_prefix}/%{_lib}
%define tde_mandir %{tde_datadir}/man
%define tde_tdeappdir %{tde_datadir}/applications/kde
%define tde_tdedocdir %{tde_docdir}/kde
%define tde_tdeincludedir %{tde_includedir}/kde
%define tde_tdelibdir %{tde_libdir}/trinity
%define _docdir %{tde_docdir}
Summary: Audio-decoding framework Summary: Audio-decoding framework
Name: trinity-akode Name: trinity-akode
Version: 2.0.2 Version: 2.0.2
Release: 1%{?dist} Release: 1%{?dist}%{?_variant}
License: LGPLv2+ License: LGPLv2+
Group: System Environment/Libraries Group: System Environment/Libraries
@ -30,19 +47,26 @@ Patch10: akode-autotools.patch
%define _with_libsamplerate --with-libsamplerate %define _with_libsamplerate --with-libsamplerate
# Pulseaudio is not available on RHEL 5 and earlier # Pulseaudio is not available on RHEL 5 and earlier
%if 0%{?fedora} >= 15 || 0%{?rhel} >= 6 %if 0%{?fedora} >= 15 || 0%{?rhel} >= 6 || 0%{?mgaversion}
%define _with_pulseaudio --with-pulseaudio %define _with_pulseaudio --with-pulseaudio
%endif %endif
BuildRequires: automake libtool BuildRequires: automake libtool
BuildRequires: alsa-lib-devel BuildRequires: alsa-lib-devel
%{?_with_flac:BuildRequires: flac-devel}
%{?_with_jack:BuildRequires: jack-audio-connection-kit-devel}
%{?_with_libsamplerate:BuildRequires: libsamplerate-devel} %{?_with_libsamplerate:BuildRequires: libsamplerate-devel}
BuildRequires: libvorbis-devel BuildRequires: libvorbis-devel
%{?_with_pulseaudio:BuildRequires: pulseaudio-libs-devel}
BuildRequires: speex-devel BuildRequires: speex-devel
%if 0%{?mgaversion}
%{?_with_jack:BuildRequires: %{_lib}jack-devel}
%{?_with_flac:BuildRequires: %{_lib}flac-devel}
%{?_with_pulseaudio:BuildRequires: %{_lib}pulseaudio-devel}
%else
%{?_with_flac:BuildRequires: flac-devel}
%{?_with_jack:BuildRequires: jack-audio-connection-kit-devel}
%{?_with_pulseaudio:BuildRequires: pulseaudio-libs-devel}
%endif
%description %description
aKode is a simple audio-decoding frame-work that provides a uniform aKode is a simple audio-decoding frame-work that provides a uniform
interface to decode the most common audio-formats. It also has a direct interface to decode the most common audio-formats. It also has a direct
@ -100,9 +124,9 @@ Requires: %{name} = %{version}-%{release}
# Ugly hack to modify TQT include directory inside autoconf files. # Ugly hack to modify TQT include directory inside autoconf files.
# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
%__sed -i admin/acinclude.m4.in \ %__sed -i "admin/acinclude.m4.in" \
-e "s|/usr/include/tqt|%{_includedir}/tqt|g" \ -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g" -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
@ -110,6 +134,10 @@ Requires: %{name} = %{version}-%{release}
%build %build
%configure \ %configure \
--bindir=%{tde_bindir} \
--libdir=%{tde_libdir} \
--includedir=%{tde_includedir} \
--datadir=%{tde_datadir} \
--disable-static \ --disable-static \
--enable-shared \ --enable-shared \
--disable-debug --disable-warnings --disable-dependency-tracking \ --disable-debug --disable-warnings --disable-dependency-tracking \
@ -136,9 +164,7 @@ Requires: %{name} = %{version}-%{release}
%__make install DESTDIR=%{buildroot} %__make install DESTDIR=%{buildroot}
# unpackaged files # unpackaged files
%__rm -f %{buildroot}%{_libdir}/lib*.la
%__rm -f %{buildroot}%{_libdir}/lib*.a %__rm -f %{buildroot}%{_libdir}/lib*.a
#rm -f %{buildroot}%{_libdir}/libakode_oss_sink.so
# rpmdocs # rpmdocs
for file in AUTHORS COPYING NEWS README TODO ; do for file in AUTHORS COPYING NEWS README TODO ; do
@ -150,49 +176,68 @@ done
%__rm -rf %{buildroot} %__rm -rf %{buildroot}
%post -p /sbin/ldconfig %post
/sbin/ldconfig
%postun -p /sbin/ldconfig %postun
/sbin/ldconfig
%post devel
/sbin/ldconfig
%postun devel
/sbin/ldconfig
%files %files
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc rpmdocs/* %doc rpmdocs/*
%{_bindir}/akodeplay %{tde_bindir}/akodeplay
%{_libdir}/libakode.so.* %{tde_libdir}/libakode.so.*
%{_libdir}/libakode_alsa_sink.so %{tde_libdir}/libakode_alsa_sink.la
%{_libdir}/libakode_mpc_decoder.so %{tde_libdir}/libakode_alsa_sink.so
%{_libdir}/libakode_oss_sink.so %{tde_libdir}/libakode_mpc_decoder.la
%{_libdir}/libakode_xiph_decoder.so %{tde_libdir}/libakode_mpc_decoder.so
%{tde_libdir}/libakode_oss_sink.la
%{tde_libdir}/libakode_oss_sink.so
%{tde_libdir}/libakode_xiph_decoder.la
%{tde_libdir}/libakode_xiph_decoder.so
%files devel %files devel
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{_bindir}/akode-config %{tde_bindir}/akode-config
%{_includedir}/* %{tde_includedir}/*
%{_libdir}/libakode.so %{tde_libdir}/libakode.la
%{_libdir}/pkgconfig/*.pc %{tde_libdir}/libakode.so
%{tde_libdir}/pkgconfig/*.pc
%if "%{?_with_jack:1}" == "1" %if "%{?_with_jack:1}" == "1"
%files jack %files jack
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{_libdir}/libakode_jack_sink.so %{tde_libdir}/libakode_jack_sink.la
%{tde_libdir}/libakode_jack_sink.so
%endif %endif
# License: GPLv2+ # License: GPLv2+
%if "%{?_with_libsamplerate:1}" == "1" %if "%{?_with_libsamplerate:1}" == "1"
%files libsamplerate %files libsamplerate
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{_libdir}/libakode_src_resampler.so %{tde_libdir}/libakode_src_resampler.la
%{tde_libdir}/libakode_src_resampler.so
%endif %endif
%if "%{?_with_pulseaudio:1}" == "1" %if "%{?_with_pulseaudio:1}" == "1"
%files pulseaudio %files pulseaudio
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{_libdir}/libakode_polyp_sink.so %{tde_libdir}/libakode_polyp_sink.la
%{tde_libdir}/libakode_polyp_sink.so
%endif %endif
%changelog %changelog
* Tue Jul 30 2012 Francois Andriot <francois.andriot@free.fr> 2.0.2-2
- Re-adds '.la' files
* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> 2.0.2-1 * Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> 2.0.2-1
- Port to TDE 3.5.13 - Port to TDE 3.5.13
- Based on spec file from Fedora 9 'akode-2.0.2-5' - Based on spec file from Fedora 9 'akode-2.0.2-5'

@ -6,7 +6,7 @@
Name: trinity-desktop Name: trinity-desktop
Version: 3.5.13 Version: 3.5.13
Release: 4%{?dist}%{?_variant} Release: 5%{?dist}%{?_variant}
License: GPL License: GPL
Summary: Meta-package to install TDE Summary: Meta-package to install TDE
Group: User Interface/Desktops Group: User Interface/Desktops
@ -22,24 +22,29 @@ BuildArch: noarch
Source0: trinity-3.5.13-fedora.repo Source0: trinity-3.5.13-fedora.repo
Source1: trinity-3.5.13-rhel.repo Source1: trinity-3.5.13-rhel.repo
Requires: trinity-kdeaccessibility >= %{version} Obsoletes: trinity-desktop-extras < %{version}-%{release}
Requires: trinity-kdeaddons >= %{version} Provides: trinity-desktop-extras = %{version}-%{release}
Requires: trinity-kdeadmin >= %{version}
Requires: trinity-kdeartwork >= %{version} Requires: trinity-tdeaccessibility >= %{version}
Requires: trinity-kdeartwork-icons >= %{version} Requires: trinity-tdeaddons >= %{version}
Requires: trinity-kdebase >= %{version} Requires: trinity-tdeadmin >= %{version}
Requires: trinity-kdebindings >= %{version} Requires: trinity-tdeartwork >= %{version}
Requires: trinity-kdeedu >= %{version} Requires: trinity-tdebase >= %{version}
Requires: trinity-kdegames >= %{version} Requires: trinity-tdebindings >= %{version}
Requires: trinity-kdegraphics >= %{version} Requires: trinity-tdeedu >= %{version}
Requires: trinity-kdemultimedia >= %{version} Requires: trinity-tdegames >= %{version}
Requires: trinity-kdenetwork >= %{version} Requires: trinity-tdegraphics >= %{version}
Requires: trinity-kdepim >= %{version} Requires: trinity-tdemultimedia >= %{version}
Requires: trinity-kdeutils >= %{version} Requires: trinity-tdenetwork >= %{version}
Requires: trinity-kdetoys >= %{version} Requires: trinity-tdepim >= %{version}
Requires: trinity-repo >= %{version} Requires: trinity-tdeutils >= %{version}
Requires: trinity-tdetoys >= %{version}
Requires: hal Requires: hal
%if 0%{?rhel} || 0%{?fedora}
Requires: trinity-repo >= %{version}
%endif
%description %description
The TDE project aims to keep the KDE3.5 computing style alive, as well as The TDE project aims to keep the KDE3.5 computing style alive, as well as
polish off any rough edges that were present as of KDE 3.5.10. Along polish off any rough edges that were present as of KDE 3.5.10. Along
@ -49,42 +54,43 @@ Toward that end, significant new enhancements have already been made in
areas such as display control, network connectivity, user areas such as display control, network connectivity, user
authentication, and much more! authentication, and much more!
%package dev %files
##########
%package devel
Group: User Interface/Desktops Group: User Interface/Desktops
Summary: Meta-package to install TDE development tools Summary: Meta-package to install TDE development tools
Requires: trinity-kdesdk >= %{version} Obsoletes: trinity-desktop-dev < %{version}-%{release}
Requires: trinity-kdevelop >= %{version} Provides: trinity-desktop-dev = %{version}-%{release}
Requires: trinity-kdewebdev >= %{version}
%description dev Requires: trinity-tdesdk >= %{version}
%{summary} Requires: trinity-tdevelop >= %{version}
Requires: trinity-tdewebdev >= %{version}
%package extras %description devel
Group: User Interface/Desktops %{summary}
Summary: Meta-package to install extra TDE packages
Requires: trinity-kdeaddons-extras >= %{version} %files devel
Requires: trinity-kdebase-extras >= %{version}
Requires: trinity-kdegraphics-extras >= %{version}
Requires: trinity-kdemultimedia-extras >= %{version}
#Requires: trinity-kdenetwork-extras >= %{version}
Requires: trinity-kdeutils-extras >= %{version}
%description extras ##########
%{summary}
%package all %package all
Group: User Interface/Desktops Group: User Interface/Desktops
Summary: Meta-package to install all TDE packages Summary: Meta-package to install all TDE packages
Requires: %{name} == %{version} Requires: %{name} = %{version}
Requires: %{name}-dev == %{version} Requires: %{name}-devel = %{version}
Requires: %{name}-extras == %{version}
%description all %description all
%{summary} %{summary}
%files all
##########
%if 0%{?rhel} || 0%{?fedora}
%package -n trinity-repo %package -n trinity-repo
Group: User Interface/Desktops Group: User Interface/Desktops
Summary: Yum configuration files for Trinity Summary: Yum configuration files for Trinity
@ -92,6 +98,13 @@ Summary: Yum configuration files for Trinity
%description -n trinity-repo %description -n trinity-repo
%{summary} %{summary}
%files -n trinity-repo
%{_sysconfdir}/yum.repos.d/*.repo
%endif
##########
%prep %prep
%build %build
@ -115,20 +128,16 @@ Summary: Yum configuration files for Trinity
>%{?buildroot}%{_sysconfdir}/yum.repos.d/trinity-3.5.13-el%{rhel}.repo >%{?buildroot}%{_sysconfdir}/yum.repos.d/trinity-3.5.13-el%{rhel}.repo
%endif %endif
%if 0%{?fedora} || 0%{?rhel}
%__chmod 644 %{?buildroot}%{_sysconfdir}/yum.repos.d/*.repo %__chmod 644 %{?buildroot}%{_sysconfdir}/yum.repos.d/*.repo
%endif
%files
%files dev
%files extras
%files all
%files -n trinity-repo
%{_sysconfdir}/yum.repos.d/*.repo
%changelog %changelog
* Wed Aug 01 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-5
- Updates to reflect new packages names
- Add Mageia 2 support
- Removes 'extras' packages
* Wed Jun 06 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-4 * Wed Jun 06 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-4
- Enable mirrorlist - Enable mirrorlist

@ -1,20 +1,16 @@
# Default version for this component
%if "%{?version}" == ""
%define version 3.5.13
%endif
%define release 6
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr" %if "%{?_prefix}" != "/usr"
%define _variant .opt %define _variant .opt
%define _docdir %{_prefix}/share/doc
%endif %endif
# TDE 3.5.13 specific building variables # TDE 3.5.13 specific building variables
BuildRequires: autoconf automake libtool m4 BuildRequires: autoconf automake libtool m4
%define tde_docdir %{_docdir}/kde %define tde_datadir %{_prefix}/share
%define tde_includedir %{_includedir}/kde %define tde_docdir %{tde_datadir}/doc
%define tde_libdir %{_libdir}/trinity %define tde_includedir %{_prefix}/include
%define tde_libdir %{_prefix}/%{_lib}
%define tde_tdedocdir %{tde_docdir}/kde
# Builds all supported languages (not unsupported ones) # Builds all supported languages (not unsupported ones)
%if "%{?KDE_LANGS}" == "" %if "%{?KDE_LANGS}" == ""
@ -24,8 +20,8 @@ BuildRequires: autoconf automake libtool m4
Name: trinity-kde-i18n Name: trinity-kde-i18n
Summary: Internationalization support for Trinity Summary: Internationalization support for Trinity
Version: %{?version} Version: 3.5.13
Release: %{?release}%{?dist}%{?_variant} Release: 6%{?dist}%{?_variant}
Vendor: Trinity Project Vendor: Trinity Project
Packager: Francois Andriot <francois.andriot@free.fr> Packager: Francois Andriot <francois.andriot@free.fr>
@ -637,15 +633,15 @@ done
%build %build
export PATH="%{_bindir}:${PATH}" export PATH="%{_bindir}:${PATH}"
export LDFLAGS="-L%{_libdir} -I%{_includedir}" export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
export kde_htmldir="%{tde_docdir}/HTML" export kde_htmldir="%{tde_tdedocdir}/HTML"
for l in %{KDE_LANGS}; do for l in %{KDE_LANGS}; do
for f in kde-i18n-${l}-*/; do for f in kde-i18n-${l}-*/; do
if [ -d "${f}" ] && [ -x "${f}/configure" ] ; then if [ -d "${f}" ] && [ -x "${f}/configure" ] ; then
pushd ${f} pushd ${f}
%configure %configure --datadir=%{tde_datadir} --docdir=%{tde_docdir}
%__make %{?_smp_mflags} %__make %{?_smp_mflags}
popd popd
fi fi
@ -666,7 +662,7 @@ done
# make symlinks relative # make symlinks relative
%if "%{_prefix}" == "/usr" %if "%{_prefix}" == "/usr"
pushd "%{buildroot}%{tde_docdir}/HTML" pushd "%{buildroot}%{tde_tdedocdir}/HTML"
for lang in *; do for lang in *; do
if [ -d "$lang" ]; then if [ -d "$lang" ]; then
pushd "$lang" pushd "$lang"
@ -698,18 +694,18 @@ popd
%endif %endif
# remove zero-length file # remove zero-length file
find "%{buildroot}%{tde_docdir}/HTML" -size 0 -exec rm -f {} \; find "%{buildroot}%{tde_tdedocdir}/HTML" -size 0 -exec rm -f {} \;
# See http://fedoraproject.org/wiki/Languages (???) # See http://fedoraproject.org/wiki/Languages (???)
%__rm -f %{buildroot}%{_datadir}/locale/*/flag.png %__rm -f %{buildroot}%{tde_datadir}/locale/*/flag.png
# Removes conflict with KDE4 # Removes conflict with KDE4
%if "%{?_prefix}" == "/usr" %if "%{?_prefix}" == "/usr"
%__rm -f %{buildroot}%{_datadir}/locale/*/entry.desktop %__rm -f %{buildroot}%{tde_datadir}/locale/*/entry.desktop
%endif %endif
# remove obsolete KDE 3 application data translations # remove obsolete KDE 3 application data translations
%__rm -rf "%{buildroot}%{_datadir}/apps" %__rm -rf "%{buildroot}%{tde_datadir}/apps"
%clean %clean
%__rm -rf %{buildroot} %__rm -rf %{buildroot}
@ -717,445 +713,445 @@ find "%{buildroot}%{tde_docdir}/HTML" -size 0 -exec rm -f {} \;
%if "%( grep -w af <<< '%{KDE_LANGS}' )" != "" %if "%( grep -w af <<< '%{KDE_LANGS}' )" != ""
%files Afrikaans %files Afrikaans
%defattr(-,root,root,-) %defattr(-,root,root,-)
%lang(af) %{_datadir}/locale/af/* %lang(af) %{tde_datadir}/locale/af/*
%lang(af) %{tde_docdir}/HTML/af/ %lang(af) %{tde_tdedocdir}/HTML/af/
%endif %endif
%if "%( grep -w ar <<< '%{KDE_LANGS}' )" != "" %if "%( grep -w ar <<< '%{KDE_LANGS}' )" != ""
%files Arabic %files Arabic
%defattr(-,root,root,-) %defattr(-,root,root,-)
%lang(ar) %{_datadir}/locale/ar/* %lang(ar) %{tde_datadir}/locale/ar/*
%endif %endif
%if "%( grep -w az <<< '%{KDE_LANGS}' )" != "" %if "%( grep -w az <<< '%{KDE_LANGS}' )" != ""
%files Azerbaijani %files Azerbaijani
%defattr(-,root,root,-) %defattr(-,root,root,-)
%lang(az) %{_datadir}/locale/az/* %lang(az) %{tde_datadir}/locale/az/*
%endif %endif
%if "%( grep -w be <<< '%{KDE_LANGS}' )" != "" %if "%( grep -w be <<< '%{KDE_LANGS}' )" != ""
%files Belarusian %files Belarusian
%defattr(-,root,root,-) %defattr(-,root,root,-)
%lang(be) %{_datadir}/locale/be/* %lang(be) %{tde_datadir}/locale/be/*
%endif %endif
%if "%( grep -w bg <<< '%{KDE_LANGS}' )" != "" %if "%( grep -w bg <<< '%{KDE_LANGS}' )" != ""
%files Bulgarian %files Bulgarian
%defattr(-,root,root,-) %defattr(-,root,root,-)
%lang(bg) %{_datadir}/locale/bg/* %lang(bg) %{tde_datadir}/locale/bg/*
%endif %endif
%if "%( grep -w bn <<< '%{KDE_LANGS}' )" != "" %if "%( grep -w bn <<< '%{KDE_LANGS}' )" != ""
%files Bengali %files Bengali
%defattr(-,root,root,-) %defattr(-,root,root,-)
%lang(bn) %{_datadir}/locale/bn/* %lang(bn) %{tde_datadir}/locale/bn/*
%endif %endif
%if "%( grep -w bo <<< '%{KDE_LANGS}' )" != "" %if "%( grep -w bo <<< '%{KDE_LANGS}' )" != ""
%files Tibetan %files Tibetan
%defattr(-,root,root,-) %defattr(-,root,root,-)
%lang(bo) %{_datadir}/locale/bo/* %lang(bo) %{tde_datadir}/locale/bo/*
%endif %endif
%if "%( grep -w br <<< '%{KDE_LANGS}' )" != "" %if "%( grep -w br <<< '%{KDE_LANGS}' )" != ""
%files Breton %files Breton
%defattr(-,root,root,-) %defattr(-,root,root,-)
%lang(br) %{_datadir}/locale/br/* %lang(br) %{tde_datadir}/locale/br/*
%endif %endif
%if "%( grep -w bs <<< '%{KDE_LANGS}' )" != "" %if "%( grep -w bs <<< '%{KDE_LANGS}' )" != ""
%files Bosnian %files Bosnian
%defattr(-,root,root,-) %defattr(-,root,root,-)
%lang(bs) %{_datadir}/locale/bs/* %lang(bs) %{tde_datadir}/locale/bs/*
%endif %endif
%if "%( grep -w ca <<< '%{KDE_LANGS}' )" != "" %if "%( grep -w ca <<< '%{KDE_LANGS}' )" != ""
%files Catalan %files Catalan
%defattr(-,root,root,-) %defattr(-,root,root,-)
%lang(ca) %{_datadir}/locale/ca/* %lang(ca) %{tde_datadir}/locale/ca/*
%lang(ca) %{tde_docdir}/HTML/ca/ %lang(ca) %{tde_tdedocdir}/HTML/ca/
%endif %endif
%if "%( grep -w cs <<< '%{KDE_LANGS}' )" != "" %if "%( grep -w cs <<< '%{KDE_LANGS}' )" != ""
%files Czech %files Czech
%defattr(-,root,root,-) %defattr(-,root,root,-)
%lang(cs) %{_datadir}/locale/cs/* %lang(cs) %{tde_datadir}/locale/cs/*
%lang(cs) %{tde_docdir}/HTML/cs/ %lang(cs) %{tde_tdedocdir}/HTML/cs/
%endif %endif
%if "%( grep -w cy <<< '%{KDE_LANGS}' )" != "" %if "%( grep -w cy <<< '%{KDE_LANGS}' )" != ""
%files Welsh %files Welsh
%defattr(-,root,root,-) %defattr(-,root,root,-)
%lang(cy) %{_datadir}/locale/cy/* %lang(cy) %{tde_datadir}/locale/cy/*
%endif %endif
%if "%( grep -w da <<< '%{KDE_LANGS}' )" != "" %if "%( grep -w da <<< '%{KDE_LANGS}' )" != ""
%files Danish %files Danish
%defattr(-,root,root,-) %defattr(-,root,root,-)
%lang(da) %{_datadir}/locale/da/* %lang(da) %{tde_datadir}/locale/da/*
%lang(da) %{tde_docdir}/HTML/da/ %lang(da) %{tde_tdedocdir}/HTML/da/
%endif %endif
%if "%( grep -w de <<< '%{KDE_LANGS}' )" != "" %if "%( grep -w de <<< '%{KDE_LANGS}' )" != ""
%files German %files German
%defattr(-,root,root,-) %defattr(-,root,root,-)
%lang(de) %{_datadir}/locale/de/* %lang(de) %{tde_datadir}/locale/de/*
%lang(de) %{tde_docdir}/HTML/de/ %lang(de) %{tde_tdedocdir}/HTML/de/
%endif %endif
%if "%( grep -w el <<< '%{KDE_LANGS}' )" != "" %if "%( grep -w el <<< '%{KDE_LANGS}' )" != ""
%files Greek %files Greek
%defattr(-,root,root,-) %defattr(-,root,root,-)
%lang(el) %{_datadir}/locale/el/* %lang(el) %{tde_datadir}/locale/el/*
%endif %endif
%if "%( grep -w en_GB <<< '%{KDE_LANGS}' )" != "" %if "%( grep -w en_GB <<< '%{KDE_LANGS}' )" != ""
%files British %files British
%defattr(-,root,root,-) %defattr(-,root,root,-)
%lang(en_GB) %{_datadir}/locale/en_GB/* %lang(en_GB) %{tde_datadir}/locale/en_GB/*
%lang(en_GB) %{tde_docdir}/HTML/en_GB/ %lang(en_GB) %{tde_tdedocdir}/HTML/en_GB/
%endif %endif
%if "%( grep -w eo <<< '%{KDE_LANGS}' )" != "" %if "%( grep -w eo <<< '%{KDE_LANGS}' )" != ""
%files Esperanto %files Esperanto
%defattr(-,root,root,-) %defattr(-,root,root,-)
%lang(eo) %{_datadir}/locale/eo/* %lang(eo) %{tde_datadir}/locale/eo/*
%endif %endif
%if "%( grep -w es <<< '%{KDE_LANGS}' )" != "" %if "%( grep -w es <<< '%{KDE_LANGS}' )" != ""
%files Spanish %files Spanish
%defattr(-,root,root,-) %defattr(-,root,root,-)
%lang(es) %{_datadir}/locale/es/* %lang(es) %{tde_datadir}/locale/es/*
%lang(es) %{tde_docdir}/HTML/es/ %lang(es) %{tde_tdedocdir}/HTML/es/
%endif %endif
%if "%( grep -w et <<< '%{KDE_LANGS}' )" != "" %if "%( grep -w et <<< '%{KDE_LANGS}' )" != ""
%files Estonian %files Estonian
%defattr(-,root,root,-) %defattr(-,root,root,-)
%lang(et) %{_datadir}/locale/et/* %lang(et) %{tde_datadir}/locale/et/*
%lang(et) %{tde_docdir}/HTML/et/ %lang(et) %{tde_tdedocdir}/HTML/et/
%endif %endif
%if "%( grep -w eu <<< '%{KDE_LANGS}' )" != "" %if "%( grep -w eu <<< '%{KDE_LANGS}' )" != ""
%files Basque %files Basque
%defattr(-,root,root,-) %defattr(-,root,root,-)
%lang(eu) %{_datadir}/locale/eu/* %lang(eu) %{tde_datadir}/locale/eu/*
%endif %endif
%if "%( grep -w fa <<< '%{KDE_LANGS}' )" != "" %if "%( grep -w fa <<< '%{KDE_LANGS}' )" != ""
%files Farsi %files Farsi
%defattr(-,root,root,-) %defattr(-,root,root,-)
%lang(fa) %{_datadir}/locale/fa/* %lang(fa) %{tde_datadir}/locale/fa/*
%endif %endif
%if "%( grep -w fi <<< '%{KDE_LANGS}' )" != "" %if "%( grep -w fi <<< '%{KDE_LANGS}' )" != ""
%files Finnish %files Finnish
%defattr(-,root,root,-) %defattr(-,root,root,-)
%lang(fi) %{_datadir}/locale/fi/* %lang(fi) %{tde_datadir}/locale/fi/*
%lang(fi) %{tde_docdir}/HTML/fi/ %lang(fi) %{tde_tdedocdir}/HTML/fi/
%endif %endif
%if "%( grep -w fo <<< '%{KDE_LANGS}' )" != "" %if "%( grep -w fo <<< '%{KDE_LANGS}' )" != ""
%files Faroese %files Faroese
%defattr(-,root,root,-) %defattr(-,root,root,-)
%lang(fo) %{_datadir}/locale/fo/* %lang(fo) %{tde_datadir}/locale/fo/*
%endif %endif
%if "%( grep -w fr <<< '%{KDE_LANGS}' )" != "" %if "%( grep -w fr <<< '%{KDE_LANGS}' )" != ""
%files French %files French
%defattr(-,root,root,-) %defattr(-,root,root,-)
%lang(fr) %{_datadir}/locale/fr/* %lang(fr) %{tde_datadir}/locale/fr/*
%lang(fr) %{tde_docdir}/HTML/fr/ %lang(fr) %{tde_tdedocdir}/HTML/fr/
%endif %endif
%if "%( grep -w fy <<< '%{KDE_LANGS}' )" != "" %if "%( grep -w fy <<< '%{KDE_LANGS}' )" != ""
%files Frisian %files Frisian
%defattr(-,root,root,-) %defattr(-,root,root,-)
%lang(fy) %{_datadir}/locale/fy/* %lang(fy) %{tde_datadir}/locale/fy/*
%endif %endif
%if "%( grep -w ga <<< '%{KDE_LANGS}' )" != "" %if "%( grep -w ga <<< '%{KDE_LANGS}' )" != ""
%files Irish %files Irish
%defattr(-,root,root,-) %defattr(-,root,root,-)
%lang(ga) %{_datadir}/locale/ga/* %lang(ga) %{tde_datadir}/locale/ga/*
%endif %endif
%if "%( grep -w gl <<< '%{KDE_LANGS}' )" != "" %if "%( grep -w gl <<< '%{KDE_LANGS}' )" != ""
%files Galician %files Galician
%defattr(-,root,root,-) %defattr(-,root,root,-)
%lang(gl) %{_datadir}/locale/gl/* %lang(gl) %{tde_datadir}/locale/gl/*
%endif %endif
%if "%( grep -w he <<< '%{KDE_LANGS}' )" != "" %if "%( grep -w he <<< '%{KDE_LANGS}' )" != ""
%files Hebrew %files Hebrew
%defattr(-,root,root,-) %defattr(-,root,root,-)
%lang(he) %{_datadir}/locale/he/* %lang(he) %{tde_datadir}/locale/he/*
%lang(he) %{tde_docdir}/HTML/he/ %lang(he) %{tde_tdedocdir}/HTML/he/
%endif %endif
%if "%( grep -w hi <<< '%{KDE_LANGS}' )" != "" %if "%( grep -w hi <<< '%{KDE_LANGS}' )" != ""
%files Hindi %files Hindi
%defattr(-,root,root,-) %defattr(-,root,root,-)
%lang(hi) %{_datadir}/locale/hi/* %lang(hi) %{tde_datadir}/locale/hi/*
%endif %endif
%if "%( grep -w hr <<< '%{KDE_LANGS}' )" != "" %if "%( grep -w hr <<< '%{KDE_LANGS}' )" != ""
%files Croatian %files Croatian
%defattr(-,root,root,-) %defattr(-,root,root,-)
%lang(hr) %{_datadir}/locale/hr/* %lang(hr) %{tde_datadir}/locale/hr/*
%lang(hr) %{tde_docdir}/HTML/hr/ %lang(hr) %{tde_tdedocdir}/HTML/hr/
%endif %endif
%if "%( grep -w hu <<< '%{KDE_LANGS}' )" != "" %if "%( grep -w hu <<< '%{KDE_LANGS}' )" != ""
%files Hungarian %files Hungarian
%defattr(-,root,root,-) %defattr(-,root,root,-)
%lang(hu) %{_datadir}/locale/hu/* %lang(hu) %{tde_datadir}/locale/hu/*
%lang(hu) %{tde_docdir}/HTML/hu/ %lang(hu) %{tde_tdedocdir}/HTML/hu/
%endif %endif
%if "%( grep -w id <<< '%{KDE_LANGS}' )" != "" %if "%( grep -w id <<< '%{KDE_LANGS}' )" != ""
%files Indonesian %files Indonesian
%defattr(-,root,root,-) %defattr(-,root,root,-)
%lang(id) %{_datadir}/locale/id/* %lang(id) %{tde_datadir}/locale/id/*
%lang(id) %{tde_docdir}/HTML/id/ %lang(id) %{tde_tdedocdir}/HTML/id/
%endif %endif
%if "%( grep -w is <<< '%{KDE_LANGS}' )" != "" %if "%( grep -w is <<< '%{KDE_LANGS}' )" != ""
%files Icelandic %files Icelandic
%defattr(-,root,root,-) %defattr(-,root,root,-)
%lang(is) %{_datadir}/locale/is/* %lang(is) %{tde_datadir}/locale/is/*
%endif %endif
%if "%( grep -w it <<< '%{KDE_LANGS}' )" != "" %if "%( grep -w it <<< '%{KDE_LANGS}' )" != ""
%files Italian %files Italian
%defattr(-,root,root,-) %defattr(-,root,root,-)
%lang(it) %{_datadir}/locale/it/* %lang(it) %{tde_datadir}/locale/it/*
%lang(it) %{tde_docdir}/HTML/it/ %lang(it) %{tde_tdedocdir}/HTML/it/
%endif %endif
%if "%( grep -w ja <<< '%{KDE_LANGS}' )" != "" %if "%( grep -w ja <<< '%{KDE_LANGS}' )" != ""
%files Japanese %files Japanese
%defattr(-,root,root,-) %defattr(-,root,root,-)
%lang(ja) %{_datadir}/locale/ja/* %lang(ja) %{tde_datadir}/locale/ja/*
%lang(ja) %{tde_docdir}/HTML/ja/ %lang(ja) %{tde_tdedocdir}/HTML/ja/
%endif %endif
%if "%( grep -w ko <<< '%{KDE_LANGS}' )" != "" %if "%( grep -w ko <<< '%{KDE_LANGS}' )" != ""
%files Korean %files Korean
%defattr(-,root,root,-) %defattr(-,root,root,-)
%lang(ko) %{_datadir}/locale/ko/* %lang(ko) %{tde_datadir}/locale/ko/*
%lang(ko) %{tde_docdir}/HTML/ko/ %lang(ko) %{tde_tdedocdir}/HTML/ko/
%endif %endif
%if "%( grep -w ku <<< '%{KDE_LANGS}' )" != "" %if "%( grep -w ku <<< '%{KDE_LANGS}' )" != ""
%files Kurdish %files Kurdish
%defattr(-,root,root,-) %defattr(-,root,root,-)
%lang(ku) %{_datadir}/locale/ku/* %lang(ku) %{tde_datadir}/locale/ku/*
%lang(ku) %{tde_docdir}/HTML/ku/ %lang(ku) %{tde_tdedocdir}/HTML/ku/
%endif %endif
%if "%( grep -w lao <<< '%{KDE_LANGS}' )" != "" %if "%( grep -w lao <<< '%{KDE_LANGS}' )" != ""
%files Lao %files Lao
%defattr(-,root,root,-) %defattr(-,root,root,-)
%lang(lo) %{_datadir}/locale/lo/* %lang(lo) %{tde_datadir}/locale/lo/*
%lang(lo) %{tde_docdir}/HTML/lo/ %lang(lo) %{tde_tdedocdir}/HTML/lo/
%endif %endif
%if "%( grep -w lt <<< '%{KDE_LANGS}' )" != "" %if "%( grep -w lt <<< '%{KDE_LANGS}' )" != ""
%files Lithuanian %files Lithuanian
%defattr(-,root,root,-) %defattr(-,root,root,-)
%lang(lt) %{_datadir}/locale/lt/* %lang(lt) %{tde_datadir}/locale/lt/*
%endif %endif
%if "%( grep -w lv <<< '%{KDE_LANGS}' )" != "" %if "%( grep -w lv <<< '%{KDE_LANGS}' )" != ""
%files Latvian %files Latvian
%defattr(-,root,root,-) %defattr(-,root,root,-)
%lang(lv) %{_datadir}/locale/lv/* %lang(lv) %{tde_datadir}/locale/lv/*
%endif %endif
%if "%( grep -w mi <<< '%{KDE_LANGS}' )" != "" %if "%( grep -w mi <<< '%{KDE_LANGS}' )" != ""
%files Maori %files Maori
%defattr(-,root,root,-) %defattr(-,root,root,-)
%lang(mi) %{_datadir}/locale/mi/* %lang(mi) %{tde_datadir}/locale/mi/*
%endif %endif
%if "%( grep -w mk <<< '%{KDE_LANGS}' )" != "" %if "%( grep -w mk <<< '%{KDE_LANGS}' )" != ""
%files Macedonian %files Macedonian
%defattr(-,root,root,-) %defattr(-,root,root,-)
%lang(mk) %{_datadir}/locale/mk/* %lang(mk) %{tde_datadir}/locale/mk/*
%endif %endif
%if "%( grep -w mt <<< '%{KDE_LANGS}' )" != "" %if "%( grep -w mt <<< '%{KDE_LANGS}' )" != ""
%files Maltese %files Maltese
%defattr(-,root,root,-) %defattr(-,root,root,-)
%lang(mt) %{_datadir}/locale/mt/* %lang(mt) %{tde_datadir}/locale/mt/*
%endif %endif
%if "%( grep -w nl <<< '%{KDE_LANGS}' )" != "" %if "%( grep -w nl <<< '%{KDE_LANGS}' )" != ""
%files Dutch %files Dutch
%defattr(-,root,root,-) %defattr(-,root,root,-)
%lang(nl) %{_datadir}/locale/nl/* %lang(nl) %{tde_datadir}/locale/nl/*
%lang(nl) %{tde_docdir}/HTML/nl/ %lang(nl) %{tde_tdedocdir}/HTML/nl/
%endif %endif
%if "%( grep -w nb <<< '%{KDE_LANGS}' )" != "" %if "%( grep -w nb <<< '%{KDE_LANGS}' )" != ""
%files Norwegian %files Norwegian
%defattr(-,root,root,-) %defattr(-,root,root,-)
%lang(nb) %{_datadir}/locale/nb/* %lang(nb) %{tde_datadir}/locale/nb/*
#%lang(nb) %{tde_docdir}/HTML/nb/ #%lang(nb) %{tde_tdedocdir}/HTML/nb/
%endif %endif
%if "%( grep -w nn <<< '%{KDE_LANGS}' )" != "" %if "%( grep -w nn <<< '%{KDE_LANGS}' )" != ""
%files Norwegian-Nynorsk %files Norwegian-Nynorsk
%defattr(-,root,root,-) %defattr(-,root,root,-)
%lang(nn) %{_datadir}/locale/nn/* %lang(nn) %{tde_datadir}/locale/nn/*
#%lang(nn) %{tde_docdir}/HTML/nn/ #%lang(nn) %{tde_tdedocdir}/HTML/nn/
%endif %endif
%if "%( grep -w oc <<< '%{KDE_LANGS}' )" != "" %if "%( grep -w oc <<< '%{KDE_LANGS}' )" != ""
%files Occitan %files Occitan
%defattr(-,root,root,-) %defattr(-,root,root,-)
%lang(oc) %{_datadir}/locale/oc/* %lang(oc) %{tde_datadir}/locale/oc/*
%endif %endif
%if "%( grep -w pa <<< '%{KDE_LANGS}' )" != "" %if "%( grep -w pa <<< '%{KDE_LANGS}' )" != ""
%files Punjabi %files Punjabi
%defattr(-,root,root,-) %defattr(-,root,root,-)
%lang(pa) %{_datadir}/locale/pa/* %lang(pa) %{tde_datadir}/locale/pa/*
%endif %endif
%if "%( grep -w pl <<< '%{KDE_LANGS}' )" != "" %if "%( grep -w pl <<< '%{KDE_LANGS}' )" != ""
%files Polish %files Polish
%defattr(-,root,root,-) %defattr(-,root,root,-)
%lang(pl) %{_datadir}/locale/pl/* %lang(pl) %{tde_datadir}/locale/pl/*
%lang(pl) %{tde_docdir}/HTML/pl/ %lang(pl) %{tde_tdedocdir}/HTML/pl/
%endif %endif
%if "%( grep -w pt <<< '%{KDE_LANGS}' )" != "" %if "%( grep -w pt <<< '%{KDE_LANGS}' )" != ""
%files Portuguese %files Portuguese
%defattr(-,root,root,-) %defattr(-,root,root,-)
%lang(pt) %{_datadir}/locale/pt/* %lang(pt) %{tde_datadir}/locale/pt/*
%lang(pt) %{tde_docdir}/HTML/pt/ %lang(pt) %{tde_tdedocdir}/HTML/pt/
%endif %endif
%if "%( grep -w pt_BR <<< '%{KDE_LANGS}' )" != "" %if "%( grep -w pt_BR <<< '%{KDE_LANGS}' )" != ""
%files Brazil %files Brazil
%defattr(-,root,root,-) %defattr(-,root,root,-)
%lang(pt_BR) %{_datadir}/locale/pt_BR/* %lang(pt_BR) %{tde_datadir}/locale/pt_BR/*
%lang(pt_BR) %{tde_docdir}/HTML/pt_BR/ %lang(pt_BR) %{tde_tdedocdir}/HTML/pt_BR/
%endif %endif
%if "%( grep -w ro <<< '%{KDE_LANGS}' )" != "" %if "%( grep -w ro <<< '%{KDE_LANGS}' )" != ""
%files Romanian %files Romanian
%defattr(-,root,root,-) %defattr(-,root,root,-)
%lang(ro) %{_datadir}/locale/ro/* %lang(ro) %{tde_datadir}/locale/ro/*
%lang(ro) %{tde_docdir}/HTML/ro/ %lang(ro) %{tde_tdedocdir}/HTML/ro/
%endif %endif
%if "%( grep -w ru <<< '%{KDE_LANGS}' )" != "" %if "%( grep -w ru <<< '%{KDE_LANGS}' )" != ""
%files Russian %files Russian
%defattr(-,root,root,-) %defattr(-,root,root,-)
%lang(ru) %{_datadir}/locale/ru/* %lang(ru) %{tde_datadir}/locale/ru/*
%lang(ru) %{tde_docdir}/HTML/ru/ %lang(ru) %{tde_tdedocdir}/HTML/ru/
%endif %endif
%if "%( grep -w sk <<< '%{KDE_LANGS}' )" != "" %if "%( grep -w sk <<< '%{KDE_LANGS}' )" != ""
%files Slovak %files Slovak
%defattr(-,root,root,-) %defattr(-,root,root,-)
%lang(sk) %{_datadir}/locale/sk/* %lang(sk) %{tde_datadir}/locale/sk/*
%lang(sk) %{tde_docdir}/HTML/sk/ %lang(sk) %{tde_tdedocdir}/HTML/sk/
%endif %endif
%if "%( grep -w sl <<< '%{KDE_LANGS}' )" != "" %if "%( grep -w sl <<< '%{KDE_LANGS}' )" != ""
%files Slovenian %files Slovenian
%defattr(-,root,root,-) %defattr(-,root,root,-)
%lang(sl) %{_datadir}/locale/sl/* %lang(sl) %{tde_datadir}/locale/sl/*
%lang(sl) %{tde_docdir}/HTML/sl/ %lang(sl) %{tde_tdedocdir}/HTML/sl/
%endif %endif
%if "%( grep -w sr <<< '%{KDE_LANGS}' )" != "" %if "%( grep -w sr <<< '%{KDE_LANGS}' )" != ""
%files Serbian %files Serbian
%defattr(-,root,root,-) %defattr(-,root,root,-)
%lang(sr) %{_datadir}/locale/sr/* %lang(sr) %{tde_datadir}/locale/sr/*
%lang(sr) %{tde_docdir}/HTML/sr/ %lang(sr) %{tde_tdedocdir}/HTML/sr/
%endif %endif
%if "%( grep -w sv <<< '%{KDE_LANGS}' )" != "" %if "%( grep -w sv <<< '%{KDE_LANGS}' )" != ""
%files Swedish %files Swedish
%defattr(-,root,root,-) %defattr(-,root,root,-)
%lang(sv) %{_datadir}/locale/sv/* %lang(sv) %{tde_datadir}/locale/sv/*
%lang(sv) %{tde_docdir}/HTML/sv/ %lang(sv) %{tde_tdedocdir}/HTML/sv/
%endif %endif
%if "%( grep -w ta <<< '%{KDE_LANGS}' )" != "" %if "%( grep -w ta <<< '%{KDE_LANGS}' )" != ""
%files Tamil %files Tamil
%defattr(-,root,root,-) %defattr(-,root,root,-)
%lang(ta) %{_datadir}/locale/ta/* %lang(ta) %{tde_datadir}/locale/ta/*
%endif %endif
%if "%( grep -w tg <<< '%{KDE_LANGS}' )" != "" %if "%( grep -w tg <<< '%{KDE_LANGS}' )" != ""
%files Tajik %files Tajik
%defattr(-,root,root,-) %defattr(-,root,root,-)
%lang(tg) %{_datadir}/locale/tg/* %lang(tg) %{tde_datadir}/locale/tg/*
%endif %endif
%if "%( grep -w th <<< '%{KDE_LANGS}' )" != "" %if "%( grep -w th <<< '%{KDE_LANGS}' )" != ""
%files Thai %files Thai
%defattr(-,root,root,-) %defattr(-,root,root,-)
%lang(th) %{_datadir}/locale/th/* %lang(th) %{tde_datadir}/locale/th/*
%endif %endif
%if "%( grep -w tr <<< '%{KDE_LANGS}' )" != "" %if "%( grep -w tr <<< '%{KDE_LANGS}' )" != ""
%files Turkish %files Turkish
%defattr(-,root,root,-) %defattr(-,root,root,-)
%lang(tr) %{_datadir}/locale/tr/* %lang(tr) %{tde_datadir}/locale/tr/*
%lang(tr) %{tde_docdir}/HTML/tr/ %lang(tr) %{tde_tdedocdir}/HTML/tr/
%endif %endif
%if "%( grep -w uk <<< '%{KDE_LANGS}' )" != "" %if "%( grep -w uk <<< '%{KDE_LANGS}' )" != ""
%files Ukrainian %files Ukrainian
%defattr(-,root,root,-) %defattr(-,root,root,-)
%lang(uk) %{tde_docdir}/HTML/uk/ %lang(uk) %{tde_tdedocdir}/HTML/uk/
%lang(uk) %{_datadir}/locale/uk/* %lang(uk) %{tde_datadir}/locale/uk/*
%endif %endif
%if "%( grep -w ven <<< '%{KDE_LANGS}' )" != "" %if "%( grep -w ven <<< '%{KDE_LANGS}' )" != ""
%files Venda %files Venda
%defattr(-,root,root,-) %defattr(-,root,root,-)
%lang(ven) %{_datadir}/locale/ven/* %lang(ven) %{tde_datadir}/locale/ven/*
%endif %endif
%if "%( grep -w vi <<< '%{KDE_LANGS}' )" != "" %if "%( grep -w vi <<< '%{KDE_LANGS}' )" != ""
%files Vietnamese %files Vietnamese
%defattr(-,root,root,-) %defattr(-,root,root,-)
%lang(vi) %{_datadir}/locale/vi/* %lang(vi) %{tde_datadir}/locale/vi/*
%endif %endif
%if "%( grep -w wa <<< '%{KDE_LANGS}' )" != "" %if "%( grep -w wa <<< '%{KDE_LANGS}' )" != ""
%files Walloon %files Walloon
%defattr(-,root,root,-) %defattr(-,root,root,-)
%lang(wa) %{_datadir}/locale/wa/* %lang(wa) %{tde_datadir}/locale/wa/*
%endif %endif
%if "%( grep -w xh <<< '%{KDE_LANGS}' )" != "" %if "%( grep -w xh <<< '%{KDE_LANGS}' )" != ""
%files Xhosa %files Xhosa
%defattr(-,root,root,-) %defattr(-,root,root,-)
%lang(xh) %{_datadir}/locale/xh/* %lang(xh) %{tde_datadir}/locale/xh/*
%lang(xh) %{tde_docdir}/HTML/xh/ %lang(xh) %{tde_tdedocdir}/HTML/xh/
%endif %endif
%if "%( grep -w zh_CN <<< '%{KDE_LANGS}' )" != "" %if "%( grep -w zh_CN <<< '%{KDE_LANGS}' )" != ""
%files Chinese %files Chinese
%defattr(-,root,root,-) %defattr(-,root,root,-)
%lang(zh_CN) %{_datadir}/locale/zh_CN/* %lang(zh_CN) %{tde_datadir}/locale/zh_CN/*
%lang(zh_CN) %{tde_docdir}/HTML/zh_CN/ %lang(zh_CN) %{tde_tdedocdir}/HTML/zh_CN/
%endif %endif
%if "%( grep -w zh_TW <<< '%{KDE_LANGS}' )" != "" %if "%( grep -w zh_TW <<< '%{KDE_LANGS}' )" != ""
%files Chinese-Big5 %files Chinese-Big5
%defattr(-,root,root,-) %defattr(-,root,root,-)
%lang(zh_TW) %{_datadir}/locale/zh_TW/* %lang(zh_TW) %{tde_datadir}/locale/zh_TW/*
%lang(zh_TW) %{tde_docdir}/HTML/zh_TW/ %lang(zh_TW) %{tde_tdedocdir}/HTML/zh_TW/
%endif %endif
%changelog %changelog

@ -0,0 +1,22 @@
--- kdeaccessibility/ksayit/KTTSD_Lib/Makefile.am.ORI 2012-07-31 13:37:10.811009510 +0200
+++ kdeaccessibility/ksayit/KTTSD_Lib/Makefile.am 2012-07-31 13:37:33.505555438 +0200
@@ -5,7 +5,7 @@
METASOURCES = AUTO
libKTTSD_Lib_la_LDFLAGS = -no-undefined $(all_libraries) -version-info 0:1
lib_LTLIBRARIES = libKTTSD_Lib.la
-libKTTSD_Lib_la_LIBADD = $(LIB_KDEUI) $(LIB_KDECORE)
+libKTTSD_Lib_la_LIBADD = $(LIB_KDEUI) $(LIB_KDECORE) -lqt-mt -lDCOP
noinst_HEADERS = kttsdlib.h kttsdlibsetupimpl.h kttsdlibtalker2.h kdeexportfix.h
kspeech_DIR = $(KTTS_KSPEECH_DIR)
--- kdeaccessibility/kttsd/libkttsd/Makefile.am.ORI 2012-07-31 17:09:08.905460827 +0200
+++ kdeaccessibility/kttsd/libkttsd/Makefile.am 2012-07-31 17:09:20.272109013 +0200
@@ -26,7 +26,7 @@
notify.cpp
libkttsd_la_LDFLAGS = -version-info 1:0:0 $(all_libraries) -no-undefined
-libkttsd_la_LIBADD = $(LIB_KIO)
+libkttsd_la_LIBADD = $(LIB_KIO) -lqt-mt -lkdeui -lkdecore
# Header files that should not be installed.
noinst_HEADERS = \

@ -5,41 +5,82 @@
%endif %endif
# TDE 3.5.13 specific building variables # TDE 3.5.13 specific building variables
%define tde_docdir %{_docdir}/kde %define tde_bindir %{_prefix}/bin
%define tde_includedir %{_includedir}/kde %define tde_datadir %{_prefix}/share
%define tde_libdir %{_libdir}/trinity %define tde_docdir %{tde_datadir}/doc
%define tde_includedir %{_prefix}/include
%define tde_libdir %{_prefix}/%{_lib}
%define tde_tdeappdir %{tde_datadir}/applications/kde
%define tde_tdedocdir %{tde_docdir}/kde
%define tde_tdeincludedir %{tde_includedir}/kde
%define tde_tdelibdir %{tde_libdir}/trinity
Summary: K Desktop Environment - Accessibility %define _docdir %{tde_docdir}
Name: trinity-kdeaccessibility
Version: 3.5.13
Release: 2%{?dist}%{?_variant}
License: GPLv2
Group: User Interface/Desktops Summary: Trinity Desktop Environment - Accessibility
Name: trinity-tdeaccessibility
Version: 3.5.13
Release: 3%{?dist}%{?_variant}
License: GPLv2
Group: User Interface/Desktops
Vendor: Trinity Project Vendor: Trinity Project
Packager: Francois Andriot <francois.andriot@free.fr> Packager: Francois Andriot <francois.andriot@free.fr>
URL: http://www.trinitydesktop.org/ URL: http://www.trinitydesktop.org/
Source0: kdeaccessibility-%{version}.tar.gz Source0: kdeaccessibility-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # [kdeaccessibility] Missing LDFLAGS causing FTBFS
Patch1: kdeaccessibility-3.5.13-missing_ldflags.patch
Provides: kdeaccessibility3 = %{version}-%{release} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: trinity-kdelibs BuildRequires: cmake >= 2.8
Requires(post): /sbin/ldconfig BuildRequires: desktop-file-utils
Requires(postun): /sbin/ldconfig BuildRequires: trinity-tdelibs-devel >= 3.5.13
BuildRequires: alsa-lib-devel
BuildRequires: trinity-akode-devel
BuildRequires: trinity-arts-devel >= 3.5.13
BuildRequires: trinity-tdemultimedia-devel >= 3.5.13
BuildRequires: cmake >= 2.8
BuildRequires: desktop-file-utils
BuildRequires: trinity-kdelibs-devel
BuildRequires: alsa-lib-devel
%if 0%{?fedora} > 4 || 0%{?rhel} > 4 %if 0%{?fedora} > 4 || 0%{?rhel} > 4
BuildRequires: libXtst-devel BuildRequires: libXtst-devel
%endif %endif
%if 0%{?mgaversion}
# Special packages for missing '.la' files on Mageia 2
BuildRequires: %{_lib}xi-devel %{_lib}xi-devel-libtool
BuildRequires: %{_lib}xext6-devel %{_lib}xext6-devel-libtool
BuildRequires: %{_lib}x11_6-devel %{_lib}x11_6-devel-libtool
BuildRequires: %{_lib}xcb-devel %{_lib}xcb-devel-libtool
BuildRequires: %{_lib}xau6-devel %{_lib}xau6-devel-libtool
%else
BuildRequires: libXi-devel
BuildRequires: libXext-devel
BuildRequires: libX11-devel
%if 0%{?rhel} >= 6 || 0%{?fedora}
BuildRequires: libxcb-devel
%endif
BuildRequires: libXau-devel
%endif
Obsoletes: trinity-kdeaccessibility < %{version}-%{release}
Provides: trinity-kdeaccessibility = %{version}-%{release}
Obsoletes: trinity-kdeaccessibility-libs < %{version}-%{release}
Provides: trinity-kdeaccessibility-libs = %{version}-%{release}
Requires: trinity-kde-icons-mono = %{version}-%{release}
Requires: trinity-kbstate = %{version}-%{release}
Requires: trinity-kmag = %{version}-%{release}
Requires: trinity-kmousetool = %{version}-%{release}
Requires: trinity-kmouth = %{version}-%{release}
Requires: trinity-ksayit = %{version}-%{release}
Requires: trinity-kttsd = %{version}-%{release}
Requires: trinity-kttsd-contrib-plugins = %{version}-%{release}
%description %description
Included with this package are: Included with this package are:
* kmag, a screen magnifier, * kmag, a screen magnifier,
@ -47,24 +88,353 @@ Included with this package are:
* kmouth, program that allows people who have lost their voice * kmouth, program that allows people who have lost their voice
to let their computer speak for them. to let their computer speak for them.
%files
##########
%package -n trinity-kde-icons-mono
Summary: A monochromatic icons theme for TDE
Group: User Interface/Desktops
%description -n trinity-kde-icons-mono
A monochromatic icon theme for TDE, designed for accessibility purposes.
This package is part of Trinity, as a component of the TDE accessibility module.
%files -n trinity-kde-icons-mono
%defattr(-,root,root,-)
%{tde_datadir}/icons/mono/index.theme
%{tde_datadir}/icons/mono/scalable/*/*.svgz
##########
%package -n trinity-kbstate
Summary: a keyboard status applet for TDE
Group: User Interface/Desktops
%description -n trinity-kbstate
A panel applet that displays the keyboard status.
This package is part of Trinity, as a component of the TDE accessibility module.
%files -n trinity-kbstate
%defattr(-,root,root,-)
%{tde_tdelibdir}/kbstate_panelapplet.la
%{tde_tdelibdir}/kbstate_panelapplet.so
%{tde_datadir}/apps/kbstateapplet/
%{tde_datadir}/apps/kicker/applets/kbstateapplet.desktop
##########
%package -n trinity-kmag
Summary: A screen magnifier for TDE
Group: User Interface/Desktops
%description -n trinity-kmag
KDE's screen magnifier tool.
You can use KMagnifier to magnify a part of the screen just as you would use
a lens to magnify a newspaper fine-print or a photograph. This application is
useful for a variety of people: from researchers to artists to web-designers to
people with low vision.
This package is part of Trinity, as a component of the TDE accessibility module.
%files -n trinity-kmag
%defattr(-,root,root,-)
%{tde_bindir}/kmag
%{tde_datadir}/applnk/Applications/kmag.desktop
%{tde_datadir}/apps/kmag/
%{tde_datadir}/icons/hicolor/*/apps/kmag.png
%{tde_datadir}/icons/locolor/*/apps/kmag.png
%{tde_tdedocdir}/HTML/en/kmag/
%post -n trinity-kmag
/sbin/ldconfig ||:
for icon_theme in hicolor locolor ; do
touch --no-create %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
done
%postun -n trinity-kmag
/sbin/ldconfig ||:
for icon_theme in hicolor locolor ; do
touch --no-create %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
done
##########
%package -n trinity-kmousetool
Summary: TDE mouse manipulation tool for the disabled
Group: User Interface/Desktops
%description -n trinity-kmousetool
KMouseTool clicks the mouse whenever the mouse cursor pauses briefly. It was
designed to help those with repetitive strain injuries, for whom pressing
buttons hurts.
This package is part of Trinity, as a component of the TDE accessibility module.
%files -n trinity-kmousetool
%defattr(-,root,root,-)
%{tde_bindir}/kmousetool
%{tde_datadir}/applnk/Applications/kmousetool.desktop
%{tde_datadir}/apps/kmousetool/
%{tde_datadir}/icons/hicolor/*/apps/kmousetool.png
%{tde_tdedocdir}/HTML/en/kmousetool/
%post -n trinity-kmousetool
for icon_theme in hicolor ; do
touch --no-create %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
done
%postun -n trinity-kmousetool
for icon_theme in hicolor ; do
touch --no-create %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
done
##########
%package -n trinity-kmouth
Summary: A type-and-say KDE frontend for speech synthesizers
Group: User Interface/Desktops
%description -n trinity-kmouth
KDE's type-and-say frontend for speech synthesizers.
It includes a history of spoken sentences from which the user can select
sentences to be re-spoken.
This package is part of Trinity, as a component of the TDE accessibility module.
%files -n trinity-kmouth
%defattr(-,root,root,-)
%{tde_datadir}/config/kmouthrc
%{tde_bindir}/kmouth
%{tde_datadir}/applnk/Applications/kmouth.desktop
%{tde_datadir}/apps/kmouth/
%{tde_datadir}/icons/hicolor/*/actions/speak.png
%{tde_datadir}/icons/hicolor/*/actions/nospeak.png
%{tde_datadir}/icons/hicolor/*/apps/kmouth.png
%{tde_datadir}/icons/locolor/*/actions/speak.png
%{tde_datadir}/icons/locolor/*/apps/kmouth.png
%{tde_tdedocdir}/HTML/en/kmouth/
%post -n trinity-kmouth
for icon_theme in hicolor ; do
touch --no-create %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
done
%postun -n trinity-kmouth
for icon_theme in hicolor ; do
touch --no-create %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
done
##########
%package -n trinity-ksayit
Summary: A frontend for the TDE Text-to-Speech system
Group: User Interface/Desktops
%description -n trinity-ksayit
Text-to-speech front-end to kttsd.
This package is part of Trinity, as a component of the TDE accessibility module.
%files -n trinity-ksayit
%defattr(-,root,root,-)
%{tde_bindir}/ksayit
%{tde_tdeincludedir}/ksayit_fxplugin.h
%{tde_tdelibdir}/libFreeverb_plugin.la
%{tde_tdelibdir}/libFreeverb_plugin.so
%{tde_libdir}/libKTTSD_Lib.so.*
%{tde_tdeappdir}/ksayit.desktop
%{tde_datadir}/apps/ksayit/
%{tde_datadir}/icons/hicolor/*/apps/ksayit.png
%{tde_datadir}/icons/hicolor/32x32/apps/ksayit_clipempty.png
%{tde_datadir}/icons/hicolor/32x32/apps/ksayit_talking.png
%{tde_datadir}/services/ksayit_libFreeverb.desktop
%{tde_datadir}/servicetypes/ksayit_libFreeverb_service.desktop
%post -n trinity-ksayit
/sbin/ldconfig ||:
for icon_theme in mono hicolor locolor ; do
touch --no-create %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
done
update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
%postun -n trinity-ksayit
/sbin/ldconfig ||:
for icon_theme in mono hicolor locolor ; do
touch --no-create %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
done
update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
##########
%package -n trinity-kttsd
Summary: A Text-to-Speech system for TDE
Group: User Interface/Desktops
%description -n trinity-kttsd
The KDE Text-to-Speech system is a plugin based service that allows any KDE
(or non-KDE) application to speak using the DCOP interface.
ksayit and kmouth are useful front-ends for this capability, while one of
festival, flite, and epos are essential back-ends.
This package is part of Trinity, as a component of the TDE accessibility module.
Homepage: http://accessibility.kde.org/developer/kttsd
%files -n trinity-kttsd
%defattr(-,root,root,-)
%{tde_bindir}/kttsd
%{tde_bindir}/kttsmgr
%{tde_tdelibdir}/kcm_kttsd.la
%{tde_tdelibdir}/kcm_kttsd.so
%{tde_tdelibdir}/ktexteditor_kttsd.la
%{tde_tdelibdir}/ktexteditor_kttsd.so
%{tde_tdelibdir}/libkttsd_akodeplugin.la
%{tde_tdelibdir}/libkttsd_akodeplugin.so
%{tde_tdelibdir}/libkttsd_alsaplugin.la
%{tde_tdelibdir}/libkttsd_alsaplugin.so
%{tde_tdelibdir}/libkttsd_artsplugin.la
%{tde_tdelibdir}/libkttsd_artsplugin.so
%{tde_tdelibdir}/libkttsd_commandplugin.la
%{tde_tdelibdir}/libkttsd_commandplugin.so
%{tde_tdelibdir}/libkttsd_eposplugin.la
%{tde_tdelibdir}/libkttsd_eposplugin.so
%{tde_tdelibdir}/libkttsd_festivalintplugin.la
%{tde_tdelibdir}/libkttsd_festivalintplugin.so
%{tde_tdelibdir}/libkttsd_fliteplugin.la
%{tde_tdelibdir}/libkttsd_fliteplugin.so
%{tde_tdelibdir}/libkttsd_sbdplugin.la
%{tde_tdelibdir}/libkttsd_sbdplugin.so
%{tde_tdelibdir}/libkttsd_stringreplacerplugin.la
%{tde_tdelibdir}/libkttsd_stringreplacerplugin.so
%{tde_tdelibdir}/libkttsd_talkerchooserplugin.la
%{tde_tdelibdir}/libkttsd_talkerchooserplugin.so
%{tde_tdelibdir}/libkttsd_xmltransformerplugin.la
%{tde_tdelibdir}/libkttsd_xmltransformerplugin.so
%{tde_tdelibdir}/libkttsjobmgrpart.la
%{tde_tdelibdir}/libkttsjobmgrpart.so
%{tde_libdir}/libkttsd.so.*
%{tde_tdeappdir}/kcmkttsd.desktop
%{tde_tdeappdir}/kttsmgr.desktop
%{tde_datadir}/apps/ktexteditor_kttsd/ktexteditor_kttsdui.rc
%exclude %{tde_datadir}/apps/kttsd/hadifix/xslt/SSMLtoTxt2pho.xsl
%{tde_datadir}/apps/kttsd/
%{tde_datadir}/icons/hicolor/16x16/actions/female.png
%{tde_datadir}/icons/hicolor/16x16/actions/male.png
%{tde_datadir}/services/ktexteditor_kttsd.desktop
%{tde_datadir}/services/kttsd.desktop
%{tde_datadir}/services/kttsd_akodeplugin.desktop
%{tde_datadir}/services/kttsd_alsaplugin.desktop
%{tde_datadir}/services/kttsd_artsplugin.desktop
%{tde_datadir}/services/kttsd_commandplugin.desktop
%{tde_datadir}/services/kttsd_eposplugin.desktop
%{tde_datadir}/services/kttsd_festivalintplugin.desktop
%{tde_datadir}/services/kttsd_fliteplugin.desktop
%{tde_datadir}/services/kttsd_sbdplugin.desktop
%{tde_datadir}/services/kttsd_stringreplacerplugin.desktop
%{tde_datadir}/services/kttsd_talkerchooserplugin.desktop
%{tde_datadir}/services/kttsd_xmltransformerplugin.desktop
%{tde_datadir}/services/kttsjobmgr.desktop
%{tde_datadir}/servicetypes/kttsd_audioplugin.desktop
%{tde_datadir}/servicetypes/kttsd_filterplugin.desktop
%{tde_datadir}/servicetypes/kttsd_synthplugin.desktop
%{tde_datadir}/icons/crystalsvg/*/apps/kttsd.png
%{tde_datadir}/icons/crystalsvg/*/apps/kttsd.svgz
%{tde_tdedocdir}/HTML/en/kttsd/
%post -n trinity-kttsd
/sbin/ldconfig ||:
for icon_theme in crystalsvg hicolor locolor ; do
touch --no-create %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
done
update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
%postun -n trinity-kttsd
/sbin/ldconfig ||:
for icon_theme in crystalsvg hicolor locolor ; do
touch --no-create %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
done
update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
##########
%package -n trinity-kttsd-contrib-plugins
Summary: the TDE Text-to-Speech system
Group: User Interface/Desktops
Requires: trinity-kttsd = %{version}-%{release}
%description -n trinity-kttsd-contrib-plugins
kttsd synthetizer plugins that depends on non-free software :
* FreeTTS plugin.
* Hadifix (mbrola/txt2pho) plugin.
Those plugins will require manual installation of third party,
non free software to work.
This package is part of Trinity, as a component of the TDE accessibility module.
%files -n trinity-kttsd-contrib-plugins
%defattr(-,root,root,-)
%{tde_tdelibdir}/libkttsd_freettsplugin.la
%{tde_tdelibdir}/libkttsd_freettsplugin.so
%{tde_tdelibdir}/libkttsd_hadifixplugin.la
%{tde_tdelibdir}/libkttsd_hadifixplugin.so
%{tde_datadir}/apps/kttsd/hadifix/xslt/SSMLtoTxt2pho.xsl
%{tde_datadir}/services/kttsd_freettsplugin.desktop
%{tde_datadir}/services/kttsd_hadifixplugin.desktop
##########
%package devel %package devel
Summary: Development files for %{name} Summary: Development files for %{name}
Group: Development/Libraries Group: Development/Libraries
Provides: kdeaccessibility3-devel = %{version}-%{release} Requires: %{name} = %{version}-%{release}
Requires: %{name} = %{version}-%{release} Requires: trinity-tdelibs-devel >= 3.5.13
Requires: trinity-kdelibs-devel
Obsoletes: trinity-kdeaccessibility-devel < %{version}-%{release}
Provides: trinity-kdeaccessibility-devel = %{version}-%{release}
%description devel %description devel
%{summary}. %{summary}.
%files devel
%defattr(-,root,root,-)
%{tde_libdir}/libkttsd.la
%{tde_libdir}/libkttsd.so
%{tde_libdir}/libKTTSD_Lib.la
%{tde_libdir}/libKTTSD_Lib.so
%post devel
/sbin/ldconfig ||:
%postun devel
/sbin/ldconfig ||:
##########
%prep %prep
%setup -q -n kdeaccessibility %setup -q -n kdeaccessibility
%patch1 -p1 -b .ftbfs
# Ugly hack to modify TQT include directory inside autoconf files. # Ugly hack to modify TQT include directory inside autoconf files.
# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
%__sed -i admin/acinclude.m4.in \ %__sed -i admin/acinclude.m4.in \
-e "s|/usr/include/tqt|%{_includedir}/tqt|g" \ -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g" -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
@ -73,34 +443,38 @@ Requires: trinity-kdelibs-devel
%build %build
unset QTDIR || : ; . /etc/profile.d/qt.sh unset QTDIR || : ; . /etc/profile.d/qt.sh
export PATH="%{_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
export LDFLAGS="-L%{_libdir} -I%{_includedir}" export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
# Avoir conflict with KDE4, if installed
# see file: '/etc/profile.d/kde.sh' from package 'kde-settings'
export KDEDIRS=%{_prefix}
export KDEDIR=%{_prefix}
%configure \ %configure \
--includedir=%{tde_includedir} \ --exec-prefix=%{_prefix} \
--bindir=%{tde_bindir} \
--libdir=%{tde_libdir} \
--datadir=%{tde_datadir} \
--includedir=%{tde_tdeincludedir} \
--disable-rpath \ --disable-rpath \
--enable-new-ldflags \ --enable-new-ldflags \
--enable-closure \ --enable-closure \
--disable-debug --disable-warnings \ --disable-debug --disable-warnings \
--enable-final \ --enable-final \
--with-extra-includes=%{_includedir}/tqt --enable-ksayit-audio-plugins \
--with-akode \
--with-extra-includes=%{tde_includedir}/tqt
%__make %{?_smp_mflags} %__make %{?_smp_mflags}
%install %install
export PATH="%{_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot} %__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot} %__make install DESTDIR=%{buildroot}
desktop-file-install \
--vendor="" \
--dir %{buildroot}%{_datadir}/applications/kde \
--delete-original \
%{buildroot}%{_datadir}/applnk/Applications/*.desktop ||:
# file lists for locale # file lists for locale
%find_lang %{name} || touch %{name}.lang
HTML_DIR=$(kde-config --expandvars --install html) HTML_DIR=$(kde-config --expandvars --install html)
if [ -d %{buildroot}/$HTML_DIR ]; then if [ -d %{buildroot}/$HTML_DIR ]; then
for lang_dir in %{buildroot}/$HTML_DIR/* ; do for lang_dir in %{buildroot}/$HTML_DIR/* ; do
@ -117,67 +491,18 @@ if [ -d %{buildroot}/$HTML_DIR ]; then
done done
fi fi
# rpmdocs
for dir in kmag kmousetool ksayit kttsd ; do
for file in AUTHORS ChangeLog README TODO ; do
test -s $dir/$file && install -p -m644 -D $dir/$file rpmdocs/$dir/$file
done
done
%clean %clean
%__rm -rf %{buildroot} %__rm -rf %{buildroot}
%post
/sbin/ldconfig ||:
for icon_theme in mono hicolor locolor ; do
touch --no-create %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
done
update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
%postun
/sbin/ldconfig ||:
for icon_theme in mono hicolor locolor ; do
touch --no-create %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
done
update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc COPYING
%doc rpmdocs/*
%{_bindir}/*
%{_datadir}/applications/kde/*.desktop
%{_datadir}/apps/*/
%{_datadir}/config/*
%{_datadir}/icons/hicolor/*/*/*
%{_datadir}/icons/locolor/*/*/*
%{_datadir}/icons/mono/
%{_datadir}/icons/crystalsvg/*/*/*
%{_datadir}/service*/*.desktop
%{_libdir}/lib*.so.*
%{_libdir}/*.la
%{tde_libdir}/*
# Misc docs
%doc %lang(en) %{tde_docdir}/HTML/en/kmag
%doc %lang(en) %{tde_docdir}/HTML/en/kmousetool
%doc %lang(en) %{tde_docdir}/HTML/en/kmouth
%doc %lang(en) %{tde_docdir}/HTML/en/kttsd
%files devel
%defattr(-,root,root,-)
%{tde_includedir}/*
%{_libdir}/lib*.so
%changelog %changelog
* Tue Jul 30 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-3
- Split into several packages
- Renames to 'trinity-tdeaccessibility'
- Add support for Mageia 2
* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-2 * Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-2
- Fix HTML directory location - Fix HTML directory location

@ -1,14 +1,21 @@
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr" %if "%{?_prefix}" != "/usr"
%define _variant .opt %define _variant .opt
%define _docdir %{_datadir}/doc
%endif %endif
# TDE 3.5.13 specific building variables # TDE 3.5.13 specific building variables
%define tde_appdir %{_datadir}/applications/kde %define tde_bindir %{_prefix}/bin
%define tde_docdir %{_docdir}/kde %define tde_datadir %{_prefix}/share
%define tde_includedir %{_includedir}/kde %define tde_docdir %{tde_datadir}/doc
%define tde_libdir %{_libdir}/trinity %define tde_includedir %{_prefix}/include
%define tde_libdir %{_prefix}/%{_lib}
%define tde_tdeappdir %{tde_datadir}/applications/kde
%define tde_tdedocdir %{tde_docdir}/kde
%define tde_tdeincludedir %{tde_includedir}/kde
%define tde_tdelibdir %{tde_libdir}/trinity
%define _docdir %{tde_docdir}
Name: trinity-tdeaddons Name: trinity-tdeaddons
Summary: Trinity Desktop Environment - Plugins Summary: Trinity Desktop Environment - Plugins
@ -35,10 +42,10 @@ Source1: metabar-fedora.tar.bz2
Source2: metabarrc Source2: metabarrc
BuildRequires: autoconf automake libtool m4 BuildRequires: autoconf automake libtool m4
BuildRequires: trinity-kdebase-devel BuildRequires: trinity-tdebase-devel
BuildRequires: trinity-kdegames-devel BuildRequires: trinity-tdegames-devel
BuildRequires: trinity-kdemultimedia-devel BuildRequires: trinity-tdemultimedia-devel
BuildRequires: trinity-kdepim-devel BuildRequires: trinity-tdepim-devel
BuildRequires: SDL-devel BuildRequires: SDL-devel
BuildRequires: alsa-lib-devel BuildRequires: alsa-lib-devel
@ -73,8 +80,6 @@ A collection of TDE Addons/Plugins, including:
%files %files
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc README
%doc rpmdocs/*
########## ##########
@ -82,7 +87,7 @@ A collection of TDE Addons/Plugins, including:
Summary: Game board designer for Atlantik Summary: Game board designer for Atlantik
Group: Applications/Games Group: Applications/Games
#Requires: trinity-atlantik #Requires: trinity-atlantik
Requires: trinity-kdegames Requires: trinity-tdegames
%description -n trinity-atlantikdesigner %description -n trinity-atlantikdesigner
Atlantik Designer is a game board designer for the game Atlantik. Atlantik Designer is a game board designer for the game Atlantik.
@ -95,25 +100,25 @@ America and Europe.
%files -n trinity-atlantikdesigner %files -n trinity-atlantikdesigner
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc atlantikdesigner/TODO %doc README atlantikdesigner/TODO
%{_bindir}/atlantikdesigner %{tde_bindir}/atlantikdesigner
%{_datadir}/apps/atlantikdesigner %{tde_datadir}/apps/atlantikdesigner
%{tde_appdir}/atlantikdesigner.desktop %{tde_tdeappdir}/atlantikdesigner.desktop
%{_datadir}/icons/hicolor/*/apps/atlantikdesigner.png %{tde_datadir}/icons/hicolor/*/apps/atlantikdesigner.png
%post -n trinity-atlantikdesigner %post -n trinity-atlantikdesigner
for f in hicolor ; do for f in hicolor ; do
touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||: touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||: gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
done done
update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%postun -n trinity-atlantikdesigner %postun -n trinity-atlantikdesigner
for f in hicolor ; do for f in hicolor ; do
touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||: touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||: gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
done done
update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
########## ##########
@ -132,12 +137,13 @@ by the German freemail provider GMX.
%files -n trinity-kaddressbook-plugins %files -n trinity-kaddressbook-plugins
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{tde_libdir}/libkaddrbk_geo_xxport.la %doc README
%{tde_libdir}/libkaddrbk_geo_xxport.so %{tde_tdelibdir}/libkaddrbk_geo_xxport.la
%{tde_libdir}/libkaddrbk_gmx_xxport.la %{tde_tdelibdir}/libkaddrbk_geo_xxport.so
%{tde_libdir}/libkaddrbk_gmx_xxport.so %{tde_tdelibdir}/libkaddrbk_gmx_xxport.la
%{_datadir}/apps/kaddressbook %{tde_tdelibdir}/libkaddrbk_gmx_xxport.so
%{_datadir}/services/kaddressbook %{tde_datadir}/apps/kaddressbook
%{tde_datadir}/services/kaddressbook
########## ##########
@ -159,56 +165,57 @@ a tab bar, a Python browser and even more.
%files -n trinity-kate-plugins %files -n trinity-kate-plugins
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{tde_libdir}/katecppsymbolviewerplugin.la %doc kate/xmltools/ChangeLog kate/xmltools/README
%{tde_libdir}/katecppsymbolviewerplugin.so %{tde_tdelibdir}/katecppsymbolviewerplugin.la
%{tde_libdir}/katefiletemplates.la %{tde_tdelibdir}/katecppsymbolviewerplugin.so
%{tde_libdir}/katefiletemplates.so %{tde_tdelibdir}/katefiletemplates.la
%{tde_libdir}/katefll_plugin.la %{tde_tdelibdir}/katefiletemplates.so
%{tde_libdir}/katefll_plugin.so %{tde_tdelibdir}/katefll_plugin.la
%{tde_libdir}/katehelloworldplugin.la %{tde_tdelibdir}/katefll_plugin.so
%{tde_libdir}/katehelloworldplugin.so %{tde_tdelibdir}/katehelloworldplugin.la
%{tde_libdir}/katehtmltoolsplugin.la %{tde_tdelibdir}/katehelloworldplugin.so
%{tde_libdir}/katehtmltoolsplugin.so %{tde_tdelibdir}/katehtmltoolsplugin.la
%{tde_libdir}/kateinsertcommandplugin.la %{tde_tdelibdir}/katehtmltoolsplugin.so
%{tde_libdir}/kateinsertcommandplugin.so %{tde_tdelibdir}/kateinsertcommandplugin.la
%{tde_libdir}/katemakeplugin.la %{tde_tdelibdir}/kateinsertcommandplugin.so
%{tde_libdir}/katemakeplugin.so %{tde_tdelibdir}/katemakeplugin.la
%{tde_libdir}/katemodelineplugin.la %{tde_tdelibdir}/katemakeplugin.so
%{tde_libdir}/katemodelineplugin.so %{tde_tdelibdir}/katemodelineplugin.la
%{tde_libdir}/kateopenheaderplugin.la %{tde_tdelibdir}/katemodelineplugin.so
%{tde_libdir}/kateopenheaderplugin.so %{tde_tdelibdir}/kateopenheaderplugin.la
%{tde_libdir}/katepybrowseplugin.la %{tde_tdelibdir}/kateopenheaderplugin.so
%{tde_libdir}/katepybrowseplugin.so %{tde_tdelibdir}/katepybrowseplugin.la
%{tde_libdir}/katesnippetsplugin.la %{tde_tdelibdir}/katepybrowseplugin.so
%{tde_libdir}/katesnippetsplugin.so %{tde_tdelibdir}/katesnippetsplugin.la
%{tde_libdir}/katetextfilterplugin.la %{tde_tdelibdir}/katesnippetsplugin.so
%{tde_libdir}/katetextfilterplugin.so %{tde_tdelibdir}/katetextfilterplugin.la
%{tde_libdir}/katexmlcheckplugin.la %{tde_tdelibdir}/katetextfilterplugin.so
%{tde_libdir}/katexmlcheckplugin.so %{tde_tdelibdir}/katexmlcheckplugin.la
%{tde_libdir}/katexmltoolsplugin.la %{tde_tdelibdir}/katexmlcheckplugin.so
%{tde_libdir}/katexmltoolsplugin.so %{tde_tdelibdir}/katexmltoolsplugin.la
%{tde_libdir}/libkatetabbarextensionplugin.la %{tde_tdelibdir}/katexmltoolsplugin.so
%{tde_libdir}/libkatetabbarextensionplugin.so %{tde_tdelibdir}/libkatetabbarextensionplugin.la
%{_datadir}/applnk/.hidden/katefll.desktop %{tde_tdelibdir}/libkatetabbarextensionplugin.so
%{_datadir}/apps/kate %{tde_datadir}/applnk/.hidden/katefll.desktop
%{_datadir}/apps/katepart %{tde_datadir}/apps/kate
%{_datadir}/apps/katexmltools %{tde_datadir}/apps/katepart
%{_datadir}/services/katecppsymbolviewer.desktop %{tde_datadir}/apps/katexmltools
%{_datadir}/services/katefiletemplates.desktop %{tde_datadir}/services/katecppsymbolviewer.desktop
%{_datadir}/services/katefll_plugin.desktop %{tde_datadir}/services/katefiletemplates.desktop
%{_datadir}/services/katehelloworld.desktop %{tde_datadir}/services/katefll_plugin.desktop
%{_datadir}/services/katehtmltools.desktop %{tde_datadir}/services/katehelloworld.desktop
%{_datadir}/services/kateinsertcommand.desktop %{tde_datadir}/services/katehtmltools.desktop
%{_datadir}/services/katemake.desktop %{tde_datadir}/services/kateinsertcommand.desktop
%{_datadir}/services/katemodeline.desktop %{tde_datadir}/services/katemake.desktop
%{_datadir}/services/kateopenheader.desktop %{tde_datadir}/services/katemodeline.desktop
%{_datadir}/services/katepybrowse.desktop %{tde_datadir}/services/kateopenheader.desktop
%{_datadir}/services/katesnippets.desktop %{tde_datadir}/services/katepybrowse.desktop
%{_datadir}/services/katetabbarextension.desktop %{tde_datadir}/services/katesnippets.desktop
%{_datadir}/services/katetextfilter.desktop %{tde_datadir}/services/katetabbarextension.desktop
%{_datadir}/services/katexmlcheck.desktop %{tde_datadir}/services/katetextfilter.desktop
%{_datadir}/services/katexmltools.desktop %{tde_datadir}/services/katexmlcheck.desktop
%{tde_docdir}/HTML/en/kate-plugins/ %{tde_datadir}/services/katexmltools.desktop
%{tde_tdedocdir}/HTML/en/kate-plugins/
########## ##########
@ -229,36 +236,37 @@ provided for audio and image files.
%files kfile-plugins %files kfile-plugins
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{_bindir}/lnkforward %doc kfile-plugins/lnk/README
%{tde_libdir}/kfile_cert.la %{tde_bindir}/lnkforward
%{tde_libdir}/kfile_cert.so %{tde_tdelibdir}/kfile_cert.la
%{tde_libdir}/kfile_desktop.la %{tde_tdelibdir}/kfile_cert.so
%{tde_libdir}/kfile_desktop.so %{tde_tdelibdir}/kfile_desktop.la
%{tde_libdir}/kfile_folder.la %{tde_tdelibdir}/kfile_desktop.so
%{tde_libdir}/kfile_folder.so %{tde_tdelibdir}/kfile_folder.la
%{tde_libdir}/kfile_html.la %{tde_tdelibdir}/kfile_folder.so
%{tde_libdir}/kfile_html.so %{tde_tdelibdir}/kfile_html.la
%{tde_libdir}/kfile_lnk.la %{tde_tdelibdir}/kfile_html.so
%{tde_libdir}/kfile_lnk.so %{tde_tdelibdir}/kfile_lnk.la
%{tde_libdir}/kfile_mhtml.la %{tde_tdelibdir}/kfile_lnk.so
%{tde_libdir}/kfile_mhtml.so %{tde_tdelibdir}/kfile_mhtml.la
%{tde_libdir}/kfile_txt.la %{tde_tdelibdir}/kfile_mhtml.so
%{tde_libdir}/kfile_txt.so %{tde_tdelibdir}/kfile_txt.la
%{tde_libdir}/librenaudioplugin.la %{tde_tdelibdir}/kfile_txt.so
%{tde_libdir}/librenaudioplugin.so %{tde_tdelibdir}/librenaudioplugin.la
%{tde_libdir}/librenimageplugin.la %{tde_tdelibdir}/librenaudioplugin.so
%{tde_libdir}/librenimageplugin.so %{tde_tdelibdir}/librenimageplugin.la
%{_datadir}/applnk/.hidden/lnkforward.desktop %{tde_tdelibdir}/librenimageplugin.so
%{_datadir}/mimelnk/application/x-win-lnk.desktop %{tde_datadir}/applnk/.hidden/lnkforward.desktop
%{_datadir}/services/kfile_cert.desktop %{tde_datadir}/mimelnk/application/x-win-lnk.desktop
%{_datadir}/services/kfile_desktop.desktop %{tde_datadir}/services/kfile_cert.desktop
%{_datadir}/services/kfile_folder.desktop %{tde_datadir}/services/kfile_desktop.desktop
%{_datadir}/services/kfile_html.desktop %{tde_datadir}/services/kfile_folder.desktop
%{_datadir}/services/kfile_lnk.desktop %{tde_datadir}/services/kfile_html.desktop
%{_datadir}/services/kfile_mhtml.desktop %{tde_datadir}/services/kfile_lnk.desktop
%{_datadir}/services/kfile_txt.desktop %{tde_datadir}/services/kfile_mhtml.desktop
%{_datadir}/services/renaudiodlg.desktop %{tde_datadir}/services/kfile_txt.desktop
%{_datadir}/services/renimagedlg.desktop %{tde_datadir}/services/renaudiodlg.desktop
%{tde_datadir}/services/renimagedlg.desktop
########## ##########
@ -280,33 +288,34 @@ controls XMMS, install the xmms-kde-trinity package.
%files -n trinity-kicker-applets %files -n trinity-kicker-applets
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{tde_libdir}/kolourpicker_panelapplet.la %doc README
%{tde_libdir}/kolourpicker_panelapplet.so %{tde_tdelibdir}/kolourpicker_panelapplet.la
%{tde_libdir}/ktimemon_panelapplet.la %{tde_tdelibdir}/kolourpicker_panelapplet.so
%{tde_libdir}/ktimemon_panelapplet.so %{tde_tdelibdir}/ktimemon_panelapplet.la
%{tde_libdir}/math_panelapplet.la %{tde_tdelibdir}/ktimemon_panelapplet.so
%{tde_libdir}/math_panelapplet.so %{tde_tdelibdir}/math_panelapplet.la
%{tde_libdir}/mediacontrol_panelapplet.la %{tde_tdelibdir}/math_panelapplet.so
%{tde_libdir}/mediacontrol_panelapplet.so %{tde_tdelibdir}/mediacontrol_panelapplet.la
%{tde_libdir}/kbinaryclock_panelapplet.la %{tde_tdelibdir}/mediacontrol_panelapplet.so
%{tde_libdir}/kbinaryclock_panelapplet.so %{tde_tdelibdir}/kbinaryclock_panelapplet.la
%{_datadir}/apps/kicker/applets %{tde_tdelibdir}/kbinaryclock_panelapplet.so
%{_datadir}/apps/mediacontrol %{tde_datadir}/apps/kicker/applets
%{_datadir}/config.kcfg/kbinaryclock.kcfg %{tde_datadir}/apps/mediacontrol
%{_datadir}/icons/locolor/*/apps/ktimemon.png %{tde_datadir}/config.kcfg/kbinaryclock.kcfg
%{_datadir}/icons/crystalsvg/*/apps/ktimemon.png %{tde_datadir}/icons/locolor/*/apps/ktimemon.png
%{tde_docdir}/HTML/en/kicker-applets/ %{tde_datadir}/icons/crystalsvg/*/apps/ktimemon.png
%{tde_tdedocdir}/HTML/en/kicker-applets/
%post -n trinity-kicker-applets %post -n trinity-kicker-applets
for f in crystalsvg locolor ; do for f in crystalsvg locolor ; do
touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||: touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||: gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
done done
%postun -n trinity-kicker-applets %postun -n trinity-kicker-applets
for f in crystalsvg locolor ; do for f in crystalsvg locolor ; do
touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||: touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||: gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
done done
########## ##########
@ -331,7 +340,8 @@ and various local news sources.
%files -n trinity-knewsticker-scripts %files -n trinity-knewsticker-scripts
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{_datadir}/apps/knewsticker/ %doc README
%{tde_datadir}/apps/knewsticker/
########## ##########
@ -343,7 +353,7 @@ Requires: python
Requires: rsync Requires: rsync
#Requires: unison #Requires: unison
Requires: trinity-konqueror Requires: trinity-konqueror
%if 0%{?fedora} > 0 %if 0%{?fedora}
Requires: python-exif Requires: python-exif
%endif %endif
@ -365,156 +375,157 @@ graphical disk usage viewer and image conversions and transformations.
%files -n trinity-konq-plugins %files -n trinity-konq-plugins
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{_datadir}/config/translaterc %doc konq-plugins/README
%{_bindir}/fsview %{tde_datadir}/config/translaterc
%{_bindir}/jpegorient %{tde_bindir}/fsview
%{_bindir}/kio_media_realfolder %{tde_bindir}/jpegorient
%{tde_libdir}/konq_sidebarnews.la %{tde_bindir}/kio_media_realfolder
%{tde_libdir}/konq_sidebarnews.so %{tde_tdelibdir}/konq_sidebarnews.la
%{tde_libdir}/konqsidebar_delicious.la %{tde_tdelibdir}/konq_sidebarnews.so
%{tde_libdir}/konqsidebar_delicious.so %{tde_tdelibdir}/konqsidebar_delicious.la
%{tde_libdir}/konqsidebar_mediaplayer.la %{tde_tdelibdir}/konqsidebar_delicious.so
%{tde_libdir}/konqsidebar_mediaplayer.so %{tde_tdelibdir}/konqsidebar_mediaplayer.la
%{tde_libdir}/konqsidebar_metabar.la %{tde_tdelibdir}/konqsidebar_mediaplayer.so
%{tde_libdir}/konqsidebar_metabar.so %{tde_tdelibdir}/konqsidebar_metabar.la
%{tde_libdir}/libakregatorkonqfeedicon.la %{tde_tdelibdir}/konqsidebar_metabar.so
%{tde_libdir}/libakregatorkonqfeedicon.so %{tde_tdelibdir}/libakregatorkonqfeedicon.la
%{tde_libdir}/libakregatorkonqplugin.la %{tde_tdelibdir}/libakregatorkonqfeedicon.so
%{tde_libdir}/libakregatorkonqplugin.so %{tde_tdelibdir}/libakregatorkonqplugin.la
%{tde_libdir}/libarkplugin.la %{tde_tdelibdir}/libakregatorkonqplugin.so
%{tde_libdir}/libarkplugin.so %{tde_tdelibdir}/libarkplugin.la
%{tde_libdir}/libautorefresh.la %{tde_tdelibdir}/libarkplugin.so
%{tde_libdir}/libautorefresh.so %{tde_tdelibdir}/libautorefresh.la
%{tde_libdir}/libbabelfishplugin.la %{tde_tdelibdir}/libautorefresh.so
%{tde_libdir}/libbabelfishplugin.so %{tde_tdelibdir}/libbabelfishplugin.la
%{tde_libdir}/libcrashesplugin.la %{tde_tdelibdir}/libbabelfishplugin.so
%{tde_libdir}/libcrashesplugin.so %{tde_tdelibdir}/libcrashesplugin.la
%{tde_libdir}/libdirfilterplugin.la %{tde_tdelibdir}/libcrashesplugin.so
%{tde_libdir}/libdirfilterplugin.so %{tde_tdelibdir}/libdirfilterplugin.la
%{tde_libdir}/librsyncplugin.la %{tde_tdelibdir}/libdirfilterplugin.so
%{tde_libdir}/librsyncplugin.so %{tde_tdelibdir}/librsyncplugin.la
%{tde_libdir}/libdomtreeviewerplugin.la %{tde_tdelibdir}/librsyncplugin.so
%{tde_libdir}/libdomtreeviewerplugin.so %{tde_tdelibdir}/libdomtreeviewerplugin.la
%{tde_libdir}/libfsviewpart.la %{tde_tdelibdir}/libdomtreeviewerplugin.so
%{tde_libdir}/libfsviewpart.so %{tde_tdelibdir}/libfsviewpart.la
%{tde_libdir}/libkhtmlsettingsplugin.la %{tde_tdelibdir}/libfsviewpart.so
%{tde_libdir}/libkhtmlsettingsplugin.so %{tde_tdelibdir}/libkhtmlsettingsplugin.la
%{tde_libdir}/kcm_kuick.la %{tde_tdelibdir}/libkhtmlsettingsplugin.so
%{tde_libdir}/kcm_kuick.so %{tde_tdelibdir}/kcm_kuick.la
%{tde_libdir}/libkimgallery.la %{tde_tdelibdir}/kcm_kuick.so
%{tde_libdir}/libkimgallery.so %{tde_tdelibdir}/libkimgallery.la
%{tde_libdir}/libkuickplugin.la %{tde_tdelibdir}/libkimgallery.so
%{tde_libdir}/libkuickplugin.so %{tde_tdelibdir}/libkuickplugin.la
%{tde_libdir}/libmfkonqmficon.la %{tde_tdelibdir}/libkuickplugin.so
%{tde_libdir}/libmfkonqmficon.so %{tde_tdelibdir}/libmfkonqmficon.la
%{tde_libdir}/libminitoolsplugin.la %{tde_tdelibdir}/libmfkonqmficon.so
%{tde_libdir}/libminitoolsplugin.so %{tde_tdelibdir}/libminitoolsplugin.la
%{tde_libdir}/librellinksplugin.la %{tde_tdelibdir}/libminitoolsplugin.so
%{tde_libdir}/librellinksplugin.so %{tde_tdelibdir}/librellinksplugin.la
%{tde_libdir}/libsearchbarplugin.la %{tde_tdelibdir}/librellinksplugin.so
%{tde_libdir}/libsearchbarplugin.so %{tde_tdelibdir}/libsearchbarplugin.la
%{tde_libdir}/libuachangerplugin.la %{tde_tdelibdir}/libsearchbarplugin.so
%{tde_libdir}/libuachangerplugin.so %{tde_tdelibdir}/libuachangerplugin.la
%{tde_libdir}/libvalidatorsplugin.la %{tde_tdelibdir}/libuachangerplugin.so
%{tde_libdir}/libvalidatorsplugin.so %{tde_tdelibdir}/libvalidatorsplugin.la
%{tde_libdir}/libwebarchiverplugin.la %{tde_tdelibdir}/libvalidatorsplugin.so
%{tde_libdir}/libwebarchiverplugin.so %{tde_tdelibdir}/libwebarchiverplugin.la
%{tde_libdir}/webarchivethumbnail.la %{tde_tdelibdir}/libwebarchiverplugin.so
%{tde_libdir}/webarchivethumbnail.so %{tde_tdelibdir}/webarchivethumbnail.la
%{_datadir}/applnk/.hidden/arkplugin.desktop %{tde_tdelibdir}/webarchivethumbnail.so
%{_datadir}/applnk/.hidden/kcmkuick.desktop %{tde_datadir}/applnk/.hidden/arkplugin.desktop
%{_datadir}/applnk/.hidden/kuickplugin.desktop %{tde_datadir}/applnk/.hidden/kcmkuick.desktop
%{_datadir}/applnk/.hidden/mediaplayerplugin.desktop %{tde_datadir}/applnk/.hidden/kuickplugin.desktop
%{_datadir}/applnk/.hidden/crashesplugin.desktop %{tde_datadir}/applnk/.hidden/mediaplayerplugin.desktop
%{_datadir}/applnk/.hidden/dirfilterplugin.desktop %{tde_datadir}/applnk/.hidden/crashesplugin.desktop
%{_datadir}/applnk/.hidden/rsyncplugin.desktop %{tde_datadir}/applnk/.hidden/dirfilterplugin.desktop
%{_datadir}/applnk/.hidden/fsview.desktop %{tde_datadir}/applnk/.hidden/rsyncplugin.desktop
%{_datadir}/applnk/.hidden/khtmlsettingsplugin.desktop %{tde_datadir}/applnk/.hidden/fsview.desktop
%{_datadir}/applnk/.hidden/kimgalleryplugin.desktop %{tde_datadir}/applnk/.hidden/khtmlsettingsplugin.desktop
%{_datadir}/applnk/.hidden/plugin_babelfish.desktop %{tde_datadir}/applnk/.hidden/kimgalleryplugin.desktop
%{_datadir}/applnk/.hidden/plugin_domtreeviewer.desktop %{tde_datadir}/applnk/.hidden/plugin_babelfish.desktop
%{_datadir}/applnk/.hidden/plugin_validators.desktop %{tde_datadir}/applnk/.hidden/plugin_domtreeviewer.desktop
%{_datadir}/applnk/.hidden/plugin_webarchiver.desktop %{tde_datadir}/applnk/.hidden/plugin_validators.desktop
%{_datadir}/applnk/.hidden/uachangerplugin.desktop %{tde_datadir}/applnk/.hidden/plugin_webarchiver.desktop
%{_datadir}/apps/akregator %{tde_datadir}/applnk/.hidden/uachangerplugin.desktop
%{_datadir}/apps/domtreeviewer %{tde_datadir}/apps/akregator
%{_datadir}/apps/fsview %{tde_datadir}/apps/domtreeviewer
%{_datadir}/apps/imagerotation/orient.py* %{tde_datadir}/apps/fsview
%{_datadir}/apps/imagerotation/exif.py* %{tde_datadir}/apps/imagerotation/orient.py*
%{_datadir}/apps/khtml/kpartplugins %{tde_datadir}/apps/imagerotation/exif.py*
%{_datadir}/apps/konqiconview %{tde_datadir}/apps/khtml/kpartplugins
%{_datadir}/apps/konqlistview %{tde_datadir}/apps/konqiconview
%{_datadir}/apps/konqsidebartng %{tde_datadir}/apps/konqlistview
%{_datadir}/apps/konqueror/icons %{tde_datadir}/apps/konqsidebartng
%{_datadir}/apps/konqueror/kpartplugins %{tde_datadir}/apps/konqueror/icons
%{_datadir}/apps/konqueror/servicemenus %{tde_datadir}/apps/konqueror/kpartplugins
%{_datadir}/apps/metabar/iconsrc %{tde_datadir}/apps/konqueror/servicemenus
%{_datadir}/apps/metabar/themes/default/default.css %{tde_datadir}/apps/metabar/iconsrc
%{_datadir}/apps/metabar/themes/default/layout.html %{tde_datadir}/apps/metabar/themes/default/default.css
%{_datadir}/apps/microformat/pics/microformat.png %{tde_datadir}/apps/metabar/themes/default/layout.html
%{_datadir}/config.kcfg/konq_sidebarnews.kcfg %{tde_datadir}/apps/microformat/pics/microformat.png
%{_datadir}/icons/locolor/16x16/apps/autorefresh.png %{tde_datadir}/config.kcfg/konq_sidebarnews.kcfg
%{_datadir}/icons/crystalsvg/16x16/actions/babelfish.png %{tde_datadir}/icons/locolor/16x16/apps/autorefresh.png
%{_datadir}/icons/crystalsvg/16x16/actions/cssvalidator.png %{tde_datadir}/icons/crystalsvg/16x16/actions/babelfish.png
%{_datadir}/icons/crystalsvg/16x16/actions/domtreeviewer.png %{tde_datadir}/icons/crystalsvg/16x16/actions/cssvalidator.png
%{_datadir}/icons/crystalsvg/16x16/actions/htmlvalidator.png %{tde_datadir}/icons/crystalsvg/16x16/actions/domtreeviewer.png
%{_datadir}/icons/crystalsvg/16x16/actions/imagegallery.png %{tde_datadir}/icons/crystalsvg/16x16/actions/htmlvalidator.png
%{_datadir}/icons/crystalsvg/16x16/actions/remotesync.png %{tde_datadir}/icons/crystalsvg/16x16/actions/imagegallery.png
%{_datadir}/icons/crystalsvg/16x16/actions/remotesyncconfig.png %{tde_datadir}/icons/crystalsvg/16x16/actions/remotesync.png
%{_datadir}/icons/crystalsvg/16x16/actions/minitools.png %{tde_datadir}/icons/crystalsvg/16x16/actions/remotesyncconfig.png
%{_datadir}/icons/crystalsvg/16x16/actions/validators.png %{tde_datadir}/icons/crystalsvg/16x16/actions/minitools.png
%{_datadir}/icons/crystalsvg/16x16/actions/webarchiver.png %{tde_datadir}/icons/crystalsvg/16x16/actions/validators.png
%{_datadir}/icons/crystalsvg/16x16/apps/konqsidebar_delicious.png %{tde_datadir}/icons/crystalsvg/16x16/actions/webarchiver.png
%{_datadir}/icons/crystalsvg/16x16/apps/konqsidebar_mediaplayer.png %{tde_datadir}/icons/crystalsvg/16x16/apps/konqsidebar_delicious.png
%{_datadir}/icons/crystalsvg/16x16/apps/konqsidebar_news.png %{tde_datadir}/icons/crystalsvg/16x16/apps/konqsidebar_mediaplayer.png
%{_datadir}/icons/crystalsvg/22x22/actions/babelfish.png %{tde_datadir}/icons/crystalsvg/16x16/apps/konqsidebar_news.png
%{_datadir}/icons/crystalsvg/22x22/actions/cssvalidator.png %{tde_datadir}/icons/crystalsvg/22x22/actions/babelfish.png
%{_datadir}/icons/crystalsvg/22x22/actions/domtreeviewer.png %{tde_datadir}/icons/crystalsvg/22x22/actions/cssvalidator.png
%{_datadir}/icons/crystalsvg/22x22/actions/htmlvalidator.png %{tde_datadir}/icons/crystalsvg/22x22/actions/domtreeviewer.png
%{_datadir}/icons/crystalsvg/22x22/actions/imagegallery.png %{tde_datadir}/icons/crystalsvg/22x22/actions/htmlvalidator.png
%{_datadir}/icons/crystalsvg/22x22/actions/remotesync.png %{tde_datadir}/icons/crystalsvg/22x22/actions/imagegallery.png
%{_datadir}/icons/crystalsvg/22x22/actions/remotesyncconfig.png %{tde_datadir}/icons/crystalsvg/22x22/actions/remotesync.png
%{_datadir}/icons/crystalsvg/22x22/actions/minitools.png %{tde_datadir}/icons/crystalsvg/22x22/actions/remotesyncconfig.png
%{_datadir}/icons/crystalsvg/22x22/actions/validators.png %{tde_datadir}/icons/crystalsvg/22x22/actions/minitools.png
%{_datadir}/icons/crystalsvg/22x22/actions/webarchiver.png %{tde_datadir}/icons/crystalsvg/22x22/actions/validators.png
%{_datadir}/icons/crystalsvg/22x22/apps/konqsidebar_mediaplayer.png %{tde_datadir}/icons/crystalsvg/22x22/actions/webarchiver.png
%{_datadir}/icons/crystalsvg/32x32/actions/minitools.png %{tde_datadir}/icons/crystalsvg/22x22/apps/konqsidebar_mediaplayer.png
%{_datadir}/icons/crystalsvg/32x32/apps/konqsidebar_mediaplayer.png %{tde_datadir}/icons/crystalsvg/32x32/actions/minitools.png
%{_datadir}/icons/crystalsvg/48x48/actions/minitools.png %{tde_datadir}/icons/crystalsvg/32x32/apps/konqsidebar_mediaplayer.png
%{_datadir}/icons/crystalsvg/48x48/apps/konqsidebar_mediaplayer.png %{tde_datadir}/icons/crystalsvg/48x48/actions/minitools.png
%{_datadir}/icons/hicolor/16x16/apps/metabar.png %{tde_datadir}/icons/crystalsvg/48x48/apps/konqsidebar_mediaplayer.png
%{_datadir}/icons/hicolor/22x22/apps/fsview.png %{tde_datadir}/icons/hicolor/16x16/apps/metabar.png
%{_datadir}/icons/hicolor/32x32/apps/fsview.png %{tde_datadir}/icons/hicolor/22x22/apps/fsview.png
%{_datadir}/icons/hicolor/32x32/apps/metabar.png %{tde_datadir}/icons/hicolor/32x32/apps/fsview.png
%{_datadir}/icons/hicolor/48x48/apps/metabar.png %{tde_datadir}/icons/hicolor/32x32/apps/metabar.png
%{_datadir}/icons/hicolor/64x64/apps/metabar.png %{tde_datadir}/icons/hicolor/48x48/apps/metabar.png
%{_datadir}/icons/hicolor/scalable/apps/metabar.svgz %{tde_datadir}/icons/hicolor/64x64/apps/metabar.png
%{_datadir}/icons/hicolor/128x128/apps/metabar.png %{tde_datadir}/icons/hicolor/scalable/apps/metabar.svgz
%{_datadir}/icons/locolor/32x32/apps/konqsidebar_mediaplayer.png %{tde_datadir}/icons/hicolor/128x128/apps/metabar.png
%{_datadir}/services/akregator_konqplugin.desktop %{tde_datadir}/icons/locolor/32x32/apps/konqsidebar_mediaplayer.png
%{_datadir}/services/ark_plugin.desktop %{tde_datadir}/services/akregator_konqplugin.desktop
%{_datadir}/services/fsview_part.desktop %{tde_datadir}/services/ark_plugin.desktop
%{_datadir}/services/kuick_plugin.desktop %{tde_datadir}/services/fsview_part.desktop
%{_datadir}/services/webarchivethumbnail.desktop %{tde_datadir}/services/kuick_plugin.desktop
%{tde_libdir}/libadblock.la %{tde_datadir}/services/webarchivethumbnail.desktop
%{tde_libdir}/libadblock.so %{tde_tdelibdir}/libadblock.la
%{tde_docdir}/HTML/en/konq-plugins/ %{tde_tdelibdir}/libadblock.so
%{tde_tdedocdir}/HTML/en/konq-plugins/
%if 0%{?fedora} %if 0%{?fedora}
%{_datadir}/apps/metabar/themes/fedora/ %{tde_datadir}/apps/metabar/themes/fedora/
%{_datadir}/config/metabarrc %{tde_datadir}/config/metabarrc
%endif %endif
%post -n trinity-konq-plugins %post -n trinity-konq-plugins
for f in crystalsvg hicolor locolor ; do for f in crystalsvg hicolor locolor ; do
touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||: touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||: gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
done done
%postun -n trinity-konq-plugins %postun -n trinity-konq-plugins
for f in crystalsvg hicolor locolor ; do for f in crystalsvg hicolor locolor ; do
touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||: touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||: gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
done done
########## ##########
@ -535,25 +546,26 @@ signatures in external mail clients such as KMail.
%files -n trinity-ksig %files -n trinity-ksig
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{_bindir}/ksig %doc README
%{tde_appdir}/ksig.desktop %{tde_bindir}/ksig
%{_datadir}/apps/ksig/ksigui.rc %{tde_tdeappdir}/ksig.desktop
%{_datadir}/icons/hicolor/*/apps/ksig.png %{tde_datadir}/apps/ksig/ksigui.rc
%{tde_docdir}/HTML/en/ksig/ %{tde_datadir}/icons/hicolor/*/apps/ksig.png
%{tde_tdedocdir}/HTML/en/ksig/
%post -n trinity-ksig %post -n trinity-ksig
for f in hicolor ; do for f in hicolor ; do
touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||: touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||: gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
done done
update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%postun -n trinity-ksig %postun -n trinity-ksig
for f in hicolor ; do for f in hicolor ; do
touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||: touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||: gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
done done
update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
########## ##########
@ -573,52 +585,53 @@ of user interfaces, playlists and visualisation plugins.
%files -n trinity-noatun-plugins %files -n trinity-noatun-plugins
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{_bindir}/noatunsynaescope.bin %doc README
%{_bindir}/noatuntippecanoe.bin %{tde_bindir}/noatunsynaescope.bin
%{_bindir}/noatuntyler.bin %{tde_bindir}/noatuntippecanoe.bin
%{tde_libdir}/noatunalsaplayer.la %{tde_bindir}/noatuntyler.bin
%{tde_libdir}/noatunalsaplayer.so %{tde_tdelibdir}/noatunalsaplayer.la
%{tde_libdir}/noatunblurscope.la %{tde_tdelibdir}/noatunalsaplayer.so
%{tde_libdir}/noatunblurscope.so %{tde_tdelibdir}/noatunblurscope.la
%{tde_libdir}/noatuncharlatan.la %{tde_tdelibdir}/noatunblurscope.so
%{tde_libdir}/noatuncharlatan.so %{tde_tdelibdir}/noatuncharlatan.la
%{tde_libdir}/noatundub.la %{tde_tdelibdir}/noatuncharlatan.so
%{tde_libdir}/noatundub.so %{tde_tdelibdir}/noatundub.la
%{tde_libdir}/noatun_ffrs.la %{tde_tdelibdir}/noatundub.so
%{tde_libdir}/noatun_ffrs.so %{tde_tdelibdir}/noatun_ffrs.la
%{tde_libdir}/noatunluckytag.la %{tde_tdelibdir}/noatun_ffrs.so
%{tde_libdir}/noatunluckytag.so %{tde_tdelibdir}/noatunluckytag.la
%{tde_libdir}/noatunlyrics.la %{tde_tdelibdir}/noatunluckytag.so
%{tde_libdir}/noatunlyrics.so %{tde_tdelibdir}/noatunlyrics.la
%{tde_libdir}/noatunmadness.la %{tde_tdelibdir}/noatunlyrics.so
%{tde_libdir}/noatunmadness.so %{tde_tdelibdir}/noatunmadness.la
%{tde_libdir}/noatun_oblique.la %{tde_tdelibdir}/noatunmadness.so
%{tde_libdir}/noatun_oblique.so %{tde_tdelibdir}/noatun_oblique.la
%{tde_libdir}/noatunpitchablespeed.la %{tde_tdelibdir}/noatun_oblique.so
%{tde_libdir}/noatunpitchablespeed.so %{tde_tdelibdir}/noatunpitchablespeed.la
%{tde_libdir}/noatunsynaescope.la %{tde_tdelibdir}/noatunpitchablespeed.so
%{tde_libdir}/noatunsynaescope.so %{tde_tdelibdir}/noatunsynaescope.la
%{tde_libdir}/noatuntippecanoe.la %{tde_tdelibdir}/noatunsynaescope.so
%{tde_libdir}/noatuntippecanoe.so %{tde_tdelibdir}/noatuntippecanoe.la
%{tde_libdir}/noatuntyler.la %{tde_tdelibdir}/noatuntippecanoe.so
%{tde_libdir}/noatuntyler.so %{tde_tdelibdir}/noatuntyler.la
%{tde_libdir}/noatunwakeup.la %{tde_tdelibdir}/noatuntyler.so
%{tde_libdir}/noatunwakeup.so %{tde_tdelibdir}/noatunwakeup.la
%{tde_libdir}/noatunwavecapture.la %{tde_tdelibdir}/noatunwakeup.so
%{tde_libdir}/noatunwavecapture.so %{tde_tdelibdir}/noatunwavecapture.la
%{_datadir}/apps/noatun/* %{tde_tdelibdir}/noatunwavecapture.so
%{_datadir}/icons/crystalsvg/16x16/apps/synaescope.png %{tde_datadir}/apps/noatun/*
%{tde_datadir}/icons/crystalsvg/16x16/apps/synaescope.png
%post -n trinity-noatun-plugins %post -n trinity-noatun-plugins
for f in crystalsvg ; do for f in crystalsvg ; do
touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||: touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||: gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
done done
%postun -n trinity-noatun-plugins %postun -n trinity-noatun-plugins
for f in crystalsvg ; do for f in crystalsvg ; do
touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||: touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||: gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
done done
########## ##########
@ -631,8 +644,8 @@ done
# Ugly hack to modify TQT include directory inside autoconf files. # Ugly hack to modify TQT include directory inside autoconf files.
# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
%__sed -i admin/acinclude.m4.in \ %__sed -i admin/acinclude.m4.in \
-e "s|/usr/include/tqt|%{_includedir}/tqt|g" \ -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g" -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
@ -641,30 +654,37 @@ done
%build %build
unset QTDIR || : ; . /etc/profile.d/qt.sh unset QTDIR || : ; . /etc/profile.d/qt.sh
export PATH="%{_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
export LDFLAGS="-L%{_libdir} -I%{_includedir}" export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
%configure \ %configure \
--includedir=%{tde_includedir} \ --exec-prefix=%{_prefix} \
--bindir=%{tde_bindir} \
--libdir=%{tde_libdir} \
--datadir=%{tde_datadir} \
--includedir=%{tde_tdeincludedir} \
--disable-rpath \ --disable-rpath \
--enable-new-ldflags \ --enable-new-ldflags \
--enable-closure \ --enable-closure \
--disable-debug --disable-warnings \ --disable-debug --disable-warnings \
--disable-dependency-tracking --enable-final \ --disable-dependency-tracking --enable-final \
--with-extra-includes=%{_includedir}/tqt --with-extra-includes=%{tde_includedir}/tqt:%{_usr}/include/db4 \
--without-xmms \
--with-sdl \
--with-berkeley-db
%__make %{?_smp_mflags} %__make %{?_smp_mflags}
%install %install
export PATH="%{_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot} %__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot} %__make install DESTDIR=%{buildroot}
# File lists for locale # File lists for locale
HTML_DIR=$(kde-config --expandvars --install html) HTML_DIR=$(kde-config --expandvars --install html)
touch %{name}.lang
if [ -d %{buildroot}/$HTML_DIR ]; then if [ -d %{buildroot}/$HTML_DIR ]; then
for lang_dir in %{buildroot}/$HTML_DIR/* ; do for lang_dir in %{buildroot}/$HTML_DIR/* ; do
if [ -d $lang_dir ]; then if [ -d $lang_dir ]; then
@ -680,17 +700,10 @@ if [ -d %{buildroot}/$HTML_DIR ]; then
done done
fi fi
# rpmdocs %if 0%{?fedora}
for dir in konq-plugins ; do
for file in AUTHORS ChangeLog README TODO ; do
test -s "$dir/$file" && install -p -m644 -D "$dir/$file" "rpmdocs/$dir/$file"
done
done
%if 0%{?fedora} > 0
# install fedora metabar theme # install fedora metabar theme
cp -prf fedora %{buildroot}%{_datadir}/apps/metabar/themes cp -prf fedora %{buildroot}%{tde_datadir}/apps/metabar/themes
install -m644 -p %{SOURCE2} %{buildroot}%{_datadir}/config/ install -m644 -p %{SOURCE2} %{buildroot}%{tde_datadir}/config/
%endif %endif

@ -0,0 +1,17 @@
commit d3d702117d757d6c16d0dd41969bc44229123330
Author: Darrell Anderson <humanreadable@yahoo.com>
Date: 1331690654 -0500
Remove "More Applications" from TDE menu.
This partially resolves bug report 653.
diff --git a/kdat/kdat.desktop b/kdat/kdat.desktop
index 3aeb7ac..7016d05 100644
--- a/kdat/kdat.desktop
+++ b/kdat/kdat.desktop
@@ -89,4 +89,4 @@ X-KDE-StartupNotify=true
DocPath=kdat/index.html
Terminal=false
X-DCOP-ServiceType=Multi
-Categories=Qt;KDE;System;X-KDE-More;
+Categories=Qt;KDE;System;

@ -1,19 +1,28 @@
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr" %if "%{?_prefix}" != "/usr"
%define _variant .opt %define _variant .opt
%define _docdir %{_datadir}/doc
%endif %endif
# TDE 3.5.13 specific building variables # TDE 3.5.13 specific building variables
%define tde_docdir %{_docdir}/kde %define tde_bindir %{_prefix}/bin
%define tde_includedir %{_includedir}/kde %define tde_sbindir %{_prefix}/sbin
%define tde_libdir %{_libdir}/trinity %define tde_datadir %{_prefix}/share
%define tde_docdir %{tde_datadir}/doc
%define tde_includedir %{_prefix}/include
%define tde_libdir %{_prefix}/%{_lib}
%define tde_tdeappdir %{tde_datadir}/applications/kde
%define tde_tdedocdir %{tde_docdir}/kde
%define tde_tdeincludedir %{tde_includedir}/kde
%define tde_tdelibdir %{tde_libdir}/trinity
Name: trinity-kdeadmin %define _docdir %{tde_docdir}
Name: trinity-tdeadmin
Summary: Administrative tools for TDE Summary: Administrative tools for TDE
Version: 3.5.13 Version: 3.5.13
Release: 4%{?dist}%{?_variant} Release: 5%{?dist}%{?_variant}
License: GPLv2 License: GPLv2
Group: User Interface/Desktops Group: User Interface/Desktops
@ -25,6 +34,9 @@ URL: http://www.trinitydesktop.org/
Prefix: %{_prefix} Prefix: %{_prefix}
Obsoletes: trinity-kdeadmin < %{version}-%{release}
Provides: trinity-kdeadmin = %{version}-%{release}
Source0: kdeadmin-%{version}.tar.gz Source0: kdeadmin-%{version}.tar.gz
Source1: kuser.pam Source1: kuser.pam
Source2: kuser.pamd Source2: kuser.pamd
@ -32,36 +44,342 @@ Source5: kpackagerc
Source6: ksysvrc Source6: ksysvrc
Source7: kuserrc Source7: kuserrc
# [kdeadmin/knetworkconf] Add RHEL 5, RHEL 6, Fedora 15, Fedora 16, Fedora 17 # [kdeadmin/knetworkconf] Add RHEL 5, RHEL 6, Fedora 15, Fedora 16, Fedora 17 [Commit #59394e6b]
Patch1: kdeadmin-3.5.13-add_rhel_fedora.patch Patch1: kdeadmin-3.5.13-add_rhel_fedora.patch
# [kdeadmin] Fix linear alphabet string errors [Commit #1f719050] # [kdeadmin] Fix linear alphabet string errors [Commit #1f719050]
Patch2: bp004-1f719050.diff Patch2: bp004-1f719050.diff
# [tdeadmin] Remove "More Applications" from TDE menu. [Bug #653] [Commit #d3d70211]
Requires: trinity-kdelibs Patch3: kdeadmin-3.5.13-remove_more_applications_in_menu.patch
Requires: pkgconfig
Requires: usermode-gtk
BuildRequires: autoconf automake libtool m4 BuildRequires: autoconf automake libtool m4
BuildRequires: trinity-kdelibs-devel BuildRequires: trinity-kdelibs-devel
BuildRequires: rpm-devel BuildRequires: rpm-devel
BuildRequires: pam-devel
%if 0%{?mgaversion}
BuildRequires: lilo
%endif
Requires: trinity-tdeadmin = %{version}-%{release}
Requires: trinity-kcron = %{version}-%{release}
Requires: trinity-kdat = %{version}-%{release}
Requires: %{name}-kfile-plugins = %{version}-%{release}
Requires: trinity-knetworkconf = %{version}-%{release}
Requires: trinity-kpackage = %{version}-%{release}
Requires: trinity-ksysv = %{version}-%{release}
Requires: trinity-kuser = %{version}-%{release}
%if 0%{?mgaversion}
Requires: trinity-lilo-config = %{version}-%{release}
%endif
%description %description
The kdeadmin package includes administrative tools for the Trinity Desktop The tdeadmin package includes administrative tools for the Trinity Desktop
Environment (TDE) including: Environment (TDE) including:
kcron, kdat, knetworkconf, kpackage, ksysv, kuser. kcron, kdat, knetworkconf, kpackage, ksysv, kuser.
%files
%defattr(-,root,root,-)
# The following files are not installed in any binary package.
# This is deliberate.
# - This file serves no purpose that we can see, and conflicts
# with GNOME system tools, so be sure to leave it out.
%exclude %{tde_libdir}/pkgconfig/*.pc
# Extract from changelog:
# tdeadmin (4:3.5.5-2) unstable; urgency=low
# +++ Changes by Ana Beatriz Guerrero Lopez:
# * Removed useless program secpolicy. (Closes: #399426)
%exclude %{tde_bindir}/secpolicy
# LILO is not provided in RHEL or Fedora
%if 0%{?rhel} || 0%{?fedora}
%exclude %{tde_tdedocdir}/HTML/en/lilo-config/
%endif
##########
%package -n trinity-kcron
Summary: The Trinity crontab editor
Group: Applications/Utilities
%description -n trinity-kcron
KCron is an application for scheduling programs to run in the background.
It is a graphical user interface to cron, the UNIX system scheduler.
%files -n trinity-kcron
%defattr(-,root,root,-)
%{tde_bindir}/kcron
%{tde_tdeappdir}/kcron.desktop
%{tde_datadir}/apps/kcron/kcronui.rc
%{tde_datadir}/icons/hicolor/*/apps/kcron.png
%{tde_tdedocdir}/HTML/en/kcron/
%post -n trinity-kcron
for icon_theme in hicolor ; do
touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
done
update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%postun -n trinity-kcron
for icon_theme in hicolor ; do
touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
done
update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
##########
%package -n trinity-kdat
Summary: A Trinity tape backup tool
Group: Applications/Utilities
%description -n trinity-kdat
KDat is a tar-based tape archiver. It is designed to work with multiple
archives on a single tape.
Main features are:
* Simple graphical interface to local filesystem and tape contents.
* Multiple archives on the same physical tape.
* Complete index of archives and files is stored on local hard disk.
* Selective restore of files from an archive.
* Backup profiles for frequently used backups.
%files -n trinity-kdat
%defattr(-,root,root,-)
%doc rpmdocs/kdat/*
%{tde_bindir}/kdat
%{tde_tdeappdir}/kdat.desktop
%{tde_datadir}/apps/kdat/
%{tde_datadir}/icons/hicolor/*/apps/kdat.png
%{tde_datadir}/icons/locolor/*/apps/kdat.png
%{tde_tdedocdir}/HTML/en/kdat/
%post -n trinity-kdat
for icon_theme in hicolor locolor ; do
touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
done
update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%postun -n trinity-kdat
for icon_theme in hicolor locolor ; do
touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
done
update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
##########
%package kfile-plugins
Summary: Trinity file metainfo plugins for deb and rpm files
Group: Environment/Libraries
%description kfile-plugins
File metainfo plugins for deb and rpm package files.
%files kfile-plugins
%defattr(-,root,root,-)
%{tde_tdelibdir}/kfile_deb.la
%{tde_tdelibdir}/kfile_deb.so
%{tde_tdelibdir}/kfile_rpm.la
%{tde_tdelibdir}/kfile_rpm.so
%{tde_datadir}/services/kfile_deb.desktop
%{tde_datadir}/services/kfile_rpm.desktop
##########
%package -n trinity-knetworkconf
Summary: Trinity network configuration tool
Group: Applications/Utilities
%description -n trinity-knetworkconf
This is a TDE control center module to configure TCP/IP settings. It
can be used to manage network devices and settings for each device.
%files -n trinity-knetworkconf
%defattr(-,root,root,-)
%doc rpmdocs/knetworkconf/*
%{tde_datadir}/icons/hicolor/*/apps/knetworkconf.png
%{tde_datadir}/icons/hicolor/22x22/actions/network_disconnected_wlan.png
%{tde_datadir}/icons/hicolor/22x22/actions/network_connected_lan_knc.png
%{tde_datadir}/icons/hicolor/22x22/actions/network_disconnected_lan.png
%{tde_datadir}/icons/hicolor/22x22/actions/network_traffic_wlan.png
%{tde_datadir}/apps/knetworkconf/
%{tde_tdeappdir}/kcm_knetworkconfmodule.desktop
%{tde_tdelibdir}/kcm_knetworkconfmodule.so
%{tde_tdelibdir}/kcm_knetworkconfmodule.la
%{tde_tdedocdir}/HTML/en/knetworkconf/
%post -n trinity-knetworkconf
for icon_theme in hicolor ; do
touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
done
%postun -n trinity-knetworkconf
for icon_theme in hicolor ; do
touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
done
##########
%package -n trinity-kpackage
Summary: Trinity package management tool
Group: Applications/Utilities
%description -n trinity-kpackage
This is a frontend to both .rpm and .deb package formats. It allows you
to view currently installed packages, browse available packages, and
install/remove them.
%files -n trinity-kpackage
%defattr(-,root,root,-)
%doc rpmdocs/kpackage/*
%{tde_bindir}/kpackage
%{tde_tdeappdir}/kpackage.desktop
%{tde_datadir}/apps/kpackage/
%{tde_datadir}/config/kpackagerc
%{tde_datadir}/icons/hicolor/*/apps/kpackage.png
%{tde_tdedocdir}/HTML/en/kpackage/
%post -n trinity-kpackage
for icon_theme in hicolor ; do
touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
done
update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%postun -n trinity-kpackage
for icon_theme in hicolor ; do
touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
done
update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
##########
%package -n trinity-ksysv
Summary: Trinity SysV-style init configuration editor
Group: Applications/Utilities
%description -n trinity-ksysv
This program allows you to edit your start and stop scripts using a
drag and drop GUI.
%files -n trinity-ksysv
%defattr(-,root,root,-)
%doc rpmdocs/ksysv/*
%{tde_bindir}/ksysv
%{tde_tdeappdir}/ksysv.desktop
%{tde_datadir}/apps/ksysv/
%{tde_datadir}/config/ksysvrc
%{tde_datadir}/icons/crystalsvg/16x16/actions/toggle_log.png
%{tde_datadir}/icons/hicolor/*/apps/ksysv.png
%{tde_datadir}/mimelnk/application/x-ksysv.desktop
%{tde_datadir}/mimelnk/text/x-ksysv-log.desktop
%{tde_tdedocdir}/HTML/en/ksysv/
%post -n trinity-ksysv
for icon_theme in crystalsvg hicolor ; do
touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
done
update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%postun -n trinity-ksysv
for icon_theme in crystalsvg hicolor ; do
touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
done
update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
##########
%package -n trinity-kuser
Summary: Trinity user/group administration tool
Group: Applications/Utilities
%if 0%{?rhel} || 0%{?fedora}
Requires: usermode-gtk
%else
Requires: usermode
%endif
%description -n trinity-kuser
A user/group administration tool for TDE.
%files -n trinity-kuser
%defattr(-,root,root,-)
%doc rpmdocs/kuser/*
%{tde_bindir}/kuser
%{tde_sbindir}/kuser
%{tde_tdeappdir}/kuser.desktop
%{tde_datadir}/apps/kuser/
%{tde_datadir}/config/kuserrc
%{tde_datadir}/config.kcfg/kuser.kcfg
%{tde_datadir}/icons/hicolor/*/apps/kuser.png
%{tde_tdedocdir}/HTML/en/kuser/
%config(noreplace) /etc/pam.d/kuser
%config(noreplace) /etc/security/console.apps/kuser
%post -n trinity-kuser
for icon_theme in hicolor ; do
touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
done
update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%postun -n trinity-kuser
for icon_theme in hicolor ; do
touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||:
done
update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
##########
%if 0%{?mgaversion}
%package -n trinity-lilo-config
Summary: Trinity frontend for lilo configuration
Group: Applications/Utilities
Requires: trinity-kcontrol
Requires: trinity-tdebase-bin
Requires: lilo
%description -n trinity-lilo-config
lilo-config is a TDE based frontend to the lilo boot manager configuration.
It runs out of the TDE Control Center.
If you want to use the menu entry to launch lilo-config, you need to install
tdebase-bin since it uses the tdesu command to gain root privileges.
%files -n trinity-lilo-config
%defattr(-,root,root,-)
%{tde_tdelibdir}/kcm_lilo.la
%{tde_tdelibdir}/kcm_lilo.so
%{tde_tdeappdir}/lilo.desktop
%{tde_tdedocdir}/HTML/en/lilo-config/
%endif
##########
%prep %prep
%setup -q -n kdeadmin %setup -q -n kdeadmin
%patch1 -p1 -b .knetworkconf %patch1 -p1 -b .knetworkconf
%patch2 -p1
%patch3 -p1
# Ugly hack to modify TQT include directory inside autoconf files. # Ugly hack to modify TQT include directory inside autoconf files.
# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
%__sed -i admin/acinclude.m4.in \ %__sed -i admin/acinclude.m4.in \
-e "s|/usr/include/tqt|%{_includedir}/tqt|g" \ -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g" -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
@ -70,42 +388,50 @@ kcron, kdat, knetworkconf, kpackage, ksysv, kuser.
%build %build
unset QTDIR || : ; . /etc/profile.d/qt.sh unset QTDIR || : ; . /etc/profile.d/qt.sh
export PATH="%{_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
export LDFLAGS="-L%{_libdir} -I%{_includedir}" export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
%configure \ %configure \
--exec-prefix=%{_prefix} \
--bindir=%{tde_bindir} \
--sbindir=%{tde_sbindir} \
--libdir=%{tde_libdir} \
--datadir=%{tde_datadir} \
--includedir=%{tde_tdeincludedir} \
--enable-new-ldflags \ --enable-new-ldflags \
--disable-dependency-tracking \ --disable-dependency-tracking \
--disable-rpath \ --disable-rpath \
--with-rpm \ --with-rpm \
--with-pam=kde \
--with-shadow \
--with-private-groups \
--enable-final \ --enable-final \
--enable-closure \ --enable-closure \
--with-private-groups \ --with-private-groups \
--with-extra-includes=%{_includedir}/tqt --with-extra-includes=%{tde_includedir}/tqt
%__make %{?_smp_mflags} %__make %{?_smp_mflags}
%install %install
export PATH="%{_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot} %__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot} %__make install DESTDIR=%{buildroot}
comps="kcron kdat knetworkconf kpackage ksysv kuser" comps="kcron kdat knetworkconf kpackage ksysv kuser"
%__mkdir_p %{buildroot}%{_datadir}/config \ %__mkdir_p %{buildroot}%{tde_datadir}/config \
%{buildroot}/etc/security/console.apps \ %{buildroot}/etc/security/console.apps \
%{buildroot}/etc/pam.d \ %{buildroot}/etc/pam.d \
%{buildroot}%{_sbindir} %{buildroot}%{tde_sbindir}
%__install -p -m644 %{SOURCE5} %{SOURCE6} %{SOURCE7} %{buildroot}%{_datadir}/config/ %__install -p -m644 %{SOURCE5} %{SOURCE6} %{SOURCE7} %{buildroot}%{tde_datadir}/config/
# Run kuser through consolehelper # Run kuser through consolehelper
%__install -p -m644 %{SOURCE1} %{buildroot}/etc/security/console.apps/kuser %__install -p -m644 %{SOURCE1} %{buildroot}/etc/security/console.apps/kuser
%__install -p -m644 %{SOURCE2} %{buildroot}/etc/pam.d/kuser %__install -p -m644 %{SOURCE2} %{buildroot}/etc/pam.d/kuser
%__mv %{buildroot}%{_bindir}/kuser %{buildroot}%{_sbindir} %__mv %{buildroot}%{tde_bindir}/kuser %{buildroot}%{tde_sbindir}
%__ln_s consolehelper %{buildroot}%{_bindir}/kuser %__ln_s consolehelper %{buildroot}%{tde_bindir}/kuser
# locale's # locale's
%find_lang %{name} || touch %{name}.lang
HTML_DIR=$(kde-config --expandvars --install html) HTML_DIR=$(kde-config --expandvars --install html)
if [ -d %{buildroot}/$HTML_DIR ]; then if [ -d %{buildroot}/$HTML_DIR ]; then
for lang_dir in %{buildroot}/$HTML_DIR/* ; do for lang_dir in %{buildroot}/$HTML_DIR/* ; do
@ -129,46 +455,19 @@ for dir in $comps ; do
done done
done done
%post
for icon_theme in crystalsvg hicolor locolor ; do
touch --no-create %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
done
update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
%postun
for icon_theme in crystalsvg hicolor locolor ; do
touch --no-create %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
done
update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
%clean %clean
%__rm -rf %{buildroot} %__rm -rf %{buildroot}
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING README
%doc rpmdocs/*
%{_bindir}/*
%{_sbindir}/*
%config(noreplace) /etc/pam.d/*
%config(noreplace) /etc/security/console.apps/*
%{_datadir}/config*/*
%{_datadir}/mimelnk/*/*.desktop
%{_datadir}/icons/crystalsvg/*/*/*
%{_datadir}/apps/*
%{_datadir}/applications/kde/*.desktop
%{_datadir}/icons/hicolor/*/*/*
%{_datadir}/icons/locolor/*/*/*
%{_datadir}/service*/*.desktop
%{tde_libdir}/*
%{_libdir}/pkgconfig/*.pc
%changelog %changelog
* Fri Jul 13 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-5
- Renames 'trinity-kdeadmin' to 'trinity-tdeadmin'
- Split in several packages
- Fix configure options
- Remove "More Applications" from TDE menu. [Bug #653] [Commit #d3d70211]
* Thu Apr 03 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-4 * Thu Apr 03 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-4
- Fix knetworkconf support for Fedora, adds Fedora 17 - Fix knetworkconf support for Fedora, adds Fedora 17
- Fix linear alphabet string errors [Commit #1f719050] - Fix linear alphabet string errors [Commit #1f719050]

@ -1,64 +1,581 @@
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr" %if "%{?_prefix}" != "/usr"
%define _variant .opt %define _variant .opt
%define _docdir %{_datadir}/doc
%endif %endif
# TDE 3.5.13 specific building variables # TDE 3.5.13 specific building variables
%define tde_libdir %{_libdir}/trinity %define tde_bindir %{_prefix}/bin
%define tde_datadir %{_prefix}/share
%define tde_docdir %{tde_datadir}/doc
%define tde_includedir %{_prefix}/include
%define tde_libdir %{_prefix}/%{_lib}
%define tde_tdeappdir %{tde_datadir}/applications/kde
%define tde_tdedocdir %{tde_docdir}/kde
%define tde_tdeincludedir %{tde_includedir}/kde
%define tde_tdelibdir %{tde_libdir}/trinity
%define _docdir %{tde_docdir}
# kdeartwork specific settings # kdeartwork specific settings
# On RHEL 6, libart is too old ! # On RHEL 6, libart is too old !
%if 0%{?fedora} >= 15 %if 0%{?fedora} >= 15 || 0%{?mgaversion}
%define with_libart 1 %define with_libart 1
%endif %endif
Name: trinity-kdeartwork Name: trinity-tdeartwork
Summary: Additional artwork (themes, sound themes, ...) for TDE Summary: Additional artwork (themes, sound themes, ...) for TDE
Version: 3.5.13 Version: 3.5.13
Release: 2%{?dist}%{?_variant} Release: 3%{?dist}%{?_variant}
License: GPLv2 License: GPLv2
Group: User Interface/Desktops Group: User Interface/Desktops
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Vendor: Trinity Project Vendor: Trinity Project
Packager: Francois Andriot <francois.andriot@free.fr> Packager: Francois Andriot <francois.andriot@free.fr>
Url: http://www.trinitydesktop.org/ Url: http://www.trinitydesktop.org/
Source: kdeartwork-%{version}.tar.gz Source: kdeartwork-%{version}.tar.gz
# FIXME: this should go in kde-settings -- Rex # FIXME: this should go in kde-settings -- Rex
Source1: webcollagerc Source1: webcollagerc
BuildRequires: cmake >= 2.8 BuildRequires: cmake >= 2.8
BuildRequires: trinity-kdebase-devel BuildRequires: trinity-tdebase-devel >= 3.5.13
BuildRequires: gettext BuildRequires: gettext
BuildRequires: esound-devel BuildRequires: esound-devel
%if 0%{?fedora}
BuildRequires: jack-audio-connection-kit-devel %if 0%{?fedora} || 0%{?mgaversion}
%define with_xscreensaver 1
BuildRequires: nas-devel BuildRequires: nas-devel
BuildRequires: xscreensaver BuildRequires: xscreensaver
%define with_xscreensaver 1
%if 0%{?mgaversion}
BuildRequires: %{_lib}jack-devel
BuildRequires: xscreensaver-extrusion
%else
BuildRequires: jack-audio-connection-kit-devel
%endif
%endif %endif
%if "%{?with_libart}" == "1" %if "%{?with_libart}" == "1"
BuildRequires: libart_lgpl-devel BuildRequires: libart_lgpl-devel
%endif %endif
Requires: trinity-kdebase
Obsoletes: trinity-kdeartwork < %{version}-%{release}
Provides: trinity-kdeartwork = %{version}-%{release}
# Metapackage
Requires: %{name}-emoticons = %{version}-%{release}
Requires: %{name}-misc = %{version}-%{release}
Requires: %{name}-style = %{version}-%{release}
Requires: %{name}-theme-icon = %{version}-%{release}
Requires: %{name}-theme-window = %{version}-%{release}
Requires: trinity-kdewallpapers = %{version}-%{release}
Requires: trinity-kscreensaver = %{version}-%{release}
%if 0%{?with_xscreensaver}
Requires: trinity-kscreensaver-xsavers = %{version}-%{release}
Requires: trinity-kscreensaver-xsavers-webcollage = %{version}-%{release}
Requires: trinity-kscreensaver-xsavers-extra = %{version}-%{release}
%endif
%description %description
Additional artwork (themes, sound themes, screensavers ...) for TDE. TDE (the Trinity Desktop Environment) is a powerful Open Source graphical
desktop environment for Unix workstations. It combines ease of use,
contemporary functionality, and outstanding graphical design with the
technological superiority of the Unix operating system.
This metapackage includes a collection of artistic extras (themes, widget
styles, screen savers, wallpaper, icons, emoticons and so on) provided
with the official release of KDE.
Homepage: http://artist.kde.org
%files
##########
%package emoticons
Summary: emoticon collections for tDE chat clients
Group: User Interface/Desktops
%description emoticons
This package contains several collections of emoticons used by official
and unofficial KDE chat clients, such as Kopete and Konversation.
This package is part of KDE, and a component of the KDE artwork module.
%files emoticons
%defattr(-,root,root,-)
%{tde_datadir}/emoticons/
##########
%package misc
Summary: various multimedia goodies released with TDE
Group: User Interface/Desktops
%description misc
This package contains miscellaneous multimedia goodies for KDE.
Included are additional TDE sounds and kworldclock themes.
This package is part of Trinity, and a component of the TDE artwork module.
%files misc
%defattr(-,root,root,-)
%{tde_datadir}/apps/kworldclock/
%{tde_datadir}/sounds/KDE_Logout_new.wav
%{tde_datadir}/sounds/KDE_Startup_new.wav
##########
%package style
Summary: widget styles released with Trinity
Group: User Interface/Desktops
%description style
This package contains additional widget styles for Trinity. Widget styles
can be used to customise the look and feel of interface components such
as buttons, scrollbars and so on. They can be applied using the style
manager in the TDE Control Centre.
This package is part of Trinity, and a component of the TDE artwork module.
%files style
%defattr(-,root,root,-)
%{tde_tdelibdir}/plugins/styles/
%{tde_tdelibdir}/kstyle_phase_config.la
%{tde_tdelibdir}/kstyle_phase_config.so
%{tde_datadir}/apps/kstyle/
##########
%package theme-icon
Summary: icon themes released with Trinity
Group: User Interface/Desktops
Obsoletes: trinity-kdeartwork-icons < %{version}-%{release}
Provides: trinity-kdeartwork-icons = %{version}-%{release}
%description theme-icon
This package contains additional icon themes for Trinity. Icon themes can be
used to customise the appearance of standard icons throughout KDE. They
can be applied using the icon manager in the Trinity Control Centre.
This package is part of Trinity, and a component of the TDE artwork module.
%files theme-icon
%defattr(-,root,root,-)
%{tde_datadir}/icons/*/*
%post theme-icon
for i in locolor ikons kdeclassic kids slick ; do
touch --no-create %{_datadir}/icons/$i 2>/dev/null || :
gtk-update-icon-cache --quiet %{_datadir}/icons/$i 2>/dev/null || :
done
%postun theme-icon
for i in locolor ikons kdeclassic kids slick ; do
touch --no-create %{_datadir}/icons/$i 2>/dev/null || :
gtk-update-icon-cache --quiet %{_datadir}/icons/$i 2>/dev/null || :
done
##########
%package theme-window
Summary: window decoration themes released with Trinity
Group: User Interface/Desktops
%description theme-window
This package contains additional window decoration themes for Trinity. Window
decoration themes can be used to customise the look of window borders and
buttons, and can be applied using the window decoration manager in the Trinity
Control Center.
This package is part of Trinity, and a component of the TDE artwork module.
%files theme-window
%defattr(-,root,root,-)
%{tde_tdelibdir}/[kt]win*
%{tde_datadir}/apps/[kt]win/
##########
%package -n trinity-kdewallpapers
Summary: wallpapers released with Trinity
Group: User Interface/Desktops
# TODO: build this subpkg noarch %description -n trinity-kdewallpapers
%package icons This package contains additional wallpapers for Trinity. Wallpapers can be
Summary: Icon themes (kdeclassic, slick ....) for KDE applied using the background manager in the TDE Control Centre.
Group: User Interface/Desktops
%description icons This package is part of Trinity, and a component of the TDE artwork module.
%{summary}.
%files -n trinity-kdewallpapers
%defattr(-,root,root,-)
%{tde_datadir}/wallpapers/
##########
%package -n trinity-kscreensaver
Summary: additional screen savers released with Trinity
Group: User Interface/Desktops
%description -n trinity-kscreensaver
This package contains the screen savers for Trinity. They can be tested and
selected within the Appearance and Themes section of the Trinity Control
Center.
The hooks for the standard xscreensavers are no longer part of this
package. To select and/or configure the standard xscreensavers through
the TDE Control Center, install the separate package kscreensaver-xsavers.
This package is part of Trinity, and a component of the TDE artwork module.
%files -n trinity-kscreensaver
%defattr(-,root,root,-)
%{tde_bindir}/kslideshow.kss
%{tde_bindir}/kpolygon.kss
%{tde_bindir}/krotation.kss
%{tde_bindir}/ksolarwinds.kss
%{tde_bindir}/klorenz.kss
%{tde_bindir}/kvm.kss
%{tde_bindir}/kflux.kss
%{tde_bindir}/kscience.kss
%{tde_bindir}/kbanner.kss
%{tde_bindir}/kfiresaver.kss
%{tde_bindir}/keuphoria.kss
%{tde_bindir}/kfountain.kss
%{tde_bindir}/kgravity.kss
%{tde_bindir}/kpartsaver.kss
%{tde_bindir}/kpendulum.kss
%{tde_bindir}/kblob.kss
%{tde_bindir}/klines.kss
%{tde_bindir}/kwave.kss
%{tde_datadir}/applnk/System/ScreenSavers/KBanner.desktop
%{tde_datadir}/applnk/System/ScreenSavers/KBlob.desktop
%{tde_datadir}/applnk/System/ScreenSavers/KEuphoria.desktop
%{tde_datadir}/applnk/System/ScreenSavers/KFiresaver.desktop
%{tde_datadir}/applnk/System/ScreenSavers/KFlux.desktop
%{tde_datadir}/applnk/System/ScreenSavers/KFountain.desktop
%{tde_datadir}/applnk/System/ScreenSavers/KGravity.desktop
%{tde_datadir}/applnk/System/ScreenSavers/KLines-saver.desktop
%{tde_datadir}/applnk/System/ScreenSavers/KLorenz.desktop
%{tde_datadir}/applnk/System/ScreenSavers/KPendulum.desktop
%{tde_datadir}/applnk/System/ScreenSavers/KPolygon.desktop
%{tde_datadir}/applnk/System/ScreenSavers/KRotation.desktop
%{tde_datadir}/applnk/System/ScreenSavers/KScience.desktop
%{tde_datadir}/applnk/System/ScreenSavers/KSlideshow.desktop
%{tde_datadir}/applnk/System/ScreenSavers/KSolarWinds.desktop
%{tde_datadir}/applnk/System/ScreenSavers/KVm.desktop
%{tde_datadir}/applnk/System/ScreenSavers/KWave.desktop
%{tde_datadir}/applnk/System/ScreenSavers/kpartsaver.desktop
%{tde_datadir}/apps/kfiresaver/
%{tde_datadir}/apps/kscreensaver/
# RHEL 5 and 6 do not build theses files - not sure why ...
%if 0%{?fedora} || 0%{?mgaversion}
%{tde_bindir}/kspace.kss
%{tde_bindir}/kclock.kss
%{tde_bindir}/kswarm.kss
%{tde_datadir}/applnk/System/ScreenSavers/KClock.desktop
%{tde_datadir}/applnk/System/ScreenSavers/KSpace.desktop
%{tde_datadir}/applnk/System/ScreenSavers/KSwarm.desktop
%endif
##########
%if 0%{?with_xscreensaver}
%package -n trinity-kscreensaver-xsavers
Summary: Trinity hooks for standard xscreensavers
Group: User Interface/Desktops
Requires: trinity-tdebase-bin >= 3.5.13
Requires: xscreensaver
%description -n trinity-kscreensaver-xsavers
This package allows a smooth integration of the standard xscreensavers
into Trinity. With this package installed you can select and/or configure
the standard xscreensavers through the Appearances and Themes section of
the Trinity Control Centre.
Note that this package does not actually contain any screensavers itself.
For the additional screensavers shipped with Trinity, see the separate package
kscreensaver-trinity. This package does depend on the xscreensaver package, and
recommend the xscreensaver-gl package, as well as contain the necessary
files to integrate these packages into Trinity.
This package is part of Trinity, and a component of the TDE artwork module.
%files -n trinity-kscreensaver-xsavers
%defattr(-,root,root,-)
#%{tde_bindir}/xscreensaver-getimage-file
#%{tde_bindir}/xscreensaver-getimage
%{tde_bindir}/kxsconfig
%{tde_bindir}/kxsrun
%{tde_datadir}/applnk/System/ScreenSavers/antinspect.desktop
%{tde_datadir}/applnk/System/ScreenSavers/antspotlight.desktop
%{tde_datadir}/applnk/System/ScreenSavers/atunnel.desktop
%{tde_datadir}/applnk/System/ScreenSavers/blinkbox.desktop
%{tde_datadir}/applnk/System/ScreenSavers/braid.desktop
%{tde_datadir}/applnk/System/ScreenSavers/bubble3d.desktop
%{tde_datadir}/applnk/System/ScreenSavers/circuit.desktop
%{tde_datadir}/applnk/System/ScreenSavers/cubestorm.desktop
%{tde_datadir}/applnk/System/ScreenSavers/deco.desktop
%{tde_datadir}/applnk/System/ScreenSavers/distort.desktop
%{tde_datadir}/applnk/System/ScreenSavers/endgame.desktop
%{tde_datadir}/applnk/System/ScreenSavers/engine.desktop
%{tde_datadir}/applnk/System/ScreenSavers/fiberlamp.desktop
%{tde_datadir}/applnk/System/ScreenSavers/flipflop.desktop
%{tde_datadir}/applnk/System/ScreenSavers/flipscreen3d.desktop
%{tde_datadir}/applnk/System/ScreenSavers/flyingtoasters.desktop
%{tde_datadir}/applnk/System/ScreenSavers/fuzzyflakes.desktop
%{tde_datadir}/applnk/System/ScreenSavers/galaxy.desktop
%{tde_datadir}/applnk/System/ScreenSavers/gears.desktop
%{tde_datadir}/applnk/System/ScreenSavers/gflux.desktop
%{tde_datadir}/applnk/System/ScreenSavers/glblur.desktop
%{tde_datadir}/applnk/System/ScreenSavers/gleidescope.desktop
%{tde_datadir}/applnk/System/ScreenSavers/glknots.desktop
%{tde_datadir}/applnk/System/ScreenSavers/glslideshow.desktop
%{tde_datadir}/applnk/System/ScreenSavers/glsnake.desktop
%{tde_datadir}/applnk/System/ScreenSavers/gltext.desktop
%{tde_datadir}/applnk/System/ScreenSavers/hypertorus.desktop
%{tde_datadir}/applnk/System/ScreenSavers/jigglypuff.desktop
%{tde_datadir}/applnk/System/ScreenSavers/lavalite.desktop
%{tde_datadir}/applnk/System/ScreenSavers/metaballs.desktop
%{tde_datadir}/applnk/System/ScreenSavers/mirrorblob.desktop
%{tde_datadir}/applnk/System/ScreenSavers/moebius.desktop
%{tde_datadir}/applnk/System/ScreenSavers/molecule.desktop
%{tde_datadir}/applnk/System/ScreenSavers/morph3d.desktop
%{tde_datadir}/applnk/System/ScreenSavers/penrose.desktop
%{tde_datadir}/applnk/System/ScreenSavers/pipes.desktop
%{tde_datadir}/applnk/System/ScreenSavers/polyhedra.desktop
%{tde_datadir}/applnk/System/ScreenSavers/polytopes.desktop
%{tde_datadir}/applnk/System/ScreenSavers/popsquares.desktop
%{tde_datadir}/applnk/System/ScreenSavers/pulsar.desktop
%{tde_datadir}/applnk/System/ScreenSavers/queens.desktop
%{tde_datadir}/applnk/System/ScreenSavers/ripples.desktop
%{tde_datadir}/applnk/System/ScreenSavers/shadebobs.desktop
%{tde_datadir}/applnk/System/ScreenSavers/sierpinski3d.desktop
%{tde_datadir}/applnk/System/ScreenSavers/slidescreen.desktop
%{tde_datadir}/applnk/System/ScreenSavers/sonar.desktop
%{tde_datadir}/applnk/System/ScreenSavers/spheremonics.desktop
%{tde_datadir}/applnk/System/ScreenSavers/stonerview.desktop
%{tde_datadir}/applnk/System/ScreenSavers/superquadrics.desktop
%{tde_datadir}/applnk/System/ScreenSavers/swirl.desktop
%{tde_datadir}/applnk/System/ScreenSavers/xlyap.desktop
%{tde_datadir}/applnk/System/ScreenSavers/m6502.desktop
%{tde_datadir}/applnk/System/ScreenSavers/glschool.desktop
%{tde_datadir}/applnk/System/ScreenSavers/moebiusgears.desktop
%{tde_datadir}/applnk/System/ScreenSavers/glcells.desktop
%{tde_datadir}/applnk/System/ScreenSavers/abstractile.desktop
%{tde_datadir}/applnk/System/ScreenSavers/lockward.desktop
%{tde_datadir}/applnk/System/ScreenSavers/cwaves.desktop
%{tde_datadir}/applnk/System/ScreenSavers/topblock.desktop
%{tde_datadir}/applnk/System/ScreenSavers/voronoi.desktop
%{tde_datadir}/applnk/System/ScreenSavers/cubicgrid.desktop
%{tde_datadir}/applnk/System/ScreenSavers/hypnowheel.desktop
%{tde_datadir}/applnk/System/ScreenSavers/lcdscrub.desktop
%{tde_datadir}/applnk/System/ScreenSavers/photopile.desktop
%{tde_datadir}/applnk/System/ScreenSavers/skytentacles.desktop
# These screensavers do not exist on Mageia 2
%if 0%{?mgaversion} == 0
%{tde_datadir}/applnk/System/ScreenSavers/glmatrix.desktop
%endif
##########
%package -n trinity-kscreensaver-xsavers-webcollage
Summary: webcollage screensaver Trinity hook
Group: User Interface/Desktops
Requires: trinity-kscreensaver-xsavers-extra = %{version}-%{release}
Requires: netpbm
%description -n trinity-kscreensaver-xsavers-webcollage
This package give access to the webcollage screensaver through the Trinity
screensaver configuration.
This screensaver downloads random pictures from the internet and creates
a collage as screensaver.
IMPORTANT NOTICE: The internet contains all kinds of pictures, some of which
you might find inappropriate and offensive.
You are specially discouraged to install this package if you are using
your computer in a working environment or in an environment with children.
If you still want to install this package, please read the file
/usr/share/doc/kscreensaver-xsavers-webcollage/README.Debian after the
installation.
This package is part of Trinity, and a component of the TDE artwork module.
%files -n trinity-kscreensaver-xsavers-webcollage
%defattr(-,root,root,-)
%{tde_datadir}/applnk/System/ScreenSavers/webcollage.desktop
##########
%package -n trinity-kscreensaver-xsavers-extra
Summary: Trinity hooks for standard xscreensavers
Group: User Interface/Desktops
Requires: trinity-kscreensaver-xsavers = %{version}-%{release}
%description -n trinity-kscreensaver-xsavers-extra
This package allows a smooth integration of the universe xscreensavers
into Trinity. With this package installed you can select and/or configure
the universe xscreensavers through the Appearances and Themes section of
the Trinity Control Centre.
Note that this package does not actually contain any screensavers itself.
For the additional screensavers shipped with TDE, see the separate package
kscreensaver.
This package is part of Trinity, and a component of the TDE artwork module.
%files -n trinity-kscreensaver-xsavers-extra
%defattr(-,root,root,-)
%{tde_datadir}/applnk/System/ScreenSavers/anemone.desktop
%{tde_datadir}/applnk/System/ScreenSavers/anemotaxis.desktop
%{tde_datadir}/applnk/System/ScreenSavers/antmaze.desktop
%{tde_datadir}/applnk/System/ScreenSavers/apollonian.desktop
%{tde_datadir}/applnk/System/ScreenSavers/apple2.desktop
%{tde_datadir}/applnk/System/ScreenSavers/atlantis.desktop
%{tde_datadir}/applnk/System/ScreenSavers/attraction.desktop
%{tde_datadir}/applnk/System/ScreenSavers/barcode.desktop
%{tde_datadir}/applnk/System/ScreenSavers/blaster.desktop
%{tde_datadir}/applnk/System/ScreenSavers/blitspin.desktop
%{tde_datadir}/applnk/System/ScreenSavers/blocktube.desktop
%{tde_datadir}/applnk/System/ScreenSavers/boing.desktop
%{tde_datadir}/applnk/System/ScreenSavers/bouboule.desktop
%{tde_datadir}/applnk/System/ScreenSavers/bouncingcow.desktop
%{tde_datadir}/applnk/System/ScreenSavers/boxed.desktop
%{tde_datadir}/applnk/System/ScreenSavers/boxfit.desktop
%{tde_datadir}/applnk/System/ScreenSavers/bsod.desktop
%{tde_datadir}/applnk/System/ScreenSavers/bumps.desktop
%{tde_datadir}/applnk/System/ScreenSavers/cage.desktop
%{tde_datadir}/applnk/System/ScreenSavers/carousel.desktop
%{tde_datadir}/applnk/System/ScreenSavers/ccurve.desktop
%{tde_datadir}/applnk/System/ScreenSavers/celtic.desktop
%{tde_datadir}/applnk/System/ScreenSavers/cloudlife.desktop
%{tde_datadir}/applnk/System/ScreenSavers/compass.desktop
%{tde_datadir}/applnk/System/ScreenSavers/coral.desktop
%{tde_datadir}/applnk/System/ScreenSavers/crackberg.desktop
%{tde_datadir}/applnk/System/ScreenSavers/crystal.desktop
%{tde_datadir}/applnk/System/ScreenSavers/cube21.desktop
%{tde_datadir}/applnk/System/ScreenSavers/cubenetic.desktop
%{tde_datadir}/applnk/System/ScreenSavers/cynosure.desktop
%{tde_datadir}/applnk/System/ScreenSavers/dangerball.desktop
%{tde_datadir}/applnk/System/ScreenSavers/decayscreen.desktop
%{tde_datadir}/applnk/System/ScreenSavers/deluxe.desktop
%{tde_datadir}/applnk/System/ScreenSavers/demon.desktop
%{tde_datadir}/applnk/System/ScreenSavers/discrete.desktop
%{tde_datadir}/applnk/System/ScreenSavers/drift.desktop
%{tde_datadir}/applnk/System/ScreenSavers/epicycle.desktop
%{tde_datadir}/applnk/System/ScreenSavers/eruption.desktop
%{tde_datadir}/applnk/System/ScreenSavers/euler2d.desktop
%{tde_datadir}/applnk/System/ScreenSavers/extrusion.desktop
%{tde_datadir}/applnk/System/ScreenSavers/fadeplot.desktop
%{tde_datadir}/applnk/System/ScreenSavers/fireworkx.desktop
%{tde_datadir}/applnk/System/ScreenSavers/flame.desktop
%{tde_datadir}/applnk/System/ScreenSavers/fliptext.desktop
%{tde_datadir}/applnk/System/ScreenSavers/flow.desktop
%{tde_datadir}/applnk/System/ScreenSavers/fluidballs.desktop
%{tde_datadir}/applnk/System/ScreenSavers/flurry.desktop
%{tde_datadir}/applnk/System/ScreenSavers/fontglide.desktop
%{tde_datadir}/applnk/System/ScreenSavers/glhanoi.desktop
%{tde_datadir}/applnk/System/ScreenSavers/glplanet.desktop
%{tde_datadir}/applnk/System/ScreenSavers/goop.desktop
%{tde_datadir}/applnk/System/ScreenSavers/grav.desktop
%{tde_datadir}/applnk/System/ScreenSavers/greynetic.desktop
%{tde_datadir}/applnk/System/ScreenSavers/halftone.desktop
%{tde_datadir}/applnk/System/ScreenSavers/halo.desktop
%{tde_datadir}/applnk/System/ScreenSavers/helix.desktop
%{tde_datadir}/applnk/System/ScreenSavers/hopalong.desktop
%{tde_datadir}/applnk/System/ScreenSavers/ifs.desktop
%{tde_datadir}/applnk/System/ScreenSavers/imsmap.desktop
%{tde_datadir}/applnk/System/ScreenSavers/interaggregate.desktop
%{tde_datadir}/applnk/System/ScreenSavers/interference.desktop
%{tde_datadir}/applnk/System/ScreenSavers/intermomentary.desktop
%{tde_datadir}/applnk/System/ScreenSavers/jigsaw.desktop
%{tde_datadir}/applnk/System/ScreenSavers/juggler3d.desktop
%{tde_datadir}/applnk/System/ScreenSavers/julia.desktop
%{tde_datadir}/applnk/System/ScreenSavers/kaleidescope.desktop
%{tde_datadir}/applnk/System/ScreenSavers/klein.desktop
%{tde_datadir}/applnk/System/ScreenSavers/kumppa.desktop
%{tde_datadir}/applnk/System/ScreenSavers/lament.desktop
%{tde_datadir}/applnk/System/ScreenSavers/loop.desktop
%{tde_datadir}/applnk/System/ScreenSavers/maze.desktop
%{tde_datadir}/applnk/System/ScreenSavers/memscroller.desktop
%{tde_datadir}/applnk/System/ScreenSavers/menger.desktop
%{tde_datadir}/applnk/System/ScreenSavers/moire.desktop
%{tde_datadir}/applnk/System/ScreenSavers/moire2.desktop
%{tde_datadir}/applnk/System/ScreenSavers/mountain.desktop
%{tde_datadir}/applnk/System/ScreenSavers/munch.desktop
%{tde_datadir}/applnk/System/ScreenSavers/nerverot.desktop
%{tde_datadir}/applnk/System/ScreenSavers/noof.desktop
%{tde_datadir}/applnk/System/ScreenSavers/noseguy.desktop
%{tde_datadir}/applnk/System/ScreenSavers/pacman.desktop
%{tde_datadir}/applnk/System/ScreenSavers/pedal.desktop
%{tde_datadir}/applnk/System/ScreenSavers/penetrate.desktop
%{tde_datadir}/applnk/System/ScreenSavers/petri.desktop
%{tde_datadir}/applnk/System/ScreenSavers/phosphor.desktop
%{tde_datadir}/applnk/System/ScreenSavers/piecewise.desktop
%{tde_datadir}/applnk/System/ScreenSavers/pinion.desktop
%{tde_datadir}/applnk/System/ScreenSavers/polyominoes.desktop
%{tde_datadir}/applnk/System/ScreenSavers/pong.desktop
%{tde_datadir}/applnk/System/ScreenSavers/providence.desktop
%{tde_datadir}/applnk/System/ScreenSavers/pyro.desktop
%{tde_datadir}/applnk/System/ScreenSavers/qix.desktop
%{tde_datadir}/applnk/System/ScreenSavers/rd-bomb.desktop
%{tde_datadir}/applnk/System/ScreenSavers/rocks.desktop
%{tde_datadir}/applnk/System/ScreenSavers/rorschach.desktop
%{tde_datadir}/applnk/System/ScreenSavers/rotzoomer.desktop
%{tde_datadir}/applnk/System/ScreenSavers/rubik.desktop
%{tde_datadir}/applnk/System/ScreenSavers/sballs.desktop
%{tde_datadir}/applnk/System/ScreenSavers/sierpinski.desktop
%{tde_datadir}/applnk/System/ScreenSavers/slip.desktop
%{tde_datadir}/applnk/System/ScreenSavers/speedmine.desktop
%{tde_datadir}/applnk/System/ScreenSavers/spotlight.desktop
%{tde_datadir}/applnk/System/ScreenSavers/sproingies.desktop
%{tde_datadir}/applnk/System/ScreenSavers/squiral.desktop
%{tde_datadir}/applnk/System/ScreenSavers/stairs.desktop
%{tde_datadir}/applnk/System/ScreenSavers/starfish.desktop
%{tde_datadir}/applnk/System/ScreenSavers/starwars.desktop
%{tde_datadir}/applnk/System/ScreenSavers/strange.desktop
%{tde_datadir}/applnk/System/ScreenSavers/substrate.desktop
%{tde_datadir}/applnk/System/ScreenSavers/tangram.desktop
%{tde_datadir}/applnk/System/ScreenSavers/thornbird.desktop
%{tde_datadir}/applnk/System/ScreenSavers/timetunnel.desktop
%{tde_datadir}/applnk/System/ScreenSavers/triangle.desktop
%{tde_datadir}/applnk/System/ScreenSavers/truchet.desktop
%{tde_datadir}/applnk/System/ScreenSavers/twang.desktop
%{tde_datadir}/applnk/System/ScreenSavers/vermiculate.desktop
%{tde_datadir}/applnk/System/ScreenSavers/vidwhacker.desktop
%{tde_datadir}/applnk/System/ScreenSavers/wander.desktop
%{tde_datadir}/applnk/System/ScreenSavers/whirlwindwarp.desktop
%{tde_datadir}/applnk/System/ScreenSavers/wormhole.desktop
%{tde_datadir}/applnk/System/ScreenSavers/xanalogtv.desktop
%{tde_datadir}/applnk/System/ScreenSavers/xflame.desktop
%{tde_datadir}/applnk/System/ScreenSavers/xrayswarm.desktop
%{tde_datadir}/applnk/System/ScreenSavers/xspirograph.desktop
%{tde_datadir}/applnk/System/ScreenSavers/zoom.desktop
# These screensavers do not exist on Mageia 2
%if 0%{?mgaversion} == 0
%{tde_datadir}/applnk/System/ScreenSavers/xjack.desktop
%{tde_datadir}/applnk/System/ScreenSavers/xmatrix.desktop
%endif
%endif
##########
%prep %prep
@ -67,14 +584,15 @@ Group: User Interface/Desktops
%build %build
unset QTDIR || : ; . /etc/profile.d/qt.sh unset QTDIR || : ; . /etc/profile.d/qt.sh
export PATH="%{_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{_libdir}/pkgconfig" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
export CMAKE_INCLUDE_PATH="%{_includedir}:%{_includedir}/tqt" export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_includedir}/tqt"
export LD_LIBRARY_PATH="%{_libdir}" export LD_LIBRARY_PATH="%{tde_libdir}"
%__mkdir build %{?!mgaversion:%__mkdir build; cd build}
cd build
%cmake \ %cmake \
-DSHARE_INSTALL_PREFIX=%{tde_datadir} \
-DLIB_INSTALL_DIR=%{tde_libdir} \
%if 0%{?with_xscreensaver} %if 0%{?with_xscreensaver}
-DWITH_XSCREENSAVER=ON \ -DWITH_XSCREENSAVER=ON \
%else %else
@ -94,21 +612,13 @@ cd build
%install %install
export PATH="%{_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot} %__rm -rf %{buildroot}
%__make install -C build DESTDIR=%{buildroot} %__make install -C build DESTDIR=%{buildroot}
# webcollage -root -directory /usr/share/backgrounds/images #227683 # 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 # File lists
%find_lang %{name} || touch %{name}.lang
HTML_DIR=$(kde-config --expandvars --install html) HTML_DIR=$(kde-config --expandvars --install html)
if [ -d %{buildroot}$HTML_DIR ]; then if [ -d %{buildroot}$HTML_DIR ]; then
for lang_dir in %{buildroot}$HTML_DIR/* ; do for lang_dir in %{buildroot}$HTML_DIR/* ; do
@ -125,64 +635,17 @@ for lang_dir in %{buildroot}$HTML_DIR/* ; do
done done
fi 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 || :
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 || :
gtk-update-icon-cache --quiet %{_datadir}/icons/$i 2>/dev/null || :
done
%clean %clean
%__rm -rf %{buildroot} %__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/*
%if 0%{?with_xscreensaver}
%{_bindir}/kxs*
%endif
%files icons
%defattr(-,root,root,-)
%doc rpmdocs/IconThemes/*
%{_datadir}/icons/ikons/
%{_datadir}/icons/kdeclassic/
%{_datadir}/icons/kids/
%{_datadir}/icons/Locolor/
%{_datadir}/icons/slick/
%changelog %changelog
* Tue Jul 30 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-3
- Split into several packages
- Add support for Mageia 2
* Fri Nov 04 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-2 * Fri Nov 04 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-2
- Updates BuildRequires - Updates BuildRequires

@ -0,0 +1,76 @@
commit 80deb52955cbd917e10f015f37699d830cb681ce
Author: Slávek Banko <slavek.banko@axis.cz>
Date: 1339336699 +0200
Add xscreensaver support to CMake
This closes Bug 859
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 31fb46c..3da5b2f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -67,6 +67,7 @@
option( WITH_XDAMAGE "Enable xdamage support" OFF )
option( WITH_XEXT "Enable xext support" OFF )
option( WITH_XTEST "Enable xext support" OFF )
+option( WITH_XSCREENSAVER "Enable xscreensaver support" ${WITH_ALL_OPTIONS} )
option( WITH_LIBUSB "Enable control of some mouse models through libusb" OFF )
option( WITH_LIBRAW1394 "Enable visualization of ieee1394 devices through libraw1394" OFF )
option( WITH_SUDO_KDESU_BACKEND "Use sudo as backend for kdesu (default is su)" OFF )
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index ded1d00..1d9c83d 100644
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -144,6 +144,26 @@ if( WITH_XTEST )
endif( )
+# xscreensaver ()
+if( WITH_XSCREENSAVER )
+ check_library_exists( Xss XScreenSaverQueryInfo "" HAVE_XSSLIB )
+ if( HAVE_XSSLIB )
+ pkg_search_module( XSS xscrnsaver )
+ else( )
+ check_library_exists( Xext XScreenSaverQueryInfo "" HAVE_XSSLIB )
+ if( HAVE_XSSLIB )
+ pkg_search_module( XSS xext )
+ endif( )
+ endif( )
+ check_include_file( X11/extensions/scrnsaver.h HAVE_XSCREENSAVER_H )
+ if( HAVE_XSSLIB AND HAVE_XSCREENSAVER_H )
+ set( HAVE_XSCREENSAVER 1 )
+ else( )
+ tde_message_fatal( "xscreensaver is requested, but was not found on your system" )
+ endif( )
+endif( )
+
+
# GL
if( BUILD_KDESKTOP OR BUILD_KCONTROL OR BUILD_KSCREENSAVER )
check_library_exists( GL glXChooseVisual "" HAVE_GLXCHOOSEVISUAL )
diff --git a/config.h.cmake b/config.h.cmake
index 39d6d85..772ca88 100644
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -21,6 +21,9 @@
// kxkb
#cmakedefine HAVE_XTEST 1
+// xscreensaver
+#cmakedefine HAVE_XSCREENSAVER 1
+
// kdm, kioslave
#cmakedefine HAVE_TERMIOS_H 1
diff --git a/kdesktop/CMakeLists.txt b/kdesktop/CMakeLists.txt
index 99d86d1..b2e4628 100644
--- a/kdesktop/CMakeLists.txt
+++ b/kdesktop/CMakeLists.txt
@@ -94,6 +94,7 @@ tde_add_tdeinit_executable( ${target} AUTOMOC
kdesktopsettings-static bgnd-static dmctl-static
konq-shared kutils-shared
${XRENDER_LIBRARIES} ${XCURSOR_LIBRARIES} Xext dl
+ ${XSS_LIBRARIES}
)

@ -1,28 +1,15 @@
--- kdebase/startkde.ORI 2011-11-14 22:23:07.191346324 +0100 --- tdebase/startkde.ORI 2012-07-29 18:23:59.885538470 +0200
+++ kdebase/startkde 2011-11-14 22:38:28.480321300 +0100 +++ tdebase/startkde 2012-07-29 18:26:19.022618054 +0200
@@ -206,6 +206,29 @@ @@ -152,6 +152,16 @@
fi fi
fi fi
+# Default Start Button icon +# Default Start Button icon for TDE
+if [ ! -e $kdehome/share/config/kickerrc ]; then +if [ ! -e $kdehome/share/config/kickerrc ]; then
+ # Fedora + if [ -r "%{tde_starticon}" ]; then
+ if [ -r /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png ]; then
+ cat <<EOF >$kdehome/share/config/kickerrc + cat <<EOF >$kdehome/share/config/kickerrc
+[KMenu] +[KMenu]
+CustomIcon=fedora-logo-icon +CustomIcon=%{tde_starticon}
+EOF
+ # RHEL 6
+ elif [ -r /usr/share/icons/hicolor/96x96/apps/system-logo-icon.png ]; then
+ cat <<EOF >$kdehome/share/config/kickerrc
+[KMenu]
+CustomIcon=system-logo-icon
+EOF
+ # RHEL 5
+ elif [ -r /usr/share/pixmaps/redhat-starthere.png ]; then
+ cat <<EOF >$kdehome/share/config/kickerrc
+[KMenu]
+CustomIcon=/usr/share/pixmaps/redhat-starthere.png
+EOF +EOF
+ fi + fi
+fi +fi

@ -0,0 +1,5 @@
#%PAM-1.0
auth include system-auth
account include system-auth
password include system-auth
session include system-auth

@ -0,0 +1,10 @@
#%PAM-1.0
auth required pam_env.so
auth required pam_permit.so
account required pam_nologin.so
account include system-auth
password include system-auth
session optional pam_keyinit.so force revoke
session include system-auth
session required pam_loginuid.so
session optional pam_console.so

@ -0,0 +1,13 @@
#%PAM-1.0
auth required pam_env.so
auth required pam_succeed_if.so
auth sufficient pam_succeed_if.so user ingroup nopasswdlogin
auth substack system-auth
account required pam_nologin.so
account include system-auth
password include system-auth
session optional pam_keyinit.so force revoke
session required pam_loginuid.so
session include system-auth
session optional pam_console.so
session required pam_namespace.so

@ -0,0 +1,5 @@
#%PAM-1.0
auth include system-auth
account include system-auth
password include system-auth
session include system-auth

File diff suppressed because it is too large Load Diff

@ -0,0 +1,32 @@
--- kdebindings/smoke/kde/Makefile.am.ORI 2012-07-30 14:03:33.850946697 +0200
+++ kdebindings/smoke/kde/Makefile.am 2012-07-30 14:04:22.961921086 +0200
@@ -9,7 +9,7 @@
libsmokekde_la_LDFLAGS = -version-info 3:2:2 -no-undefined $(all_libraries) $(GLINC) $(KDE_RPATH)
# the libraries to link against.
-libsmokekde_la_LIBADD = $(LIB_KHTML) -lkjs -lfontconfig $(LIB_KMDI) $(LIB_KNS) $(LIB_KSPELL) $(LIB_KUTILS) $(LIB_KDEPRINT) $(GLLIB)
+libsmokekde_la_LIBADD = $(LIB_KHTML) -lkjs -lfontconfig $(LIB_KMDI) $(LIB_KNS) $(LIB_KSPELL) $(LIB_KUTILS) $(LIB_KDEPRINT) $(GLLIB) -lqt-mt -lkdeui -lkdecore -lDCOP -lkio -lkparts -lkdefx
x_sources = x_1.cpp x_2.cpp x_3.cpp x_4.cpp x_5.cpp x_6.cpp x_7.cpp \
x_8.cpp x_9.cpp x_10.cpp x_11.cpp x_12.cpp x_13.cpp x_14.cpp x_15.cpp \
--- kdebindings/kdejava/koala/kdejava/Makefile.am.ORI 2012-07-30 14:18:07.024345627 +0200
+++ kdebindings/kdejava/koala/kdejava/Makefile.am 2012-07-30 14:18:19.055092255 +0200
@@ -33,6 +33,6 @@
libkdejava_la_LDFLAGS = $(all_libraries) -no-undefined -version-info $(SOMAJOR):$(SOMINOR):$(SOSUBMINOR)
-libkdejava_la_LIBADD = $(top_builddir)/qtjava/javalib/qtjava/libqtjavasupport.la -lkmdi $(LIB_KHTML) $(LIB_KSPELL) $(LIB_KIO)
+libkdejava_la_LIBADD = $(top_builddir)/qtjava/javalib/qtjava/libqtjavasupport.la -lkmdi $(LIB_KHTML) $(LIB_KSPELL) $(LIB_KIO) -lkdecore -lkparts -lkdeui -lkutils -lDCOP -lkdefx -lkdeprint
KDE_OPTIONS = qtonly nofinal
--- kdebindings/xparts/src/kde/Makefile.am.ORI 2012-07-30 14:27:24.347613550 +0200
+++ kdebindings/xparts/src/kde/Makefile.am 2010-08-12 05:12:49.000000000 +0200
@@ -5,7 +5,7 @@
libkdexparts_la_SOURCES = xparthost_kpart.cpp xparthost.skel xpart.stub \
kbrowsersignals.cpp xbrowsersignals.skel xbrowserextension.stub
-libkdexparts_la_LIBADD = $(LIB_KPARTS)
+libkdexparts_la_LIBADD = $(LIB_KPARTS) -lDCOP -lqt-mt -lkdecore -lkdeui
libkdexparts_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 1:0
xpart_DIR=$(srcdir)/../interfaces

File diff suppressed because it is too large Load Diff

@ -0,0 +1,18 @@
commit 9d1871a43cd11869f9a1eac7f6e1c6ae23b84072
Author: Darrell Anderson <humanreadable@yahoo.com>
Date: 1330147966 -0600
Fix kbruch/Makefile.am to eliminate build error.
This resolves bug report 786.
diff --git a/kbruch/Makefile.am b/kbruch/Makefile.am
index b2c27d1..7b159ff 100644
--- a/kbruch/Makefile.am
+++ b/kbruch/Makefile.am
@@ -2,5 +2,5 @@ SUBDIRS = src testcases
EXTRA_DIST = AUTHORS ChangeLog README TODO kbruch.lsm VERSION
-VERSION:=`cat ${PWD}/VERSION`
+VERSION=`cat ${PWD}/VERSION`
include ../admin/Doxyfile.am

@ -0,0 +1,51 @@
commit 0cd3b7cec9eed70d39e1ae884d76db585790c9a3
Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: 1327530864 -0600
Fix linear alphabet string errors
diff --git a/kstars/kstars/indi/base64.c b/kstars/kstars/indi/base64.c
index e83db54..2842451 100644
--- a/kstars/kstars/indi/base64.c
+++ b/kstars/kstars/indi/base64.c
@@ -30,7 +30,7 @@
#include "base64.h"
static const char base64digits[] =
- "ABCDEFGHIJKLMNOPTQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+ "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
#define BAD (-1)
static const char base64val[] = {
diff --git a/ktouch/extras/training-gen/perl/dk.config b/ktouch/extras/training-gen/perl/dk.config
index 46d7edd..409a07c 100644
--- a/ktouch/extras/training-gen/perl/dk.config
+++ b/ktouch/extras/training-gen/perl/dk.config
@@ -16,4 +16,4 @@ wn
x
,.
-ABCDEFGHIJKLMNOPTQRSTUVWYZÆØÅ
\ No newline at end of file
+ABCDEFGHIJKLMNOPQRSTUVWYZÆØÅ
\ No newline at end of file
diff --git a/ktouch/extras/training-gen/perl/en.config b/ktouch/extras/training-gen/perl/en.config
index cca1346..bb5df1a 100644
--- a/ktouch/extras/training-gen/perl/en.config
+++ b/ktouch/extras/training-gen/perl/en.config
@@ -12,4 +12,4 @@ qu
wn
cx
yz
-ABCDEFGHIJKLMNOPTQRSTUVWXYZ
+ABCDEFGHIJKLMNOPQRSTUVWXYZ
diff --git a/ktouch/extras/training-gen/perl/es.config b/ktouch/extras/training-gen/perl/es.config
index 1efd7b7..49b8b32 100644
--- a/ktouch/extras/training-gen/perl/es.config
+++ b/ktouch/extras/training-gen/perl/es.config
@@ -14,4 +14,4 @@ qu
wnñ
cx
yz
-ABCDEFGHIJKLMNOPTQRSTUVWXYZ
+ABCDEFGHIJKLMNOPQRSTUVWXYZ

@ -0,0 +1,17 @@
commit b83d045598947bb355ed6a2996b24225da6a9ffa
Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: 1326310679 -0600
Fix kdeedu makefile glitch
This closes Bug 785
diff --git a/kalzium/src/solver/Makefile b/kalzium/src/solver/Makefile
index 4b96fdb..6012982 100644
--- a/kalzium/src/solver/Makefile
+++ b/kalzium/src/solver/Makefile
@@ -89,4 +89,4 @@ install :
.depend: parser.ml lexer.ml
$(OCAMLDEP) $(INCLUDES) *.mli *.ml > $@
-include .depend
+-include .depend

@ -0,0 +1,55 @@
--- kdeedu/libkdeedu/kdeeducore/Makefile.am.ORI 2012-08-01 16:03:57.158018060 +0200
+++ kdeedu/libkdeedu/kdeeducore/Makefile.am 2012-08-01 16:04:06.206657197 +0200
@@ -11,7 +11,7 @@
libkdeeducode_includedir = $(includedir)/libkdeedu
libkdeeducode_include_HEADERS = keduvocdata.h
-libkdeeducore_la_LIBADD = $(LIB_KDECORE)
+libkdeeducore_la_LIBADD = $(LIB_KDECORE) $(LIB_QT)
METASOURCES = AUTO
--- kdeedu/libkdeedu/kdeeduui/Makefile.am.ORI 2012-08-01 16:08:47.875060426 +0200
+++ kdeedu/libkdeedu/kdeeduui/Makefile.am 2012-08-01 16:08:53.275867176 +0200
@@ -10,7 +10,7 @@
libkdeeduuiinclude_HEADERS = kdeeduglossary.h
libkdeeduui_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 3:5:0
-libkdeeduui_la_LIBADD = $(LIB_KDECORE) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KHTML)
+libkdeeduui_la_LIBADD = $(LIB_KDECORE) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KHTML) $(LIB_QT)
METASOURCES = AUTO
--- kdeedu/libkdeedu/extdate/Makefile.am.ORI 2012-08-01 16:10:28.272515295 +0200
+++ kdeedu/libkdeedu/extdate/Makefile.am 2012-08-01 16:10:37.999176797 +0200
@@ -7,7 +7,7 @@
libextdate_la_SOURCES = extdatetime.cpp extcalendarsystem.cpp extcalendarsystemgregorian.cpp extdatetbl.cpp extdatepicker.cpp extdatetimeedit.cpp extdatewidget.cpp
libextdate_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 3:0:2
-libextdate_la_LIBADD = $(LIB_KDEUI)
+libextdate_la_LIBADD = $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE)
test_extdate_SOURCES = test_extdate.cc
test_extdate_LDADD = libextdate.la
--- kdeedu/kiten/Makefile.am.ORI 2012-08-01 16:15:45.679552203 +0200
+++ kdeedu/kiten/Makefile.am 2012-08-01 16:15:53.606341454 +0200
@@ -13,7 +13,7 @@
lib_LTLIBRARIES = libkiten.la
libkiten_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined -version-info 1:0:0
-libkiten_la_LIBADD = $(LIB_KDEUI) $(LIB_KDEPRINT)
+libkiten_la_LIBADD = $(LIB_KDEUI) $(LIB_KDEPRINT) $(LIB_QT) $(LIB_KDECORE)
libkiten_la_SOURCES = asyndeta.cpp dict.cpp widgets.cpp kromajiedit.cpp rad.cpp \
deinf.cpp kitenconfig.kcfgc
--- kdeedu/kvoctrain/kvoctrain/kvt-core/Makefile.am.ORI 2012-08-01 16:24:48.865399440 +0200
+++ kdeedu/kvoctrain/kvoctrain/kvt-core/Makefile.am 2012-08-01 16:24:54.832227336 +0200
@@ -12,6 +12,7 @@
SUBDIRS = kvt-xml
-libkvoctraincore_la_LIBADD= kvt-xml/libkvtxml.la
+libkvoctraincore_la_LIBADD= kvt-xml/libkvtxml.la ../common-dialogs/libcommondlg.la $(LIB_QT) $(LIB_KDECORE) $(LIB_KIO) $(LIB_KDEUI) -lDCOP
+libkvoctraincore_la_LDFLAGS = $(QT_LDFLAGS)
noinst_HEADERS = grammarmanager.h

File diff suppressed because it is too large Load Diff

@ -0,0 +1,44 @@
--- kdegames/libkdegames/Makefile.am.ORI 2012-07-31 20:25:24.961859509 +0200
+++ kdegames/libkdegames/Makefile.am 2012-07-31 20:25:32.306619391 +0200
@@ -2,7 +2,7 @@
lib_LTLIBRARIES = libkdegames.la
libkdegames_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined -version-info 3:0:2
libkdegames_la_LIBADD = highscore/libkhighscore.la kgame/libkgame.la kgame/dialogs/libkgamedialogs.la \
- $(LIB_KSYCOCA) $(LIB_KDNSSD)
+ $(LIB_KSYCOCA) $(LIB_KDNSSD) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)
libkdegames_la_SOURCES = kcarddialog.cpp kstdgameaction.cpp \
kgamemisc.cpp kchatbase.cpp kchat.cpp \
--- kdegames/atlantik/libatlantikclient/Makefile.am.ORI 2012-07-31 20:26:55.089913155 +0200
+++ kdegames/atlantik/libatlantikclient/Makefile.am 2012-07-31 20:27:00.414739083 +0200
@@ -1,7 +1,7 @@
INCLUDES = -I$(top_srcdir)/atlantik/libatlantic $(all_includes)
lib_LTLIBRARIES = libatlantikclient.la
libatlantikclient_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined -version-info 3:0:2
-libatlantikclient_la_LIBADD = ../libatlantic/libatlantic.la $(LIB_KIO)
+libatlantikclient_la_LIBADD = ../libatlantic/libatlantic.la $(LIB_KIO) $(LIB_KDECORE)
libatlantikclient_la_SOURCES = atlantik_network.cpp monopdprotocol.cpp
--- kdegames/atlantik/libatlantikui/Makefile.am.ORI 2012-07-31 20:29:44.177385572 +0200
+++ kdegames/atlantik/libatlantikui/Makefile.am 2012-07-31 20:30:27.821958801 +0200
@@ -1,7 +1,7 @@
INCLUDES = -I$(top_srcdir)/atlantik/libatlantic $(all_includes)
lib_LTLIBRARIES = libatlantikui.la
libatlantikui_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined -version-info 3:0:2
-libatlantikui_la_LIBADD = ../libatlantic/libatlantic.la $(LIB_KIO)
+libatlantikui_la_LIBADD = ../libatlantic/libatlantic.la $(LIB_KIO) $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx
libatlantikui_la_SOURCES = auction_widget.cpp board.cpp estatedetails.cpp \
estateview.cpp kwrappedlistviewitem.cpp portfolioestate.cpp \
--- kdegames/kolf/Makefile.am.ORI 2012-07-31 20:38:20.125518870 +0200
+++ kdegames/kolf/Makefile.am 2012-07-31 20:38:30.672174091 +0200
@@ -12,7 +12,7 @@
floater.cpp slope.cpp
libkolf_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 3:0:2
-libkolf_la_LIBADD = $(LIB_KDEGAMES) $(LIB_KDEPRINT) $(LIB_KIO) -lartskde
+libkolf_la_LIBADD = $(LIB_KDEGAMES) $(LIB_KDEPRINT) $(LIB_KIO) -lartskde -lkdefx -lsoundserver_idl -lartsmodules
libkolf_la_DEPENDENCIES = $(LIB_KDEGAMES_DEP)

File diff suppressed because it is too large Load Diff

@ -0,0 +1,41 @@
commit b2d01d000c11d7c0dd183e1af059f81ac5249c25
Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: 1339541595 -0500
Add poppler-tqt.pc file
diff --git a/kfile-plugins/dependencies/poppler-tqt/CMakeLists.txt b/kfile-plugins/dependencies/poppler-tqt/CMakeLists.txt
index d07e813..42d50a8 100644
--- a/kfile-plugins/dependencies/poppler-tqt/CMakeLists.txt
+++ b/kfile-plugins/dependencies/poppler-tqt/CMakeLists.txt
@@ -28,6 +28,12 @@ link_directories(
${TQT_LIBRARY_DIRS}
)
+##### pc files ##################################
+
+configure_file( poppler-tqt.pc.cmake poppler-tqt.pc @ONLY )
+
+install( FILES ${CMAKE_CURRENT_BINARY_DIR}/poppler-tqt.pc DESTINATION ${PKGCONFIG_INSTALL_DIR} )
+
##### headers ###################################
install( FILES
diff --git a/kfile-plugins/dependencies/poppler-tqt/poppler-tqt.pc.cmake b/kfile-plugins/dependencies/poppler-tqt/poppler-tqt.pc.cmake
new file mode 100644
index 0000000..ce2b40d
--- /dev/null
+++ b/kfile-plugins/dependencies/poppler-tqt/poppler-tqt.pc.cmake
@@ -0,0 +1,12 @@
+prefix=@CMAKE_INSTALL_PREFIX@
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: poppler-tqt
+Description: TQt bindings for poppler
+Version: @POPPLER_VERSION@
+Requires: poppler = @POPPLER_VERSION@
+
+Libs: -L${libdir} -lpoppler-tqt
+Cflags: -I${includedir}

@ -0,0 +1,11 @@
--- kdegraphics/kfile-plugins/dependencies/poppler-tqt/CMakeLists.txt.ORI 2012-08-01 19:42:18.057554419 +0200
+++ kdegraphics/kfile-plugins/dependencies/poppler-tqt/CMakeLists.txt 2012-08-01 19:42:28.320371892 +0200
@@ -38,7 +38,7 @@
install( FILES
poppler-qt.h poppler-page-transition.h poppler-link-qt3.h
- DESTINATION ${INCLUDE_INSTALL_DIR}/kde )
+ DESTINATION ${INCLUDE_INSTALL_DIR} )
##### poppler-tqt (shared) ############################

@ -1,19 +1,26 @@
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr" %if "%{?_prefix}" != "/usr"
%define _variant .opt %define _variant .opt
%define _docdir %{_datadir}/doc
%endif %endif
# TDE 3.5.13 specific building variables # TDE 3.5.13 specific building variables
%define tde_appdir %{_datadir}/applications/kde %define tde_bindir %{_prefix}/bin
%define tde_docdir %{_docdir}/kde %define tde_datadir %{_prefix}/share
%define tde_includedir %{_includedir}/kde %define tde_docdir %{tde_datadir}/doc
%define tde_libdir %{_libdir}/trinity %define tde_includedir %{_prefix}/include
%define tde_libdir %{_prefix}/%{_lib}
%define tde_tdeappdir %{tde_datadir}/applications/kde
%define tde_tdedocdir %{tde_docdir}/kde
%define tde_tdeincludedir %{tde_includedir}/kde
%define tde_tdelibdir %{tde_libdir}/trinity
%define _docdir %{tde_docdir}
Name: trinity-tdegraphics Name: trinity-tdegraphics
Version: 3.5.13 Version: 3.5.13
Release: 5%{?dist}%{_variant} Release: 6%{?dist}%{_variant}
License: GPL License: GPL
Summary: Trinity Desktop Environment - Graphics Applications Summary: Trinity Desktop Environment - Graphics Applications
@ -46,6 +53,10 @@ Patch5: kdegraphics-3.5.13-fix_gcc47_compilation.patch
Patch6: kdegraphics-3.5.13-fix_poppler_support.patch Patch6: kdegraphics-3.5.13-fix_poppler_support.patch
# [tdegraphics] Fix corrupt image file. [Commit #d655a9f8] # [tdegraphics] Fix corrupt image file. [Commit #d655a9f8]
Patch7: kdegraphics-3.5.13-fix_corrupt_image_file.patch Patch7: kdegraphics-3.5.13-fix_corrupt_image_file.patch
# [tdegraphics] Add poppler-tqt.pc file [Commit #b2d01d00]
Patch8: kdegraphics-3.5.13-add_poppler_tqt_pc.patch
# [tdegraphics] Fix poppler include directory location
Patch9: kdegraphics-3.5.13-fix_poppler_include_dir.patch
BuildRequires: cmake >= 2.8 BuildRequires: cmake >= 2.8
BuildRequires: tqtinterface-devel BuildRequires: tqtinterface-devel
@ -58,43 +69,65 @@ BuildRequires: libtiff-devel
BuildRequires: libungif-devel BuildRequires: libungif-devel
BuildRequires: automake libtool BuildRequires: automake libtool
BuildRequires: gphoto2-devel BuildRequires: gphoto2-devel
BuildRequires: sane-backends-devel
BuildRequires: libusb-devel BuildRequires: libusb-devel
BuildRequires: t1lib-devel
BuildRequires: libdrm-devel BuildRequires: libdrm-devel
BuildRequires: pcre-devel
%if 0%{?mgaversion}
BuildRequires: %{_lib}sane1-devel
BuildRequires: %{_lib}t1lib-devel
BuildRequires: %{_lib}paper-devel
# kuickshow
BuildRequires: %{_lib}imlib-devel
# kpovmodeler
BuildRequires: %{_lib}xi-devel
# kgamma
BuildRequires: %{_lib}xxf86vm-devel
# ksvg
BuildRequires: %{_lib}xmu6-devel
# kpovmodeler
BuildRequires: %{_lib}mesagl1-devel
BuildRequires: %{_lib}mesaglu1-devel
%else
BuildRequires: sane-backends-devel
BuildRequires: t1lib-devel
BuildRequires: libpaper-devel
# kuickshow
BuildRequires: imlib-devel
# kpovmodeler
BuildRequires: libXi-devel
# kgamma # kgamma
BuildRequires: libXxf86vm-devel BuildRequires: libXxf86vm-devel
# ksvg
BuildRequires: libXmu-devel
# kpovmodeler
BuildRequires: libGL-devel
BuildRequires: libGLU-devel
%endif
#kfile-plugin #kfile-plugin
BuildRequires: OpenEXR-devel BuildRequires: OpenEXR-devel
# kpdf # kpdf
BuildRequires: freetype-devel BuildRequires: freetype-devel
%if 0%{?rhel} >=6 || 0%{?fedora} >= 15 %if 0%{?rhel} >=6 || 0%{?fedora} >= 15 || 0%{?mgaversion}
BuildRequires: poppler-devel >= 0.12 BuildRequires: poppler-devel >= 0.12
BuildRequires: poppler-qt-devel >= 0.12 #BuildRequires: poppler-qt-devel >= 0.12
%else %else
BuildRequires: trinity-poppler-devel # On RHEL 5, the distro-provided poppler is too old. We built a newer one.
BuildRequires: trinity-poppler-qt3-devel >= 0.12 BuildRequires: trinity-poppler-devel
BuildRequires: trinity-poppler-qt3-devel >= 0.12
%endif %endif
BuildRequires: libpaper-devel
# ksvg # ksvg
BuildRequires: fontconfig-devel BuildRequires: fontconfig-devel
BuildRequires: lcms-devel BuildRequires: lcms-devel
BuildRequires: libart_lgpl-devel BuildRequires: libart_lgpl-devel
BuildRequires: libXmu-devel
# kpovmodeler
BuildRequires: libGL-devel libGLU-devel libXi-devel
# kuickshow # kuickshow
BuildRequires: imlib-devel
BuildRequires: fribidi-devel BuildRequires: fribidi-devel
#Requires: tqtinterface
#Requires: trinity-arts
#Requires: trinity-kdelibs
Obsoletes: trinity-kdegraphics < %{version}-%{release} Obsoletes: trinity-kdegraphics < %{version}-%{release}
Provides: trinity-kdegraphics = %{version}-%{release} Provides: trinity-kdegraphics = %{version}-%{release}
@ -156,31 +189,31 @@ to allow access to your camera's pictures with the URL camera:/
%post -n trinity-kamera %post -n trinity-kamera
for f in crystalsvg hicolor ; do for f in crystalsvg hicolor ; do
touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||: touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||: gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
done done
update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%postun -n trinity-kamera %postun -n trinity-kamera
for f in crystalsvg hicolor ; do for f in crystalsvg hicolor ; do
touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||: touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||: gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
done done
update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%files -n trinity-kamera %files -n trinity-kamera
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{tde_libdir}/kcm_kamera.la %{tde_tdelibdir}/kcm_kamera.la
%{tde_libdir}/kcm_kamera.so %{tde_tdelibdir}/kcm_kamera.so
%{tde_libdir}/kio_kamera.la %{tde_tdelibdir}/kio_kamera.la
%{tde_libdir}/kio_kamera.so %{tde_tdelibdir}/kio_kamera.so
%{tde_appdir}/kamera.desktop %{tde_tdeappdir}/kamera.desktop
%{_datadir}/icons/crystalsvg/*/actions/camera_test.png %{tde_datadir}/icons/crystalsvg/*/actions/camera_test.png
%{_datadir}/icons/crystalsvg/*/apps/camera.png %{tde_datadir}/icons/crystalsvg/*/apps/camera.png
%{_datadir}/icons/crystalsvg/*/devices/camera.png %{tde_datadir}/icons/crystalsvg/*/devices/camera.png
%{_datadir}/icons/crystalsvg/*/filesystems/camera.png %{tde_datadir}/icons/crystalsvg/*/filesystems/camera.png
%{_datadir}/services/camera.protocol %{tde_datadir}/services/camera.protocol
%{tde_docdir}/HTML/en/kamera/ %{tde_tdedocdir}/HTML/en/kamera/
########## ##########
@ -194,14 +227,14 @@ picker.
%files -n trinity-kcoloredit %files -n trinity-kcoloredit
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{_bindir}/kcolorchooser %{tde_bindir}/kcolorchooser
%{_bindir}/kcoloredit %{tde_bindir}/kcoloredit
%{tde_appdir}/kcolorchooser.desktop %{tde_tdeappdir}/kcolorchooser.desktop
%{tde_appdir}/kcoloredit.desktop %{tde_tdeappdir}/kcoloredit.desktop
%{_datadir}/apps/kcoloredit/kcoloreditui.rc %{tde_datadir}/apps/kcoloredit/kcoloreditui.rc
%{_datadir}/icons/hicolor/*/apps/kcolorchooser.png %{tde_datadir}/icons/hicolor/*/apps/kcolorchooser.png
%{_datadir}/icons/hicolor/*/apps/kcoloredit.png %{tde_datadir}/icons/hicolor/*/apps/kcoloredit.png
%{tde_docdir}/HTML/en/kcoloredit/ %{tde_tdedocdir}/HTML/en/kcoloredit/
########## ##########
@ -215,63 +248,63 @@ tags, etc. all from within the file manager).
%files kfile-plugins %files kfile-plugins
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{tde_libdir}/gsthumbnail.la %{tde_tdelibdir}/gsthumbnail.la
%{tde_libdir}/gsthumbnail.so %{tde_tdelibdir}/gsthumbnail.so
%{tde_libdir}/kfile_bmp.la %{tde_tdelibdir}/kfile_bmp.la
%{tde_libdir}/kfile_bmp.so %{tde_tdelibdir}/kfile_bmp.so
%{tde_libdir}/kfile_dds.la %{tde_tdelibdir}/kfile_dds.la
%{tde_libdir}/kfile_dds.so %{tde_tdelibdir}/kfile_dds.so
%{tde_libdir}/kfile_dvi.la %{tde_tdelibdir}/kfile_dvi.la
%{tde_libdir}/kfile_dvi.so %{tde_tdelibdir}/kfile_dvi.so
%{tde_libdir}/kfile_exr.la %{tde_tdelibdir}/kfile_exr.la
%{tde_libdir}/kfile_exr.so %{tde_tdelibdir}/kfile_exr.so
%{tde_libdir}/kfile_gif.la %{tde_tdelibdir}/kfile_gif.la
%{tde_libdir}/kfile_gif.so %{tde_tdelibdir}/kfile_gif.so
%{tde_libdir}/kfile_ico.la %{tde_tdelibdir}/kfile_ico.la
%{tde_libdir}/kfile_ico.so %{tde_tdelibdir}/kfile_ico.so
%{tde_libdir}/kfile_jpeg.la %{tde_tdelibdir}/kfile_jpeg.la
%{tde_libdir}/kfile_jpeg.so %{tde_tdelibdir}/kfile_jpeg.so
%{tde_libdir}/kfile_pcx.la %{tde_tdelibdir}/kfile_pcx.la
%{tde_libdir}/kfile_pcx.so %{tde_tdelibdir}/kfile_pcx.so
%{tde_libdir}/kfile_pdf.la %{tde_tdelibdir}/kfile_pdf.la
%{tde_libdir}/kfile_pdf.so %{tde_tdelibdir}/kfile_pdf.so
%{tde_libdir}/kfile_png.la %{tde_tdelibdir}/kfile_png.la
%{tde_libdir}/kfile_png.so %{tde_tdelibdir}/kfile_png.so
%{tde_libdir}/kfile_pnm.la %{tde_tdelibdir}/kfile_pnm.la
%{tde_libdir}/kfile_pnm.so %{tde_tdelibdir}/kfile_pnm.so
%{tde_libdir}/kfile_ps.la %{tde_tdelibdir}/kfile_ps.la
%{tde_libdir}/kfile_ps.so %{tde_tdelibdir}/kfile_ps.so
%{tde_libdir}/kfile_raw.la %{tde_tdelibdir}/kfile_raw.la
%{tde_libdir}/kfile_raw.so %{tde_tdelibdir}/kfile_raw.so
%{tde_libdir}/kfile_rgb.la %{tde_tdelibdir}/kfile_rgb.la
%{tde_libdir}/kfile_rgb.so %{tde_tdelibdir}/kfile_rgb.so
%{tde_libdir}/kfile_tga.la %{tde_tdelibdir}/kfile_tga.la
%{tde_libdir}/kfile_tga.so %{tde_tdelibdir}/kfile_tga.so
%{tde_libdir}/kfile_tiff.la %{tde_tdelibdir}/kfile_tiff.la
%{tde_libdir}/kfile_tiff.so %{tde_tdelibdir}/kfile_tiff.so
%{tde_libdir}/kfile_xbm.la %{tde_tdelibdir}/kfile_xbm.la
%{tde_libdir}/kfile_xbm.so %{tde_tdelibdir}/kfile_xbm.so
%{tde_libdir}/kfile_xpm.la %{tde_tdelibdir}/kfile_xpm.la
%{tde_libdir}/kfile_xpm.so %{tde_tdelibdir}/kfile_xpm.so
%{_datadir}/services/gsthumbnail.desktop %{tde_datadir}/services/gsthumbnail.desktop
%{_datadir}/services/kfile_bmp.desktop %{tde_datadir}/services/kfile_bmp.desktop
%{_datadir}/services/kfile_dds.desktop %{tde_datadir}/services/kfile_dds.desktop
%{_datadir}/services/kfile_dvi.desktop %{tde_datadir}/services/kfile_dvi.desktop
%{_datadir}/services/kfile_exr.desktop %{tde_datadir}/services/kfile_exr.desktop
%{_datadir}/services/kfile_gif.desktop %{tde_datadir}/services/kfile_gif.desktop
%{_datadir}/services/kfile_ico.desktop %{tde_datadir}/services/kfile_ico.desktop
%{_datadir}/services/kfile_jpeg.desktop %{tde_datadir}/services/kfile_jpeg.desktop
%{_datadir}/services/kfile_pcx.desktop %{tde_datadir}/services/kfile_pcx.desktop
%{_datadir}/services/kfile_pdf.desktop %{tde_datadir}/services/kfile_pdf.desktop
%{_datadir}/services/kfile_png.desktop %{tde_datadir}/services/kfile_png.desktop
%{_datadir}/services/kfile_pnm.desktop %{tde_datadir}/services/kfile_pnm.desktop
%{_datadir}/services/kfile_ps.desktop %{tde_datadir}/services/kfile_ps.desktop
%{_datadir}/services/kfile_raw.desktop %{tde_datadir}/services/kfile_raw.desktop
%{_datadir}/services/kfile_rgb.desktop %{tde_datadir}/services/kfile_rgb.desktop
%{_datadir}/services/kfile_tga.desktop %{tde_datadir}/services/kfile_tga.desktop
%{_datadir}/services/kfile_tiff.desktop %{tde_datadir}/services/kfile_tiff.desktop
%{_datadir}/services/kfile_xbm.desktop %{tde_datadir}/services/kfile_xbm.desktop
%{_datadir}/services/kfile_xpm.desktop %{tde_datadir}/services/kfile_xpm.desktop
########## ##########
@ -284,16 +317,16 @@ This program and KPart allow the user to display *.DVI files from TeX.
%files -n trinity-kdvi %files -n trinity-kdvi
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{_bindir}/kdvi %{tde_bindir}/kdvi
%{tde_libdir}/kdvipart.la %{tde_tdelibdir}/kdvipart.la
%{tde_libdir}/kdvipart.so %{tde_tdelibdir}/kdvipart.so
%{tde_appdir}/kdvi.desktop %{tde_tdeappdir}/kdvi.desktop
%{_datadir}/apps/kdvi/ %{tde_datadir}/apps/kdvi/
%{_datadir}/config.kcfg/kdvi.kcfg %{tde_datadir}/config.kcfg/kdvi.kcfg
%{_datadir}/icons/hicolor/*/apps/kdvi.png %{tde_datadir}/icons/hicolor/*/apps/kdvi.png
%{_datadir}/icons/hicolor/scalable/apps/kdvi.svgz %{tde_datadir}/icons/hicolor/scalable/apps/kdvi.svgz
%{_datadir}/services/kdvimultipage.desktop %{tde_datadir}/services/kdvimultipage.desktop
%{tde_docdir}/HTML/en/kdvi/ %{tde_tdedocdir}/HTML/en/kdvi/
########## ##########
@ -309,11 +342,11 @@ A fax viewer for Trinity, supporting the display of raw and tiffed fax images
%files -n trinity-kfax %files -n trinity-kfax
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc rpmdocs/kfax/ %doc rpmdocs/kfax/
%{_bindir}/kfax %{tde_bindir}/kfax
%{tde_appdir}/kfax.desktop %{tde_tdeappdir}/kfax.desktop
%{_datadir}/apps/kfax/ %{tde_datadir}/apps/kfax/
%{_datadir}/icons/hicolor/??x??/apps/kfax.png %{tde_datadir}/icons/hicolor/??x??/apps/kfax.png
%{_datadir}/icons/hicolor/scalable/apps/kfax.svgz %{tde_datadir}/icons/hicolor/scalable/apps/kfax.svgz
########## ##########
@ -330,17 +363,17 @@ kfax application once it reproduces all of kfax's features.
%files -n trinity-kfaxview %files -n trinity-kfaxview
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{_bindir}/kfaxview %{tde_bindir}/kfaxview
%{_libdir}/libkfaximage.so.* %{tde_libdir}/libkfaximage.so.*
%{_libdir}/libkfaximage.so %{tde_libdir}/libkfaximage.so
%{_libdir}/libkfaximage.la %{tde_libdir}/libkfaximage.la
%{tde_libdir}/kfaxviewpart.* %{tde_tdelibdir}/kfaxviewpart.*
%{tde_appdir}/kfaxview.desktop %{tde_tdeappdir}/kfaxview.desktop
%{_datadir}/apps/kfaxview/ %{tde_datadir}/apps/kfaxview/
%{_datadir}/icons/hicolor/??x??/apps/kfaxview.png %{tde_datadir}/icons/hicolor/??x??/apps/kfaxview.png
%{_datadir}/icons/hicolor/scalable/apps/kfaxview.svgz %{tde_datadir}/icons/hicolor/scalable/apps/kfaxview.svgz
%{_datadir}/services/kfaxmultipage.desktop %{tde_datadir}/services/kfaxmultipage.desktop
%{_datadir}/services/kfaxmultipage_tiff.desktop %{tde_datadir}/services/kfaxmultipage_tiff.desktop
########## ##########
@ -357,13 +390,13 @@ Homepage: http://kgamma.berlios.de/index2.php
%files -n trinity-kgamma %files -n trinity-kgamma
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{_bindir}/xf86gammacfg %{tde_bindir}/xf86gammacfg
%{tde_libdir}/kcm_kgamma.la %{tde_tdelibdir}/kcm_kgamma.la
%{tde_libdir}/kcm_kgamma.so %{tde_tdelibdir}/kcm_kgamma.so
%{tde_appdir}/kgamma.desktop %{tde_tdeappdir}/kgamma.desktop
%{_datadir}/apps/kgamma/ %{tde_datadir}/apps/kgamma/
%{_datadir}/icons/hicolor/*/apps/kgamma.png %{tde_datadir}/icons/hicolor/*/apps/kgamma.png
%{tde_docdir}/HTML/en/kgamma/ %{tde_tdedocdir}/HTML/en/kgamma/
########## ##########
@ -382,18 +415,18 @@ online.
%files -n trinity-kghostview %files -n trinity-kghostview
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{_bindir}/kghostview %{tde_bindir}/kghostview
%{tde_libdir}/libkghostviewpart.la %{tde_tdelibdir}/libkghostviewpart.la
%{tde_libdir}/libkghostviewpart.so %{tde_tdelibdir}/libkghostviewpart.so
%{_libdir}/libkghostviewlib.so.* %{tde_libdir}/libkghostviewlib.so.*
%{tde_appdir}/kghostview.desktop %{tde_tdeappdir}/kghostview.desktop
%{_datadir}/apps/kconf_update/kghostview.upd %{tde_datadir}/apps/kconf_update/kghostview.upd
%{_datadir}/apps/kconf_update/update-to-xt-names.pl %{tde_datadir}/apps/kconf_update/update-to-xt-names.pl
%{_datadir}/apps/kghostview/ %{tde_datadir}/apps/kghostview/
%{_datadir}/config.kcfg/kghostview.kcfg %{tde_datadir}/config.kcfg/kghostview.kcfg
%{_datadir}/icons/hicolor/*/apps/kghostview.png %{tde_datadir}/icons/hicolor/*/apps/kghostview.png
%{_datadir}/services/kghostview_part.desktop %{tde_datadir}/services/kghostview_part.desktop
%{tde_docdir}/HTML/en/kghostview/ %{tde_tdedocdir}/HTML/en/kghostview/
########## ##########
@ -406,11 +439,11 @@ KIconedit allows you easily to create and edit icons.
%files -n trinity-kiconedit %files -n trinity-kiconedit
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{_bindir}/kiconedit %{tde_bindir}/kiconedit
%{tde_appdir}/kiconedit.desktop %{tde_tdeappdir}/kiconedit.desktop
%{_datadir}/apps/kiconedit/ %{tde_datadir}/apps/kiconedit/
%{_datadir}/icons/hicolor/*/apps/kiconedit.png %{tde_datadir}/icons/hicolor/*/apps/kiconedit.png
%{tde_docdir}/HTML/en/kiconedit/ %{tde_tdedocdir}/HTML/en/kiconedit/
########## ##########
@ -426,24 +459,24 @@ MRML server.
%files -n trinity-kmrml %files -n trinity-kmrml
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{_bindir}/mrmlsearch %{tde_bindir}/mrmlsearch
%{tde_libdir}/kcm_kmrml.la %{tde_tdelibdir}/kcm_kmrml.la
%{tde_libdir}/kcm_kmrml.so %{tde_tdelibdir}/kcm_kmrml.so
%{tde_libdir}/kded_daemonwatcher.la %{tde_tdelibdir}/kded_daemonwatcher.la
%{tde_libdir}/kded_daemonwatcher.so %{tde_tdelibdir}/kded_daemonwatcher.so
%{tde_libdir}/kio_mrml.la %{tde_tdelibdir}/kio_mrml.la
%{tde_libdir}/kio_mrml.so %{tde_tdelibdir}/kio_mrml.so
%{tde_libdir}/libkmrmlpart.la %{tde_tdelibdir}/libkmrmlpart.la
%{tde_libdir}/libkmrmlpart.so %{tde_tdelibdir}/libkmrmlpart.so
%{tde_libdir}/mrmlsearch.la %{tde_tdelibdir}/mrmlsearch.la
%{tde_libdir}/mrmlsearch.so %{tde_tdelibdir}/mrmlsearch.so
%{_libdir}/lib[kt]deinit_mrmlsearch.so %{tde_libdir}/lib[kt]deinit_mrmlsearch.so
%{tde_appdir}/kcmkmrml.desktop %{tde_tdeappdir}/kcmkmrml.desktop
%{_datadir}/apps/konqueror/servicemenus/mrml-servicemenu.desktop %{tde_datadir}/apps/konqueror/servicemenus/mrml-servicemenu.desktop
%{_datadir}/mimelnk/text/mrml.desktop %{tde_datadir}/mimelnk/text/mrml.desktop
%{_datadir}/services/kded/daemonwatcher.desktop %{tde_datadir}/services/kded/daemonwatcher.desktop
%{_datadir}/services/mrml.protocol %{tde_datadir}/services/mrml.protocol
%{_datadir}/services/mrml_part.desktop %{tde_datadir}/services/mrml_part.desktop
########## ##########
@ -468,12 +501,12 @@ Homepage: http://kolourpaint.sourceforge.net
%files -n trinity-kolourpaint %files -n trinity-kolourpaint
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{_bindir}/kolourpaint %{tde_bindir}/kolourpaint
%{tde_appdir}/kolourpaint.desktop %{tde_tdeappdir}/kolourpaint.desktop
%{_datadir}/apps/kolourpaint/ %{tde_datadir}/apps/kolourpaint/
%{_datadir}/icons/hicolor/*/apps/kolourpaint.png %{tde_datadir}/icons/hicolor/*/apps/kolourpaint.png
%{_datadir}/icons/hicolor/scalable/apps/kolourpaint.svgz %{tde_datadir}/icons/hicolor/scalable/apps/kolourpaint.svgz
%{tde_docdir}/HTML/en/kolourpaint/ %{tde_tdedocdir}/HTML/en/kolourpaint/
########## ##########
@ -498,11 +531,11 @@ Homepage: http://kooka.kde.org/
%files -n trinity-kooka %files -n trinity-kooka
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{_datadir}/config/kookarc %{tde_datadir}/config/kookarc
%{_bindir}/kooka %{tde_bindir}/kooka
%{tde_appdir}/kooka.desktop %{tde_tdeappdir}/kooka.desktop
%{_datadir}/apps/kooka/ %{tde_datadir}/apps/kooka/
%{tde_docdir}/HTML/en/kooka/ %{tde_tdedocdir}/HTML/en/kooka/
########## ##########
@ -518,17 +551,17 @@ application.
%files -n trinity-kpdf %files -n trinity-kpdf
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{_bindir}/kpdf %{tde_bindir}/kpdf
%{tde_libdir}/libkpdfpart.la %{tde_tdelibdir}/libkpdfpart.la
%{tde_libdir}/libkpdfpart.so %{tde_tdelibdir}/libkpdfpart.so
%{tde_appdir}/kpdf.desktop %{tde_tdeappdir}/kpdf.desktop
%{_datadir}/apps/kpdf/shell.rc %{tde_datadir}/apps/kpdf/shell.rc
%{_datadir}/apps/kpdfpart/part.rc %{tde_datadir}/apps/kpdfpart/part.rc
%{_datadir}/config.kcfg/kpdf.kcfg %{tde_datadir}/config.kcfg/kpdf.kcfg
%{tde_docdir}/HTML/en/kpdf/ %{tde_tdedocdir}/HTML/en/kpdf/
%{_datadir}/icons/hicolor/*/apps/kpdf.png %{tde_datadir}/icons/hicolor/*/apps/kpdf.png
%{_datadir}/icons/hicolor/scalable/apps/kpdf.svgz %{tde_datadir}/icons/hicolor/scalable/apps/kpdf.svgz
%{_datadir}/services/kpdf_part.desktop %{tde_datadir}/services/kpdf_part.desktop
########## ##########
@ -555,15 +588,15 @@ Homepage: http://www.kpovmodeler.org
%files -n trinity-kpovmodeler %files -n trinity-kpovmodeler
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc rpmdocs/kpovmodeler/ %doc rpmdocs/kpovmodeler/
%{_bindir}/kpovmodeler %{tde_bindir}/kpovmodeler
%{_libdir}/libkpovmodeler.so.* %{tde_libdir}/libkpovmodeler.so.*
%{_libdir}/libkpovmodeler.la %{tde_libdir}/libkpovmodeler.la
%{tde_libdir}/libkpovmodelerpart.* %{tde_tdelibdir}/libkpovmodelerpart.*
%{tde_appdir}/kpovmodeler.desktop %{tde_tdeappdir}/kpovmodeler.desktop
%{_datadir}/apps/kpovmodeler/ %{tde_datadir}/apps/kpovmodeler/
%{_datadir}/icons/crystalsvg/*/mimetypes/kpovmodeler_doc.* %{tde_datadir}/icons/crystalsvg/*/mimetypes/kpovmodeler_doc.*
%{_datadir}/icons/hicolor/*/apps/kpovmodeler.* %{tde_datadir}/icons/hicolor/*/apps/kpovmodeler.*
%doc %{tde_docdir}/HTML/en/kpovmodeler/ %doc %{tde_tdedocdir}/HTML/en/kpovmodeler/
########## ##########
@ -576,12 +609,12 @@ Kruler is a screen ruler (using pixels) and color measurement tool for KDE.
%files -n trinity-kruler %files -n trinity-kruler
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{_bindir}/kruler %{tde_bindir}/kruler
%{tde_appdir}/kruler.desktop %{tde_tdeappdir}/kruler.desktop
%{_datadir}/applnk/Graphics/kruler.desktop %{tde_datadir}/applnk/Graphics/kruler.desktop
%{_datadir}/apps/kruler/ %{tde_datadir}/apps/kruler/
%{_datadir}/icons/hicolor/*/apps/kruler.png %{tde_datadir}/icons/hicolor/*/apps/kruler.png
%{tde_docdir}/HTML/en/kruler/ %{tde_tdedocdir}/HTML/en/kruler/
########## ##########
@ -596,11 +629,11 @@ The images can then be saved in a variety of formats.
%files -n trinity-ksnapshot %files -n trinity-ksnapshot
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{_bindir}/ksnapshot %{tde_bindir}/ksnapshot
%{tde_appdir}/ksnapshot.desktop %{tde_tdeappdir}/ksnapshot.desktop
%{tde_docdir}/HTML/en/ksnapshot/ %{tde_tdedocdir}/HTML/en/ksnapshot/
%{_datadir}/icons/hicolor/*/apps/ksnapshot.png %{tde_datadir}/icons/hicolor/*/apps/ksnapshot.png
%{_datadir}/icons/hicolor/scalable/apps/ksnapshot.svgz %{tde_datadir}/icons/hicolor/scalable/apps/ksnapshot.svgz
########## ##########
@ -615,23 +648,23 @@ application.
%files -n trinity-ksvg %files -n trinity-ksvg
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{_bindir}/printnodetest %{tde_bindir}/printnodetest
%{_bindir}/svgdisplay %{tde_bindir}/svgdisplay
%{tde_libdir}/libksvgplugin.la %{tde_tdelibdir}/libksvgplugin.la
%{tde_libdir}/libksvgplugin.so %{tde_tdelibdir}/libksvgplugin.so
%{tde_libdir}/libksvgrendererlibart.la %{tde_tdelibdir}/libksvgrendererlibart.la
%{tde_libdir}/libksvgrendererlibart.so %{tde_tdelibdir}/libksvgrendererlibart.so
%{tde_libdir}/svgthumbnail.la %{tde_tdelibdir}/svgthumbnail.la
%{tde_libdir}/svgthumbnail.so %{tde_tdelibdir}/svgthumbnail.so
%{_libdir}/libksvg.so.0 %{tde_libdir}/libksvg.so.0
%{_libdir}/libksvg.so.0.0.1 %{tde_libdir}/libksvg.so.0.0.1
%{_libdir}/libtext2path.so.0 %{tde_libdir}/libtext2path.so.0
%{_libdir}/libtext2path.so.0.0.0 %{tde_libdir}/libtext2path.so.0.0.0
%{_datadir}/apps/ksvg/ksvgplugin.rc %{tde_datadir}/apps/ksvg/ksvgplugin.rc
%{_datadir}/services/ksvglibartcanvas.desktop %{tde_datadir}/services/ksvglibartcanvas.desktop
%{_datadir}/services/ksvgplugin.desktop %{tde_datadir}/services/ksvgplugin.desktop
%{_datadir}/services/svgthumbnail.desktop %{tde_datadir}/services/svgthumbnail.desktop
%{_datadir}/servicetypes/ksvgrenderer.desktop %{tde_datadir}/servicetypes/ksvgrenderer.desktop
########## ##########
@ -646,52 +679,52 @@ as well.
%files -n trinity-kview %files -n trinity-kview
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{_bindir}/kview %{tde_bindir}/kview
%{tde_libdir}/kcm_kviewcanvasconfig.la %{tde_tdelibdir}/kcm_kviewcanvasconfig.la
%{tde_libdir}/kcm_kviewcanvasconfig.so %{tde_tdelibdir}/kcm_kviewcanvasconfig.so
%{tde_libdir}/kcm_kviewgeneralconfig.la %{tde_tdelibdir}/kcm_kviewgeneralconfig.la
%{tde_libdir}/kcm_kviewgeneralconfig.so %{tde_tdelibdir}/kcm_kviewgeneralconfig.so
%{tde_libdir}/kcm_kviewpluginsconfig.la %{tde_tdelibdir}/kcm_kviewpluginsconfig.la
%{tde_libdir}/kcm_kviewpluginsconfig.so %{tde_tdelibdir}/kcm_kviewpluginsconfig.so
%{tde_libdir}/kcm_kviewpresenterconfig.la %{tde_tdelibdir}/kcm_kviewpresenterconfig.la
%{tde_libdir}/kcm_kviewpresenterconfig.so %{tde_tdelibdir}/kcm_kviewpresenterconfig.so
%{tde_libdir}/kcm_kviewviewerpluginsconfig.la %{tde_tdelibdir}/kcm_kviewviewerpluginsconfig.la
%{tde_libdir}/kcm_kviewviewerpluginsconfig.so %{tde_tdelibdir}/kcm_kviewviewerpluginsconfig.so
%{tde_libdir}/kview.la %{tde_tdelibdir}/kview.la
%{tde_libdir}/kview.so %{tde_tdelibdir}/kview.so
%{tde_libdir}/kview_browserplugin.la %{tde_tdelibdir}/kview_browserplugin.la
%{tde_libdir}/kview_browserplugin.so %{tde_tdelibdir}/kview_browserplugin.so
%{tde_libdir}/kview_effectsplugin.la %{tde_tdelibdir}/kview_effectsplugin.la
%{tde_libdir}/kview_effectsplugin.so %{tde_tdelibdir}/kview_effectsplugin.so
%{tde_libdir}/kview_presenterplugin.la %{tde_tdelibdir}/kview_presenterplugin.la
%{tde_libdir}/kview_presenterplugin.so %{tde_tdelibdir}/kview_presenterplugin.so
%{tde_libdir}/kview_scannerplugin.la %{tde_tdelibdir}/kview_scannerplugin.la
%{tde_libdir}/kview_scannerplugin.so %{tde_tdelibdir}/kview_scannerplugin.so
%{tde_libdir}/libkviewcanvas.la %{tde_tdelibdir}/libkviewcanvas.la
%{tde_libdir}/libkviewcanvas.so %{tde_tdelibdir}/libkviewcanvas.so
%{tde_libdir}/libkviewviewer.la %{tde_tdelibdir}/libkviewviewer.la
%{tde_libdir}/libkviewviewer.so %{tde_tdelibdir}/libkviewviewer.so
%{_libdir}/lib[kt]deinit_kview.so %{tde_libdir}/lib[kt]deinit_kview.so
%{_libdir}/libkimageviewer.so.* %{tde_libdir}/libkimageviewer.so.*
%{tde_libdir}/libphotobook.la %{tde_tdelibdir}/libphotobook.la
%{tde_libdir}/libphotobook.so %{tde_tdelibdir}/libphotobook.so
%{tde_appdir}/kview.desktop %{tde_tdeappdir}/kview.desktop
%{_datadir}/apps/kview/ %{tde_datadir}/apps/kview/
%{_datadir}/apps/kviewviewer/ %{tde_datadir}/apps/kviewviewer/
%{_datadir}/apps/photobook/photobookui.rc %{tde_datadir}/apps/photobook/photobookui.rc
%{_datadir}/icons/crystalsvg/*/apps/photobook.png %{tde_datadir}/icons/crystalsvg/*/apps/photobook.png
%{_datadir}/icons/hicolor/*/apps/kview.png %{tde_datadir}/icons/hicolor/*/apps/kview.png
%{_datadir}/services/kconfiguredialog/kviewcanvasconfig.desktop %{tde_datadir}/services/kconfiguredialog/kviewcanvasconfig.desktop
%{_datadir}/services/kconfiguredialog/kviewgeneralconfig.desktop %{tde_datadir}/services/kconfiguredialog/kviewgeneralconfig.desktop
%{_datadir}/services/kconfiguredialog/kviewpluginsconfig.desktop %{tde_datadir}/services/kconfiguredialog/kviewpluginsconfig.desktop
%{_datadir}/services/kconfiguredialog/kviewpresenterconfig.desktop %{tde_datadir}/services/kconfiguredialog/kviewpresenterconfig.desktop
%{_datadir}/services/kconfiguredialog/kviewviewerpluginsconfig.desktop %{tde_datadir}/services/kconfiguredialog/kviewviewerpluginsconfig.desktop
%{_datadir}/services/kviewcanvas.desktop %{tde_datadir}/services/kviewcanvas.desktop
%{_datadir}/services/kviewviewer.desktop %{tde_datadir}/services/kviewviewer.desktop
%{_datadir}/services/photobook.desktop %{tde_datadir}/services/photobook.desktop
%{_datadir}/servicetypes/kimageviewer.desktop %{tde_datadir}/servicetypes/kimageviewer.desktop
%{_datadir}/servicetypes/kimageviewercanvas.desktop %{tde_datadir}/servicetypes/kimageviewercanvas.desktop
%{tde_docdir}/HTML/en/kview/ %{tde_tdedocdir}/HTML/en/kview/
########## ##########
@ -709,25 +742,25 @@ DjVu images.
%files -n trinity-kviewshell %files -n trinity-kviewshell
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{_bindir}/kviewshell %{tde_bindir}/kviewshell
%{_libdir}/libdjvu.la %{tde_libdir}/libdjvu.la
%{_libdir}/libdjvu.so %{tde_libdir}/libdjvu.so
%{tde_libdir}/djvuviewpart.so %{tde_tdelibdir}/djvuviewpart.so
%{tde_libdir}/djvuviewpart.la %{tde_tdelibdir}/djvuviewpart.la
%{tde_libdir}/emptymultipagepart.la %{tde_tdelibdir}/emptymultipagepart.la
%{tde_libdir}/emptymultipagepart.so %{tde_tdelibdir}/emptymultipagepart.so
%{tde_libdir}/kviewerpart.la %{tde_tdelibdir}/kviewerpart.la
%{tde_libdir}/kviewerpart.so %{tde_tdelibdir}/kviewerpart.so
%{_libdir}/libkmultipage.so.* %{tde_libdir}/libkmultipage.so.*
%{_datadir}/apps/djvumultipage.rc %{tde_datadir}/apps/djvumultipage.rc
%{_datadir}/apps/kviewerpart/ %{tde_datadir}/apps/kviewerpart/
%{_datadir}/apps/kviewshell/kviewshell.rc %{tde_datadir}/apps/kviewshell/kviewshell.rc
%{_datadir}/config.kcfg/djvumultipage.kcfg %{tde_datadir}/config.kcfg/djvumultipage.kcfg
%{_datadir}/config.kcfg/kviewshell.kcfg %{tde_datadir}/config.kcfg/kviewshell.kcfg
%{_datadir}/icons/crystalsvg/*/apps/kviewshell.png %{tde_datadir}/icons/crystalsvg/*/apps/kviewshell.png
%{_datadir}/services/emptymultipage.desktop %{tde_datadir}/services/emptymultipage.desktop
%{_datadir}/services/djvumultipage.desktop %{tde_datadir}/services/djvumultipage.desktop
%{_datadir}/servicetypes/kmultipage.desktop %{tde_datadir}/servicetypes/kmultipage.desktop
########## ##########
@ -742,12 +775,12 @@ It provides an easy-to-use library, which allows you to access your scanner
%files -n trinity-libkscan %files -n trinity-libkscan
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{_libdir}/libkscan.so.* %{tde_libdir}/libkscan.so.*
%{_datadir}/icons/crystalsvg/16x16/actions/palette_color.png %{tde_datadir}/icons/crystalsvg/16x16/actions/palette_color.png
%{_datadir}/icons/crystalsvg/16x16/actions/palette_gray.png %{tde_datadir}/icons/crystalsvg/16x16/actions/palette_gray.png
%{_datadir}/icons/crystalsvg/16x16/actions/palette_halftone.png %{tde_datadir}/icons/crystalsvg/16x16/actions/palette_halftone.png
%{_datadir}/icons/crystalsvg/16x16/actions/palette_lineart.png %{tde_datadir}/icons/crystalsvg/16x16/actions/palette_lineart.png
%{_datadir}/services/scanservice.desktop %{tde_datadir}/services/scanservice.desktop
########## ##########
@ -760,8 +793,8 @@ This package contains development files for Trinity's scanner library.
%files -n trinity-libkscan-devel %files -n trinity-libkscan-devel
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{_libdir}/libkscan.la %{tde_libdir}/libkscan.la
%{_libdir}/libkscan.so %{tde_libdir}/libkscan.so
########## ##########
@ -775,7 +808,7 @@ This library is used by the Trinity graphics file plugins for PDF support.
%files libpoppler-tqt %files libpoppler-tqt
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{_libdir}/libpoppler-tqt.so.* %{tde_libdir}/libpoppler-tqt.so.*
########## ##########
@ -790,12 +823,12 @@ This package contains the development files needed to compile applications again
%files libpoppler-tqt-devel %files libpoppler-tqt-devel
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{tde_includedir}/poppler-link-qt3.h %{tde_tdeincludedir}/poppler-link-qt3.h
%{tde_includedir}/poppler-page-transition.h %{tde_tdeincludedir}/poppler-page-transition.h
%{tde_includedir}/poppler-qt.h %{tde_tdeincludedir}/poppler-qt.h
%{_libdir}/libpoppler-tqt.la %{tde_libdir}/libpoppler-tqt.la
%{_libdir}/libpoppler-tqt.so %{tde_libdir}/libpoppler-tqt.so
#%{_libdir}/pkgconfig/poppler-tqt.pc %{tde_libdir}/pkgconfig/poppler-tqt.pc
########## ##########
@ -814,42 +847,42 @@ Requires: %{name}-libpoppler-tqt-devel = %{version}-%{release}
%files devel %files devel
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{_includedir}/dom/ %{tde_tdeincludedir}/dom/
#%{_includedir}/kfaximage.h #%{tde_tdeincludedir}/kfaximage.h
%{_includedir}/kmultipageInterface.h %{tde_tdeincludedir}/kmultipageInterface.h
%{_includedir}/ksvg/ %{tde_tdeincludedir}/ksvg/
%{_includedir}/kviewshell/ %{tde_tdeincludedir}/kviewshell/
%{_includedir}/libtext2path-0.1/BezierPath.h %{tde_tdeincludedir}/libtext2path-0.1/BezierPath.h
%{_includedir}/libtext2path-0.1/Glyph.h %{tde_tdeincludedir}/libtext2path-0.1/Glyph.h
%{_includedir}/libtext2path-0.1/GlyphTracer.h %{tde_tdeincludedir}/libtext2path-0.1/GlyphTracer.h
%{_libdir}/lib[kt]deinit_kview.la %{tde_libdir}/lib[kt]deinit_kview.la
%{_libdir}/lib[kt]deinit_mrmlsearch.la %{tde_libdir}/lib[kt]deinit_mrmlsearch.la
%{_libdir}/libkghostviewlib.la %{tde_libdir}/libkghostviewlib.la
%{_libdir}/libkghostviewlib.so %{tde_libdir}/libkghostviewlib.so
%{_libdir}/libkimageviewer.la %{tde_libdir}/libkimageviewer.la
%{_libdir}/libkimageviewer.so %{tde_libdir}/libkimageviewer.so
%{_libdir}/libkmultipage.la %{tde_libdir}/libkmultipage.la
%{_libdir}/libkmultipage.so %{tde_libdir}/libkmultipage.so
%{_libdir}/libkpovmodeler.la %{tde_libdir}/libkpovmodeler.la
%{_libdir}/libkpovmodeler.so %{tde_libdir}/libkpovmodeler.so
%{_libdir}/libksvg.la %{tde_libdir}/libksvg.la
%{_libdir}/libksvg.so %{tde_libdir}/libksvg.so
%{_libdir}/libtext2path.la %{tde_libdir}/libtext2path.la
%{_libdir}/libtext2path.so %{tde_libdir}/libtext2path.so
%{_datadir}/cmake/* %{tde_datadir}/cmake/*
############ ############
# Excludes kuickshow (built separately) # Excludes kuickshow (built separately)
%exclude %{_bindir}/kuickshow %exclude %{tde_bindir}/kuickshow
%exclude %{tde_libdir}/kuickshow.la %exclude %{tde_tdelibdir}/kuickshow.la
%exclude %{tde_libdir}/kuickshow.so %exclude %{tde_tdelibdir}/kuickshow.so
%exclude %{_libdir}/lib[kt]deinit_kuickshow.la %exclude %{tde_libdir}/lib[kt]deinit_kuickshow.la
%exclude %{_libdir}/lib[kt]deinit_kuickshow.so %exclude %{tde_libdir}/lib[kt]deinit_kuickshow.so
%exclude %{tde_appdir}/kuickshow.desktop %exclude %{tde_tdeappdir}/kuickshow.desktop
%exclude %{_datadir}/apps/kuickshow/ %exclude %{tde_datadir}/apps/kuickshow/
%exclude %{_datadir}/icons/hicolor/*/apps/kuickshow.png %exclude %{tde_datadir}/icons/hicolor/*/apps/kuickshow.png
%exclude %{tde_docdir}/HTML/en/kuickshow/ %exclude %{tde_tdedocdir}/HTML/en/kuickshow/
########## ##########
@ -865,18 +898,25 @@ Requires: %{name}-libpoppler-tqt-devel = %{version}-%{release}
%patch5 -p1 -b .gcc47 %patch5 -p1 -b .gcc47
%patch6 -p1 -b .poppler %patch6 -p1 -b .poppler
%patch7 -p1 %patch7 -p1
%patch8 -p1
%patch9 -p1
%build %build
unset QTDIR || : ; . /etc/profile.d/qt.sh unset QTDIR || : ; . /etc/profile.d/qt.sh
export PATH="%{_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{_libdir}/pkgconfig" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
export CMAKE_INCLUDE_PATH="%{_includedir}:%{_includedir}/tqt" export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_includedir}/tqt"
export LD_LIBRARY_PATH="%{_libdir}" #export LD_LIBRARY_PATH="%{tde_libdir}"
%__mkdir build %{?!mgaversion:%__mkdir build; cd build}
cd build
%cmake \ %cmake \
-DBIN_INSTALL_DIR=%{tde_bindir} \
-DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-DLIB_INSTALL_DIR=%{tde_libdir} \
-DSHARE_INSTALL_PREFIX=%{tde_datadir} \
-DPKGCONFIG_INSTALL_DIR="%{tde_libdir}/pkgconfig" \
-DCMAKE_SKIP_RPATH="OFF" \
-DWITH_T1LIB=ON \ -DWITH_T1LIB=ON \
-DWITH_LIBPAPER=ON \ -DWITH_LIBPAPER=ON \
-DWITH_TIFF=ON \ -DWITH_TIFF=ON \
@ -889,12 +929,11 @@ cd build
%__make %{?_smp_mflags} %__make %{?_smp_mflags}
%install %install
export PATH="%{_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot} %__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot} -C build %__make install DESTDIR=%{buildroot} -C build
# locale's # locale's
%find_lang %{name} || touch %{name}.lang
HTML_DIR=$(kde-config --expandvars --install html) HTML_DIR=$(kde-config --expandvars --install html)
if [ -d %{buildroot}$HTML_DIR ]; then if [ -d %{buildroot}$HTML_DIR ]; then
for lang_dir in %{buildroot}$HTML_DIR/* ; do for lang_dir in %{buildroot}$HTML_DIR/* ; do
@ -932,6 +971,9 @@ rm -f %{buildroot}/libkpovmodeler.so
%changelog %changelog
* Wed Aug 01 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-6
- Add poppler-tqt.pc file [Commit #b2d01d00]
* Mon Jul 09 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-5 * Mon Jul 09 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-5
- Renames 'kdegraphics' to 'tdegraphics' - Renames 'kdegraphics' to 'tdegraphics'
- Split in several packages - Split in several packages

@ -0,0 +1,100 @@
commit 513ffc6edff67b5f7f121c3064b059ce82cbb842
Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: 1341187933 -0500
Add ability to set KLed off color
diff --git a/kdeui/kled.cpp b/kdeui/kled.cpp
index 3a3aa2a..dc245cd 100644
--- a/kdeui/kled.cpp
+++ b/kdeui/kled.cpp
@@ -536,6 +536,12 @@ KLed::color() const
return led_color;
}
+TQColor
+KLed::offColor() const
+{
+ return led_off_color;
+}
+
KLed::Look
KLed::look() const
{
@@ -581,6 +587,17 @@ KLed::setColor(const TQColor& col)
}
void
+KLed::setOffColor(const TQColor& col)
+{
+ if(led_off_color!=col) {
+ if(d->on_map) { delete d->on_map; d->on_map = 0; }
+ if(d->off_map) { delete d->off_map; d->off_map = 0; }
+ d->offcolor = col;
+ update();
+ }
+}
+
+void
KLed::setDarkFactor(int darkfactor)
{
if (d->dark_factor != darkfactor) {
diff --git a/kdeui/kled.h b/kdeui/kled.h
index 7b9f327..b4f828e 100644
--- a/kdeui/kled.h
+++ b/kdeui/kled.h
@@ -50,6 +50,7 @@ class TDEUI_EXPORT KLed : public TQWidget
Q_PROPERTY( Shape tqshape READ tqshape WRITE setShape )
Q_PROPERTY( Look look READ look WRITE setLook )
Q_PROPERTY( TQColor color READ color WRITE setColor )
+ Q_PROPERTY( TQColor offColor READ color WRITE setOffColor )
Q_PROPERTY( int darkFactor READ darkFactor WRITE setDarkFactor )
public:
@@ -148,6 +149,14 @@ public:
TQColor color() const;
/**
+ * Returns the off color of the widget
+ *
+ * @see OffColor
+ * @short Returns LED off color.
+ */
+ TQColor offColor() const;
+
+ /**
* Returns the look of the widget.
*
* @see Look
@@ -204,6 +213,23 @@ public:
void setColor(const TQColor& color);
/**
+ * Set the off color of the widget.
+ * The Color is shown with the KLed::On state.
+ * The KLed::Off state is shown with this color if set
+ *
+ * The widget calls the update() method, so it will
+ * be updated when entering the main event loop.
+ *
+ * Note that calling setColor will override this value
+ *
+ * @see Color
+ *
+ * @param color New off color of the LED.
+ * @short Sets the LED off color.
+ */
+ void setOffColor(const TQColor& color);
+
+ /**
* Sets the factor to darken the LED in OFF state.
* Same as TQColor::dark().
* "darkfactor should be greater than 100, else the LED gets lighter
@@ -316,6 +342,7 @@ protected:
private:
State led_state;
TQColor led_color;
+ TQColor led_off_color;
Look led_look;
Shape led_tqshape;

@ -0,0 +1,178 @@
commit d3a9d56143cf668c7d29b26a324a424d02036371
Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: 1337109016 -0500
Add the ability to force read-only configuration file access in a TDE application
Force kde-config to use read-only access
This closes Bug 293
diff --git a/kdecore/kconfigbackend.cpp b/kdecore/kconfigbackend.cpp
index 9ee9dd6..4ad0e5f 100644
--- a/kdecore/kconfigbackend.cpp
+++ b/kdecore/kconfigbackend.cpp
@@ -247,17 +247,22 @@ void KConfigBackEnd::changeFileName(const TQString &_fileName,
mfileName = _fileName;
resType = _resType;
useKDEGlobals = _useKDEGlobals;
- if (mfileName.isEmpty())
+ if (mfileName.isEmpty()) {
mLocalFileName = TQString::null;
- else if (!TQDir::isRelativePath(mfileName))
+ }
+ else if (!TQDir::isRelativePath(mfileName)) {
mLocalFileName = mfileName;
- else
- mLocalFileName = KGlobal::dirs()->saveLocation(resType) + mfileName;
+ }
+ else {
+ mLocalFileName = KGlobal::dirs()->saveLocation(resType, TQString(), false) + mfileName;
+ }
- if (useKDEGlobals)
+ if (useKDEGlobals) {
mGlobalFileName = KGlobal::dirs()->saveLocation("config", TQString(), false) + TQString::fromLatin1("kdeglobals");
- else
+ }
+ else {
mGlobalFileName = TQString::null;
+ }
d->localLastModified = TQDateTime();
d->localLastSize = 0;
diff --git a/kdecore/kconfigbase.cpp b/kdecore/kconfigbase.cpp
index 9ad6600..c5c0a4e 100644
--- a/kdecore/kconfigbase.cpp
+++ b/kdecore/kconfigbase.cpp
@@ -1139,16 +1139,18 @@ static TQString translatePath( TQString path )
// return original path, if it refers to another type of URL (e.g. http:/), or
// if the path is already relative to another directory
- if (!startsWithFile && path[0] != '/' ||
- startsWithFile && path[5] != '/')
+ if (((!startsWithFile) && (path[0] != '/')) || (startsWithFile && (path[5] != '/'))) {
return path;
+ }
- if (startsWithFile)
+ if (startsWithFile) {
path.remove(0,5); // strip leading "file:/" off the string
+ }
// keep only one single '/' at the beginning - needed for cleanHomeDirPath()
- while (path[0] == '/' && path[1] == '/')
+ while (path[0] == '/' && path[1] == '/') {
path.remove(0,1);
+ }
// we can not use KGlobal::dirs()->relativeLocation("home", path) here,
// since it would not recognize paths without a trailing '/'.
diff --git a/kdecore/kinstance.cpp b/kdecore/kinstance.cpp
index fe0a515..5b3aa86 100644
--- ./kdecore/kinstance.cpp.orig 2011-08-11 04:30:15.000000000 +0200
+++ ./kdecore/kinstance.cpp 2012-06-18 23:34:55.942376042 +0200
@@ -70,7 +70,7 @@
: _dirs (0L),
_config (0L),
_iconLoader (0L),
- _name( name ), _aboutData( new KAboutData( name, "", 0 ) )
+ _name( name ), _aboutData( new KAboutData( name, "", 0 ) ), m_configReadOnly(false)
{
DEBUG_ADD
Q_ASSERT(!name.isEmpty());
@@ -88,7 +88,7 @@
: _dirs (0L),
_config (0L),
_iconLoader (0L),
- _name( aboutData->appName() ), _aboutData( aboutData )
+ _name( aboutData->appName() ), _aboutData( aboutData ), m_configReadOnly(false)
{
DEBUG_ADD
Q_ASSERT(!_name.isEmpty());
@@ -107,7 +107,7 @@
: _dirs ( src->_dirs ),
_config ( src->_config ),
_iconLoader ( src->_iconLoader ),
- _name( src->_name ), _aboutData( src->_aboutData )
+ _name( src->_name ), _aboutData( src->_aboutData ), m_configReadOnly(false)
{
DEBUG_ADD
Q_ASSERT(!_name.isEmpty());
@@ -174,6 +174,11 @@
extern bool kde_kiosk_exception;
extern bool kde_kiosk_admin;
+void KInstance::setConfigReadOnly(bool ro)
+{
+ m_configReadOnly = ro;
+}
+
KConfig *KInstance::config() const
{
DEBUG_CHECK_ALIVE
@@ -199,7 +204,7 @@
if ( d->sharedConfig == 0 )
{
if ( !_name.isEmpty() )
- d->sharedConfig = KSharedConfig::openConfig( _name + "rc");
+ d->sharedConfig = KSharedConfig::openConfig( _name + "rc"), m_configReadOnly;
else
d->sharedConfig = KSharedConfig::openConfig( TQString::null );
}
diff --git a/kdecore/kinstance.h b/kdecore/kinstance.h
index 75cc4b4..444a2d8 100644
--- a/kdecore/kinstance.h
+++ b/kdecore/kinstance.h
@@ -96,6 +96,14 @@ class kdecore_EXPORT KInstance
KSharedConfig *sharedConfig() const;
/**
+ * Set a read-only flag on the configuration files
+ * This must be called before config() or dirs() to have any effect
+ * Defaults to FALSE
+ * @param ro read only if TRUE
+ */
+ void setConfigReadOnly(bool ro);
+
+ /**
* Returns an iconloader object.
* @return the iconloader object.
*/
@@ -162,6 +170,7 @@ protected:
virtual void virtual_hook( int id, void* data );
private:
KInstancePrivate *d;
+ bool m_configReadOnly;
};
#endif
diff --git a/kdecore/kstandarddirs.cpp b/kdecore/kstandarddirs.cpp
index bce4bf4..bb8ae97 100644
--- ./kdecore/kstandarddirs.cpp.orig 2011-08-21 06:15:32.000000000 +0200
+++ ./kdecore/kstandarddirs.cpp 2012-06-18 23:46:56.765409982 +0200
@@ -767,8 +766,12 @@
srv = findExe(TQString::tqfromLatin1("lnusertemp"));
if (!srv.isEmpty())
{
- system(TQFile::encodeName(srv)+" "+type);
- result = readlink(TQFile::encodeName(dir).data(), link, 1023);
+ if (system(TQFile::encodeName(srv)+" "+type) < 0 ) {
+ result = readlink(TQFile::encodeName(dir).data(), link, 1023);
+ }
+ else {
+ result = -1;
+ }
}
}
if (result > 0)
diff --git a/kdecore/kde-config.cpp.in b/kdecore/kde-config.cpp.in
index 90c5dae..c988b00 100644
--- a/kdecore/kde-config.cpp.in
+++ b/kdecore/kde-config.cpp.in
@@ -120,6 +120,7 @@ int main(int argc, char **argv)
KCmdLineArgs::addCmdLineOptions( options ); // Add my own options.
KInstance a("kde-config");
+ a.setConfigReadOnly(TRUE);
(void)KGlobal::dirs(); // trigger the creation
(void)KGlobal::config();

@ -0,0 +1,171 @@
commit b4bba7b553995a6b13214dbbabe18ff311007eea
Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: 1341113466 -0500
Fix iso kioslave not parsing large images properly
diff --git a/kioslave/iso/kiso.cpp b/kioslave/iso/kiso.cpp
index c6faa65..6403f62 100644
--- a/kioslave/iso/kiso.cpp
+++ b/kioslave/iso/kiso.cpp
@@ -188,7 +188,7 @@ KIso::~KIso()
}
/* callback function for libisofs */
-static int readf(char *buf, int start, int len,void *udata) {
+static int readf(char *buf, long start, long len,void *udata) {
TQIODevice* dev = ( static_cast<KIso*> (udata) )->device();
@@ -212,7 +212,7 @@ static int mycallb(struct iso_directory_record *idr,void *udata) {
bool special=false;
KArchiveEntry *entry=NULL,*oldentry=NULL;
char z_algo[2],z_params[2];
- int z_size=0;
+ long long z_size=0;
if ((idr->flags[0] & 1) && !iso->showhidden) return 0;
if (iso->level) {
@@ -289,7 +289,8 @@ static int mycallb(struct iso_directory_record *idr,void *udata) {
void KIso::addBoot(struct el_torito_boot_descriptor* bootdesc) {
- int i,size;
+ int i;
+ long long size;
boot_head boot;
boot_entry *be;
TQString path;
diff --git a/kioslave/iso/kisofile.cpp b/kioslave/iso/kisofile.cpp
index afac16b..ffae0d3 100644
--- a/kioslave/iso/kisofile.cpp
+++ b/kioslave/iso/kisofile.cpp
@@ -20,7 +20,7 @@
KIsoFile::KIsoFile( KArchive* archive, const TQString& name, int access,
int date, int adate,int cdate, const TQString& user, const TQString& group,
- const TQString& symlink,int pos, int size) :
+ const TQString& symlink,long long pos, long long size) :
KArchiveFile(archive, name, access, date, user, group, symlink, pos, size) {
@@ -32,7 +32,7 @@ KIsoFile::KIsoFile( KArchive* archive, const TQString& name, int access,
KIsoFile::~KIsoFile(){
}
-void KIsoFile::setZF(char algo[2],char parms[2],int realsize) {
+void KIsoFile::setZF(char algo[2],char parms[2],long long realsize) {
m_algo[0]=algo[0];m_algo[1]=algo[1];
m_parms[0]=parms[0];m_parms[1]=parms[1];
m_realsize=realsize;
diff --git a/kioslave/iso/kisofile.h b/kioslave/iso/kisofile.h
index 193509c..696a8c1 100644
--- a/kioslave/iso/kisofile.h
+++ b/kioslave/iso/kisofile.h
@@ -29,9 +29,9 @@ class KIsoFile : public KArchiveFile {
public:
KIsoFile( KArchive* archive, const TQString& name, int access, int date,
int adate,int cdate, const TQString& user, const TQString& group,
- const TQString& symlink, int pos, int size);
+ const TQString& symlink, long long pos, long long size);
~KIsoFile();
- void setZF(char algo[2],char parms[2],int realsize);
+ void setZF(char algo[2],char parms[2],long long realsize);
int adate() const { return m_adate; }
int cdate() const { return m_cdate; }
long long realsize() const { return m_realsize; }
diff --git a/kioslave/iso/libisofs/isofs.c b/kioslave/iso/libisofs/isofs.c
index ab13d9e..e599450 100644
--- a/kioslave/iso/libisofs/isofs.c
+++ b/kioslave/iso/libisofs/isofs.c
@@ -122,8 +122,8 @@ void FreeBootTable(boot_head *boot) {
boot->defentry=NULL;
}
-int BootImageSize(int media,int len) {
- int ret;
+int BootImageSize(int media,long len) {
+ long long ret;
switch(media & 0xf) {
case 0:
@@ -158,7 +158,7 @@ static boot_entry *CreateBootEntry(char *be) {
return entry;
}
-int ReadBootTable(readfunc *read,int sector, boot_head *head, void *udata) {
+int ReadBootTable(readfunc *read,long sector, boot_head *head, void *udata) {
char buf[2048], *c, *be;
int i,end=0;
@@ -221,7 +221,7 @@ err:
/**
* Creates the linked list of the volume descriptors
*/
-iso_vol_desc *ReadISO9660(readfunc *read,int sector,void *udata) {
+iso_vol_desc *ReadISO9660(readfunc *read,long sector,void *udata) {
int i;
struct iso_volume_descriptor buf;
@@ -577,10 +577,10 @@ int level=0,joliet=0,dirs,files;
iconv_t iconv_d;
int fd;
-int readf(char *buf, int start, int len,void *udata) {
+int readf(char *buf, long start, long len,void *udata) {
int ret;
- if ((ret=lseek(fd, start << 11, SEEK_SET))<0) return ret;
+ if ((ret=lseek64(fd, start << 11, SEEK_SET))<0) return ret;
ret=read(fd, buf, len << 11);
if (ret<0) return ret;
return (ret >> 11);
diff --git a/kioslave/iso/libisofs/isofs.h b/kioslave/iso/libisofs/isofs.h
index 52190e6..b8971a4 100644
--- a/kioslave/iso/libisofs/isofs.h
+++ b/kioslave/iso/libisofs/isofs.h
@@ -50,7 +50,7 @@ typedef struct _rr_entry {
int re; /* relocated */
char z_algo[2]; /* zizofs algorithm */
char z_params[2]; /* zizofs parameters */
- int z_size; /* zizofs real_size */
+ long z_size; /* zizofs real_size */
} rr_entry;
typedef struct _iso_vol_desc {
@@ -78,7 +78,7 @@ typedef struct _boot_head {
/**
* this callback function needs to read 'len' sectors from 'start' into 'buf'
*/
-typedef int readfunc(char *buf,int start, int len,void *);
+typedef int readfunc(char *buf,long start, long len,void *);
/**
* ProcessDir uses this callback
@@ -107,7 +107,7 @@ time_t isodate_84261(char * p, int hs);
* If the function fails, returns NULL
* Don't forget to call FreeISO9660 after using the volume descriptor list!
*/
-iso_vol_desc *ReadISO9660(readfunc *read,int sector,void *udata);
+iso_vol_desc *ReadISO9660(readfunc *read,long sector,void *udata);
/**
* Frees the linked list of volume descriptors
@@ -140,7 +140,7 @@ int JolietLevel(struct iso_volume_descriptor *ivd);
/**
* Returns the size of the boot image (in 512 byte sectors)
*/
-int BootImageSize(int media,int len);
+int BootImageSize(int media,long len);
/**
* Frees the boot catalog entries in 'boot'. If you ever called ReadBootTable,
@@ -151,7 +151,7 @@ void FreeBootTable(boot_head *boot);
/**
* Reads the boot catalog into 'head'. Don't forget to call FreeBootTable!
*/
-int ReadBootTable(readfunc *read,int sector, boot_head *head, void *udata);
+int ReadBootTable(readfunc *read,long sector, boot_head *head, void *udata);
#ifdef __cplusplus
} //extern "C"

@ -0,0 +1,35 @@
commit d1c71f692f5329dbfe817bbed41c5137be608efa
Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: 1341199632 -0500
Fix spinbox text entry when base is not 10
diff --git a/kdeui/knuminput.cpp b/kdeui/knuminput.cpp
index 27b86f9..118af6c 100644
--- a/kdeui/knuminput.cpp
+++ b/kdeui/knuminput.cpp
@@ -206,6 +206,7 @@ KIntSpinBox::KIntSpinBox(TQWidget *parent, const char *name)
{
editor()->tqsetAlignment(AlignRight);
val_base = 10;
+ setValidator(new KIntValidator(this, val_base));
setValue(0);
}
@@ -219,11 +220,16 @@ KIntSpinBox::KIntSpinBox(int lower, int upper, int step, int value, int base,
{
editor()->tqsetAlignment(AlignRight);
val_base = base;
+ setValidator(new KIntValidator(this, val_base));
setValue(value);
}
void KIntSpinBox::setBase(int base)
{
+ const KIntValidator* kvalidator = dynamic_cast<const KIntValidator*>(validator());
+ if (kvalidator) {
+ const_cast<KIntValidator*>(kvalidator)->setBase(base);
+ }
val_base = base;
}

@ -0,0 +1,21 @@
commit 87363770ea3fe6167445b6d445ca563f2a3f05fc
Author: Darrell Anderson <humanreadable@yahoo.com>
Date: 1339430277 -0500
Restore tdesu dialog "Keep password" check box default to disabled/unchecked.
diff --git a/tdesu/defaults.h b/tdesu/defaults.h
index 4649b2b..7fd724e 100644
--- a/kdesu/defaults.h
+++ b/kdesu/defaults.h
@@ -13,9 +13,8 @@
#ifndef __Defaults_h_included__
#define __Defaults_h_included__
-/*const int defTimeout = 120*60;*/
const int defTimeout = 120*60;
const int defEchoMode = 0;
-const int defKeep = true;
+const int defKeep = false;
#endif

@ -0,0 +1,115 @@
commit dca4c677237b01768f5d6d798a2d918547d2ee8e
Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: 1341289561 -0500
Update iso kioslave to better handle large images
diff --git a/kioslave/iso/kiso.cpp b/kioslave/iso/kiso.cpp
index c9e2d43..9ec1f1c 100644
--- a/kioslave/iso/kiso.cpp
+++ b/kioslave/iso/kiso.cpp
@@ -188,7 +188,7 @@ KIso::~KIso()
}
/* callback function for libisofs */
-static int readf(char *buf, long start, long len,void *udata) {
+static int readf(char *buf, long long start, long long len,void *udata) {
TQIODevice* dev = ( static_cast<KIso*> (udata) )->device();
diff --git a/kioslave/iso/libisofs/isofs.c b/kioslave/iso/libisofs/isofs.c
index e599450..f1db442 100644
--- a/kioslave/iso/libisofs/isofs.c
+++ b/kioslave/iso/libisofs/isofs.c
@@ -122,7 +122,7 @@ void FreeBootTable(boot_head *boot) {
boot->defentry=NULL;
}
-int BootImageSize(int media,long len) {
+int BootImageSize(int media,long long len) {
long long ret;
switch(media & 0xf) {
@@ -158,7 +158,7 @@ static boot_entry *CreateBootEntry(char *be) {
return entry;
}
-int ReadBootTable(readfunc *read,long sector, boot_head *head, void *udata) {
+int ReadBootTable(readfunc *read,long long sector, boot_head *head, void *udata) {
char buf[2048], *c, *be;
int i,end=0;
@@ -221,7 +221,7 @@ err:
/**
* Creates the linked list of the volume descriptors
*/
-iso_vol_desc *ReadISO9660(readfunc *read,long sector,void *udata) {
+iso_vol_desc *ReadISO9660(readfunc *read,long long sector,void *udata) {
int i;
struct iso_volume_descriptor buf;
@@ -577,7 +577,7 @@ int level=0,joliet=0,dirs,files;
iconv_t iconv_d;
int fd;
-int readf(char *buf, long start, long len,void *udata) {
+int readf(char *buf, long long start, long long len,void *udata) {
int ret;
if ((ret=lseek64(fd, start << 11, SEEK_SET))<0) return ret;
diff --git a/kioslave/iso/libisofs/isofs.h b/kioslave/iso/libisofs/isofs.h
index b8971a4..1d17de4 100644
--- a/kioslave/iso/libisofs/isofs.h
+++ b/kioslave/iso/libisofs/isofs.h
@@ -50,13 +50,13 @@ typedef struct _rr_entry {
int re; /* relocated */
char z_algo[2]; /* zizofs algorithm */
char z_params[2]; /* zizofs parameters */
- long z_size; /* zizofs real_size */
+ long long z_size; /* zizofs real_size */
} rr_entry;
typedef struct _iso_vol_desc {
struct _iso_vol_desc *next;
struct _iso_vol_desc *prev;
- struct iso_volume_descriptor data;
+ struct iso_volume_descriptor data;
} iso_vol_desc;
typedef struct _boot_entry {
@@ -78,7 +78,7 @@ typedef struct _boot_head {
/**
* this callback function needs to read 'len' sectors from 'start' into 'buf'
*/
-typedef int readfunc(char *buf,long start, long len,void *);
+typedef int readfunc(char *buf,long long start, long long len,void *);
/**
* ProcessDir uses this callback
@@ -107,7 +107,7 @@ time_t isodate_84261(char * p, int hs);
* If the function fails, returns NULL
* Don't forget to call FreeISO9660 after using the volume descriptor list!
*/
-iso_vol_desc *ReadISO9660(readfunc *read,long sector,void *udata);
+iso_vol_desc *ReadISO9660(readfunc *read,long long sector,void *udata);
/**
* Frees the linked list of volume descriptors
@@ -140,7 +140,7 @@ int JolietLevel(struct iso_volume_descriptor *ivd);
/**
* Returns the size of the boot image (in 512 byte sectors)
*/
-int BootImageSize(int media,long len);
+int BootImageSize(int media,long long len);
/**
* Frees the boot catalog entries in 'boot'. If you ever called ReadBootTable,
@@ -151,7 +151,7 @@ void FreeBootTable(boot_head *boot);
/**
* Reads the boot catalog into 'head'. Don't forget to call FreeBootTable!
*/
-int ReadBootTable(readfunc *read,long sector, boot_head *head, void *udata);
+int ReadBootTable(readfunc *read,long long sector, boot_head *head, void *udata);
#ifdef __cplusplus
} //extern "C"

@ -1,16 +1,23 @@
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr" %if "%{?_prefix}" != "/usr"
%define _variant .opt %define _variant .opt
%define _docdir %{_datadir}/doc
%endif %endif
# TDE 3.5.13 specific variables # TDE 3.5.13 specific variables
%define tde_docdir %{_docdir}/kde %define tde_bindir %{_prefix}/bin
%define tde_libdir %{_libdir}/trinity %define tde_datadir %{_prefix}/share
%define tde_docdir %{tde_datadir}/doc
%define tde_includedir %{_prefix}/include
%define tde_libdir %{_prefix}/%{_lib}
%define tde_tdedocdir %{tde_docdir}/kde
%define tde_tdelibdir %{tde_libdir}/trinity
%define _docdir %{tde_docdir}
Name: trinity-tdelibs Name: trinity-tdelibs
Version: 3.5.13 Version: 3.5.13
Release: 10%{?dist}%{?_variant} Release: 11%{?dist}%{?_variant}
License: GPL License: GPL
Summary: TDE Libraries Summary: TDE Libraries
Group: Environment/Libraries Group: Environment/Libraries
@ -71,12 +78,21 @@ Patch27: kdelibs-3.5.13-add_dynamic_label_to_kpassword.patch
Patch28: kdelibs-3.5.13-fix_build_kspell2.patch Patch28: kdelibs-3.5.13-fix_build_kspell2.patch
## [tdelibs] Export kdemain symbol in iso kioslave [Bug #465] [Commit #0536f0b7] ## [tdelibs] Export kdemain symbol in iso kioslave [Bug #465] [Commit #0536f0b7]
Patch29: kdelibs-3.5.13-fix_iso_kioslave.patch Patch29: kdelibs-3.5.13-fix_iso_kioslave.patch
## [tdelibs] Fix iso kioslave not parsing large images properly [Commit #b4bba7b5]
Patch30: kdelibs-3.5.13-fix_iso_kioslave_not_parsing_large_image_properly.patch
## [tdelibs] Add ability to set KLed off color [Commit #513ffc6e]
Patch31: kdelibs-3.5.13-add_ability_to_set_kled_off_color.patch
## [tdelibs] Fix spinbox text entry when base is not 10 [Commit #d1c71f69]
Patch32: kdelibs-3.5.13-fix_spinbox_text_entry_when_base_not_10.patch
## [tdelibs] Update iso kioslave to better handle large images [Commit #dca4c677]
Patch33: kdelibs-3.5.13-update_iso_kioslave_better_handle_large_image.patch
## [tdelibs] Restore tdesu dialog "Keep password" check box default to disabled/unchecked. [Commit #87363770]
Patch34: kdelibs-3.5.13-restore_tdesu_keeppassword_default_disabled.patch
BuildRequires: cmake >= 2.8 BuildRequires: cmake >= 2.8
BuildRequires: libtool BuildRequires: libtool
BuildRequires: tqtinterface-devel BuildRequires: tqtinterface-devel
BuildRequires: trinity-arts-devel BuildRequires: trinity-arts-devel
BuildRequires: avahi-devel
BuildRequires: krb5-devel libxslt-devel cups-devel libart_lgpl-devel pcre-devel BuildRequires: krb5-devel libxslt-devel cups-devel libart_lgpl-devel pcre-devel
BuildRequires: libutempter-devel BuildRequires: libutempter-devel
BuildRequires: bzip2-devel BuildRequires: bzip2-devel
@ -85,25 +101,34 @@ BuildRequires: gcc-c++
BuildRequires: alsa-lib-devel BuildRequires: alsa-lib-devel
BuildRequires: libidn-devel BuildRequires: libidn-devel
BuildRequires: qt3-devel BuildRequires: qt3-devel
BuildRequires: avahi-qt3-devel
BuildRequires: jasper-devel BuildRequires: jasper-devel
BuildRequires: libtiff-devel BuildRequires: libtiff-devel
BuildRequires: OpenEXR-devel BuildRequires: OpenEXR-devel
BuildRequires: libtool-ltdl-devel
BuildRequires: glib2-devel BuildRequires: glib2-devel
BuildRequires: gamin-devel BuildRequires: gamin-devel
BuildRequires: xorg-x11-proto-devel
BuildRequires: libXcomposite-devel
BuildRequires: aspell-devel BuildRequires: aspell-devel
BuildRequires: hspell-devel BuildRequires: hspell-devel
BuildRequires: avahi-tqt-devel >= 3.5.13
# LUA support are not ready yet # LUA support are not ready yet
#BuildRequires: lua-devel #BuildRequires: lua-devel
Requires: tqtinterface %if 0%{?mgaversion}
Requires: trinity-arts BuildRequires: %{_lib}avahi-client-devel
BuildRequires: %{_lib}ltdl-devel
BuildRequires: x11-proto-devel
BuildRequires: %{_lib}xcomposite1-devel
Requires: %{_lib}avahi-client3
%else
BuildRequires: avahi-devel
BuildRequires: libtool-ltdl-devel
BuildRequires: xorg-x11-proto-devel
BuildRequires: libXcomposite-devel
%endif
Requires: tqtinterface >= 3.5.13
Requires: trinity-arts >= 3.5.13
Requires: avahi Requires: avahi
Requires: qt3 Requires: qt3 >= 3.3.8.d
Requires: avahi-qt3
%description %description
Libraries for the Trinity Desktop Environment: Libraries for the Trinity Desktop Environment:
@ -115,103 +140,103 @@ kimgio (image manipulation).
%files %files
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc AUTHORS COPYING COPYING-DOCS COPYING.LIB README TODO %doc AUTHORS COPYING COPYING-DOCS COPYING.LIB README TODO
%{_bindir}/artsmessage %{tde_bindir}/artsmessage
%{_bindir}/cupsdconf %{tde_bindir}/cupsdconf
%{_bindir}/cupsdoprint %{tde_bindir}/cupsdoprint
%{_bindir}/dcop %{tde_bindir}/dcop
%{_bindir}/dcopclient %{tde_bindir}/dcopclient
%{_bindir}/dcopfind %{tde_bindir}/dcopfind
%{_bindir}/dcopobject %{tde_bindir}/dcopobject
%{_bindir}/dcopquit %{tde_bindir}/dcopquit
%{_bindir}/dcopref %{tde_bindir}/dcopref
%{_bindir}/dcopserver %{tde_bindir}/dcopserver
%{_bindir}/dcopserver_shutdown %{tde_bindir}/dcopserver_shutdown
%{_bindir}/dcopstart %{tde_bindir}/dcopstart
%{_bindir}/filesharelist %{tde_bindir}/filesharelist
%{_bindir}/fileshareset %{tde_bindir}/fileshareset
%{_bindir}/imagetops %{tde_bindir}/imagetops
%{_bindir}/kab2kabc %{tde_bindir}/kab2kabc
%{_bindir}/kaddprinterwizard %{tde_bindir}/kaddprinterwizard
%{_bindir}/kbuildsycoca %{tde_bindir}/kbuildsycoca
%{_bindir}/kcmshell %{tde_bindir}/kcmshell
%{_bindir}/kconf_update %{tde_bindir}/kconf_update
%{_bindir}/kcookiejar %{tde_bindir}/kcookiejar
%{_bindir}/kde-config %{tde_bindir}/kde-config
%{_bindir}/kde-menu %{tde_bindir}/kde-menu
%{_bindir}/kded %{tde_bindir}/kded
%{_bindir}/kdeinit %{tde_bindir}/kdeinit
%{_bindir}/kdeinit_shutdown %{tde_bindir}/kdeinit_shutdown
%{_bindir}/kdeinit_wrapper %{tde_bindir}/kdeinit_wrapper
%{_bindir}/kdesu_stub %{tde_bindir}/kdesu_stub
%{_bindir}/kdontchangethehostname %{tde_bindir}/kdontchangethehostname
%{_bindir}/kdostartupconfig %{tde_bindir}/kdostartupconfig
%{_bindir}/kfile %{tde_bindir}/kfile
%{_bindir}/kfmexec %{tde_bindir}/kfmexec
%{_bindir}/khotnewstuff %{tde_bindir}/khotnewstuff
%{_bindir}/kinstalltheme %{tde_bindir}/kinstalltheme
%{_bindir}/kio_http_cache_cleaner %{tde_bindir}/kio_http_cache_cleaner
%{_bindir}/kio_uiserver %{tde_bindir}/kio_uiserver
%{_bindir}/kioexec %{tde_bindir}/kioexec
%{_bindir}/kioslave %{tde_bindir}/kioslave
%{_bindir}/klauncher %{tde_bindir}/klauncher
%{_bindir}/kmailservice %{tde_bindir}/kmailservice
%{_bindir}/kmimelist %{tde_bindir}/kmimelist
%attr(4755,root,root) %{_bindir}/kpac_dhcp_helper %attr(4755,root,root) %{tde_bindir}/kpac_dhcp_helper
%{_bindir}/ksendbugmail %{tde_bindir}/ksendbugmail
%{_bindir}/kshell %{tde_bindir}/kshell
%{_bindir}/kstartupconfig %{tde_bindir}/kstartupconfig
%{_bindir}/ktelnetservice %{tde_bindir}/ktelnetservice
%{_bindir}/ktradertest %{tde_bindir}/ktradertest
%{_bindir}/kwrapper %{tde_bindir}/kwrapper
%{_bindir}/lnusertemp %{tde_bindir}/lnusertemp
%{_bindir}/make_driver_db_cups %{tde_bindir}/make_driver_db_cups
%{_bindir}/make_driver_db_lpr %{tde_bindir}/make_driver_db_lpr
%{_bindir}/meinproc %{tde_bindir}/meinproc
%{_bindir}/networkstatustestservice %{tde_bindir}/networkstatustestservice
%{_bindir}/start_kdeinit %{tde_bindir}/start_kdeinit
%{_bindir}/start_kdeinit_wrapper %{tde_bindir}/start_kdeinit_wrapper
%attr(4755,root,root) %{_bindir}/kgrantpty %attr(4755,root,root) %{tde_bindir}/kgrantpty
%{_libdir}/lib*.so.* %{tde_tdelibdir}/*
%{_libdir}/lib[kt]deinit_*.la %{tde_libdir}/lib*.so.*
%{_libdir}/lib[kt]deinit_*.so %{tde_libdir}/lib[kt]deinit_*.la
%{tde_libdir}/ %{tde_libdir}/lib[kt]deinit_*.so
%{_datadir}/applications/kde/*.desktop %{tde_datadir}/applications/kde/*.desktop
%{_datadir}/autostart/kab2kabc.desktop %{tde_datadir}/autostart/kab2kabc.desktop
%{_datadir}/applnk/kio_iso.desktop %{tde_datadir}/applnk/kio_iso.desktop
%{_datadir}/apps/* %{tde_datadir}/apps/*
%exclude %{_datadir}/apps/ksgmltools2/ %exclude %{tde_datadir}/apps/ksgmltools2/
%config(noreplace) %{_datadir}/config/* %config(noreplace) %{tde_datadir}/config/*
%{_datadir}/emoticons/* %{tde_datadir}/emoticons/*
%{_datadir}/icons/default.kde %{tde_datadir}/icons/default.kde
%{_datadir}/mimelnk/magic %{tde_datadir}/mimelnk/magic
%{_datadir}/mimelnk/*/*.desktop %{tde_datadir}/mimelnk/*/*.desktop
%{_datadir}/services/* %{tde_datadir}/services/*
%{_datadir}/servicetypes/* %{tde_datadir}/servicetypes/*
%{_datadir}/icons/crystalsvg/ %{tde_datadir}/icons/crystalsvg/
%{tde_docdir}/HTML/en/kspell %{tde_tdedocdir}/HTML/en/kspell/
# remove conflicts with kdelibs-4 # remove conflicts with kdelibs-4
%if "%{?_prefix}" != "/usr" %if "%{?_prefix}" != "/usr"
%{_bindir}/checkXML %{tde_bindir}/checkXML
%{_bindir}/ksvgtopng %{tde_bindir}/ksvgtopng
%{_bindir}/kunittestmodrunner %{tde_bindir}/kunittestmodrunner
%{_bindir}/preparetips %{tde_bindir}/preparetips
%{_datadir}/icons/hicolor/index.theme %{tde_datadir}/icons/hicolor/index.theme
%{_datadir}/locale/all_languages %{tde_datadir}/locale/all_languages
%{tde_docdir}/HTML/en/common/* %{tde_tdedocdir}/HTML/en/common/*
%{_sysconfdir}/ld.so.conf.d/trinity.conf %{_sysconfdir}/ld.so.conf.d/trinity.conf
%else %else
%exclude %{_bindir}/checkXML %exclude %{tde_bindir}/checkXML
%exclude %{_bindir}/ksvgtopng %exclude %{tde_bindir}/ksvgtopng
%exclude %{_bindir}/kunittestmodrunner %exclude %{tde_bindir}/kunittestmodrunner
%exclude %{_bindir}/preparetips %exclude %{tde_bindir}/preparetips
%exclude %{_datadir}/config/colors %exclude %{tde_datadir}/config/colors
%exclude %{_datadir}/config/kdebug.areas %exclude %{tde_datadir}/config/kdebug.areas
%exclude %{_datadir}/config/kdebugrc %exclude %{tde_datadir}/config/kdebugrc
%exclude %{_datadir}/config/ksslcalist %exclude %{tde_datadir}/config/ksslcalist
%exclude %{_datadir}/config/ui/ui_standards.rc %exclude %{tde_datadir}/config/ui/ui_standards.rc
%exclude %{_datadir}/icons/hicolor/index.theme %exclude %{tde_datadir}/icons/hicolor/index.theme
%exclude %{_datadir}/locale/all_languages %exclude %{tde_datadir}/locale/all_languages
%exclude %{tde_docdir}/HTML/en/common/* %exclude %{tde_tdedocdir}/HTML/en/common/*
%endif %endif
# Avoid conflict with 'redhat-menus' package # Avoid conflict with 'redhat-menus' package
@ -222,11 +247,13 @@ kimgio (image manipulation).
%endif %endif
# New in TDE 3.5.13 # New in TDE 3.5.13
%{_bindir}/kdetcompmgr %{tde_bindir}/kdetcompmgr
%post -p /sbin/ldconfig %post
/sbin/ldconfig || :
%postun -p /sbin/ldconfig %postun
/sbin/ldconfig || :
########## ##########
@ -246,40 +273,25 @@ applications for TDE.
%files devel %files devel
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{_bindir}/dcopidl* %{tde_bindir}/dcopidl*
%{_bindir}/kconfig_compiler %{tde_bindir}/kconfig_compiler
%{_bindir}/makekdewidgets %{tde_bindir}/makekdewidgets
%{_datadir}/apps/ksgmltools2/ %{tde_datadir}/apps/ksgmltools2/
%{_includedir}/* %{tde_includedir}/*
%{_libdir}/*.la %{tde_libdir}/*.la
%{_libdir}/*.so %{tde_libdir}/*.so
%{_libdir}/*.a %{tde_libdir}/*.a
%exclude %{_libdir}/libkdeinit_*.la %exclude %{tde_libdir}/libkdeinit_*.la
%exclude %{_libdir}/libkdeinit_*.so %exclude %{tde_libdir}/libkdeinit_*.so
# New in TDE 3.5.13 # New in TDE 3.5.13
%{_datadir}/cmake/kdelibs.cmake %{tde_datadir}/cmake/kdelibs.cmake
%post devel -p /sbin/ldconfig %post devel
/sbin/ldconfig || :
%postun devel -p /sbin/ldconfig %postun devel
/sbin/ldconfig || :
##########
%if 0
%package apidocs
Group: Development/Libraries
Summary: %{name} - API documentation
Requires: %{name} = %{version}-%{release}
%description apidocs
This package includes the TDE API documentation in HTML
format for easy browsing
%files apidocs
%defattr(-,root,root,-)
#%{tde_docdir}/HTML/en/kdelibs*
%endif
########## ##########
@ -304,18 +316,33 @@ format for easy browsing
%patch26 -p1 %patch26 -p1
%patch27 -p1 %patch27 -p1
%patch28 -p1 %patch28 -p1
%patch29 -p1
%patch30 -p1
%patch31 -p1
%patch32 -p1
%patch33 -p1
%patch34 -p1
%build %build
unset QTDIR || : ; . /etc/profile.d/qt.sh unset QTDIR || : ; . /etc/profile.d/qt.sh
export PATH="%{_bindir}:${PATH}" export PATH="%{tde_bindir}:${QTDIR}/bin:${PATH}"
export LD_LIBRARY_PATH="%{_libdir}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
export PKG_CONFIG_PATH="%{_libdir}/pkgconfig" export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_includedir}/tqt"
export CMAKE_INCLUDE_PATH="%{_includedir}:%{_includedir}/tqt"
%__mkdir build # We need LD_LIBRARY_PATH here because ld.so.conf file has not been written yet
cd build export LD_LIBRARY_PATH="%{tde_libdir}"
%{?!mgaversion:%__mkdir build; cd build}
%cmake \ %cmake \
-DBIN_INSTALL_DIR=%{tde_bindir} \
-DDOC_INSTALL_DIR=%{tde_docdir} \
-DINCLUDE_INSTALL_DIR=%{tde_includedir} \
-DLIB_INSTALL_DIR=%{tde_libdir} \
-DPKGCONFIG_INSTALL_DIR=%{tde_libdir}/pkgconfig \
-DSHARE_INSTALL_PREFIX=%{tde_datadir} \
-DCMAKE_SKIP_RPATH="OFF" \
-DWITH_ARTS=ON \ -DWITH_ARTS=ON \
-DWITH_ALSA=ON \ -DWITH_ALSA=ON \
-DWITH_LIBART=ON \ -DWITH_LIBART=ON \
@ -345,7 +372,7 @@ cd build
%if "%{?_prefix}" != "/usr" %if "%{?_prefix}" != "/usr"
%__mkdir_p %{?buildroot}%{_sysconfdir}/ld.so.conf.d %__mkdir_p %{?buildroot}%{_sysconfdir}/ld.so.conf.d
cat <<EOF >%{?buildroot}%{_sysconfdir}/ld.so.conf.d/trinity.conf cat <<EOF >%{?buildroot}%{_sysconfdir}/ld.so.conf.d/trinity.conf
%{_libdir} %{tde_libdir}
EOF EOF
%endif %endif
@ -365,6 +392,13 @@ EOF
%changelog %changelog
* Sun Jul 22 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-11
- Fix iso kioslave not parsing large images properly [Commit #b4bba7b5]
- Add ability to set KLed off color [Commit #513ffc6e]
- Fix spinbox text entry when base is not 10 [Commit #d1c71f69]
- Update iso kioslave to better handle large images [Commit #dca4c677]
- Restore tdesu dialog "Keep password" check box default to disabled/unchecked. [Commit #87363770]
* Tue Jun 26 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-10 * Tue Jun 26 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-10
- Renames to 'trinity-tdelibs' - Renames to 'trinity-tdelibs'
- Enable 'aspell', 'hspell' and 'libidn' - Enable 'aspell', 'hspell' and 'libidn'

@ -0,0 +1,31 @@
commit 7eb7626c8a6d819c040cd9aba0b0bca3b484fde7
Author: Darrell Anderson <humanreadable@yahoo.com>
Date: 1337622268 -0500
Reverse patch from GIT hash 2cc2e3a2.
diff --git a/kmix/CMakeLists.txt b/kmix/CMakeLists.txt
index 237c95d..a8a419f 100644
--- a/kmix/CMakeLists.txt
+++ b/kmix/CMakeLists.txt
@@ -26,7 +26,6 @@ link_directories(
##### other data ################################
install( FILES kmix.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
-install( FILES kmix.desktop DESTINATION ${AUTOSTART_INSTALL_DIR} )
install( FILES kmixui.rc DESTINATION ${DATA_INSTALL_DIR}/kmix )
install( FILES restore_kmix_volumes.desktop DESTINATION ${AUTOSTART_INSTALL_DIR} )
install( FILES kmixapplet.desktop DESTINATION ${DATA_INSTALL_DIR}/kicker/applets )
diff --git a/kmix/Makefile.am b/kmix/Makefile.am
index d2da702..5051363 100644
--- a/kmix/Makefile.am
+++ b/kmix/Makefile.am
@@ -49,7 +49,7 @@ xdg_apps_DATA = kmix.desktop
rcdir = $(kde_datadir)/kmix
rc_DATA = kmixui.rc
-autostart_DATA = kmix.desktop restore_kmix_volumes.desktop
+autostart_DATA = restore_kmix_volumes.desktop
autostartdir = $(datadir)/autostart
lnkdir = $(kde_datadir)/kicker/applets

@ -0,0 +1,133 @@
--- kdemultimedia/arts/runtime/Makefile.am.ORI 2012-07-31 13:56:06.508165053 +0200
+++ kdemultimedia/arts/runtime/Makefile.am 2012-07-31 13:57:03.018059604 +0200
@@ -11,7 +11,7 @@
structurebuilder_impl.cc structures_impl.cc moduleinfo.cc \
compatibility.cc localfactory_impl.cc artsbuilderloader_impl.cc
-libartsbuilder_la_LIBADD = -lmcop -lartsflow $(LIBDL)
+libartsbuilder_la_LIBADD = -lmcop -lartsflow -lartsflow_idl $(LIBDL)
libartsbuilder_la_COMPILE_FIRST = artsbuilder.h
libartsbuilder_la_LDFLAGS = $(all_libraries) -L$(arts_libraries) \
-no-undefined
--- kdemultimedia/arts/gui/kde/Makefile.am.ORI 2012-07-31 14:06:50.128691312 +0200
+++ kdemultimedia/arts/gui/kde/Makefile.am 2012-07-31 14:07:00.431493289 +0200
@@ -15,7 +15,7 @@
klevelmeter_normalbars.cpp klevelmeter_firebars.cpp \
ktickmarks_impl.cpp kvolumefader_impl.cpp klabel_impl.cpp
-libartsgui_kde_la_LIBADD = $(LIB_KIO) -lkdecore -lkdeui \
+libartsgui_kde_la_LIBADD = $(LIB_KIO) -lkdecore -lkdeui -lkdefx -lqt-mt \
$(top_builddir)/arts/gui/common/libartsgui_idl.la
libartsgui_kde_la_LDFLAGS = $(all_libraries) -no-undefined
libartsgui_kde_la_COMPILE_FIRST = ../common/artsgui.h
--- kdemultimedia/arts/modules/synth/Makefile.am.ORI 2012-07-31 12:30:46.465821368 +0000
+++ kdemultimedia/arts/modules/synth/Makefile.am 2012-07-31 12:32:09.287170210 +0000
@@ -31,7 +31,7 @@
libartsmodulessynth_la_LIBADD = \
$(top_builddir)/arts/runtime/libartsbuilder.la \
$(top_builddir)/arts/midi/libartsmidi_idl.la \
- -lartsflow -lartsgsl -lartsflow_idl -lmcop
+ -lartsflow -lartsgsl -lartsflow_idl -lmcop -lglib-2.0
#libartsmodulessynth_la_LIBADD = $(top_builddir)/arts/gui/common/libartsgui_idl.la $(top_builddir)/arts/midi/libartsmidi_idl.la -lartsflow -lartsflow_idl -lmcop $(LIBDL) $(LIB_KDEUI) $(LIB_KDECORE)
libartsmodulessynth_la_LDFLAGS = $(all_libraries) -L$(arts_libraries) -lartsflow -lartsgsl -no-undefined
--- kdemultimedia/arts/modules/common/Makefile.am.ORI 2012-07-31 12:36:08.682126035 +0000
+++ kdemultimedia/arts/modules/common/Makefile.am 2012-07-31 12:36:17.362939295 +0000
@@ -25,7 +25,7 @@
$(top_builddir)/arts/gui/common/libartsgui_idl.la \
$(top_builddir)/arts/midi/libartsmidi_idl.la \
$(top_builddir)/arts/modules/synth/libartsmodulessynth.la \
- -lartsflow -lartsflow_idl -lmcop $(LIB_KDECORE)
+ -lartsflow -lartsflow_idl -lmcop $(LIB_KDECORE) -lqt-mt -lvorbisfile
libartsmodulescommon_la_LDFLAGS = $(all_libraries) -L$(arts_libraries) -no-undefined
--- kdemultimedia/juk/Makefile.am.ORI 2012-07-31 14:39:39.222531330 +0200
+++ kdemultimedia/juk/Makefile.am 2012-07-31 14:40:03.805986466 +0200
@@ -85,7 +85,7 @@
##################################################
juk_LDADD = -lm $(LDADD_GST) $(mblibs) $(LIB_KIO) $(taglib_libs) $(akode_libs) $(LIB_KHTML) $(LIB_ARTS)
-juk_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LDFLAGS_GST) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl
+juk_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LDFLAGS_GST) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl -lakode
KDE_CXXFLAGS = $(USE_EXCEPTIONS)
--- kdemultimedia/kmid/Makefile.am.ORI 2012-07-31 14:42:26.666868929 +0200
+++ kdemultimedia/kmid/Makefile.am 2012-07-31 14:43:01.345123193 +0200
@@ -4,7 +4,7 @@
lib_LTLIBRARIES = libkmidlib.la
libkmidlib_la_LDFLAGS = $(all_libraries)
-libkmidlib_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS) $(LIB_KIO) -lkmid
+libkmidlib_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS) $(LIB_KIO) -lkmid -lqt-mt -lkdeui -lDCOP -lkdecore
libkmidpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
libkmidpart_la_LIBADD = libkmidlib.la
--- kdemultimedia/kmix/Makefile.am.ORI 2012-07-31 14:45:49.958546243 +0200
+++ kdemultimedia/kmix/Makefile.am 2012-07-31 14:47:51.780002978 +0200
@@ -25,13 +25,13 @@
volume.cpp kledbutton.cpp verticaltext.cpp mixerIface.skel \
kmixtoolbox.cpp mixertoolbox.cpp dialogviewconfiguration.cpp KMixApp.cpp dialogselectmaster.cpp
-kmix_la_LIBADD = $(LIB_KDEUI) $(LIB_KUTILS) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND)
+kmix_la_LIBADD = $(LIB_KDEUI) $(LIB_KUTILS) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND) -lqt-mt -lkdecore -lDCOP
kmix_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -avoid-version
kmixctrl_la_SOURCES = kmixctrl.cpp mixer.cpp mixset.cpp mixdevice.cpp volume.cpp mixerIface.skel \
mixertoolbox.cpp mixer_backend.cpp
-kmixctrl_la_LIBADD = $(LIB_KDECORE) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND)
+kmixctrl_la_LIBADD = $(LIB_KDECORE) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND) -lqt-mt -lDCOP
kmixctrl_la_LDFLAGS = $(all_libraries) -module -avoid-version
kmix_panelapplet_la_SOURCES = kmixapplet.cpp \
--- kdemultimedia/libkcddb/Makefile.am.ORI 2012-07-31 14:54:00.740438712 +0200
+++ kdemultimedia/libkcddb/Makefile.am 2012-07-31 14:54:14.899151410 +0200
@@ -14,7 +14,7 @@
cdinfoencodingwidget.cpp cdinfoencodingwidgetbase.ui
libkcddb_la_LDFLAGS = $(all_libraries) -version-info 1:0:0
-libkcddb_la_LIBADD = $(LIB_KDECORE) $(LIB_KIO)
+libkcddb_la_LIBADD = $(LIB_KDECORE) $(LIB_KIO) -lqt-mt -lkdeui
METASOURCES = AUTO
--- kdemultimedia/noatun/library/noatunarts/Makefile.am.ORI 2012-07-31 15:07:07.507909928 +0200
+++ kdemultimedia/noatun/library/noatunarts/Makefile.am 2012-07-31 15:07:17.378685278 +0200
@@ -7,7 +7,7 @@
StereoVolumeControl_impl.cpp Session_impl.cpp
libnoatunarts_la_COMPILE_FIRST = noatunarts.h
libnoatunarts_la_LDFLAGS = $(all_libraries) -avoid-version -no-undefined
-libnoatunarts_la_LIBADD = -lkmedia2_idl -lsoundserver_idl -lartsflow
+libnoatunarts_la_LIBADD = -lkmedia2_idl -lsoundserver_idl -lartsflow -lmcop -lartsflow_idl
libnoatunarts_la_METASOURCES = AUTO
noatunarts.mcoptype: noatunarts.h
--- kdemultimedia/noatun/library/Makefile.am.ftbfs 2011-10-28 21:13:18.000000000 +0200
+++ kdemultimedia/noatun/library/Makefile.am 2012-07-31 15:20:52.961371759 +0200
@@ -30,11 +30,11 @@
libnoatun_la_LIBADD = $(top_builddir)/arts/gui/common/libartsgui.la \
$(top_builddir)/arts/gui/kde/libartsgui_kde.la $(top_builddir)/arts/modules/libartsmodules.la \
-lkio -lqtmcop -lkmedia2_idl $(top_builddir)/noatun/library/noatunarts/libnoatunarts.la \
- -lartsflow -lsoundserver_idl -lartskde $(LIBDL)
+ -lartsflow -lsoundserver_idl -lartskde $(LIBDL) -lqt-mt -lDCOP
libnoatuncontrols_la_SOURCES = controls.cpp scrollinglabel.cpp
libnoatuncontrols_la_LDFLAGS = -version-info 3:0:2 $(KDE_RPATH) $(all_libraries) -no-undefined
-libnoatuncontrols_la_LIBADD = $(LIBDL) $(LIB_KDEUI)
+libnoatuncontrols_la_LIBADD = $(LIBDL) $(LIB_KDEUI) -lqt-mt -lkdecore
METASOURCES = AUTO
META_INCLUDES = $(srcdir)/noatun
--- kdemultimedia/noatun/modules/winskin/vis/Makefile.am.ORI 2012-07-31 15:26:20.619544165 +0200
+++ kdemultimedia/noatun/modules/winskin/vis/Makefile.am 2012-07-31 15:26:33.802272534 +0200
@@ -17,7 +17,7 @@
libwinskinvis_la_LDFLAGS= $(all_libraries) -avoid-version \
-no-undefined
-libwinskinvis_la_LIBADD = -lkmedia2_idl -lsoundserver_idl -lartsflow
+libwinskinvis_la_LIBADD = -lkmedia2_idl -lsoundserver_idl -lartsflow -lartsflow_idl -lmcop
libwinskinvis_la_COMPILE_FIRST = winskinvis.cc
libwinskinvis_la_METASOURCES = AUTO

File diff suppressed because it is too large Load Diff

@ -0,0 +1,20 @@
commit 5c988de1bdaf2c4cf692e6c195375607a8c67ab0
Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: 1343320500 -0500
Fix a fatal error message
Thanks to 'Nix' for the patch!
diff --git a/kopete/plugins/netmeeting/CMakeLists.txt b/kopete/plugins/netmeeting/CMakeLists.txt
index b6cc031..318b672 100644
--- a/kopete/plugins/netmeeting/CMakeLists.txt
+++ b/kopete/plugins/netmeeting/CMakeLists.txt
@@ -10,7 +10,7 @@
#################################################
if( NOT BUILD_KOPETE_PROTOCOL_MSN )
- tde_message_error( "netmeeting plugin needs msn protocol.\n Add -DBUILD_KOPETE_PROTOCOL_MSN=ON to cmake flags." )
+ tde_message_fatal( "netmeeting plugin needs msn protocol.\n Add -DBUILD_KOPETE_PROTOCOL_MSN=ON to cmake flags." )
endif( )
include_directories(

@ -0,0 +1,46 @@
commit 0a2892edc380aa11fb5474004e02fd4d86abdec1
Author: Slávek Banko <slavek.banko@axis.cz>
Date: 1340214777 +0200
Fix html special chars in kopete nowlistening plugin
This partially resolves Bug 944
diff --git a/kopete/plugins/nowlistening/nowlisteningplugin.cpp b/kopete/plugins/nowlistening/nowlisteningplugin.cpp
index a914818..1f1fed5 100644
--- a/kopete/plugins/nowlistening/nowlisteningplugin.cpp
+++ b/kopete/plugins/nowlistening/nowlisteningplugin.cpp
@@ -20,6 +20,7 @@
#include <tqtimer.h>
#include <tqstringlist.h>
+#include <tqstylesheet.h>
#include <tqregexp.h>
#include <kdebug.h>
@@ -189,7 +190,7 @@ void NowListeningPlugin::slotOutgoingMessage(Kopete::Message& msg)
if(!NowListeningConfig::self()->chatAdvertising())
return;
- TQString originalBody = msg.plainBody();
+ TQString originalBody = msg.escapedBody();
// If it is a /media message, don't process it
if(originalBody.startsWith(NowListeningConfig::self()->header()))
@@ -222,7 +223,7 @@ void NowListeningPlugin::slotOutgoingMessage(Kopete::Message& msg)
{
TQString advert = mediaPlayerAdvert(false); // false since newTrackPlaying() did the update
if( !advert.isEmpty() )
- newBody = originalBody + "<br>" + advert;
+ newBody = originalBody + "<br>" + TQStyleSheet::escape(advert);
// If we send because the information has changed since it was last sent, we must
// rebuild the list of contacts the latest information was sent to.
@@ -501,7 +502,7 @@ void NowListeningPlugin::advertiseToChat( Kopete::ChatSession *theChat, TQString
pl,
message,
Kopete::Message::Outbound,
- Kopete::Message::RichText );
+ Kopete::Message::PlainText );
theChat->sendMessage( msg );
}

@ -0,0 +1,46 @@
commit 2d699f523902244113eeec627ca6b9b18b740da0
Author: Slávek Banko <slavek.banko@axis.cz>
Date: 1340214777 +0200
Fix html special chars in kopete nowlistening plugin
This partially resolves Bug 994
diff --git a/kopete/plugins/nowlistening/nowlisteningplugin.cpp b/kopete/plugins/nowlistening/nowlisteningplugin.cpp
index a914818..1f1fed5 100644
--- a/kopete/plugins/nowlistening/nowlisteningplugin.cpp
+++ b/kopete/plugins/nowlistening/nowlisteningplugin.cpp
@@ -20,6 +20,7 @@
#include <tqtimer.h>
#include <tqstringlist.h>
+#include <tqstylesheet.h>
#include <tqregexp.h>
#include <kdebug.h>
@@ -189,7 +190,7 @@ void NowListeningPlugin::slotOutgoingMessage(Kopete::Message& msg)
if(!NowListeningConfig::self()->chatAdvertising())
return;
- TQString originalBody = msg.plainBody();
+ TQString originalBody = msg.escapedBody();
// If it is a /media message, don't process it
if(originalBody.startsWith(NowListeningConfig::self()->header()))
@@ -222,7 +223,7 @@ void NowListeningPlugin::slotOutgoingMessage(Kopete::Message& msg)
{
TQString advert = mediaPlayerAdvert(false); // false since newTrackPlaying() did the update
if( !advert.isEmpty() )
- newBody = originalBody + "<br>" + advert;
+ newBody = originalBody + "<br>" + TQStyleSheet::escape(advert);
// If we send because the information has changed since it was last sent, we must
// rebuild the list of contacts the latest information was sent to.
@@ -501,7 +502,7 @@ void NowListeningPlugin::advertiseToChat( Kopete::ChatSession *theChat, TQString
pl,
message,
Kopete::Message::Outbound,
- Kopete::Message::RichText );
+ Kopete::Message::PlainText );
theChat->sendMessage( msg );
}

@ -0,0 +1,19 @@
commit 35c41f35b08e981caa062f963ad2611ee6ef35a9
Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: 1343320733 -0500
Fix a parallel build bug
Thanks to 'Nix' for the patch!
diff --git a/filesharing/advanced/propsdlgplugin/CMakeLists.txt b/filesharing/advanced/propsdlgplugin/CMakeLists.txt
index f6477d1..26d94f5 100644
--- a/filesharing/advanced/propsdlgplugin/CMakeLists.txt
+++ b/filesharing/advanced/propsdlgplugin/CMakeLists.txt
@@ -32,6 +32,7 @@ install( FILES
tde_add_library( propsdlgplugin_common STATIC_PIC AUTOMOC
SOURCES propertiespage.cpp propertiespagegui.ui
+ DEPENDENCIES filesharesamba
)

@ -0,0 +1,114 @@
commit d8cbbab802a063679a4db5cebc73122cdb1da100
Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: 1343324022 -0500
Use libv4l if available, otherwise check for v4l1 headers
diff --git a/kopete/ConfigureChecks.cmake b/kopete/ConfigureChecks.cmake
index aece436..70e97f5 100644
--- a/kopete/ConfigureChecks.cmake
+++ b/kopete/ConfigureChecks.cmake
@@ -26,3 +26,10 @@ if ( HAVE_LIBV4L1_VIDEODEV_H )
endif ( )
# -- End libv4l1-videodev.h ----------------------------------------------
+# -- Check for linux/videodev.h presence --------------------
+CHECK_INCLUDE_FILE ( "linux/videodev.h" HAVE_LINUX_VIDEODEV_H )
+if ( HAVE_LINUX_VIDEODEV_H )
+ add_definitions( -DHAVE_LINUX_VIDEODEV_H )
+endif ( )
+# -- End linux-videodev.h ----------------------------------------------
+
diff --git a/kopete/libkopete/avdevice/videocontrol.h b/kopete/libkopete/avdevice/videocontrol.h
index c4db3b9..dbef6b5 100644
--- a/kopete/libkopete/avdevice/videocontrol.h
+++ b/kopete/libkopete/avdevice/videocontrol.h
@@ -15,8 +15,6 @@
*************************************************************************
*/
-#define ENABLE_AV
-
#ifndef KOPETE_AVVIDEOCONTROL_H
#define KOPETE_AVVIDEOCONTROL_H
diff --git a/kopete/libkopete/avdevice/videodevice.cpp b/kopete/libkopete/avdevice/videodevice.cpp
index ea23544..e12fb02 100644
--- a/kopete/libkopete/avdevice/videodevice.cpp
+++ b/kopete/libkopete/avdevice/videodevice.cpp
@@ -15,8 +15,6 @@
*************************************************************************
*/
-#define ENABLE_AV
-
#include <cstdlib>
#include <cerrno>
#include <cstring>
diff --git a/kopete/libkopete/avdevice/videodevice.h b/kopete/libkopete/avdevice/videodevice.h
index 7bba507..7e57513 100644
--- a/kopete/libkopete/avdevice/videodevice.h
+++ b/kopete/libkopete/avdevice/videodevice.h
@@ -15,11 +15,11 @@
*************************************************************************
*/
-#define ENABLE_AV
-
#ifndef KOPETE_AVVIDEODEVICELISTITEM_H
#define KOPETE_AVVIDEODEVICELISTITEM_H
+#define ENABLE_AV
+
#if defined HAVE_CONFIG_H
#include <config.h>
#endif
@@ -54,8 +54,10 @@
#include <linux/kernel.h>
#if defined(HAVE_LIBV4L1_VIDEODEV_H)
#include <libv4l1-videodev.h>
-#else
+#elif defined(HAVE_LINUX_VIDEODEV_H)
#include <linux/videodev.h>
+#else
+#undef ENABLE_AV
#endif
#define VIDEO_MODE_PAL_Nc 3
#define VIDEO_MODE_PAL_M 4
@@ -293,8 +295,10 @@ public:
void enumerateMenu (void);
#endif
+#ifndef ENABLE_AV
struct video_capability V4L_capabilities;
struct video_buffer V4L_videobuffer;
+#endif
#endif
TQValueVector<Kopete::AV::VideoInput> m_input;
TQValueVector<Kopete::AV::VideoControl> m_control;
diff --git a/kopete/libkopete/avdevice/videodevicepool.cpp b/kopete/libkopete/avdevice/videodevicepool.cpp
index b725d5d..cbfe7cb 100644
--- a/kopete/libkopete/avdevice/videodevicepool.cpp
+++ b/kopete/libkopete/avdevice/videodevicepool.cpp
@@ -15,8 +15,6 @@
*************************************************************************
*/
-#define ENABLE_AV
-
#include <assert.h>
#include <cstdlib>
#include <cerrno>
diff --git a/kopete/libkopete/avdevice/videoinput.h b/kopete/libkopete/avdevice/videoinput.h
index 9fc109a..dd7504f 100644
--- a/kopete/libkopete/avdevice/videoinput.h
+++ b/kopete/libkopete/avdevice/videoinput.h
@@ -15,8 +15,6 @@
*************************************************************************
*/
-#define ENABLE_AV
-
#ifndef KOPETE_AVVIDEOINPUT_H
#define KOPETE_AVVIDEOINPUT_H

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

@ -0,0 +1,100 @@
commit bfb0bc00e959ed3cac6cf4e517a24de50446be50
Author: Serghei Amelian <serghei.amelian@gmail.com>
Date: 1329176749 +0200
[tdesdk] cmake port
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 806890a..c6f7d3d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -26,6 +26,7 @@ include( CheckIncludeFile )
include( CheckTypeSize )
include( CheckCSourceCompiles )
include( CheckCXXSourceCompiles )
+include( CheckFunctionExists )
include( CheckLibraryExists )
@@ -55,6 +56,21 @@ option( BUILD_DOC "Build documentation" ${BUILD_ALL} )
option( BUILD_KAPPTEMPLATE "Build kapptemplate" ${BUILD_ALL} )
option( BUILD_KBABEL "Build kbabel" ${BUILD_ALL} )
option( BUILD_KBUGBUSTER "Build kbugbuster" ${BUILD_ALL} )
+option( BUILD_KDEACCOUNTS_PLUGIN "Build kdeaccounts-plugin" ${BUILD_ALL} )
+option( BUILD_KFILE_PLUGINS "Build kfile-plugins" ${BUILD_ALL} )
+option( BUILD_KIOSLAVE "Build kioslave" ${BUILD_ALL} )
+option( BUILD_KMTRACE "Build kmtrace" ${BUILD_ALL} )
+option( BUILD_KOMPARE "Build kompare" ${BUILD_ALL} )
+option( BUILD_KPROFILEMETHOD "Build kprofilemethod" ${BUILD_ALL} )
+option( BUILD_KSPY "Build kspy" ${BUILD_ALL} )
+option( BUILD_KSTARTPERF "Build kstartperf" ${BUILD_ALL} )
+option( BUILD_KUIVIEWER "Build kuiviewer" ${BUILD_ALL} )
+option( BUILD_KUNITTEST "Build kunittest" ${BUILD_ALL} )
+option( BUILD_POXML "Build poxml" ${BUILD_ALL} )
+option( BUILD_SCHECK "Build scheck" ${BUILD_ALL} )
+option( BUILD_SCRIPTS "Build scripts" ${BUILD_ALL} )
+option( BUILD_TDECACHEGRIND "Build tdecachegrind" ${BUILD_ALL} )
+option( BUILD_UMBRELLO "Build umbrello" ${BUILD_ALL} )
##### configure checks ##########################
@@ -83,6 +96,21 @@ tde_conditional_add_subdirectory( BUILD_DOC doc )
tde_conditional_add_subdirectory( BUILD_KAPPTEMPLATE kapptemplate )
tde_conditional_add_subdirectory( BUILD_KBABEL kbabel )
tde_conditional_add_subdirectory( BUILD_KBUGBUSTER kbugbuster )
+tde_conditional_add_subdirectory( BUILD_KDEACCOUNTS_PLUGIN kdeaccounts-plugin )
+tde_conditional_add_subdirectory( BUILD_KFILE_PLUGINS kfile-plugins )
+tde_conditional_add_subdirectory( BUILD_KIOSLAVE kioslave )
+tde_conditional_add_subdirectory( BUILD_KMTRACE kmtrace )
+tde_conditional_add_subdirectory( BUILD_KOMPARE kompare )
+tde_conditional_add_subdirectory( BUILD_KPROFILEMETHOD kprofilemethod )
+tde_conditional_add_subdirectory( BUILD_KSPY kspy )
+tde_conditional_add_subdirectory( BUILD_KSTARTPERF kstartperf )
+tde_conditional_add_subdirectory( BUILD_KUIVIEWER kuiviewer )
+tde_conditional_add_subdirectory( BUILD_KUNITTEST kunittest )
+tde_conditional_add_subdirectory( BUILD_POXML poxml )
+tde_conditional_add_subdirectory( BUILD_SCHECK scheck )
+tde_conditional_add_subdirectory( BUILD_SCRIPTS scripts )
+tde_conditional_add_subdirectory( BUILD_TDECACHEGRIND kcachegrind )
+tde_conditional_add_subdirectory( BUILD_UMBRELLO umbrello )
##### write configure files #####################
diff --git a/config.h.cmake b/config.h.cmake
index 139f3c7..7ab8b07 100644
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -1 +1,4 @@
#cmakedefine VERSION "@version@"
+
+// kcachegrind
+#cmakedefine HAVE_MMAP 1
diff --git a/kbabel/kbabel/CMakeLists.txt b/kbabel/kbabel/CMakeLists.txt
index b5164b4..6b263b5 100644
--- a/kbabel/kbabel/CMakeLists.txt
+++ b/kbabel/kbabel/CMakeLists.txt
@@ -62,4 +62,5 @@ tde_add_library( kbabel STATIC AUTOMOC
fontpreferences.ui editordiffpreferences.ui editorpreferences.ui
searchpreferences.ui colorpreferences.ui kbcataloglistview.cpp
kbcataloglistviewitem.cpp errorlistview.cpp
+ DEPENDENCIES kbabelcommon-shared
)
diff --git a/kmtrace/ktrace.c b/kmtrace/ktrace.c
index 21fca37..8b9eb2f 100644
--- a/kmtrace/ktrace.c
+++ b/kmtrace/ktrace.c
@@ -778,12 +778,12 @@ kuntrace()
"Mallocs: %8ld Frees: %8ld Leaks: %8ld\n"
"Logged Mallocs: %8ld Logged Frees: %8ld Logged Leaks: %8ld\n"
"Avg. Free lookups: %ld Malloc collisions: %ld Max offset: %ld\n",
- tr_max_mallocs, TR_CACHE_SIZE, tr_flashes,
+ tr_max_mallocs, (long int)TR_CACHE_SIZE, tr_flashes,
tr_mallocs, tr_frees, tr_current_mallocs,
tr_logged_mallocs, tr_logged_frees,
tr_logged_mallocs - tr_logged_frees,
tr_frees > 0 ? ( tr_failed_free_lookups / tr_frees ) : 0,
- tr_malloc_collisions, tr_max_offset);
+ tr_malloc_collisions, (long int)tr_max_offset);
#endif
fclose (mallstream);
mallstream = NULL;

@ -0,0 +1,32 @@
commit 572169a2e18705e526990c52924a268b218ff52b
Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: 1340737965 -0500
Fix FTBFS on newer subversion libraries
This closes Bug 872
diff --git a/kioslave/svn/ConfigureChecks.cmake b/kioslave/svn/ConfigureChecks.cmake
index 81358c6..3d46c74 100644
--- a/kioslave/svn/ConfigureChecks.cmake
+++ b/kioslave/svn/ConfigureChecks.cmake
@@ -19,12 +19,16 @@ endif( )
# check for subversion library
-check_library_exists( "svn_client-1" "svn_pool_create_ex" "${SVN_LIBRARY_DIR}" HAVE_SVN_POOL_CREATE_EX )
-
-if( HAVE_SVN_POOL_CREATE_EX )
+check_library_exists( "svn_client-1" "svn_pool_create_ex" "${SVN_LIBRARY_DIR}" HAVE_SVN_POOL_CREATE_EX_SVN_CLIENT )
+if( HAVE_SVN_POOL_CREATE_EX_SVN_CLIENT )
set( SVN_LIBRARIES "svn_client-1;svn_subr-1;svn_ra-1" )
else( )
- tde_message_fatal( "svn_client-1 library was not found on your system.\n Subversion is installed?\n Try to set SVN_LIBRARY_DIR to subversion library directory." )
+ check_library_exists( "svn_subr-1" "svn_pool_create_ex" "${SVN_LIBRARY_DIR}" HAVE_SVN_POOL_CREATE_EX_SUBR )
+ if( HAVE_SVN_POOL_CREATE_EX_SUBR )
+ set( SVN_LIBRARIES "svn_client-1;svn_subr-1;svn_ra-1" )
+ else( )
+ tde_message_fatal( "svn_client-1 or svn_subr-1 library was not found on your system.\n Subversion is installed?\n Try to set SVN_LIBRARY_DIR to subversion library directory." )
+ endif( )
endif( )

@ -0,0 +1,21 @@
--- kdesdk/kapptemplate/CMakeLists.txt.ORI 2012-07-30 17:58:45.681535290 +0200
+++ kdesdk/kapptemplate/CMakeLists.txt 2012-07-30 17:58:55.232338294 +0200
@@ -23,7 +23,7 @@
install( PROGRAMS
${CMAKE_CURRENT_BINARY_DIR}/kapptemplate
- DESTINATION ${DATA_INSTALL_DIR}/kapptemplate/bin )
+ DESTINATION ${BIN_INSTALL_DIR}/kapptemplate/bin )
install( FILES
kapptemplate.common kapptemplate.module
--- kdesdk/kbugbuster/kresources/CMakeLists.txt.ORI 2012-07-30 18:00:21.039575551 +0200
+++ kdesdk/kbugbuster/kresources/CMakeLists.txt 2012-07-30 18:00:25.414486000 +0200
@@ -17,6 +17,7 @@
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/../backend
${TDE_INCLUDE_DIR}
+ ${TDE_INCLUDE_DIR}/kde
${TQT_INCLUDE_DIRS}
)

File diff suppressed because it is too large Load Diff

@ -0,0 +1,21 @@
--- kdetoys/kweather/Makefile.am.ORI 2012-08-01 10:42:11.015544034 +0200
+++ kdetoys/kweather/Makefile.am 2012-08-01 10:44:37.144904650 +0200
@@ -26,7 +26,8 @@
weatherIface.skel weatherservice.stub \
weatherbutton.cpp
weather_panelapplet_la_LDFLAGS = $(KDE_PLUGIN) -module $(all_libraries)
-weather_panelapplet_la_LIBADD = $(LIB_KHTML)
+weather_panelapplet_la_LIBADD = $(LIB_KHTML) -lqt-mt -lDCOP
+
appletdir = $(kde_datadir)/kicker/applets
applet_DATA = kweather.desktop
@@ -67,7 +68,7 @@
kde_services_DATA = kcmweather.desktop kcmweatherservice.desktop
kweatherreport_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version
-kweatherreport_la_LIBADD = $(LIB_KHTML) reportview.lo
+kweatherreport_la_LIBADD = $(LIB_KHTML) reportview.lo -lqt-mt -lDCOP -lkdecore -lkdeui
kweatherreport_la_SOURCES = reportmain.cpp weatherservice.stub
KDE_ICON = kweather

@ -1,24 +1,35 @@
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr" %if "%{?_prefix}" != "/usr"
%define _variant .opt %define _variant .opt
%define _docdir %{_datadir}/doc
%endif %endif
# TDE 3.5.13 specific building variables # TDE 3.5.13 specific building variables
%define tde_docdir %{_docdir}/kde %define tde_bindir %{_prefix}/bin
%define tde_includedir %{_includedir}/kde %define tde_datadir %{_prefix}/share
%define tde_libdir %{_libdir}/trinity %define tde_docdir %{tde_datadir}/doc
%define tde_includedir %{_prefix}/include
%define tde_libdir %{_prefix}/%{_lib}
%define tde_tdeappdir %{tde_datadir}/applications/kde
%define tde_tdedocdir %{tde_docdir}/kde
%define tde_tdeincludedir %{tde_includedir}/kde
%define tde_tdelibdir %{tde_libdir}/trinity
Summary: K Desktop Environment - Toys and Amusements %define _docdir %{tde_docdir}
Name: trinity-kdetoys
Group: Amusements/Graphics
Version: 3.5.13 Summary: Trinity Desktop Environment - Toys and Amusements
Release: 2%{?dist}%{?_variant} Name: trinity-tdetoys
Group: Amusements/Graphics
Version: 3.5.13
Release: 3%{?dist}%{?_variant}
License: GPLv2+ License: GPLv2+
Source0: kdetoys-%{version}.tar.gz Source0: kdetoys-%{version}.tar.gz
# [kdetoys] Missing LDFLAGS cause FTBFS on Mageia 2
Patch1: kdetoys-3.5.13-missing_ldflags.patch
Vendor: Trinity Project Vendor: Trinity Project
Packager: Francois Andriot <francois.andriot@free.fr> Packager: Francois Andriot <francois.andriot@free.fr>
URL: http://www.trinitydesktop.org/ URL: http://www.trinitydesktop.org/
@ -32,6 +43,20 @@ BuildRequires: tqtinterface-devel
BuildRequires: trinity-kdelibs-devel BuildRequires: trinity-kdelibs-devel
BuildRequires: gettext BuildRequires: gettext
Obsoletes: trinity-kdetoys < %{version}-%{release}
Provides: trinity-kdetoys = %{version}-%{release}
# Metapackage
Requires: trinity-amor = %{version}-%{release}
Requires: trinity-eyesapplet = %{version}-%{release}
Requires: trinity-fifteenapplet = %{version}-%{release}
Requires: trinity-kmoon = %{version}-%{release}
Requires: trinity-kodo = %{version}-%{release}
Requires: trinity-kteatime = %{version}-%{release}
Requires: trinity-ktux = %{version}-%{release}
Requires: trinity-kweather = %{version}-%{release}
Requires: trinity-kworldclock = %{version}-%{release}
%description %description
Includes: Includes:
@ -47,17 +72,315 @@ Includes:
globe globe
NOTE: kicker applets and screen savers require kdebase to be installed, NOTE: kicker applets and screen savers require kdebase to be installed,
and user to be logged-in to KDE. and user to be logged-in to TDE.
%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING README
##########
%package -n trinity-amor
Summary: a Trinity creature for your desktop
Group: Amusements/Graphics
%description -n trinity-amor
AMOR stands for Amusing Misuse Of Resources. It provides several different
characters who prance around your X screen doing tricks and giving you tips.
Note that AMOR will only work with some window managers. Both KWin (the
KDE window manager) and Metacity (a GTK2 window manager) are supported.
This package is part of Trinity, and a component of the TDE toys module.
%files -n trinity-amor
%defattr(-,root,root,-)
%{tde_bindir}/amor
%exclude %{tde_tdeincludedir}/AmorIface.h
%{tde_datadir}/apps/amor/
%{tde_tdeappdir}/amor.desktop
%{tde_datadir}/icons/hicolor/*/apps/amor.png
%{tde_tdedocdir}/HTML/en/amor/
%doc AUTHORS COPYING README
%post -n trinity-amor
touch --no-create %{_datadir}/icons/hicolor ||:
gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
%postun -n trinity-amor
touch --no-create %{_datadir}/icons/hicolor ||:
gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
##########
%package -n trinity-eyesapplet
Summary: eyes applet for Trinity
Group: Amusements/Graphics
%description -n trinity-eyesapplet
An applet for the KDE panel containing a pair of eyes that follow your mouse
around the screen.
This package is part of Trinity, and a component of the TDE toys module.
%files -n trinity-eyesapplet
%defattr(-,root,root,-)
%{tde_tdelibdir}/eyes_panelapplet.la
%{tde_tdelibdir}/eyes_panelapplet.so
%{tde_datadir}/apps/kicker/applets/eyesapplet.desktop
%doc AUTHORS COPYING README
##########
%package -n trinity-fifteenapplet
Summary: fifteen pieces puzzle for Trinity
Group: Amusements/Graphics
%description -n trinity-fifteenapplet
An applet for the KDE panel that lets you play the Fifteen Pieces
sliding block puzzle. You have to order 15 pieces in a 4x4 square by
moving them around.
This package is part of Trinity, and a component of the TDE toys module.
%files -n trinity-fifteenapplet
%defattr(-,root,root,-)
%{tde_tdelibdir}/fifteen_panelapplet.la
%{tde_tdelibdir}/fifteen_panelapplet.so
%{tde_datadir}/apps/kicker/applets/kfifteenapplet.desktop
%doc AUTHORS COPYING README
##########
%package -n trinity-kmoon
Summary: moon phase indicator for Trinity
Group: Amusements/Graphics
%description -n trinity-kmoon
An applet for the KDE panel that displays the current phase of the moon.
This package is part of Trinity, and a component of the TDE toys module.
%files -n trinity-kmoon
%defattr(-,root,root,-)
%{tde_tdelibdir}/kmoon_panelapplet.la
%{tde_tdelibdir}/kmoon_panelapplet.so
%{tde_datadir}/apps/kicker/applets/kmoonapplet.desktop
%{tde_datadir}/apps/kmoon/
%{tde_datadir}/icons/hicolor/*/apps/kmoon.png
%{tde_tdedocdir}/HTML/en/kmoon/
%doc AUTHORS COPYING README
%post -n trinity-kmoon
touch --no-create %{_datadir}/icons/hicolor ||:
gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
%postun
touch --no-create %{_datadir}/icons/hicolor ||:
gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
##########
%package -n trinity-kodo
Summary: mouse odometer for Trinity
Group: Amusements/Graphics
%description -n trinity-kodo
KOdometer measures your desktop mileage. It tracks the movement of your mouse
pointer across your desktop and renders it in inches/feet/miles! It can
do cm/metres/km too. Its most exciting feature is the tripometer.
This package is part of Trinity, and a component of the TDE toys module.
%files -n trinity-kodo
%defattr(-,root,root,-)
%{tde_bindir}/kodo
%{tde_tdeappdir}/kodo.desktop
%{tde_datadir}/apps/kodo/numbers.png
%{tde_datadir}/icons/hicolor/*/apps/kodo.png
%{tde_tdedocdir}/HTML/en/kodo/
%doc AUTHORS COPYING README
%post -n trinity-kodo
touch --no-create %{_datadir}/icons/hicolor ||:
gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
%postun -n trinity-kodo
touch --no-create %{_datadir}/icons/hicolor ||:
gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
##########
%package -n trinity-kteatime
Summary: Trinity utility for making a fine cup of tea
Group: Amusements/Graphics
%description -n trinity-kteatime
KTeaTime is a handy timer for steeping tea. No longer will you have to
guess at how long it takes for your tea to be ready. Simply select the
type of tea you have, and it will alert you when the tea is ready to
drink.
KTeaTime sits in the Trinity system tray.
Please note that KTeaTime is written explicitly for Trinity. If you are
using a non-KDE window manager or desktop environment then it is quite
possible that KTeaTime will not work on your system.
This package is part of Trinity, and a component of the TDE toys module.
%files -n trinity-kteatime
%defattr(-,root,root,-)
%{tde_bindir}/kteatime
%{tde_tdeappdir}/kteatime.desktop
%{tde_datadir}/apps/kteatime/
%{tde_datadir}/icons/hicolor/*/apps/kteatime.png
%{tde_tdedocdir}/HTML/en/kteatime/
%doc AUTHORS COPYING README
%post -n trinity-kteatime
touch --no-create %{_datadir}/icons/hicolor ||:
gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
%postun -n trinity-kteatime
touch --no-create %{_datadir}/icons/hicolor ||:
gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
##########
%package -n trinity-ktux
Summary: Tux screensaver for Trinity
Group: Amusements/Graphics
%description -n trinity-ktux
A neat Tux-in-a-spaceship screensaver for the K Desktop Environment (KDE).
This package is part of Trinity, and a component of the TDE toys module.
%files -n trinity-ktux
%defattr(-,root,root,-)
%{tde_bindir}/ktux
%{tde_datadir}/apps/ktux/
%{tde_datadir}/applnk/System/ScreenSavers/ktux.desktop
%{tde_datadir}/icons/hicolor/*/apps/ktux.png
%doc AUTHORS COPYING README
%post -n trinity-ktux
touch --no-create %{_datadir}/icons/hicolor ||:
gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
%postun -n trinity-ktux
touch --no-create %{_datadir}/icons/hicolor ||:
gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
##########
%package -n trinity-kweather
Summary: weather display applet for Trinity
Group: Amusements/Graphics
%description -n trinity-kweather
An applet for the KDE panel that displays your area's current weather.
Information shown includes the temperature, wind speed, air pressure
and more. By pressing a button a full weather report can be obtained.
KWeather also provides a weather service that can track multiple weather
stations and provide this information to other applications, including
Konqueror's sidebar and Kontact's summary page.
This package is part of Trinity, and a component of the TDE toys module.
%files -n trinity-kweather
%defattr(-,root,root,-)
%{tde_bindir}/kweatherservice
%{tde_bindir}/kweatherreport
%{tde_libdir}/lib[kt]deinit_kweatherreport.so
%{tde_libdir}/lib[kt]deinit_kweatherreport.la
%{tde_tdelibdir}/kcm_weather.so
%{tde_tdelibdir}/kcm_weather.la
%{tde_tdelibdir}/kcm_weatherservice.so
%{tde_tdelibdir}/kcm_weatherservice.la
%{tde_tdelibdir}/kweatherreport.so
%{tde_tdelibdir}/kweatherreport.la
%{tde_tdelibdir}/weather_panelapplet.la
%{tde_tdelibdir}/weather_panelapplet.so
%{tde_datadir}/apps/kicker/applets/kweather.desktop
%{tde_datadir}/apps/kweather/
%{tde_datadir}/apps/kweatherservice/stations.dat
%{tde_datadir}/apps/kweatherservice/weather_stations.desktop
%{tde_datadir}/icons/hicolor/*/apps/kweather.png
%{tde_datadir}/services/kweatherservice.desktop
%{tde_datadir}/services/kcmweather.desktop
%{tde_datadir}/services/kcmweatherservice.desktop
%{tde_tdedocdir}/HTML/en/kweather/
%doc AUTHORS COPYING README
%post -n trinity-kweather
touch --no-create %{_datadir}/icons/hicolor ||:
gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
%postun -n trinity-kweather
touch --no-create %{_datadir}/icons/hicolor ||:
gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
##########
%package -n trinity-kworldclock
Summary: earth watcher for Trinity
Group: Amusements/Graphics
%description -n trinity-kworldclock
Displays where in the world it is light and dark depending on time, as
well as offering the time in all of the major cities of the world.
This can be run standalone, as an applet in the KDE panel or as a
desktop background.
Additional kworldclock themes are available in the tdeartwork-misc package.
This package is part of Trinity, and a component of the TDE toys module.
%files -n trinity-kworldclock
%defattr(-,root,root,-)
%{tde_bindir}/kworldclock
%{tde_tdelibdir}/ww_panelapplet.la
%{tde_tdelibdir}/ww_panelapplet.so
%{tde_tdeappdir}/kworldclock.desktop
%{tde_datadir}/apps/kdesktop/programs/kdeworld.desktop
%{tde_datadir}/apps/kicker/applets/kwwapplet.desktop
%{tde_datadir}/apps/kworldclock/
%{tde_datadir}/icons/hicolor/*/apps/kworldclock.png
%{tde_tdedocdir}/HTML/en/kworldclock/
%doc AUTHORS COPYING README
%post -n trinity-kworldclock
touch --no-create %{_datadir}/icons/hicolor ||:
gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
%postun -n trinity-kworldclock
touch --no-create %{_datadir}/icons/hicolor ||:
gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
##########
%prep %prep
%setup -q -n kdetoys %setup -q -n kdetoys
%patch1 -p1 -b .ftbfs
# Ugly hack to modify TQT include directory inside autoconf files. # Ugly hack to modify TQT include directory inside autoconf files.
# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
%__sed -i admin/acinclude.m4.in \ %__sed -i admin/acinclude.m4.in \
-e "s|/usr/include/tqt|%{_includedir}/tqt|g" \ -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g" -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
@ -66,42 +389,34 @@ and user to be logged-in to KDE.
%build %build
unset QTDIR || : ; . /etc/profile.d/qt.sh unset QTDIR || : ; . /etc/profile.d/qt.sh
export PATH="%{_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
export LDFLAGS="-L%{_libdir} -I%{_includedir}" export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
%configure \ %configure \
--includedir=%{_includedir}/kde \ --exec-prefix=%{_prefix} \
--disable-rpath \ --bindir=%{tde_bindir} \
--enable-new-ldflags \ --libdir=%{tde_libdir} \
--enable-closure \ --datadir=%{tde_datadir} \
--disable-debug --disable-warnings \ --includedir=%{tde_tdeincludedir} \
--disable-dependency-tracking --enable-final \ --disable-rpath \
--with-extra-includes=%{_includedir}/tqt --enable-new-ldflags \
--enable-closure \
--disable-debug --disable-warnings \
--disable-dependency-tracking --enable-final \
--with-extra-includes=%{tde_includedir}/tqt
%__make %{?_smp_mflags} %__make %{?_smp_mflags}
%install %install
export PATH="%{_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
%__rm -rf "%{buildroot}" %__rm -rf "%{buildroot}"
%__make install DESTDIR=%{buildroot} %__make install DESTDIR=%{buildroot}
desktop-file-install \
--dir=%{buildroot}%{_datadir}/applnk/System/ScreenSavers \
--vendor="" \
%{buildroot}%{_datadir}/applnk/System/ScreenSavers/*.desktop ||:
desktop-file-install \
--dir=%{buildroot}%{_datadir}/applications/kde \
--vendor="" \
%{buildroot}%{_datadir}/applications/kde/*.desktop ||:
# replace absolute symlink with relative # replace absolute symlink with relative
ln -nfs tips-en %{buildroot}%{_datadir}/apps/amor/tips ln -nfs tips-en %{buildroot}%{tde_datadir}/apps/amor/tips
## File lists ## File lists
# locale's
%find_lang %{name} || touch %{name}.lang
# HTML (1.0) # HTML (1.0)
HTML_DIR=$(kde-config --expandvars --install html) HTML_DIR=$(kde-config --expandvars --install html)
if [ -d %{buildroot}$HTML_DIR ]; then if [ -d %{buildroot}$HTML_DIR ]; then
@ -119,38 +434,17 @@ for lang_dir in %{buildroot}$HTML_DIR/* ; do
done done
fi fi
## Unpackaged files
# not sure the point of just one header file 'AmorIface.h', omit (for now).
%__rm -rf %{buildroot}%{_includedir}
%post
touch --no-create %{_datadir}/icons/hicolor ||:
gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
%postun
touch --no-create %{_datadir}/icons/hicolor ||:
gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING README
%{_bindir}/*
%{_libdir}/libkdeinit_*.*
%{tde_libdir}/*
%{_datadir}/applications/kde/*.desktop
%{_datadir}/applnk/System/ScreenSavers/*.desktop
%{_datadir}/apps/*
%{_datadir}/icons/hicolor/*/*/*
%{_datadir}/service*/*.desktop
%doc %lang(en) %{tde_docdir}/HTML/en/*
%clean %clean
%__rm -rf %{buildroot} %__rm -rf %{buildroot}
%changelog %changelog
* Wed Aug 01 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-3
- Split into several packages
- Renames to 'trinity-tdetoys'
- Add support for Mageia 2
* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-2 * Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-2
- Fix HTML directory location - Fix HTML directory location

@ -0,0 +1,63 @@
--- kdeutils/ark/arch.cpp~ 2011-08-13 09:25:08.000000000 +0300
+++ kdeutils/ark/arch.cpp 2012-06-14 16:58:52.417875615 +0300
@@ -33,6 +33,7 @@
// QT includes
#include <tqapplication.h>
#include <tqfile.h>
+#include <tqtextcodec.h>
// KDE includes
#include <kdebug.h>
@@ -288,7 +290,7 @@
data[ lfChar ] = '\0';
- m_buffer.append( TQString::fromUtf8(data + startChar).latin1() );
+ m_buffer.append( data + startChar );
data[ lfChar ] = '\n';
startChar = lfChar + 1;
@@ -333,12 +335,15 @@
unsigned int pos = 0;
int strpos, len;
+ TQTextCodec *codec = TQTextCodec::codecForLocale();
+ TQString tqunicode_line = codec->toUnicode( line );
+
// Go through our columns, try to pick out data, return silently on failure
for ( TQPtrListIterator <ArchColumns>col( m_archCols ); col.current(); ++col )
{
ArchColumns *curCol = *col;
- strpos = curCol->pattern.search( line, pos );
+ strpos = curCol->pattern.search( tqunicode_line, pos );
len = curCol->pattern.matchedLength();
if ( ( strpos == -1 ) || ( len > curCol->maxLength ) )
@@ -354,7 +359,7 @@
pos = strpos + len;
- columns[curCol->colRef] = TQString::fromLocal8Bit( line.mid(strpos, len) );
+ columns[curCol->colRef] = tqunicode_line.mid(strpos, len).utf8();
}
--- kdeutils-3.5.1/ark/arkapp.cpp~ 2006-01-19 19:49:29 +0300
+++ kdeutils-3.5.1/ark/arkapp.cpp 2006-02-20 19:28:23 +0300
@@ -32,6 +32,7 @@
#include <unistd.h>
#include <tqfile.h>
#include <errno.h>
+#include <qtextcodec.h>
#include "arkapp.h"
@@ -110,6 +111,7 @@ ArkApplication::ArkApplication()
{
m_mainwidget = new TQWidget;
setMainWidget(m_mainwidget);
+ QTextCodec::setCodecForCStrings(QTextCodec::codecForLocale());
}
int

@ -0,0 +1,61 @@
--- kdeutils/kcalc/Makefile.am.ORI 2012-08-01 22:22:16.274750161 +0200
+++ kdeutils/kcalc/Makefile.am 2012-08-01 22:23:10.181783997 +0200
@@ -19,7 +19,7 @@
kcalctype.h dlabel.h stats.h
kcalc_la_LDFLAGS = $(all_libraries) -module -avoid-version
-kcalc_la_LIBADD = $(LIB_KDEUI) knumber/libknumber.la
+kcalc_la_LIBADD = $(LIB_KDEUI) knumber/libknumber.la $(LIB_QT) $(LIB_KDECORE)
KDE_ICON = kcalc
--- kdeutils/kedit/Makefile.am.ORI 2012-08-01 22:26:20.127379647 +0200
+++ kdeutils/kedit/Makefile.am 2012-08-01 22:26:38.144056739 +0200
@@ -12,7 +12,7 @@
kdeinit_LTLIBRARIES = kedit.la
kedit_la_SOURCES = kedit.cpp ktextfiledlg.cpp misc.ui color.ui prefs.kcfgc
-kedit_la_LIBADD = -lkdeprint $(LIB_KFILE)
+kedit_la_LIBADD = -lkdeprint $(LIB_KFILE) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)
kedit_la_LDFLAGS = -module -avoid-version $(KDE_PLUGIN) $(all_libraries)
noinst_HEADERS = kedit.h ktextfiledlg.h\
--- kdeutils/khexedit/lib/Makefile.am.ORI 2012-08-01 22:28:26.956106523 +0200
+++ kdeutils/khexedit/lib/Makefile.am 2012-08-01 22:28:33.941981315 +0200
@@ -7,7 +7,7 @@
# this library is used by the kbytesedit part and the khepart part
lib_LTLIBRARIES = libkhexeditcommon.la
libkhexeditcommon_la_LDFLAGS = $(all_libraries) -no-undefined
-libkhexeditcommon_la_LIBADD = controller/libkcontroller.la codecs/libkhecodecs.la $(LIB_KDECORE)
+libkhexeditcommon_la_LIBADD = controller/libkcontroller.la codecs/libkhecodecs.la $(LIB_KDECORE) $(LIB_QT)
libkhexeditcommon_la_SOURCES = kcolumn.cpp kbordercolumn.cpp koffsetcolumn.cpp \
kbuffercolumn.cpp kvaluecolumn.cpp kcharcolumn.cpp \
kcolumnsview.cpp khexedit.cpp kbytesedit.cpp \
--- kdeutils/kregexpeditor/Makefile.am.ORI 2012-08-01 22:31:33.556720026 +0200
+++ kdeutils/kregexpeditor/Makefile.am 2012-08-01 22:31:48.203381087 +0200
@@ -29,7 +29,7 @@
libkregexpeditorcommon_la_LDFLAGS = $(all_libraries) -version-info 1:0:0 -no-undefined
libkregexpeditorcommon_la_LIBADD = KMultiFormListBox/libkmultiformlistbox.la \
- KWidgetStreamer/libkwidgetstreamer.la $(LIB_KIO)
+ KWidgetStreamer/libkwidgetstreamer.la $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)
METASOURCES = AUTO
--- kdeutils/ksim/library/Makefile.am.ORI 2012-08-01 22:35:30.852281916 +0200
+++ kdeutils/ksim/library/Makefile.am 2012-08-01 22:35:39.599384576 +0200
@@ -1,4 +1,4 @@
-lib_LTLIBRARIES = libksimcore.la
+lib_LTLIBRARIES = libksimcore.la
libksimcore_la_SOURCES = common.cpp themeloader.cpp \
chart.cpp label.cpp \
@@ -7,7 +7,7 @@
pluginmodule.cpp ksimconfig.cpp
libksimcore_la_LDFLAGS = $(all_libraries) -version-info 1:0 -no-undefined
-libksimcore_la_LIBADD = $(LIB_KDEUI)
+libksimcore_la_LIBADD = $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE) -lkdefx
ksiminclude_HEADERS = common.h themeloader.h \
chart.h label.h \

File diff suppressed because it is too large Load Diff

@ -1,23 +1,29 @@
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr" %if "%{?_prefix}" != "/usr"
%define _variant .opt %define _variant .opt
%define _docdir %{_datadir}/doc
%endif %endif
# TDE 3.5.13 specific variables # TDE 3.5.13 specific building variables
%define tde_appdir %{_datadir}/applications/kde %define tde_bindir %{_prefix}/bin
%define tde_docdir %{_docdir}/kde %define tde_datadir %{_prefix}/share
%define tde_includedir %{_includedir}/kde %define tde_docdir %{tde_datadir}/doc
%define tde_libdir %{_libdir}/trinity %define tde_includedir %{_prefix}/include
%define tde_libdir %{_prefix}/%{_lib}
Name: trinity-kdevelop %define tde_tdeappdir %{tde_datadir}/applications/kde
%define tde_tdedocdir %{tde_docdir}/kde
%define tde_tdeincludedir %{tde_includedir}/kde
%define tde_tdelibdir %{tde_libdir}/trinity
%define _docdir %{tde_docdir}
Name: trinity-tdevelop
Summary: Integrated Development Environment for C++/C Summary: Integrated Development Environment for C++/C
Version: 3.5.13 Version: 3.5.13
Release: 4%{?dist}%{?_variant} Release: 5%{?dist}%{?_variant}
License: GPLv2
License: GPLv2 Group: Development/Tools
Group: Development/Tools
Vendor: Trinity Project Vendor: Trinity Project
Packager: Francois Andriot <francois.andriot@free.fr> Packager: Francois Andriot <francois.andriot@free.fr>
@ -47,29 +53,37 @@ Requires: %{name}-libs = %{version}-%{release}
Requires: make Requires: make
Requires: perl Requires: perl
Requires: flex >= 2.5.4 Requires: flex >= 2.5.4
Requires: qt3-designer %if 0%{?rhel} || 0%{?fedora}
Requires: qt3-designer >= 3.3.8.d
%else
Requires: %{_lib}qt3-devel >= 3.3.8.d
%endif
Requires: gettext Requires: gettext
Requires: ctags Requires: ctags
BuildRequires: cmake >= 2.8 BuildRequires: cmake >= 2.8
BuildRequires: tqtinterface-devel BuildRequires: tqtinterface-devel >= 3.5.13
BuildRequires: trinity-arts-devel BuildRequires: trinity-arts-devel >= 3.5.13
BuildRequires: trinity-tdelibs-devel BuildRequires: trinity-tdelibs-devel >= 3.5.13
BuildRequires: qt3-devel-docs #BuildRequires: qt3-devel-docs >= 3.3.8.d
BuildRequires: db4-devel BuildRequires: db4-devel
BuildRequires: flex BuildRequires: flex
# FIXME: No CVS support in KDevelop? This is going to suck... # FIXME: No CVS support in KDevelop? This is going to suck...
# Requires kdesdk3. # Requires kdesdk3.
BuildRequires: trinity-kdesdk-devel BuildRequires: trinity-tdesdk-devel >= 3.5.13
BuildRequires: subversion-devel neon-devel BuildRequires: subversion-devel
BuildRequires: neon-devel
# looks like this is dragged in by apr-devel (dep of subversion-devel), but not # looks like this is dragged in by apr-devel (dep of subversion-devel), but not
# a dependency # a dependency
BuildRequires: openldap-devel BuildRequires: openldap-devel
Obsoletes: trinity-kdevelop < %{version}-%{release}
Provides: trinity-kdevelop = %{version}-%{release}
%description %description
The KDevelop Integrated Development Environment provides many features The TDevelop Integrated Development Environment provides many features
that developers need as well as providing a unified interface to programs that developers need as well as providing a unified interface to programs
like gdb, the C/C++ compiler, and make. KDevelop manages or provides: like gdb, the C/C++ compiler, and make. TDevelop manages or provides:
All development tools needed for C++ programming like Compiler, All development tools needed for C++ programming like Compiler,
Linker, automake and autoconf; KAppWizard, which generates complete, Linker, automake and autoconf; KAppWizard, which generates complete,
@ -90,26 +104,90 @@ with KIconEdit; The inclusion of any other program you need for
development by adding it to the "Tools"-menu according to your development by adding it to the "Tools"-menu according to your
individual needs. individual needs.
%files
%defattr(-,root,root,-)
%{tde_bindir}/*
%{tde_tdelibdir}/*
%{tde_libdir}/kconf_update_bin/*
%{tde_tdeappdir}/*
%{tde_datadir}/apps/*
%{tde_datadir}/config/*
%{tde_datadir}/desktop-directories/*
%{tde_datadir}/icons/hicolor/*/*/*
%{tde_datadir}/icons/locolor/*/*/*
%{tde_datadir}/mimelnk/*.desktop
%{tde_datadir}/mimelnk/*/*
%{tde_datadir}/services/*
%{tde_datadir}/servicetypes/*
%{tde_tdedocdir}/HTML/en/*
%post
for f in hicolor locolor ; do
touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
done
update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%postun
for f in hicolor locolor ; do
touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
done
update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
##########
%package devel %package devel
Summary: Development files for %{name} Summary: Development files for %{name}
Group: Development/Libraries Group: Development/Libraries
Requires: %{name}-libs = %{version}-%{release} Requires: %{name}-libs = %{version}-%{release}
Obsoletes: trinity-kdevelop-devel < %{version}-%{release}
Provides: trinity-kdevelop-devel = %{version}-%{release}
%description devel %description devel
%{summary}. %{summary}.
%files devel
%defattr(-,root,root,-)
%{tde_libdir}/lib*.so
%{tde_libdir}/lib*.la
%{tde_includedir}/*
%post devel
/sbin/ldconfig || :
%postun devel
/sbin/ldconfig || :
##########
%package libs %package libs
Summary: %{name} runtime libraries Summary: %{name} runtime libraries
Group: System Environment/Libraries Group: System Environment/Libraries
Requires: trinity-kdelibs Requires: trinity-kdelibs
# include to be paranoid, installing libs-only is still mostly untested -- Rex # include to be paranoid, installing libs-only is still mostly untested -- Rex
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
Obsoletes: trinity-kdevelop-libs < %{version}-%{release}
Provides: trinity-kdevelop-libs = %{version}-%{release}
%description libs %description libs
%{summary}. %{summary}.
%files libs
%defattr(-,root,root,-)
%{tde_libdir}/lib*.so.*
%post libs
/sbin/ldconfig || :
%postun libs
/sbin/ldconfig || :
%prep ##########
%prep
%setup -q -n kdevelop -a1 %setup -q -n kdevelop -a1
%patch1 -p0 -b .config %patch1 -p0 -b .config
%patch2 -p1 %patch2 -p1
@ -119,8 +197,8 @@ Requires: %{name} = %{version}-%{release}
# Ugly hack to modify TQT include directory inside autoconf files. # Ugly hack to modify TQT include directory inside autoconf files.
# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
%__sed -i "admin/acinclude.m4.in" \ %__sed -i "admin/acinclude.m4.in" \
-e "s|/usr/include/tqt|%{_includedir}/tqt|g" \ -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g" -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
@ -132,22 +210,31 @@ Requires: %{name} = %{version}-%{release}
%build %build
unset QTDIR || : ; . /etc/profile.d/qt.sh unset QTDIR || : ; . /etc/profile.d/qt.sh
export PATH="%{_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{_libdir}/pkgconfig" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
export CMAKE_INCLUDE_PATH="%{_includedir}:%{_includedir}/tqt" export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_includedir}/tqt"
export LD_LIBRARY_PATH="%{_libdir}" export LD_LIBRARY_PATH="%{tde_libdir}"
# c references # c references
pushd c_cpp_reference-2.0.2_for_KDE_3.0 pushd c_cpp_reference-2.0.2_for_KDE_3.0
%configure \ %configure \
--exec-prefix=%{_prefix} \
--bindir=%{tde_bindir} \
--libdir=%{tde_libdir} \
--datadir=%{tde_datadir} \
--includedir=%{tde_tdeincludedir} \
--with-qt-libraries=${QTLIB} \ --with-qt-libraries=${QTLIB} \
--with-qt-includes=${QTINC} \ --with-qt-includes=${QTINC} \
--with-extra-libs=%{_libdir} --with-extra-libs=%{tde_libdir}
popd popd
%__mkdir build %{?!mgaversion:%__mkdir build; cd build}
cd build
%cmake \ %cmake \
-DBIN_INSTALL_DIR=%{tde_bindir} \
-DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-DLIB_INSTALL_DIR=%{tde_libdir} \
-DSHARE_INSTALL_PREFIX=%{tde_datadir} \
-DCMAKE_SKIP_RPATH="OFF" \
-DWITH_BUILDTOOL_ALL=ON \ -DWITH_BUILDTOOL_ALL=ON \
-DWITH_LANGUAGE_ALL=ON \ -DWITH_LANGUAGE_ALL=ON \
-DWITH_VCS_ALL=OFF \ -DWITH_VCS_ALL=OFF \
@ -157,72 +244,28 @@ cd build
%__make %{?_smp_mflags} %__make %{?_smp_mflags}
# c references
cd .. cd ..
%__make %{?_smp_mflags} -C c_cpp_reference-2.0.2_for_KDE_3.0 %__make %{?_smp_mflags} -C c_cpp_reference-2.0.2_for_KDE_3.0
%install %install
%__rm -rf %{buildroot} %__rm -rf %{buildroot}
cd build %__make install DESTDIR=%{buildroot} -C build
%__make install DESTDIR=%{buildroot}
cd ..
%__make install DESTDIR=%{buildroot} -C c_cpp_reference-2.0.2_for_KDE_3.0 %__make install DESTDIR=%{buildroot} -C c_cpp_reference-2.0.2_for_KDE_3.0
# remove useless files # remove useless files
%__rm -rf %{buildroot}%{_prefix}/kdevbdb %__rm -rf %{buildroot}%{_prefix}/kdevbdb
%post
for f in 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
for f in 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 || :
%post libs -p /sbin/ldconfig
%postun libs -p /sbin/ldconfig
%clean %clean
%__rm -rf %{buildroot} %__rm -rf %{buildroot}
%files
%defattr(-,root,root,-)
%{tde_docdir}/HTML/en/*
%{_bindir}/*
%{tde_libdir}/*
%{_libdir}/kconf_update_bin/*
%{tde_appdir}/*
%{_datadir}/apps/*
%{_datadir}/config/*
%{_datadir}/desktop-directories/*
%{_datadir}/icons/hicolor/*/*/*
%{_datadir}/icons/locolor/*/*/*
%{_datadir}/mimelnk/*.desktop
%{_datadir}/mimelnk/*/*
%{_datadir}/services/*
%{_datadir}/servicetypes/*
%files libs
%defattr(-,root,root,-)
%{_libdir}/lib*.so.*
%{_libdir}/lib*.la
%files devel
%defattr(-,root,root,-)
%{_libdir}/lib*.so
%{_includedir}/*
%changelog %changelog
* Wed Aug 01 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-5
- Renames to 'trinity-tdevelop'
- Add support for Mageia 2
* Sun Jul 08 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-4 * Sun Jul 08 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-4
- Removes runtime dependency to 'trinity-kdelibs' - Removes runtime dependency to 'trinity-kdelibs'

@ -0,0 +1,22 @@
--- kdewebdev/kommander/plugin/Makefile.am.ORI 2012-07-30 20:43:40.366904851 +0200
+++ kdewebdev/kommander/plugin/Makefile.am 2012-07-30 20:43:52.205813593 +0200
@@ -7,7 +7,7 @@
libkommanderplugin_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -no-undefined
# the libraries to link against.
-libkommanderplugin_la_LIBADD = $(LIB_KDEUI) $(LIB_QT)
+libkommanderplugin_la_LIBADD = $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)
libkommanderplugin_la_SOURCES = kommanderplugin.cpp specialinformation.cpp
--- kdewebdev/kommander/widget/Makefile.am.ORI 2012-07-30 20:49:46.120865640 +0200
+++ kdewebdev/kommander/widget/Makefile.am 2012-07-30 20:50:25.875198532 +0200
@@ -7,7 +7,7 @@
libkommanderwidget_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -no-undefined
# the libraries to link against.
-libkommanderwidget_la_LIBADD = $(top_builddir)/kommander/factory/libkommanderfactory.la $(LIB_KIO) $(LIB_KDEUI) $(LIB_QT)
+libkommanderwidget_la_LIBADD = $(top_builddir)/kommander/factory/libkommanderfactory.la $(LIB_KIO) $(LIB_KDEUI) $(LIB_QT) -lDCOP
libkommanderwidget_la_SOURCES = expression.cpp function.cpp functionlib.cpp \
invokeclass.cpp kmdrmainwindow.cpp kommanderfunctions.cpp kommanderwidget.cpp \

@ -1,17 +1,26 @@
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr" %if "%{?_prefix}" != "/usr"
%define _variant .opt %define _variant .opt
%define _docdir %{_datadir}/doc
%endif %endif
# TDE 3.5.13 specific building variables # TDE 3.5.13 specific building variables
%define tde_docdir %{_docdir}/kde %define tde_bindir %{_prefix}/bin
%define tde_includedir %{_includedir}/kde %define tde_datadir %{_prefix}/share
%define tde_libdir %{_libdir}/trinity %define tde_docdir %{tde_datadir}/doc
%define tde_includedir %{_prefix}/include
%define tde_libdir %{_prefix}/%{_lib}
%define tde_mandir %{tde_datadir}/man
Name: trinity-kdewebdev %define tde_tdeappdir %{tde_datadir}/applications/kde
%define tde_tdedocdir %{tde_docdir}/kde
%define tde_tdeincludedir %{tde_includedir}/kde
%define tde_tdelibdir %{tde_libdir}/trinity
%define _docdir %{tde_docdir}
Name: trinity-tdewebdev
Version: 3.5.13 Version: 3.5.13
Release: 2%{?dist}%{?_variant} Release: 3%{?dist}%{?_variant}
License: GPL License: GPL
Summary: Web development applications Summary: Web development applications
Group: Applications/Editors Group: Applications/Editors
@ -24,17 +33,19 @@ Prefix: %{_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: kdewebdev-%{version}.tar.gz Source0: kdewebdev-%{version}.tar.gz
Source1: http://download.sourceforge.net/quanta/css.tar.bz2 Source1: http://download.sourceforge.net/quanta/css.tar.bz2
Source2: http://download.sourceforge.net/quanta/html.tar.bz2 Source2: http://download.sourceforge.net/quanta/html.tar.bz2
Source3: http://download.sourceforge.net/quanta/php_manual_en_20030401.tar.bz2 Source3: http://download.sourceforge.net/quanta/php_manual_en_20030401.tar.bz2
Source4: http://download.sourceforge.net/quanta/javascript.tar.bz2 Source4: http://download.sourceforge.net/quanta/javascript.tar.bz2
Source5: hi48-app-kxsldbg.png Source5: hi48-app-kxsldbg.png
Patch0: javascript.patch Patch0: javascript.patch
Patch1: kdewebdev-3.5.4-kxsldbg-icons.patch Patch1: kdewebdev-3.5.4-kxsldbg-icons.patch
# [kdewebdev] Fix FTBFS due to missing linker flags
Patch2: kdewebdev-3.5.13-fix_ftbfs.patch
BuildRequires: autoconf automake libtool m4 BuildRequires: autoconf automake libtool m4
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
BuildRequires: trinity-kdelibs-devel BuildRequires: trinity-kdelibs-devel
BuildRequires: trinity-kdesdk-devel BuildRequires: trinity-kdesdk-devel
@ -45,19 +56,20 @@ BuildRequires: libgcrypt-devel
%endif %endif
BuildRequires: perl BuildRequires: perl
Requires: %{name}-libs = %{version}-%{release}
# optional Obsoletes: trinity-kdewebdev-libs < %{version}-%{release}
Requires: tidy Provides: trinity-kdewebdev-libs = %{version}-%{release}
Obsoletes: trinity-kdewebdev < %{version}-%{release}
Provides: trinity-kdewebdev = %{version}-%{release}
Provides: kdewebdev3 = %{version}-%{release} Requires: trinity-quanta = %{version}-%{release}
Requires: trinity-quanta-data = %{version}-%{release}
Requires: trinity-kfilereplace = %{version}-%{release}
Requires: trinity-kimagemapeditor = %{version}-%{release}
Requires: trinity-klinkstatus = %{version}-%{release}
Requires: trinity-kommander = %{version}-%{release}
Requires: trinity-kxsldbg = %{version}-%{release}
Obsoletes: quanta < %{version}-%{release}
Provides: quanta = %{version}-%{release}
%define kommander_ver 1.2.2
#Obsoletes: kommander < %{kommander_ver}-%{release}
Provides: kommander = %{kommander_ver}-%{release}
%description %description
%{summary}, including: %{summary}, including:
@ -68,33 +80,403 @@ Provides: kommander = %{kommander_ver}-%{release}
* kxsldbg: xslt Debugger * kxsldbg: xslt Debugger
* quanta+: web development * quanta+: web development
%files
##########
%package -n trinity-quanta
Summary: web development environment for KDE [Trinity]
Group: Applications/Development
Requires: trinity-kfilereplace = %{version}-%{release}
Requires: trinity-klinkstatus = %{version}-%{release}
Requires: trinity-kommander = %{version}-%{release}
Requires: trinity-quanta-data = %{version}-%{release}
#Requires: trinity-kimagemapeditor = %{version}-%{release}
#Requires: trinity-kxsldbg = %{version}-%{release}
Requires: tidy
%description -n trinity-quanta
Quanta Plus is a web development environment for working with HTML
and associated languages. It strives to be neutral and transparent
to all markup languages, while supporting popular web-based scripting
languages, CSS and other emerging W3C recommendations.
Quanta Plus supports many external components, debuggers and other tools
for web development, several of which are shipped with the KDE web
development module.
Quanta Plus is not in any way affiliated with any commercial versions
of Quanta. The primary coders from the original team left the GPL'd
version to produce a commercial product.
This package is part of TDE, as a component of the TDE web development module.
%files -n trinity-quanta
%defattr(-,root,root,-)
%{tde_bindir}/quanta
%{tde_tdelibdir}/quantadebuggerdbgp.la
%{tde_tdelibdir}/quantadebuggerdbgp.so
%{tde_tdelibdir}/quantadebuggergubed.la
%{tde_tdelibdir}/quantadebuggergubed.so
%{tde_tdeappdir}/quanta.desktop
%{tde_datadir}/apps/kafkapart
%{tde_datadir}/icons/hicolor/*/apps/quanta.png
%{tde_datadir}/mimelnk/application/x-webprj.desktop
%{tde_datadir}/services/quantadebuggerdbgp.desktop
%{tde_datadir}/services/quantadebuggergubed.desktop
%{tde_datadir}/services/quanta_preview_config.desktop
%{tde_datadir}/servicetypes/quantadebugger.desktop
%{tde_tdedocdir}/HTML/en/quanta/
%post -n trinity-quanta
for f in 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 -n trinity-quanta
for f in 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 || :
##########
%package -n trinity-quanta-data
Summary: data files for Quanta Plus web development environment [Trinity]
Group: Applications/Development
%description -n trinity-quanta-data
This package contains architecture-independent data files for Quanta
Plus, a web development environment for working with HTML and associated
languages.
See the quanta package for further information.
This package is part of TDE, as a component of the TDE web development module.
%files -n trinity-quanta-data
%defattr(-,root,root,-)
%{tde_datadir}/apps/quanta/
##########
%package -n trinity-kfilereplace
Summary: batch search-and-replace component for KDE [Trinity]
Group: Applications/Development
%description -n trinity-kfilereplace
KFileReplace is an embedded component for KDE that acts as a batch
search-and-replace tool. It allows you to replace one expression with
another in many files at once.
Note that at the moment KFileReplace does not come as a standalone
application. An example of an application that uses the KFileReplace
component is Quanta Plus (found in the package quanta).
This package is part of TDE, as a component of the TDE web development module.
%files -n trinity-kfilereplace
%defattr(-,root,root,-)
%{tde_bindir}/kfilereplace
%{tde_tdelibdir}/libkfilereplacepart.la
%{tde_tdelibdir}/libkfilereplacepart.so
%{tde_tdeappdir}/kfilereplace.desktop
%{tde_datadir}/apps/kfilereplace/kfilereplaceui.rc
%{tde_datadir}/apps/kfilereplacepart
%{tde_datadir}/icons/hicolor/*/apps/kfilereplace.png
%{tde_datadir}/services/kfilereplacepart.desktop
%{tde_tdedocdir}/HTML/en/kfilereplace/
%post -n trinity-kfilereplace
for f in 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 -n trinity-kfilereplace
for f in 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 || :
##########
%package -n trinity-kimagemapeditor
Summary: HTML image map editor for KDE [Trinity]
Group: Applications/Development
%description -n trinity-kimagemapeditor
KImageMapEditor is a tool that allows you to edit image maps in HTML
files. As well as providing a standalone application, KImageMapEditor
makes itself available as a KPart for embedding into larger applications.
This package is part of TDE, as a component of the TDE web development module.
%files -n trinity-kimagemapeditor
%defattr(-,root,root,-)
%{tde_bindir}/kimagemapeditor
%{tde_tdelibdir}/libkimagemapeditor.la
%{tde_tdelibdir}/libkimagemapeditor.so
%{tde_tdeappdir}/kimagemapeditor.desktop
%{tde_datadir}/apps/kimagemapeditor/
%{tde_datadir}/icons/hicolor/*/apps/kimagemapeditor.png
%{tde_datadir}/icons/locolor/*/apps/kimagemapeditor.png
%{tde_datadir}/services/kimagemapeditorpart.desktop
%post -n trinity-kimagemapeditor
for f in 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 -n trinity-kimagemapeditor
for f in 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 || :
##########
%package -n trinity-klinkstatus
Summary: web link validity checker for KDE [Trinity]
Group: Applications/Development
%description -n trinity-klinkstatus
KLinkStatus is KDE's web link validity checker. It allows you to
search internal and external links throughout your web site. Simply
point it to a single page and choose the depth to search.
You can also check local files, or files over ftp:, fish: or any other
KIO protocols. For performance, links can be checked simultaneously.
This package is part of TDE, as a component of the TDE web development module.
%files -n trinity-klinkstatus
%defattr(-,root,root,-)
%{tde_bindir}/klinkstatus
%{tde_tdelibdir}/libklinkstatuspart.la
%{tde_tdelibdir}/libklinkstatuspart.so
%{tde_tdeappdir}/klinkstatus.desktop
%{tde_datadir}/apps/klinkstatus/
%{tde_datadir}/apps/klinkstatuspart/
%{tde_datadir}/config.kcfg/klinkstatus.kcfg
%{tde_datadir}/icons/crystalsvg/16x16/actions/bug.png
%{tde_datadir}/icons/hicolor/*/apps/klinkstatus.png
%{tde_datadir}/services/klinkstatus_part.desktop
%{tde_tdedocdir}/HTML/en/klinkstatus/
%post -n trinity-klinkstatus
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 -n trinity-klinkstatus
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 || :
##########
%package -n trinity-kommander
Summary: visual dialog builder and executor tool [Trinity]
Group: Applications/Development
Requires: gettext
%description -n trinity-kommander
Kommander is a visual dialog building tool whose primary objective is
to create as much functionality as possible without using any scripting
language.
More specifically, Kommander is a set of tools that allow you to create
dynamic GUI dialogs that generate, based on their state, a piece of
text. The piece of text can be a command line to a program, any piece
of code, business documents that contain a lot of repetitious or
templated text and so on.
The resulting generated text can then be executed as a command line
program (hence the name "Kommander"), written to a file, passed to a
script for extended processing, and literally anything else you can
think of. And you aren't required to write a single line of code!
As well as building dialogs, Kommander may be expanded to create full
mainwindow applications.
This package is part of TDE, as a component of the TDE web development module.
%files -n trinity-kommander
%defattr(-,root,root,-)
%{tde_bindir}/kmdr-editor
%{tde_bindir}/kmdr-executor
%{tde_bindir}/kmdr-plugins
%{tde_libdir}/libkommanderplugin.so.*
%{tde_libdir}/libkommanderwidgets.la
%{tde_libdir}/libkommanderwidget.so.*
%{tde_libdir}/libkommanderwidgets.so.*
%{tde_tdeappdir}/kmdr-editor.desktop
%{tde_datadir}/applnk/.hidden/kmdr-executor.desktop
%{tde_datadir}/apps/katepart/syntax/kommander.xml
%{tde_datadir}/apps/kommander/pics/kommandersplash.png
%{tde_tdedocdir}/HTML/en/kommander/
%{tde_datadir}/icons/crystalsvg/*/apps/kommander.png
%{tde_datadir}/mimelnk/application/x-kommander.desktop
#kommander/examples /opt/trinity/share/doc/kommander
#kommander/working/extractkmdr /opt/trinity/bin
#kommander/working/kmdr2po /opt/trinity/bin
%{tde_tdelibdir}/libkommander_part.so
%{tde_tdelibdir}/libkommander_part.la
%{tde_datadir}/apps/kommander/
%{tde_datadir}/apps/kmdr-editor/editor/
%{tde_datadir}/apps/katepart/syntax/kommander-new.xml
%{tde_datadir}/apps/kdevappwizard/kommanderplugin.png
%{tde_datadir}/apps/kdevappwizard/kommanderplugin.tar.gz
%{tde_datadir}/apps/kdevappwizard/templates/kommanderplugin.kdevtemplate
%{tde_datadir}/services/kommander_part.desktop
%post -n trinity-kommander
/sbin/ldconfig || :
for f in crystalsvg ; 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 -n trinity-kommander
/sbin/ldconfig || :
for f in crystalsvg ; 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 || :
##########
%package -n trinity-kommander-devel
Summary: development files for Kommander [Trinity]
Group: Development/Libraries
Requires: trinity-kommander = %{version}-%{release}
%description -n trinity-kommander-devel
This package contains the headers and other development files for
building plugins or otherwise extending Kommander.
Kommander is a visual dialog building tool whose primary objective is
to create as much functionality as possible without using any scripting
language.
See the kommander package for further information.
This package is part of TDE, as a component of the TDE web development module.
%files -n trinity-kommander-devel
%defattr(-,root,root,-)
%{tde_libdir}/libkommanderplugin.la
%{tde_libdir}/libkommanderplugin.so
%{tde_libdir}/libkommanderwidget.la
%{tde_libdir}/libkommanderwidget.so
%{tde_libdir}/libkommanderwidgets.so
%{tde_tdeincludedir}/kommander*
%{tde_tdeincludedir}/specials.h
%post -n trinity-kommander-devel
/sbin/ldconfig || :
%postun -n trinity-kommander-devel
/sbin/ldconfig || :
##########
%package -n trinity-kxsldbg
Summary: graphical XSLT debugger for KDE [Trinity]
Group: Applications/Development
%description -n trinity-kxsldbg
KXSLDbg is a debugger for XSLT scripts. It includes a graphical user
interface as well as a text-based debugger. KXSLDbg can be run as a
standalone application or as an embedded KDE part.
XSLT is an XML language for defining transformations of XML files from
XML to some other arbitrary format, such as XML, HTML, plain text, etc.,
using standard XSLT stylesheets.
This package is part of TDE, as a component of the TDE web development module.
%files -n trinity-kxsldbg
%defattr(-,root,root,-)
%{tde_bindir}/kxsldbg
%{tde_bindir}/xsldbg
%{tde_tdelibdir}/libkxsldbgpart.la
%{tde_tdelibdir}/libkxsldbgpart.so
%{tde_tdeappdir}/kxsldbg.desktop
%{tde_datadir}/apps/kxsldbg
%{tde_datadir}/apps/kxsldbgpart
%{tde_tdedocdir}/HTML/en/kxsldbg/
%{tde_tdedocdir}/HTML/en/xsldbg/
%{tde_datadir}/icons/hicolor/*/actions/1downarrow.png
%{tde_datadir}/icons/hicolor/*/actions/configure.png
%{tde_datadir}/icons/hicolor/*/actions/exit.png
%{tde_datadir}/icons/hicolor/*/actions/hash.png
%{tde_datadir}/icons/hicolor/*/actions/mark.png
%{tde_datadir}/icons/hicolor/*/actions/next.png
%{tde_datadir}/icons/hicolor/*/actions/run.png
%{tde_datadir}/icons/hicolor/*/actions/step.png
%{tde_datadir}/icons/hicolor/*/actions/xsldbg_*.png
%{tde_datadir}/icons/hicolor/*/apps/kxsldbg.png
%{tde_datadir}/icons/locolor/*/apps/kxsldbg.png
%{tde_datadir}/services/kxsldbg_part.desktop
%post -n trinity-kxsldbg
for f in 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 -n trinity-kxsldbg
for f in 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 || :
##########
%package devel %package devel
Group: Development/Libraries Group: Development/Libraries
Summary: Header files and documentation for %{name} Summary: Header files and documentation for %{name}
Provides: kdewebdev3-devel = %{version}-%{release}
Requires: trinity-kdelibs-devel Obsoletes: trinity-kdewebdev-devel < %{version}-%{release}
Requires: %{name}-libs Provides: trinity-kdewebdev-devel = %{version}-%{release}
Obsoletes: quanta-devel < %{version}-%{release}
Requires: trinity-tdelibs-devel
Requires: trinity-kommander-devel = %{version}-%{release}
%description devel %description devel
%{summary}. %{summary}.
%package libs %files devel
Summary: %{name} runtime libraries
Group: System Environment/Libraries
Requires: trinity-kdelibs
# helps multilib upgrades
%description libs
%{summary}.
##########
%prep %prep
%setup -q -a 1 -a 2 -a 3 -a 4 -n kdewebdev %setup -q -a 1 -a 2 -a 3 -a 4 -n kdewebdev
# Ugly hack to modify TQT include directory inside autoconf files. # Ugly hack to modify TQT include directory inside autoconf files.
# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
%__sed -i admin/acinclude.m4.in \ %__sed -i "admin/acinclude.m4.in" \
-e "s|/usr/include/tqt|%{_includedir}/tqt|g" \ -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g" -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
@ -102,29 +484,34 @@ Requires: trinity-kdelibs
%patch0 -p0 -b .javascript %patch0 -p0 -b .javascript
%patch1 -p1 -b .kxsldbg-icons %patch1 -p1 -b .kxsldbg-icons
%patch2 -p1 -b .ftbfs
%__install -m644 -p %{SOURCE5} kxsldbg/ %__install -m644 -p %{SOURCE5} kxsldbg/
%build %build
unset QTDIR || : ; source /etc/profile.d/qt.sh unset QTDIR || : ; source /etc/profile.d/qt.sh
export PATH="%{_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
export LDFLAGS="-L%{_libdir} -I%{_includedir}" export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
%configure \ %configure \
--includedir=%{tde_includedir} \ --exec-prefix=%{_prefix} \
--bindir=%{tde_bindir} \
--datadir=%{tde_datadir} \
--libdir=%{tde_libdir} \
--includedir=%{tde_tdeincludedir} \
--disable-rpath \ --disable-rpath \
--enable-new-ldflags \ --enable-new-ldflags \
--enable-closure \ --enable-closure \
--disable-debug --disable-warnings \ --disable-debug --disable-warnings \
--disable-dependancy-tracking --enable-final \ --disable-dependancy-tracking --enable-final \
--with-extra-includes=%{_includedir}/tqt \ --with-extra-includes=%{tde_includedir}/tqt \
%__make %{?_smp_mflags} %__make %{?_smp_mflags}
%install %install
export PATH="%{_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{?buildroot} %__rm -rf %{?buildroot}
%__make install DESTDIR=%{?buildroot} %__make install DESTDIR=%{?buildroot}
@ -134,15 +521,15 @@ export PATH="%{_bindir}:${PATH}"
for i in css html javascript ; do for i in css html javascript ; do
pushd $i pushd $i
./install.sh <<EOF ./install.sh <<EOF
%{buildroot}%{_datadir}/apps/quanta/doc %{buildroot}%{tde_datadir}/apps/quanta/doc
EOF EOF
popd popd
rm -rf $i rm -rf $i
done done
cp -a php php.docrc %{buildroot}%{_datadir}/apps/quanta/doc/ cp -a php php.docrc %{buildroot}%{tde_datadir}/apps/quanta/doc/
# make symlinks relative # make symlinks relative
pushd %{buildroot}%{tde_docdir}/HTML/en pushd %{buildroot}%{tde_tdedocdir}/HTML/en
for i in *; do for i in *; do
if [ -d $i -a -L $i/common ]; then if [ -d $i -a -L $i/common ]; then
rm -f $i/common rm -f $i/common
@ -151,69 +538,12 @@ for i in *; do
done done
popd popd
# rpmdocs
for dir in k* quanta; do
for file in AUTHORS ChangeLog README TODO ; do
test -s "$dir/$file" && install -p -m644 -D "$dir/$file" "rpmdocs/$dir/$file"
done
done
%post
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
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 || :
%post libs -p /sbin/ldconfig
%postun libs -p /sbin/ldconfig
%clean %clean
%__rm -rf %{buildroot} %__rm -rf %{buildroot}
%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README
%doc rpmdocs/*
%{_bindir}/*
%{tde_libdir}/*
%{_datadir}/applications/kde/*
%{_datadir}/applnk/.hidden/*
%{_datadir}/apps/*
%doc %{_datadir}/apps/quanta/doc
%{_datadir}/config.kcfg/*
%{_datadir}/icons/crystalsvg/*/*/*
%{_datadir}/icons/hicolor/*/*/*
%{_datadir}/icons/locolor/*/*/*
%{_datadir}/mimelnk/application/*
%{_datadir}/services/*
%{_datadir}/servicetypes/*
%doc %lang(en) %{tde_docdir}/HTML/en/*
%files libs
%defattr(-,root,root,-)
%{_libdir}/lib*.so.*
%{_libdir}/lib*.la
%files devel
%defattr(-,root,root,-)
%{_libdir}/lib*.so
%{tde_includedir}/*
%changelog %changelog
* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-2 * Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-2
- Fix HTML directory location - Fix HTML directory location

Loading…
Cancel
Save