diff --git a/debian/lenny/tdebase/debian/kwin-trinity.install b/debian/lenny/tdebase/debian/twin-trinity.install similarity index 100% rename from debian/lenny/tdebase/debian/kwin-trinity.install rename to debian/lenny/tdebase/debian/twin-trinity.install diff --git a/debian/lenny/tdebase/debian/kwin-trinity.lintian b/debian/lenny/tdebase/debian/twin-trinity.lintian similarity index 100% rename from debian/lenny/tdebase/debian/kwin-trinity.lintian rename to debian/lenny/tdebase/debian/twin-trinity.lintian diff --git a/debian/lenny/tdebase/debian/kwin-trinity.postinst b/debian/lenny/tdebase/debian/twin-trinity.postinst similarity index 100% rename from debian/lenny/tdebase/debian/kwin-trinity.postinst rename to debian/lenny/tdebase/debian/twin-trinity.postinst diff --git a/debian/lenny/tdebase/debian/kwin-trinity.prerm b/debian/lenny/tdebase/debian/twin-trinity.prerm similarity index 100% rename from debian/lenny/tdebase/debian/kwin-trinity.prerm rename to debian/lenny/tdebase/debian/twin-trinity.prerm diff --git a/debian/lenny/tdeutils/debian/control b/debian/lenny/tdeutils/debian/control index 2878c43a3..bd4eb1525 100644 --- a/debian/lenny/tdeutils/debian/control +++ b/debian/lenny/tdeutils/debian/control @@ -5,7 +5,7 @@ Maintainer: Timothy Pearson XSBC-Original-Maintainer: Debian Qt/KDE Maintainers Uploaders: Ana Beatriz Guerrero Lopez , Christopher Martin , Fathi Boudra , Josh Metzler , Sune Vuorela Build-Depends: libasound2-dev, ia32-libs [amd64], cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-trinity-dev (>= 4:3.5.10), tdebase-trinity-dev (>= 4:3.5.10), libkonq4-trinity-dev (>= 4:3.5.10), libgmp3-dev, libsnmp-dev, libxpm-dev, python-dev, libxtst-dev, xutils, sharutils, automake, autoconf, libtool, libltdl-dev -Build-Depends-Indep: doxygen, qt3-doc, graphviz, gsfonts-x11, tdelibs4-trinity-doc +Build-Depends-Indep: doxygen, libtqtinterface-doc, graphviz, gsfonts-x11, tdelibs4-trinity-doc Standards-Version: 3.8.4 Package: tdeutils-trinity diff --git a/debian/squeeze/tdebase/debian/kwin-trinity.install b/debian/squeeze/tdebase/debian/twin-trinity.install similarity index 100% rename from debian/squeeze/tdebase/debian/kwin-trinity.install rename to debian/squeeze/tdebase/debian/twin-trinity.install diff --git a/debian/squeeze/tdebase/debian/kwin-trinity.lintian b/debian/squeeze/tdebase/debian/twin-trinity.lintian similarity index 100% rename from debian/squeeze/tdebase/debian/kwin-trinity.lintian rename to debian/squeeze/tdebase/debian/twin-trinity.lintian diff --git a/debian/squeeze/tdebase/debian/kwin-trinity.postinst b/debian/squeeze/tdebase/debian/twin-trinity.postinst similarity index 100% rename from debian/squeeze/tdebase/debian/kwin-trinity.postinst rename to debian/squeeze/tdebase/debian/twin-trinity.postinst diff --git a/debian/squeeze/tdebase/debian/kwin-trinity.prerm b/debian/squeeze/tdebase/debian/twin-trinity.prerm similarity index 100% rename from debian/squeeze/tdebase/debian/kwin-trinity.prerm rename to debian/squeeze/tdebase/debian/twin-trinity.prerm diff --git a/debian/squeeze/tdeutils/debian/control b/debian/squeeze/tdeutils/debian/control index 2878c43a3..bd4eb1525 100644 --- a/debian/squeeze/tdeutils/debian/control +++ b/debian/squeeze/tdeutils/debian/control @@ -5,7 +5,7 @@ Maintainer: Timothy Pearson XSBC-Original-Maintainer: Debian Qt/KDE Maintainers Uploaders: Ana Beatriz Guerrero Lopez , Christopher Martin , Fathi Boudra , Josh Metzler , Sune Vuorela Build-Depends: libasound2-dev, ia32-libs [amd64], cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-trinity-dev (>= 4:3.5.10), tdebase-trinity-dev (>= 4:3.5.10), libkonq4-trinity-dev (>= 4:3.5.10), libgmp3-dev, libsnmp-dev, libxpm-dev, python-dev, libxtst-dev, xutils, sharutils, automake, autoconf, libtool, libltdl-dev -Build-Depends-Indep: doxygen, qt3-doc, graphviz, gsfonts-x11, tdelibs4-trinity-doc +Build-Depends-Indep: doxygen, libtqtinterface-doc, graphviz, gsfonts-x11, tdelibs4-trinity-doc Standards-Version: 3.8.4 Package: tdeutils-trinity diff --git a/redhat/applications/fusion-icon/trinity-fusion-icon.spec b/redhat/applications/fusion-icon/trinity-fusion-icon.spec new file mode 100644 index 000000000..6b56f82b5 --- /dev/null +++ b/redhat/applications/fusion-icon/trinity-fusion-icon.spec @@ -0,0 +1,98 @@ +# Default version for this component +%define kdecomp fusion-icon +%define version 0.0.0+git20071028 +%define release 1 + +%define _prefix /usr +%if "%{?python2_sitelib}" == "" +%define python2_sitelib %(python2 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())") +%endif + +# TDE 3.5.13 specific building variables +BuildRequires: autoconf automake libtool m4 +%define tde_docdir %{_docdir}/kde +%define tde_includedir %{_includedir}/kde +%define tde_libdir %{_libdir}/trinity + + +Name: trinity-%{kdecomp} +Summary: tray icon to launch and manage Compiz Fusion [Trinity] +Version: %{?version} +Release: %{?release}%{?dist}%{?_variant} + +License: GPLv2+ +Group: Applications/Utilities + +Vendor: Trinity Project +Packager: Francois Andriot +URL: http://www.trinitydesktop.org/ + +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{kdecomp}-3.5.13.tar.gz + +BuildRequires: tqtinterface-devel +BuildRequires: trinity-kdelibs-devel +BuildRequires: trinity-kdebase-devel +BuildRequires: desktop-file-utils +BuildRequires: python +Requires: python + +%description +The OpenCompositing Project brings 3D desktop visual effects that +improve the usability and eye candy of the X Window System and provide +increased productivity. + +This package contains a tray icon that can launch Compiz and its +decorators. + + +%prep +%setup -q -n applications/%{kdecomp} + +%__sed -i Makefile \ + -e "s,^PREFIX = .*,PREFIX = '%{_prefix}'," \ + -e "s,^DESTDIR = .*,DESTDIR = '%{buildroot}'," + +%build +export PATH="%{_bindir}:${PATH}" +%__make + + +%install +export PATH="%{_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} + + +%clean +%__rm -rf %{buildroot} + + +%post +touch --no-create %{_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : + +%postun +touch --no-create %{_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : + + +%files +%defattr(-,root,root,-) +%{_bindir}/fusion-icon +%{python2_sitelib}/FusionIcon/ +%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 +%{python2_sitelib}/fusion_icon-0.0.0_git-py*.egg-info +%endif +%{_datadir}/applications/fusion-icon.desktop +%{_datadir}/icons/hicolor/22x22/apps/fusion-icon.png +%{_datadir}/icons/hicolor/24x24/apps/fusion-icon.png +%{_datadir}/icons/hicolor/48x48/apps/fusion-icon.png +%{_datadir}/icons/hicolor/scalable/apps/fusion-icon.svg + + +%Changelog +* Sat Nov 19 2011 Francois Andriot - 0.0.0+git20071028-1 +- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/k9copy/k9copy-3.5.13-ftbfs.patch b/redhat/applications/k9copy/k9copy-3.5.13-ftbfs.patch new file mode 100644 index 000000000..67c2464cd --- /dev/null +++ b/redhat/applications/k9copy/k9copy-3.5.13-ftbfs.patch @@ -0,0 +1,12 @@ +diff -Nuar k9copy.ORI/src/Makefile.am k9copy.P/src/Makefile.am +--- k9copy.ORI/src/Makefile.am 2011-11-21 00:08:57.943296860 +0100 ++++ k9copy.P/src/Makefile.am 2011-11-21 00:18:50.559281008 +0100 +@@ -30,7 +30,7 @@ + kconfigdlg.cpp kviewmpeg2.cpp kviewmpeg2.h langselectw.ui main.cpp mencoderCmdGen.ui \ + playbackoptionsw.ui prefAuthor.ui prefDVD.ui prefMPEG4.ui prefMencoder.ui prefpreview.ui \ + titlefactor.ui viewmpeg2.ui +-k9copy_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor $(LIB_KPARTS) ++k9copy_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor $(LIB_KPARTS) $(LIBDL) + k9copy_LDADD = $(top_builddir)/k9Mplayer/libk9mplayer.la \ + $(top_builddir)/k9author/libk9author.la $(top_builddir)/k9decmpeg/libk9decmpeg.la \ + $(top_builddir)/k9devices/libk9devices.la $(top_builddir)/k9vamps/libk9vamps.la \ diff --git a/redhat/applications/k9copy/trinity-k9copy.spec b/redhat/applications/k9copy/trinity-k9copy.spec new file mode 100644 index 000000000..ab79315ea --- /dev/null +++ b/redhat/applications/k9copy/trinity-k9copy.spec @@ -0,0 +1,110 @@ +# Default version for this component +%define kdecomp k9copy +%define version 1.2.3 +%define release 1 + +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?_prefix}" != "/usr" +%define _variant .opt +%define _docdir %{_prefix}/share/doc +%endif + +# TDE 3.5.12 specific building variables +BuildRequires: autoconf automake libtool m4 +%define tde_docdir %{_docdir}/kde +%define tde_includedir %{_includedir}/kde +%define tde_libdir %{_libdir}/trinity + + +Name: trinity-%{kdecomp} +Summary: DVD backup tool for Trinity +Version: %{?version} +Release: %{?release}%{?dist}%{?_variant} + +License: GPLv2+ +Group: Applications/Utilities + +Vendor: Trinity Project +Packager: Francois Andriot +URL: http://www.trinitydesktop.org/ + +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{kdecomp}-3.5.13.tar.gz +Patch0: k9copy-3.5.13-ftbfs.patch + +BuildRequires: tqtinterface-devel +BuildRequires: trinity-kdelibs-devel +BuildRequires: trinity-kdebase-devel +BuildRequires: desktop-file-utils +BuildRequires: ffmpeg-devel + +Requires: ffmpeg + +%description +k9copy is a tabbed tool that allows to copy of one or more titles from a DVD9 +to a DVD5, in thesame way than DVDShrink for Microsoft Windows (R). +This is the Trinity version + + +%prep +%setup -q -n applications/%{kdecomp} +%patch0 -p1 + +# Ugly hack to modify TQT include directory inside autoconf files. +# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! +sed -i admin/acinclude.m4.in \ + -e "s,/usr/include/tqt,%{_includedir}/tqt,g" + +%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +%__make -f "admin/Makefile.common" + + +%build +export PATH="%{_bindir}:${PATH}" +export LDFLAGS="-L%{_libdir} -I%{_includedir}" + +%configure \ + --disable-rpath \ + --with-extra-includes=%{_includedir}/tqt \ + --enable-closure + +%__make %{?_smp_mflags} + + +%install +export PATH="%{_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} + +%find_lang %{kdecomp} + +%clean +%__rm -rf %{buildroot} + + +%post +touch --no-create %{_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : + +%postun +touch --no-create %{_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : + + +%files -f %{kdecomp}.lang +%defattr(-,root,root,-) +%doc AUTHORS COPYING +%{_bindir}/k9copy +%{_datadir}/applications/kde/k9copy.desktop +%{_datadir}/apps/k9copy +%{_datadir}/apps/konqueror/servicemenus/k9copy_open.desktop +%{_docdir}/HTML/en/k9copy +%{_datadir}/icons/hicolor/*/apps/k9copy.png + + +%Changelog +* Sat Nov 19 2011 Francois Andriot - 1.2.3-1 +- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/kbfx/trinity-kbfx.spec b/redhat/applications/kbfx/trinity-kbfx.spec new file mode 100644 index 000000000..55e16d6c7 --- /dev/null +++ b/redhat/applications/kbfx/trinity-kbfx.spec @@ -0,0 +1,134 @@ +# Default version for this component +%define kdecomp kbfx +%define version 0.4.9.3.1 +%define release 1 + +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?_prefix}" != "/usr" +%define _variant .opt +%define _docdir %{_prefix}/share/doc +%endif + +# TDE 3.5.13 specific building variables +BuildRequires: autoconf automake libtool m4 +%define tde_docdir %{_docdir}/kde +%define tde_includedir %{_includedir}/kde +%define tde_libdir %{_libdir}/trinity + + +Name: trinity-%{kdecomp} +Summary: an alternative to K-Menu for KDE [Trinity] +Version: %{?version} +Release: %{?release}%{?dist}%{?_variant} + +License: GPLv2+ +Group: Applications/Utilities + +Vendor: Trinity Project +Packager: Francois Andriot +URL: http://www.trinitydesktop.org/ + +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{kdecomp}-3.5.13.tar.gz + +BuildRequires: tqtinterface-devel +BuildRequires: trinity-kdelibs-devel +BuildRequires: trinity-kdebase-devel +BuildRequires: desktop-file-utils + +%description +KBFX is an alternative to the classical K-Menu button and its menu. +It improves the user experience by enabling him to set a bigger (and thus more +visible) start button and by finally replacing the Win95-like K-Menu. +If you still want the old menu, because you're used to it, it is still +available as an option in kbfx. We recommend, however, that you give the Spinx +bar a try. + +Homepage: http://www.kbfx.org + + +%prep +%setup -q -n applications/%{kdecomp} + +# Fix TDE executable path in CMakeLists.txt +%__sed -i "CMakeLists.txt" \ + -e "s,/usr/bin/uic-tqt,%{_bindir}/uic-tqt," \ + -e "s,/usr/bin/tmoc,%{_bindir}/tmoc," \ + -e "s,/usr/include/tqt,%{_includedir}/tqt," + + +%build +unset QTDIR || : ; . /etc/profile.d/qt.sh +export PATH="%{_bindir}:${PATH}" + +%__mkdir build +cd build +%cmake \ + -DUSE_STRIGI=OFF \ + -DUSE_MENUDRAKE=OFF \ + -DUSE_KDE4=OFF \ + .. + +%__make %{?_smp_mflags} + + +%install +export PATH="%{_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} -C build + + +%clean +%__rm -rf %{buildroot} + + +%post +/sbin/ldconfig +touch --no-create %{_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : + +%postun +/sbin/ldconfig +touch --no-create %{_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : + + +%files +%defattr(-,root,root,-) +%{_bindir}/kbfxconfigapp +%{_includedir}/kbfx +%{_libdir}/kbfx/plugins/libkbfxplasmadataplasmoid.la +%{_libdir}/kbfx/plugins/libkbfxplasmadataplasmoid.so +%{_libdir}/kbfx/plugins/libkbfxplasmadatasettings.la +%{_libdir}/kbfx/plugins/libkbfxplasmadatasettings.so +%{_libdir}/kbfx/plugins/libkbfxplasmadatastub.la +%{_libdir}/kbfx/plugins/libkbfxplasmadatastub.so +%{_libdir}/kbfx/plugins/libkbfxplasmarecentstuff.la +%{_libdir}/kbfx/plugins/libkbfxplasmarecentstuff.so +%{_libdir}/libkbfxcommon.la +%{_libdir}/libkbfxcommon.so +%{_libdir}/libkbfxdata.la +%{_libdir}/libkbfxdata.so +%{tde_libdir}/libkbfxspinx.la +%{tde_libdir}/libkbfxspinx.so +%{_datadir}/applications/kde/kbfx_theme.desktop +%{_datadir}/applications/kde/kbfxconfigapp.desktop +%{_datadir}/apps/kbfx/skins/*/* +%{_datadir}/apps/kbfxconfigapp/kbfxconfigappui.rc +%{_datadir}/apps/kicker/applets/kbfxspinx.desktop +%{_datadir}/apps/konqueror/servicemenus/kbfx_install_theme.desktop +%{_datadir}/apps/konqueror/servicemenus/kbfx_prepare_theme.desktop +%{_docdir}/HTML/en/common/kbfx-*.jpg +%{_docdir}/HTML/en/kbfxconfigapp/index.cache.bz2 +%{_docdir}/HTML/en/kbfxconfigapp/index.docbook +%{_docdir}/kbfx +%{_datadir}/icons/hicolor/*/apps/kbfx.png +%{_datadir}/icons/hicolor/*/apps/kbfxconfigapp.png +%{_datadir}/locale/*/LC_MESSAGES/kbfxconfigapp.mo +%{_datadir}/mimelnk/application/x-kbfxtheme.desktop + +%Changelog +* Sun Nov 20 2011 Francois Andriot - 0.4.9.3.1-1 +- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/kchmviewer/kchmviewer-3.5.13-ftbfs.patch b/redhat/applications/kchmviewer/kchmviewer-3.5.13-ftbfs.patch new file mode 100644 index 000000000..05012b5ba --- /dev/null +++ b/redhat/applications/kchmviewer/kchmviewer-3.5.13-ftbfs.patch @@ -0,0 +1,11 @@ +--- kchmviewer/lib/kio-msits/Makefile.am.ORI 2011-11-21 00:43:10.415241950 +0100 ++++ kchmviewer/lib/kio-msits/Makefile.am 2011-11-21 00:43:22.929241583 +0100 +@@ -5,7 +5,7 @@ + + kio_msits_la_SOURCES = msits.cpp + kio_msits_la_LIBADD = -lkio $(CHM_LIBS) +-kio_msits_la_LDFLAGS = -module -avoid-version $(KDE_LDFLAGS) $(LIB_QT) $(LIB_KIO) $(LIB_KDECORE) $(KDE_PLUGIN) ++kio_msits_la_LDFLAGS = -module -avoid-version $(KDE_LDFLAGS) $(LIB_QT) $(LIB_KIO) $(LIB_KDECORE) $(KDE_PLUGIN) $(QT_LDFLAGS) + + protocol_DATA = msits.protocol + protocoldir = $(kde_servicesdir) diff --git a/redhat/applications/kchmviewer/trinity-kchmviewer.spec b/redhat/applications/kchmviewer/trinity-kchmviewer.spec new file mode 100644 index 000000000..c322597fc --- /dev/null +++ b/redhat/applications/kchmviewer/trinity-kchmviewer.spec @@ -0,0 +1,131 @@ +# Default version for this component +%define kdecomp kchmviewer +%define version 3.1.2 +%define release 1 + +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?_prefix}" != "/usr" +%define _variant .opt +%define _docdir %{_prefix}/share/doc +%endif + +# TDE 3.5.12 specific building variables +BuildRequires: autoconf automake libtool m4 +%define tde_docdir %{_docdir}/kde +%define tde_includedir %{_includedir}/kde +%define tde_libdir %{_libdir}/trinity + + +Name: trinity-%{kdecomp} +Summary: CHM viewer for Trinity +Version: %{?version} +Release: %{?release}%{?dist}%{?_variant} + +License: GPLv2+ +Group: Applications/Utilities + +Vendor: Trinity Project +Packager: Francois Andriot +URL: http://www.trinitydesktop.org/ + +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{kdecomp}-3.5.13.tar.gz +Patch0: kchmviewer-3.5.13-ftbfs.patch + +BuildRequires: tqtinterface-devel +BuildRequires: trinity-kdelibs-devel +BuildRequires: trinity-kdebase-devel +BuildRequires: desktop-file-utils + +%description +KchmViewer is a chm (MS HTML help file format) viewer, written in C++. +Unlike most existing CHM viewers for Unix, it uses Trolltech Qt widget +library, and does not depend on KDE or GNOME. However, it may be compiled +with full Trinity support, including Trinity widgets and KIO/KHTML. + +The main advantage of KchmViewer is non-English language support. Unlike +others, KchmViewer in most cases correctly detects help file encoding, +correctly shows tables of context of Russian, Korean, Chinese and Japanese +help files, and correctly searches in non-English help files (search for +MBCS languages - ja/ko/ch is still in progress). + +Completely safe and harmless. Does not support JavaScript in any way, +optionally warns you before opening an external web page, or switching to +another help file. Shows an appropriate image for every TOC entry. + +KchmViewer Has complete chm index support, including multiple index entries, +cross-links and parent/child entries in index as well as Persistent bookmarks +support. Correctly detects and shows encoding of any valid chm file. + + +%prep +%setup -q -n applications/%{kdecomp} +%patch0 -p1 + +# Ugly hack to modify TQT include directory inside autoconf files. +# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! +sed -i admin/acinclude.m4.in \ + -e "s,/usr/include/tqt,%{_includedir}/tqt,g" + +%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +%__make -f "admin/Makefile.common" + + +%build +unset QTDIR || : ; . /etc/profile.d/qt.sh +export PATH="%{_bindir}:${PATH}" +export LDFLAGS="-L%{_libdir} -I%{_includedir}" + +%configure \ + --disable-rpath \ + --with-x \ + --with-kde \ + --with-extra-includes=%{_includedir}/tqt \ + --enable-closure + +# --with-qt-dir=${QTDIR} \ +# --with-qt-includes=${QTINC} \ +# --with-qt-libraries=${QTLIB} \ + +%__make %{?_smp_mflags} + + +%install +export PATH="%{_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} + +%find_lang %{kdecomp} + +%clean +%__rm -rf %{buildroot} + + +%post +touch --no-create %{_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : + +%postun +touch --no-create %{_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : + + +%files -f %{kdecomp}.lang +%defattr(-,root,root,-) +%doc ChangeLog COPYING FAQ README +%{_bindir}/kchmviewer +%exclude %{_libdir}/libchmfile.a +%exclude %{_libdir}/libkdeextra.a +%{tde_libdir}/kio_msits.la +%{tde_libdir}/kio_msits.so +%{_datadir}/applnk/kchmviewer.desktop +%{_datadir}/icons/crystalsvg/*/apps/kchmviewer.png +%{_datadir}/services/msits.protocol + + +%Changelog +* Sat Nov 19 2011 Francois Andriot - 3.1.2-1 +- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/kcpuload/trinity-kcpuload.spec b/redhat/applications/kcpuload/trinity-kcpuload.spec new file mode 100644 index 000000000..67b2c39d1 --- /dev/null +++ b/redhat/applications/kcpuload/trinity-kcpuload.spec @@ -0,0 +1,108 @@ +# Default version for this component +%define kdecomp kcpuload +%define version 2.00 +%define release 1 + +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?_prefix}" != "/usr" +%define _variant .opt +%define _docdir %{_prefix}/share/doc +%endif + +# TDE 3.5.13 specific building variables +BuildRequires: autoconf automake libtool m4 +%define tde_docdir %{_docdir}/kde +%define tde_includedir %{_includedir}/kde +%define tde_libdir %{_libdir}/trinity + + +Name: trinity-%{kdecomp} +Summary: a CPU meter for Kicker [Trinity] +Version: %{?version} +Release: %{?release}%{?dist}%{?_variant} + +License: GPLv2+ +Group: Applications/Utilities + +Vendor: Trinity Project +Packager: Francois Andriot +URL: http://www.trinitydesktop.org/ + +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{kdecomp}-3.5.13.tar.gz + +BuildRequires: tqtinterface-devel +BuildRequires: trinity-kdelibs-devel +BuildRequires: trinity-kdebase-devel +BuildRequires: desktop-file-utils +BuildRequires: gettext + + +%description +KCPULoad is a small program for Kicker (the KDE panel). It shows a +recent history of CPU usage in the form of one or two configurable +diagrams in the system tray. These diagrams have settings for colours +and various different styles. + +KCPULoad has support for SMP and separate user/system loads. + + +%prep +%setup -q -n applications/%{kdecomp} + +# Ugly hack to modify TQT include directory inside autoconf files. +# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! +sed -i admin/acinclude.m4.in \ + -e "s,/usr/include/tqt,%{_includedir}/tqt,g" + +%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +%__make -f "admin/Makefile.common" + + +%build +export PATH="%{_bindir}:${PATH}" +export LDFLAGS="-L%{_libdir} -I%{_includedir}" + +%configure \ + --disable-rpath \ + --with-extra-includes=%{_includedir}/tqt + +%__make %{?_smp_mflags} + + +%install +export PATH="%{_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} + + +%clean +%__rm -rf %{buildroot} + + +%post +touch --no-create %{_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : + +%postun +touch --no-create %{_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : + + +%files +%defattr(-,root,root,-) +%{_bindir}/kcpuload +%{_datadir}/applnk/System/kcpuload.desktop +%{_datadir}/apps/kcpuload/icons/*/*/*/*.png +%{_datadir}/icons/*/*/apps/kcpuload.png +%{_docdir}/HTML/en/kcpuload/common +%{_docdir}/HTML/en/kcpuload/index.cache.bz2 +%{_docdir}/HTML/en/kcpuload/index.docbook + + +%Changelog +* Sat Nov 19 2011 Francois Andriot - 2.00-1 +- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/kde-style-lipstik/trinity-kde-style-lipstik.spec b/redhat/applications/kde-style-lipstik/trinity-kde-style-lipstik.spec new file mode 100644 index 000000000..6a6dcd028 --- /dev/null +++ b/redhat/applications/kde-style-lipstik/trinity-kde-style-lipstik.spec @@ -0,0 +1,108 @@ +# Default version for this component +%define kdecomp kde-style-lipstik +%define version 2.2.3 +%define release 1 + +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?_prefix}" != "/usr" +%define _variant .opt +%define _docdir %{_prefix}/share/doc +%endif + +# TDE 3.5.13 specific building variables +BuildRequires: autoconf automake libtool m4 +%define tde_docdir %{_docdir}/kde +%define tde_includedir %{_includedir}/kde +%define tde_libdir %{_libdir}/trinity + + +Name: trinity-%{kdecomp} +Summary: Lipstik style for TDE +Version: %{?version} +Release: %{?release}%{?dist}%{?_variant} + +License: GPLv2+ +Group: Applications/Utilities + +Vendor: Trinity Project +Packager: Francois Andriot +URL: http://www.trinitydesktop.org/ + +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{kdecomp}-3.5.13.tar.gz + +BuildRequires: tqtinterface-devel +BuildRequires: trinity-kdelibs-devel +BuildRequires: trinity-kdebase-devel +BuildRequires: desktop-file-utils +BuildRequires: gettext + + +%description +Based on the plastik style, Lipstik is a purified style with many options to +tune your desktop look. + +Lipstik also provides Lipstik-color-schemes + + +%prep +%setup -q -n applications/%{kdecomp} + +# Ugly hack to modify TQT include directory inside autoconf files. +# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! +sed -i admin/acinclude.m4.in \ + -e "s,/usr/include/tqt,%{_includedir}/tqt,g" + +%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +%__make -f "admin/Makefile.common" + + +%build +export PATH="%{_bindir}:${PATH}" +export LDFLAGS="-L%{_libdir} -I%{_includedir}" + +%configure \ + --disable-rpath \ + --with-extra-includes=%{_includedir}/tqt + +%__make %{?_smp_mflags} + + +%install +export PATH="%{_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} + + +%clean +%__rm -rf %{buildroot} + + +%post +touch --no-create %{_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : + +%postun +touch --no-create %{_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : + + +%files +%defattr(-,root,root,-) +%doc AUTHORS COPYING +%{tde_libdir}/kstyle_lipstik_config.la +%{tde_libdir}/kstyle_lipstik_config.so +%{tde_libdir}/plugins/styles/lipstik.la +%{tde_libdir}/plugins/styles/lipstik.so +%{_datadir}/apps/kdisplay/color-schemes/lipstiknoble.kcsrc +%{_datadir}/apps/kdisplay/color-schemes/lipstikstandard.kcsrc +%{_datadir}/apps/kdisplay/color-schemes/lipstikwhite.kcsrc +%{_datadir}/apps/kstyle/themes/lipstik.themerc + + +%Changelog +* Sat Nov 19 2011 Francois Andriot - 2.2.3-1 +- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/kde-style-qtcurve/kde-style-qtcurve-1.6.2-libsuffix.patch b/redhat/applications/kde-style-qtcurve/kde-style-qtcurve-1.6.2-libsuffix.patch new file mode 100644 index 000000000..d7e8df30c --- /dev/null +++ b/redhat/applications/kde-style-qtcurve/kde-style-qtcurve-1.6.2-libsuffix.patch @@ -0,0 +1,11 @@ +--- kde-style-qtcurve/CMakeLists.txt.ORI 2011-11-20 22:37:40.050443616 +0100 ++++ kde-style-qtcurve/CMakeLists.txt 2011-11-20 22:40:04.355439569 +0100 +@@ -46,7 +46,7 @@ + if (QT_PLUGINS_DIR MATCHES NOTFOUND) + MESSAGE(STATUS_ERROR "Qt3 package not found--assuming TQt4") + SET(QT_INCLUDE_DIR "/usr/include/qt4") +- SET(QT_PLUGINS_DIR "${KDE3PREFIX}/lib/trinity/plugins") ++ SET(QT_PLUGINS_DIR "${KDE3PREFIX}/lib${LIB_SUFFIX}/trinity/plugins") + endif (QT_PLUGINS_DIR MATCHES NOTFOUND) + endif (NOT QTC_QT_ONLY) + diff --git a/redhat/applications/kde-style-qtcurve/trinity-kde-style-qtcurve.spec b/redhat/applications/kde-style-qtcurve/trinity-kde-style-qtcurve.spec new file mode 100644 index 000000000..4995202a2 --- /dev/null +++ b/redhat/applications/kde-style-qtcurve/trinity-kde-style-qtcurve.spec @@ -0,0 +1,118 @@ +# Default version for this component +%define kdecomp kde-style-qtcurve +%define version 0.55.2 +%define release 1 + +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?_prefix}" != "/usr" +%define _variant .opt +%define _docdir %{_prefix}/share/doc +%endif + +# TDE 3.5.13 specific building variables +BuildRequires: autoconf automake libtool m4 +%define tde_docdir %{_docdir}/kde +%define tde_includedir %{_includedir}/kde +%define tde_libdir %{_libdir}/trinity + + +Name: trinity-%{kdecomp} +Summary: This is a set of widget styles for Trinity based apps +Version: %{?version} +Release: %{?release}%{?dist}%{?_variant} + +License: GPLv2+ +Group: Applications/Utilities + +Vendor: Trinity Project +Packager: Francois Andriot +URL: http://www.trinitydesktop.org/ + +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{kdecomp}-3.5.13.tar.gz + +Patch0: kde-style-qtcurve-1.6.2-libsuffix.patch + +BuildRequires: tqtinterface-devel +BuildRequires: trinity-kdelibs-devel +BuildRequires: trinity-kdebase-devel +BuildRequires: desktop-file-utils +BuildRequires: gettext + + +%description +This package together with gtk2-engines-qtcurve aim to provide a unified look +and feel on the desktop when using KDE and Gnome applications. + +This package is most useful when installed together with +gtk2-engines-qtcurve. + + +%prep +%setup -q -n applications/%{kdecomp} +%patch0 -p1 + +# Ugly hack to modify TQT include directory inside autoconf files. +# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! +sed -i CMakeLists.txt \ + -e "s,/usr/include/tqt,%{_includedir}/tqt,g" + + +%build +unset QTDIR || : ; . /etc/profile.d/qt.sh +export PATH="%{_bindir}:${PATH}" + +export CXXFLAGS="-I${QTINC} ${CXXFLAGS}" + +%__mkdir build +cd build +%cmake \ + -DKDE3PREFIX=%{_prefix} \ + .. + +%__make %{?_smp_mflags} + + +%install +export PATH="%{_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} -C build + + +%clean +%__rm -rf %{buildroot} + + +%post +touch --no-create %{_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : + +%postun +touch --no-create %{_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : + + +%files +%defattr(-,root,root,-) +%doc AUTHORS COPYING +%{tde_libdir}/plugins/styles/qtcurve.so +%{_datadir}/apps/QtCurve/Agua.qtcurve +%{_datadir}/apps/QtCurve/Agua_II.qtcurve +%{_datadir}/apps/QtCurve/Curve.qtcurve +%{_datadir}/apps/QtCurve/Flat.qtcurve +%{_datadir}/apps/QtCurve/Human.qtcurve +%{_datadir}/apps/QtCurve/Inverted.qtcurve +%{_datadir}/apps/QtCurve/Klearlooks.qtcurve +%{_datadir}/apps/QtCurve/Milk.qtcurve +%{_datadir}/apps/QtCurve/Murrine.qtcurve +%{_datadir}/apps/QtCurve/Ozone.qtcurve +%{_datadir}/apps/QtCurve/Plastic.qtcurve +%{_datadir}/apps/QtCurve/Silk.qtcurve +%{_datadir}/apps/kdisplay/color-schemes/QtCurve.kcsrc + + +%Changelog +* Sat Nov 19 2011 Francois Andriot - 0.55.2-1 +- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/kiosktool/trinity-kiosktool.spec b/redhat/applications/kiosktool/trinity-kiosktool.spec new file mode 100644 index 000000000..ec96de232 --- /dev/null +++ b/redhat/applications/kiosktool/trinity-kiosktool.spec @@ -0,0 +1,131 @@ +# Default version for this component +%define kdecomp kiosktool +%define version 1.0 +%define release 1 + +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?_prefix}" != "/usr" +%define _variant .opt +%define _docdir %{_prefix}/share/doc +%endif + +# TDE 3.5.13 specific building variables +BuildRequires: autoconf automake libtool m4 +%define tde_docdir %{_docdir}/kde +%define tde_includedir %{_includedir}/kde +%define tde_libdir %{_libdir}/trinity + + +Name: trinity-%{kdecomp} +Version: %{?version} +Release: %{?release}%{?dist}%{?_variant} +Summary: tool to configure the TDE kiosk framework + +License: GPLv2+ +Group: Applications/Multimedia + +Vendor: Trinity Project +Packager: Francois Andriot +URL: http://www.trinitydesktop.org/ + + +Source0: %{kdecomp}-3.5.13.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: gettext +BuildRequires: trinity-kdelibs-devel + + +%description +A Point&Click tool for system administrators to enable +TDE's KIOSK features or otherwise preconfigure TDE for +groups of users. + + +%prep +%setup -q -n applications/%{kdecomp} + +# Ugly hack to modify TQT include directory inside autoconf files. +# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! +sed -i admin/acinclude.m4.in \ + -e "s,/usr/include/tqt,%{_includedir}/tqt,g" + +%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +%__make -f admin/Makefile.common + +%build +unset QTDIR || : ; source /etc/profile.d/qt.sh +export PATH="%{_bindir}:${PATH}" +export LDFLAGS="-L%{_libdir} -I%{_includedir}" + + +%configure \ + --disable-rpath \ + --enable-new-ldflags \ + --disable-debug --disable-warnings \ + --disable-dependency-tracking --enable-final \ + --enable-closure \ + --with-extra-includes=%{_includedir}/tqt + + +%__make %{?_smp_mflags} + + +%install +export PATH="%{_bindir}:${PATH}" +%__rm -rf $RPM_BUILD_ROOT +%__make install DESTDIR=$RPM_BUILD_ROOT + +## File lists +# locale's +%find_lang %{kdecomp} +# HTML (1.0) +HTML_DIR=$(kde-config --expandvars --install html) +if [ -d $RPM_BUILD_ROOT$HTML_DIR ]; then +for lang_dir in $RPM_BUILD_ROOT$HTML_DIR/* ; do + if [ -d $lang_dir ]; then + lang=$(basename $lang_dir) + echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang + # replace absolute symlinks with relative ones + pushd $lang_dir + for i in *; do + [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common + done + popd + fi +done +fi + + +%clean +%__rm -rf $RPM_BUILD_ROOT + + +%post +touch --no-create %{_datadir}/icons/hicolor ||: +gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||: +update-desktop-database >& /dev/null ||: + +%postun +touch --no-create %{_datadir}/icons/hicolor ||: +gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||: +update-desktop-database >& /dev/null ||: + + + +%files -f %{kdecomp}.lang +%defattr(-,root,root,-) +%doc ChangeLog COPYING README TODO +%{_bindir}/kiosktool +%{_bindir}/kiosktool-kdedirs +%{_datadir}/applications/kde/kiosktool.desktop +%{_datadir}/apps/kiosktool/*.png +%{_docdir}/HTML/en/kiosktool/ +%{_datadir}/icons/crystalsvg/*/apps/kiosktool.png +%{_datadir}/apps/kiosktool/kiosk_data.xml +%{_datadir}/apps/kiosktool/kiosktoolui.rc + +%Changelog +* Sat Nov 19 2011 Francois Andriot - 1.0-1 +- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/knights/trinity-knights.spec b/redhat/applications/knights/trinity-knights.spec new file mode 100644 index 000000000..2dbbdc1a4 --- /dev/null +++ b/redhat/applications/knights/trinity-knights.spec @@ -0,0 +1,115 @@ +# Default version for this component +%define kdecomp knights +%define version 0.6 +%define release 1 + +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?_prefix}" != "/usr" +%define _variant .opt +%define _docdir %{_prefix}/share/doc +%endif + +# TDE 3.5.13 specific building variables +BuildRequires: autoconf automake libtool m4 +%define tde_docdir %{_docdir}/kde +%define tde_includedir %{_includedir}/kde +%define tde_libdir %{_libdir}/trinity + + +Name: trinity-%{kdecomp} +Summary: A chess interface for the K Desktop Environment [Trinity] +Version: %{?version} +Release: %{?release}%{?dist}%{?_variant} + +License: GPLv2+ +Group: Amusements/Games + +Vendor: Trinity Project +Packager: Francois Andriot +URL: http://www.trinitydesktop.org/ + +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{kdecomp}-3.5.13.tar.gz + +BuildRequires: tqtinterface-devel +BuildRequires: trinity-kdelibs-devel +BuildRequires: trinity-kdebase-devel +BuildRequires: desktop-file-utils +BuildRequires: gettext + +Requires: gnuchess + +%description +Knights aims to be the ultimate chess resource on your computer. +Written for the K Desktop Environment, it's designed to be both friendly +to new chess players and functional for Grand Masters. + +Here's a quick list of Knights' key features: +* Play against yourself, against computer opponents, + or against others over the Internet. +* Customize your board and pieces with over 30 different themes, + or make your own! +* Audio cues help alert you to important events. +* Novice players can preview potential moves. +* Save your unfinished matches and play them again later. + + +%prep +%setup -q -n applications/%{kdecomp} + +# Ugly hack to modify TQT include directory inside autoconf files. +# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! +sed -i admin/acinclude.m4.in \ + -e "s,/usr/include/tqt,%{_includedir}/tqt,g" + +%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +%__make -f "admin/Makefile.common" + + +%build +export PATH="%{_bindir}:${PATH}" +export LDFLAGS="-L%{_libdir} -I%{_includedir}" + +%configure \ + --disable-rpath \ + --with-extra-includes=%{_includedir}/tqt + +%__make %{?_smp_mflags} + + +%install +export PATH="%{_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} + +%find_lang %{kdecomp} + +%clean +%__rm -rf %{buildroot} + + +%post +touch --no-create %{_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : + +%postun +touch --no-create %{_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : + + +%files -f %{kdecomp}.lang +%defattr(-,root,root,-) +%{_bindir}/knights +%{_datadir}/applnk/Games/Board/knights.desktop +%{_datadir}/apps/knights +%{_docdir}/HTML/*/knights +%{_datadir}/icons/*/*/*/*.png +%{_datadir}/mimelnk/application/pgn.desktop + + +%Changelog +* Sun Nov 20 2011 Francois Andriot - 0.6-1 +- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/kpowersave/trinity-kpowersave.spec b/redhat/applications/kpowersave/trinity-kpowersave.spec new file mode 100644 index 000000000..c69f96f5e --- /dev/null +++ b/redhat/applications/kpowersave/trinity-kpowersave.spec @@ -0,0 +1,123 @@ +# Default version for this component +%define kdecomp kpowersave +%define version 0.7.3 +%define release 1 + +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?_prefix}" != "/usr" +%define _variant .opt +%define _docdir %{_prefix}/share/doc +%endif + +# TDE 3.5.13 specific building variables +BuildRequires: autoconf automake libtool m4 +%define tde_docdir %{_docdir}/kde +%define tde_includedir %{_includedir}/kde +%define tde_libdir %{_libdir}/trinity + + +Name: trinity-%{kdecomp} +Version: %{?version} +Release: %{?release}%{?dist}%{?_variant} +Summary: HAL based power management applet for Trinityfiles or directories. + +License: GPLv2+ +Group: Applications/Utilities + +Vendor: Trinity Project +Packager: Francois Andriot +URL: http://www.trinitydesktop.org/ + +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{kdecomp}-3.5.13.tar.gz + + +BuildRequires: tqtinterface-devel +BuildRequires: trinity-kdelibs-devel +BuildRequires: trinity-kdebase-devel +BuildRequires: desktop-file-utils + +%description +KPowersave is a TDE systray applet which allows to control the power +management settings and policies of your computer. +It relies on HAL to do the heavy lifting. + +Current feature list: + * support for ACPI, APM and PMU + * trigger suspend to disk/ram and standby + * switch cpu frequency policy (between: performance, dynamic and powersave) + * applet icon with information about AC state, battery fill and battery + (warning) states + * applet tooltip with information about battery fill and remaining battery + time/percentage + * autosuspend (to suspend the machine if the user has been inactive for a + defined time) + * a global configurable blacklist with programs which prevent autosuspend + (e.g. videoplayer and cd burning tools) + * trigger lock screen and select the lock method + * KNotify support + * online help + * localisations for many languages +KPowersave supports schemes with following configurable specific +settings for: + * screensaver + * DPMS + * autosuspend + * scheme specific blacklist for autosuspend + * notification settings + + +%prep +%setup -q -n applications/%{kdecomp} + +%build +unset QTDIR || : ; . /etc/profile.d/qt.sh +export PATH="%{_bindir}:${PATH}" + +%__mkdir build +cd build +%cmake \ + .. + +%__make %{?_smp_mflags} + + +%install +export PATH="%{_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} -C build + + +%clean +%__rm -rf %{buildroot} + + +%post +touch --no-create %{_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : + +%postun +touch --no-create %{_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : + + +%files +%defattr(-,root,root,-) +%doc AUTHORS COPYING +%{_bindir}/kpowersave +%{_libdir}/libkdeinit_kpowersave.la +%{_libdir}/libkdeinit_kpowersave.so +%{tde_libdir}/kpowersave.la +%{tde_libdir}/kpowersave.so +%{_datadir}/applications/kde/kpowersave.desktop +%{_datadir}/apps/kpowersave/eventsrc +%{_datadir}/apps/kpowersave/icons/*/*/*/*.png +%{_datadir}/icons/*/*/*/*.png +%{_datadir}/autostart/kpowersave-autostart.desktop +%{_datadir}/config/kpowersaverc + +%Changelog +* Sat Nov 19 2011 Francois Andriot - 0.7.3-1 +- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/kradio/trinity-kradio.spec b/redhat/applications/kradio/trinity-kradio.spec new file mode 100644 index 000000000..505dca071 --- /dev/null +++ b/redhat/applications/kradio/trinity-kradio.spec @@ -0,0 +1,124 @@ +# Default version for this component +%define kdecomp kradio +%define version 0.1.1.1 +%define release 1 + +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?_prefix}" != "/usr" +%define _variant .opt +%define _docdir %{_prefix}/share/doc +%endif + +# TDE 3.5.13 specific building variables +BuildRequires: autoconf automake libtool m4 +%define tde_docdir %{_docdir}/kde +%define tde_includedir %{_includedir}/kde +%define tde_libdir %{_libdir}/trinity + + +Name: trinity-%{kdecomp} +Summary: Comfortable Radio Application for KDE [Trinity] +Version: %{?version} +Release: %{?release}%{?dist}%{?_variant} + +License: GPLv2+ +Group: Applications/Utilities + +Vendor: Trinity Project +Packager: Francois Andriot +URL: http://www.trinitydesktop.org/ + +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{kdecomp}-3.5.13.tar.gz + +BuildRequires: tqtinterface-devel +BuildRequires: trinity-kdelibs-devel +BuildRequires: trinity-kdebase-devel +BuildRequires: desktop-file-utils +BuildRequires: gettext + +BuildRequires: libsndfile-devel + +%description +KRadio is a comfortable radio application for KDE 3.x with support for +V4L and V4L2 radio cards drivers. + +KRadio currently provides + + * V4L/V4L2 radio support + * Remote control support (LIRC) + * Alarms, sleep Countdown + * Several GUI Controls (Docking Menu, Station Quickbar, Radio Display) + * Recording capabilities, including MP3 and Ogg/Vorbis encoding + * Timeshifter functionality + * Extendable plugin architecture + +This package also includes a growing collection of station preset +files for many cities around the world contributed by KRadio users. + +As KRadio is based on an extendable plugin architecture, contributions +of new plugins (e.g. Internet Radio Streams, new cool GUIs) are welcome. + + +%prep +%setup -q -n applications/%{kdecomp} + +# Ugly hack to modify TQT include directory inside autoconf files. +# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! +sed -i admin/acinclude.m4.in \ + -e "s,/usr/include/tqt,%{_includedir}/tqt,g" + +%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +%__make -f "admin/Makefile.common" + + +%build +export PATH="%{_bindir}:${PATH}" +export LDFLAGS="-L%{_libdir} -I%{_includedir}" + +%configure \ + --disable-rpath \ + --with-extra-includes=%{_includedir}/tqt + +%__make %{?_smp_mflags} + + +%install +export PATH="%{_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} + +%find_lang %{kdecomp} + +%clean +%__rm -rf %{buildroot} + + +%post +touch --no-create %{_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : + +%postun +touch --no-create %{_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : + + +%files -f %{kdecomp}.lang +%defattr(-,root,root,-) +%{_bindir}/convert-presets +%{_bindir}/kradio +%{_libdir}/kradio/plugins/*.la +%{_libdir}/kradio/plugins/*.so +%{_datadir}/applications/kde/kradio.desktop +%{_datadir}/apps/kradio/icons/*/*/*/*.png +%{_datadir}/apps/kradio/presets/*/*.krp +%{_datadir}/apps/kradio/presets/*/*/*.krp +%{_datadir}/locale/*/LC_MESSAGES/kradio-*.mo + + +%Changelog +* Sat Nov 19 2011 Francois Andriot - 0.1.1.1-1 +- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/ksplash-engine-moodin/trinity-ksplash-engine-moodin.spec b/redhat/applications/ksplash-engine-moodin/trinity-ksplash-engine-moodin.spec new file mode 100644 index 000000000..8f1b80b1a --- /dev/null +++ b/redhat/applications/ksplash-engine-moodin/trinity-ksplash-engine-moodin.spec @@ -0,0 +1,114 @@ +# Default version for this component +%define kdecomp ksplash-engine-moodin +%define version 0.4.2 +%define release 1 + +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?_prefix}" != "/usr" +%define _variant .opt +%define _docdir %{_prefix}/share/doc +%endif + +# TDE 3.5.13 specific building variables +BuildRequires: autoconf automake libtool m4 +%define tde_docdir %{_docdir}/kde +%define tde_includedir %{_includedir}/kde +%define tde_libdir %{_libdir}/trinity + + +Name: trinity-%{kdecomp} +Summary: fading splash screen engine for Trinity +Version: %{?version} +Release: %{?release}%{?dist}%{?_variant} + +License: GPLv2+ +Group: Applications/Utilities + +Vendor: Trinity Project +Packager: Francois Andriot +URL: http://www.trinitydesktop.org/ + +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{kdecomp}-3.5.13.tar.gz + +BuildRequires: tqtinterface-devel +BuildRequires: trinity-kdelibs-devel +BuildRequires: trinity-kdebase-devel +BuildRequires: desktop-file-utils +BuildRequires: gettext + + +%description +Heavily customizable engine for various types of themes. + +Features: +* scale cache +* fading images +* use current icon set or custom images +* unlimited Custom text labels +* set fading delay and length +* custom image arrangement +* resolution independent themes + +This KDE splash screen engine is based upon Linspire's +engine by Sean Meiners + +Homepage: http://moodwrod.com + + +%prep +%setup -q -n applications/%{kdecomp} + +# Ugly hack to modify TQT include directory inside autoconf files. +# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! +sed -i admin/acinclude.m4.in \ + -e "s,/usr/include/tqt,%{_includedir}/tqt,g" + +%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +%__make -f "admin/Makefile.common" + + +%build +export PATH="%{_bindir}:${PATH}" +export LDFLAGS="-L%{_libdir} -I%{_includedir}" + +%configure \ + --disable-rpath \ + --with-extra-includes=%{_includedir}/tqt + +%__make %{?_smp_mflags} + + +%install +export PATH="%{_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} + + +%clean +%__rm -rf %{buildroot} + + +%post +touch --no-create %{_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : + +%postun +touch --no-create %{_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : + + +%files +%defattr(-,root,root,-) +%{tde_libdir}/ksplashmoodin.la +%{tde_libdir}/ksplashmoodin.so +%{_datadir}/apps/ksplash +%{_datadir}/services/ksplashmoodin.desktop + + +%Changelog +* Sat Nov 19 2011 Francois Andriot - 0.4.2-1 +- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/kwin-style-crystal/trinity-kwin-style-crystal.spec b/redhat/applications/kwin-style-crystal/trinity-kwin-style-crystal.spec new file mode 100644 index 000000000..23cb1da54 --- /dev/null +++ b/redhat/applications/kwin-style-crystal/trinity-kwin-style-crystal.spec @@ -0,0 +1,108 @@ +# Default version for this component +%define kdecomp kwin-style-crystal +%define version 1.0.5 +%define release 1 + +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?_prefix}" != "/usr" +%define _variant .opt +%define _docdir %{_prefix}/share/doc +%endif + +# TDE 3.5.13 specific building variables +BuildRequires: autoconf automake libtool m4 +%define tde_docdir %{_docdir}/kde +%define tde_includedir %{_includedir}/kde +%define tde_libdir %{_libdir}/trinity + + +Name: trinity-%{kdecomp} +Summary: Semi transparant window decoration for Trinity. +Version: %{?version} +Release: %{?release}%{?dist}%{?_variant} + +License: GPLv2+ +Group: Applications/Utilities + +Vendor: Trinity Project +Packager: Francois Andriot +URL: http://www.trinitydesktop.org/ + +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{kdecomp}-3.5.13.tar.gz + +BuildRequires: tqtinterface-devel +BuildRequires: trinity-kdelibs-devel +BuildRequires: trinity-kdebase-devel +BuildRequires: desktop-file-utils +BuildRequires: gettext + + +%description +Crystal offers you pseudo transparent titlebar, buttons and borders +transparent, so you can see more of your lovely background image +Transparancy and buttons can be costumized to match your wishes. +Offers rounded corners as well + +And it is of course nice to look at. Upstream says: +"- Don't forget to breathe, while drooling." + + +%prep +%setup -q -n applications/%{kdecomp} + +# Ugly hack to modify TQT include directory inside autoconf files. +# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! +sed -i admin/acinclude.m4.in \ + -e "s,/usr/include/tqt,%{_includedir}/tqt,g" + +%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +%__make -f "admin/Makefile.common" + + +%build +export PATH="%{_bindir}:${PATH}" +export LDFLAGS="-L%{_libdir} -I%{_includedir}" + +%configure \ + --disable-rpath \ + --with-extra-includes=%{_includedir}/tqt + +%__make %{?_smp_mflags} + + +%install +export PATH="%{_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} + + +%clean +%__rm -rf %{buildroot} + + +%post +touch --no-create %{_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : + +%postun +touch --no-create %{_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : + + +%files +%defattr(-,root,root,-) +%doc AUTHORS COPYING +%{tde_libdir}/kwin3_crystal.la +%{tde_libdir}/kwin3_crystal.so +%{tde_libdir}/kwin_crystal_config.la +%{tde_libdir}/kwin_crystal_config.so +%{_datadir}/apps/kwin/crystal.desktop + + +%Changelog +* Sat Nov 19 2011 Francois Andriot - 1.0.5-1 +- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/components.txt b/redhat/components.txt index 14d9b1e4e..a7853060a 100644 --- a/redhat/components.txt +++ b/redhat/components.txt @@ -50,7 +50,25 @@ applications/kstreamripper applications/kdesudo applications/digikam applications/konversation -applications/ksensors +extras/ksensors applications/amarok applications/kaffeine applications/knetworkmanager +applications/kwin-style-crystal +applications/kde-style-lipstik +applications/kde-style-qtcurve +applications/kpowersave +applications/kiosktool +applications/k9copy +applications/kchmviewer +applications/kbfx +applications/kradio +applications/kcpuload +applications/fusion-icon +applications/ksplash-engine-moodin +applications/knights +libraries/libksquirrel +#extras/libkexif +applications/ksquirrel +applications/gtk-qt-engine + diff --git a/redhat/applications/ksensors/ksensors-0.7.3-fix-min-max.patch b/redhat/extras/ksensors/ksensors-0.7.3-fix-min-max.patch similarity index 100% rename from redhat/applications/ksensors/ksensors-0.7.3-fix-min-max.patch rename to redhat/extras/ksensors/ksensors-0.7.3-fix-min-max.patch diff --git a/redhat/applications/ksensors/ksensors-0.7.3-lm_sensors-3.x.patch b/redhat/extras/ksensors/ksensors-0.7.3-lm_sensors-3.x.patch similarity index 100% rename from redhat/applications/ksensors/ksensors-0.7.3-lm_sensors-3.x.patch rename to redhat/extras/ksensors/ksensors-0.7.3-lm_sensors-3.x.patch diff --git a/redhat/applications/ksensors/ksensors-0.7.3-po.patch b/redhat/extras/ksensors/ksensors-0.7.3-po.patch similarity index 100% rename from redhat/applications/ksensors/ksensors-0.7.3-po.patch rename to redhat/extras/ksensors/ksensors-0.7.3-po.patch diff --git a/redhat/applications/ksensors/ksensors-0.7.3-trinity.patch b/redhat/extras/ksensors/ksensors-0.7.3-trinity.patch similarity index 100% rename from redhat/applications/ksensors/ksensors-0.7.3-trinity.patch rename to redhat/extras/ksensors/ksensors-0.7.3-trinity.patch diff --git a/redhat/applications/ksensors/ksensors-0.7.3.tar.gz b/redhat/extras/ksensors/ksensors-0.7.3.tar.gz similarity index 100% rename from redhat/applications/ksensors/ksensors-0.7.3.tar.gz rename to redhat/extras/ksensors/ksensors-0.7.3.tar.gz diff --git a/redhat/applications/ksensors/ksensors-desktop.patch b/redhat/extras/ksensors/ksensors-desktop.patch similarity index 100% rename from redhat/applications/ksensors/ksensors-desktop.patch rename to redhat/extras/ksensors/ksensors-desktop.patch diff --git a/redhat/applications/ksensors/ksensors_0.7.3-15.diff.gz b/redhat/extras/ksensors/ksensors_0.7.3-15.diff.gz similarity index 100% rename from redhat/applications/ksensors/ksensors_0.7.3-15.diff.gz rename to redhat/extras/ksensors/ksensors_0.7.3-15.diff.gz diff --git a/redhat/applications/ksensors/trinity-ksensors.spec b/redhat/extras/ksensors/trinity-ksensors.spec similarity index 100% rename from redhat/applications/ksensors/trinity-ksensors.spec rename to redhat/extras/ksensors/trinity-ksensors.spec diff --git a/redhat/genrpm.sh b/redhat/genrpm.sh index c0627d032..b575f93cb 100755 --- a/redhat/genrpm.sh +++ b/redhat/genrpm.sh @@ -43,7 +43,7 @@ if [ -z "${VERSION}" ]; then if [ -n "${REQVERSION}" ]; then set $( cd "${COMP}"; echo ${COMP##*/}*-${REQVERSION}.tar.gz) else - set $( cd "${COMP}"; echo ${COMP##*/}*.tar.gz) + set $( cd "${COMP}"; echo ${COMP##*/}*.tar.* ) fi if [ $# -gt 1 ]; then select VERSION in $*; do break; done diff --git a/redhat/kdebase/kdebase-3.5.12-kickoff_unstable.patch b/redhat/kdebase/kdebase-3.5.12-kickoff_unstable.patch index 2a58f0020..7b8b649e1 100644 --- a/redhat/kdebase/kdebase-3.5.12-kickoff_unstable.patch +++ b/redhat/kdebase/kdebase-3.5.12-kickoff_unstable.patch @@ -1,13 +1,443 @@ -Index: ui/k_new_mnu.cpp -=================================================================== ---- ui/k_new_mnu.cpp (revision 1259264) -+++ ui/k_new_mnu.cpp (working copy) -@@ -3502,6 +3502,8 @@ - descr, "system:/media/" + name, nId++, -1 ); +Binary files kdebase/kicker/data/kickoff/resize_handle.png and kdebase1/kicker/data/kickoff/resize_handle.png differ +diff -ur kdebase/kicker/kicker/buttons/knewbutton.cpp kdebase1/kicker/kicker/buttons/knewbutton.cpp +--- kdebase/kicker/kicker/buttons/knewbutton.cpp 2011-08-11 01:25:50.000000000 -0400 ++++ kdebase1/kicker/kicker/buttons/knewbutton.cpp 2011-11-18 12:54:22.380404540 -0500 +@@ -55,26 +55,28 @@ + : KButton( parent ), + m_oldPos(0,0) + { ++ ++ setTitle(i18n("K Menu")); + Q_ASSERT( !m_self ); + m_self = this; +- m_hoverTimer = -1; + m_openTimer = -1; +- m_active = false; ++ m_hoverTimer = -1; + m_mouseInside = false; + m_drag = false; +- +- setIconAlignment((TQ_Alignment)(AlignTop|AlignRight)); +- setAcceptDrops(true); +- setIcon("kmenu-suse"); +- setDrawArrow(false); +- +- m_movie = new TQMovie(locate("data", "kicker/pics/kmenu_basic.mng")); +- m_movie->connectUpdate(this, TQT_SLOT(updateMovie())); +- m_movie->connectStatus(TQT_TQOBJECT(this), TQT_SLOT(slotStatus(int))); +- m_movie->connectResize(this, TQT_SLOT(slotSetSize(const TQSize&))); +- ++ ++ setIcon("kmenu"); ++ setIcon(KickerSettings::customKMenuIcon()); ++ + TQApplication::desktop()->screen()->installEventFilter(this); +- setMouseTracking(true); ++ ++ if (KickerSettings::showKMenuText()) ++ { ++ setButtonText(KickerSettings::kMenuText()); ++ setFont(KickerSettings::buttonFont()); ++ setTextColor(KickerSettings::buttonTextColor()); ++ } ++ ++ tqrepaint(); + } - ++it; // skip separator -+ ++it; -+ ++it; + KNewButton::~KNewButton() +@@ -82,28 +84,15 @@ + if ( m_self == this ) + m_self = 0; + setMouseTracking(false); +- delete m_movie; + } + +-void KNewButton::slotStatus(int status) +-{ +- if(status == TQMovie::EndOfLoop) +- slotStopAnimation(); +-} + +-TQColor KNewButton::borderColor() const ++void KNewButton::drawButton(TQPainter *p) + { +- TQImage img = m_active_pixmap.convertToImage(); +- +- for (int i = 0; i < img.width(); ++i) { +- QRgb rgb = img.pixel(orientation() == Qt::Horizontal ? img.width() - i - 1 : +- i, 2); +- +- if (tqGreen(rgb) > 0x50) +- return rgb; +- } +- +- return img.pixel( orientation() == Qt::Horizontal ? img.width() - 2 : 2, 2); ++ if (KickerSettings::showDeepButtons()) ++ PanelPopupButton::drawDeepButton(p); ++ else ++ PanelPopupButton::drawButton(p); + } + + void KNewButton::show() +@@ -111,103 +100,12 @@ + KButton::show(); + + if (KickerSettings::firstRun()) { +- TQTimer::singleShot(500,this,TQT_SLOT(slotExecMenu())); ++ TQTimer::singleShot(0,this,TQT_SLOT(slotExecMenu())); + KickerSettings::setFirstRun(false); + KickerSettings::writeConfig(); + } + } + +-void KNewButton::updateMovie() +-{ +- m_oldPos = TQPoint( -1, -1 ); +- drawEye(); +- +- if (!m_active && m_movie->running()) +- m_movie->pause(); +-} +- +-void KNewButton::setPopupDirection(KPanelApplet::Direction d) +-{ +- KButton::setPopupDirection(d); +- +- delete m_movie; +- +- switch (d) { +- case KPanelApplet::Left: +- setIconAlignment((TQ_Alignment)(AlignTop|AlignLeft)); +- m_movie = new TQMovie(locate("data", "kicker/pics/kmenu_vertical.mng")); +- break; +- case KPanelApplet::Right: +- setIconAlignment((TQ_Alignment)(AlignTop|AlignRight)); +- m_movie = new TQMovie(locate("data", "kicker/pics/kmenu_vertical.mng")); +- break; +- case KPanelApplet::Up: +- setIconAlignment((TQ_Alignment)(AlignTop|AlignHCenter)); +- m_movie = new TQMovie(locate("data", "kicker/pics/kmenu_basic.mng")); +- break; +- case KPanelApplet::Down: +- setIconAlignment((TQ_Alignment)(AlignBottom|AlignHCenter)); +- m_movie = new TQMovie(locate("data", "kicker/pics/kmenu_flipped.mng")); +- } +- +- m_movie->connectUpdate(this, TQT_SLOT(updateMovie())); +- m_movie->connectStatus(TQT_TQOBJECT(this), TQT_SLOT(slotStatus(int))); +- m_movie->connectResize(this, TQT_SLOT(slotSetSize(const TQSize&))); +-} +- +-void KNewButton::slotSetSize(const TQSize& s) +-{ +- m_iconSize = s; +-} +- +-double KNewButton::buttonScaleFactor(const TQSize& s) const +-{ +- double sf = 1.0; +- +- switch (popupDirection()) { +- case KPanelApplet::Left: +- case KPanelApplet::Right: +-// sf = kMin(double(s.width()) / m_iconSize.height(), double(s.height()) / m_iconSize.width()); +-// break; +- case KPanelApplet::Up: +- case KPanelApplet::Down: +- sf = kMin(double(s.width()) / m_iconSize.width(), double(s.height()) / m_iconSize.height()); +- break; +- } +- +- if (sf > 0.8) sf = 1.0; +- return sf; +-} +- +-int KNewButton::widthForHeight(int height) const +-{ +- int r = m_iconSize.width() * buttonScaleFactor(TQSize(m_iconSize.width(), height)); +- +- if (!m_movie->running() && height != m_active_pixmap.height()) +- { +- KNewButton* that = const_cast(this); +- TQTimer::singleShot(0, that, TQT_SLOT(slotStopAnimation())); +- } +- +- return r; +-} +- +-int KNewButton::preferredDimension(int panelDim) const +-{ +- return kMax(m_icon.width(), m_icon.height()); +-} +- +-int KNewButton::heightForWidth(int width) const +-{ +- int r = m_iconSize.width() * buttonScaleFactor(TQSize(width, m_iconSize.height())); +- if (!m_movie->running() && width != m_active_pixmap.width()) +- { +- KNewButton* that = const_cast(this); +- TQTimer::singleShot(0, that, TQT_SLOT(slotStopAnimation())); +- } +- return r; +-} +- + bool KNewButton::eventFilter(TQObject *o, TQEvent *e) + { + if (e->type() == TQEvent::MouseButtonRelease || +@@ -223,75 +121,9 @@ + } + } + +- if (KickerSettings::kickoffDrawGeekoEye() && e->type() == TQEvent::MouseMove) +- { +- TQMouseEvent *me = TQT_TQMOUSEEVENT(e); +- if ((me->state() & Qt::MouseButtonMask) == Qt::NoButton) +- drawEye(); +- } +- + return KButton::eventFilter(o, e); + } + +-void KNewButton::drawEye() +-{ +-#define eye_x 62 +-#define eye_y 13 +- TQPoint mouse = TQCursor::pos(); +- TQPoint me = mapToGlobal(TQPoint(eye_x, eye_y)); +- double a = atan2(mouse.y() - me.y(), mouse.x() - me.x()); +- int dx = int(2.1 * cos(a)); +- int dy = int(2.1 * sin(a)); +- +- TQPoint newpos(eye_x+dx,eye_y+dy); +- if (newpos!=m_oldPos) { +- m_oldPos = newpos; +- TQPixmap pixmap = m_active_pixmap; +- +- double sf = 1.0; +- +- if(!m_movie->framePixmap().isNull()) +- { +- pixmap = m_movie->framePixmap(); +- pixmap.detach(); +- m_iconSize = pixmap.size(); +- sf = buttonScaleFactor(size()); +- +- if (KickerSettings::kickoffDrawGeekoEye()) { +- TQPainter p(&pixmap); +- p.setPen(white); +- p.setBrush(white); +- // p.setPen(TQColor(110,185,55)); +- p.drawRect(eye_x+dx, eye_y+dy, 2, 2); +- p. end(); +- } +- } +- +- TQWMatrix matrix; +- switch (popupDirection()) { +- case KPanelApplet::Left: +- matrix.scale(sf, -sf); +- matrix.rotate(90); +- break; +- case KPanelApplet::Up: +- matrix.scale(sf, sf); +- break; +- case KPanelApplet::Right: +- matrix.scale(sf, -sf); +- matrix.rotate(90); +- break; +- case KPanelApplet::Down: +- matrix.scale(sf, sf); +- break; +- } +- m_active_pixmap = pixmap.xForm(matrix); +- +- tqrepaint(false); +- } +-#undef eye_x +-#undef eye_y +-} +- + void KNewButton::enterEvent(TQEvent* e) + { + KButton::enterEvent(e); +@@ -315,15 +147,8 @@ + } + + m_active = true; +- m_movie->unpause(); +- m_movie->restart(); + } + +-void KNewButton::rewindMovie() +-{ +- m_oldPos = TQPoint( -1, -1 ); +- m_movie->unpause(); +-} + + void KNewButton::dragEnterEvent(TQDragEnterEvent* /*e*/) + { +@@ -369,31 +194,12 @@ + } + } + +-void KNewButton::slotStopAnimation() +-{ +- m_active = false; +- m_movie->pause(); +- m_movie->restart(); +- TQTimer::singleShot(200, this, TQT_SLOT(rewindMovie())); +-} +- +-const TQPixmap& KNewButton::labelIcon() const +-{ +- return m_active_pixmap; +-} +- + void KNewButton::slotExecMenu() + { +- if (m_openTimer != -1) +- killTimer(m_openTimer); +- +- m_openTimer = startTimer(TQApplication::doubleClickInterval() * 3); + + if (m_active) + { + m_active = false; +- m_movie->pause(); +- m_movie->restart(); } + + KButton::slotExecMenu(); +@@ -401,40 +207,12 @@ + assert(!KickerTip::tippingEnabled()); + assert(dynamic_cast(m_popup)); + +- disconnect(dynamic_cast(m_popup), TQT_SIGNAL(aboutToHide()), this, +- TQT_SLOT(slotStopAnimation())); +- connect(dynamic_cast(m_popup), TQT_SIGNAL(aboutToHide()), +- TQT_SLOT(slotStopAnimation())); +- + m_popup->move(KickerLib::popupPosition(popupDirection(), m_popup, this)); + // I wish KMenu would properly done itself when it closes. But it doesn't. + +- bool useEffect = true; // could be TQApplication::isEffectEnabled() +- useEffect = false; // too many TQt bugs to be useful +- if (m_drag) +- useEffect = false; +- + m_drag = false; // once is enough + +- if (useEffect) +- { +- switch (popupDirection()) { +- case KPanelApplet::Left: +- qScrollEffect(m_popup, TQEffects::LeftScroll); +- break; +- case KPanelApplet::Up: +- qScrollEffect(m_popup, TQEffects::UpScroll); +- break; +- case KPanelApplet::Right: +- qScrollEffect(m_popup, TQEffects::RightScroll); +- break; +- case KPanelApplet::Down: +- qScrollEffect(m_popup, TQEffects::DownScroll); +- break; +- } +- } +- else +- static_cast(m_popup)->show(); ++ static_cast(m_popup)->show(); } + void KNewButton::timerEvent(TQTimerEvent* e) +@@ -447,9 +225,4 @@ + killTimer(m_hoverTimer); + m_hoverTimer = -1; + } +- if (e->timerId() == m_openTimer) +- { +- killTimer(m_openTimer); +- m_openTimer = -1; +- } + } +diff -ur kdebase/kicker/kicker/buttons/knewbutton.h kdebase1/kicker/kicker/buttons/knewbutton.h +--- kdebase/kicker/kicker/buttons/knewbutton.h 2011-03-12 01:58:13.000000000 -0500 ++++ kdebase1/kicker/kicker/buttons/knewbutton.h 2011-11-18 09:31:03.163665964 -0500 +@@ -28,7 +28,6 @@ + + #include "kbutton.h" + +-#include + #include + + /** +@@ -43,25 +42,10 @@ + ~KNewButton(); + + static KNewButton *self() { return m_self; } +- + void loadConfig( const KConfigGroup& config ); +- +- virtual const TQPixmap& labelIcon() const; +- +- virtual int widthForHeight(int height) const; +- virtual int preferredDimension(int panelDim) const; +- virtual int heightForWidth(int width) const; +- + TQColor borderColor() const; ++ //virtual void setPopupDirection(KPanelApplet::Direction d); + +- virtual void setPopupDirection(KPanelApplet::Direction d); +- +-private slots: +- void slotStatus(int); +- void slotSetSize(const TQSize&); +- void slotStopAnimation(); +- void rewindMovie(); +- void updateMovie(); + + protected: + virtual void show(); +@@ -78,17 +62,15 @@ + void timerEvent(TQTimerEvent*); + + private: +- void drawEye(); +- double buttonScaleFactor(const TQSize& s) const; + +- TQMovie* m_movie; ++ void drawButton(TQPainter *p); + TQPixmap m_active_pixmap; + TQPoint m_oldPos; + TQSize m_iconSize; + TQRect m_sloppyRegion; +- int m_hoverTimer; + int m_openTimer; +- bool m_active; ++ int m_hoverTimer; ++ bool m_active; + bool m_mouseInside; + bool m_drag; + +diff -ur kdebase/kicker/kicker/ui/k_new_mnu.cpp kdebase1/kicker/kicker/ui/k_new_mnu.cpp +--- kdebase/kicker/kicker/ui/k_new_mnu.cpp 2011-08-11 01:25:49.000000000 -0400 ++++ kdebase1/kicker/kicker/ui/k_new_mnu.cpp 2011-11-18 15:02:51.565689119 -0500 +@@ -1700,8 +1700,6 @@ + TQPixmap pix( 64, footer->height() ); + TQPainter p( &pix ); + p.fillRect( 0, 0, 64, footer->height(), m_branding->tqcolorGroup().brush( TQColorGroup::Base ) ); +- p.fillRect( 0, m_orientation == BottomUp ? footer->height() - 2 : 0, +- 64, 3, KNewButton::self()->borderColor() ); + p.end(); + footer->setPaletteBackgroundPixmap( pix ); + } +@@ -3500,7 +3498,8 @@ + } + m_systemView->insertItem( iconName, userLabel.isEmpty() ? label : userLabel, + descr, "system:/media/" + name, nId++, -1 ); +- ++ ++it; ++ ++it; + ++it; // skip separator + } + } diff --git a/redhat/kdebase/kdebase-3.5.13-kdm-crypt.patch b/redhat/kdebase/kdebase-3.5.13-kdm-crypt.patch new file mode 100644 index 000000000..772d95f0e --- /dev/null +++ b/redhat/kdebase/kdebase-3.5.13-kdm-crypt.patch @@ -0,0 +1,43 @@ +diff -u -r kdebase.orig/config.h.cmake kdebase/config.h.cmake +--- kdebase.orig/config.h.cmake 2011-10-30 00:02:15.000000000 +0300 ++++ kdebase/config.h.cmake 2011-11-19 00:59:26.088061733 +0200 +@@ -114,6 +114,7 @@ + #cmakedefine HAVE_SYSINFO 1 + #cmakedefine HAVE_STRNLEN 1 + #cmakedefine HAVE_GETIFADDRS 1 ++#cmakedefine HAVE_CRYPT 1 + + #cmakedefine HAVE_SETUSERCONTEXT 1 + #cmakedefine HAVE_GETUSERSHELL 1 +diff -u -r kdebase.orig/kdm/backend/CMakeLists.txt kdebase/kdm/backend/CMakeLists.txt +--- kdebase.orig/kdm/backend/CMakeLists.txt 2011-09-03 22:32:00.000000000 +0300 ++++ kdebase/kdm/backend/CMakeLists.txt 2011-11-19 01:05:03.820839491 +0200 +@@ -43,6 +43,6 @@ + process.c protodpy.c reset.c resource.c rpcauth.c + server.c session.c sessreg.c socket.c streams.c + util.c xdmauth.c xdmcp.c +- LINK X11 ${XAU_LIBRARIES} ${DBUS_TQT_LIBRARIES} ${PAM_LIBRARY} ${XDMCP_LIBRARIES} ++ LINK X11 ${XAU_LIBRARIES} ${DBUS_TQT_LIBRARIES} ${CRYPT_LIBRARY} ${PAM_LIBRARY} ${XDMCP_LIBRARIES} + DESTINATION ${BIN_INSTALL_DIR} + ) +diff -u -r kdebase.orig/kdm/ConfigureChecks.cmake kdebase/kdm/ConfigureChecks.cmake +--- kdebase.orig/kdm/ConfigureChecks.cmake 2011-03-16 22:49:38.000000000 +0200 ++++ kdebase/kdm/ConfigureChecks.cmake 2011-11-19 01:05:40.426381860 +0200 +@@ -27,6 +27,16 @@ + check_function_exists( auth_timeok HAVE_AUTH_TIMEOK ) + tde_restore( CMAKE_REQUIRED_LIBRARIES ) + ++check_function_exists( crypt LIBC_HAVE_CRYPT ) ++if( LIBC_HAVE_CRYPT ) ++ set( HAVE_CRYPT 1 CACHE INTERNAL "" FORCE ) ++else( ) ++ check_library_exists( crypt crypt "" HAVE_CRYPT ) ++ if( HAVE_CRYPT ) ++ set( CRYPT_LIBRARY crypt ) ++ endif( ) ++endif( ) ++ + check_include_file( lastlog.h HAVE_LASTLOG_H ) + check_include_file( termio.h HAVE_TERMIO_H ) + + diff --git a/redhat/kdebase/kdebase-3.5.13-startkde_icon.patch b/redhat/kdebase/kdebase-3.5.13-startkde_icon.patch new file mode 100644 index 000000000..039290a0c --- /dev/null +++ b/redhat/kdebase/kdebase-3.5.13-startkde_icon.patch @@ -0,0 +1,32 @@ +--- kdebase/startkde.ORI 2011-11-14 22:23:07.191346324 +0100 ++++ kdebase/startkde 2011-11-14 22:38:28.480321300 +0100 +@@ -206,6 +206,29 @@ + fi + fi + ++# Default Start Button icon ++if [ ! -e $kdehome/share/config/kickerrc ]; then ++ # Fedora ++ if [ -r /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png ]; then ++ cat <$kdehome/share/config/kickerrc ++[KMenu] ++CustomIcon=fedora-logo-icon ++EOF ++ # RHEL 6 ++ elif [ -r /usr/share/icons/hicolor/96x96/apps/system-logo-icon.png ]; then ++ cat <$kdehome/share/config/kickerrc ++[KMenu] ++CustomIcon=system-logo-icon ++EOF ++ # RHEL 5 ++ elif [ -r /usr/share/pixmaps/redhat-starthere.png ]; then ++ cat <$kdehome/share/config/kickerrc ++[KMenu] ++CustomIcon=/usr/share/pixmaps/redhat-starthere.png ++EOF ++ fi ++fi ++ + # XCursor mouse theme needs to be applied here to work even for kded or ksmserver. + if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize" ; then + kapplymousetheme "$kcminputrc_mouse_cursortheme" "$kcminputrc_mouse_cursorsize" diff --git a/redhat/kdebase/trinity-kdebase-3.5.13.spec b/redhat/kdebase/trinity-kdebase-3.5.13.spec index faf8d13ad..84d3c4d8c 100644 --- a/redhat/kdebase/trinity-kdebase-3.5.13.spec +++ b/redhat/kdebase/trinity-kdebase-3.5.13.spec @@ -2,7 +2,7 @@ %if "%{?version}" == "" %define version 3.5.13 %endif -%define release 7 +%define release 8 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -61,11 +61,14 @@ Patch7: kdebase-3.5.13-genkdmconf_Xsession_location.patch Patch8: kdebase-3.5.13-startkde_ldpreload.patch ## [kdebase/kioslave/media/mediamanager] FTBFS missing dbus-tqt includes Patch9: kdebase-3.5.13-mediamanager_ftbfs.patch -## [kdebase/kicker/kicker/ui] -Patch10: kdebase-3.5.12-kickoff_unstable.patch ## [kdebase/startkde] Sets default Start Icon in 'kickerrc' Patch11: kdebase-3.5.13-startkde_icon.patch +# TDE 3.5.13 patches +## [kdebase/kicker/kicker/ui] +Patch10: kdebase-3.5.12-kickoff_unstable.patch +## [kdebase/kdm] adds gcrypt support +Patch12: kdebase-3.5.13-kdm-crypt.patch # Fedora 15 Theme: "Lovelock" %if 0%{?fedora} == 15 @@ -217,10 +220,9 @@ Protocol handlers (KIOslaves) for personal information management, including: %patch7 -p1 %patch8 -p1 %patch9 -p1 -cd kicker/kicker -%patch10 -p0 -cd - +%patch10 -p1 %patch11 -p1 +%patch12 -p1 # Applies an optional distro-specific graphical theme %if "%{?tde_bg}" != "" @@ -317,9 +319,10 @@ cd build %endif # Moves the XDG configuration files to TDE directory +%if "%{_prefix}" != "/usr" %__mkdir_p "%{?buildroot}%{_prefix}/etc" %__mv -f "%{?buildroot}%{_sysconfdir}/xdg" "%{?buildroot}%{_prefix}/etc" - +%endif %clean %__rm -rf %{?buildroot} @@ -522,10 +525,17 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %{_datadir}/sounds/* %{tde_libdir}/* %{_libdir}/libkdeinit_*.* +%if "%{_prefix}" != "/usr" %{_prefix}/etc/xdg/menus/applications-merged/kde-essential.menu %{_prefix}/etc/xdg/menus/kde-information.menu %{_prefix}/etc/xdg/menus/kde-screensavers.menu %{_prefix}/etc/xdg/menus/kde-settings.menu +%else +%{_sysconfdir}/xdg/menus/applications-merged/kde-essential.menu +%{_sysconfdir}/xdg/menus/kde-information.menu +%{_sysconfdir}/xdg/menus/kde-screensavers.menu +%{_sysconfdir}/xdg/menus/kde-settings.menu +%endif /usr/share/xsessions/*.desktop # Remove conflicts with redhat-menus %if "%{?_prefix}" != "/usr" @@ -583,6 +593,10 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %{_datadir}/cmake/*.cmake %changelog +* Fri Nov 18 2011 Francois Andriot - 3.5.13-8 +- Updates Kickoff menu Fix [TDE Bugs #281, #508] +- Adds KDM gcrypt dependency + * Sun Nov 13 2011 Francois Andriot - 3.5.13-7 - Add distribution-specific start button icon diff --git a/redhat/kdenetwork/trinity-kdenetwork-3.5.13.spec b/redhat/kdenetwork/trinity-kdenetwork-3.5.13.spec index d54a01d40..f0d9f109f 100644 --- a/redhat/kdenetwork/trinity-kdenetwork-3.5.13.spec +++ b/redhat/kdenetwork/trinity-kdenetwork-3.5.13.spec @@ -2,7 +2,7 @@ %if "%{?version}" == "" %define version 3.5.13 %endif -%define release 2 +%define release 3 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -241,7 +241,7 @@ done install -p -m644 -D %{SOURCE1} %{buildroot}/etc/pam.d/kppp3 mkdir -p %{buildroot}%{_sbindir} mv %{buildroot}%{_bindir}/kppp %{buildroot}%{_sbindir} -ln -s consolehelper %{buildroot}%{_bindir}/kppp +ln -s /usr/bin/consolehelper %{buildroot}%{_bindir}/kppp mkdir -p %{buildroot}/etc/security/console.apps cat > %{buildroot}/etc/security/console.apps/kppp3 < - 3.5.13-3 +- Fix symbolic link to 'consolehelper' + * Sat Nov 12 2011 Francois Andriot - 3.5.13-2 - Removes conflict on file 'lisarc' for RHEL 5 diff --git a/redhat/kdeutils/trinity-kdeutils-3.5.13.spec b/redhat/kdeutils/trinity-kdeutils-3.5.13.spec index 6519e8aa2..67af6e856 100755 --- a/redhat/kdeutils/trinity-kdeutils-3.5.13.spec +++ b/redhat/kdeutils/trinity-kdeutils-3.5.13.spec @@ -2,7 +2,7 @@ %if "%{?version}" == "" %define version 3.5.13 %endif -%define release 3 +%define release 4 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -192,7 +192,7 @@ install -p -D -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/security/console.apps pushd %{buildroot}%{_bindir} mkdir -p %{buildroot}%{_sbindir} mv klaptop_acpi_helper ../sbin - ln -s consolehelper klaptop_acpi_helper + ln -s /usr/bin/consolehelper klaptop_acpi_helper popd # klaptop setting @@ -347,6 +347,9 @@ done %changelog +* Thu Nov 17 2011 Francois Andriot - 3.5.13-4 +- Fix symbolic link to 'consolehelper' + * Fri Nov 11 2011 Francois Andriot - 3.5.13-3 - Removes 'dpkg' commands inside klaptopdaemon diff --git a/redhat/libraries/libksquirrel/libksquirrel-3.5.13-detect_netpbm.patch b/redhat/libraries/libksquirrel/libksquirrel-3.5.13-detect_netpbm.patch new file mode 100644 index 000000000..f7a409e8a --- /dev/null +++ b/redhat/libraries/libksquirrel/libksquirrel-3.5.13-detect_netpbm.patch @@ -0,0 +1,18 @@ +--- libksquirrel/configure.ac.ORI 2011-11-21 15:32:36.479813141 +0100 ++++ libksquirrel/configure.ac 2011-11-21 15:32:48.082812826 +0100 +@@ -587,15 +587,6 @@ + fi + fi + +-sq_codec_pict="yes" +-sq_have_pict="no" +-if test $sq_codec_pict = yes; then +- AC_PATH_PROG(PICTTOPPM, picttoppm) +- if [ test -n "$PICTTOPPM" ]; then sq_have_pict="yes" AC_SUBST(PICTTOPPM) +- else missing_prog PICT netpbm +- fi +-fi +- + sq_codec_mac="yes" + sq_have_mac="no" + if test $sq_codec_mac = yes; then diff --git a/redhat/libraries/libksquirrel/libksquirrel-3.5.13-fix_docdir.patch b/redhat/libraries/libksquirrel/libksquirrel-3.5.13-fix_docdir.patch new file mode 100644 index 000000000..4730fe5bc --- /dev/null +++ b/redhat/libraries/libksquirrel/libksquirrel-3.5.13-fix_docdir.patch @@ -0,0 +1,46 @@ +--- libksquirrel/doc/sources/Makefile.am.ORI 2011-11-21 15:50:33.705784300 +0100 ++++ libksquirrel/doc/sources/Makefile.am 2011-11-21 15:52:13.134781698 +0100 +@@ -1,24 +1,24 @@ + install-data-local: +- $(mkinstalldirs) $(DESTDIR)/usr/share/doc/ksquirrel-libs/$(PACKAGE_VERSION)/sources +- $(mkinstalldirs) $(DESTDIR)/usr/share/doc/ksquirrel-libs/$(PACKAGE_VERSION)/sources/c +- $(mkinstalldirs) $(DESTDIR)/usr/share/doc/ksquirrel-libs/$(PACKAGE_VERSION)/sources/c++ +- $(mkinstalldirs) $(DESTDIR)/usr/share/doc/ksquirrel-libs/$(PACKAGE_VERSION)/sources/ttx ++ $(mkinstalldirs) $(DESTDIR)$(datadir)/doc/ksquirrel-libs/$(PACKAGE_VERSION)/sources ++ $(mkinstalldirs) $(DESTDIR)$(datadir)/doc/ksquirrel-libs/$(PACKAGE_VERSION)/sources/c ++ $(mkinstalldirs) $(DESTDIR)$(datadir)/doc/ksquirrel-libs/$(PACKAGE_VERSION)/sources/c++ ++ $(mkinstalldirs) $(DESTDIR)$(datadir)/doc/ksquirrel-libs/$(PACKAGE_VERSION)/sources/ttx + +- $(INSTALL_DATA) c/module.c $(DESTDIR)/usr/share/doc/ksquirrel-libs/$(PACKAGE_VERSION)/sources/c/module.c +- $(INSTALL_DATA) c/main.c $(DESTDIR)/usr/share/doc/ksquirrel-libs/$(PACKAGE_VERSION)/sources/c/main.c +- $(INSTALL_SCRIPT) c/compile $(DESTDIR)/usr/share/doc/ksquirrel-libs/$(PACKAGE_VERSION)/sources/c/compile ++ $(INSTALL_DATA) c/module.c $(DESTDIR)$(datadir)/doc/ksquirrel-libs/$(PACKAGE_VERSION)/sources/c/module.c ++ $(INSTALL_DATA) c/main.c $(DESTDIR)$(datadir)/doc/ksquirrel-libs/$(PACKAGE_VERSION)/sources/c/main.c ++ $(INSTALL_SCRIPT) c/compile $(DESTDIR)$(datadir)/doc/ksquirrel-libs/$(PACKAGE_VERSION)/sources/c/compile + +- $(INSTALL_SCRIPT) c++/compile $(DESTDIR)/usr/share/doc/ksquirrel-libs/$(PACKAGE_VERSION)/sources/c++/compile +- $(INSTALL_DATA) c++/main.cpp $(DESTDIR)/usr/share/doc/ksquirrel-libs/$(PACKAGE_VERSION)/sources/c++/main.cpp +- $(INSTALL_DATA) c++/triangle.cpp $(DESTDIR)/usr/share/doc/ksquirrel-libs/$(PACKAGE_VERSION)/sources/c++/triangle.cpp +- $(INSTALL_DATA) c++/polygon.hpp $(DESTDIR)/usr/share/doc/ksquirrel-libs/$(PACKAGE_VERSION)/sources/c++/polygon.hpp +- $(INSTALL_DATA) c++/README $(DESTDIR)/usr/share/doc/ksquirrel-libs/$(PACKAGE_VERSION)/sources/c++/README ++ $(INSTALL_SCRIPT) c++/compile $(DESTDIR)$(datadir)/doc/ksquirrel-libs/$(PACKAGE_VERSION)/sources/c++/compile ++ $(INSTALL_DATA) c++/main.cpp $(DESTDIR)$(datadir)/doc/ksquirrel-libs/$(PACKAGE_VERSION)/sources/c++/main.cpp ++ $(INSTALL_DATA) c++/triangle.cpp $(DESTDIR)$(datadir)/doc/ksquirrel-libs/$(PACKAGE_VERSION)/sources/c++/triangle.cpp ++ $(INSTALL_DATA) c++/polygon.hpp $(DESTDIR)$(datadir)/doc/ksquirrel-libs/$(PACKAGE_VERSION)/sources/c++/polygon.hpp ++ $(INSTALL_DATA) c++/README $(DESTDIR)$(datadir)/doc/ksquirrel-libs/$(PACKAGE_VERSION)/sources/c++/README + +- $(INSTALL_DATA) ttx/Makefile.am $(DESTDIR)/usr/share/doc/ksquirrel-libs/$(PACKAGE_VERSION)/sources/ttx/Makefile.am +- $(INSTALL_DATA) ttx/README $(DESTDIR)/usr/share/doc/ksquirrel-libs/$(PACKAGE_VERSION)/sources/ttx/README +- $(INSTALL_SCRIPT) ttx/compile-c++ $(DESTDIR)/usr/share/doc/ksquirrel-libs/$(PACKAGE_VERSION)/sources/ttx/compile-c++ +- $(INSTALL_DATA) ttx/fmt_codec_ttx_defs.h $(DESTDIR)/usr/share/doc/ksquirrel-libs/$(PACKAGE_VERSION)/sources/ttx/fmt_codec_ttx_defs.h +- $(INSTALL_DATA) ttx/fmt_codec_ttx.h $(DESTDIR)/usr/share/doc/ksquirrel-libs/$(PACKAGE_VERSION)/sources/ttx/fmt_codec_ttx.h +- $(INSTALL_DATA) ttx/fmt_codec_ttx.cpp $(DESTDIR)/usr/share/doc/ksquirrel-libs/$(PACKAGE_VERSION)/sources/ttx/fmt_codec_ttx.cpp ++ $(INSTALL_DATA) ttx/Makefile.am $(DESTDIR)$(datadir)/doc/ksquirrel-libs/$(PACKAGE_VERSION)/sources/ttx/Makefile.am ++ $(INSTALL_DATA) ttx/README $(DESTDIR)$(datadir)/doc/ksquirrel-libs/$(PACKAGE_VERSION)/sources/ttx/README ++ $(INSTALL_SCRIPT) ttx/compile-c++ $(DESTDIR)$(datadir)/doc/ksquirrel-libs/$(PACKAGE_VERSION)/sources/ttx/compile-c++ ++ $(INSTALL_DATA) ttx/fmt_codec_ttx_defs.h $(DESTDIR)$(datadir)/doc/ksquirrel-libs/$(PACKAGE_VERSION)/sources/ttx/fmt_codec_ttx_defs.h ++ $(INSTALL_DATA) ttx/fmt_codec_ttx.h $(DESTDIR)$(datadir)/doc/ksquirrel-libs/$(PACKAGE_VERSION)/sources/ttx/fmt_codec_ttx.h ++ $(INSTALL_DATA) ttx/fmt_codec_ttx.cpp $(DESTDIR)$(datadir)/doc/ksquirrel-libs/$(PACKAGE_VERSION)/sources/ttx/fmt_codec_ttx.cpp + + EXTRA_DIST = c c++ ttx +\ Pas de fin de ligne à la fin du fichier diff --git a/redhat/libraries/libksquirrel/trinity-libksquirrel.spec b/redhat/libraries/libksquirrel/trinity-libksquirrel.spec new file mode 100644 index 000000000..0be591792 --- /dev/null +++ b/redhat/libraries/libksquirrel/trinity-libksquirrel.spec @@ -0,0 +1,145 @@ +# Default version for this component +%define kdecomp libksquirrel +%define version 0.8.0 +%define release 1 + +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?_prefix}" != "/usr" +%define _variant .opt +%define _docdir %{_prefix}/share/doc +%endif + +# TDE 3.5.13 specific building variables +BuildRequires: autoconf automake libtool m4 +%define tde_docdir %{_docdir}/kde +%define tde_includedir %{_includedir}/kde +%define tde_libdir %{_libdir}/trinity + + +Name: trinity-%{kdecomp} +Summary: Trinity image viewer +Version: %{?version} +Release: %{?release}%{?dist}%{?_variant} + +License: GPLv2+ +Group: Environment/Libraries + +Vendor: Trinity Project +Packager: Francois Andriot +URL: http://www.trinitydesktop.org/ + +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{kdecomp}-3.5.13.tar.gz +Patch0: libksquirrel-3.5.13-detect_netpbm.patch +Patch1: libksquirrel-3.5.13-fix_docdir.patch + +BuildRequires: tqtinterface-devel +BuildRequires: trinity-kdelibs-devel +BuildRequires: trinity-kdebase-devel +BuildRequires: desktop-file-utils +BuildRequires: gettext + +BuildRequires: gettext-devel +BuildRequires: transfig +BuildRequires: netpbm-progs +%if 0%{?fedora} >= 15 +BuildRequires: xmedcon-devel +BuildRequires: djvulibre +%endif + +%description +Runtime libraries for KSquirrel. + + +%package devel +Group: Development/Libraries +Summary: Trinity image viewer +Requires: %{name} + +%description devel +Development libraries for KSquirrel. + + +%package tools +Summary: Trinity image viewer +Group: Environment/Libraries +Requires: %{name} + +%description tools +Tools for KSquirrel. + + +%prep +%setup -q -n libraries/%{kdecomp} +%patch0 -p1 +%patch1 -p1 + +# Ugly hack to modify TQT include directory inside autoconf files. +# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! +sed -i admin/acinclude.m4.in \ + -e "s,/usr/include/tqt,%{_includedir}/tqt,g" + +%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +%__make -f "admin/Makefile.common" cvs + + +%build +export PATH="%{_bindir}:${PATH}" +export LDFLAGS="-L%{_libdir} -I%{_includedir}" + +%configure \ + --disable-rpath \ + --with-extra-includes=%{_includedir}/tqt + +%__make %{?_smp_mflags} + + +%install +export PATH="%{_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} + + +%clean +%__rm -rf %{buildroot} + + +%post +/sbin/ldconfig +touch --no-create %{_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : + +%postun +/sbin/ldconfig +touch --no-create %{_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : + + +%files +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog COPYING LICENSE README +%{_libdir}/ksquirrel-libs/*.so.* +%{_libdir}/*.so.* +%{_datadir}/ksquirrel-libs + +%files devel +%defattr(-,root,root,-) +%{_includedir}/ksquirrel-libs +%{_libdir}/ksquirrel-libs/*.la +%{_libdir}/ksquirrel-libs/*.so +%{_libdir}/*.la +%{_libdir}/*.so +%{_libdir}/pkgconfig/ksquirrellibs.pc +%{_docdir}/ksquirrel-libs + +%files tools +%defattr(-,root,root,-) +%{_bindir}/* + + +%Changelog +* Sun Nov 20 2011 Francois Andriot - 0.8.0-1 +- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/ubuntu/maverick/tdebase/debian/kwin-trinity.install b/ubuntu/maverick/tdebase/debian/twin-trinity.install similarity index 100% rename from ubuntu/maverick/tdebase/debian/kwin-trinity.install rename to ubuntu/maverick/tdebase/debian/twin-trinity.install diff --git a/ubuntu/maverick/tdebase/debian/kwin-trinity.lintian b/ubuntu/maverick/tdebase/debian/twin-trinity.lintian similarity index 100% rename from ubuntu/maverick/tdebase/debian/kwin-trinity.lintian rename to ubuntu/maverick/tdebase/debian/twin-trinity.lintian diff --git a/ubuntu/maverick/tdebase/debian/kwin-trinity.postinst b/ubuntu/maverick/tdebase/debian/twin-trinity.postinst similarity index 100% rename from ubuntu/maverick/tdebase/debian/kwin-trinity.postinst rename to ubuntu/maverick/tdebase/debian/twin-trinity.postinst diff --git a/ubuntu/maverick/tdebase/debian/kwin-trinity.prerm b/ubuntu/maverick/tdebase/debian/twin-trinity.prerm similarity index 100% rename from ubuntu/maverick/tdebase/debian/kwin-trinity.prerm rename to ubuntu/maverick/tdebase/debian/twin-trinity.prerm diff --git a/ubuntu/maverick/tdeutils/debian/control b/ubuntu/maverick/tdeutils/debian/control index c33bf1354..a74b5d942 100644 --- a/ubuntu/maverick/tdeutils/debian/control +++ b/ubuntu/maverick/tdeutils/debian/control @@ -5,7 +5,7 @@ Maintainer: Timothy Pearson XSBC-Original-Maintainer: Debian Qt/KDE Maintainers Uploaders: Ana Beatriz Guerrero Lopez , Christopher Martin , Fathi Boudra , Josh Metzler , Sune Vuorela Build-Depends: libasound2-dev, ia32-libs [amd64], cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-trinity-dev (>= 4:3.5.10), tdebase-trinity-dev (>= 4:3.5.10), libkonq4-trinity-dev (>= 4:3.5.10), libgmp3-dev, libsnmp-dev, libxpm-dev, python-dev, libxtst-dev, xutils, sharutils, automake, autoconf, libtool, libltdl-dev -Build-Depends-Indep: doxygen, qt3-doc, graphviz, gsfonts-x11, tdelibs4-trinity-doc +Build-Depends-Indep: doxygen, libtqtinterface-doc, graphviz, gsfonts-x11, tdelibs4-trinity-doc Standards-Version: 3.8.4 Package: tdeutils-trinity