RPM packaging: update tde-guidance, style-lipstik, style-qtcurve, tdepowersave, tderadio, tdesudo

pull/3/head
François Andriot 10 years ago
parent 997c042e21
commit cc95c54618

@ -56,6 +56,7 @@ Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
Source1: trinity-%{tde_pkg}-rpmlintrc
BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version}

@ -0,0 +1 @@
setBadness('file-contains-buildroot', 0)

@ -1,108 +0,0 @@
# 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}
%define tde_includedir %{_includedir}/kde
%define tde_libdir %{_libdir}/kde3
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 <francois.andriot@free.fr>
URL: http://www.trinitydesktop.org/
Prefix: %{_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{kdecomp}-3.5.12.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 <francois.andriot@free.fr> - 2.2.3-1
- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16

@ -1,129 +0,0 @@
# Default version for this component
%define kdecomp kde-style-lipstik
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?tde_prefix}" != "/usr"
%define _variant .opt
%endif
# TDE 3.5.13 specific building variables
%define tde_bindir %{tde_prefix}/bin
%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
%define tde_includedir %{tde_prefix}/include
%define tde_libdir %{tde_prefix}/%{_lib}
%define tde_mandir %{tde_datadir}/man
%define tde_appdir %{tde_datadir}/applications
%define tde_tdeappdir %{tde_appdir}/kde
%define tde_tdedocdir %{tde_docdir}/tde
%define tde_tdeincludedir %{tde_includedir}/tde
%define tde_tdelibdir %{tde_libdir}/trinity
%define _docdir %{tde_docdir}
Name: trinity-style-lipstik
Summary: Lipstik style for TDE
Version: 2.2.3
Release: 3%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Utilities
Vendor: Trinity Project
Packager: Francois Andriot <francois.andriot@free.fr>
URL: http://www.trinitydesktop.org/
Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{kdecomp}-3.5.13.1.tar.gz
Obsoletes: trinity-kde-style-lipstik
BuildRequires: trinity-tqtinterface-devel >= 3.5.13.1
BuildRequires: trinity-tdelibs-devel >= 3.5.13.1
BuildRequires: trinity-tdebase-devel >= 3.5.13.1
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
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif
%prep
%setup -q -n %{kdecomp}-3.5.13.1
# 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|%{tde_includedir}/tqt|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/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
%build
unset QTDIR; . /etc/profile.d/qt3.sh
export PATH="%{tde_bindir}:${PATH}"
export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
%configure \
--prefix=%{tde_prefix} \
--exec-prefix=%{tde_prefix} \
--datadir=%{tde_datadir} \
--includedir=%{tde_tdeincludedir} \
--libdir=%{tde_libdir} \
--disable-rpath \
--with-extra-includes=%{tde_includedir}/tqt
%__make %{?_smp_mflags}
%install
export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot}
%clean
%__rm -rf %{buildroot}
%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING
%{tde_tdelibdir}/kstyle_lipstik_config.la
%{tde_tdelibdir}/kstyle_lipstik_config.so
%{tde_tdelibdir}/plugins/styles/lipstik.la
%{tde_tdelibdir}/plugins/styles/lipstik.so
%{tde_datadir}/apps/kdisplay/color-schemes/lipstiknoble.kcsrc
%{tde_datadir}/apps/kdisplay/color-schemes/lipstikstandard.kcsrc
%{tde_datadir}/apps/kdisplay/color-schemes/lipstikwhite.kcsrc
%{tde_datadir}/apps/kstyle/themes/lipstik.themerc
%changelog
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 2.2.3-3
- Initial release for TDE 3.5.13.1
* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 2.2.3-2
- Rebuilt for Fedora 17
- Fix HTML directory location
- Removes post and postun
* Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 2.2.3-1
- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16

@ -1,120 +0,0 @@
# Default version for this component
%define kdecomp kde-style-lipstik
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?tde_prefix}" != "/usr"
%define _variant .opt
%endif
# TDE 3.5.13 specific building variables
%define tde_bindir %{tde_prefix}/bin
%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
%define tde_includedir %{tde_prefix}/include
%define tde_libdir %{tde_prefix}/%{_lib}
%define tde_mandir %{tde_datadir}/man
%define tde_appdir %{tde_datadir}/applications
%define tde_tdeappdir %{tde_appdir}/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-style-lipstik
Summary: Lipstik style for TDE
Version: 2.2.3
Release: 2%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Utilities
Vendor: Trinity Project
Packager: Francois Andriot <francois.andriot@free.fr>
URL: http://www.trinitydesktop.org/
Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{kdecomp}-3.5.13.tar.gz
Obsoletes: trinity-kde-style-lipstik
BuildRequires: tqtinterface-devel
BuildRequires: trinity-tdelibs-devel
BuildRequires: trinity-tdebase-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|%{tde_includedir}/tqt|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/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
%build
unset QTDIR; . /etc/profile.d/qt.sh
export PATH="%{tde_bindir}:${PATH}"
export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
%configure \
--prefix=%{tde_prefix} \
--exec-prefix=%{tde_prefix} \
--datadir=%{tde_datadir} \
--libdir=%{tde_libdir} \
--disable-rpath \
--with-extra-includes=%{tde_includedir}/tqt
%__make %{?_smp_mflags}
%install
export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot}
%clean
%__rm -rf %{buildroot}
%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING
%{tde_tdelibdir}/kstyle_lipstik_config.la
%{tde_tdelibdir}/kstyle_lipstik_config.so
%{tde_tdelibdir}/plugins/styles/lipstik.la
%{tde_tdelibdir}/plugins/styles/lipstik.so
%{tde_datadir}/apps/kdisplay/color-schemes/lipstiknoble.kcsrc
%{tde_datadir}/apps/kdisplay/color-schemes/lipstikstandard.kcsrc
%{tde_datadir}/apps/kdisplay/color-schemes/lipstikwhite.kcsrc
%{tde_datadir}/apps/kstyle/themes/lipstik.themerc
%Changelog
* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 2.2.3-2
- Rebuilt for Fedora 17
- Fix HTML directory location
- Removes post and postun
* Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 2.2.3-1
- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16

@ -1,43 +1,56 @@
# Default version for this component #
%define tde_pkg tde-style-lipstik # spec file for package tde-style-lipstik (version R14.0.0)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
#
# Please submit bugfixes or comments via http://www.trinitydesktop.org/
#
# TDE variables
%define tde_epoch 2
%define tde_version 14.0.0 %define tde_version 14.0.0
%define tde_pkg tde-style-lipstik
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %define tde_prefix /opt/trinity
%if "%{?tde_prefix}" != "/usr"
%define _variant .opt
%endif
# TDE specific building variables
%define tde_bindir %{tde_prefix}/bin %define tde_bindir %{tde_prefix}/bin
%define tde_datadir %{tde_prefix}/share %define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc %define tde_docdir %{tde_datadir}/doc
%define tde_includedir %{tde_prefix}/include %define tde_includedir %{tde_prefix}/include
%define tde_libdir %{tde_prefix}/%{_lib} %define tde_libdir %{tde_prefix}/%{_lib}
%define tde_mandir %{tde_datadir}/man %define tde_mandir %{tde_datadir}/man
%define tde_appdir %{tde_datadir}/applications %define tde_tdeappdir %{tde_datadir}/applications/tde
%define tde_tdeappdir %{tde_appdir}/tde
%define tde_tdedocdir %{tde_docdir}/tde %define tde_tdedocdir %{tde_docdir}/tde
%define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdeincludedir %{tde_includedir}/tde
%define tde_tdelibdir %{tde_libdir}/trinity %define tde_tdelibdir %{tde_libdir}/trinity
%define _docdir %{tde_docdir}
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 2.2.3
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
Summary: Lipstik style for TDE
Group: Applications/Utilities
URL: http://www.trinitydesktop.org/
Name: trinity-tde-style-lipstik %if 0%{?suse_version}
Summary: Lipstik style for TDE License: GPL-2.0+
Version: 2.2.3 %else
Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant} License: GPLv2+
%endif
License: GPLv2+
Group: Applications/Utilities
Vendor: Trinity Project #Vendor: Trinity Desktop
Packager: Francois Andriot <francois.andriot@free.fr> #Packager: Francois Andriot <francois.andriot@free.fr>
URL: http://www.trinitydesktop.org/
Prefix: %{tde_prefix} Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
@ -46,12 +59,25 @@ Provides: trinity-kde-style-lipstik = %{version}-%{release}
Obsoletes: trinity-style-lipstik < %{version}-%{release} Obsoletes: trinity-style-lipstik < %{version}-%{release}
Provides: trinity-style-lipstik = %{version}-%{release} Provides: trinity-style-lipstik = %{version}-%{release}
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
BuildRequires: autoconf automake libtool m4
BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: fdupes
# SUSE desktop files utility
%if 0%{?suse_version}
BuildRequires: update-desktop-files
%endif
%if 0%{?opensuse_bs} && 0%{?suse_version}
# for xdg-menu script
BuildRequires: brp-check-trinity
%endif
%description %description
Based on the plastik style, Lipstik is a purified style with many options to Based on the plastik style, Lipstik is a purified style with many options to
@ -60,10 +86,14 @@ tune your desktop look.
Lipstik also provides Lipstik-color-schemes Lipstik also provides Lipstik-color-schemes
%if 0%{?suse_version} || 0%{?pclinuxos} ##########
%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
%debug_package %debug_package
%endif %endif
##########
%prep %prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
@ -120,5 +150,5 @@ export PATH="%{tde_bindir}:${PATH}"
%changelog %changelog
* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2.2.3-6 * Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2:2.2.3-1
- Initial release for TDE 14.0.0 - Initial release for TDE 14.0.0

@ -1,11 +0,0 @@
--- 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)

@ -1,101 +0,0 @@
--- a/config/qtcurveconfig.cpp.ORI 2012-08-29 22:09:16.845292598 +0200
+++ a/config/qtcurveconfig.cpp 2012-08-29 22:13:35.992935999 +0200
@@ -671,7 +671,7 @@
connect(activeTabAppearance, SIGNAL(activated(int)), SLOT(activeTabAppearanceChanged()));
connect(toolbarSeparators, SIGNAL(activated(int)), SLOT(updateChanged()));
connect(splitters, SIGNAL(activated(int)), SLOT(updateChanged()));
- connect(fixParentlessDialogs, SIGNAL(toggled(bool)), SLOT(updateChanged()));
+// connect(fixParentlessDialogs, SIGNAL(toggled(bool)), SLOT(updateChanged()));
connect(fillSlider, SIGNAL(toggled(bool)), SLOT(updateChanged()));
connect(sliderStyle, SIGNAL(activated(int)), SLOT(updateChanged()));
connect(roundMbTopOnly, SIGNAL(toggled(bool)), SLOT(updateChanged()));
@@ -749,10 +749,10 @@
connect(gtkButtonOrder, SIGNAL(toggled(bool)), SLOT(updateChanged()));
connect(mapKdeIcons, SIGNAL(toggled(bool)), SLOT(updateChanged()));
connect(passwordChar, SIGNAL(clicked()), SLOT(passwordCharClicked()));
- connect(framelessGroupBoxes, SIGNAL(toggled(bool)), SLOT(updateChanged()));
+// connect(framelessGroupBoxes, SIGNAL(toggled(bool)), SLOT(updateChanged()));
connect(colorMenubarMouseOver, SIGNAL(toggled(bool)), SLOT(updateChanged()));
connect(useHighlightForMenu, SIGNAL(toggled(bool)), SLOT(updateChanged()));
- connect(groupBoxLine, SIGNAL(toggled(bool)), SLOT(updateChanged()));
+// connect(groupBoxLine, SIGNAL(toggled(bool)), SLOT(updateChanged()));
connect(fadeLines, SIGNAL(toggled(bool)), SLOT(updateChanged()));
connect(menuIcons, SIGNAL(toggled(bool)), SLOT(updateChanged()));
connect(stdBtnSizes, SIGNAL(toggled(bool)), SLOT(updateChanged()));
@@ -1436,7 +1436,7 @@
opts.shadeMenubarOnlyWhenActive=shadeMenubarOnlyWhenActive->isChecked();
opts.thinnerMenuItems=thinnerMenuItems->isChecked();
opts.thinnerBtns=thinnerBtns->isChecked();
- opts.fixParentlessDialogs=fixParentlessDialogs->isChecked();
+// opts.fixParentlessDialogs=fixParentlessDialogs->isChecked();
opts.animatedProgress=animatedProgress->isChecked();
opts.stripedProgress=(EStripe)stripedProgress->currentItem();
opts.lighterPopupMenuBgnd=lighterPopupMenuBgnd->value();
@@ -1526,11 +1526,11 @@
opts.gtkButtonOrder=gtkButtonOrder->isChecked();
opts.mapKdeIcons=mapKdeIcons->isChecked();
opts.passwordChar=toInt(passwordChar->text());
- opts.framelessGroupBoxes=framelessGroupBoxes->isChecked();
+// opts.framelessGroupBoxes=framelessGroupBoxes->isChecked();
opts.customGradient=customGradient;
opts.colorMenubarMouseOver=colorMenubarMouseOver->isChecked();
opts.useHighlightForMenu=useHighlightForMenu->isChecked();
- opts.groupBoxLine=groupBoxLine->isChecked();
+// opts.groupBoxLine=groupBoxLine->isChecked();
opts.fadeLines=fadeLines->isChecked();
opts.menuIcons=menuIcons->isChecked();
opts.stdBtnSizes=stdBtnSizes->isChecked();
@@ -1575,7 +1575,7 @@
shadeMenubarOnlyWhenActive->setChecked(opts.shadeMenubarOnlyWhenActive);
thinnerMenuItems->setChecked(opts.thinnerMenuItems);
thinnerBtns->setChecked(opts.thinnerBtns);
- fixParentlessDialogs->setChecked(opts.fixParentlessDialogs);
+// fixParentlessDialogs->setChecked(opts.fixParentlessDialogs);
animatedProgress->setChecked(opts.animatedProgress);
stripedProgress->setCurrentItem(opts.stripedProgress);
embolden->setChecked(opts.embolden);
@@ -1651,7 +1651,7 @@
customCheckRadioColor->setColor(opts.customCheckRadioColor);
colorMenubarMouseOver->setChecked(opts.colorMenubarMouseOver);
useHighlightForMenu->setChecked(opts.useHighlightForMenu);
- groupBoxLine->setChecked(opts.groupBoxLine);
+// groupBoxLine->setChecked(opts.groupBoxLine);
fadeLines->setChecked(opts.fadeLines);
menuIcons->setChecked(opts.menuIcons);
stdBtnSizes->setChecked(opts.stdBtnSizes);
@@ -1678,7 +1678,7 @@
gtkButtonOrder->setChecked(opts.gtkButtonOrder);
mapKdeIcons->setChecked(opts.mapKdeIcons);
setPasswordChar(opts.passwordChar);
- framelessGroupBoxes->setChecked(opts.framelessGroupBoxes);
+// framelessGroupBoxes->setChecked(opts.framelessGroupBoxes);
customGradient=opts.customGradient;
gradCombo->setCurrentItem(APPEARANCE_CUSTOM1);
@@ -1731,7 +1731,7 @@
shadeMenubarOnlyWhenActive->isChecked()!=currentStyle.shadeMenubarOnlyWhenActive ||
thinnerMenuItems->isChecked()!=currentStyle.thinnerMenuItems ||
thinnerBtns->isChecked()!=currentStyle.thinnerBtns ||
- fixParentlessDialogs->isChecked()!=currentStyle.fixParentlessDialogs ||
+// fixParentlessDialogs->isChecked()!=currentStyle.fixParentlessDialogs ||
animatedProgress->isChecked()!=currentStyle.animatedProgress ||
stripedProgress->currentItem()!=currentStyle.stripedProgress ||
lighterPopupMenuBgnd->value()!=currentStyle.lighterPopupMenuBgnd ||
@@ -1796,7 +1796,7 @@
splitters->currentItem()!=currentStyle.splitters ||
colorMenubarMouseOver->isChecked()!=currentStyle.colorMenubarMouseOver ||
useHighlightForMenu->isChecked()!=currentStyle.useHighlightForMenu ||
- groupBoxLine->isChecked()!=currentStyle.groupBoxLine ||
+// groupBoxLine->isChecked()!=currentStyle.groupBoxLine ||
fadeLines->isChecked()!=currentStyle.fadeLines ||
menuIcons->isChecked()!=currentStyle.menuIcons ||
stdBtnSizes->isChecked()!=currentStyle.stdBtnSizes ||
@@ -1819,7 +1819,7 @@
gtkComboMenus->isChecked()!=currentStyle.gtkComboMenus ||
gtkButtonOrder->isChecked()!=currentStyle.gtkButtonOrder ||
mapKdeIcons->isChecked()!=currentStyle.mapKdeIcons ||
- framelessGroupBoxes->isChecked()!=currentStyle.framelessGroupBoxes ||
+// framelessGroupBoxes->isChecked()!=currentStyle.framelessGroupBoxes ||
getSquareFlags()!=currentStyle.square ||
getWindowBorderFlags()!=currentStyle.windowBorder||

@ -1,243 +0,0 @@
--- kde-style-qtcurve/cmake/QtCurveQt3.cmake.ORI 2012-08-29 19:47:59.470536207 +0200
+++ kde-style-qtcurve/cmake/QtCurveQt3.cmake 2012-08-29 19:48:50.268522398 +0200
@@ -1,5 +1,5 @@
FILE(GLOB GLOB_PATHS_BIN /usr/lib/qt-3*/bin/)
-FIND_PATH(QT_PLUGINS_DIR imageformats
+FIND_PATH(QT_PLUGINS_DIR designer
$ENV{QTDIR}/plugins
${GLOB_PATHS_BIN}
/usr/local/qt/plugins
--- a/config/CMakeLists.txt.module 2011-08-22 00:39:00.000000000 +0200
+++ a/config/CMakeLists.txt 2012-08-29 22:21:41.673500945 +0200
@@ -4,9 +4,23 @@
set(kstyle_qtcurve_config_PART_SRCS qtcurveconfig.cpp)
endif (QTC_STYLE_SUPPORT)
-include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/common ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} ${KDE3_INCLUDE_DIR} ${QT_INCLUDE_DIR})
-trinity_add_ui_files(kstyle_qtcurve_config_PART_SRCS qtcurveconfigbase.ui)
-trinity_add_kpart(kstyle_qtcurve_config ${kstyle_qtcurve_config_PART_SRCS})
-trinity_automoc(${kstyle_qtcurve_config_PART_SRCS})
-target_link_libraries(kstyle_qtcurve_config ${QT_AND_KDECORE_LIBS} kio kdeui)
-install(TARGETS kstyle_qtcurve_config DESTINATION ${KDE3_LIB_DIR}/trinity)
+include_directories(
+ ${CMAKE_SOURCE_DIR}
+ ${CMAKE_SOURCE_DIR}/common
+ ${CMAKE_CURRENT_BINARY_DIR}
+ ${CMAKE_BINARY_DIR}
+ ${TDE_INCLUDE_DIR}
+ ${QT_INCLUDE_DIR}
+)
+
+link_directories(
+ ${TQT_LIBRARY_DIRS}
+)
+
+tde_add_ui_files(kstyle_qtcurve_config_PART_SRCS qtcurveconfigbase.ui)
+tde_add_kpart(kstyle_qtcurve_config
+ MODULE
+ SOURCES ${kstyle_qtcurve_config_PART_SRCS}
+ LINK ${QT_AND_KDECORE_LIBS} kio kdeui
+ DESTINATION ${TDE_LIB_DIR}/trinity)
+tde_automoc(${kstyle_qtcurve_config_PART_SRCS})
--- a/CMakeLists.txt.module 2012-08-29 20:30:59.679915086 +0200
+++ b/CMakeLists.txt 2012-08-29 22:09:03.118576286 +0200
@@ -3,7 +3,7 @@
set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README")
set(CPACK_GENERATOR "DEB;RPM;TGZ")
-set(DEBIAN_PACKAGE_DESCRIPTION "QtCurve for Qt3/KDE3")
+set(DEBIAN_PACKAGE_DESCRIPTION "QtCurve for Qt3/TDE")
set(DEBIAN_PACKAGE_SECTION "kde")
set(CPACK_SOURCE_GENERATOR "TBZ2")
set(CPACK_PACKAGE_VERSION_MAJOR "1")
@@ -16,39 +16,64 @@
set(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${QTCURVE_VERSION_FULL}")
include(CPack)
+##### include essential cmake modules ###########
+
+include( FindPkgConfig )
+include( CheckIncludeFile )
+include( CheckSymbolExists )
+include( CheckFunctionExists )
+include( CheckCSourceCompiles )
+include( CheckCXXSourceCompiles )
+include( CheckTypeSize )
+include( CheckCSourceRuns )
+include( CheckLibraryExists )
+
+##### include our cmake modules #################
+
+set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" )
+include( TDEMacros )
+include( TDESetupPaths )
+
+##### setup and find essential stuff ############
+
+tde_setup_paths( )
+find_package( TQt )
+
+
if(COMMAND cmake_policy)
cmake_policy(SET CMP0003 NEW)
endif(COMMAND cmake_policy)
if (QTC_BUILD_CONFIG_MODULE)
if (NOT QTC_QT_ONLY)
- find_package(KDE3)
- if (NOT KDE3_FOUND)
+ find_package(TDE)
+ if (NOT TDE_VERSION)
set(QTC_QT_ONLY true)
- message("INFO: KDE3 not found! Compiling for Qt only! (Not building the config module)")
- endif (NOT KDE3_FOUND)
+ message("INFO: Trinity not found! Compiling for Qt only! (Not building the config module)")
+ endif (NOT TDE_VERSION)
endif (NOT QTC_QT_ONLY)
else (QTC_BUILD_CONFIG_MODULE)
set(QTC_QT_ONLY true)
endif (QTC_BUILD_CONFIG_MODULE)
if (NOT QTC_QT_ONLY)
- include(KDE3Macros)
+ include(TDEMacros)
else (NOT QTC_QT_ONLY)
- if (NOT KDE3PREFIX)
- SET(KDE3PREFIX "/opt/trinity")
- endif (NOT KDE3PREFIX)
+ if (NOT TDEPREFIX)
+ SET(TDEPREFIX "/opt/trinity")
+ endif (NOT TDEPREFIX)
+endif (NOT QTC_QT_ONLY)
set(QT_MT_REQUIRED TRUE)
find_package(Qt3 REQUIRED)
set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake )
include(QtCurveQt3)
+ set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" )
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${LIB_SUFFIX}/trinity/plugins")
+ SET(QT_PLUGINS_DIR "${TDEPREFIX}/lib${LIB_SUFFIX}/trinity/plugins")
endif (QT_PLUGINS_DIR MATCHES NOTFOUND)
-endif (NOT QTC_QT_ONLY)
#if (NOT QTC_QT_ONLY)
exec_program(kde-config
@@ -56,18 +81,15 @@
OUTPUT_VARIABLE CMAKE_INSTALL_PREFIX)
#endif (NOT QTC_QT_ONLY)
-SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I/usr/include/tqt -include tqt.h -DTQT_THREAD_SUPPORT")
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I/opt/trinity/include/tqt -include tqt.h -DTQT_THREAD_SUPPORT")
# NASTY HACK TO FORCE COMPILATION
# REMOVE WHEN FIXED
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I/opt/trinity/include")
-SET(QT_UIC_EXECUTABLE "/usr/bin/uic-tqt" CACHE FILEPATH "")
-SET(QT_MOC_EXECUTABLE "/usr/bin/tmoc" CACHE FILEPATH "")
-
exec_program(kde-config
ARGS --install locale --expandvars
- OUTPUT_VARIABLE KDE3_LOCALE_PREFIX)
+ OUTPUT_VARIABLE TDE_LOCALE_PREFIX)
file(TO_CMAKE_PATH "$ENV{KDEDIRS}" _KDEDIRS)
@@ -87,31 +109,31 @@
endif(KDE4_KDECONFIG_EXECUTABLE)
if(NOT KDE4PREFIX)
- set(KDE4PREFIX ${KDE3PREFIX})
+ set(KDE4PREFIX ${TDEPREFIX})
endif(NOT KDE4PREFIX)
configure_file (config.h.cmake ${CMAKE_BINARY_DIR}/config.h)
#if (NOT QTC_QT_ONLY)
- add_definitions(${QT_DEFINITIONS} ${KDE3_DEFINITIONS})
- include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE3_INCLUDES})
+ add_definitions(${QT_DEFINITIONS} ${TDE_DEFINITIONS})
+ include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${TDE_INCLUDES})
#else (NOT QTC_QT_ONLY)
# add_definitions(${QT_DEFINITIONS})
# include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR})
#endif (NOT QTC_QT_ONLY)
-set(DATA_INSTALL_DIR ${KDE3PREFIX}/share/apps)
+set(DATA_INSTALL_DIR ${TDEPREFIX}/share/apps)
-if(QTC_DEFAULT_TO_KDE3)
- message("INFO: Defaulting to reading KDE3 settings if KDE_SESSION_VERSION is not set")
-else(QTC_DEFAULT_TO_KDE3)
+if(QTC_DEFAULT_TO_TDE)
+ message("INFO: Defaulting to reading TDE settings if KDE_SESSION_VERSION is not set")
+else(QTC_DEFAULT_TO_TDE)
message("INFO: Defaulting to reading KDE4 settings if KDE_SESSION_VERSION is not set")
-endif(QTC_DEFAULT_TO_KDE3)
+endif(QTC_DEFAULT_TO_TDE)
add_subdirectory(style)
#if (NOT QTC_QT_ONLY)
if (QTC_BUILD_CONFIG_MODULE)
message("**************************************************************\n"
- "Warning: The KDE3 config module is deprecated, and is no longer\n"
+ "Warning: The TDE config module is deprecated, and is no longer\n"
" actively maintained. This module NO LONGER COMPILES!\n"
" It is recommended to use the KDE4 version instead.\n"
"**************************************************************\n")
--- kde-style-qtcurve/po/CMakeLists.txt.ORI 2012-08-30 20:03:49.306967361 +0200
+++ kde-style-qtcurve/po/CMakeLists.txt 2012-08-30 20:03:55.714827822 +0200
@@ -18,7 +18,7 @@
add_custom_command(TARGET translations
COMMAND ${GETTEXT_MSGFMT_EXECUTABLE} --check -o ${_gmoFile} ${_poFile}
DEPENDS ${_poFile})
- install(FILES ${_gmoFile} DESTINATION ${KDE3_LOCALE_PREFIX}/${_langCode}/LC_MESSAGES/ RENAME ${catalogname}.mo)
+ install(FILES ${_gmoFile} DESTINATION ${TDE_LOCALE_PREFIX}/${_langCode}/LC_MESSAGES/ RENAME ${catalogname}.mo)
endif( _langCode )
endforeach(_poFile ${PO_FILES})
endif(NOT GETTEXT_MSGFMT_EXECUTABLE)
--- kde-style-qtcurve/style/CMakeLists.txt.cmake 2011-08-22 00:39:00.000000000 +0200
+++ kde-style-qtcurve/style/CMakeLists.txt 2012-08-30 20:20:04.645840572 +0200
@@ -1,14 +1,25 @@
if (NOT QTC_QT_ONLY)
set(qtcurve_SRCS qtcurve.cpp pixmaps.h)
add_definitions(-DQT_PLUGIN)
- include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} ${KDE3_INCLUDE_DIR} ${QT_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/common)
- link_directories(${KDE3_LIB_DIR})
- trinity_automoc(${qtcurve_SRCS})
- add_library(qtcurve MODULE ${qtcurve_SRCS})
- set_target_properties(qtcurve PROPERTIES PREFIX "")
- target_link_libraries(qtcurve ${QT_LIBRARIES} kdefx)
- install(TARGETS qtcurve LIBRARY DESTINATION ${KDE3_LIB_DIR}/trinity/plugins/styles)
- install(FILES qtcurve.themerc DESTINATION ${KDE3PREFIX}/share/apps/kstyle/themes)
+ include_directories(
+ ${CMAKE_SOURCE_DIR}
+ ${CMAKE_CURRENT_BINARY_DIR}
+ ${CMAKE_BINARY_DIR}
+ ${TDE_INCLUDE_DIR}
+ ${QT_INCLUDE_DIR}
+ ${CMAKE_SOURCE_DIR}/common
+ )
+ link_directories(
+ ${TDE_LIB_DIR}
+ )
+ tde_add_library(qtcurve
+ MODULE
+ PROPERTIES PREFIX ""
+ SOURCES ${qtcurve_SRCS}
+ LINK ${QT_LIBRARIES} kdefx
+ DESTINATION ${TDE_LIB_DIR}/trinity/plugins/styles
+ )
+ install(FILES qtcurve.themerc DESTINATION ${TDEPREFIX}/share/apps/kstyle/themes)
else (NOT QTC_QT_ONLY)
set(qtcurve_MOC_CLASSES qtcurve.h qtc_kstyle.h)
QTCURVE_QT_WRAP_CPP(qtcurve_MOC_SRCS ${qtcurve_MOC_CLASSES})
--- a/style/qtcurve.cpp.ORI 2012-08-30 20:57:36.256639146 +0200
+++ a/style/qtcurve.cpp 2012-08-30 20:57:40.338552798 +0200
@@ -8684,4 +8684,3 @@
resetHover();
}
-#include "qtcurve.moc"

@ -1,237 +0,0 @@
--- a/style/qtcurve.h.ORI 2012-08-30 20:50:02.179242022 +0200
+++ a/style/qtcurve.h 2012-08-30 20:51:22.372546460 +0200
@@ -1,5 +1,5 @@
-#ifndef __TQTCURVE_H__
-#define __TQTCURVE_H__
+#ifndef __QTCURVE_H__
+#define __QTCURVE_H__
/*
TQtCurve (C) Craig Drummond, 2003 - 2010 craig.p.drummond@gmail.com
@@ -51,7 +51,7 @@
*/
#include "config.h"
-#ifdef TQTC_TQT_ONLY
+#ifdef QTC_QT_ONLY
#include "tqtc_kstyle.h"
#else
#include <kdeversion.h>
@@ -68,7 +68,7 @@
class TQTimer;
class TQSlider;
-#ifdef TQTC_TQT_ONLY
+#ifdef QTC_QT_ONLY
#define BASE_STYLE TQtCKStyle
#else
#define BASE_STYLE KStyle
@@ -126,7 +126,7 @@
ENTRY_NONE
};
-#ifdef TQTC_STYLE_SUPPORT
+#ifdef QTC_STYLE_SUPPORT
TQtCurveStyle(const TQString &name=TQString());
#else
TQtCurveStyle();
@@ -278,7 +278,7 @@
mutable TQColor itsColoredBackgroundCols[TOTAL_SHADES+1];
EApp itsThemedApp;
mutable TQCache<TQPixmap> itsPixmapCache;
-#if defined TQTC_TQT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200
+#if defined QTC_QT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200
bool itsIsTransKicker;
#endif
EHover itsHover;
--- a/style/qtcurve.cpp.tqt 2012-08-30 21:28:00.664141509 +0200
+++ a/style/qtcurve.cpp 2012-08-30 21:28:18.078781087 +0200
@@ -62,7 +62,7 @@
#include <tqtable.h>
#include "config.h"
-#ifndef TQTC_TQT_ONLY
+#ifndef QTC_QT_ONLY
#include <kdeversion.h>
#endif
#include <tqsettings.h>
@@ -196,7 +196,7 @@
? atoi(sessionVersion)<4
? 3
: 4
-#ifdef TQTC_DEFAULT_TO_KDE3
+#ifdef QTC_DEFAULT_TO_KDE3
: 3;
#else
: getenv("TDE_FULL_SESSION")
@@ -292,7 +292,7 @@
return kdeHome[trinity ? 0 : 1];
}
-#ifdef TQTC_STYLE_SUPPORT
+#ifdef QTC_STYLE_SUPPORT
static void getStyles(const TQString &dir, const char *sub, TQStringList &styles)
{
TQDir d(dir+sub);
@@ -349,7 +349,7 @@
TQStringList list;
list << "TQtCurve";
-#ifdef TQTC_STYLE_SUPPORT
+#ifdef QTC_STYLE_SUPPORT
getStyles(kdeHome(useTQt3Settings()), list);
getStyles(kdeHome(!useTQt3Settings()), list);
getStyles(KDE_PREFIX(useTQt3Settings() ? 3 : 4), list);
@@ -363,7 +363,7 @@
{
return "qtcurve"==s.lower()
? new TQtCurveStyle
-#ifdef TQTC_STYLE_SUPPORT
+#ifdef QTC_STYLE_SUPPORT
: 0==s.find(THEME_PREFIX)
? new TQtCurveStyle(s)
#endif
@@ -375,7 +375,7 @@
#define SKIP_TASKBAR (APP_SKIP_TASKBAR==itsThemedApp || APP_KPRINTER==itsThemedApp || APP_KDIALOG==itsThemedApp)
-#if defined TQTC_TQT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200
+#if defined QTC_QT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200
#include <tqfile.h>
#endif
@@ -393,7 +393,7 @@
#define DW_BGND 105
-#if defined TQTC_TQT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200
+#if defined QTC_QT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200
// Try to read $KDEHOME/share/config/kickerrc to find out if kicker is transparent...
static bool kickerIsTrans()
@@ -802,7 +802,7 @@
p->restore();
}
-#ifdef TQTC_STYLE_SUPPORT
+#ifdef QTC_STYLE_SUPPORT
TQtCurveStyle::TQtCurveStyle(const TQString &name)
#else
TQtCurveStyle::TQtCurveStyle()
@@ -820,7 +820,7 @@
itsMdiColors(0L),
itsThemedApp(APP_OTHER),
itsPixmapCache(150000, 499),
-#if defined TQTC_TQT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200
+#if defined QTC_QT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200
itsIsTransKicker(false),
#endif
itsHover(HOVER_NONE),
@@ -835,7 +835,7 @@
itsDragWidget(0L),
itsDragWidgetHadMouseTracking(false)
{
-#ifdef TQTC_STYLE_SUPPORT
+#ifdef QTC_STYLE_SUPPORT
TQString rcFile;
if(!name.isEmpty())
{
@@ -1161,7 +1161,7 @@
if ("kicker"==appName || "appletproxy"==appName)
{
itsThemedApp=APP_KICKER;
-#if defined TQTC_TQT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200
+#if defined QTC_QT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200
itsIsTransKicker=kickerIsTrans();
#endif
}
@@ -1196,7 +1196,7 @@
else if ("korn"==appName)
{
itsThemedApp=APP_KORN;
-#if defined TQTC_TQT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200
+#if defined QTC_QT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200
itsIsTransKicker=kickerIsTrans();
#endif
}
@@ -1236,7 +1236,7 @@
if(SHADE_NONE!=opts.menuStripe && opts.noMenuStripeApps.contains(appName))
opts.menuStripe=SHADE_NONE;
-#ifdef TQTC_ENABLE_PARENTLESS_DIALOG_FIX_SUPPORT
+#ifdef QTC_ENABLE_PARENTLESS_DIALOG_FIX_SUPPORT
if(opts.fixParentlessDialogs && (opts.noDlgFixApps.contains(appName) || opts.noDlgFixApps.contains("kde")))
opts.fixParentlessDialogs=false;
#endif
@@ -1762,7 +1762,7 @@
((TQGroupBox *)widget)->setFlat(false);
((TQGroupBox *)widget)->setFrameShape(TQFrame::NoFrame);
}
-#ifdef TQTC_ENABLE_PARENTLESS_DIALOG_FIX_SUPPORT
+#ifdef QTC_ENABLE_PARENTLESS_DIALOG_FIX_SUPPORT
else if(opts.fixParentlessDialogs && ::tqqt_cast<TQDialog *>(widget))
{
TQDialog *dlg=(TQDialog *)widget;
@@ -1931,7 +1931,7 @@
}
else if(widget->inherits("KTabCtl"))
widget->removeEventFilter(this);
-#ifdef TQTC_ENABLE_PARENTLESS_DIALOG_FIX_SUPPORT
+#ifdef QTC_ENABLE_PARENTLESS_DIALOG_FIX_SUPPORT
else if(opts.fixParentlessDialogs && ::tqqt_cast<TQDialog *>(widget))
widget->removeEventFilter(this);
#endif
@@ -2277,7 +2277,7 @@
break;
}
-#ifdef TQTC_ENABLE_PARENTLESS_DIALOG_FIX_SUPPORT
+#ifdef QTC_ENABLE_PARENTLESS_DIALOG_FIX_SUPPORT
if(opts.fixParentlessDialogs && ::tqqt_cast<TQDialog *>(object))
{
TQDialog *dlg=(TQDialog *)object;
@@ -3152,7 +3152,7 @@
if(flags&Style_Down)
flags=((flags|Style_Down)^Style_Down)| Style_Sunken;
flags|=Style_Enabled;
-#if defined TQTC_TQT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200
+#if defined QTC_QT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200
#if defined KDE_VERSION && KDE_VERSION >= 0x30400 && KDE_VERSION < 0x30500
if(HOVER_KICKER==itsHover && itsHoverWidget) // && itsHoverWidget==p->device())
flags|=Style_MouseOver;
@@ -3161,7 +3161,7 @@
#endif
drawLightBevel(p, r, cg, flags|Style_Horizontal, ROUNDED_ALL,
getFill(flags, use), use, true, false);
-#if defined TQTC_TQT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200
+#if defined QTC_QT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200
itsFormMode=false;
#endif
}
@@ -3313,7 +3313,7 @@
? cg.background().dark(DW_BGND)
: */cg.background(),
p, r, cg, glassMod ? flags : flags|Style_Horizontal,
-#if defined TQTC_TQT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200
+#if defined QTC_QT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200
(APP_KORN==itsThemedApp && itsIsTransKicker && PE_ButtonTool==pe) ||
#endif
operaMdi || mdi
@@ -3345,7 +3345,7 @@
drawLightBevel(p, r, cg, glassMod ? flags : flags|Style_Horizontal,
flags&CHECK_BUTTON
-#if defined TQTC_TQT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200
+#if defined QTC_QT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200
|| (APP_KORN==itsThemedApp && itsIsTransKicker && PE_ButtonTool==pe)
#endif
? ROUNDED_NONE : ROUNDED_ALL,
@@ -5540,7 +5540,7 @@
bflags|=NO_ETCH_BUTTON;
// If we're pressed, on, or raised...
-#if defined TQTC_TQT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200
+#if defined QTC_QT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200
if(bflags &(Style_Down | Style_On | Style_Raised) || onControlButtons)
#else
if(bflags &(Style_Down | Style_On | Style_Raised | Style_MouseOver) ||

@ -1,141 +0,0 @@
# Default version for this component
%define kdecomp kde-style-qtcurve
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?tde_prefix}" != "/usr"
%define _variant .opt
%endif
# TDE 3.5.13 specific building variables
%define tde_bindir %{tde_prefix}/bin
%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
%define tde_includedir %{tde_prefix}/include
%define tde_libdir %{tde_prefix}/%{_lib}
%define tde_mandir %{tde_datadir}/man
%define tde_appdir %{tde_datadir}/applications
%define tde_tdeappdir %{tde_appdir}/kde
%define tde_tdedocdir %{tde_docdir}/tde
%define tde_tdeincludedir %{tde_includedir}/tde
%define tde_tdelibdir %{tde_libdir}/trinity
%define _docdir %{tde_docdir}
Name: trinity-style-qtcurve
Summary: This is a set of widget styles for Trinity based apps
Version: 0.55.2
Release: 4%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Utilities
Vendor: Trinity Project
Packager: Francois Andriot <francois.andriot@free.fr>
URL: http://www.trinitydesktop.org/
Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{kdecomp}-3.5.13.1.tar.gz
BuildRequires: trinity-tqtinterface-devel >= 3.5.13.1
BuildRequires: trinity-tdelibs-devel >= 3.5.13.1
BuildRequires: trinity-tdebase-devel >= 3.5.13.1
BuildRequires: desktop-file-utils
BuildRequires: gettext
Obsoletes: trinity-kde-style-qtcurve
Provides: trinity-kde-style-qtcurve
%description
This package together with gtk2-engines-qtcurve aim to provide a unified look
and feel on the desktop when using TDE and Gnome applications.
This package is most useful when installed together with
gtk2-engines-qtcurve.
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif
%prep
%setup -q -n %{kdecomp}-3.5.13.1
# 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|%{tde_includedir}/tqt|g" \
-e "s|/usr/bin/uic-tqt|%{tde_bindir}/uic-tqt|g" \
-e "s|/usr/bin/tmoc|%{tde_bindir}/tmoc|g"
%build
unset QTDIR || : ; . /etc/profile.d/qt3.sh
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
export CXXFLAGS="-I${QTINC} -I%{tde_tdeincludedir} ${CXXFLAGS}"
%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
%__mkdir_p build
cd build
%endif
%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" \
-DTDE_INCLUDE_DIR=%{tde_tdeincludedir} \
-DQTC_QT_ONLY=false \
-DQTC_STYLE_SUPPORT=true \
-DBUILD_ALL=on \
..
%__make %{?_smp_mflags}
%install
export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot} -C build
%find_lang qtcurve
%clean
%__rm -rf %{buildroot}
%files -f qtcurve.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING
%{tde_tdelibdir}/kstyle_qtcurve_config.la
%{tde_tdelibdir}/kstyle_qtcurve_config.so
%{tde_tdelibdir}/plugins/styles/qtcurve.so
%{tde_tdelibdir}/plugins/styles/qtcurve.la
%{tde_datadir}/apps/kdisplay/color-schemes/QtCurve.kcsrc
%{tde_datadir}/apps/kstyle/themes/qtcurve.themerc
%{tde_datadir}/apps/QtCurve/*.qtcurve
%changelog
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.55.2-4
- Initial release for TDE 3.5.13.1
* Sun Sep 09 2012 Francois Andriot <francois.andriot@free.fr> - 0.55.2-3
- Switch to v3.5.13-sru branch
* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.55.2-2
- Rebuilt for Fedora 17
- Removes post and postun
* Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 0.55.2-1
- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16

@ -1,140 +0,0 @@
# Default version for this component
%define kdecomp kde-style-qtcurve
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?tde_prefix}" != "/usr"
%define _variant .opt
%endif
# TDE 3.5.13 specific building variables
%define tde_bindir %{tde_prefix}/bin
%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
%define tde_includedir %{tde_prefix}/include
%define tde_libdir %{tde_prefix}/%{_lib}
%define tde_mandir %{tde_datadir}/man
%define tde_appdir %{tde_datadir}/applications
%define tde_tdeappdir %{tde_appdir}/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-style-qtcurve
Summary: This is a set of widget styles for Trinity based apps
Version: 0.55.2
Release: 3%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Utilities
Vendor: Trinity Project
Packager: Francois Andriot <francois.andriot@free.fr>
URL: http://www.trinitydesktop.org/
Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{kdecomp}-3.5.13.tar.gz
Source1: cmake-3.5.13.tar.gz
# [qtcurve] Version 3.5.13-sru
Patch0: kde-style-qtcurve-3.5.13-sru-20120909.patch
BuildRequires: tqtinterface-devel
BuildRequires: trinity-tdelibs-devel
BuildRequires: trinity-tdebase-devel
BuildRequires: desktop-file-utils
BuildRequires: gettext
Obsoletes: trinity-kde-style-qtcurve
Provides: trinity-kde-style-qtcurve
%description
This package together with gtk2-engines-qtcurve aim to provide a unified look
and feel on the desktop when using TDE and Gnome applications.
This package is most useful when installed together with
gtk2-engines-qtcurve.
%prep
%setup -q -n applications/%{kdecomp}
%setup -q -n applications/%{kdecomp} -a 1
%__mv -f cmake-3.5.13/* cmake/
%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|%{tde_includedir}/tqt|g" \
-e "s|/usr/bin/uic-tqt|%{tde_bindir}/uic-tqt|g" \
-e "s|/usr/bin/tmoc|%{tde_bindir}/tmoc|g"
%build
unset QTDIR || : ; . /etc/profile.d/qt.sh
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
export CXXFLAGS="-I${QTINC} -I%{tde_tdeincludedir} ${CXXFLAGS}"
%if 0%{?rhel} || 0%{?fedora}
%__mkdir_p build
cd build
%endif
%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" \
-DTDE_INCLUDE_DIR=%{tde_tdeincludedir} \
-DQTC_QT_ONLY=false \
-DQTC_STYLE_SUPPORT=true \
-DBUILD_ALL=on \
..
%__make %{?_smp_mflags}
%install
export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot} -C build
%find_lang qtcurve
%clean
%__rm -rf %{buildroot}
%files -f qtcurve.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING
%{tde_tdelibdir}/kstyle_qtcurve_config.la
%{tde_tdelibdir}/kstyle_qtcurve_config.so
%{tde_tdelibdir}/plugins/styles/qtcurve.so
%{tde_tdelibdir}/plugins/styles/qtcurve.la
%{tde_datadir}/apps/kdisplay/color-schemes/QtCurve.kcsrc
%{tde_datadir}/apps/kstyle/themes/qtcurve.themerc
%{tde_datadir}/apps/QtCurve/*.qtcurve
%Changelog
* Sun Sep 09 2012 Francois Andriot <francois.andriot@free.fr> - 0.55.2-3
- Switch to v3.5.13-sru branch
* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.55.2-2
- Rebuilt for Fedora 17
- Removes post and postun
* Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 0.55.2-1
- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16

@ -1,59 +1,95 @@
# Default version for this component #
%define tde_pkg tde-style-qtcurve # spec file for package tde-style-qtcurve (version R14.0.0)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
#
# Please submit bugfixes or comments via http://www.trinitydesktop.org/
#
# TDE variables
%define tde_epoch 2
%define tde_version 14.0.0 %define tde_version 14.0.0
%define tde_pkg tde-style-qtcurve
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %define tde_prefix /opt/trinity
%if "%{?tde_prefix}" != "/usr"
%define _variant .opt
%endif
# TDE specific building variables
%define tde_bindir %{tde_prefix}/bin %define tde_bindir %{tde_prefix}/bin
%define tde_datadir %{tde_prefix}/share %define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc %define tde_docdir %{tde_datadir}/doc
%define tde_includedir %{tde_prefix}/include %define tde_includedir %{tde_prefix}/include
%define tde_libdir %{tde_prefix}/%{_lib} %define tde_libdir %{tde_prefix}/%{_lib}
%define tde_mandir %{tde_datadir}/man %define tde_mandir %{tde_datadir}/man
%define tde_appdir %{tde_datadir}/applications %define tde_tdeappdir %{tde_datadir}/applications/tde
%define tde_tdeappdir %{tde_appdir}/tde
%define tde_tdedocdir %{tde_docdir}/tde %define tde_tdedocdir %{tde_docdir}/tde
%define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdeincludedir %{tde_includedir}/tde
%define tde_tdelibdir %{tde_libdir}/trinity %define tde_tdelibdir %{tde_libdir}/trinity
%define _docdir %{tde_docdir}
Name: trinity-tde-style-qtcurve Name: trinity-%{tde_pkg}
Summary: This is a set of widget styles for Trinity based apps Epoch: %{tde_epoch}
Version: 0.55.2 Version: 0.55.2
Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant} Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
Summary: This is a set of widget styles for Trinity based apps
Group: Applications/Utilities
URL: http://www.trinitydesktop.org/
License: GPLv2+ %if 0%{?suse_version}
Group: Applications/Utilities License: GPL-2.0+
%else
License: GPLv2+
%endif
Vendor: Trinity Project #Vendor: Trinity Desktop
Packager: Francois Andriot <francois.andriot@free.fr> #Packager: Francois Andriot <francois.andriot@free.fr>
URL: http://www.trinitydesktop.org/
Prefix: %{tde_prefix} Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
BuildRequires: gettext BuildRequires: gettext
BuildRequires: cmake libtool
BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: fdupes
# SUSE desktop files utility
%if 0%{?suse_version}
BuildRequires: update-desktop-files
%endif
%if 0%{?opensuse_bs} && 0%{?suse_version}
# for xdg-menu script
BuildRequires: brp-check-trinity
%endif
# IDN support
BuildRequires: libidn-devel
# GAMIN support
# Not on openSUSE.
%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
%define with_gamin 1
BuildRequires: gamin-devel
%endif
Obsoletes: trinity-kde-style-qtcurve < %{version}-%{release} Obsoletes: trinity-kde-style-qtcurve < %{version}-%{release}
Provides: trinity-kde-style-qtcurve = %{version}-%{release} Provides: trinity-kde-style-qtcurve = %{version}-%{release}
Obsoletes: trinity-style-qtcurve < %{version}-%{release} Obsoletes: trinity-style-qtcurve < %{version}-%{release}
Provides: trinity-style-qtcurve = %{version}-%{release} Provides: trinity-style-qtcurve = %{version}-%{release}
%description %description
This package together with gtk2-engines-qtcurve aim to provide a unified look This package together with gtk2-engines-qtcurve aim to provide a unified look
and feel on the desktop when using TDE and Gnome applications. and feel on the desktop when using TDE and Gnome applications.
@ -62,10 +98,14 @@ This package is most useful when installed together with
gtk2-engines-qtcurve. gtk2-engines-qtcurve.
%if 0%{?suse_version} || 0%{?pclinuxos} ##########
%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
%debug_package %debug_package
%endif %endif
##########
%prep %prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
@ -137,9 +177,9 @@ export PATH="%{tde_bindir}:${PATH}"
%{tde_tdelibdir}/plugins/styles/qtcurve.la %{tde_tdelibdir}/plugins/styles/qtcurve.la
%{tde_datadir}/apps/tdedisplay/color-schemes/QtCurve.kcsrc %{tde_datadir}/apps/tdedisplay/color-schemes/QtCurve.kcsrc
%{tde_datadir}/apps/tdestyle/themes/qtcurve.themerc %{tde_datadir}/apps/tdestyle/themes/qtcurve.themerc
%{tde_datadir}/apps/QtCurve/*.qtcurve %{tde_datadir}/apps/QtCurve/
%changelog %changelog
* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.55.2-7 * Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2:0.55.2-1
- Initial release for TDE 14.0.0 - Initial release for TDE 14.0.0

@ -1,5 +1,5 @@
# #
# spec file for package tdeio-tdenetworkmanager (version R14.0.0) # spec file for package tdenetworkmanager (version R14.0.0)
# #
# Copyright (c) 2014 Trinity Desktop Environment # Copyright (c) 2014 Trinity Desktop Environment
# #

@ -1,55 +1,123 @@
# Default version for this component #
%define tde_pkg tdepowersave # spec file for package tdepowersave (version R14.0.0)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
#
# Please submit bugfixes or comments via http://www.trinitydesktop.org/
#
# TDE variables
%define tde_epoch 2
%define tde_version 14.0.0 %define tde_version 14.0.0
%define tde_pkg tdepowersave
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %define tde_prefix /opt/trinity
%if "%{?tde_prefix}" != "/usr"
%define _variant .opt
%endif
# TDE specific building variables
%define tde_bindir %{tde_prefix}/bin %define tde_bindir %{tde_prefix}/bin
%define tde_datadir %{tde_prefix}/share %define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc %define tde_docdir %{tde_datadir}/doc
%define tde_includedir %{tde_prefix}/include %define tde_includedir %{tde_prefix}/include
%define tde_libdir %{tde_prefix}/%{_lib} %define tde_libdir %{tde_prefix}/%{_lib}
%define tde_mandir %{tde_datadir}/man %define tde_mandir %{tde_datadir}/man
%define tde_appdir %{tde_datadir}/applications %define tde_tdeappdir %{tde_datadir}/applications/tde
%define tde_tdeappdir %{tde_appdir}/tde
%define tde_tdedocdir %{tde_docdir}/tde %define tde_tdedocdir %{tde_docdir}/tde
%define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdeincludedir %{tde_includedir}/tde
%define tde_tdelibdir %{tde_libdir}/trinity %define tde_tdelibdir %{tde_libdir}/trinity
%define _docdir %{tde_docdir}
Name: trinity-%{tde_pkg} Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 0.7.3 Version: 0.7.3
Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant} Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
Summary: Power management applet for Trinityfiles or directories. Summary: Power management applet for Trinity
Group: Applications/Utilities
URL: http://www.trinitydesktop.org/
%if 0%{?suse_version}
License: GPL-2.0+
%else
License: GPLv2+ License: GPLv2+
Group: Applications/Utilities %endif
Vendor: Trinity Project #Vendor: Trinity Desktop
Packager: Francois Andriot <francois.andriot@free.fr> #Packager: Francois Andriot <francois.andriot@free.fr>
URL: http://www.trinitydesktop.org/
Prefix: %{tde_prefix} Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
BuildRequires: libdbus-tqt-1-devel >= %{tde_epoch}:0.63
BuildRequires: libdbus-1-tqt-devel >= %{tde_epoch}:0.9
BuildRequires: cmake libtool
BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: fdupes
# SUSE desktop files utility
%if 0%{?suse_version}
BuildRequires: update-desktop-files
%endif
%if 0%{?opensuse_bs} && 0%{?suse_version}
# for xdg-menu script
BuildRequires: brp-check-trinity
%endif
# UDEV support
%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6
%define with_tdehwlib 1
BuildRequires: libudev-devel
%endif
# XSCREENSAVER support
# Disabled on RHEL4
%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
%define with_xscreensaver 1
%if 0%{?rhel} == 5
BuildRequires: xorg-x11-proto-devel
BuildRequires: gnome-screensaver
%endif
%if 0%{?mgaversion} || 0%{?mdkversion}
%if 0%{?mgaversion} >= 4
BuildRequires: %{_lib}xscrnsaver-devel
%else
BuildRequires: %{_lib}xscrnsaver%{?mgaversion:1}-devel
%endif
%endif
%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version} >= 1220
BuildRequires: libXScrnSaver-devel
%endif
%if 0%{?suse_version} == 1140
BuildRequires: xscreensaver
%endif
%endif
# IDN support
BuildRequires: libidn-devel
# GAMIN support
# Not on openSUSE.
%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
%define with_gamin 1
BuildRequires: gamin-devel
%endif
Obsoletes: trinity-kpowersave < %{version}-%{release} Obsoletes: trinity-kpowersave < %{version}-%{release}
Provides: trinity-kpowersave = %{version}-%{release} Provides: trinity-kpowersave = %{version}-%{release}
%description %description
TDEPowersave is a TDE systray applet which allows to control the power TDEPowersave is a TDE systray applet which allows to control the power
management settings and policies of your computer. management settings and policies of your computer.
@ -80,10 +148,14 @@ settings for:
* notification settings * notification settings
%if 0%{?suse_version} || 0%{?pclinuxos} ##########
%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
%debug_package %debug_package
%endif %endif
##########
%prep %prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
@ -133,7 +205,7 @@ export PATH="%{tde_bindir}:${PATH}"
%post %post
update-desktop-database %{tde_appdir} > /dev/null update-desktop-database %{tde_tdeappdir} > /dev/null
/sbin/ldconfig /sbin/ldconfig
touch --no-create %{tde_datadir}/icons/hicolor || : touch --no-create %{tde_datadir}/icons/hicolor || :
gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
@ -145,7 +217,7 @@ if [ $1 = 1 ] && [ -r /etc/acpi/actions/power.sh ]; then
fi fi
%postun %postun
update-desktop-database %{tde_appdir} > /dev/null update-desktop-database %{tde_tdeappdir} > /dev/null
/sbin/ldconfig /sbin/ldconfig
touch --no-create %{tde_datadir}/icons/hicolor || : touch --no-create %{tde_datadir}/icons/hicolor || :
gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
@ -164,8 +236,7 @@ fi
%{tde_tdelibdir}/tdepowersave.la %{tde_tdelibdir}/tdepowersave.la
%{tde_tdelibdir}/tdepowersave.so %{tde_tdelibdir}/tdepowersave.so
%{tde_tdeappdir}/tdepowersave.desktop %{tde_tdeappdir}/tdepowersave.desktop
%{tde_datadir}/apps/tdepowersave/eventsrc %{tde_datadir}/apps/tdepowersave/
%{tde_datadir}/apps/tdepowersave/icons/*/*/*/*.png
%{tde_datadir}/icons/hicolor/*/*/*.png %{tde_datadir}/icons/hicolor/*/*/*.png
%{tde_datadir}/autostart/tdepowersave-autostart.desktop %{tde_datadir}/autostart/tdepowersave-autostart.desktop
%{tde_datadir}/config/tdepowersaverc %{tde_datadir}/config/tdepowersaverc
@ -175,9 +246,10 @@ fi
%lang(en) %{tde_tdedocdir}/HTML/en/tdepowersave/ %lang(en) %{tde_tdedocdir}/HTML/en/tdepowersave/
%lang(fi) %{tde_tdedocdir}/HTML/fi/tdepowersave/ %lang(fi) %{tde_tdedocdir}/HTML/fi/tdepowersave/
%lang(hu) %{tde_tdedocdir}/HTML/hu/tdepowersave/ %lang(hu) %{tde_tdedocdir}/HTML/hu/tdepowersave/
%lang(nb) %dir %{tde_tdedocdir}/HTML/nb
%lang(nb) %{tde_tdedocdir}/HTML/nb/tdepowersave/ %lang(nb) %{tde_tdedocdir}/HTML/nb/tdepowersave/
%changelog %changelog
* Thu Jul 04 2013 Francois Andriot <francois.andriot@free.fr> - 0.7.3-5 * Thu Jul 04 2013 Francois Andriot <francois.andriot@free.fr> - 2:0.7.3-1
- Initial release for TDE 14.0.0 - Initial release for TDE 14.0.0

@ -1,182 +0,0 @@
# Default version for this component
%define kdecomp kradio
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?tde_prefix}" != "/usr"
%define _variant .opt
%endif
# TDE 3.5.13 specific building variables
%define tde_bindir %{tde_prefix}/bin
%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
%define tde_includedir %{tde_prefix}/include
%define tde_libdir %{tde_prefix}/%{_lib}
%define tde_mandir %{tde_datadir}/man
%define tde_appdir %{tde_datadir}/applications
%define tde_tdeappdir %{tde_appdir}/kde
%define tde_tdedocdir %{tde_docdir}/tde
%define tde_tdeincludedir %{tde_includedir}/tde
%define tde_tdelibdir %{tde_libdir}/trinity
%define _docdir %{tde_docdir}
Name: trinity-%{kdecomp}
Summary: Comfortable Radio Application for KDE [Trinity]
Version: 0.1.1.1
Release: 5%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Utilities
Vendor: Trinity Project
Packager: Francois Andriot <francois.andriot@free.fr>
URL: http://www.trinitydesktop.org/
Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{kdecomp}-3.5.13.1.tar.gz
Patch1: kradio-3.5.13.1-updated_preset.patch
BuildRequires: trinity-tqtinterface-devel >= 3.5.13.1
BuildRequires: trinity-tdelibs-devel >= 3.5.13.1
BuildRequires: trinity-tdebase-devel >= 3.5.13.1
BuildRequires: desktop-file-utils
BuildRequires: gettext
BuildRequires: libsndfile-devel
BuildRequires: lirc-devel
%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: %{_lib}twolame-devel
%endif
%if 0%{?suse_version}
BuildRequires: libtwolame-devel
%endif
%if 0%{?rhel} || 0%{?fedora}
BuildRequires: lame-devel
%endif
%description
KRadio is a comfortable radio application for Trinity 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.
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif
%prep
%setup -q -n %{kdecomp}-3.5.13.1
%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|%{tde_includedir}/tqt|g" \
-e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
%build
unset QTDIR; . /etc/profile.d/qt3.sh
export PATH="%{tde_bindir}:${PATH}"
export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
%configure \
--prefix=%{tde_prefix} \
--exec-prefix=%{tde_prefix} \
--bindir=%{tde_bindir} \
--datadir=%{tde_datadir} \
--libdir=%{tde_libdir} \
--mandir=%{tde_mandir} \
--includedir=%{tde_tdeincludedir} \
--disable-rpath \
--with-extra-includes=%{tde_includedir}/tqt \
--enable-lirc \
--enable-v4l2 \
--enable-lame \
--enable-ogg \
--enable-alsa \
--enable-oss
%__make %{?_smp_mflags}
%install
export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot}
%find_lang %{kdecomp}
%clean
%__rm -rf %{buildroot}
%post
for f in hicolor locolor ; do
touch --no-create %{tde_datadir}/icons/${f} || :
gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
done
update-desktop-database %{tde_appdir} -q &> /dev/null ||:
%postun
for f in hicolor locolor ; do
touch --no-create %{tde_datadir}/icons/${f} || :
gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
done
update-desktop-database %{tde_appdir} -q &> /dev/null ||:
%files -f %{kdecomp}.lang
%defattr(-,root,root,-)
%{tde_bindir}/convert-presets
%{tde_bindir}/kradio
%{tde_libdir}/kradio/plugins/*.la
%{tde_libdir}/kradio/plugins/*.so
%{tde_tdeappdir}/kradio.desktop
%{tde_datadir}/apps/kradio/
%{tde_datadir}/locale/*/LC_MESSAGES/kradio-*.mo
%changelog
* Sat Dec 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.1.1.1-5
- Updates presets
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.1.1.1-4
- Initial release for TDE 3.5.13.1
* Sun Jul 08 2012 Francois Andriot <francois.andriot@free.fr> - 0.1.1.1-3
- Rebuild for RHEL 5
- Fix postinstall
* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.1.1.1-2
- Rebuild for Fedora 17
- Fix HTML directory location
* Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 0.1.1.1-1
- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16

@ -1,164 +0,0 @@
# Default version for this component
%define kdecomp kradio
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?tde_prefix}" != "/usr"
%define _variant .opt
%endif
# TDE 3.5.13 specific building variables
%define tde_bindir %{tde_prefix}/bin
%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
%define tde_includedir %{tde_prefix}/include
%define tde_libdir %{tde_prefix}/%{_lib}
%define tde_mandir %{tde_datadir}/man
%define tde_appdir %{tde_datadir}/applications
%define tde_tdeappdir %{tde_appdir}/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-%{kdecomp}
Summary: Comfortable Radio Application for KDE [Trinity]
Version: 0.1.1.1
Release: 3%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Utilities
Vendor: Trinity Project
Packager: Francois Andriot <francois.andriot@free.fr>
URL: http://www.trinitydesktop.org/
Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{kdecomp}-3.5.13.tar.gz
BuildRequires: tqtinterface-devel
BuildRequires: trinity-tdelibs-devel
BuildRequires: trinity-tdebase-devel
BuildRequires: desktop-file-utils
BuildRequires: gettext
BuildRequires: libsndfile-devel
BuildRequires: lirc-devel
%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: %{_lib}twolame-devel
%else
BuildRequires: lame-devel
%endif
%description
KRadio is a comfortable radio application for Trinity 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|%{tde_includedir}/tqt|g" \
-e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
%build
unset QTDIR; . /etc/profile.d/qt.sh
export PATH="%{tde_bindir}:${PATH}"
export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
%configure \
--prefix=%{tde_prefix} \
--exec-prefix=%{tde_prefix} \
--bindir=%{tde_bindir} \
--datadir=%{tde_datadir} \
--libdir=%{tde_libdir} \
--mandir=%{tde_mandir} \
--includedir=%{tde_tdeincludedir} \
--disable-rpath \
--with-extra-includes=%{tde_includedir}/tqt \
--enable-lirc \
--enable-v4l2 \
--enable-lame \
--enable-ogg \
--enable-alsa \
--enable-oss
%__make %{?_smp_mflags}
%install
export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot}
%find_lang %{kdecomp}
%clean
%__rm -rf %{buildroot}
%post
for f in hicolor locolor ; do
touch --no-create %{tde_datadir}/icons/${f} || :
gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
done
update-desktop-database %{tde_appdir} -q &> /dev/null ||:
%postun
for f in hicolor locolor ; do
touch --no-create %{tde_datadir}/icons/${f} || :
gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
done
update-desktop-database %{tde_appdir} -q &> /dev/null ||:
%files -f %{kdecomp}.lang
%defattr(-,root,root,-)
%{tde_bindir}/convert-presets
%{tde_bindir}/kradio
%{tde_libdir}/kradio/plugins/*.la
%{tde_libdir}/kradio/plugins/*.so
%{tde_tdeappdir}/kradio.desktop
%{tde_datadir}/apps/kradio/
%{tde_datadir}/locale/*/LC_MESSAGES/kradio-*.mo
%Changelog
* Sun Jul 08 2012 Francois Andriot <francois.andriot@free.fr> - 0.1.1.1-3
- Rebuild for RHEL 5
- Fix postinstall
* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.1.1.1-2
- Rebuild for Fedora 17
- Fix HTML directory location
* Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 0.1.1.1-1
- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16

@ -1,56 +1,83 @@
# Default version for this component #
%define tde_pkg tderadio # spec file for package tderadio (version R14.0.0)
%define tde_version 14.0.0 #
# Copyright (c) 2014 Trinity Desktop Environment
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
#
# Please submit bugfixes or comments via http://www.trinitydesktop.org/
#
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
%if "%{?tde_prefix}" != "/usr" %define with_lirc 1
%define _variant .opt
%endif %endif
# TDE specific building variables # TDE variables
%define tde_epoch 2
%define tde_version 14.0.0
%define tde_pkg tderadio
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin %define tde_bindir %{tde_prefix}/bin
%define tde_datadir %{tde_prefix}/share %define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc %define tde_docdir %{tde_datadir}/doc
%define tde_includedir %{tde_prefix}/include %define tde_includedir %{tde_prefix}/include
%define tde_libdir %{tde_prefix}/%{_lib} %define tde_libdir %{tde_prefix}/%{_lib}
%define tde_mandir %{tde_datadir}/man %define tde_mandir %{tde_datadir}/man
%define tde_appdir %{tde_datadir}/applications %define tde_tdeappdir %{tde_datadir}/applications/tde
%define tde_tdeappdir %{tde_appdir}/tde
%define tde_tdedocdir %{tde_docdir}/tde %define tde_tdedocdir %{tde_docdir}/tde
%define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdeincludedir %{tde_includedir}/tde
%define tde_tdelibdir %{tde_libdir}/trinity %define tde_tdelibdir %{tde_libdir}/trinity
%define _docdir %{tde_docdir}
%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} Name: trinity-%{tde_pkg}
%define with_lirc 1 Epoch: %{tde_epoch}
%endif Version: 0.1.1.1
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
Name: trinity-%{tde_pkg} Summary: Comfortable Radio Application for TDE
Summary: Comfortable Radio Application for TDE [Trinity] Group: Applications/Utilities
Version: 0.1.1.1 URL: http://www.trinitydesktop.org/
Release: %{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist}%{?_variant}
License: GPLv2+ %if 0%{?suse_version}
Group: Applications/Utilities License: GPL-2.0+
%else
License: GPLv2+
%endif
Vendor: Trinity Project #Vendor: Trinity Desktop
Packager: Francois Andriot <francois.andriot@free.fr> #Packager: Francois Andriot <francois.andriot@free.fr>
URL: http://www.trinitydesktop.org/
Prefix: %{tde_prefix} Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
BuildRequires: gettext BuildRequires: gettext
BuildRequires: autoconf automake libtool m4
BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: fdupes
# SUSE desktop files utility
%if 0%{?suse_version}
BuildRequires: update-desktop-files
%endif
%if 0%{?opensuse_bs} && 0%{?suse_version}
# for xdg-menu script
BuildRequires: brp-check-trinity
%endif
BuildRequires: libsndfile-devel BuildRequires: libsndfile-devel
%{?with_lirc:BuildRequires: lirc-devel} %{?with_lirc:BuildRequires: lirc-devel}
@ -67,11 +94,12 @@ BuildRequires: lame-devel
Obsoletes: trinity-kradio < %{version}-%{release} Obsoletes: trinity-kradio < %{version}-%{release}
Provides: trinity-kradio = %{version}-%{release} Provides: trinity-kradio = %{version}-%{release}
%description %description
KRadio is a comfortable radio application for Trinity with support for TDERadio is a comfortable radio application for Trinity with support for
V4L and V4L2 radio cards drivers. V4L and V4L2 radio cards drivers.
KRadio currently provides TDERadio currently provides
* V4L/V4L2 radio support * V4L/V4L2 radio support
%if 0%{?with_lirc} %if 0%{?with_lirc}
@ -84,16 +112,20 @@ KRadio currently provides
* Extendable plugin architecture * Extendable plugin architecture
This package also includes a growing collection of station preset This package also includes a growing collection of station preset
files for many cities around the world contributed by KRadio users. files for many cities around the world contributed by TDERadio users.
As KRadio is based on an extendable plugin architecture, contributions As TDERadio is based on an extendable plugin architecture, contributions
of new plugins (e.g. Internet Radio Streams, new cool GUIs) are welcome. of new plugins (e.g. Internet Radio Streams, new cool GUIs) are welcome.
%if 0%{?suse_version} || 0%{?pclinuxos} ##########
%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
%debug_package %debug_package
%endif %endif
##########
%prep %prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
@ -143,6 +175,11 @@ export PATH="%{tde_bindir}:${PATH}"
%find_lang %{tde_pkg} %find_lang %{tde_pkg}
# Updates applications categories for openSUSE
%if 0%{?suse_version}
%suse_update_desktop_file -G "Radio Tuner" %{tde_pkg} AudioVideo Tuner
%endif
%clean %clean
%__rm -rf %{buildroot} %__rm -rf %{buildroot}
@ -153,24 +190,28 @@ for f in hicolor locolor ; do
touch --no-create %{tde_datadir}/icons/${f} || : touch --no-create %{tde_datadir}/icons/${f} || :
gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
done done
update-desktop-database %{tde_appdir} -q &> /dev/null ||: update-desktop-database %{tde_tdeappdir} -q &> /dev/null ||:
%postun %postun
for f in hicolor locolor ; do for f in hicolor locolor ; do
touch --no-create %{tde_datadir}/icons/${f} || : touch --no-create %{tde_datadir}/icons/${f} || :
gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
done done
update-desktop-database %{tde_appdir} -q &> /dev/null ||: update-desktop-database %{tde_tdeappdir} -q &> /dev/null ||:
%files -f %{tde_pkg}.lang %files -f %{tde_pkg}.lang
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{tde_bindir}/convert-presets %{tde_bindir}/convert-presets
%{tde_bindir}/tderadio %{tde_bindir}/tderadio
%dir %{tde_libdir}/tderadio
%dir %{tde_libdir}/tderadio/plugins
%{tde_libdir}/tderadio/plugins/*.la %{tde_libdir}/tderadio/plugins/*.la
%{tde_libdir}/tderadio/plugins/*.so %{tde_libdir}/tderadio/plugins/*.so
%{tde_tdeappdir}/tderadio.desktop %{tde_tdeappdir}/tderadio.desktop
%{tde_datadir}/apps/tderadio/ %{tde_datadir}/apps/tderadio/
%dir %{tde_datadir}/icons/hicolor/256x256
%dir %{tde_datadir}/icons/hicolor/256x256/actions
%{tde_datadir}/icons/hicolor/*/*/tderadio*.png %{tde_datadir}/icons/hicolor/*/*/tderadio*.png
%{tde_datadir}/icons/locolor/*/*/tderadio*.png %{tde_datadir}/icons/locolor/*/*/tderadio*.png
%lang(de) %{tde_datadir}/locale/de/LC_MESSAGES/*.mo %lang(de) %{tde_datadir}/locale/de/LC_MESSAGES/*.mo
@ -178,5 +219,5 @@ update-desktop-database %{tde_appdir} -q &> /dev/null ||:
%{tde_tdedocdir}/HTML/en/tderadio/ %{tde_tdedocdir}/HTML/en/tderadio/
%changelog %changelog
* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.1.1.1-8 * Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2:0.1.1.1-1
- Initial release for TDE 14.0.0 - Initial release for TDE 14.0.0

@ -1,139 +0,0 @@
# Default version for this component
%define kdecomp kdesudo
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?tde_prefix}" != "/usr"
%define _variant .opt
%endif
# TDE 3.5.13 specific building variables
%define tde_bindir %{tde_prefix}/bin
%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
%define tde_includedir %{tde_prefix}/include
%define tde_libdir %{tde_prefix}/%{_lib}
%define tde_mandir %{tde_datadir}/man
%define tde_appdir %{tde_datadir}/applications
%define tde_tdeappdir %{tde_appdir}/kde
%define tde_tdedocdir %{tde_docdir}/tde
%define tde_tdeincludedir %{tde_includedir}/tde
%define tde_tdelibdir %{tde_libdir}/trinity
%define _docdir %{tde_docdir}
Name: trinity-%{kdecomp}
Summary: sudo frontend for Trinity
Version: 2.5.1
Release: 3%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Utilities
Vendor: Trinity Project
Packager: Francois Andriot <francois.andriot@free.fr>
URL: http://www.trinitydesktop.org/
Prefix: %{_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{kdecomp}-3.5.13.1.tar.gz
BuildRequires: trinity-tqtinterface-devel >= 3.5.13.1
BuildRequires: trinity-arts-devel >= 3.5.13.1
BuildRequires: trinity-tdelibs-devel >= 3.5.13.1
BuildRequires: trinity-tdebase-devel >= 3.5.13.1
BuildRequires: desktop-file-utils
%description
KdeSudo is a graphical frontend for the sudo utility.
It allows you to run programs as another user by entering your password.
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif
%prep
%setup -q -n %{kdecomp}-3.5.13.1
# 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|%{tde_includedir}/tqt|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/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
%build
unset QTDIR || : ; source /etc/profile.d/qt3.sh
export PATH="%{tde_bindir}:${PATH}"
export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
%configure \
--prefix=%{tde_prefix} \
--exec-prefix=%{tde_prefix} \
--bindir=%{tde_bindir} \
--includedir=%{tde_tdeincludedir} \
--disable-rpath \
--with-extra-includes=%{tde_includedir}/tqt
%__make %{?_smp_mflags}
%install
export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot}
## File lists
# HTML (1.0)
HTML_DIR=$(kde-config --expandvars --install html)
if [ -d %{buildroot}$HTML_DIR ]; then
for lang_dir in %{buildroot}$HTML_DIR/* ; do
if [ -d $lang_dir ]; then
lang=$(basename $lang_dir)
echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
# replace absolute symlinks with relative ones
pushd $lang_dir
for i in *; do
[ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
done
popd
fi
done
fi
%find_lang %{kdecomp}
%clean
%__rm -rf %{buildroot}
%files -f %{kdecomp}.lang
%defattr(-,root,root,-)
%{tde_bindir}/kdesudo
%{tde_tdedocdir}/HTML/en/kdesudo/
%changelog
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 2.5.1-3
- Initial release for TDE 3.5.13.1
* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 2.5.1-2
- Rebuilt for Fedora 17
- Fix HTML directory location
- Removes post and postun
* Wed Nov 02 2011 Francois Andriot <francois.andriot@free.fr> - 2.5.1-1
- Initial release for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15

@ -1,130 +0,0 @@
# Default version for this component
%define kdecomp kdesudo
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?tde_prefix}" != "/usr"
%define _variant .opt
%endif
# TDE 3.5.13 specific building variables
%define tde_bindir %{tde_prefix}/bin
%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
%define tde_includedir %{tde_prefix}/include
%define tde_libdir %{tde_prefix}/%{_lib}
%define tde_mandir %{tde_datadir}/man
%define tde_appdir %{tde_datadir}/applications
%define tde_tdeappdir %{tde_appdir}/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-%{kdecomp}
Summary: sudo frontend for Trinity
Version: 2.5.1
Release: 2%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Utilities
Vendor: Trinity Project
Packager: Francois Andriot <francois.andriot@free.fr>
URL: http://www.trinitydesktop.org/
Prefix: %{_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{kdecomp}-3.5.13.tar.gz
BuildRequires: tqtinterface-devel
BuildRequires: trinity-arts-devel
BuildRequires: trinity-tdelibs-devel
BuildRequires: trinity-tdebase-devel
BuildRequires: desktop-file-utils
%description
KdeSudo is a graphical frontend for the sudo utility.
It allows you to run programs as another user by entering your password.
%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|%{tde_includedir}/tqt|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/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
%build
unset QTDIR || : ; source /etc/profile.d/qt.sh
export PATH="%{tde_bindir}:${PATH}"
export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
%configure \
--prefix=%{tde_prefix} \
--exec-prefix=%{tde_prefix} \
--bindir=%{tde_bindir} \
--disable-rpath \
--with-extra-includes=%{tde_includedir}/tqt
%__make %{?_smp_mflags}
%install
export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot}
## File lists
# HTML (1.0)
HTML_DIR=$(kde-config --expandvars --install html)
if [ -d %{buildroot}$HTML_DIR ]; then
for lang_dir in %{buildroot}$HTML_DIR/* ; do
if [ -d $lang_dir ]; then
lang=$(basename $lang_dir)
echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
# replace absolute symlinks with relative ones
pushd $lang_dir
for i in *; do
[ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
done
popd
fi
done
fi
%find_lang %{kdecomp}
%clean
%__rm -rf %{buildroot}
%files -f %{kdecomp}.lang
%defattr(-,root,root,-)
%{tde_bindir}/kdesudo
%{tde_tdedocdir}/HTML/en/kdesudo/
%Changelog
* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 2.5.1-2
- Rebuilt for Fedora 17
- Fix HTML directory location
- Removes post and postun
* Wed Nov 02 2011 Francois Andriot <francois.andriot@free.fr> - 2.5.1-1
- Initial release for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15

@ -1,67 +1,97 @@
# Default version for this component #
%define tde_pkg tdesudo # spec file for package tdesudo (version R14.0.0)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
#
# Please submit bugfixes or comments via http://www.trinitydesktop.org/
#
# TDE variables
%define tde_epoch 2
%define tde_version 14.0.0 %define tde_version 14.0.0
%define tde_pkg tdesudo
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %define tde_prefix /opt/trinity
%if "%{?tde_prefix}" != "/usr"
%define _variant .opt
%endif
# TDE specific building variables
%define tde_bindir %{tde_prefix}/bin %define tde_bindir %{tde_prefix}/bin
%define tde_datadir %{tde_prefix}/share %define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc %define tde_docdir %{tde_datadir}/doc
%define tde_includedir %{tde_prefix}/include %define tde_includedir %{tde_prefix}/include
%define tde_libdir %{tde_prefix}/%{_lib} %define tde_libdir %{tde_prefix}/%{_lib}
%define tde_mandir %{tde_datadir}/man %define tde_mandir %{tde_datadir}/man
%define tde_appdir %{tde_datadir}/applications %define tde_tdeappdir %{tde_datadir}/applications/tde
%define tde_tdeappdir %{tde_appdir}/tde
%define tde_tdedocdir %{tde_docdir}/tde %define tde_tdedocdir %{tde_docdir}/tde
%define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdeincludedir %{tde_includedir}/tde
%define tde_tdelibdir %{tde_libdir}/trinity %define tde_tdelibdir %{tde_libdir}/trinity
%define _docdir %{tde_docdir}
Name: trinity-%{tde_pkg} Name: trinity-%{tde_pkg}
Summary: sudo frontend for Trinity Epoch: %{tde_epoch}
Version: 2.5.1
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
Summary: Sudo frontend for Trinity
Group: Applications/Utilities
URL: http://www.trinitydesktop.org/
Version: 2.5.1 %if 0%{?suse_version}
Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant} License: GPL-2.0+
%else
License: GPLv2+ License: GPLv2+
Group: Applications/Utilities %endif
Vendor: Trinity Project #Vendor: Trinity Desktop
Packager: Francois Andriot <francois.andriot@free.fr> #Packager: Francois Andriot <francois.andriot@free.fr>
URL: http://www.trinitydesktop.org/
Prefix: %{_prefix} Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
BuildRequires: autoconf automake libtool m4
BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: fdupes
# SUSE desktop files utility
%if 0%{?suse_version}
BuildRequires: update-desktop-files
%endif
%if 0%{?opensuse_bs} && 0%{?suse_version}
# for xdg-menu script
BuildRequires: brp-check-trinity
%endif
Obsoletes: trinity-kdesudo < %{version}-%{release} Obsoletes: trinity-kdesudo < %{version}-%{release}
Provides: trinity-kdesudo = %{version}-%{release} Provides: trinity-kdesudo = %{version}-%{release}
Requires: sudo Requires: sudo
%description %description
TdeSudo is a graphical frontend for the sudo utility. TdeSudo is a graphical frontend for the sudo utility.
It allows you to run programs as another user by entering your password. It allows you to run programs as another user by entering your password.
%if 0%{?suse_version} || 0%{?pclinuxos} ##########
%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
%debug_package %debug_package
%endif %endif
##########
%prep %prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
@ -113,5 +143,5 @@ export PATH="%{tde_bindir}:${PATH}"
%changelog %changelog
* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2.5.1-6 * Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2:2.5.1-1
- Initial release for TDE 14.0.0 - Initial release for TDE 14.0.0

Loading…
Cancel
Save