RPM Packaging: massive update

pull/3/head
François Andriot 9 years ago
parent 6253ed4f81
commit 562049cd69

@ -33,7 +33,7 @@ extras: icons-nuvola kdevmon kdissert klamav klibido knoda kompose koverartist k
arts: tqtinterface trinity-filesystem esound cmake
$(call buildpkg,dependencies/arts)
avahi-tqt: tqtinterface autoconf automake libtool
avahi-tqt: tqtinterface autoconf automake libtool2
$(call buildpkg,dependencies/avahi-tqt)
dbus-1-tqt: tqtinterface cmake
@ -42,7 +42,7 @@ dbus-1-tqt: tqtinterface cmake
dbus-tqt: tqtinterface cmake
$(call buildpkg,dependencies/dbus-tqt)
libart_lgpl: tqtinterface libtool
libart_lgpl: tqtinterface libtool2
$(call buildpkg,dependencies/libart-lgpl)
libcaldav: tqtinterface autoconf libcurl
@ -85,7 +85,7 @@ tdeadmin: tdebase
tdeartwork: tdebase
$(call buildpkg,main/tdeartwork)
tdebase: tdelibs cmake htdig fileshareset libconfig
tdebase: tdelibs cmake htdig fileshareset
$(call buildpkg,main/tdebase)
tdebindings: tdebase tqscintilla
@ -174,23 +174,16 @@ endif
endif
endif
libconfig:
libcurl: automake libtool2
# Build on CentOS 5 only
ifneq ($(wildcard /boot/vmlinuz*.el5*),)
$(call buildpkg,3rdparty/libconfig)
endif
libcurl: automake libtool
# Build on CentOS 5 only
ifneq ($(wildcard /boot/vmlinuz*.el5*),)
ifneq ($(wildcard /boot/vmlinuz*.el4*),)
$(call buildpkg,3rdparty/curl)
endif
libtool: autoconf automake
libtool2: autoconf automake
# Build on CentOS 5 only
ifneq ($(wildcard /boot/vmlinuz*.el5*),)
$(call buildpkg,3rdparty/libtool)
$(call buildpkg,3rdparty/libtool2)
endif
lilypond: mftrace
@ -246,7 +239,7 @@ endif
### Extra packages
akode: tqtinterface
$(call buildpkg,extras/akode)
$(call buildpkg,dependencies/akode)
cmake-macros: cmake
ifneq ($(wildcard /etc/SuSE-release),)
@ -337,10 +330,16 @@ gwenview: tdebase
$(call buildpkg,applications/gwenview)
k3b: tdebase
# Do NOT build on CentOS 5 (No TDE HWLIB support)
ifeq ($(wildcard /boot/vmlinuz*.el5*),)
$(call buildpkg,applications/k3b)
endif
k9copy: tdebase k3b
# Do NOT build on CentOS 5 (No K3B)
ifeq ($(wildcard /boot/vmlinuz*.el5*),)
$(call buildpkg,applications/k9copy)
endif
kaffeine: tdebase
$(call buildpkg,applications/kaffeine)
@ -427,7 +426,9 @@ kile: tdebase
$(call buildpkg,applications/kile)
kima: tdebase
ifeq ($(wildcard /boot/vmlinuz*.el5*),)
$(call buildpkg,applications/kima)
endif
kiosktool: tdebase
$(call buildpkg,applications/kiosktool)
@ -553,8 +554,8 @@ potracegui: tdebase
$(call buildpkg,applications/potracegui)
qt4-tqt-theme-engine: tdebase
# Do NOT build on CentOS
ifeq ($(wildcard /etc/centos-release),)
# Do NOT build on CentOS 5, CentOS 6
ifeq ($(wildcard /boot/vmlinuz*.el5* /boot/vmlinuz*.el6*),)
$(call buildpkg,applications/qt4-tqt-theme-engine)
endif
@ -598,7 +599,10 @@ ifeq ($(wildcard /boot/vmlinuz*.el5* /boot/vmlinuz*.el6*),)
endif
tdepowersave: tdebase
# Do NOT build on CentOS 5
ifeq ($(wildcard /boot/vmlinuz*.el5*),)
$(call buildpkg,applications/tdepowersave)
endif
tderadio: tdebase
$(call buildpkg,applications/tderadio)
@ -641,7 +645,10 @@ gwenview-i18n: tdebase
$(call buildpkg,applications/gwenview-i18n)
k3b-i18n: tdebase
# Do NOT build on CentOS 5
ifeq ($(wildcard /boot/vmlinuz*.el5*),)
$(call buildpkg,applications/k3b-i18n)
endif
koffice-i18n: tdebase
$(call buildpkg,applications/koffice-i18n)
@ -676,7 +683,9 @@ klamav:
$(call buildpkg,extras/klamav)
klibido: pan
ifeq ($(wildcard /boot/vmlinuz*.el5*),)
$(call buildpkg,extras/klibido)
endif
knoda: hk_classes
$(call buildpkg,extras/knoda)
@ -694,7 +703,9 @@ mathemagics:
$(call buildpkg,extras/mathemagics)
pan:
ifeq ($(wildcard /boot/vmlinuz*.el5*),)
$(call buildpkg,3rdparty/pan)
endif
png2qrgb:
$(call buildpkg,extras/png2qrgb)

@ -23,6 +23,7 @@
%define tde_pkg basket
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
%define tde_confdir %{_sysconfdir}/trinity
%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
%define tde_includedir %{tde_prefix}/include
@ -107,6 +108,7 @@ baskets to HTML.
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export kde_confdir="%{tde_confdir}"
# Warning: --enable-final causes FTBFS
%configure \
@ -183,7 +185,7 @@ update-desktop-database %{tde_tdeappdir} -q &> /dev/null
%{tde_tdelibdir}/libbasketpart.so
%{tde_tdelibdir}/libkontact_basket.la
%{tde_tdelibdir}/libkontact_basket.so
%{tde_datadir}/config/magic/basket.magic
%{tde_confdir}/magic/basket.magic
%{tde_datadir}/icons/crystalsvg/*/*/*
%{tde_datadir}/mimelnk/application/x-basket-archive.desktop
%{tde_datadir}/mimelnk/application/x-basket-template.desktop

@ -1,208 +0,0 @@
#
# spec file for package basket (version R14)
#
# 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
%if "%{?tde_version}" == ""
%define tde_version 14.0.1
%endif
%define tde_pkg basket
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
%define tde_confdir %{_sysconfdir}/trinity
%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_tdeappdir %{tde_datadir}/applications/tde
%define tde_tdedocdir %{tde_docdir}/tde
%define tde_tdeincludedir %{tde_includedir}/tde
%define tde_tdelibdir %{tde_libdir}/trinity
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 1.0.3.1
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
Summary: Taking care of your ideas.
Group: Applications/Utilities
URL: http://www.trinitydesktop.org/
%if 0%{?suse_version}
License: GPL-2.0+
%else
License: GPLv2+
%endif
#Vendor: Trinity Desktop
#Packager: Francois Andriot <francois.andriot@free.fr>
Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: trinity-tdepim-devel >= %{tde_version}
BuildRequires: desktop-file-utils
BuildRequires: gpgme-devel
BuildRequires: autoconf automake libtool m4
BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: libtool
# 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
This application is mainly an all-purpose notes taker. It provide several baskets where
to drop every sort of items: text, rich text, links, images, sounds, files, colors,
application launcher... Objects can be edited, copied, dragged... So, you can arrange
them as you want ! This application can be used to quickly drop web objects (link, text,
images...) or notes, as well as to free your clutered desktop (if any). It is also useful
to collect informations for a report. Those data can be shared with co-workers by exporting
baskets to HTML.
##########
%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
%debug_package
%endif
##########
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%__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 QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export kde_confdir="%{tde_confdir}"
# Warning: --enable-final causes FTBFS
%configure \
--prefix=%{tde_prefix} \
--exec-prefix=%{tde_prefix} \
--bindir=%{tde_bindir} \
--includedir=%{tde_tdeincludedir} \
--libdir=%{tde_libdir} \
--datadir=%{tde_datadir} \
\
--disable-dependency-tracking \
--disable-debug \
--enable-new-ldflags \
--disable-final \
--enable-closure \
--enable-rpath \
--disable-gcc-hidden-visibility
%__make %{?_smp_mflags} || %__make
%install
export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot}
%find_lang %{tde_pkg}
# Updates applications categories for openSUSE
%if 0%{?suse_version}
%suse_update_desktop_file -G "Extended Clipboard" basket DesktopUtility
%endif
# Apps that should stay in TDE
echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop"
%clean
%__rm -rf %{buildroot}
%post
for f in crystalsvg ; do
touch --no-create %{tde_datadir}/icons/${f} || :
gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
done
/sbin/ldconfig
update-desktop-database %{tde_tdeappdir} -q &> /dev/null
%postun
for f in crystalsvg ; do
touch --no-create %{tde_datadir}/icons/${f} || :
gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
done
/sbin/ldconfig
update-desktop-database %{tde_tdeappdir} -q &> /dev/null
%files -f %{tde_pkg}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING
%{tde_bindir}/basket
%{tde_tdeappdir}/basket.desktop
%{tde_datadir}/apps/basket/
%dir %{tde_datadir}/apps/kontact/ksettingsdialog
%{tde_datadir}/apps/kontact/ksettingsdialog/kontact_basketplugin.setdlg
%{tde_libdir}/libbasketcommon.la
%{tde_libdir}/libbasketcommon.so
%{tde_tdelibdir}/basketthumbcreator.la
%{tde_tdelibdir}/basketthumbcreator.so
%{tde_tdelibdir}/kcm_basket.la
%{tde_tdelibdir}/kcm_basket.so
%{tde_tdelibdir}/libbasketpart.la
%{tde_tdelibdir}/libbasketpart.so
%{tde_tdelibdir}/libkontact_basket.la
%{tde_tdelibdir}/libkontact_basket.so
%{tde_confdir}/magic/basket.magic
%{tde_datadir}/icons/crystalsvg/*/*/*
%{tde_datadir}/mimelnk/application/x-basket-archive.desktop
%{tde_datadir}/mimelnk/application/x-basket-template.desktop
%{tde_datadir}/services/basket_config_apps.desktop
%{tde_datadir}/services/basket_config_baskets.desktop
#%{tde_datadir}/services/basket_config_features.desktop
%{tde_datadir}/services/basket_config_general.desktop
%{tde_datadir}/services/basket_config_new_notes.desktop
#%{tde_datadir}/services/basket_config_notes.desktop
%{tde_datadir}/services/basket_config_notes_appearance.desktop
%{tde_datadir}/services/basket_part.desktop
%{tde_datadir}/services/basketthumbcreator.desktop
%{tde_datadir}/services/kontact/basket.desktop
%{tde_datadir}/services/kontact/basket_v4.desktop
%{tde_tdedocdir}/HTML/en/basket/
%changelog
* Mon Jul 29 2013 Francois Andriot <francois.andriot@free.fr> - 2:1.0.3.1-1
- Initial release for TDE 14.0.0

@ -1,26 +0,0 @@
diff --git a/bibletime/backend/cswordbackend.cpp b/bibletime/backend/cswordbackend.cpp
index 1c218b3..dda6275 100644
--- a/bibletime/backend/cswordbackend.cpp
+++ b/bibletime/backend/cswordbackend.cpp
@@ -251,7 +251,7 @@ const bool CSwordBackend::shutdownModules() {
/** Returns true if the given option is enabled. */
const bool CSwordBackend::isOptionEnabled( const CSwordModuleInfo::FilterTypes type) {
- return (getGlobalOption( optionName(type).latin1() ) == "On");
+ return (strcmp(getGlobalOption( optionName(type).latin1() ), "On") == 0);
}
/** Sets the given options enabled or disabled depending on the second parameter. */
diff --git a/bibletime/frontend/cdragdropmgr.cpp b/bibletime/frontend/cdragdropmgr.cpp
index 52d012f..4f8c4fe 100644
--- a/bibletime/frontend/cdragdropmgr.cpp
+++ b/bibletime/frontend/cdragdropmgr.cpp
@@ -36,7 +36,7 @@ bool CDragDropMgr::BTDrag::canDecode( const TQMimeSource * mime ) {
};
bool CDragDropMgr::BTDrag::provides( const char* type ) const {
- return (type == "BibleTime/DND"); //return only true if the type is BibleTime/DND
+ return (strcmp(type, "BibleTime/DND") == 0); //return only true if the type is BibleTime/DND
};
const char* CDragDropMgr::BTDrag::format( int i ) const {

@ -55,7 +55,6 @@ Prefix: %{_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
Patch0: %{tde_pkg}-%{tde_version}.patch
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
@ -109,7 +108,6 @@ texts, write own notes, save, print etc.).
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%patch0 -p1 -b .rpmlint
%__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"

@ -1,185 +0,0 @@
#
# spec file for package bibletime (version R14)
#
# 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
%if "%{?tde_version}" == ""
%define tde_version 14.0.1
%endif
%define tde_pkg bibletime
%define tde_prefix /opt/trinity
%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_tdeappdir %{tde_datadir}/applications/tde
%define tde_tdedocdir %{tde_docdir}/tde
%define tde_tdeincludedir %{tde_includedir}/tde
%define tde_tdelibdir %{tde_libdir}/trinity
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 1.6.6.0
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
Summary: A bible study tool for Trinity
Group: Applications/Utilities
URL: http://www.trinitydesktop.org/
%if 0%{?suse_version}
License: GPL-2.0+
%else
License: GPLv2+
%endif
#Vendor: Trinity Desktop
#Packager: Francois Andriot <francois.andriot@free.fr>
Prefix: %{_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: autoconf automake libtool m4
BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: libtool
BuildRequires: desktop-file-utils
BuildRequires: gettext
# 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
# BOOST support
BuildRequires: boost-devel
# Requires: clucene
%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 6
BuildRequires: clucene-core-devel
%endif
%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: %{_lib}clucene-devel
%endif
# Requires: sword
BuildRequires: sword-devel
Requires: sword
%description
BibleTime is a free and easy to use bible study tool for UNIX systems.
It requires a working TDE environment and the SWORD library.
BibleTime provides easy handling of digitized texts (Bibles, commentaries
and lexicons) and powerful features to work with these texts (search in
texts, write own notes, save, print etc.).
##########
%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
%debug_package
%endif
##########
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%__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 QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
%configure \
--prefix=%{tde_prefix} \
--exec-prefix=%{tde_prefix} \
--bindir=%{tde_bindir} \
--libdir=%{tde_libdir} \
--datadir=%{tde_datadir} \
--includedir=%{tde_tdeincludedir} \
\
--disable-dependency-tracking \
--disable-debug \
--enable-new-ldflags \
--enable-final \
--enable-closure \
--enable-rpath \
--disable-gcc-hidden-visibility
# Not SMP safe !
%__make -C bibletime/frontend
# SMP safe !
%__make %{?_smp_mflags} || %__make
%install
export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot}
%__chmod 644 %{buildroot}%{tde_datadir}/apps/bibletime/pics/*
%__chmod 644 %{buildroot}%{tde_datadir}/apps/bibletime/bibletimeui.rc
%__chmod 644 %{buildroot}%{tde_datadir}/apps/bibletime/tips
echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_datadir}/applications/bibletime.desktop"
%clean
%__rm -rf %{buildroot}
%post
touch --no-create %{tde_datadir}/icons/hicolor || :
gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
update-desktop-database %{tde_datadir}/applications -q &> /dev/null
%postun
touch --no-create %{tde_datadir}/icons/hicolor || :
gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
update-desktop-database %{tde_datadir}/applications -q &> /dev/null
%files
%defattr(-,root,root,-)
%{tde_bindir}/bibletime
%{tde_tdeincludedir}/bibletimeinterface.h
%{tde_datadir}/applications/bibletime.desktop
%{tde_datadir}/apps/bibletime/
%{tde_datadir}/icons/hicolor/*/*/*.png
%{tde_tdedocdir}/HTML/en/bibletime/
%changelog
* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2:1.6.6.0-1
- Initial release for TDE 14.0.0

@ -115,6 +115,12 @@ Requires: cdrdao
BuildRequires: libudev-devel
%endif
# HAL support
%if 0%{?rhel} == 5
%define with_hal 1
BuildRequires: hal-devel
%endif
# DBUS support
# TQT bindings not available for RHEL4
%if 0%{?rhel} == 4
@ -474,7 +480,7 @@ fi
%{?with_libmad:--with-libmad} %{?!with_libmad:--without-libmad} \
--with-musepack \
--without-resmgr \
--without-hal
%{?with_hal:--with-hal} %{?!with_hal:--without-hal} \
# Strange behaviour on RHEL4 ...
%if 0%{?rhel} == 4

@ -1,29 +0,0 @@
--- trinity-k9copy-14.0.0~pre130+76443cbb/src/Makefile.am.ftbfs 2013-07-21 09:56:44.000000000 +0200
+++ trinity-k9copy-14.0.0~pre130+76443cbb/src/Makefile.am 2013-08-02 11:00:55.291717387 +0200
@@ -35,7 +35,7 @@
$(top_builddir)/k9author/libk9author.la $(top_builddir)/k9decmpeg/libk9decmpeg.la \
$(top_builddir)/k9devices/libk9devices.la $(top_builddir)/k9vamps/libk9vamps.la \
$(top_builddir)/libdvdnav/libk9dvdnav.la $(top_builddir)/libk9copy/libk9copy.la \
- $(LIB_TDEUI) -ltdemdi $(LIBDL) -ldvdread
+ $(LIB_TDEUI) -ltdemdi $(LIBDL) -ldvdread -lk3b -lk3bdevice
# this is where the desktop file will go
shelldesktopdir = $(kde_appsdir)/Utilities
--- trinity-k9copy-3.5.13.2/k9decmpeg/mpeg2_internal.h.ORI 2013-07-28 19:42:30.331485057 +0200
+++ trinity-k9copy-3.5.13.2/k9decmpeg/mpeg2_internal.h 2013-07-28 19:43:09.713519110 +0200
@@ -21,6 +21,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#ifndef __MPEG2_INTERNAL_H__
+#define __MPEG2_INTERNAL_H__
+
/* macroblock modes */
#define MACROBLOCK_INTRA 1
#define MACROBLOCK_PATTERN 2
@@ -298,3 +301,5 @@
extern mpeg2_mc_t mpeg2_mc_altivec;
extern mpeg2_mc_t mpeg2_mc_alpha;
extern mpeg2_mc_t mpeg2_mc_vis;
+
+#endif // __MPEG2_INTERNAL_H__

@ -56,7 +56,6 @@ Prefix: %{_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
Patch0: %{tde_pkg}-%{tde_version}.patch
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
@ -100,7 +99,6 @@ This is the Trinity version.
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%patch0 -p1 -b .ftbfs
# Removes internal dvdread headers
%__rm -rf dvdread

@ -1,177 +0,0 @@
#
# spec file for package k9copy (version R14)
#
# 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
%if "%{?tde_version}" == ""
%define tde_version 14.0.0
%endif
%define tde_pkg k9copy
%define tde_prefix /opt/trinity
%define tde_appdir %{tde_datadir}/applications
%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_tdeappdir %{tde_datadir}/applications/tde
%define tde_tdedocdir %{tde_docdir}/tde
%define tde_tdeincludedir %{tde_includedir}/tde
%define tde_tdelibdir %{tde_libdir}/trinity
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 1.2.3
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
Summary: DVD backup tool for Trinity
Group: Applications/Utilities
URL: http://www.trinitydesktop.org/
%if 0%{?suse_version}
License: GPL-2.0+
%else
License: GPLv2+
%endif
#Vendor: Trinity Desktop
#Packager: Francois Andriot <francois.andriot@free.fr>
Prefix: %{_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
BuildRequires: trinity-k3b-devel
BuildRequires: autoconf automake libtool m4
BuildRequires: gcc-c++
BuildRequires: pkgconfig
# 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
# Warning: the target distribution must have ffmpeg !
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.
##########
%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
%debug_package
%endif
##########
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
# Removes internal dvdread headers
%__rm -rf dvdread
%__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 QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
# FFMPEG ...
if [ -d /usr/include/ffmpeg ]; then
export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/include/ffmpeg"
fi
# NOTICE: --enable-final causes FTBFS !
%configure \
--prefix=%{tde_prefix} \
--exec-prefix=%{tde_prefix} \
--bindir=%{tde_bindir} \
--datadir=%{tde_datadir} \
--includedir=%{tde_tdeincludedir} \
\
--disable-dependency-tracking \
--disable-debug \
--disable-final \
--enable-new-ldflags \
--enable-closure \
--enable-rpath \
--disable-gcc-hidden-visibility \
\
--enable-k3bdevices
%__make %{?_smp_mflags} || %__make
%install
export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot}
%find_lang %{tde_pkg}
%clean
%__rm -rf %{buildroot}
%post
touch --no-create %{tde_datadir}/icons/hicolor || :
gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
update-desktop-database %{tde_appdir} &> /dev/null
%postun
touch --no-create %{tde_datadir}/icons/hicolor || :
gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
update-desktop-database %{tde_appdir} &> /dev/null
%files -f %{tde_pkg}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING
%{tde_bindir}/k9copy
%{tde_tdeappdir}/k9copy.desktop
%{tde_datadir}/apps/k9copy/
%{tde_datadir}/apps/konqueror/servicemenus/k9copy_open.desktop
%lang(en) %{tde_tdedocdir}/HTML/en/k9copy/
%{tde_datadir}/icons/hicolor/*/apps/k9copy.png
%changelog
* Mon Jul 29 2013 Francois Andriot <francois.andriot@free.fr> - 2:1.2.3-1
- Initial release for TDE 14.0.0

@ -82,12 +82,15 @@ BuildRequires: brp-check-trinity
%endif
# OPENLDAP support
%if 0%{?rhel} || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
BuildRequires: openldap-devel
%endif
%if 0%{?suse_version}
BuildRequires: openldap2-devel
%endif
%if 0%{?rhel} == 5
BuildRequires: openldap24-libs-devel
%endif
%description
@ -179,7 +182,12 @@ export PATH="%{tde_bindir}:${PATH}"
--enable-final \
--enable-closure \
--enable-rpath \
--disable-gcc-hidden-visibility
--disable-gcc-hidden-visibility \
\
%if 0%{?rhel} == 5
--with-extra-includes=/usr/include/openldap24 \
--with-extra-libs=/usr/lib/openldap24 \
%endif
%__make %{?_smp_mflags}

@ -78,12 +78,15 @@ BuildRequires: brp-check-trinity
%endif
# OPENLDAP support
%if 0%{?rhel} || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
BuildRequires: openldap-devel
%endif
%if 0%{?suse_version}
BuildRequires: openldap2-devel
%endif
%if 0%{?rhel} == 5
BuildRequires: openldap24-libs-devel
%endif
Requires: trinity-kcontrol-ldap-controller = %{?epoch:%{epoch}:}%{version}-%{release}
@ -156,7 +159,12 @@ export PATH="%{tde_bindir}:${PATH}"
--enable-final \
--enable-closure \
--enable-rpath \
--disable-gcc-hidden-visibility
--disable-gcc-hidden-visibility \
\
%if 0%{?rhel} == 5
--with-extra-includes=/usr/include/openldap24 \
--with-extra-libs=/usr/lib/openldap24 \
%endif
%__make %{?_smp_mflags}

@ -78,12 +78,15 @@ BuildRequires: brp-check-trinity
%endif
# OPENLDAP support
%if 0%{?rhel} || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
BuildRequires: openldap-devel
%endif
%if 0%{?suse_version}
BuildRequires: openldap2-devel
%endif
%if 0%{?rhel} == 5
BuildRequires: openldap24-libs-devel
%endif
Requires: trinity-kcontrol-ldap-manager = %{?epoch:%{epoch}:}%{version}-%{release}
@ -150,7 +153,12 @@ export PATH="%{tde_bindir}:${PATH}"
--enable-final \
--enable-closure \
--enable-rpath \
--disable-gcc-hidden-visibility
--disable-gcc-hidden-visibility \
\
%if 0%{?rhel} == 5
--with-extra-includes=/usr/include/openldap24 \
--with-extra-libs=/usr/lib/openldap24 \
%endif
%__make %{?_smp_mflags}

@ -78,12 +78,15 @@ BuildRequires: brp-check-trinity
%endif
# OPENLDAP support
%if 0%{?rhel} || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
BuildRequires: openldap-devel
%endif
%if 0%{?suse_version}
BuildRequires: openldap2-devel
%endif
%if 0%{?rhel} == 5
BuildRequires: openldap24-libs-devel
%endif
%description
@ -124,7 +127,12 @@ export PATH="%{tde_bindir}:${PATH}"
--enable-final \
--enable-closure \
--enable-rpath \
--disable-gcc-hidden-visibility
--disable-gcc-hidden-visibility \
\
%if 0%{?rhel} == 5
--with-extra-includes=/usr/include/openldap24 \
--with-extra-libs=/usr/lib/openldap24 \
%endif
%__make %{?_smp_mflags}

@ -1,13 +0,0 @@
diff --git a/src/gstplayer.cpp b/src/gstplayer.cpp
index c4bf580..0585ac9 100644
--- a/src/gstplayer.cpp
+++ b/src/gstplayer.cpp
@@ -750,7 +750,7 @@ void KGStreamerPlayer::seek (int val /*offset_in_deciseconds*/) {
void KGStreamerPlayer::volume (int val) {
//fprintf (stderr, "position %d\n", val);
if (gst_elm_play)
- g_object_set (G_OBJECT (gst_elm_play), "volume", 1.0*val/100, 0L);
+ g_object_set (G_OBJECT (gst_elm_play), "volume", 1.0*val/100, NULL);
}
void KGStreamerPlayer::updatePosition () {

@ -23,6 +23,7 @@
%define tde_pkg kmplayer
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
%define tde_confdir %{_sysconfdir}/trinity
%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
%define tde_includedir %{tde_prefix}/include
@ -56,7 +57,6 @@ Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
Patch0: %{tde_pkg}-14.0.0.patch
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
@ -214,7 +214,7 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%{tde_libdir}/libkmplayercommon.so
%{tde_bindir}/kgstplayer
%{tde_bindir}/kxineplayer
%{tde_datadir}/config/kmplayerrc
%{tde_confdir}/kmplayerrc
%{tde_datadir}/apps/kmplayer/bookmarks.xml
%{tde_datadir}/apps/kmplayer/noise.gif
%{tde_datadir}/icons/hicolor/*/apps/kmplayer.png
@ -268,7 +268,6 @@ Documention for KMPlayer, a basic audio/video viewer application for TDE.
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%patch0 -p1 -b .orig
%__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"
@ -279,6 +278,7 @@ Documention for KMPlayer, a basic audio/video viewer application for TDE.
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
export kde_confdir="%{tde_confdir}"
%configure \
--prefix=%{tde_prefix} \

@ -1,325 +0,0 @@
#
# spec file for package kmplayer (version R14)
#
# 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
%if "%{?tde_version}" == ""
%define tde_version 14.0.0
%endif
%define tde_pkg kmplayer
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
%define tde_confdir %{_sysconfdir}/trinity
%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_tdeappdir %{tde_datadir}/applications/tde
%define tde_tdedocdir %{tde_docdir}/tde
%define tde_tdeincludedir %{tde_includedir}/tde
%define tde_tdelibdir %{tde_libdir}/trinity
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 0.10.0c
Release: %{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist}%{?_variant}
Summary: Media player for Trinity
Group: Applications/Multimedia
URL: http://www.trinitydesktop.org/
#URL: http://kmplayer.kde.org
%if 0%{?suse_version}
License: GPL-2.0+
%else
License: GPLv2+
%endif
#Vendor: Trinity Desktop
#Packager: Francois Andriot <francois.andriot@free.fr>
Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
BuildRequires: autoconf automake libtool m4
BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: libtool
# 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
# DBUS support
%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version}
BuildRequires: trinity-dbus-tqt-devel >= %{tde_version}
%endif
# GSTREAMER support
%if 0%{?mgaversion} || 0%{?mdkversion}
%if 0%{?pclinuxos}
BuildRequires: libgstreamer0.10-devel
%else
BuildRequires: %{_lib}gstreamer0.10-devel
%endif
BuildRequires: %{_lib}gstreamer-plugins-base0.10-devel
%endif
%if 0%{?rhel} == 4
BuildRequires: gstreamer-devel
#BuildRequires: gstreamer-plugins-devel
%endif
%if 0%{?rhel} >= 5 || 0%{?fedora}
BuildRequires: gstreamer-devel
BuildRequires: gstreamer-plugins-base-devel
%endif
%if 0%{?suse_version}
BuildRequires: gstreamer-0_10-devel
BuildRequires: gstreamer-0_10-plugins-base-devel
%endif
# XINE support
%if 0%{?fedora} || 0%{?rhel} >= 4 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion}
%define with_xine 1
%if 0%{?mgaversion} || 0%{?mdkversion}
%if 0%{?pclinuxos}
BuildRequires: %{_lib}xine-devel
%else
BuildRequires: %{_lib}xine1.2-devel
%endif
%endif
%if 0%{?fedora} || 0%{?rhel}
BuildRequires: xine-lib-devel
%endif
%if 0%{?suse_version}
BuildRequires: libxine-devel
%endif
%endif
# X11 stuff
%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: libxt-devel
BuildRequires: libxv-devel
%endif
%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1210
BuildRequires: libXv-devel
%endif
%if 0%{?rhel} == 4
BuildRequires: xorg-x11-devel
%endif
%if 0%{?suse_version} == 1140
BuildRequires: xorg-x11-libXv-devel
%endif
# GTK2 stuff
BuildRequires: gtk2-devel
# DBUS stuff
%if 0%{?suse_version}
BuildRequires: dbus-1-glib-devel
%else
BuildRequires: dbus-glib-devel
%endif
Requires: %{name}-base = %{?epoch:%{epoch}:}%{version}-%{release}
%description
A basic audio/video viewer application for Trinity.
KMPlayer can:
* play DVD (DVDNav only with the Xine player)
* play VCD
* let the backend players play from a pipe (read from stdin)
* play from a TV device (experimental)
* show backend player's console output
* launch ffserver (only 0.4.8 works) when viewing from a v4l device
* DCOP KMediaPlayer interface support
* VDR viewer frontend (with *kxvplayer), configure VDR keys with standard TDE
shortcut configure window
* Lots of configurable shortcuts. Highly recommended for the VDR keys
(if you have VDR) and volume increase/decrease
%post
/sbin/ldconfig || :
%postun
/sbin/ldconfig || :
%files -f %{tde_pkg}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog INSTALL README TODO kmplayer.lsm
%{tde_bindir}/kmplayer
%{tde_bindir}/knpplayer
%{tde_bindir}/kxvplayer
%{tde_libdir}/libtdeinit_kmplayer.la
%{tde_libdir}/libtdeinit_kmplayer.so
%{tde_tdelibdir}/kmplayer.la
%{tde_tdelibdir}/kmplayer.so
%{tde_tdeappdir}/kmplayer.desktop
%exclude %{tde_datadir}/apps/kmplayer/bookmarks.xml
%exclude %{tde_datadir}/apps/kmplayer/kmplayerpartui.rc
%exclude %{tde_datadir}/apps/kmplayer/noise.gif
%exclude %{tde_datadir}/apps/kmplayer/pluginsinfo
%{tde_datadir}/apps/kmplayer/
##########
%package base
Group: Applications/Multimedia
Summary: Base files for KMPlayer [Trinity]
%description base
Core files needed for KMPlayer.
%post base
touch --no-create %{tde_datadir}/icons/hicolor || :
gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
/sbin/ldconfig || :
%postun base
touch --no-create %{tde_datadir}/icons/hicolor || :
gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
/sbin/ldconfig || :
%files base
%defattr(-,root,root,-)
%{tde_libdir}/libkmplayercommon.la
%{tde_libdir}/libkmplayercommon.so
%{tde_bindir}/kgstplayer
%{tde_bindir}/kxineplayer
%{tde_confdir}/kmplayerrc
%{tde_datadir}/apps/kmplayer/bookmarks.xml
%{tde_datadir}/apps/kmplayer/noise.gif
%{tde_datadir}/icons/hicolor/*/apps/kmplayer.png
%{tde_datadir}/icons/hicolor/*/apps/kmplayer.svgz
%{tde_datadir}/mimelnk/application/x-kmplayer.desktop
%{tde_datadir}/mimelnk/video/x-ms-wmp.desktop
##########
%package konq-plugins
Group: Applications/Multimedia
Requires: %{name}-base = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: trinity-konqueror >= %{tde_version}
Summary: KMPlayer plugin for KHTML/Konqueror [Trinity]
%description konq-plugins
This plugin enables audio/video playback inside konqueror, using Xine (with
*kxineplayer) or GStreamer (with *kgstplayer), such as movie trailers, web
tv or radio. It mimics QuickTime, MS Media Player and RealPlayer plugin
browser plugins.
%files konq-plugins
%defattr(-,root,root,-)
%{tde_tdelibdir}/libkmplayerpart.la
%{tde_tdelibdir}/libkmplayerpart.so
%{tde_datadir}/apps/kmplayer/kmplayerpartui.rc
%{tde_datadir}/apps/kmplayer/pluginsinfo
%{tde_datadir}/services/kmplayer_part.desktop
##########
%package doc
Group: Applications/Multimedia
Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
Summary: Handbook for KMPlayer [Trinity]
%description doc
Documention for KMPlayer, a basic audio/video viewer application for TDE.
%files doc
%defattr(-,root,root,-)
%{tde_tdedocdir}/HTML/*/kmplayer
##########
%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
%debug_package
%endif
##########
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%__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 QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
export kde_confdir="%{tde_confdir}"
%configure \
--prefix=%{tde_prefix} \
--exec-prefix=%{tde_prefix} \
--bindir=%{tde_bindir} \
--datadir=%{tde_datadir} \
--includedir=%{tde_tdeincludedir} \
--libdir=%{tde_libdir} \
--mandir=%{tde_mandir} \
\
--disable-dependency-tracking \
--disable-debug \
--enable-new-ldflags \
--enable-final \
--enable-closure \
--enable-rpath \
--disable-gcc-hidden-visibility
%__make %{?_smp_mflags} || %__make
%install
export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot}
%find_lang %{tde_pkg}
# Removes unwanted files
%__rm -f %{?buildroot}%{tde_datadir}/mimelnk/application/x-mplayer2.desktop
# Updates applications categories for openSUSE
%if 0%{?suse_version}
%suse_update_desktop_file -r "%{tde_pkg}" TDE AudioVideo Player Video
%endif
%clean
%__rm -rf %{buildroot}
%changelog
* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2:0.10.0c-1
- Initial release for TDE 14.0.0

@ -177,7 +177,6 @@ BuildRequires: libutempter-devel
# POPPLER support
%if 0%{?rhel} >=6 || 0%{?fedora} >= 15 || 0%{?suse_version}
BuildRequires: poppler-devel >= 0.12
#BuildRequires: poppler-qt-devel >= 0.12
%endif
%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: %{_lib}poppler-devel
@ -185,7 +184,6 @@ BuildRequires: %{_lib}poppler-devel
%if 0%{?rhel} >= 4 && 0%{?rhel} <= 5
# On RHEL 5, the distro-provided poppler is too old. We built a newer one.
BuildRequires: trinity-poppler-devel >= 0.12
BuildRequires: trinity-poppler-qt3-devel >= 0.12
%endif
# POSTGRESQL support
@ -1125,6 +1123,12 @@ RD=$(ruby -r rbconfig -e 'printf("%s",Config::CONFIG["rubyhdrdir"])')
export CXXFLAGS="${CXXFLAGS} -I${RD}/%_normalized_cpu-linux"
%endif
# FTBFS on RHEL 5
%if 0%{?rhel} == 5
%__sed -i "kexi/migration/keximigratetest.cpp" \
-e "/TDEApplication/ s|\");|\", true, true, true);|"
%endif
%configure \
--prefix=%{tde_prefix} \
--exec-prefix=%{tde_prefix} \

@ -1,13 +0,0 @@
diff --git a/plugins/upnp/upnpmcastsocket.cpp b/plugins/upnp/upnpmcastsocket.cpp
index 3b8be45..0172ed2 100644
--- a/plugins/upnp/upnpmcastsocket.cpp
+++ b/plugins/upnp/upnpmcastsocket.cpp
@@ -21,7 +21,7 @@
#include <kurl.h>
extern "C" {
#include <unistd.h>
- inline ssize_t mycread (int __fd, void *__buf, size_t __nbytes) { read(__fd, __buf, __nbytes); }
+ inline ssize_t mycread (int __fd, void *__buf, size_t __nbytes) { return read(__fd, __buf, __nbytes); }
};
#include <sys/socket.h>
#include <netinet/in.h>

@ -56,8 +56,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
Patch0: %{tde_pkg}-14.0.0.patch
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
@ -115,7 +113,6 @@ enabling background downloading.
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%patch0 -p1 -b .ftbfs
%__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"

@ -1,226 +0,0 @@
#
# spec file for package ktorrent (version R14)
#
# 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
%if "%{?tde_version}" == ""
%define tde_version 14.0.0
%endif
%define tde_pkg ktorrent
%define tde_prefix /opt/trinity
%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_tdeappdir %{tde_datadir}/applications/tde
%define tde_tdedocdir %{tde_docdir}/tde
%define tde_tdeincludedir %{tde_includedir}/tde
%define tde_tdelibdir %{tde_libdir}/trinity
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 2.2.8
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
Summary: BitTorrent client for Trinity
Group: Applications/Utilities
URL: http://ktorrent.org
%if 0%{?suse_version}
License: GPL-2.0+
%else
License: GPLv2+
%endif
#Vendor: Trinity Desktop
#Packager: Francois Andriot <francois.andriot@free.fr>
Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
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
# GMP support
BuildRequires: gmp-devel
# AVAHI support
# Disabled on RHEL4 and RHEL5
%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?suse_version}
%define with_avahi 1
BuildRequires: trinity-avahi-tqt-devel
Requires: trinity-avahi-tqt
%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: %{_lib}avahi-client-devel
Requires: %{_lib}avahi-client3
%else
BuildRequires: avahi-devel
Requires: avahi
%endif
%endif
%description
KTorrent is a BitTorrent program for Trinity. Its features include speed capping
(both down and up), integrated searching, UDP tracker support, preview of
certain file types (video and audio) and integration into the TDE Panel
enabling background downloading.
##########
%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
%debug_package
%endif
##########
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%__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 QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
%configure \
--prefix="%{tde_prefix}" \
--exec-prefix="%{tde_prefix}" \
--bindir="%{tde_bindir}" \
--datadir="%{tde_datadir}" \
--libdir="%{tde_libdir}" \
--mandir="%{tde_mandir}" \
--includedir="%{tde_tdeincludedir}" \
\
--disable-dependency-tracking \
--disable-debug \
--enable-final \
--enable-new-ldflags \
--enable-closure \
--enable-rpath \
--disable-gcc-hidden-visibility \
\
%{?!with_avahi:--without-avahi}
# Not SMP safe !
%__make
%install
export PATH="%{tde_bindir}:${PATH}"
%__rm -rf "%{buildroot}"
%__make install DESTDIR="%{buildroot}"
%find_lang %{tde_pkg}
# Unwanted files
%__rm -f "%{?buildroot}%{tde_libdir}/libktorrent.so"
%clean
%__rm -rf "%{buildroot}"
%post
update-desktop-database %{tde_tdeappdir} > /dev/null
touch --no-create %{tde_datadir}/icons/hicolor || :
gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
/sbin/ldconfig || :
%postun
update-desktop-database %{tde_tdeappdir} > /dev/null
touch --no-create %{tde_datadir}/icons/hicolor || :
gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
/sbin/ldconfig || :
%files -f %{tde_pkg}.lang
%defattr(-,root,root,-)
%{tde_bindir}/ktcachecheck
%{tde_bindir}/ktorrent
%{tde_bindir}/ktshell
%{tde_bindir}/kttorinfo
%{tde_bindir}/ktupnptest
%{tde_libdir}/libktorrent-%{version}.so
%{tde_libdir}/libktorrent.la
%{tde_tdelibdir}/ktinfowidgetplugin.la
%{tde_tdelibdir}/ktinfowidgetplugin.so
%{tde_tdelibdir}/ktipfilterplugin.la
%{tde_tdelibdir}/ktipfilterplugin.so
%{tde_tdelibdir}/ktlogviewerplugin.la
%{tde_tdelibdir}/ktlogviewerplugin.so
%{tde_tdelibdir}/ktpartfileimportplugin.la
%{tde_tdelibdir}/ktpartfileimportplugin.so
%{tde_tdelibdir}/ktrssfeedplugin.la
%{tde_tdelibdir}/ktrssfeedplugin.so
%{tde_tdelibdir}/ktscanfolderplugin.la
%{tde_tdelibdir}/ktscanfolderplugin.so
%{tde_tdelibdir}/ktschedulerplugin.la
%{tde_tdelibdir}/ktschedulerplugin.so
%{tde_tdelibdir}/ktsearchplugin.la
%{tde_tdelibdir}/ktsearchplugin.so
%{tde_tdelibdir}/ktstatsplugin.la
%{tde_tdelibdir}/ktstatsplugin.so
%{tde_tdelibdir}/ktupnpplugin.la
%{tde_tdelibdir}/ktupnpplugin.so
%{tde_tdelibdir}/ktwebinterfaceplugin.la
%{tde_tdelibdir}/ktwebinterfaceplugin.so
%{tde_tdeappdir}/ktorrent.desktop
%{tde_datadir}/apps/ktorrent/
%{tde_datadir}/config.kcfg/*.kcfg
%{tde_datadir}/icons/hicolor/*/*/*.png
%{tde_datadir}/icons/hicolor/*/*/*.svgz
%{tde_datadir}/services/*.desktop
%{tde_datadir}/servicetypes/ktorrentplugin.desktop
%{tde_tdedocdir}/HTML/en/ktorrent/
%if 0%{?with_avahi}
%{tde_tdelibdir}/ktzeroconfplugin.la
%{tde_tdelibdir}/ktzeroconfplugin.so
%endif
%changelog
* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2:2.2.8-1
- Initial release for TDE 14.0.0

@ -130,6 +130,13 @@ with the K Desktop Environment version 3.
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
# FTBFS on RHEL 5
%if 0%{?rhel} == 5
%__sed -i "admin/acinclude.m4.in" \
-i "src/kvilib/tal/kvi_tal_application.cpp" \
-e "/TDEApplication/ s|\")|\", true, true, true)|";
%endif
%__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"

@ -120,6 +120,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
# Warning: --enable-final causes FTBFS
# Warning: RHEL5 FTBFS: https://bugzilla.redhat.com/show_bug.cgi?id=499837
%configure \
--prefix=%{tde_prefix} \
--exec-prefix=%{tde_prefix} \
@ -135,7 +136,10 @@ export PATH="%{tde_bindir}:${PATH}"
--enable-new-ldflags \
--enable-closure \
--enable-rpath \
--disable-gcc-hidden-visibility
--disable-gcc-hidden-visibility \
%if 0%{?rhel} == 5
--disable-libreadline \
%endif
%__make %{?_smp_mflags}

@ -1,10 +0,0 @@
diff --git a/systemsettings/tdecmodulemenu.cpp b/systemsettings/tdecmodulemenu.cpp
index 56c1220..d8f84ce 100644
--- a/systemsettings/tdecmodulemenu.cpp
+++ b/systemsettings/tdecmodulemenu.cpp
@@ -185,4 +185,5 @@ TQString TDECModuleMenu::deriveCaptionFromPath( const TQString &menuPath )
return result;
}
}
+ return result;
}

@ -23,6 +23,7 @@
%define tde_pkg tde-systemsettings
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
%define tde_confdir %{_sysconfdir}/trinity
%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
%define tde_includedir %{tde_prefix}/include
@ -57,8 +58,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
Source1: kde-settings-laptops.directory
Patch0: %{tde_pkg}-14.0.0.patch
Provides: trinity-kde-systemsettings = %{?epoch:%{epoch}:}%{version}-%{release}
@ -102,7 +101,6 @@ Control Centre with an improved user interface.
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%patch0 -p1
%__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"
@ -112,6 +110,7 @@ Control Centre with an improved user interface.
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export kde_confdir="%{tde_confdir}"
%configure \
@ -184,7 +183,7 @@ update-desktop-database %{tde_tdeappdir} -q &> /dev/null
%{tde_datadir}/applications/tde/medianotifications.desktop
%{tde_datadir}/applications/tde/systemsettings.desktop
%{tde_datadir}/apps/systemsettings/
%{tde_datadir}/config/systemsettingsrc
%{tde_confdir}/systemsettingsrc
%{tde_datadir}/desktop-directories/*.directory
%{tde_datadir}/icons/crystalsvg/*/apps/systemsettings.png
%{tde_tdedocdir}/HTML/en/systemsettings/

@ -1,194 +0,0 @@
#
# spec file for package tde-systemsettings (version R14)
#
# 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
%if "%{?tde_version}" == ""
%define tde_version 14.0.0
%endif
%define tde_pkg tde-systemsettings
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
%define tde_confdir %{_sysconfdir}/trinity
%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_sysconfdir %{_sysconfdir}/trinity
%define tde_tdeappdir %{tde_datadir}/applications/tde
%define tde_tdedocdir %{tde_docdir}/tde
%define tde_tdeincludedir %{tde_includedir}/tde
%define tde_tdelibdir %{tde_libdir}/trinity
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 0.0svn20070312
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
Summary: Easy to use control centre for TDE
Group: Applications/Utilities
URL: http://www.trinitydesktop.org
%if 0%{?suse_version}
License: GPL-2.0+
%else
License: GPLv2+
%endif
#Vendor: Trinity Desktop
#Packager: Francois Andriot <francois.andriot@free.fr>
Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
Source1: kde-settings-laptops.directory
Provides: trinity-kde-systemsettings = %{?epoch:%{epoch}:}%{version}-%{release}
Obsoletes: trinity-kde-systemsettings < %{?epoch:%{epoch}:}%{version}-%{release}
Provides: trinity-systemsettings = %{?epoch:%{epoch}:}%{version}-%{release}
Obsoletes: trinity-systemsettings < %{?epoch:%{epoch}:}%{version}-%{release}
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
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
Requires: trinity-guidance
%description
System preferences is a replacement for the TDE
Control Centre with an improved user interface.
##########
%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
%debug_package
%endif
##########
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%__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 QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export kde_confdir="%{tde_confdir}"
%configure \
--prefix=%{tde_prefix} \
--exec-prefix=%{tde_prefix} \
--bindir=%{tde_bindir} \
--datadir=%{tde_datadir} \
--includedir=%{tde_tdeincludedir} \
--sysconfdir=%{tde_sysconfdir} \
\
--disable-dependency-tracking \
--disable-debug \
--enable-final \
--enable-new-ldflags \
--enable-closure \
--enable-rpath \
--disable-gcc-hidden-visibility
%__make %{?_smp_mflags}
%install
export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot}
%__install -D -m 644 %{SOURCE1} %{buildroot}%{tde_datadir}/desktop-directories/tde-settings-laptops.directory
# Unwanted files
%__rm -f %{buildroot}%{tde_datadir}/applications/tde/kcmfontinst.desktop
%__rm -f %{buildroot}%{tde_datadir}/desktop-directories/tde-settings-power.directory
%__rm -f %{buildroot}%{tde_datadir}/desktop-directories/tde-settings-system.directory
%__rm -f %{buildroot}%{tde_datadir}/applications/tde/laptop.desktop
echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/audioencoding.desktop"
echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/defaultapplication.desktop"
echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/kcm_knetworkconfmodule_ss.desktop"
echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/medianotifications.desktop"
echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/systemsettings.desktop"
%clean
%__rm -rf %{buildroot}
%post
touch --no-create %{tde_datadir}/icons/crystalsvg || :
gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
update-desktop-database %{tde_tdeappdir} -q &> /dev/null
%postun
touch --no-create %{tde_datadir}/icons/crystalsvg || :
gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
update-desktop-database %{tde_tdeappdir} -q &> /dev/null
%files
%defattr(-,root,root,-)
%doc README TODO
%dir %{tde_sysconfdir}/xdg
%dir %{tde_sysconfdir}/xdg/menus
%dir %{tde_sysconfdir}/xdg/menus/applications-merged
%{tde_sysconfdir}/xdg/menus/applications-merged/tde-system-settings-merge.menu
%{tde_sysconfdir}/xdg/menus/tde-system-settings.menu
%{tde_bindir}/systemsettings
%{tde_datadir}/applications/tde/audioencoding.desktop
%{tde_datadir}/applications/tde/defaultapplication.desktop
%{tde_datadir}/applications/tde/kcm_knetworkconfmodule_ss.desktop
#%{tde_datadir}/applications/tde/laptop.desktop
%{tde_datadir}/applications/tde/medianotifications.desktop
%{tde_datadir}/applications/tde/systemsettings.desktop
%{tde_datadir}/apps/systemsettings/
%{tde_confdir}/systemsettingsrc
%{tde_datadir}/desktop-directories/*.directory
%{tde_datadir}/icons/crystalsvg/*/apps/systemsettings.png
%{tde_tdedocdir}/HTML/en/systemsettings/
%changelog
* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2:0.0svn20070312-1
- Initial release for TDE 14.0.0

@ -1,13 +0,0 @@
diff --git a/src/watools.cpp b/src/watools.cpp
index 5814274..252c791 100644
--- a/src/watools.cpp
+++ b/src/watools.cpp
@@ -192,6 +192,8 @@ int WATools::availableNetworks( const char* _ifname ) //returns a list of availa
i++;
} while (scan = scan->next);
printf( "WATools: Networks found: %i\n", i );
+
+ return i;
}

@ -55,7 +55,6 @@ Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
Patch0: %{tde_pkg}-14.0.0.patch
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
@ -121,7 +120,6 @@ remembered so next time the user won't have to enter them again.
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%patch0 -p1
%build

@ -1,206 +0,0 @@
#
# spec file for package wlassistant (version R14)
#
# 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
%if "%{?tde_version}" == ""
%define tde_version 14.0.0
%endif
%define tde_pkg wlassistant
%define tde_prefix /opt/trinity
%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_tdeappdir %{tde_datadir}/applications/tde
%define tde_tdedocdir %{tde_docdir}/tde
%define tde_tdeincludedir %{tde_includedir}/tde
%define tde_tdelibdir %{tde_libdir}/trinity
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 0.5.7
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
Summary: User friendly TDE frontend for wireless network connection
Group: Applications/Utilities
URL: http://wlassistant.sourceforge.net/
%if 0%{?suse_version}
License: GPL-2.0+
%else
License: GPLv2+
%endif
#Vendor: Trinity Desktop
#Packager: Francois Andriot <francois.andriot@free.fr>
Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
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
# Wireless support
%if 0%{?fedora} >= 6 || 0%{?rhel} >= 5
BuildRequires: wireless-tools-devel
%endif
%if 0%{?mgaversion} == 2 || 0%{?mdkversion}
BuildRequires: %{_lib}iw29-devel
%endif
%if 0%{?rhel} == 5 || 0%{?suse_version}
BuildRequires: wireless-tools
%endif
%if 0%{?suse_version} || 0%{?mgaversion} >= 3
BuildRequires: libiw-devel
%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
# PYTHON support
BuildRequires: python
%description
Wireless Assistant scans for wireless access points and displays link quality,
encryption and other useful information. When user wants to connect to a
network, Wireless Assistant opens up its wizards and guides the user through
Wi-Fi settings. After a successful connection is made the settings are
remembered so next time the user won't have to enter them again.
##########
%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
%debug_package
%endif
##########
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
# Shitty hack for RHEL4 ...
if [ -d "/usr/X11R6" ]; then
export CMAKE_INCLUDE_PATH="${CMAKE_INCLUDE_PATH}:/usr/X11R6/include:/usr/X11R6/%{_lib}"
export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
fi
if ! rpm -E %%cmake|grep -q "cd build"; then
%__mkdir_p build
cd build
fi
%cmake \
-DCMAKE_BUILD_TYPE="RelWithDebInfo" \
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_SKIP_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
\
-DBIN_INSTALL_DIR=%{tde_bindir} \
-DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-DLIB_INSTALL_DIR=%{tde_libdir} \
-DSHARE_INSTALL_PREFIX=%{tde_datadir} \
\
-DBUILD_ALL=on \
..
%__make %{?_smp_mflags}
%install
export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot} -C build
# Updates applications categories for openSUSE
%if 0%{?suse_version}
%suse_update_desktop_file -i -r "%{?buildroot}%{tde_tdeappdir}/wlassistant.desktop" System Network
%endif
%clean
%__rm -rf %{buildroot}
%post
touch --no-create %{tde_datadir}/icons/hicolor || :
gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%postun
touch --no-create %{tde_datadir}/icons/hicolor || :
gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%files
%defattr(-,root,root,-)
%doc ChangeLog VERSION
%{tde_bindir}/wlassistant
%{tde_tdeappdir}/wlassistant.desktop
%{tde_datadir}/icons/hicolor/16x16/apps/wlassistant.png
%{tde_datadir}/icons/hicolor/32x32/apps/wlassistant.png
%lang(ar) %{tde_datadir}/locale/ar/LC_MESSAGES/wlassistant.mo
%lang(ca) %{tde_datadir}/locale/ca/LC_MESSAGES/wlassistant.mo
%lang(es) %{tde_datadir}/locale/es/LC_MESSAGES/wlassistant.mo
%lang(fr) %{tde_datadir}/locale/fr/LC_MESSAGES/wlassistant.mo
%lang(nb) %{tde_datadir}/locale/nb/LC_MESSAGES/wlassistant.mo
%lang(pl) %{tde_datadir}/locale/pl/LC_MESSAGES/wlassistant.mo
%lang(pt) %{tde_datadir}/locale/pt_BR/LC_MESSAGES/wlassistant.mo
%lang(sv) %{tde_datadir}/locale/sv/LC_MESSAGES/wlassistant.mo
%lang(zh_CN) %{tde_datadir}/locale/zh_CN/LC_MESSAGES/wlassistant.mo
%lang(zh_TW) %{tde_datadir}/locale/zh_TW/LC_MESSAGES/wlassistant.mo
%changelog
* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2:0.5.7-1
- Initial release for TDE 14.0.0

@ -60,6 +60,13 @@ if [ -r "${TEMPDIR}/one.patch" ]; then
-e "/%setup/ s/$/\n%patch389 -p1/"
fi
# 3. PCLinuxOS hack ...
if [ -r "/etc/pclinuxos-release" ]; then
sed -i "${TEMPDIR}/${SPECFILE##*/}" \
-e "/admin\/Makefile.common/ s|$| \|\| autoreconf -i \&\& make -f admin/Makefile.common|" \
|| exit 1
fi
[ -d "${BUILDDIR}" ] || mkdir -p "${BUILDDIR}"
RPMDIR="$(rpm -E %{_rpmdir}.tde-${TDE_VERSION})"

@ -26,7 +26,7 @@ case "${PKGNAME}" in
# 3rd party dependencies
"esound"|"fileshareset"|"hk_classes"|"python-qt3") PREFIX="";;
# Extra build stuff
"autoconf"|"automake"|"cmake"|"gnuchess"|"htdig"|"imlib1"|"libconfig"|"libotr3"|"libtool"|"lilypond"|"m4"|"mftrace"|"pan"|"pcsc-perl"|"torsocks"|"wv2") PREFIX="";;
"autoconf"|"automake"|"cmake"|"gnuchess"|"htdig"|"imlib1"|"libconfig"|"libotr3"|"libtool2"|"lilypond"|"m4"|"mftrace"|"pan"|"pcsc-perl"|"torsocks"|"wv2") PREFIX="";;
# Other
"curl") PREFIX="trinity-lib";;
# Default case: add prefix

@ -41,6 +41,12 @@
%define _variant .opt
%endif
%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
%define libakode %{_lib}akode
%else
%define libakode libakode
%endif
Name: trinity-akode
Summary: Audio-decoding framework
Group: System Environment/Libraries
@ -48,24 +54,31 @@ Epoch: %{tde_epoch}
Version: 2.0.2
Release: 1%{?dist}%{?_variant}
URL: http://www.kde-apps.org/content/show.php?content=30375
License: LGPLv2+
#URL: http://carewolf.com/akode/
%if 0%{?suse_version}
License: GPL-2.0+
%else
License: GPLv2+
%endif
Source0: akode-%{tde_version}.tar.gz
Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: cmake >= 2.8
BuildRequires: gcc-c++
BuildRequires: libtool
# TQT support
BuildRequires: libtqt4-devel
BuildRequires: trinity-filesystem >= %{tde_version}
# FLAC support
%define _with_flac --with-flac
%if 0%{?mgaversion} || 0%{?mdkversion}
%if 0%{?pclinuxos}
BuildRequires: libflac-devel
%else
BuildRequires: %{_lib}flac-devel
%endif
%endif
%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
BuildRequires: flac-devel
@ -75,7 +88,7 @@ BuildRequires: flac-devel
%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
%define _with_jack --with-jack
%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: %{_lib}jack-devel
BuildRequires: libjack-devel
%endif
%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
BuildRequires: jack-audio-connection-kit-devel
@ -88,12 +101,11 @@ BuildRequires: jack-audio-connection-kit-devel
BuildRequires: libsamplerate-devel
%endif
%if 0
# PULSEAUDIO support
%if 0%{?fedora} >= 15 || 0%{?rhel} >= 6 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
%define _with_pulseaudio --with-pulseaudio
%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: %{_lib}pulseaudio-devel
BuildRequires: libpulseaudio-devel
%endif
%if 0%{?rhel} || 0%{?fedora}
BuildRequires: pulseaudio-libs-devel
@ -102,21 +114,13 @@ BuildRequires: pulseaudio-libs-devel
BuildRequires: pulseaudio-devel
%endif
%endif
%endif
# MAD support
%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel}
%define _with_libmad --with-libmad
%if 0%{?mdkversion} || 0%{?mgaversion}
BuildRequires: %{_lib}mad-devel
%endif
%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel}
BuildRequires: libmad-devel
%endif
%endif
BuildRequires: cmake >= 2.8
BuildRequires: libtool
BuildRequires: alsa-lib-devel
BuildRequires: libvorbis-devel
BuildRequires: speex-devel
@ -162,14 +166,15 @@ aKode also has the following audio outputs:
Summary: Headers for developing programs that will use %{name}
Group: Development/Libraries
Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
%{?_with_jack:Requires: %{name}-jack = %{?epoch:%{epoch}:}%{version}-%{release}}
%{?_with_pulseaudio:Requires: %{name}-pulseaudio = %{?epoch:%{epoch}:}%{version}-%{release}}
%{?_with_libsamplerate:Requires: %{name}-libsamplerate = %{?epoch:%{epoch}:}%{version}-%{release}}
%{?_with_libmad:Requires: %{name}-libmad = %{?epoch:%{epoch}:}%{version}-%{release}}
%{?_with_jack:Requires: %{libakode}_jack_sink = %{?epoch:%{epoch}:}%{version}-%{release}}
%{?_with_pulseaudio:Requires: %{libakode}_polyp_sink = %{?epoch:%{epoch}:}%{version}-%{release}}
%{?_with_libsamplerate:Requires: %{libakode}_src_resampler = %{?epoch:%{epoch}:}%{version}-%{release}}
%{?_with_libmad:Requires: %{libakode}_mpeg_decoder = %{?epoch:%{epoch}:}%{version}-%{release}}
Requires: pkgconfig
%description devel
This package contains the development files for Akode.
It is needed if you intend to build an application linked against Akode.
%files devel
%defattr(-,root,root,-)
@ -177,7 +182,7 @@ This package contains the development files for Akode.
%{_includedir}/*
%{_libdir}/libakode.la
%{_libdir}/libakode.so
#%{_libdir}/pkgconfig/*.pc
%{_libdir}/pkgconfig/akode.pc
%post devel
/sbin/ldconfig
@ -189,23 +194,24 @@ This package contains the development files for Akode.
%if "%{?_with_jack}" != ""
%package jack
%package -n %{libakode}_jack_sink
Summary: Jack audio output backend for %{name}
Group: Development/Libraries
Provides: libakode_jack_sink = %{version}-%{release}
Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
%description jack
%description -n %{libakode}_jack_sink
This package contains the Jack audio output backend for Akode.
%files jack
%files -n %{libakode}_jack_sink
%defattr(-,root,root,-)
%{_libdir}/libakode_jack_sink.la
%{_libdir}/libakode_jack_sink.so
%post jack
%post -n %{libakode}_jack_sink
/sbin/ldconfig
%postun jack
%postun -n %{libakode}_jack_sink
/sbin/ldconfig
%endif
@ -214,24 +220,25 @@ This package contains the Jack audio output backend for Akode.
%if "%{?_with_pulseaudio}" != ""
%package pulseaudio
%package -n %{libakode}_polyp_sink
Summary: Pulseaudio output backend for %{name}
Group: Development/Libraries
Provides: libakode_polyp_sink = %{version}-%{release}
Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
%description pulseaudio
%description -n %{libakode}_polyp_sink
This package contains the pulseaudio backend for Akode.
Recommended for network transparent audio.
%files pulseaudio
%files -n %{libakode}_polyp_sink
%defattr(-,root,root,-)
%{_libdir}/libakode_polyp_sink.la
%{_libdir}/libakode_polyp_sink.so
%post pulseaudio
%post -n %{libakode}_polyp_sink
/sbin/ldconfig
%postun pulseaudio
%postun -n %{libakode}_polyp_sink
/sbin/ldconfig
%endif
@ -241,25 +248,24 @@ Recommended for network transparent audio.
# Packaged separately to keep main/core %{akode} package LGPL-clean.
%if "%{?_with_libsamplerate:1}" == "1"
%package libsamplerate
%package -n %{libakode}_src_resampler
Summary: Resampler based on libsamplerate for %{name}
Group: Development/Libraries
License: GPLv2+
Provides: libakode_src_resampler = %{version}-%{release}
Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
%description libsamplerate
%description -n %{libakode}_src_resampler
This package contains the samplerate decoder for Akode.
# License: GPLv2+
%files libsamplerate
%files -n %{libakode}_src_resampler
%defattr(-,root,root,-)
%{_libdir}/libakode_src_resampler.la
%{_libdir}/libakode_src_resampler.so
%post libsamplerate
%post -n %{libakode}_src_resampler
/sbin/ldconfig
%postun libsamplerate
%postun -n %{libakode}_src_resampler
/sbin/ldconfig
%endif
@ -268,22 +274,24 @@ This package contains the samplerate decoder for Akode.
%if "%{?_with_libmad}" != ""
%package libmad
%package -n %{libakode}_mpeg_decoder
Summary: Decoder based on libmad for %{name}
Group: Development/Libraries
Provides: libakode_mpeg_decoder = %{version}-%{release}
Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
%description libmad
%description -n %{libakode}_mpeg_decoder
This package contains the mad decoder for Akode.
%files libmad
%files -n %{libakode}_mpeg_decoder
%defattr(-,root,root,-)
%{_libdir}/libakode_mpeg_decoder.la
%{_libdir}/libakode_mpeg_decoder.so
%post libmad
%post -n %{libakode}_mpeg_decoder
/sbin/ldconfig
%postun libmad
%postun -n %{libakode}_mpeg_decoder
/sbin/ldconfig
%endif
@ -297,7 +305,7 @@ This package contains the mad decoder for Akode.
##########
%prep
%setup -q -n akode
%setup -q -n akode-2.0.2
%build
@ -323,7 +331,7 @@ fi
-DWITH_LIBLTDL="OFF" \
-DWITH_ALSA_SINK="ON" \
%{!?_with_jack:-DWITH_JACK_SINK="OFF"} %{?_with_jack:-DWITH_JACK_SINK="ON"} \
%{!?_with_pulseaudio:-DWITH_POLYP_SINK="OFF"} %{?_with_pulseaudio:-DWITH_POLYP_SINK="ON"} \
%{!?_with_pulseaudio:-DWITH_PULSE_SINK="OFF"} %{?_with_pulseaudio:-DWITH_PULSE_SINK="ON"} \
-DWITH_OSS_SINK="ON" \
-DWITH_SUN_SINK="OFF" \
\
@ -337,21 +345,10 @@ fi
%__make %{?_smp_mflags} || %__make
# %{?_with_flac} %{!?_with_flac:--without-flac} \
# %{?_with_libsamplerate} %{!?_with_libsamplerate:--without-libsamplerate} \
# --with-speex \
# --with-vorbis \
# --without-ffmpeg \
# %{?_with_libmad} %{!?_with_libmad:--without-libmad}
%install
%__rm -rf %{buildroot}
%__make install DESTDIR=%{?buildroot} -C build
# unpackaged files
#%__rm -f %{buildroot}%{tde_libdir}/*.a
# rpmdocs
for file in AUTHORS COPYING NEWS README TODO ; do
test -s "$file" && install -p -m644 -D "$file" "rpmdocs/$file"

@ -21,7 +21,9 @@
# TDE variables
%define tde_epoch 1
%if "%{?tde_version}" == ""
%define tde_version 3.5.13.2
%endif
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
%define tde_datadir %{tde_prefix}/share
@ -46,24 +48,32 @@ Epoch: %{tde_epoch}
Version: 2.0.2
Release: 1%{?dist}%{?_variant}
URL: http://www.kde-apps.org/content/show.php?content=30375
License: LGPLv2+
#URL: http://carewolf.com/akode/
%if 0%{?suse_version}
License: GPL-2.0+
%else
License: GPLv2+
%endif
Source0: akode-%{tde_version}.tar.gz
Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: gcc-c++
BuildRequires: libtool
# TQT support
BuildRequires: libtqt4-devel
BuildRequires: trinity-filesystem >= %{tde_version}
# FLAC support
%define _with_flac --with-flac
%if 0%{?mgaversion} || 0%{?mdkversion}
%if 0%{?pclinuxos}
BuildRequires: libflac-devel
%else
BuildRequires: %{_lib}flac-devel
%endif
%endif
%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
BuildRequires: flac-devel
@ -73,7 +83,7 @@ BuildRequires: flac-devel
%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
%define _with_jack --with-jack
%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: %{_lib}jack-devel
BuildRequires: libjack-devel
%endif
%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
BuildRequires: jack-audio-connection-kit-devel
@ -90,7 +100,7 @@ BuildRequires: libsamplerate-devel
%if 0%{?fedora} >= 15 || 0%{?rhel} >= 6 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
%define _with_pulseaudio --with-pulseaudio
%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: %{_lib}pulseaudio-devel
BuildRequires: libpulseaudio-devel
%endif
%if 0%{?rhel} || 0%{?fedora}
BuildRequires: pulseaudio-libs-devel
@ -103,16 +113,9 @@ BuildRequires: pulseaudio-devel
# MAD support
%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel}
%define _with_libmad --with-libmad
%if 0%{?mdkversion} || 0%{?mgaversion}
BuildRequires: %{_lib}mad-devel
%endif
%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel}
BuildRequires: libmad-devel
%endif
%endif
BuildRequires: automake libtool
BuildRequires: alsa-lib-devel
BuildRequires: libvorbis-devel
BuildRequires: speex-devel
@ -166,6 +169,7 @@ Requires: pkgconfig
%description devel
This package contains the development files for Akode.
It is needed if you intend to build an application linked against Akode.
%files devel
%defattr(-,root,root,-)
@ -240,13 +244,11 @@ Recommended for network transparent audio.
%package libsamplerate
Summary: Resampler based on libsamplerate for %{name}
Group: Development/Libraries
License: GPLv2+
Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
%description libsamplerate
This package contains the samplerate decoder for Akode.
# License: GPLv2+
%files libsamplerate
%defattr(-,root,root,-)
%{tde_libdir}/libakode_src_resampler.la
@ -273,6 +275,7 @@ Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
This package contains the mad decoder for Akode.
%files libmad
%defattr(-,root,root,-)
%{tde_libdir}/libakode_mpeg_decoder.la
%{tde_libdir}/libakode_mpeg_decoder.so
@ -301,6 +304,7 @@ This package contains the mad decoder for Akode.
%build
unset QTDIR QTINC QTLIB
export CXXFLAGS="${RPM_OPT_FLAGS} -DHAVE_STDINT_H"
%configure \
@ -328,12 +332,12 @@ export CXXFLAGS="${RPM_OPT_FLAGS} -DHAVE_STDINT_H"
--without-ffmpeg \
%{?_with_libmad} %{!?_with_libmad:--without-libmad}
%__make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool
%__make %{?_smp_mflags} || %__make
%install
%__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot}
%__make install DESTDIR=%{?buildroot}
# unpackaged files
%__rm -f %{buildroot}%{tde_libdir}/*.a

@ -27,6 +27,7 @@
%define tde_pkg arts
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
%define tde_confdir %{_sysconfdir}/trinity
%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
%define tde_includedir %{tde_prefix}/include
@ -233,7 +234,7 @@ intended for systems running the Pulseaudio server.
%files config-pulseaudio
%defattr(-,root,root,-)
%{tde_datadir}/config/kcmartsrc
%{tde_confdir}/kcmartsrc
%endif
@ -295,13 +296,14 @@ fi
# Installs the Pulseaudio configuration file
%if 0%{?with_pulseaudio}
cat <<EOF >"%{?buildroot}%{tde_datadir}/config/kcmartsrc"
%__mkdir_p "%{?buildroot}%{tde_confdir}"
cat <<EOF >"%{?buildroot}%{tde_confdir}/kcmartsrc"
[Arts]
Arguments=\s-F 10 -S 4096 -a esd -n -s 1 -m artsmessage -c drkonqi -l 3 -f
NetworkTransparent=true
SuspendTime=1
EOF
chmod 644 "%{?buildroot}%{tde_datadir}/config/kcmartsrc"
chmod 644 "%{?buildroot}%{tde_confdir}/kcmartsrc"
%endif
# Add supplementary folders

@ -67,7 +67,7 @@ BuildRequires: gettext-devel
BuildRequires: xorg-x11-devel
%endif
%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: %{_lib}xi-devel
BuildRequires: libxi-devel
%endif
%if 0%{?suse_version} >= 1220 || 0%{?rhel} >= 5 || 0%{?fedora}
BuildRequires: libXi-devel
@ -89,7 +89,7 @@ BuildRequires: libcap-devel
# AVAHI support
%if 0%{?mgaversion} || 0%{?mdkversion}
%define avahi_devel %{_lib}avahi-client-devel
%define avahi_devel libavahi-client-devel
%endif
%if 0%{?suse_version} || 0%{?rhel} || 0%{?fedora}
%define avahi_devel avahi-devel

@ -114,6 +114,12 @@ Requires: %{libdbus}-1-tqt0 = %{?epoch:%{epoch}:}%{version}-%{release}
Obsoletes: trinity-dbus-1-tqt-devel < %{?epoch:%{epoch}:}%{version}-%{release}
Provides: trinity-dbus-1-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release}
%if 0%{?suse_version}
Requires: dbus-1-devel
%else
Requires: dbus-devel
%endif
%description -n %{libdbus}-1-tqt-devel
D-BUS is a message bus, used for sending messages between applications.
Conceptually, it fits somewhere in between raw sockets and CORBA in

@ -115,6 +115,12 @@ Requires: %{libdbus}-tqt-1-0 = %{?epoch:%{epoch}:}%{version}-%{release}
Obsoletes: trinity-dbus-tqt-devel < %{?epoch:%{epoch}:}%{version}-%{release}
Provides: trinity-dbus-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release}
%if 0%{?suse_version}
Requires: dbus-1-devel
%else
Requires: dbus-devel
%endif
%description -n %{libdbus}-tqt-1-devel
D-BUS is a message bus, used for sending messages between applications.
Conceptually, it fits somewhere in between raw sockets and CORBA in

@ -54,6 +54,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
Patch1: libcaldav-14.0.1-rhel5.patch
BuildRequires: make
BuildRequires: libtool
BuildRequires: fdupes
@ -67,15 +69,10 @@ BuildRequires: gtk2-devel
%endif
# CURL support
%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version}
%define libcurl_devel libcurl-devel
%else
%if 0%{?mgaversion} || 0%{?mdkversion}
%define libcurl_devel %{_lib}curl-devel
%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion}
%define libcurl_devel libcurl-devel >= 7.15.5
%else
# Specific CURL version for TDE on RHEL 5 (and older)
#define libcurl_devel trinity-libcurl-devel
%endif
%define libcurl_devel curl-devel >= 7.15.5
%endif
%{?libcurl_devel:BuildRequires: %{libcurl_devel}}
@ -154,7 +151,10 @@ This package includes the development files.
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
./autogen.sh
%if 0%{?rhel} == 5
%patch1 -p1 -b .ftbfs
%endif
autoreconf -fiv
%build

@ -0,0 +1,193 @@
diff --git a/src/add-caldav-object.c b/src/add-caldav-object.c
index 68a4377..35aef48 100644
--- a/src/add-caldav-object.c
+++ b/src/add-caldav-object.c
@@ -103,7 +103,6 @@ gboolean caldav_add(caldav_settings* settings, caldav_error* error) {
curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "PUT");
curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
res = curl_easy_perform(curl);
if (res != 0) {
error->code = -1;
diff --git a/src/delete-caldav-object.c b/src/delete-caldav-object.c
index 9a85168..ea5733f 100644
--- a/src/delete-caldav-object.c
+++ b/src/delete-caldav-object.c
@@ -150,7 +150,6 @@ gboolean caldav_delete(caldav_settings* settings, caldav_error* error) {
curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "REPORT");
curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
res = curl_easy_perform(curl);
g_free(search);
curl_slist_free_all(http_header);
@@ -249,7 +248,6 @@ gboolean caldav_delete(caldav_settings* settings, caldav_error* error) {
curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "DELETE");
curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
res = curl_easy_perform(curl);
if (LOCKSUPPORT && lock_token) {
caldav_unlock_object(
@@ -380,7 +378,6 @@ gboolean caldav_tasks_delete(caldav_settings* settings, caldav_error* error) {
curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "REPORT");
curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
res = curl_easy_perform(curl);
g_free(search);
curl_slist_free_all(http_header);
@@ -479,7 +476,6 @@ gboolean caldav_tasks_delete(caldav_settings* settings, caldav_error* error) {
curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "DELETE");
curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
res = curl_easy_perform(curl);
if (LOCKSUPPORT && lock_token) {
caldav_unlock_object(
diff --git a/src/get-caldav-report.c b/src/get-caldav-report.c
index d916259..0021cb8 100644
--- a/src/get-caldav-report.c
+++ b/src/get-caldav-report.c
@@ -169,7 +169,6 @@ gboolean caldav_getall(caldav_settings* settings, caldav_error* error) {
curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "REPORT");
curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
res = curl_easy_perform(curl);
if (res != 0) {
error->code = -1;
@@ -266,7 +265,6 @@ gboolean caldav_getrange(caldav_settings* settings, caldav_error* error) {
curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "REPORT");
curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
res = curl_easy_perform(curl);
if (res != 0) {
error->code = -1;
@@ -349,7 +347,6 @@ gboolean caldav_tasks_getall(caldav_settings* settings, caldav_error* error) {
curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "REPORT");
curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
res = curl_easy_perform(curl);
if (res != 0) {
error->code = -1;
@@ -446,7 +443,6 @@ gboolean caldav_tasks_getrange(caldav_settings* settings, caldav_error* error) {
curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "REPORT");
curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
res = curl_easy_perform(curl);
if (res != 0) {
error->code = -1;
diff --git a/src/get-display-name.c b/src/get-display-name.c
index 8fc0ff8..c205efd 100644
--- a/src/get-display-name.c
+++ b/src/get-display-name.c
@@ -99,7 +99,6 @@ gboolean caldav_getname(caldav_settings* settings, caldav_error* error) {
curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "PROPFIND");
curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
res = curl_easy_perform(curl);
if (res != 0) {
error->code = -1;
diff --git a/src/get-freebusy-report.c b/src/get-freebusy-report.c
index f75ab92..40a5a3c 100644
--- a/src/get-freebusy-report.c
+++ b/src/get-freebusy-report.c
@@ -104,7 +104,6 @@ gboolean caldav_freebusy(caldav_settings* settings, caldav_error* error) {
curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "REPORT");
curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
res = curl_easy_perform(curl);
if (res != 0) {
error->code = -1;
diff --git a/src/lock-caldav-object.c b/src/lock-caldav-object.c
index 30f2d20..6845551 100644
--- a/src/lock-caldav-object.c
+++ b/src/lock-caldav-object.c
@@ -107,7 +107,6 @@ gchar* caldav_lock_object(
curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "LOCK");
curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
res = curl_easy_perform(curl);
curl_slist_free_all(http_header);
if (res != 0) {
@@ -211,7 +210,6 @@ gboolean caldav_unlock_object(gchar* lock_token, gchar* URI,
curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "UNLOCK");
curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
res = curl_easy_perform(curl);
curl_slist_free_all(http_header);
if (res != 0) {
diff --git a/src/modify-caldav-object.c b/src/modify-caldav-object.c
index fb3a4d0..f3563d8 100644
--- a/src/modify-caldav-object.c
+++ b/src/modify-caldav-object.c
@@ -151,7 +151,6 @@ gboolean caldav_modify(caldav_settings* settings, caldav_error* error) {
curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "REPORT");
curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
res = curl_easy_perform(curl);
curl_slist_free_all(http_header);
http_header = NULL;
@@ -249,7 +248,6 @@ gboolean caldav_modify(caldav_settings* settings, caldav_error* error) {
strlen(settings->file));
curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "PUT");
res = curl_easy_perform(curl);
if (LOCKSUPPORT && lock_token) {
@@ -391,7 +389,6 @@ gboolean caldav_tasks_modify(caldav_settings* settings, caldav_error* error) {
curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "REPORT");
curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
res = curl_easy_perform(curl);
curl_slist_free_all(http_header);
http_header = NULL;
@@ -489,7 +486,6 @@ gboolean caldav_tasks_modify(caldav_settings* settings, caldav_error* error) {
strlen(settings->file));
curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "PUT");
res = curl_easy_perform(curl);
if (LOCKSUPPORT && lock_token) {
diff --git a/src/options-caldav-server.c b/src/options-caldav-server.c
index 1d97d04..0045afe 100644
--- a/src/options-caldav-server.c
+++ b/src/options-caldav-server.c
@@ -74,7 +74,6 @@ gboolean caldav_getoptions(CURL* curl, caldav_settings* settings, response* resu
curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "OPTIONS");
curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
res = curl_easy_perform(curl);
if (res == 0) {
gchar* head;
@@ -102,15 +101,12 @@ gboolean caldav_getoptions(CURL* curl, caldav_settings* settings, response* resu
}
else if (
(res == CURLE_SSL_CONNECT_ERROR ||
- CURLE_PEER_FAILED_VERIFICATION ||
CURLE_SSL_ENGINE_NOTFOUND ||
CURLE_SSL_ENGINE_SETFAILED ||
CURLE_SSL_CERTPROBLEM ||
CURLE_SSL_CIPHER ||
CURLE_SSL_CACERT ||
- CURLE_SSL_CACERT_BADFILE ||
- CURLE_SSL_CRL_BADFILE ||
- CURLE_SSL_ISSUER_ERROR) && settings->usehttps) {
+ CURLE_SSL_CRL_BADFILE ) && settings->usehttps) {
error->code = -2;
error->str = g_strdup(error_buf);
}

@ -54,19 +54,17 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
Patch1: libcarddav-14.0.1-rhel5.patch
BuildRequires: make
BuildRequires: libtool
# CURL support
%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version}
%define libcurl_devel libcurl-devel
%else
%if 0%{?mgaversion} || 0%{?mdkversion}
%define libcurl_devel %{_lib}curl-devel
%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion}
%define libcurl_devel libcurl-devel >= 7.15.5
%else
# Specific CURL version for TDE on RHEL 5 (and older)
#define libcurl_devel trinity-libcurl-devel
%endif
%define libcurl_devel curl-devel >= 7.15.5
%endif
%{?libcurl_devel:BuildRequires: %{libcurl_devel}}
@ -153,11 +151,14 @@ This package contains the development files.
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%if 0%{?rhel} == 5
%patch1 -p1 -b .ftbfs
%endif
# Fix empty ChangeLog cause invalid macro in 'configure.ac'
echo "%{name} (%{version})" >ChangeLog
./autogen.sh
autoreconf -fiv
%build

@ -0,0 +1,164 @@
diff --git a/src/add-carddav-object.c b/src/add-carddav-object.c
index 5574991..a1586d8 100644
--- a/src/add-carddav-object.c
+++ b/src/add-carddav-object.c
@@ -104,7 +104,6 @@ gboolean carddav_add(carddav_settings* settings, carddav_error* error) {
curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "PUT");
curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
res = curl_easy_perform(curl);
if (res != 0) {
error->code = -1;
diff --git a/src/delete-carddav-object.c b/src/delete-carddav-object.c
index 96b9033..6984a82 100644
--- a/src/delete-carddav-object.c
+++ b/src/delete-carddav-object.c
@@ -132,7 +132,6 @@ gboolean carddav_delete(carddav_settings* settings, carddav_error* error) {
curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "REPORT");
curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
res = curl_easy_perform(curl);
g_free(search);
curl_slist_free_all(http_header);
@@ -231,7 +230,6 @@ gboolean carddav_delete(carddav_settings* settings, carddav_error* error) {
curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "DELETE");
curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
res = curl_easy_perform(curl);
if (LOCKSUPPORT && lock_token) {
carddav_unlock_object(
@@ -417,7 +415,6 @@ gboolean carddav_delete_by_uri(carddav_settings* settings, carddav_error* error)
curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "DELETE");
curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
res = curl_easy_perform(curl);
if (LOCKSUPPORT && lock_token) {
carddav_unlock_object(
diff --git a/src/get-carddav-report.c b/src/get-carddav-report.c
index b44fd2c..7655b29 100644
--- a/src/get-carddav-report.c
+++ b/src/get-carddav-report.c
@@ -117,7 +117,6 @@ static gchar* carddav_dirlist(carddav_settings* settings, carddav_error* error)
curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "PROPFIND");
curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
res = curl_easy_perform(curl);
if (res != 0) {
error->code = -1;
@@ -243,7 +242,6 @@ gboolean carddav_getall(carddav_settings* settings, carddav_error* error) {
curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "REPORT");
curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
res = curl_easy_perform(curl);
if (res != 0) {
error->code = -1;
@@ -345,7 +343,6 @@ gboolean carddav_getall_by_uri(carddav_settings* settings, carddav_error* error)
curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "REPORT");
curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
res = curl_easy_perform(curl);
if (res != 0) {
error->code = -1;
@@ -378,4 +375,4 @@ gboolean carddav_getall_by_uri(carddav_settings* settings, carddav_error* error)
curl_easy_cleanup(curl);
g_free(dav_file_listing);
return result;
-}
\ No newline at end of file
+}
diff --git a/src/get-display-name.c b/src/get-display-name.c
index 9e782e0..16c3e4b 100644
--- a/src/get-display-name.c
+++ b/src/get-display-name.c
@@ -100,7 +100,6 @@ gboolean carddav_getname(carddav_settings* settings, carddav_error* error) {
curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "PROPFIND");
curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
res = curl_easy_perform(curl);
if (res != 0) {
error->code = -1;
diff --git a/src/lock-carddav-object.c b/src/lock-carddav-object.c
index 163264c..2292cad 100644
--- a/src/lock-carddav-object.c
+++ b/src/lock-carddav-object.c
@@ -109,7 +109,6 @@ gchar* carddav_lock_object(
curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "LOCK");
curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
res = curl_easy_perform(curl);
curl_slist_free_all(http_header);
if (res != 0) {
@@ -214,7 +213,6 @@ gboolean carddav_unlock_object(gchar* lock_token, gchar* URI,
curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "UNLOCK");
curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
res = curl_easy_perform(curl);
curl_slist_free_all(http_header);
if (res != 0) {
diff --git a/src/modify-carddav-object.c b/src/modify-carddav-object.c
index 1822068..a8b6de2 100644
--- a/src/modify-carddav-object.c
+++ b/src/modify-carddav-object.c
@@ -133,7 +133,6 @@ gboolean carddav_modify(carddav_settings* settings, carddav_error* error) {
curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "REPORT");
curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
res = curl_easy_perform(curl);
curl_slist_free_all(http_header);
http_header = NULL;
@@ -231,7 +230,6 @@ gboolean carddav_modify(carddav_settings* settings, carddav_error* error) {
strlen(settings->file));
curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "PUT");
res = curl_easy_perform(curl);
if (LOCKSUPPORT && lock_token) {
@@ -430,7 +428,6 @@ gboolean carddav_modify_by_uri(carddav_settings* settings, carddav_error* error)
strlen(settings->file));
curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "PUT");
res = curl_easy_perform(curl);
if (LOCKSUPPORT && lock_token) {
diff --git a/src/options-carddav-server.c b/src/options-carddav-server.c
index b774401..b44aae2 100644
--- a/src/options-carddav-server.c
+++ b/src/options-carddav-server.c
@@ -75,7 +75,6 @@ gboolean carddav_getoptions(CURL* curl, carddav_settings* settings, response* re
curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "OPTIONS");
curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
if (settings->debug) {
curl_easy_setopt(curl, CURLOPT_VERBOSE, 1);
}
@@ -106,15 +105,12 @@ gboolean carddav_getoptions(CURL* curl, carddav_settings* settings, response* re
}
else if (
(res == CURLE_SSL_CONNECT_ERROR ||
- CURLE_PEER_FAILED_VERIFICATION ||
CURLE_SSL_ENGINE_NOTFOUND ||
CURLE_SSL_ENGINE_SETFAILED ||
CURLE_SSL_CERTPROBLEM ||
CURLE_SSL_CIPHER ||
CURLE_SSL_CACERT ||
- CURLE_SSL_CACERT_BADFILE ||
- CURLE_SSL_CRL_BADFILE ||
- CURLE_SSL_ISSUER_ERROR) && settings->usehttps) {
+ CURLE_SSL_CRL_BADFILE ) && settings->usehttps) {
error->code = -2;
error->str = g_strdup(error_buf);
}

@ -150,12 +150,18 @@ unset QTDIR QTINC QTLIB
--qtdir=/usr \
--debug
# Workaround strange tqmake behaviour in RHEL5
%if 0%{?rhel} == 5
%__sed -i "Makefile" -e "s|..\/..\/..\/..|%{_prefix}|g"
%endif
%__make %{?_smp_mflags}
%install
%__rm -rf $RPM_BUILD_ROOT
%__make install INSTALL_ROOT=$RPM_BUILD_ROOT
%__make install INSTALL_ROOT="${RPM_BUILD_ROOT}/"
%clean

@ -174,6 +174,11 @@ export QTDIR=%{_libdir}/tqt3
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
# Workaround strange tqmake behaviour in RHEL5
%if 0%{?rhel} == 5
%__sed -i "qt/Makefile" -e "s|..\/..\/..\/..\/..|%{_prefix}|g"
%endif
%__make %{?_smp_mflags} -C qt
%__make %{?_smp_mflags} -C designer

@ -136,8 +136,12 @@ BuildRequires: cups-devel
%define xrandr_devel libXrandr-devel
%endif
%if 0%{?mdkversion} || 0%{?mgaversion}
%if 0%{?pclinuxos}
%define xrandr_devel libxrandr2-devel
%else
%define xrandr_devel libxrandr-devel
%endif
%endif
%{?xrandr_devel:BuildRequires: %{xrandr_devel}}
# Xcursor support
@ -248,8 +252,12 @@ BuildRequires: mesa-libGL-devel
BuildRequires: mesa-libGLU-devel
%endif
%if 0%{?mdkversion} || 0%{?mgaversion}
%if 0%{?pclinuxos}
BuildRequires: MesaGLU-devel
%else
BuildRequires: mesaglu-devel
%endif
%endif
%if 0%{?suse_version}
BuildRequires: Mesa-libGL-devel
BuildRequires: Mesa-libGLU-devel

@ -49,7 +49,7 @@
Name: trinity-%{tde_pkg}
Summary: library for apps that want to use kipi-plugins (runtime version) [Trinity]
Summary: Library for apps that want to use kipi-plugins (runtime version) [Trinity]
Group: System/Libraries
Epoch: %{tde_epoch}
Version: 0.1.5
@ -98,9 +98,9 @@ BuildRequires: libtool-ltdl-devel
%description
Libkipi is a library
o that contains common routines and widget used by kipi-plugins
o to ease implementation of the kipi-plugins interface in an application
that wants to use kipi-plugins
- that contains common routines and widget used by kipi-plugins
- to ease implementation of the kipi-plugins interface in an application
that wants to use kipi-plugins
Homepage: http://www.kipi-plugins.org/

@ -63,7 +63,7 @@ Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
Patch0: %{tde_pkg}-%{tde_version}.patch
Patch0: %{tde_pkg}-14.0.0.patch
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
@ -83,6 +83,10 @@ BuildRequires: libtool-ltdl-devel
# TRANSFIG support
BuildRequires: transfig
# GHOSTSCRIPT support
%define with_ghostscript 1
BuildRequires: ghostscript
# GETTEXT support
BuildRequires: gettext
BuildRequires: gettext-devel
@ -120,6 +124,9 @@ BuildRequires: xmedcon-devel
# RSVG support
%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
%define with_svg 1
%if 0%{?rhel} == 5
BuildRequires: librsvg2-devel
%endif
%if 0%{?fedora} || 0%{?rhel}
BuildRequires: librsvg2
%endif
@ -198,8 +205,10 @@ This package contains the runtime libraries for KSquirrel.
%{tde_libdir}/ksquirrel-libs/libkls_djvu.so.0
%{tde_libdir}/ksquirrel-libs/libkls_djvu.so.0.8.0
%endif
%if 0%{?with_ghostscript}
%{tde_libdir}/ksquirrel-libs/libkls_eps.so.0
%{tde_libdir}/ksquirrel-libs/libkls_eps.so.0.8.0
%endif
%{tde_libdir}/ksquirrel-libs/libkls_fig.so.0
%{tde_libdir}/ksquirrel-libs/libkls_fig.so.0.8.0
%{tde_libdir}/ksquirrel-libs/libkls_fli.so.0
@ -358,8 +367,10 @@ This package contains the development libraries for KSquirrel.
%{tde_libdir}/ksquirrel-libs/libkls_djvu.la
%{tde_libdir}/ksquirrel-libs/libkls_djvu.so
%endif
%if 0%{?with_ghostscript}
%{tde_libdir}/ksquirrel-libs/libkls_eps.la
%{tde_libdir}/ksquirrel-libs/libkls_eps.so
%endif
%{tde_libdir}/ksquirrel-libs/libkls_fig.la
%{tde_libdir}/ksquirrel-libs/libkls_fig.so
%{tde_libdir}/ksquirrel-libs/libkls_fli.la

@ -1,568 +0,0 @@
#
# spec file for package libksquirrel (version R14)
#
# 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/
#
# BUILD WARNING:
# Remove qt-devel and qt3-devel and any kde*-devel on your system !
# Having KDE libraries may cause FTBFS here !
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
%define tde_version 14.0.0
%endif
%define tde_pkg libksquirrel
%define tde_prefix /opt/trinity
%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_tdeappdir %{tde_datadir}/applications/tde
%define tde_tdedocdir %{tde_docdir}/tde
%define tde_tdeincludedir %{tde_includedir}/tde
%define tde_tdelibdir %{tde_libdir}/trinity
# 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
Name: trinity-%{tde_pkg}
Summary: Trinity image viewer
Group: System/Libraries
Epoch: %{tde_epoch}
Version: 0.8.0
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
URL: http://www.trinitydesktop.org/
%if 0%{?suse_version}
License: GPL-2.0+
%else
License: GPLv2+
%endif
#Vendor: Trinity Desktop
#Packager: Francois Andriot <francois.andriot@free.fr>
Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: desktop-file-utils
BuildRequires: gcc-c++
BuildRequires: pkgconfig
# AUTOTOOLS
BuildRequires: automake autoconf libtool
%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: %{_lib}ltdl-devel
%endif
%if 0%{?fedora} || 0%{?rhel} >= 5 || 0%{?suse_version} >= 1220
BuildRequires: libtool-ltdl-devel
%endif
# TRANSFIG support
BuildRequires: transfig
# GETTEXT support
BuildRequires: gettext
BuildRequires: gettext-devel
# OPENEXR support
BuildRequires: OpenEXR-devel
# TIFF support
BuildRequires: libtiff-devel
# GIF support
%if 0%{?suse_version}
BuildRequires: giflib-devel
%endif
%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?rhel}
BuildRequires: libungif-devel
%endif
# MNG support
BuildRequires: libmng-devel
# DJVU support
%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
%define with_djvu 1
BuildRequires: djvulibre
%endif
# XMEDCON support
%if 0%{?fedora}
%define with_xmedcon 1
BuildRequires: xmedcon
BuildRequires: xmedcon-devel
%endif
# RSVG support
%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
%define with_svg 1
%if 0%{?fedora} || 0%{?rhel}
BuildRequires: librsvg2
%endif
%if 0%{?fedora} >= 19 || 0%{?rhel} >= 7
BuildRequires: librsvg2-tools
%endif
%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: librsvg
%endif
%if 0%{?suse_version}
BuildRequires: rsvg-view
BuildRequires: librsvg-devel
%endif
%endif
# JASPER support
%if 0%{?rhel} >=4 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
%define with_jasper 1
%if 0%{?suse_version}
BuildRequires: libjasper-devel
%endif
%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: %{_lib}jasper-devel
%endif
%if 0%{?rhel} || 0%{?fedora}
BuildRequires: jasper-devel
%endif
%endif
# FREETYPE support
%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
%define with_freetype 1
%if 0%{?suse_version} == 1140
BuildRequires: freetype2-devel
%else
BuildRequires: freetype-devel
%endif
%endif
# WMF support
BuildRequires: libwmf-devel
# XML2 support
BuildRequires: libxml2-devel
# NETPBM support
%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
BuildRequires: netpbm
%else
BuildRequires: netpbm-progs
%endif
%description
This package contains the runtime libraries for KSquirrel.
%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING LICENSE README
%dir %{tde_libdir}/ksquirrel-libs
%{tde_libdir}/ksquirrel-libs/libkls_avs.so.0
%{tde_libdir}/ksquirrel-libs/libkls_avs.so.0.8.0
%{tde_libdir}/ksquirrel-libs/libkls_bmp.so.0
%{tde_libdir}/ksquirrel-libs/libkls_bmp.so.0.8.0
%{tde_libdir}/ksquirrel-libs/libkls_camera.so.0
%{tde_libdir}/ksquirrel-libs/libkls_camera.so.0.8.0
%{tde_libdir}/ksquirrel-libs/libkls_cut.so.0
%{tde_libdir}/ksquirrel-libs/libkls_cut.so.0.8.0
%{tde_libdir}/ksquirrel-libs/libkls_dds.so.0
%{tde_libdir}/ksquirrel-libs/libkls_dds.so.0.8.0
%if 0%{?with_xmedcon}
%{tde_libdir}/ksquirrel-libs/libkls_dicom.so.0
%{tde_libdir}/ksquirrel-libs/libkls_dicom.so.0.8.0
%endif
%if 0%{?with_djvu}
%{tde_libdir}/ksquirrel-libs/libkls_djvu.so.0
%{tde_libdir}/ksquirrel-libs/libkls_djvu.so.0.8.0
%endif
%{tde_libdir}/ksquirrel-libs/libkls_eps.so.0
%{tde_libdir}/ksquirrel-libs/libkls_eps.so.0.8.0
%{tde_libdir}/ksquirrel-libs/libkls_fig.so.0
%{tde_libdir}/ksquirrel-libs/libkls_fig.so.0.8.0
%{tde_libdir}/ksquirrel-libs/libkls_fli.so.0
%{tde_libdir}/ksquirrel-libs/libkls_fli.so.0.8.0
%{tde_libdir}/ksquirrel-libs/libkls_gif.so.0
%{tde_libdir}/ksquirrel-libs/libkls_gif.so.0.8.0
%{tde_libdir}/ksquirrel-libs/libkls_hdr.so.0
%{tde_libdir}/ksquirrel-libs/libkls_hdr.so.0.8.0
%{tde_libdir}/ksquirrel-libs/libkls_ico.so.0
%{tde_libdir}/ksquirrel-libs/libkls_ico.so.0.8.0
%{tde_libdir}/ksquirrel-libs/libkls_iff.so.0
%{tde_libdir}/ksquirrel-libs/libkls_iff.so.0.8.0
%{tde_libdir}/ksquirrel-libs/libkls_jbig.so.0
%{tde_libdir}/ksquirrel-libs/libkls_jbig.so.0.8.0
%{tde_libdir}/ksquirrel-libs/libkls_jpeg.so.0
%{tde_libdir}/ksquirrel-libs/libkls_jpeg.so.0.8.0
%{tde_libdir}/ksquirrel-libs/libkls_jpeg2000.so.0
%{tde_libdir}/ksquirrel-libs/libkls_jpeg2000.so.0.8.0
%{tde_libdir}/ksquirrel-libs/libkls_koala.so.0
%{tde_libdir}/ksquirrel-libs/libkls_koala.so.0.8.0
%{tde_libdir}/ksquirrel-libs/libkls_leaf.so.0
%{tde_libdir}/ksquirrel-libs/libkls_leaf.so.0.8.0
%{tde_libdir}/ksquirrel-libs/libkls_lif.so.0
%{tde_libdir}/ksquirrel-libs/libkls_lif.so.0.8.0
%{tde_libdir}/ksquirrel-libs/libkls_ljpeg.so.0
%{tde_libdir}/ksquirrel-libs/libkls_ljpeg.so.0.8.0
%{tde_libdir}/ksquirrel-libs/libkls_mac.so.0
%{tde_libdir}/ksquirrel-libs/libkls_mac.so.0.8.0
%{tde_libdir}/ksquirrel-libs/libkls_mdl.so.0
%{tde_libdir}/ksquirrel-libs/libkls_mdl.so.0.8.0
%{tde_libdir}/ksquirrel-libs/libkls_mng.so.0
%{tde_libdir}/ksquirrel-libs/libkls_mng.so.0.8.0
%{tde_libdir}/ksquirrel-libs/libkls_mtv.so.0
%{tde_libdir}/ksquirrel-libs/libkls_mtv.so.0.8.0
%{tde_libdir}/ksquirrel-libs/libkls_neo.so.0
%{tde_libdir}/ksquirrel-libs/libkls_neo.so.0.8.0
%{tde_libdir}/ksquirrel-libs/libkls_openexr.so.0
%{tde_libdir}/ksquirrel-libs/libkls_openexr.so.0.8.0
%{tde_libdir}/ksquirrel-libs/libkls_pcx.so.0
%{tde_libdir}/ksquirrel-libs/libkls_pcx.so.0.8.0
%{tde_libdir}/ksquirrel-libs/libkls_pi1.so.0
%{tde_libdir}/ksquirrel-libs/libkls_pi1.so.0.8.0
%{tde_libdir}/ksquirrel-libs/libkls_pi3.so.0
%{tde_libdir}/ksquirrel-libs/libkls_pi3.so.0.8.0
%{tde_libdir}/ksquirrel-libs/libkls_pix.so.0
%{tde_libdir}/ksquirrel-libs/libkls_pix.so.0.8.0
%{tde_libdir}/ksquirrel-libs/libkls_png.so.0
%{tde_libdir}/ksquirrel-libs/libkls_png.so.0.8.0
%{tde_libdir}/ksquirrel-libs/libkls_pnm.so.0
%{tde_libdir}/ksquirrel-libs/libkls_pnm.so.0.8.0
%{tde_libdir}/ksquirrel-libs/libkls_psd.so.0
%{tde_libdir}/ksquirrel-libs/libkls_psd.so.0.8.0
%{tde_libdir}/ksquirrel-libs/libkls_psp.so.0
%{tde_libdir}/ksquirrel-libs/libkls_psp.so.0.8.0
%{tde_libdir}/ksquirrel-libs/libkls_pxr.so.0
%{tde_libdir}/ksquirrel-libs/libkls_pxr.so.0.8.0
%{tde_libdir}/ksquirrel-libs/libkls_ras.so.0
%{tde_libdir}/ksquirrel-libs/libkls_ras.so.0.8.0
%{tde_libdir}/ksquirrel-libs/libkls_rawrgb.so.0
%{tde_libdir}/ksquirrel-libs/libkls_rawrgb.so.0.8.0
%{tde_libdir}/ksquirrel-libs/libkls_sct.so.0
%{tde_libdir}/ksquirrel-libs/libkls_sct.so.0.8.0
%{tde_libdir}/ksquirrel-libs/libkls_sgi.so.0
%{tde_libdir}/ksquirrel-libs/libkls_sgi.so.0.8.0
%{tde_libdir}/ksquirrel-libs/libkls_sun.so.0
%{tde_libdir}/ksquirrel-libs/libkls_sun.so.0.8.0
%if 0%{?with_svg}
%{tde_libdir}/ksquirrel-libs/libkls_svg.so.0
%{tde_libdir}/ksquirrel-libs/libkls_svg.so.0.8.0
%endif
%{tde_libdir}/ksquirrel-libs/libkls_tga.so.0
%{tde_libdir}/ksquirrel-libs/libkls_tga.so.0.8.0
%{tde_libdir}/ksquirrel-libs/libkls_tiff.so.0
%{tde_libdir}/ksquirrel-libs/libkls_tiff.so.0.8.0
%if 0%{?with_freetype}
%{tde_libdir}/ksquirrel-libs/libkls_ttf.so.0
%{tde_libdir}/ksquirrel-libs/libkls_ttf.so.0.8.0
%endif
%{tde_libdir}/ksquirrel-libs/libkls_utah.so.0
%{tde_libdir}/ksquirrel-libs/libkls_utah.so.0.8.0
%{tde_libdir}/ksquirrel-libs/libkls_wal.so.0
%{tde_libdir}/ksquirrel-libs/libkls_wal.so.0.8.0
%{tde_libdir}/ksquirrel-libs/libkls_wbmp.so.0
%{tde_libdir}/ksquirrel-libs/libkls_wbmp.so.0.8.0
%{tde_libdir}/ksquirrel-libs/libkls_wmf.so.0
%{tde_libdir}/ksquirrel-libs/libkls_wmf.so.0.8.0
%{tde_libdir}/ksquirrel-libs/libkls_xbm.so.0
%{tde_libdir}/ksquirrel-libs/libkls_xbm.so.0.8.0
%{tde_libdir}/ksquirrel-libs/libkls_xcf.so.0
%{tde_libdir}/ksquirrel-libs/libkls_xcf.so.0.8.0
%{tde_libdir}/ksquirrel-libs/libkls_xcur.so.0
%{tde_libdir}/ksquirrel-libs/libkls_xcur.so.0.8.0
%{tde_libdir}/ksquirrel-libs/libkls_xim.so.0
%{tde_libdir}/ksquirrel-libs/libkls_xim.so.0.8.0
%{tde_libdir}/ksquirrel-libs/libkls_xpm.so.0
%{tde_libdir}/ksquirrel-libs/libkls_xpm.so.0.8.0
%{tde_libdir}/ksquirrel-libs/libkls_xwd.so.0
%{tde_libdir}/ksquirrel-libs/libkls_xwd.so.0.8.0
%{tde_libdir}/libksquirrel-libs-png.so.0
%{tde_libdir}/libksquirrel-libs-png.so.0.0.0
%{tde_libdir}/libksquirrel-libs.so.0
%{tde_libdir}/libksquirrel-libs.so.0.8.0
%dir %{tde_datadir}/ksquirrel-libs
%{tde_datadir}/ksquirrel-libs/libkls_camera.so.ui
%if 0%{?with_djvu}
%{tde_datadir}/ksquirrel-libs/libkls_djvu.so.ui
%endif
%if 0%{?with_svg}
%{tde_datadir}/ksquirrel-libs/libkls_svg.so.ui
%endif
%{tde_datadir}/ksquirrel-libs/libkls_tiff.so.ui
%{tde_datadir}/ksquirrel-libs/libkls_xcf.so.ui
%{tde_datadir}/ksquirrel-libs/rgbmap
%post
/sbin/ldconfig || :
%postun
/sbin/ldconfig || :
##########
%package devel
Group: Development/Libraries/Other
Summary: Trinity image viewer
Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
%description devel
This package contains the development libraries for KSquirrel.
%files devel
%defattr(-,root,root,-)
%dir %{tde_includedir}/ksquirrel-libs
%{tde_includedir}/ksquirrel-libs/error.h
%{tde_includedir}/ksquirrel-libs/fileio.h
%{tde_includedir}/ksquirrel-libs/fmt_codec_base.h
%{tde_includedir}/ksquirrel-libs/fmt_defs.h
%{tde_includedir}/ksquirrel-libs/fmt_types.h
%{tde_includedir}/ksquirrel-libs/fmt_utils.h
%{tde_includedir}/ksquirrel-libs/settings.h
%{tde_libdir}/ksquirrel-libs/libkls_avs.la
%{tde_libdir}/ksquirrel-libs/libkls_avs.so
%{tde_libdir}/ksquirrel-libs/libkls_bmp.la
%{tde_libdir}/ksquirrel-libs/libkls_bmp.so
%{tde_libdir}/ksquirrel-libs/libkls_camera.la
%{tde_libdir}/ksquirrel-libs/libkls_camera.so
%{tde_libdir}/ksquirrel-libs/libkls_cut.la
%{tde_libdir}/ksquirrel-libs/libkls_cut.so
%{tde_libdir}/ksquirrel-libs/libkls_dds.la
%{tde_libdir}/ksquirrel-libs/libkls_dds.so
%if 0%{?with_xmedcon}
%{tde_libdir}/ksquirrel-libs/libkls_dicom.la
%{tde_libdir}/ksquirrel-libs/libkls_dicom.so
%endif
%if 0%{?with_djvu}
%{tde_libdir}/ksquirrel-libs/libkls_djvu.la
%{tde_libdir}/ksquirrel-libs/libkls_djvu.so
%endif
%{tde_libdir}/ksquirrel-libs/libkls_eps.la
%{tde_libdir}/ksquirrel-libs/libkls_eps.so
%{tde_libdir}/ksquirrel-libs/libkls_fig.la
%{tde_libdir}/ksquirrel-libs/libkls_fig.so
%{tde_libdir}/ksquirrel-libs/libkls_fli.la
%{tde_libdir}/ksquirrel-libs/libkls_fli.so
%{tde_libdir}/ksquirrel-libs/libkls_gif.la
%{tde_libdir}/ksquirrel-libs/libkls_gif.so
%{tde_libdir}/ksquirrel-libs/libkls_hdr.la
%{tde_libdir}/ksquirrel-libs/libkls_hdr.so
%{tde_libdir}/ksquirrel-libs/libkls_ico.la
%{tde_libdir}/ksquirrel-libs/libkls_ico.so
%{tde_libdir}/ksquirrel-libs/libkls_iff.la
%{tde_libdir}/ksquirrel-libs/libkls_iff.so
%{tde_libdir}/ksquirrel-libs/libkls_jbig.la
%{tde_libdir}/ksquirrel-libs/libkls_jbig.so
%{tde_libdir}/ksquirrel-libs/libkls_jpeg.la
%{tde_libdir}/ksquirrel-libs/libkls_jpeg.so
%{tde_libdir}/ksquirrel-libs/libkls_jpeg2000.la
%{tde_libdir}/ksquirrel-libs/libkls_jpeg2000.so
%{tde_libdir}/ksquirrel-libs/libkls_koala.la
%{tde_libdir}/ksquirrel-libs/libkls_koala.so
%{tde_libdir}/ksquirrel-libs/libkls_leaf.la
%{tde_libdir}/ksquirrel-libs/libkls_leaf.so
%{tde_libdir}/ksquirrel-libs/libkls_lif.la
%{tde_libdir}/ksquirrel-libs/libkls_lif.so
%{tde_libdir}/ksquirrel-libs/libkls_ljpeg.la
%{tde_libdir}/ksquirrel-libs/libkls_ljpeg.so
%{tde_libdir}/ksquirrel-libs/libkls_mac.la
%{tde_libdir}/ksquirrel-libs/libkls_mac.so
%{tde_libdir}/ksquirrel-libs/libkls_mdl.la
%{tde_libdir}/ksquirrel-libs/libkls_mdl.so
%{tde_libdir}/ksquirrel-libs/libkls_mng.la
%{tde_libdir}/ksquirrel-libs/libkls_mng.so
%{tde_libdir}/ksquirrel-libs/libkls_mtv.la
%{tde_libdir}/ksquirrel-libs/libkls_mtv.so
%{tde_libdir}/ksquirrel-libs/libkls_neo.la
%{tde_libdir}/ksquirrel-libs/libkls_neo.so
%{tde_libdir}/ksquirrel-libs/libkls_openexr.la
%{tde_libdir}/ksquirrel-libs/libkls_openexr.so
%{tde_libdir}/ksquirrel-libs/libkls_pcx.la
%{tde_libdir}/ksquirrel-libs/libkls_pcx.so
%{tde_libdir}/ksquirrel-libs/libkls_pi1.la
%{tde_libdir}/ksquirrel-libs/libkls_pi1.so
%{tde_libdir}/ksquirrel-libs/libkls_pi3.la
%{tde_libdir}/ksquirrel-libs/libkls_pi3.so
%{tde_libdir}/ksquirrel-libs/libkls_pix.la
%{tde_libdir}/ksquirrel-libs/libkls_pix.so
%{tde_libdir}/ksquirrel-libs/libkls_png.la
%{tde_libdir}/ksquirrel-libs/libkls_png.so
%{tde_libdir}/ksquirrel-libs/libkls_pnm.la
%{tde_libdir}/ksquirrel-libs/libkls_pnm.so
%{tde_libdir}/ksquirrel-libs/libkls_psd.la
%{tde_libdir}/ksquirrel-libs/libkls_psd.so
%{tde_libdir}/ksquirrel-libs/libkls_psp.la
%{tde_libdir}/ksquirrel-libs/libkls_psp.so
%{tde_libdir}/ksquirrel-libs/libkls_pxr.la
%{tde_libdir}/ksquirrel-libs/libkls_pxr.so
%{tde_libdir}/ksquirrel-libs/libkls_ras.la
%{tde_libdir}/ksquirrel-libs/libkls_ras.so
%{tde_libdir}/ksquirrel-libs/libkls_rawrgb.la
%{tde_libdir}/ksquirrel-libs/libkls_rawrgb.so
%{tde_libdir}/ksquirrel-libs/libkls_sct.la
%{tde_libdir}/ksquirrel-libs/libkls_sct.so
%{tde_libdir}/ksquirrel-libs/libkls_sgi.la
%{tde_libdir}/ksquirrel-libs/libkls_sgi.so
%{tde_libdir}/ksquirrel-libs/libkls_sun.la
%{tde_libdir}/ksquirrel-libs/libkls_sun.so
%if 0%{?with_svg}
%{tde_libdir}/ksquirrel-libs/libkls_svg.la
%{tde_libdir}/ksquirrel-libs/libkls_svg.so
%endif
%{tde_libdir}/ksquirrel-libs/libkls_tga.la
%{tde_libdir}/ksquirrel-libs/libkls_tga.so
%{tde_libdir}/ksquirrel-libs/libkls_tiff.la
%{tde_libdir}/ksquirrel-libs/libkls_tiff.so
%if 0%{?with_freetype}
%{tde_libdir}/ksquirrel-libs/libkls_ttf.la
%{tde_libdir}/ksquirrel-libs/libkls_ttf.so
%endif
%{tde_libdir}/ksquirrel-libs/libkls_utah.la
%{tde_libdir}/ksquirrel-libs/libkls_utah.so
%{tde_libdir}/ksquirrel-libs/libkls_wal.la
%{tde_libdir}/ksquirrel-libs/libkls_wal.so
%{tde_libdir}/ksquirrel-libs/libkls_wbmp.la
%{tde_libdir}/ksquirrel-libs/libkls_wbmp.so
%{tde_libdir}/ksquirrel-libs/libkls_wmf.la
%{tde_libdir}/ksquirrel-libs/libkls_wmf.so
%{tde_libdir}/ksquirrel-libs/libkls_xbm.la
%{tde_libdir}/ksquirrel-libs/libkls_xbm.so
%{tde_libdir}/ksquirrel-libs/libkls_xcf.la
%{tde_libdir}/ksquirrel-libs/libkls_xcf.so
%{tde_libdir}/ksquirrel-libs/libkls_xcur.la
%{tde_libdir}/ksquirrel-libs/libkls_xcur.so
%{tde_libdir}/ksquirrel-libs/libkls_xim.la
%{tde_libdir}/ksquirrel-libs/libkls_xim.so
%{tde_libdir}/ksquirrel-libs/libkls_xpm.la
%{tde_libdir}/ksquirrel-libs/libkls_xpm.so
%{tde_libdir}/ksquirrel-libs/libkls_xwd.la
%{tde_libdir}/ksquirrel-libs/libkls_xwd.so
%{tde_libdir}/libksquirrel-libs-png.la
%{tde_libdir}/libksquirrel-libs-png.so
%{tde_libdir}/libksquirrel-libs.la
%{tde_libdir}/libksquirrel-libs.so
%{tde_libdir}/pkgconfig/ksquirrellibs.pc
%{tde_docdir}/ksquirrel-libs/
%post devel
/sbin/ldconfig || :
%postun devel
/sbin/ldconfig || :
##########
%package tools
Summary: Trinity image viewer
Group: System/Libraries
Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
%description tools
This package contains the tools for KSquirrel.
%files tools
%defattr(-,root,root,-)
%{tde_bindir}/ksquirrel-libs-camera2ppm
%{tde_bindir}/ksquirrel-libs-dcraw
%if 0%{?with_xmedcon}
%{tde_bindir}/ksquirrel-libs-dicom2png
%endif
%{tde_bindir}/ksquirrel-libs-fig2ppm
%{tde_bindir}/ksquirrel-libs-iff2ppm
%{tde_bindir}/ksquirrel-libs-leaf2ppm
%{tde_bindir}/ksquirrel-libs-ljpeg2ppm
%{tde_bindir}/ksquirrel-libs-ljpeg2ppm-s
%{tde_bindir}/ksquirrel-libs-mac2ppm
%{tde_bindir}/ksquirrel-libs-neo2ppm
%{tde_bindir}/ksquirrel-libs-pi12ppm
%{tde_bindir}/ksquirrel-libs-pi32ppm
%if 0%{?with_svg}
%{tde_bindir}/ksquirrel-libs-svg2png
%endif
%if 0%{?with_freetype}
%{tde_bindir}/ksquirrel-libs-ttf2pnm
%endif
%{tde_bindir}/ksquirrel-libs-utah2ppm
%{tde_bindir}/ksquirrel-libs-xcf2pnm
%{tde_bindir}/ksquirrel-libs-xim2ppm
##########
%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
%debug_package
%endif
##########
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
# FIXME: under PCLinuxOS, headers are under 'freetype2' not 'freetype'
if [ -r /usr/include/freetype2/ftbitmap.h ]; then
%__sed -i "configure.ac" -e "s|freetype/ftbitmap.h|freetype2/ftbitmap.h|"
%__sed -i "kernel/kls_ttf/ttf2pnm.cpp" -e "s|freetype/config/|freetype2/config/|"
fi
%__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 QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
%configure \
--prefix=%{tde_prefix} \
--exec-prefix=%{tde_prefix} \
--bindir=%{tde_bindir} \
--datadir=%{tde_datadir} \
--libdir=%{tde_libdir} \
--includedir=%{tde_includedir} \
\
--disable-dependency-tracking \
--disable-debug \
--enable-new-ldflags \
--enable-final \
--enable-closure \
--enable-rpath \
--disable-gcc-hidden-visibility \
\
%{?with_djvu:--enable-djvu}
%__make %{?_smp_mflags}
%install
export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot}
%clean
%__rm -rf %{buildroot}
%Changelog
* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2:0.8.0-1
- Initial release for TDE 14.0.0

@ -88,12 +88,15 @@ BuildRequires: cyrus-sasl-devel
%endif
# OPENLDAP support
%if 0%{?rhel} || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
BuildRequires: openldap-devel
%endif
%if 0%{?suse_version}
BuildRequires: openldap2-devel
%endif
%if 0%{?rhel} == 5
BuildRequires: openldap24-libs-devel
%endif
%description
@ -169,7 +172,12 @@ export PATH="%{tde_bindir}:${PATH}"
--enable-final \
--enable-closure \
--enable-rpath \
--disable-gcc-hidden-visibility
--disable-gcc-hidden-visibility \
\
%if 0%{?rhel} == 5
--with-extra-includes=/usr/include/openldap24 \
--with-extra-libs=/usr/lib/openldap24 \
%endif
%__make %{?_smp_mflags}

@ -76,6 +76,9 @@ It provides an object-oriented interface and is easy to use.
%{tde_mandir}/man1/puic.1*
%{_bindir}/pqtapi
%{_bindir}/pqtsh
%if 0%{?rhel} == 5
%{_datadir}/doc/libqt-perl/
%endif
##########
@ -147,6 +150,11 @@ export PATH="%{tde_bindir}:${PATH}"
\
--disable-smoke
# Fix invalid path in RHEL 5
%if 0%{?rhel} == 5
%__sed -i "PerlTQt/Makefile" -e "s|\$(PREFIX)/|\$(DESTDIR)\$(PREFIX)/|"
%endif
%__make %{?_smp_mflags}

@ -192,6 +192,11 @@ if [ -f "%{_libdir}/${LIBPYTHON}" ]; then
-e "s|#define LIB_PYTHON \".*\"|#define LIB_PYTHON \"%{_libdir}/${LIBPYTHON}\"|"
fi
# Fix FTBFS on RHEL 5
%if 0%{?rhel} == 5
%__sed -i "src/pythonize."* -e "s|const char \*object|char \*object|g"
%endif
%build
unset QTDIR QTINC QTLIB

@ -15,6 +15,8 @@
# Please submit bugfixes or comments via http://www.trinitydesktop.org/
#
%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""

@ -42,9 +42,9 @@
Name: trinity-%{tde_pkg}
Version: %{tde_version}
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
Vendor: Trinity Project
Summary: Internationalization support for Trinity
Group: User Interface/Desktops
URL: http://www.trinitydesktop.org/
%if 0%{?suse_version}
License: GPL-2.0+
@ -55,6 +55,8 @@ License: GPLv2+
#Vendor: Trinity Desktop
#Packager: Francois Andriot <francois.andriot@free.fr>
Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
# Speed build options

File diff suppressed because it is too large Load Diff

@ -88,10 +88,11 @@ BuildRequires: brp-check-trinity
BuildRequires: audiofile-devel
# AKODE support
%if 0%{?with_akode}
%define with_akode 1
BuildRequires: trinity-akode-devel
%{?with_mad:BuildRequires: trinity-akode-libmad}
%endif
%define with_mad 1
%{?with_mad:BuildRequires: libakode_mpeg_decoder}
# ALSA support
BuildRequires: alsa-lib-devel

@ -66,6 +66,7 @@ Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
Patch1: tdeaddons-14.0.1-fix_sdl_detection.patch
# Trinity dependencies
@ -115,6 +116,9 @@ BuildRequires: gamin-devel
BuildRequires: pcre-devel
%endif
# ACL support
BuildRequires: libacl-devel
# DB4/DB5 support
%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} >= 1220 || 0%{?mdkversion} || 0%{?mgaversion}
%define with_db 1
@ -729,6 +733,7 @@ done
%prep
%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
%patch1 -p1 -b .sdl
%build

@ -0,0 +1,18 @@
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index 1fedc9a..f3872b9 100644
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -74,7 +74,12 @@ if( BUILD_NOATUN_PLUGINS )
if( WITH_SDL )
pkg_search_module( SDL sdl )
if( NOT SDL_FOUND )
- tde_message_fatal( "SDL is requested, but was not found on your system" )
+ check_include_file( SDL/SDL.h HAVE_SDL_H )
+ if( NOT HAVE_SDL_H )
+ tde_message_fatal( "SDL is requested, but was not found on your system" )
+ endif ( )
+ set ( SDL_INCLUDE_DIRS /usr/include/SDL )
+ set ( SDL_LIBRARIES SDL pthread )
endif( )
endif( WITH_SDL )

@ -81,6 +81,9 @@ BuildRequires: libidn-devel
# ESOUND support
BuildRequires: esound-devel
# ACL support
BuildRequires: libacl-devel
# MESA support
%if 0%{?rhel} || 0%{?fedora}
BuildRequires: mesa-libGL-devel
@ -492,11 +495,36 @@ This package is part of Trinity, and a component of the TDE artwork module.
%{tde_datadir}/applnk/System/ScreenSavers/cwaves.desktop
%{tde_datadir}/applnk/System/ScreenSavers/topblock.desktop
%{tde_datadir}/applnk/System/ScreenSavers/voronoi.desktop
%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
%{tde_datadir}/applnk/System/ScreenSavers/cubicgrid.desktop
%{tde_datadir}/applnk/System/ScreenSavers/hypnowheel.desktop
%{tde_datadir}/applnk/System/ScreenSavers/lcdscrub.desktop
%{tde_datadir}/applnk/System/ScreenSavers/photopile.desktop
%{tde_datadir}/applnk/System/ScreenSavers/skytentacles.desktop
%endif
%if 0%{?rhel} == 5
%{tde_datadir}/applnk/System/ScreenSavers/bubbles.desktop
%{tde_datadir}/applnk/System/ScreenSavers/critical.desktop
%{tde_datadir}/applnk/System/ScreenSavers/flag.desktop
%{tde_datadir}/applnk/System/ScreenSavers/forest.desktop
%{tde_datadir}/applnk/System/ScreenSavers/glforestfire.desktop
%{tde_datadir}/applnk/System/ScreenSavers/hyperball.desktop
%{tde_datadir}/applnk/System/ScreenSavers/hypercube.desktop
%{tde_datadir}/applnk/System/ScreenSavers/juggle.desktop
%{tde_datadir}/applnk/System/ScreenSavers/laser.desktop
%{tde_datadir}/applnk/System/ScreenSavers/lightning.desktop
%{tde_datadir}/applnk/System/ScreenSavers/lisa.desktop
%{tde_datadir}/applnk/System/ScreenSavers/lissie.desktop
%{tde_datadir}/applnk/System/ScreenSavers/lmorph.desktop
%{tde_datadir}/applnk/System/ScreenSavers/mismunch.desktop
%{tde_datadir}/applnk/System/ScreenSavers/rotor.desktop
%{tde_datadir}/applnk/System/ScreenSavers/sphere.desktop
%{tde_datadir}/applnk/System/ScreenSavers/spiral.desktop
%{tde_datadir}/applnk/System/ScreenSavers/t3d.desktop
%{tde_datadir}/applnk/System/ScreenSavers/vines.desktop
%{tde_datadir}/applnk/System/ScreenSavers/whirlygig.desktop
%{tde_datadir}/applnk/System/ScreenSavers/worm.desktop
%endif
##########

@ -23,6 +23,7 @@
%define tde_pkg tdebase
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
%define tde_confdir %{_sysconfdir}/trinity
%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
%define tde_includedir %{tde_prefix}/include
@ -325,7 +326,7 @@ BuildRequires: cyrus-sasl-devel
BuildRequires: pam-devel
# LIBUSB support
%if 0%{?mageia} || 0%{?mandriva} || 0%{?pclinuxos}
%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos}
BuildRequires: %{_lib}usb1.0-devel
BuildRequires: %{_lib}usb-compat0.1-devel
%else
@ -349,10 +350,14 @@ BuildRequires: gamin-devel
%endif
# OPENLDAP support
%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
BuildRequires: openldap-devel
%endif
%if 0%{?suse_version}
BuildRequires: openldap2-devel
%else
BuildRequires: openldap-devel
%endif
%if 0%{?rhel} == 5
BuildRequires: openldap24-libs-devel
%endif
# SENSORS support
@ -371,6 +376,9 @@ BuildRequires: libudev-devel
%define with_tdehwlib 1
%endif
# ACL support
BuildRequires: libacl-devel
# XRANDR support
# On RHEL5, xrandr library is too old.
%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?suse_version}
@ -570,7 +578,7 @@ BuildRequires: drakconf
# LIBCONFIG support
# Needed for "compton" stuff
%if 0%{?rhel} >= 6 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora}
%define with_compton 1
%define with_libconfig 1
BuildRequires: libconfig-devel
%endif
@ -1295,7 +1303,7 @@ TDE applications, particularly those in the TDE base module.
%if 0%{?with_tsak}
%{tde_bindir}/tsak
%endif
%if 0%{?with_compton}
%if 0%{?with_libconfig}
%{tde_bindir}/compton-tde
%endif
%{tde_bindir}/tdedebugdialog
@ -2190,7 +2198,7 @@ already. Most users won't need this.
%dir %{tdm_datadir}/sessions
%{tdm_datadir}/sessions/*.desktop
%{tdm_datadir}/themes/
%{tde_datadir}/config/%{tdm}
%{tde_confdir}/%{tdm}
%dir %{_sysconfdir}/trinity/%{tdm}
%config(noreplace) %{_sysconfdir}/trinity/%{tdm}/*
%{tde_tdedocdir}/HTML/en/%{tdm}/
@ -3524,7 +3532,7 @@ fi
%__sed -i "tdeioslave/media/tdecmodule/media.desktop" -e "s|^Icon=.*|Icon=kcmmedia|"
# RHEL 5 does not support 'compton'
%if 0%{?with_compton} == 0
%if 0%{?with_libconfig} == 0
%__sed -i "twin/CMakeLists.txt" -e "/compton-tde/ s/^/#/"
%endif
@ -3540,6 +3548,11 @@ if [ -d "/usr/include/samba-4.0" ]; then
export CMAKE_INCLUDE_PATH="${CMAKE_INCLUDE_PATH}:/usr/include/samba-4.0"
fi
# openldap 2.4 includes (CentOS 5)
if [ -d "/usr/include/openldap24" ]; then
RPM_OPT_FLAGS="-I%{_includedir}/openldap24 -L%{_libdir}/openldap24 ${RPM_OPT_FLAGS}"
fi
if ! rpm -E %%cmake|grep -q "cd build"; then
%__mkdir_p build
cd build
@ -3556,6 +3569,7 @@ fi
-DWITH_GCC_VISIBILITY=ON \
\
-DBIN_INSTALL_DIR="%{tde_bindir}" \
-DCONFIG_INSTALL_DIR="%{tde_confdir}" \
-DINCLUDE_INSTALL_DIR="%{tde_tdeincludedir}" \
-DLIB_INSTALL_DIR="%{tde_libdir}" \
-DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
@ -3573,8 +3587,8 @@ fi
-DWITH_XFIXES=ON \
%{?!with_xrandr:-DWITH_XRANDR=OFF} \
-DWITH_XRENDER=ON \
-DWITH_XDAMAGE=ON \
-DWITH_XEXT=ON \
%{?!with_libconfig:-DWITH_LIBCONFIG=OFF} \
-DWITH_PCRE=ON \
%{?!with_xtest:-DWITH_XTEST=OFF} \
-DWITH_OPENGL=ON \
%{?!with_xscreensaver:-DWITH_XSCREENSAVER=OFF} \
@ -3582,6 +3596,7 @@ fi
-DWITH_LIBUSB=ON \
-DWITH_LIBRAW1394=ON \
-DWITH_SUDO_TDESU_BACKEND=OFF \
-DWITH_SUDO_KONSOLE_SUPER_USER_COMMAND=OFF \
-DWITH_PAM=ON \
-DWITH_SHADOW=OFF \
-DWITH_XDMCP=ON \
@ -3591,8 +3606,8 @@ fi
-DWITH_SENSORS=ON \
%{?with_hal:-DWITH_HAL=ON} \
%{?!with_tdehwlib:-DWITH_TDEHWLIB=OFF} \
-DWITH_ELFICON=OFF \
-DWITH_UPOWER=ON \
-DWITH_ELFICON=OFF \
\
-DBUILD_ALL=ON \
%if 0%{?suse_version}
@ -3606,6 +3621,9 @@ fi
%endif
%{!?with_kbdledsync:-DBUILD_TDEKBDLEDSYNC=OFF} \
%{!?with_tsak:-DBUILD_TSAK=OFF} \
%if 0%{?fedora} >= 22
-DHTDIG_SEARCH_BINARY="/usr/bin/htdig" \
%endif
..
%__make %{?_smp_mflags} || %__make
@ -3699,10 +3717,6 @@ fi
%__sed -i "s|kdm|tdm|g" "%{?buildroot}/usr/lib/systemd/system/tdm.service"
%endif
# Symlink TDM configuration
%__mkdir_p "%{?buildroot}%{tde_datadir}/config"
%__ln_s "%{_sysconfdir}/trinity/%{tdm}" "%{?buildroot}%{tde_datadir}/config/%{tdm}"
# SELINUX policy for RHEL / Fedora
%if 0%{?with_selinux_policy}
%__install -D -m 644 "%{SOURCE8}" "%{?buildroot}%{?_sysconfdir}/trinity/%{tdm}/tdm.pp"
@ -3768,8 +3782,8 @@ for i in {16,22}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i
for i in {16,22,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/places/network.png hicolor/"$i"x"$i"/apps/kcmnetpref.png ;done
for i in {16,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/devices/blockdevice.png hicolor/"$i"x"$i"/apps/kcmkdnssd.png ;done
for i in {16,22,32,48,64}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/devices/input-joystick.png hicolor/"$i"x"$i"/apps/kcmjoystick.png ;done
for i in {16,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/devices/mouse.png hicolor/"$i"x"$i"/apps/kcmmouse.png ;done
for i in {16,22,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/devices/system.png hicolor/"$i"x"$i"/apps/kcmmedia.png ;done
for i in {16,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/devices/input-mouse.png hicolor/"$i"x"$i"/apps/kcmmouse.png ;done
for i in {16,22,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/devices/computer.png hicolor/"$i"x"$i"/apps/kcmmedia.png ;done
for i in {16,22,32}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/encrypted.png hicolor/"$i"x"$i"/apps/kcmcrypto.png ;done
for i in {16,22,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/places/trashcan_empty.png hicolor/"$i"x"$i"/apps/kcmprivacy.png ;done
for i in {16,22,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/places/network.png hicolor/"$i"x"$i"/apps/kcmnic.png ;done

File diff suppressed because it is too large Load Diff

@ -1,9 +0,0 @@
#!/bin/sh
if [ -x /usr/lib/rpm/redhat/find-requires ] ; then
FINDREQ=/usr/lib/rpm/redhat/find-requires
else
FINDREQ=/usr/lib/rpm/find-requires
fi
$FINDREQ $* | sed -e '/libcairo.so.2/d' -e '/libpangocairo-1.0.so.0/d'

@ -1077,12 +1077,21 @@ exit 1
# [tdebindings] Function 'rb_frame_this_func' does not exist in RHEL4/5
%if 0%{?rhel} >= 4 && 0%{?rhel} <= 5
%__sed -i "qtruby/rubylib/qtruby/Qt.cpp" -e "s|rb_frame_this_func|rb_frame_last_func|g"
%__sed -i "qtruby/rubylib/qtruby/Qt.cpp" \
-i "korundum/rubylib/korundum/Korundum.cpp" \
-e "s|rb_frame_this_func|rb_frame_last_func|g"
%endif
# Another strange FTBFS in RHEL 5
%if 0%{?rhel} >= 4 && 0%{?rhel} <= 5
%__sed -i "xparts/xpart_notepad/shell_xparthost.cpp" \
-i "xparts/xpart_notepad/xp_notepad.cpp" \
-e "/TDEApplication/ s| );|, true, true, true);|"
%endif
# Disable kmozilla, it does not build with recent xulrunner (missing 'libmozjs.so')
%__sed -i "xparts/Makefile.am" \
-e "s|SUBDIRS = .*|SUBDIRS = src xpart_notepad|"
-e "s|SUBDIRS = .*|SUBDIRS = src xpart_notepad|"
%__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"
@ -1150,8 +1159,7 @@ pushd dcopperl
CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL INSTALLDIRS=vendor
# [Bug #348] Ugly hack to modify the man pages directory
sed -i Makefile \
-e "s|/usr/share/man|%{tde_mandir}|g"
sed -i "Makefile" -e "s|/usr/share/man|%{tde_mandir}|g"
%__make OPTIMIZE="$RPM_OPT_FLAGS" ||:
popd

@ -1362,6 +1362,11 @@ This package contains the development files for tdeedu.
%prep
%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
# RHEL5 strange FTBFS on V4L stuff
%if 0%{?rhel} == 5
%__sed -i "admin/acinclude.m4.in" -e "s|-ansi||"
%endif
%__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"

@ -0,0 +1,13 @@
--- trinity-tdeedu-14.0.1/kstars/configure.in.in.orig 2015-07-31 11:34:32.712141661 -0400
+++ trinity-tdeedu-14.0.1/kstars/configure.in.in 2015-07-31 11:35:49.442314137 -0400
@@ -87,7 +87,9 @@
[have_v4l2=true],
[have_v4l2=false],
[#include <sys/time.h>
- #include <linux/videodev2.h>])
+ extern "C" {
+ #include <linux/videodev2.h>
+ }])
if test x$have_v4l2 = xfalse; then
unset ac_cv_type_struct_v4l2_buffer
AC_CHECK_TYPE([struct v4l2_buffer],

@ -101,6 +101,9 @@ BuildRequires: libtiff-devel
# PCRE support
BuildRequires: pcre-devel
# ACL support
BuildRequires: libacl-devel
# GIF support
%if 0%{?suse_version}
BuildRequires: giflib-devel
@ -199,7 +202,6 @@ BuildRequires: OpenEXR-devel
# POPPLER support
%if 0%{?rhel} >=6 || 0%{?fedora} >= 15 || 0%{?suse_version}
BuildRequires: poppler-devel >= 0.12
#BuildRequires: poppler-qt-devel >= 0.12
%endif
%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: %{_lib}poppler-devel
@ -207,7 +209,6 @@ BuildRequires: %{_lib}poppler-devel
%if 0%{?rhel} >= 4 && 0%{?rhel} <= 5
# On RHEL 5, the distro-provided poppler is too old. We built a newer one.
BuildRequires: trinity-poppler-devel >= 0.12
BuildRequires: trinity-poppler-qt3-devel >= 0.12
%endif
# LCMS support
@ -1278,6 +1279,15 @@ applications against tdegraphics libraries.
# Fix applications icons
%__sed -i "kooka/kooka.desktop" -e "s|^Icon=.*|Icon=kooka|"
# Fix FTBFS in RHEL 5
%if 0%{?rhel} && 0%{?rhel} <= 5
%__sed -i "kpdf/xpdf/aconf.h" \
-e "s|#define HAVE_MKSTEMPS 1|#define HAVE_MKSTEMPS 0|"
%__sed -i "tdefile-plugins/dependencies/poppler-tqt/CMakeLists.txt" \
-e "/link_directories/ s|$|\n \${POPPLER_LIBRARY_DIRS}|" \
-e "/{POPPLER_INCLUDE_DIRS/ s|$|\n \${POPPLER_INCLUDE_DIRS}/..|"
%endif
%build
unset QTDIR QTINC QTLIB

@ -1,173 +1,31 @@
From 608ee3f53763ca7fe4e925e8309525c78d937984 Mon Sep 17 00:00:00 2001
From: Slávek Banko <slavek.banko@axis.cz>
Date: Thu, 25 Dec 2014 18:10:23 +0000
Subject: Fix FTBFS because CUPS 2.x
This resolves Bug 2270
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 592bebb509786ccec893b305d3ae6a0c76ed3bdb)
---
diff --git a/tdeprint/cups/cupsdconf2/cups-util.c b/tdeprint/cups/cupsdconf2/cups-util.c
index eadd6b6..3772b35 100644
--- a/tdeprint/cups/cupsdconf2/cups-util.c
+++ b/tdeprint/cups/cupsdconf2/cups-util.c
@@ -33,7 +33,7 @@ cupsGetConf(void)
char prompt[1024]; /* Prompt string */
int digest_tries; /* Number of tries with Digest */
static char filename[HTTP_MAX_URI]; /* Local filename */
-#if CUPS_VERSION_MAJOR - 0 <= 1 && CUPS_VERSION_MINOR - 0 < 2
+#if CUPS_VERSION_MAJOR < 1 || (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 2)
const char *fqdn = 0;
#else
char fqdn[ HTTP_MAX_URI ]; /* Server name buffer */
@@ -119,7 +119,7 @@ cupsGetConf(void)
* See if we should retry the current digest password...
*/
-#if CUPS_VERSION_MAJOR - 0 <= 1 && CUPS_VERSION_MINOR - 0 < 2
+#if CUPS_VERSION_MAJOR < 1 || (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 2)
www_authenticate = cups_server->fields[HTTP_FIELD_WWW_AUTHENTICATE];
#else
www_authenticate = httpGetField( cups_server, HTTP_FIELD_WWW_AUTHENTICATE );
@@ -130,7 +130,7 @@ cupsGetConf(void)
/*
* Nope - get a password from the user...
*/
-#if CUPS_VERSION_MAJOR - 0 <= 1 && CUPS_VERSION_MINOR - 0 < 2
+#if CUPS_VERSION_MAJOR < 1 || (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 2)
fqdn = cups_server->hostname;
#else
httpGetHostname( cups_server, fqdn, sizeof( fqdn ) );
@@ -155,7 +155,7 @@ cupsGetConf(void)
* Got a password; encode it for the server...
*/
-#if CUPS_VERSION_MAJOR - 0 <= 1 && CUPS_VERSION_MINOR - 0 < 2
+#if CUPS_VERSION_MAJOR < 1 || (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 2)
www_authenticate = cups_server->fields[HTTP_FIELD_WWW_AUTHENTICATE];
#else
www_authenticate = httpGetField( cups_server, HTTP_FIELD_WWW_AUTHENTICATE );
@@ -167,7 +167,7 @@ cupsGetConf(void)
*/
snprintf(plain, sizeof(plain), "%s:%s", cupsUser(), pwdstring);
-#if CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 2
+#if CUPS_VERSION_MAJOR > 1 || (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 2)
httpEncode64_2(encode, sizeof(encode), plain, sizeof(plain));
#else
httpEncode64(encode, plain);
@@ -236,7 +236,7 @@ cupsGetConf(void)
*/
while ((bytes =
-#if CUPS_VERSION_MAJOR - 0 <= 1 && CUPS_VERSION_MINOR - 0 < 2
+#if CUPS_VERSION_MAJOR < 1 || (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 2)
httpRead
#else
httpRead2
@@ -266,7 +266,7 @@ cupsPutConf(const char *name) /* I - Name of the config file to send */
http_status_t status; /* HTTP status from server */
char prompt[1024]; /* Prompt string */
int digest_tries; /* Number of tries with Digest */
-#if CUPS_VERSION_MAJOR - 0 <= 1 && CUPS_VERSION_MINOR - 0 < 2
+#if CUPS_VERSION_MAJOR < 1 || (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 2)
const char *fqdn = 0;
#else
char fqdn[ HTTP_MAX_URI ]; /* Server name buffer */
@@ -341,7 +341,7 @@ cupsPutConf(const char *name) /* I - Name of the config file to send */
break;
}
else
-#if CUPS_VERSION_MAJOR - 0 <= 1 && CUPS_VERSION_MINOR - 0 < 2
+#if CUPS_VERSION_MAJOR < 1 || (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 2)
httpWrite
#else
httpWrite2
@@ -350,7 +350,7 @@ cupsPutConf(const char *name) /* I - Name of the config file to send */
if (status == HTTP_CONTINUE)
{
-#if CUPS_VERSION_MAJOR - 0 <= 1 && CUPS_VERSION_MINOR - 0 < 2
+#if CUPS_VERSION_MAJOR < 1 || (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 2)
httpWrite
#else
httpWrite2
@@ -381,7 +381,7 @@ cupsPutConf(const char *name) /* I - Name of the config file to send */
* See if we should retry the current digest password...
*/
-#if CUPS_VERSION_MAJOR - 0 <= 1 && CUPS_VERSION_MINOR - 0 < 2
+#if CUPS_VERSION_MAJOR < 1 || (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 2)
www_authenticate = cups_server->fields[HTTP_FIELD_WWW_AUTHENTICATE];
#else
www_authenticate = httpGetField( cups_server, HTTP_FIELD_WWW_AUTHENTICATE );
@@ -394,7 +394,7 @@ cupsPutConf(const char *name) /* I - Name of the config file to send */
*/
-#if CUPS_VERSION_MAJOR - 0 <= 1 && CUPS_VERSION_MINOR - 0 < 2
+#if CUPS_VERSION_MAJOR < 1 || (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 2)
fqdn = cups_server->hostname;
#else
httpGetHostname( cups_server, fqdn, sizeof( fqdn ) );
@@ -418,7 +418,7 @@ cupsPutConf(const char *name) /* I - Name of the config file to send */
* Got a password; encode it for the server...
*/
-#if CUPS_VERSION_MAJOR - 0 <= 1 && CUPS_VERSION_MINOR - 0 < 2
+#if CUPS_VERSION_MAJOR < 1 || (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 2)
www_authenticate = cups_server->fields[HTTP_FIELD_WWW_AUTHENTICATE];
#else
www_authenticate = httpGetField( cups_server, HTTP_FIELD_WWW_AUTHENTICATE );
@@ -430,7 +430,7 @@ cupsPutConf(const char *name) /* I - Name of the config file to send */
*/
snprintf(plain, sizeof(plain), "%s:%s", cupsUser(), pwdstring);
-#if CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 2
+#if CUPS_VERSION_MAJOR > 1 || (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 2)
httpEncode64_2(encode, sizeof(encode), plain, sizeof(plain));
#else
httpEncode64(encode, plain);
@@ -512,7 +512,7 @@ cups_local_auth(http_t *http) /* I - Connection */
* See if we are accessing localhost...
the struct has changed in newer versions - PiggZ (adam@piggz.co.uk)
*/
-#if CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 2
+#if CUPS_VERSION_MAJOR > 1 || (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 2)
if (!httpAddrLocalhost(http))
#else
if (ntohl(*(int*)&http->hostaddr.sin_addr) != 0x7f000001 &&
diff --git a/tdeprint/cups/ipprequest.cpp b/tdeprint/cups/ipprequest.cpp
index b4e3991..8a36315 100644
--- a/tdeprint/cups/ipprequest.cpp
+++ b/tdeprint/cups/ipprequest.cpp
@@ -407,7 +407,7 @@ bool IppRequest::doFileRequest(const TQString& res, const TQString& filename)
}
#ifdef HAVE_CUPS_NO_PWD_CACHE
-#if CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR <= 2
+#if CUPS_VERSION_MAJOR < 1 || (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 2)
strncpy( HTTP->authstring, cups_authstring.data(), HTTP_MAX_VALUE );
#else
httpSetAuthString( HTTP, NULL, cups_authstring.data() );
@@ -421,7 +421,7 @@ bool IppRequest::doFileRequest(const TQString& res, const TQString& filename)
request_ = cupsDoFileRequest(HTTP, request_, (res.isEmpty() ? "/" : res.latin1()), (filename.isEmpty() ? NULL : filename.latin1()));
#ifdef HAVE_CUPS_NO_PWD_CACHE
-#if CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR <= 2
+#if CUPS_VERSION_MAJOR < 1 || (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 2)
cups_authstring = HTTP->authstring;
#else
cups_authstring = httpGetAuthString( HTTP );
@@ -757,7 +757,7 @@ void IppRequest::setMap(const TQMap<TQString,TQString>& opts)
cupsFreeOptions(n, options);
// find an remove that annoying "document-format" attribute
-#if CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 2
+#if CUPS_VERSION_MAJOR > 1 || (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 2)
ipp_attribute_t *attr = ippFindAttribute(request_, "document-format", IPP_TAG_NAME);
ippDeleteAttribute(request_, attr);
#else
--
cgit v0.9.0.2-52-g1de3
diff --git a/tdecore/tdeglobal.h b/tdecore/tdeglobal.h
index b5fddb8..1269c36 100644
--- a/tdecore/tdeglobal.h
+++ b/tdecore/tdeglobal.h
@@ -25,8 +25,10 @@ class KCharsets;
class TDEConfig;
class TDESharedConfig;
class TDEIconLoader;
+#ifdef __TDE_HAVE_TDEHWLIB
class TDEHardwareDevices;
class TDEGlobalNetworkManager;
+#endif
class TDELocale;
class TDEStandardDirs;
class KStaticDeleterBase;
@@ -79,6 +81,7 @@ public:
*/
static TDEIconLoader *iconLoader();
+#ifdef __TDE_HAVE_TDEHWLIB
/**
* Returns a TDEHardwareDevices object.
* @return the global hardware devices object
@@ -90,6 +93,7 @@ public:
* @return the global network manager object
*/
static TDEGlobalNetworkManager *networkManager();
+#endif
/**
* Returns the global locale object.

@ -27,6 +27,7 @@
%define tde_pkg tdelibs
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
%define tde_confdir %{_sysconfdir}/trinity
%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
%define tde_includedir %{tde_prefix}/include
@ -63,7 +64,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
Source1: %{name}-rpmlintrc
Patch0: %{tde_pkg}-%{tde_version}.patch
Patch0: tdelibs-14.0.1.patch
Obsoletes: tdelibs < %{version}-%{release}
Provides: tdelibs = %{version}-%{release}
@ -124,6 +126,9 @@ BuildRequires: libtiff-devel
# OPENSSL support
BuildRequires: openssl-devel
# ACL support
BuildRequires: libacl-devel
# GLIB2 support
BuildRequires: glib2-devel
@ -314,6 +319,9 @@ Requires: %{cacert}
%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
%define xt_devel libXt-devel
%endif
%if 0%{?mgaversion} || 0%{?mdkversion}
%define xt_devel libxt-devel
%endif
%{?xt_devel:BuildRequires: %{xt_devel}}
### New features in TDE R14
@ -470,7 +478,6 @@ kimgio (image manipulation).
%{tde_datadir}/applnk/tdeio_iso.desktop
%{tde_datadir}/apps/*
%exclude %{tde_datadir}/apps/ksgmltools2/
%{tde_datadir}/config/*
%{tde_datadir}/emoticons/*
%{tde_datadir}/icons/crystalsvg/
%{tde_datadir}/icons/default.tde
@ -482,6 +489,9 @@ kimgio (image manipulation).
%{tde_tdedocdir}/HTML/en/common/*
%{tde_tdedocdir}/HTML/en/tdespell/
# Global Trinity configuration
%config %{tde_confdir}
# Some setuid binaries need special care
%if 0%{?suse_version}
%verify(not mode) %{tde_bindir}/kgrantpty
@ -578,6 +588,13 @@ applications for TDE.
%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
%patch0 -p1 -b .ftbfs
# RHEL 5: remove tdehwlib stuff from include files, to avoid FTBFS in tdebindings
%if 0%{?rhel} == 5
%__sed -i "tdecore/kinstance.h" \
-i "tdecore/tdeglobal.h" \
-e "/#ifdef __TDE_HAVE_TDEHWLIB/,/#endif/d"
%endif
%build
unset QTDIR QTINC QTLIB
@ -607,6 +624,7 @@ fi
\
-DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
-DBIN_INSTALL_DIR="%{tde_bindir}" \
-DCONFIG_INSTALL_DIR="%{tde_confdir}" \
-DDOC_INSTALL_DIR="%{tde_docdir}" \
-DINCLUDE_INSTALL_DIR="%{tde_tdeincludedir}" \
-DLIB_INSTALL_DIR="%{tde_libdir}" \
@ -698,5 +716,5 @@ chmod 0755 "%{?buildroot}%{tde_bindir}/start_tdeinit"
%changelog
* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
- Initial release for TDE 14.0.0
* Tue Jul 21 2015 Francois Andriot <francois.andriot@free.fr> - 14.0.1-1
- Initial release for TDE 14.0.1

@ -1,704 +0,0 @@
#
# spec file for package tdelibs (version R14)
#
# 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/
#
# BUILD WARNING:
# Remove qt-devel and qt3-devel and any kde*-devel on your system !
# Having KDE libraries may cause FTBFS here !
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
%define tde_version 14.0.1
%endif
%define tde_pkg tdelibs
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
%define tde_confdir %{_sysconfdir}/trinity
%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_tdeappdir %{tde_datadir}/applications/tde
%define tde_tdedocdir %{tde_docdir}/tde
%define tde_tdeincludedir %{tde_includedir}/tde
%define tde_tdelibdir %{tde_libdir}/trinity
# 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
Name: trinity-%{tde_pkg}
Version: %{tde_version}
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
Summary: TDE Libraries
Group: System/GUI/Other
URL: http://www.trinitydesktop.org/
%if 0%{?suse_version}
License: GPL-2.0+
%else
License: GPLv2+
%endif
#Vendor: Trinity Desktop
#Packager: Francois Andriot <francois.andriot@free.fr>
Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
Source1: %{name}-rpmlintrc
Obsoletes: tdelibs < %{version}-%{release}
Provides: tdelibs = %{version}-%{release}
Obsoletes: trinity-kdelibs < %{version}-%{release}
Provides: trinity-kdelibs = %{version}-%{release}
Obsoletes: trinity-kdelibs-apidocs < %{version}-%{release}
Provides: trinity-kdelibs-apidocs = %{version}-%{release}
# for set_permissions macro
%if 0%{?suse_version}
PreReq: permissions
%endif
# Trinity dependencies
BuildRequires: libtqt4-devel = %{tde_epoch}:4.2.0
BuildRequires: trinity-arts-devel >= %{tde_epoch}:1.5.10
BuildRequires: libdbus-tqt-1-devel >= %{tde_epoch}:0.63
BuildRequires: libdbus-1-tqt-devel >= %{tde_epoch}:0.9
BuildRequires: trinity-filesystem >= %{tde_version}
Requires: trinity-arts >= %{tde_epoch}:1.5.10
Requires: trinity-filesystem >= %{tde_version}
Requires: fileshareset >= 2.0
BuildRequires: cmake >= 2.8
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
# KRB5 support
BuildRequires: krb5-devel
# XSLT support
BuildRequires: libxslt-devel
# ALSA support
BuildRequires: alsa-lib-devel
# IDN support
BuildRequires: libidn-devel
# CUPS support
BuildRequires: cups-devel
# TIFF support
BuildRequires: libtiff-devel
# OPENSSL support
BuildRequires: openssl-devel
# GLIB2 support
BuildRequires: glib2-devel
# LUA support are not ready yet
#BuildRequires: lua-devel
# LIBART_LGPL support
BuildRequires: libart_lgpl-devel
# ASPELL support
BuildRequires: aspell
BuildRequires: aspell-devel
# GAMIN support
# Not on openSUSE.
%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
%define with_gamin 1
BuildRequires: gamin-devel
%endif
# PCRE support
%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
%define with_pcre 1
BuildRequires: pcre-devel
%endif
# INOTIFY support
%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
%define with_inotify 1
%endif
# BZIP2 support
%if 0%{?suse_version}
BuildRequires: libbz2-devel
%else
BuildRequires: bzip2-devel
%endif
# UTEMPTER support
%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: %{_lib}utempter-devel
%endif
%if 0%{?rhel} >=5 || 0%{?fedora}
BuildRequires: libutempter-devel
%endif
%if 0%{?rhel} == 4
BuildRequires: utempter
%endif
%if 0%{?suse_version}
BuildRequires: utempter-devel
%endif
# HSPELL support
%if 0%{?rhel} >=6 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
%define with_hspell 1
BuildRequires: hspell-devel
%endif
# JASPER support
%if 0%{?rhel} >=6 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
%define with_jasper 1
%if 0%{?suse_version}
BuildRequires: libjasper-devel
%endif
%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: %{_lib}jasper-devel
%endif
%if 0%{?rhel} || 0%{?fedora}
BuildRequires: jasper-devel
%endif
%endif
# AVAHI support
%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
%define with_avahi 1
BuildRequires: libavahi-tqt-devel >= 1:0.6.30
%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: %{_lib}avahi-client-devel
Requires: %{_lib}avahi-client3
%endif
%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version}
BuildRequires: avahi-devel
Requires: avahi
%endif
%endif
# OPENEXR support
%if 0%{?rhel} >=6 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
%define with_openexr 1
BuildRequires: OpenEXR-devel
%endif
# LIBTOOL
BuildRequires: libtool
%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: %{_lib}ltdl-devel
%endif
%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220
BuildRequires: libtool-ltdl-devel
%endif
# X11 support
%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: x11-proto-devel
%endif
%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version}
BuildRequires: xorg-x11-proto-devel
%endif
%if 0%{?rhel} == 4
BuildRequires: xorg-x11-devel
%endif
# ICEAUTH
%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} >= 1220
Requires: iceauth
%endif
%if 0%{?rhel} >= 5 || 0%{?fedora}
Requires: xorg-x11-server-utils
%endif
%if 0%{?rhel} == 4 || 0%{?suse_version}
Requires: xorg-x11
%endif
# XZ support
%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version}
%define with_lzma 1
%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: %{_lib}lzma-devel
%endif
%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version}
BuildRequires: xz-devel
%endif
%endif
# Certificates support
%if 0%{?fedora} || 0%{?rhel} >= 6
BuildRequires: ca-certificates
Requires: ca-certificates
%if 0%{?fedora} >= 20 || 0%{?rhel} >= 6
%define cacert %{_sysconfdir}/pki/tls/certs/ca-bundle.crt
%endif
%if 0%{?fedora} == 18 || 0%{?fedora} == 19
%define cacert %{_sysconfdir}/ssl/certs/ca-certificates.crt
%endif
%endif
%if 0%{?mgaversion} || 0%{?mdkversion}
%if 0%{?pclinuxos}
Requires: rootcerts
%define cacert %{_sysconfdir}/pki/tls/certs/ca-bundle.crt
%else
%define cacert %{_sysconfdir}/ssl/certs/ca-bundle.crt
Requires: openssl
%endif
%endif
%if 0%{?rhel} == 5
%define cacert %{_sysconfdir}/pki/tls/certs/ca-bundle.crt
Requires: openssl
%endif
%if 0%{?suse_version}
%define cacert %{_sysconfdir}/ssl/ca-bundle.pem
BuildRequires: ca-certificates
Requires: ca-certificates
%endif
%if "%{cacert}" != ""
Requires: %{cacert}
%endif
# XRANDR support
# On RHEL5, xrandr library is too old.
%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?suse_version}
%define with_xrandr 1
%endif
# XCOMPOSITE support
%if 0%{?mgaversion} || 0%{?mdkversion}
%if 0%{?mgaversion} >= 4
%define xcomposite_devel %{_lib}xcomposite-devel
%else
%define xcomposite_devel %{_lib}xcomposite%{?mgaversion:1}-devel
%endif
%endif
%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220
%define xcomposite_devel libXcomposite-devel
%endif
%{?xcomposite_devel:BuildRequires: %{xcomposite_devel}}
# XT support
%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
%define xt_devel libXt-devel
%endif
%{?xt_devel:BuildRequires: %{xt_devel}}
### New features in TDE R14
# LIBMAGIC support
%if 0%{?rhel} == 5
BuildRequires: file
%else
BuildRequires: file-devel
%endif
# NETWORKMANAGER support
%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?suse_version}
%define with_nm 1
%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: %{_lib}nm-util-devel
%endif
%if 0%{?rhel} >= 6 || 0%{?fedora}
BuildRequires: NetworkManager-glib-devel
%endif
%if 0%{?suse_version}
BuildRequires: NetworkManager-devel
%endif
%endif
# UDEV support
%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6
%define with_tdehwlib 1
BuildRequires: libudev-devel
%endif
# HAL support
%if 0%{?rhel} == 5
%define with_hal 1
%endif
# UDISKS support
%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} == 6
%if 0%{?pclinuxos} == 0
%define with_udisks 1
BuildRequires: udisks-devel
Requires: udisks
%endif
%endif
# PMOUNT support
#Requires: pmount
# UDISKS2 support
%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 7
%define with_udisks2 1
%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
BuildRequires: libudisks2-devel
%else
BuildRequires: udisks2-devel
%endif
Requires: udisks2
%endif
# DEVICEKIT POWER support
%if 0%{?rhel} == 6
%define with_devkitpower 1
Requires: DeviceKit-power
%endif
# UPOWER support
%if 0%{?fedora} || 0%{?suse_version} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?rhel} >= 7
%define with_upower 1
Requires: upower
%endif
# SYSTEMD support
%if 0%{?fedora} || 0%{?suse_version} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?rhel} >= 7
%define with_systemd 1
%endif
%description
Libraries for the Trinity Desktop Environment:
TDE Libraries included: tdecore (TDE core library), tdeui (user interface),
kfm (file manager), tdehtmlw (HTML widget), tdeio (Input/Output, networking),
kspell (spelling checker), jscript (javascript), kab (addressbook),
kimgio (image manipulation).
%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING COPYING-DOCS COPYING.LIB README TODO
%{tde_bindir}/artsmessage
%{tde_bindir}/cupsdconf
%{tde_bindir}/cupsdoprint
%{tde_bindir}/dcop
%{tde_bindir}/dcopclient
%{tde_bindir}/dcopfind
%{tde_bindir}/dcopobject
%{tde_bindir}/dcopquit
%{tde_bindir}/dcopref
%{tde_bindir}/dcopserver
%{tde_bindir}/dcopserver_shutdown
%{tde_bindir}/dcopstart
%{tde_bindir}/imagetops
%{tde_bindir}/tdeab2tdeabc
%{tde_bindir}/kaddprinterwizard
%{tde_bindir}/tdebuildsycoca
%{tde_bindir}/tdecmshell
%{tde_bindir}/tdeconf_update
%{tde_bindir}/kcookiejar
%{tde_bindir}/tde-config
%{tde_bindir}/tde-menu
%{tde_bindir}/kded
%{tde_bindir}/tdeinit
%{tde_bindir}/tdeinit_shutdown
%{tde_bindir}/tdeinit_wrapper
%{tde_bindir}/tdesu_stub
%{tde_bindir}/kdetcompmgr
%{tde_bindir}/kdontchangethehostname
%{tde_bindir}/tdedostartupconfig
%{tde_bindir}/tdefile
%{tde_bindir}/kfmexec
%{tde_bindir}/tdehotnewstuff
%{tde_bindir}/kinstalltheme
%{tde_bindir}/tdeio_http_cache_cleaner
%{tde_bindir}/tdeio_uiserver
%{tde_bindir}/tdeioexec
%{tde_bindir}/tdeioslave
%{tde_bindir}/tdeiso_info
%{tde_bindir}/tdelauncher
%if 0%{?with_elficon}
%{tde_bindir}/tdelfeditor
%endif
%{tde_bindir}/tdemailservice
%{tde_bindir}/tdemimelist
%{tde_bindir}/tdesendbugmail
%{tde_bindir}/kshell
%{tde_bindir}/tdestartupconfig
%{tde_bindir}/tdetelnetservice
%{tde_bindir}/tdetradertest
%{tde_bindir}/kwrapper
%{tde_bindir}/lnusertemp
%{tde_bindir}/make_driver_db_cups
%{tde_bindir}/make_driver_db_lpr
%{tde_bindir}/meinproc
%{tde_bindir}/networkstatustestservice
%{tde_bindir}/start_tdeinit_wrapper
%{tde_bindir}/checkXML
%{tde_bindir}/ksvgtopng
%{tde_bindir}/tdeunittestmodrunner
%{tde_bindir}/preparetips
%{tde_tdelibdir}/*
%{tde_libdir}/lib*.so.*
%{tde_libdir}/libtdeinit_*.la
%{tde_libdir}/libtdeinit_*.so
%{tde_datadir}/applications/tde/*.desktop
%{tde_datadir}/autostart/tdeab2tdeabc.desktop
%{tde_datadir}/applnk/tdeio_iso.desktop
%{tde_datadir}/apps/*
%exclude %{tde_datadir}/apps/ksgmltools2/
%{tde_datadir}/emoticons/*
%{tde_datadir}/icons/crystalsvg/
%{tde_datadir}/icons/default.tde
%{tde_datadir}/icons/hicolor/index.theme
%{tde_datadir}/locale/all_languages
%{tde_datadir}/mimelnk/*/*.desktop
%{tde_datadir}/services/*
%{tde_datadir}/servicetypes/*
%{tde_tdedocdir}/HTML/en/common/*
%{tde_tdedocdir}/HTML/en/tdespell/
# Global Trinity configuration
%config %{tde_confdir}
# Some setuid binaries need special care
%if 0%{?suse_version}
%verify(not mode) %{tde_bindir}/kgrantpty
%verify(not mode) %{tde_bindir}/kpac_dhcp_helper
%verify(not mode) %{tde_bindir}/start_tdeinit
%else
%attr(4755,root,root) %{tde_bindir}/kgrantpty
%attr(4755,root,root) %{tde_bindir}/kpac_dhcp_helper
%attr(4711,root,root) %{tde_bindir}/start_tdeinit
%endif
%config %{_sysconfdir}/xdg/menus/tde-applications.menu
%config %{_sysconfdir}/xdg/menus/tde-applications.menu-no-kde
# DBUS stuff, related to TDE hwlib
%if 0%{?with_tdehwlib}
%{tde_bindir}/tde_dbus_hardwarecontrol
%config %{_sysconfdir}/dbus-1/system.d/org.trinitydesktop.hardwarecontrol.conf
%{_datadir}/dbus-1/system-services/org.trinitydesktop.hardwarecontrol.service
%endif
%pre
# TDE Bug #1074
if [ -d "%{tde_datadir}/locale/all_languages" ]; then
rm -rf "%{tde_datadir}/locale/all_languages"
fi
%post
/sbin/ldconfig || :
%if 0%{?suse_version}
# Sets permissions on setuid files (openSUSE specific)
%set_permissions %{tde_bindir}/kgrantpty
%set_permissions %{tde_bindir}/kpac_dhcp_helper
%set_permissions %{tde_bindir}/start_tdeinit
%endif
%postun
/sbin/ldconfig || :
##########
%package devel
Summary: TDE Libraries (Development files)
Group: Development/Libraries/X11
Requires: %{name} = %{version}-%{release}
Obsoletes: tdelibs-devel < %{version}-%{release}
Provides: tdelibs-devel = %{version}-%{release}
Obsoletes: trinity-kdelibs-devel < %{version}-%{release}
Provides: trinity-kdelibs-devel = %{version}-%{release}
Requires: libtqt3-mt-devel >= 3.5.0
Requires: libtqt4-devel = %{tde_epoch}:4.2.0
Requires: trinity-arts-devel >= %{tde_epoch}:1.5.10
Requires: libart_lgpl-devel
%{?xcomposite_devel:Requires: %{xcomposite_devel}}
%{?xt_devel:Requires: %{xt_devel}}
%description devel
This package includes the header files you will need to compile
applications for TDE.
%files devel
%defattr(-,root,root,-)
%{tde_bindir}/dcopidl*
%{tde_bindir}/*config_compiler
%{tde_bindir}/maketdewidgets
%{tde_datadir}/apps/ksgmltools2/
%{tde_tdeincludedir}/*
%{tde_libdir}/*.la
%{tde_libdir}/*.so
%{tde_libdir}/*.a
%exclude %{tde_libdir}/libtdeinit_*.la
%exclude %{tde_libdir}/libtdeinit_*.so
%{tde_datadir}/cmake/tdelibs.cmake
%{tde_libdir}/pkgconfig/tdelibs.pc
%post devel
/sbin/ldconfig || :
%postun devel
/sbin/ldconfig || :
##########
%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
%debug_package
%endif
##########
%prep
%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
if [ -d "/usr/X11R6" ]; then
export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -L/usr/X11R6/%{_lib} -I/usr/X11R6/include"
fi
export TDEDIR="%{tde_prefix}"
if ! rpm -E %%cmake|grep -q "cd build"; then
%__mkdir_p build
cd build
fi
%cmake \
-DCMAKE_BUILD_TYPE="RelWithDebInfo" \
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_SKIP_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_NO_BUILTIN_CHRPATH=ON \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=ON \
\
-DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
-DBIN_INSTALL_DIR="%{tde_bindir}" \
-DCONFIG_INSTALL_DIR="%{tde_confdir}" \
-DDOC_INSTALL_DIR="%{tde_docdir}" \
-DINCLUDE_INSTALL_DIR="%{tde_tdeincludedir}" \
-DLIB_INSTALL_DIR="%{tde_libdir}" \
-DPKGCONFIG_INSTALL_DIR="%{tde_libdir}/pkgconfig" \
-DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
\
-DWITH_ALL_OPTIONS=ON \
-DWITH_ARTS=ON \
-DWITH_ALSA=ON \
-DWITH_LIBART=ON \
-DWITH_LIBIDN=ON \
-DWITH_SSL=ON \
-DWITH_CUPS=ON \
-DWITH_LUA=OFF \
-DWITH_TIFF=ON \
%{?!with_jasper:-DWITH_JASPER=OFF} \
%{?!with_openexr:-DWITH_OPENEXR=OFF} \
-DWITH_UTEMPTER=ON \
%{?!with_elficon:-DWITH_ELFICON=OFF} \
%{?!with_avahi:-DWITH_AVAHI=OFF} \
%{?!with_pcre:-DWITH_PCRE=OFF} \
%{?!with_inotify:-DWITH_INOTIFY=OFF} \
%{?!with_gamin:-DWITH_GAMIN=OFF} \
%{?!with_tdehwlib:-DWITH_TDEHWLIB=OFF} \
%{?!with_tdehwlib:-DWITH_TDEHWLIB_DAEMONS=OFF} \
%{?with_hal:-DWITH_HAL=ON} \
%{?with_devkitpower:-DWITH_DEVKITPOWER=ON} \
%{?with_systemd:-DWITH_LOGINDPOWER=ON} \
%{?!with_upower:-DWITH_UPOWER=OFF} \
%{?!with_udisks:-DWITH_UDISKS=OFF} \
%{?!with_udisks2:-DWITH_UDISKS2=OFF} \
-DWITH_CONSOLEKIT=ON \
%{?with_nm:-DWITH_NETWORK_MANAGER_BACKEND=ON} \
-DWITH_SUDO_TDESU_BACKEND=OFF \
-DWITH_OLD_XDG_STD=OFF \
%{?!with_lzma:-DWITH_LZMA=OFF} \
-DWITH_LIBBFD=OFF \
%{?!with_xrandr:-DWITH_XRANDR=OFF} \
-DWITH_XCOMPOSITE=ON \
-DWITH_KDE4_MENU_SUFFIX=OFF \
\
-DWITH_ASPELL=ON \
%{?!with_hspell:-DWITH_HSPELL=OFF} \
-DWITH_TDEICONLOADER_DEBUG=OFF \
..
%__make %{?_smp_mflags} || %__make
%install
%__rm -rf "%{?buildroot}"
%__make install DESTDIR="%{?buildroot}" -C build
# Use system-wide CA certificates
%if "%{?cacert}" != ""
%__rm -f "%{?buildroot}%{tde_datadir}/apps/kssl/ca-bundle.crt"
%__ln_s "%{cacert}" "%{?buildroot}%{tde_datadir}/apps/kssl/ca-bundle.crt"
%endif
# Symlinks duplicate files (mostly under 'ksgmltools2')
%fdupes -s "%{?buildroot}"
# Fix 'tderesources.desktop' (openSUSE only)
%if 0%{?suse_version}
%suse_update_desktop_file -r tderesources Qt X-TDE-settings-desktop
%endif
# Remove setuid bit on some binaries.
chmod 0755 "%{?buildroot}%{tde_bindir}/kgrantpty"
chmod 0755 "%{?buildroot}%{tde_bindir}/kpac_dhcp_helper"
chmod 0755 "%{?buildroot}%{tde_bindir}/start_tdeinit"
# fileshareset 2.0 is provided separately.
# Remove integrated fileshareset 1.0 .
%__rm -f "%{?buildroot}%{tde_bindir}/filesharelist"
%__rm -f "%{?buildroot}%{tde_bindir}/fileshareset"
%clean
%__rm -rf "%{?buildroot}"
%if 0%{?suse_version}
# Check permissions on setuid files (openSUSE specific)
%verifyscript
%verify_permissions -e %{tde_bindir}/kgrantpty
%verify_permissions -e %{tde_bindir}/kpac_dhcp_helper
%verify_permissions -e %{tde_bindir}/start_tdeinit
%endif
%changelog
* Tue Jul 21 2015 Francois Andriot <francois.andriot@free.fr> - 14.0.1-1
- Initial release for TDE 14.0.1

@ -43,7 +43,7 @@
Name: trinity-%{tde_pkg}
Summary: Multimedia applications for the Trinity Desktop Environment (TDE)
Summary: Multimedia applications for the Trinity Desktop Environment
Version: %{tde_version}
Release: %{?!preversion:2}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
Group: Productivity/Multimedia/Sound/Utilities
@ -96,10 +96,11 @@ BuildRequires: brp-check-trinity
BuildRequires: taglib-devel
# AKODE support
%if 0%{?with_akode}
%define with_akode 1
BuildRequires: trinity-akode-devel
%{?with_mad:BuildRequires: trinity-akode-libmad}
%endif
%define with_mad 1
%{?with_mad:BuildRequires: libakode_mpeg_decoder}
# ZLIB support
BuildRequires: zlib-devel
@ -1272,7 +1273,7 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
%{?with_xine:--with-xine} %{!?with_xine:--without-xine}
# Fix unexplained "undefined reference to `__stack_chk_fail'"
%if 0%{?mgaversion} == 4 || 0%{?pclinuxos}
%if 0%{?mgaversion} >= 4 || 0%{?pclinuxos}
%__sed -i "noatun/app/Makefile" -e "/^libtdeinit_noatun_la_LDFLAGS/ s/$/ -Wl,-lc/"
%endif
@ -1303,7 +1304,7 @@ export PATH="%{tde_bindir}:${PATH}"
# Copy missing icons from 'crystalsvg' theme (tdelibs)
%__mkdir_p "%{?buildroot}{tde_datadir}/icons/hicolor/"{16x16,22x22,32x32,48x48,64x64}"/apps/"
pushd $RPM_BUILD_ROOT%{tde_datadir}/icons/
for i in {16,22,32,48,64}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/devices/cdaudio_unmount.png hicolor/"$i"x"$i"/apps/kcmaudiocd.png; done
for i in {16,22,32,48,64}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/devices/media-optical-cdaudio.png hicolor/"$i"x"$i"/apps/kcmaudiocd.png; done
popd
# Updates applications categories for openSUSE

File diff suppressed because it is too large Load Diff

@ -218,6 +218,9 @@ BuildRequires: speex-devel
#{?fedora:Requires(hint): qca-tls}
Requires: jasper
# ACL support
BuildRequires: libacl-devel
# MEANWHILE support
%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?suse_version}
%define with_meanwhile 1

@ -73,9 +73,6 @@ Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
%if 0%{?rhel} == 5
Patch0: %{tde_pkg}-%{version}.patch
%endif
BuildRequires: trinity-arts-devel >= %{tde_epoch}:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
@ -114,15 +111,13 @@ BuildRequires: brp-check-trinity
BuildRequires: gamin-devel
%endif
# CURL support
# FLEX support
%if 0%{?fedora} >= 15
BuildRequires: flex-static
%endif
%if 0%{?rhel} > 0 && 0%{?rhel} <= 5
BuildRequires: trinity-libcurl-devel
%else
# CURL support
BuildRequires: curl-devel
%endif
# GLIB2 support
BuildRequires: glib2-devel
@ -147,28 +142,47 @@ BuildRequires: libXcomposite-devel
%endif
# XSCREENSAVER support
# Disabled on RHEL4
%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
# RHEL 4: disabled
# RHEL 6: available in EPEL
# RHEL 7: available in NUX
%if 0%{?fedora} || 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
%if 0%{?fedora} || 0%{?rhel} >= 5
BuildRequires: libXScrnSaver-devel
BuildRequires: xscreensaver
BuildRequires: xscreensaver-base
BuildRequires: xscreensaver-extras
%if 0%{?fedora}
BuildRequires: xscreensaver-extras-base
%endif
BuildRequires: xscreensaver-gl-base
BuildRequires: xscreensaver-gl-extras
%endif
%if 0%{?suse_version}
BuildRequires: libXScrnSaver-devel
BuildRequires: xscreensaver
BuildRequires: xscreensaver-data
BuildRequires: xscreensaver-data-extra
%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
BuildRequires: xscreensaver-base
BuildRequires: xscreensaver-extrusion
BuildRequires: xscreensaver-gl
%endif
%endif
# ACL support
BuildRequires: libacl-devel
Requires: trinity-libtdepim = %{version}-%{release}
Requires: %{name}-kfile-plugins = %{version}-%{release}
@ -339,7 +353,7 @@ Requires: trinity-akregator = %{version}-%{release}
%package -n trinity-kaddressbook
Summary: TDE addressbook application
Group: Applications/Communications
Requires: trinity-kdebase-pim-ioslaves
Requires: trinity-tdebase-pim-ioslaves
Requires: %{name}-tderesources = %{version}-%{release}
%description -n trinity-kaddressbook
@ -2277,9 +2291,6 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%prep
%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
%if 0%{?rhel} == 5
%patch0 -p1
%endif
%build

@ -332,7 +332,7 @@ Requires: trinity-akregator = %{version}-%{release}
%package -n trinity-kaddressbook
Summary: TDE addressbook application
Group: Applications/Communications
Requires: trinity-kdebase-pim-ioslaves
Requires: trinity-tdebase-pim-ioslaves
Requires: %{name}-tderesources = %{version}-%{release}
%description -n trinity-kaddressbook

@ -83,6 +83,9 @@ BuildRequires: update-desktop-files
BuildRequires: brp-check-trinity
%endif
# ACL support
BuildRequires: libacl-devel
# IDN support
BuildRequires: libidn-devel

@ -95,6 +95,9 @@ BuildRequires: libidn-devel
BuildRequires: gamin-devel
%endif
# ACL support
BuildRequires: libacl-devel
# PCRE support
BuildRequires: pcre-devel

@ -135,6 +135,9 @@ BuildRequires: pcre-devel
%define build_klaptopdaemon 1
%endif
# ACL support
BuildRequires: libacl-devel
# XSCREENSAVER support
%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
%define with_xscreensaver 1
@ -1057,6 +1060,14 @@ This package contains the development files for tdeutils.
%prep
%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
%if 0%{?rhel} == 5
# Reverts some older Python stuff
%__sed -i "superkaramba/src/"*".cpp" \
-e "s|PyBytes_CheckExact|PyString_CheckExact|g" \
-e "s|PyBytes_AsString|PyString_AsString|g" \
-e "s|PyBytes_FromString|PyString_FromString|g" \
%endif
%build
unset QTDIR QTINC QTLIB

@ -27,6 +27,7 @@
%define tde_pkg tdevelop
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
%define tde_confdir %{_sysconfdir}/trinity
%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
%define tde_includedir %{tde_prefix}/include
@ -126,11 +127,15 @@ BuildRequires: subversion-devel
# NEON support
BuildRequires: neon-devel
# LDAP support
# OPENLDAP support
%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
BuildRequires: openldap-devel
%endif
%if 0%{?suse_version}
BuildRequires: openldap2-devel
%else
BuildRequires: openldap-devel
%endif
%if 0%{?rhel} == 5
BuildRequires: openldap24-libs-devel
%endif
# LIBACL support
@ -168,9 +173,11 @@ individual needs.
%{tde_bindir}/kdevdesigner
%{tde_bindir}/tdevelop
%{tde_bindir}/tdevelop-htdig
%{tde_bindir}/kdevprj2tdevelop
%{tde_bindir}/kdevprj2kdevelop
%{tde_bindir}/kdevprofileeditor
%{tde_libdir}/tdeconf_update_bin/kdev-gen-settings-tdeconf_update
%{tde_confdir}/kdevassistantrc
%{tde_confdir}/tdeveloprc
%{tde_tdeappdir}/kdevassistant.desktop
%{tde_tdeappdir}/kdevdesigner.desktop
%{tde_tdeappdir}/tdevelop.desktop
@ -490,8 +497,6 @@ individual needs.
%{tde_datadir}/apps/kdevtrollproject/
%{tde_datadir}/apps/kdevvalgrind/
%{tde_datadir}/apps/tdeio_pydoc/
%{tde_datadir}/config/kdevassistantrc
%{tde_datadir}/config/tdeveloprc
%{tde_datadir}/desktop-directories/tde-development-tdevelop.directory
%{tde_tdedocdir}/HTML/en/tdevelop/
%{tde_libdir}/libd.so.0
@ -624,6 +629,12 @@ if [ -d /usr/X11R6 ]; then
export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
fi
# openldap 2.4 includes (CentOS 5)
if [ -d "/usr/include/openldap24" ]; then
RPM_OPT_FLAGS="-I%{_includedir}/openldap24 -L%{_libdir}/openldap24 ${RPM_OPT_FLAGS}"
fi
if ! rpm -E %%cmake|grep -q "cd build"; then
%__mkdir_p build
cd build
@ -641,6 +652,7 @@ fi
-DWITH_GCC_VISIBILITY=OFF \
\
-DBIN_INSTALL_DIR=%{tde_bindir} \
-DCONFIG_INSTALL_DIR="%{tde_confdir}" \
-DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-DLIB_INSTALL_DIR=%{tde_libdir} \
-DSHARE_INSTALL_PREFIX=%{tde_datadir} \
@ -667,5 +679,5 @@ fi
%changelog
* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
- Initial release for TDE 14.0.0
* Tue Jul 21 2015 Francois Andriot <francois.andriot@free.fr> - 14.0.1-1
- Initial release

@ -1,673 +0,0 @@
#
# spec file for package tdevelop (version R14)
#
# 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/
#
# BUILD WARNING:
# Remove qt-devel and qt3-devel and any kde*-devel on your system !
# Having KDE libraries may cause FTBFS here !
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
%define tde_version 14.0.1
%endif
%define tde_pkg tdevelop
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
%define tde_confdir %{_sysconfdir}/trinity
%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_tdeappdir %{tde_datadir}/applications/tde
%define tde_tdedocdir %{tde_docdir}/tde
%define tde_tdeincludedir %{tde_includedir}/tde
%define tde_tdelibdir %{tde_libdir}/trinity
# 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
Name: trinity-%{tde_pkg}
Summary: Integrated Development Environment for C++/C
Version: %{tde_version}
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
Group: Development/Tools
URL: http://www.trinitydesktop.org/
%if 0%{?suse_version}
License: GPL-2.0+
%else
License: GPLv2+
%endif
#Vendor: Trinity Project
#Packager: Francois Andriot <francois.andriot@free.fr>
Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
Requires: %{name}-libs = %{version}-%{release}
BuildRequires: tqt3-apps-devel >= 3.5.0
BuildRequires: trinity-arts-devel >= %{tde_epoch}:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: trinity-tdesdk-devel >= %{tde_version}
Obsoletes: trinity-kdevelop < %{version}-%{release}
Provides: trinity-kdevelop = %{version}-%{release}
# 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: cmake >= 2.8
BuildRequires: gcc-c++
BuildRequires: fdupes
BuildRequires: desktop-file-utils
BuildRequires: make
Requires: make
Requires: perl
Requires: tqt3-designer >= 3.5.0
Requires: libtqt3-mt-devel >= 3.5.0
Requires: gettext
Requires: ctags
# LIBIDN 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
# PCRE support
BuildRequires: pcre-devel
# DB4 support
%if 0%{?rhel} || 0%{?fedora}
BuildRequires: db4-devel
%endif
# FLEX support
BuildRequires: flex
Requires: flex >= 2.5.4
# SVN support
BuildRequires: subversion-devel
# NEON support
BuildRequires: neon-devel
# LDAP support
%if 0%{?suse_version}
BuildRequires: openldap2-devel
%else
BuildRequires: openldap-devel
%endif
# LIBACL support
%if 0%{?suse_version} || 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: libacl-devel
%endif
%description
The TDevelop Integrated Development Environment provides many features
that developers need as well as providing a unified interface to programs
like gdb, the C/C++ compiler, and make. TDevelop manages or provides:
All development tools needed for C++ programming like Compiler,
Linker, automake and autoconf; KAppWizard, which generates complete,
ready-to-go sample applications; Classgenerator, for creating new
classes and integrating them into the current project; File management
for sources, headers, documentation etc. to be included in the
project; The creation of User-Handbooks written with SGML and the
automatic generation of HTML-output with the KDE look and feel;
Automatic HTML-based API-documentation for your project's classes with
cross-references to the used libraries; Internationalization support
for your application, allowing translators to easily add their target
language to a project;
tdevelop also includes WYSIWYG (What you see is what you get)-creation
of user interfaces with a built-in dialog editor; Debugging your
application by integrating KDbg; Editing of project-specific pixmaps
with KIconEdit; The inclusion of any other program you need for
development by adding it to the "Tools"-menu according to your
individual needs.
%files
%defattr(-,root,root,-)
%{tde_bindir}/kdevassistant
%{tde_bindir}/kdevdesigner
%{tde_bindir}/tdevelop
%{tde_bindir}/tdevelop-htdig
%{tde_bindir}/kdevprj2kdevelop
%{tde_bindir}/kdevprofileeditor
%{tde_libdir}/tdeconf_update_bin/kdev-gen-settings-tdeconf_update
%{tde_confdir}/kdevassistantrc
%{tde_confdir}/tdeveloprc
%{tde_tdeappdir}/kdevassistant.desktop
%{tde_tdeappdir}/kdevdesigner.desktop
%{tde_tdeappdir}/tdevelop.desktop
%{tde_tdeappdir}/tdevelop_c_cpp.desktop
%{tde_tdeappdir}/tdevelop_kde_cpp.desktop
%{tde_tdeappdir}/tdevelop_ruby.desktop
%{tde_tdeappdir}/tdevelop_scripting.desktop
%{tde_tdelibdir}/tdeio_chm.la
%{tde_tdelibdir}/tdeio_chm.so
%{tde_tdelibdir}/tdeio_csharpdoc.la
%{tde_tdelibdir}/tdeio_csharpdoc.so
%{tde_tdelibdir}/tdeio_perldoc.la
%{tde_tdelibdir}/tdeio_perldoc.so
%{tde_tdelibdir}/tdeio_pydoc.la
%{tde_tdelibdir}/tdeio_pydoc.so
%{tde_tdelibdir}/libdocchmplugin.la
%{tde_tdelibdir}/libdocchmplugin.so
%{tde_tdelibdir}/libdoccustomplugin.la
%{tde_tdelibdir}/libdoccustomplugin.so
%{tde_tdelibdir}/libdocdevhelpplugin.la
%{tde_tdelibdir}/libdocdevhelpplugin.so
%{tde_tdelibdir}/libdocdoxygenplugin.la
%{tde_tdelibdir}/libdocdoxygenplugin.so
%{tde_tdelibdir}/libdockdevtocplugin.la
%{tde_tdelibdir}/libdockdevtocplugin.so
%{tde_tdelibdir}/libdocqtplugin.la
%{tde_tdelibdir}/libdocqtplugin.so
%{tde_tdelibdir}/libkchmpart.la
%{tde_tdelibdir}/libkchmpart.so
%{tde_tdelibdir}/libkdevabbrev.la
%{tde_tdelibdir}/libkdevabbrev.so
%{tde_tdelibdir}/libkdevadaproject.la
%{tde_tdelibdir}/libkdevadaproject.so
%{tde_tdelibdir}/libkdevadasupport.la
%{tde_tdelibdir}/libkdevadasupport.so
%{tde_tdelibdir}/libkdevantproject.la
%{tde_tdelibdir}/libkdevantproject.so
%{tde_tdelibdir}/libkdevappview.la
%{tde_tdelibdir}/libkdevappview.so
%{tde_tdelibdir}/libkdevappwizard.la
%{tde_tdelibdir}/libkdevappwizard.so
%{tde_tdelibdir}/libkdevastyle.la
%{tde_tdelibdir}/libkdevastyle.so
%{tde_tdelibdir}/libkdevautoproject.la
%{tde_tdelibdir}/libkdevautoproject.so
%{tde_tdelibdir}/libkdevbashsupport.la
%{tde_tdelibdir}/libkdevbashsupport.so
%{tde_tdelibdir}/libkdevbookmarks.la
%{tde_tdelibdir}/libkdevbookmarks.so
%{tde_tdelibdir}/libkdevclassview.la
%{tde_tdelibdir}/libkdevclassview.so
%{tde_tdelibdir}/libkdevcppsupport.la
%{tde_tdelibdir}/libkdevcppsupport.so
%{tde_tdelibdir}/libkdevcsharpsupport.la
%{tde_tdelibdir}/libkdevcsharpsupport.so
%{tde_tdelibdir}/libkdevctags2.la
%{tde_tdelibdir}/libkdevctags2.so
%{tde_tdelibdir}/libkdevcustompcsimporter.la
%{tde_tdelibdir}/libkdevcustompcsimporter.so
%{tde_tdelibdir}/libkdevcustomproject.la
%{tde_tdelibdir}/libkdevcustomproject.so
%{tde_tdelibdir}/libkdevdccoptions.la
%{tde_tdelibdir}/libkdevdccoptions.so
%{tde_tdelibdir}/libkdevdebugger.la
%{tde_tdelibdir}/libkdevdebugger.so
%{tde_tdelibdir}/libkdevdesignerpart.la
%{tde_tdelibdir}/libkdevdesignerpart.so
%{tde_tdelibdir}/libkdevdiff.la
%{tde_tdelibdir}/libkdevdiff.so
%{tde_tdelibdir}/libkdevdistpart.la
%{tde_tdelibdir}/libkdevdistpart.so
%{tde_tdelibdir}/libkdevdocumentation.la
%{tde_tdelibdir}/libkdevdocumentation.so
%{tde_tdelibdir}/libkdevdoxygen.la
%{tde_tdelibdir}/libkdevdoxygen.so
%{tde_tdelibdir}/libkdeveditorchooser.la
%{tde_tdelibdir}/libkdeveditorchooser.so
%{tde_tdelibdir}/libkdevfilecreate.la
%{tde_tdelibdir}/libkdevfilecreate.so
%{tde_tdelibdir}/libkdevfilegroups.la
%{tde_tdelibdir}/libkdevfilegroups.so
%{tde_tdelibdir}/libkdevfilelist.la
%{tde_tdelibdir}/libkdevfilelist.so
%{tde_tdelibdir}/libkdevfileselector.la
%{tde_tdelibdir}/libkdevfileselector.so
%{tde_tdelibdir}/libkdevfileview.la
%{tde_tdelibdir}/libkdevfileview.so
%{tde_tdelibdir}/libkdevfilter.la
%{tde_tdelibdir}/libkdevfilter.so
%{tde_tdelibdir}/libkdevfortransupport.la
%{tde_tdelibdir}/libkdevfortransupport.so
%{tde_tdelibdir}/libkdevfpcoptions.la
%{tde_tdelibdir}/libkdevfpcoptions.so
%{tde_tdelibdir}/libkdevfullscreen.la
%{tde_tdelibdir}/libkdevfullscreen.so
%{tde_tdelibdir}/libkdevgccoptions.la
%{tde_tdelibdir}/libkdevgccoptions.so
%{tde_tdelibdir}/libkdevgrepview.la
%{tde_tdelibdir}/libkdevgrepview.so
%{tde_tdelibdir}/libkdevjavasupport.la
%{tde_tdelibdir}/libkdevjavasupport.so
%{tde_tdelibdir}/libkdevtdelibsimporter.la
%{tde_tdelibdir}/libkdevtdelibsimporter.so
%{tde_tdelibdir}/libkdevkonsoleview.la
%{tde_tdelibdir}/libkdevkonsoleview.so
%{tde_tdelibdir}/libkdevmakeview.la
%{tde_tdelibdir}/libkdevmakeview.so
%{tde_tdelibdir}/libkdevopenwith.la
%{tde_tdelibdir}/libkdevopenwith.so
%{tde_tdelibdir}/libkdevpartexplorer.la
%{tde_tdelibdir}/libkdevpartexplorer.so
%{tde_tdelibdir}/libkdevpascalproject.la
%{tde_tdelibdir}/libkdevpascalproject.so
%{tde_tdelibdir}/libkdevpascalsupport.la
%{tde_tdelibdir}/libkdevpascalsupport.so
%{tde_tdelibdir}/libkdevperlsupport.la
%{tde_tdelibdir}/libkdevperlsupport.so
%{tde_tdelibdir}/libkdevpgioptions.la
%{tde_tdelibdir}/libkdevpgioptions.so
%{tde_tdelibdir}/libkdevphpsupport.la
%{tde_tdelibdir}/libkdevphpsupport.so
%{tde_tdelibdir}/libkdevpythonsupport.la
%{tde_tdelibdir}/libkdevpythonsupport.so
%{tde_tdelibdir}/libkdevqt4importer.la
%{tde_tdelibdir}/libkdevqt4importer.so
%{tde_tdelibdir}/libkdevqtimporter.la
%{tde_tdelibdir}/libkdevqtimporter.so
%{tde_tdelibdir}/libkdevquickopen.la
%{tde_tdelibdir}/libkdevquickopen.so
%{tde_tdelibdir}/libkdevrbdebugger.la
%{tde_tdelibdir}/libkdevrbdebugger.so
%{tde_tdelibdir}/libkdevregexptest.la
%{tde_tdelibdir}/libkdevregexptest.so
%{tde_tdelibdir}/libkdevreplace.la
%{tde_tdelibdir}/libkdevreplace.so
%{tde_tdelibdir}/libkdevrubysupport.la
%{tde_tdelibdir}/libkdevrubysupport.so
%{tde_tdelibdir}/libkdevscripting.la
%{tde_tdelibdir}/libkdevscripting.so
%{tde_tdelibdir}/libkdevscriptproject.la
%{tde_tdelibdir}/libkdevscriptproject.so
%{tde_tdelibdir}/libkdevsnippet.la
%{tde_tdelibdir}/libkdevsnippet.so
%{tde_tdelibdir}/libkdevsqlsupport.la
%{tde_tdelibdir}/libkdevsqlsupport.so
%{tde_tdelibdir}/libkdevtexttools.la
%{tde_tdelibdir}/libkdevtexttools.so
%{tde_tdelibdir}/libkdevtipofday.la
%{tde_tdelibdir}/libkdevtipofday.so
%{tde_tdelibdir}/libkdevtools.la
%{tde_tdelibdir}/libkdevtools.so
%{tde_tdelibdir}/libkdevtrollproject.la
%{tde_tdelibdir}/libkdevtrollproject.so
%{tde_tdelibdir}/libkdevuichooser.la
%{tde_tdelibdir}/libkdevuichooser.so
%{tde_tdelibdir}/libkdevvalgrind.la
%{tde_tdelibdir}/libkdevvalgrind.so
%{tde_tdelibdir}/libkdevvcsmanager.la
%{tde_tdelibdir}/libkdevvcsmanager.so
%{tde_datadir}/apps/tdeconf_update/
%{tde_datadir}/apps/kdevabbrev/
%{tde_datadir}/apps/kdevadaproject/
%{tde_datadir}/apps/kdevadasupport/
%{tde_datadir}/apps/kdevantproject/
%{tde_datadir}/apps/kdevappoutputview/
%{tde_datadir}/apps/kdevappwizard/
%{tde_datadir}/apps/kdevassistant/
%{tde_datadir}/apps/kdevastyle/
%{tde_datadir}/apps/kdevautoproject/
%{tde_datadir}/apps/kdevbashsupport/
%{tde_datadir}/apps/kdevclassview/
%{tde_datadir}/apps/kdevcppsupport/
%{tde_datadir}/icons/hicolor/*/actions/breakpoint_add.png
%{tde_datadir}/icons/hicolor/*/actions/breakpoint_delete.png
%{tde_datadir}/icons/hicolor/*/actions/breakpoint_delete_all.png
%{tde_datadir}/icons/hicolor/*/actions/breakpoint_edit.png
%{tde_datadir}/icons/hicolor/*/actions/ktip.png
%{tde_datadir}/icons/hicolor/*/apps/kdevassistant.png
%{tde_datadir}/icons/hicolor/*/apps/kdevdesigner.png
%{tde_datadir}/icons/hicolor/*/apps/tdevelop.png
%{tde_datadir}/icons/locolor/*/actions/tdevelop_tip.png
%{tde_datadir}/mimelnk/application/x-tdevelop.desktop
%{tde_datadir}/services/chm.protocol
%{tde_datadir}/services/csharpdoc.protocol
%{tde_datadir}/services/docchmplugin.desktop
%{tde_datadir}/services/doccustomplugin.desktop
%{tde_datadir}/services/docdevhelpplugin.desktop
%{tde_datadir}/services/docdoxygenplugin.desktop
%{tde_datadir}/services/dockdevtocplugin.desktop
%{tde_datadir}/services/docqtplugin.desktop
%{tde_datadir}/services/kchmpart.desktop
%{tde_datadir}/services/kdevabbrev.desktop
%{tde_datadir}/services/kdevadaproject.desktop
%{tde_datadir}/services/kdevadasupport.desktop
%{tde_datadir}/services/kdevantproject.desktop
%{tde_datadir}/services/kdevappoutputview.desktop
%{tde_datadir}/services/kdevappwizard.desktop
%{tde_datadir}/services/kdevastyle.desktop
%{tde_datadir}/services/kdevautoproject.desktop
%{tde_datadir}/services/kdevbashsupport.desktop
%{tde_datadir}/services/kdevbookmarks.desktop
%{tde_datadir}/services/kdevclassview.desktop
%{tde_datadir}/services/kdevcppsupport.desktop
%{tde_datadir}/services/kdevcsharpsupport.desktop
%{tde_datadir}/services/kdevcsupport.desktop
%{tde_datadir}/services/kdevctags2.desktop
%{tde_datadir}/services/kdevcustomproject.desktop
%{tde_datadir}/services/kdevdccoptions.desktop
%{tde_datadir}/services/kdevdebugger.desktop
%{tde_datadir}/services/kdevdesigner_part.desktop
%{tde_datadir}/services/kdevdiff.desktop
%{tde_datadir}/services/kdevdistpart.desktop
%{tde_datadir}/services/kdevdocumentation.desktop
%{tde_datadir}/services/kdevdoxygen.desktop
%{tde_datadir}/services/kdeveditorchooser.desktop
%{tde_datadir}/services/kdevfilecreate.desktop
%{tde_datadir}/services/kdevfilegroups.desktop
%{tde_datadir}/services/kdevfilelist.desktop
%{tde_datadir}/services/kdevfileselector.desktop
%{tde_datadir}/services/kdevfileview.desktop
%{tde_datadir}/services/kdevfilter.desktop
%{tde_datadir}/services/kdevfortransupport.desktop
%{tde_datadir}/services/kdevfpcoptions.desktop
%{tde_datadir}/services/kdevfullscreen.desktop
%{tde_datadir}/services/kdevg77options.desktop
%{tde_datadir}/services/kdevgccoptions.desktop
%{tde_datadir}/services/kdevgppoptions.desktop
%{tde_datadir}/services/kdevgrepview.desktop
%{tde_datadir}/services/kdevjavasupport.desktop
%{tde_datadir}/services/kdevtdeautoproject.desktop
%{tde_datadir}/services/kdevtdelibsimporter.desktop
%{tde_datadir}/services/kdevkonsoleview.desktop
%{tde_datadir}/services/kdevmakeview.desktop
%{tde_datadir}/services/kdevopenwith.desktop
%{tde_datadir}/services/kdevpartexplorer.desktop
%{tde_datadir}/services/kdevpascalproject.desktop
%{tde_datadir}/services/kdevpascalsupport.desktop
%{tde_datadir}/services/kdevpcscustomimporter.desktop
%{tde_datadir}/services/kdevperlsupport.desktop
%{tde_datadir}/services/kdevpgf77options.desktop
%{tde_datadir}/services/kdevpghpfoptions.desktop
%{tde_datadir}/services/kdevphpsupport.desktop
%{tde_datadir}/services/kdevpythonsupport.desktop
%{tde_datadir}/services/kdevqt4importer.desktop
%{tde_datadir}/services/kdevqtimporter.desktop
%{tde_datadir}/services/kdevquickopen.desktop
%{tde_datadir}/services/kdevrbdebugger.desktop
%{tde_datadir}/services/kdevregexptest.desktop
%{tde_datadir}/services/kdevreplace.desktop
%{tde_datadir}/services/kdevrubysupport.desktop
%{tde_datadir}/services/kdevscripting.desktop
%{tde_datadir}/services/kdevscriptproject.desktop
%{tde_datadir}/services/kdevsnippet.desktop
%{tde_datadir}/services/kdevsqlsupport.desktop
%{tde_datadir}/services/kdevtexttools.desktop
%{tde_datadir}/services/kdevtipofday.desktop
%{tde_datadir}/services/kdevtmakeproject.desktop
%{tde_datadir}/services/kdevtools.desktop
%{tde_datadir}/services/kdevtrollproject.desktop
%{tde_datadir}/services/kdevuichooser.desktop
%{tde_datadir}/services/kdevvalgrind.desktop
%{tde_datadir}/services/kdevvcsmanager.desktop
%{tde_datadir}/services/perldoc.protocol
%{tde_datadir}/services/pydoc.protocol
%{tde_datadir}/servicetypes/tdevelopappfrontend.desktop
%{tde_datadir}/servicetypes/tdevelopcodebrowserfrontend.desktop
%{tde_datadir}/servicetypes/tdevelopcompileroptions.desktop
%{tde_datadir}/servicetypes/tdevelopcreatefile.desktop
%{tde_datadir}/servicetypes/tdevelopdifffrontend.desktop
%{tde_datadir}/servicetypes/tdevelopdocumentationplugins.desktop
%{tde_datadir}/servicetypes/tdeveloplanguagesupport.desktop
%{tde_datadir}/servicetypes/tdevelopmakefrontend.desktop
%{tde_datadir}/servicetypes/tdeveloppcsimporter.desktop
%{tde_datadir}/servicetypes/tdevelopplugin.desktop
%{tde_datadir}/servicetypes/tdevelopproject.desktop
%{tde_datadir}/servicetypes/tdevelopquickopen.desktop
%{tde_datadir}/servicetypes/tdevelopsourceformatter.desktop
%{tde_datadir}/servicetypes/tdevelopvcsintegrator.desktop
%{tde_datadir}/servicetypes/tdevelopversioncontrol.desktop
%{tde_datadir}/apps/kdevcsharpsupport/
%{tde_datadir}/apps/kdevctags2/
%{tde_datadir}/apps/kdevcustomproject/
%{tde_datadir}/apps/kdevdebugger/
%{tde_datadir}/apps/kdevdesigner/
%{tde_datadir}/apps/kdevdesignerpart/
%{tde_datadir}/apps/kdevdesignerpart/
%{tde_datadir}/apps/kdevdiff/
%{tde_datadir}/apps/kdevdistpart/
%{tde_datadir}/apps/kdevdocumentation/
%{tde_datadir}/apps/kdevdoxygen/
%{tde_datadir}/apps/tdevelop/
%{tde_datadir}/apps/kdevfilecreate/
%{tde_datadir}/apps/kdevfilelist/
%{tde_datadir}/apps/kdevfilter/
%{tde_datadir}/apps/kdevfortransupport/
%{tde_datadir}/apps/kdevfullscreen/
%{tde_datadir}/apps/kdevgrepview/
%{tde_datadir}/apps/kdevjavasupport/
%{tde_datadir}/apps/kdevmakeview/
%{tde_datadir}/apps/kdevpartexplorer/
%{tde_datadir}/apps/kdevpascalproject/
%{tde_datadir}/apps/kdevpascalsupport/
%{tde_datadir}/apps/kdevperlsupport/
%{tde_datadir}/apps/kdevphpsupport/
%{tde_datadir}/apps/kdevpythonsupport/
%{tde_datadir}/apps/kdevquickopen/
%{tde_datadir}/apps/kdevrbdebugger/
%{tde_datadir}/apps/kdevregexptest/
%{tde_datadir}/apps/kdevreplace/
%{tde_datadir}/apps/kdevrubysupport/
%{tde_datadir}/apps/kdevscripting/
%{tde_datadir}/apps/kdevscriptproject/
%{tde_datadir}/apps/kdevsnippet/
%{tde_datadir}/apps/kdevsqlsupport
%{tde_datadir}/apps/kdevtipofday/
%{tde_datadir}/apps/kdevtools/
%{tde_datadir}/apps/kdevtrollproject/
%{tde_datadir}/apps/kdevvalgrind/
%{tde_datadir}/apps/tdeio_pydoc/
%{tde_datadir}/desktop-directories/tde-development-tdevelop.directory
%{tde_tdedocdir}/HTML/en/tdevelop/
%{tde_libdir}/libd.so.0
%{tde_libdir}/libd.so.0.0.0
%{tde_libdir}/libkinterfacedesigner.so.0
%{tde_libdir}/libkinterfacedesigner.so.0.0.0
%{tde_tdelibdir}/libkdevvisualboyadvance.la
%{tde_tdelibdir}/libkdevvisualboyadvance.so
%{tde_datadir}/apps/kdevdesignerpart/pics/
%{tde_datadir}/apps/kdevvisualboyadvance/
%{tde_tdedocdir}/HTML/en/tde_app_devel/
%{tde_datadir}/mimelnk/text/x-fortran.desktop
%{tde_datadir}/services/kdevvisualboyadvance.desktop
%{tde_tdedocdir}/HTML/en/kdevdesigner/
%post
for f in hicolor locolor ; do
touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
done
update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%postun
for f in hicolor locolor ; do
touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
done
update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
##########
%package devel
Summary: Development files for %{name}
Group: Development/Libraries/Other
Requires: %{name}-libs = %{version}-%{release}
Obsoletes: trinity-kdevelop-devel < %{version}-%{release}
Provides: trinity-kdevelop-devel = %{version}-%{release}
%description devel
This package contains the development files for tdevelop.
%files devel
%defattr(-,root,root,-)
%{tde_libdir}/lib*.so
%{tde_libdir}/lib*.la
%{tde_includedir}/*
%post devel
/sbin/ldconfig || :
%postun devel
/sbin/ldconfig || :
##########
%package libs
Summary: %{name} runtime libraries
Group: System Environment/Libraries
Requires: trinity-tdelibs >= %{tde_version}
# include to be paranoid, installing libs-only is still mostly untested -- Rex
Requires: %{name} = %{version}-%{release}
Obsoletes: trinity-kdevelop-libs < %{version}-%{release}
Provides: trinity-kdevelop-libs = %{version}-%{release}
%description libs
This package contains the libraries needed for the tdevelop programs.
%files libs
%defattr(-,root,root,-)
%{tde_libdir}/libdesignerintegration.so.0
%{tde_libdir}/libdesignerintegration.so.0.0.0
%{tde_libdir}/libdocumentation_interfaces.so.0
%{tde_libdir}/libdocumentation_interfaces.so.0.0.0
%{tde_libdir}/libgdbmi_parser.so.0
%{tde_libdir}/libgdbmi_parser.so.0.0.0
%{tde_libdir}/libkdevbuildbase.so.0
%{tde_libdir}/libkdevbuildbase.so.0.0.0
%{tde_libdir}/libkdevbuildtoolswidgets.so.0
%{tde_libdir}/libkdevbuildtoolswidgets.so.0.0.0
%{tde_libdir}/libkdevcatalog.so.0
%{tde_libdir}/libkdevcatalog.so.0.0.0
%{tde_libdir}/libkdevcppparser.so.0
%{tde_libdir}/libkdevcppparser.so.0.0.0
%{tde_libdir}/libtdevelop.so.1
%{tde_libdir}/libtdevelop.so.1.0.0
%{tde_libdir}/libkdevextras.so.0
%{tde_libdir}/libkdevextras.so.0.0.0
%{tde_libdir}/libkdevpropertyeditor.so.0
%{tde_libdir}/libkdevpropertyeditor.so.0.0.0
%{tde_libdir}/libkdevqmakeparser.so.0
%{tde_libdir}/libkdevqmakeparser.so.0.0.0
%{tde_libdir}/libkdevshell.so.0
%{tde_libdir}/libkdevshell.so.0.0.0
%{tde_libdir}/libkdevwidgets.so.0
%{tde_libdir}/libkdevwidgets.so.0.0.0
%{tde_libdir}/liblang_debugger.so.0
%{tde_libdir}/liblang_debugger.so.0.0.0
%{tde_libdir}/liblang_interfaces.so.0
%{tde_libdir}/liblang_interfaces.so.0.0.0
%{tde_libdir}/libprofileengine.so.0
%{tde_libdir}/libprofileengine.so.0.0.0
%post libs
/sbin/ldconfig || :
%postun libs
/sbin/ldconfig || :
##########
%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
%debug_package
%endif
##########
%prep
%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
# Specific path for RHEL4
if [ -d /usr/X11R6 ]; then
export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
fi
if ! rpm -E %%cmake|grep -q "cd build"; then
%__mkdir_p build
cd build
fi
# Warning: GCC visibility causes FTBFS [Bug #1285]
%cmake \
-DCMAKE_BUILD_TYPE="RelWithDebInfo" \
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_SKIP_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_NO_BUILTIN_CHRPATH=ON \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
\
-DBIN_INSTALL_DIR=%{tde_bindir} \
-DCONFIG_INSTALL_DIR="%{tde_confdir}" \
-DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-DLIB_INSTALL_DIR=%{tde_libdir} \
-DSHARE_INSTALL_PREFIX=%{tde_datadir} \
\
-DWITH_BUILDTOOL_ALL=ON \
-DWITH_LANGUAGE_ALL=ON \
-DWITH_VCS_ALL=OFF \
-DBUILD_ALL=ON \
..
%__make %{?_smp_mflags} || %__make
%install
%__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot} -C build
# Links duplicate files
%fdupes "%{?buildroot}%{tde_datadir}"
%clean
%__rm -rf %{buildroot}
%changelog
* Tue Jul 21 2015 Francois Andriot <francois.andriot@free.fr> - 14.0.1-1
- Initial release

@ -43,7 +43,7 @@
Name: trinity-%{tde_pkg}
Summary: Web development applications
Summary: Web development applications
Group: Applications/Editors
Version: %{tde_version}
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
@ -563,7 +563,7 @@ fi
\
--enable-editors \
--with-extra-includes=%{_includedir}/tqt
# WTF hack for RHEL4
%if 0%{?rhel} == 4

@ -53,7 +53,7 @@ speex-devel
libxslt-devel
aspell-devel
gamin-devel
libutempter-devel
utempter-devel
libjasper-devel
hspell-devel
OpenEXR-devel
@ -62,10 +62,9 @@ libnm-util-devel
libudev-devel
udisks2-devel
htdig
libraw1394
devel
libusb1.0-devel
libusb-compat0.1-devel
libraw1394-devel
lib64usb1.0-devel
lib64usb-compat0.1-devel
lm_sensors-devel
libxscrnsaver-devel
libsmbclient-devel
@ -93,7 +92,7 @@ java-devel
ruby-devel
subversion-devel
neon-devel
libbinutils-devel
binutils-devel
gnutls-devel
libgadu-devel
lib64iw29-devel
@ -121,7 +120,6 @@ libmtp-devel
libmusicbrainz-devel
libnjb-devel
libvisual-devel
libtunepimp-devel
lib64inotifytools-devel
libmp4v2-devel
sword-devel
@ -132,7 +130,7 @@ libflac++-devel
libffmpeg-devel
lib64xaw-devel
libofx-devel
libOpenSP5-devel
lib64OpenSP5-devel
ImageMagick-devel
doxygen
lib64readline-devel
@ -140,12 +138,10 @@ GraphicsMagick-devel
libpqxx-devel
libwpd-devel
lib64wv2-devel
lib64openjpeg-devel
libotr-devel
pilot-link-devel
scons
libxcb-devel
libxcb-xlib-devel
chrpath
liblo-devel
dssi-devel

Loading…
Cancel
Save