diff options
Diffstat (limited to 'redhat/applications')
234 files changed, 1711 insertions, 18430 deletions
diff --git a/redhat/applications/abakus/abakus-3.5.13.2.spec b/redhat/applications/abakus/abakus-3.5.13.2.spec deleted file mode 100644 index 9200c19a4..000000000 --- a/redhat/applications/abakus/abakus-3.5.13.2.spec +++ /dev/null @@ -1,126 +0,0 @@ -# Default version for this component -%define tde_pkg abakus -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man - -%define tde_tdeappdir %{tde_datadir}/applications/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - -Name: trinity-%{tde_pkg} -Summary: Calculator for TDE -Version: 0.91 -Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: cmake >= 2.8 -BuildRequires: bison - -%description -AbaKus is a complex calculator, which provides -many different kinds of calculations. -Think of it as bc (the command-line calculator) with a nice GUI. -It also gives information about mathematical variables and -has the user-friendly menu options of a normal TDE application. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} - - -%build -unset QTDIR QTINC QTLIB -. /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" - -# Do not build against any "/usr" installed KDE -export KDEDIR="%{tde_prefix}" - -# 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 - -%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 \ - \ - -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \ - -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 - - -%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 AUTHORS COPYING -%{tde_bindir}/abakus -%{tde_datadir}/apps/abakus/ -%{tde_datadir}/icons/hicolor/*/apps/abakus.png -%{tde_tdedocdir}/HTML/en/abakus/ -%{tde_datadir}/applnk/Utilities/abakus.desktop - -%changelog diff --git a/redhat/applications/abakus/abakus.spec b/redhat/applications/abakus/abakus.spec index fe63fd198..c4077a07d 100644 --- a/redhat/applications/abakus/abakus.spec +++ b/redhat/applications/abakus/abakus.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg abakus %define tde_prefix /opt/trinity @@ -28,6 +28,7 @@ %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 @@ -82,6 +83,16 @@ BuildRequires: gamin-devel # OPENSSL support BuildRequires: openssl-devel +# 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 AbaKus is a complex calculator, which provides @@ -139,6 +150,11 @@ export PATH="%{tde_bindir}:${PATH}" %find_lang %{tde_pkg} +# Updates applications categories for openSUSE +%if 0%{?suse_version} +%suse_update_desktop_file -r "%{buildroot}%{tde_tdeappdir}/abakus.desktop" Utility Calculator +%endif + %clean %__rm -rf %{buildroot} @@ -151,7 +167,7 @@ export PATH="%{tde_bindir}:${PATH}" %{tde_datadir}/apps/abakus/ %{tde_datadir}/icons/hicolor/*/apps/abakus.png %{tde_tdedocdir}/HTML/en/abakus/ -%{tde_datadir}/applnk/Utilities/abakus.desktop +%{tde_tdeappdir}/abakus.desktop %changelog diff --git a/redhat/applications/adept/adept-3.5.13.2.spec b/redhat/applications/adept/adept-3.5.13.2.spec deleted file mode 100644 index 0939d80f0..000000000 --- a/redhat/applications/adept/adept-3.5.13.2.spec +++ /dev/null @@ -1,183 +0,0 @@ -# Default version for this component -%define tde_pkg adept -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: Package management suite for Trinity -Version: 2.1.3 -Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://lpnotfr.free.fr/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -Requires: %{name}-manager = %{version}-%{release} -Requires: %{name}-installer = %{version}-%{release} -Requires: %{name}-updater = %{version}-%{release} -Requires: %{name}-notifier = %{version}-%{release} -Requires: %{name}-batch = %{version}-%{release} - - -%description -These packages belong to the adept suite: - * adept-manager - package manager - * adept-installer - application manager - * adept-updater - system upgrade wizard - * adept-notifier - systray notification of available updates - - -%files -%defattr(-,root,root,-) -%doc AUTHORS CHANGELOG ChangeLog COPYING - -########## - -%package common -Requires: trinity-konsole -Summary: Package manager for Trinity -- common files - -%description common -Icons and other common files for all adept components. - -########## - -%package manager -Requires: %{name}-common = %{version}-%{release} -Summary: package manager for Trinity - -%description manager -Adept Manager is a graphical user interface for package management. - -Besides these basic functions the following features are provided: - * Search and filter the list of available packages (also using debtags) - * Perform smart system upgrades - * Edit the list of used repositories (sources.list) - * Configure packages through the debconf system - -Please also install libtqt-perl if you want the TDE Debconf frontend -to function. - -########## - -%package installer -Requires: %{name}-common = %{version}-%{release} -Summary: simple user interface for application management (for Trinity) - -%description installer -Adept Installer presents a list of applications available through the -Advanced Package Tool (APT). An application is considered a package -that contains a .desktop file for use with TDE, GNOME or other -desktop environment. - -########## - -%package updater -Requires: %{name}-common = %{version}-%{release} -Summary: system update tool for Trinity - -%description updater -Adept Updater provides a simple wizard-style user interface to system -upgrades. It uses same algorithms as apt-get dist-upgrade. - -########## - -%package notifier -Requires: %{name}-common = %{version}-%{release} -Requires: %{name}-updater = %{version}-%{release} -Summary: System tray notifier of available system updates - -%description notifier -Adept Notifier provides a system tray icon notifying the user of -available updates. It will run Adept Updater for the user when -clicked. - -########## - -%package batch -Requires: %{name}-manager = %{version}-%{release} -Summary: command line install for Adept - -%description batch -Adept Batch lets you install packages with Adept from the -command line. It is intended for shell scripts and being run -by external applications. - -########## - -%if 0%{?suse_version} || 0%{?pclinuxos} -%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/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --includedir=%{tde_tdeincludedir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ - --disable-rpath \ - --enable-closure - -%__make %{?_smp_mflags} -C adept - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -%find_lang %{tde_pkg} - - -%clean -%__rm -rf %{buildroot} - - - - -%changelog diff --git a/redhat/applications/adept/adept-14.0.0.spec b/redhat/applications/adept/adept.spec index 62e996ddf..ba1c416f4 100644 --- a/redhat/applications/adept/adept-14.0.0.spec +++ b/redhat/applications/adept/adept.spec @@ -18,7 +18,7 @@ # Default version for this component %define tde_pkg adept %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif # TDE specific building variables diff --git a/redhat/applications/amarok/amarok-3.5.13.1-fix_rhel4_libs.patch b/redhat/applications/amarok/amarok-3.5.13.1-fix_rhel4_libs.patch deleted file mode 100644 index 0b6d3259b..000000000 --- a/redhat/applications/amarok/amarok-3.5.13.1-fix_rhel4_libs.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- amarok-3.5.13.1/amarok/src/engine/yauap/ConfigureChecks.cmake.ORI 2012-10-11 22:54:02.017468265 +0200 -+++ amarok-3.5.13.1/amarok/src/engine/yauap/ConfigureChecks.cmake 2012-10-11 22:54:52.644445209 +0200 -@@ -16,8 +16,8 @@ - endif( ) - - # dbus-tqt --pkg_search_module( DBUS_TQT dbus-tqt ) --if( NOT DBUS_TQT_FOUND ) -- tde_message_fatal( "dbus-tqt is required, but was not found on your system" ) --endif( ) -+#pkg_search_module( DBUS_TQT dbus-tqt ) -+#if( NOT DBUS_TQT_FOUND ) -+# tde_message_fatal( "dbus-tqt is required, but was not found on your system" ) -+#endif( ) - diff --git a/redhat/applications/amarok/amarok-3.5.13.2.spec b/redhat/applications/amarok/amarok-3.5.13.2.spec deleted file mode 100644 index 9f6c153db..000000000 --- a/redhat/applications/amarok/amarok-3.5.13.2.spec +++ /dev/null @@ -1,438 +0,0 @@ -# Basic package informations -%define tde_pkg amarok -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man - -%define tde_tdeappdir %{tde_datadir}/applications/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: Media player -Version: 1.4.10 -Release: %{?!preversion:12}%{?preversion:11_%{preversion}}%{?dist} - -Group: Applications/Multimedia -License: GPLv2+ -Url: http://amarok.kde.org - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -Patch3: amarok-3.5.13.1-fix_rhel4_libs.patch - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: trinity-konqueror-devel >= %{tde_version} - -BuildRequires: alsa-lib-devel -BuildRequires: desktop-file-utils -BuildRequires: esound-devel -BuildRequires: gettext -BuildRequires: pcre-devel -BuildRequires: taglib-devel - -# LIBTOOL -BuildRequires: libtool -%if 0%{?fedora} > 4 || 0%{?rhel} > 4 -BuildRequires: libtool-ltdl-devel -%endif - -BuildRequires: libusb-devel -BuildRequires: mysql-devel -BuildRequires: postgresql-devel -BuildRequires: SDL-devel -BuildRequires: taglib-devel -BuildRequires: sqlite-devel -# not used anymore, in favor of libvisual ? -- Rex -#{?fedora:BuildRequires: xmms-devel} - - -# DBUS support -%if 0%{?suse_version} -BuildRequires: dbus-1-devel -%else -BuildRequires: dbus-devel -%endif - -# DBUS-(T)QT support -%if 0%{?rhel} == 4 -BuildRequires: dbus-qt -%else -BuildRequires: trinity-dbus-tqt-devel >= 1:0.63 -%endif - -# IFP support -# IFP package is broken under PCLinuxOS. -%if 0%{?pclinuxos} == 0 -%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} -%define with_ifp 1 -BuildRequires: libifp-devel -%endif -%endif - -# KARMA support -%if 0%{?mgaversion} || 0%{?mdkversion} -%if 0%{?pclinuxos} == 0 -%define with_karma 1 -BuildRequires: libkarma-devel -BuildRequires: karma-sharp -%endif -%endif - -# GPOD (ipod) support -%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} -%define with_gpod 1 -BuildRequires: libgpod-devel >= 0.4.2 -%endif - -# MTP players -%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} -%define with_mtp 1 -BuildRequires: libmtp-devel -BuildRequires: libmusicbrainz-devel -%endif - -# Creative Nomad Jukebox -%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} >= 1220 -%define with_njb 1 -BuildRequires: libnjb-devel -%endif - -# VISUAL support -%if 0%{?rhel} >= 4 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} -%define with_libvisual 1 -BuildRequires: libvisual-devel -%endif - -# TUNEPIMP support -%if 0%{?mgaversion} && 0%{?mgaversion} <= 2 -BuildRequires: libtunepimp-devel -%endif -%if 0%{?fedora} || 0%{?mdkversion} || 0%{?suse_version} -BuildRequires: libtunepimp-devel -%endif - -# INOTIFY support -%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} -%define with_inotify 1 -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: %{_lib}inotifytools-devel -%endif -%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 - -# YAUAP support -%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} -%define with_yauap 1 -%endif - -# AKODE support -%if 0 -%define with_akode 1 -BuildRequires: trinity-akode-devel -%endif - -# MP4V2 support -%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} -%define with_mp4v2 1 -BuildRequires: libmp4v2-devel -%endif - -# ruby -BuildRequires: ruby -BuildRequires: ruby-devel - -# To open the selected browser, works with Patch2 -Requires: xdg-utils -Requires(post): xdg-utils -Requires(postun): xdg-utils - - -%description -Amarok is a multimedia player with: - - fresh playlist concept, very fast to use, with drag and drop - - plays all formats supported by the various engines - - audio effects, like reverb and compressor - - compatible with the .m3u and .pls formats for playlists - - nice GUI, integrates into the TDE look, but with a unique touch - -%files -f %{tde_pkg}.lang -%defattr(-,root,root,-) -%doc COPYING AUTHORS ChangeLog README -%{tde_bindir}/amarok -%{tde_bindir}/amarokapp -%{tde_bindir}/amarokcollectionscanner -%{tde_bindir}/amarok_proxy.rb -%{tde_datadir}/apps/amarok/ -%{tde_datadir}/icons/hicolor/*/*/* -%{tde_tdeappdir}/*.desktop -%{tde_datadir}/servicetypes/*.desktop -%{tde_datadir}/apps/profiles/amarok.profile.xml -%{tde_datadir}/config/amarokrc -%{tde_datadir}/config.kcfg/*.kcfg -%{tde_datadir}/services/amarokitpc.protocol -%{tde_datadir}/services/amaroklastfm.protocol -%{tde_datadir}/services/amarokpcast.protocol -# -libs ? -- Rex -%{tde_libdir}/libamarok.so.0 -%{tde_libdir}/libamarok.so.0.0.0 -# DAAP -%{tde_bindir}/amarok_daapserver.rb -%{tde_tdelibdir}/libamarok_daap-mediadevice.* -%{tde_datadir}/services/amarok_daap-mediadevice.desktop -# Mass-storage -%{tde_datadir}/services/amarok_massstorage-device.desktop -%{tde_tdelibdir}/libamarok_massstorage-device.* -# NFS -%{tde_datadir}/services/amarok_nfs-device.desktop -%{tde_tdelibdir}/libamarok_nfs-device.* -# SMB -%{tde_datadir}/services/amarok_smb-device.desktop -%{tde_tdelibdir}/libamarok_smb-device.* -# IPod -%if 0%{?with_gpod} -%{tde_datadir}/services/amarok_ipod-mediadevice.desktop -%{tde_tdelibdir}/libamarok_ipod-mediadevice.* -%endif -# VFAT -%{tde_datadir}/services/amarok_generic-mediadevice.desktop -%{tde_tdelibdir}/libamarok_generic-mediadevice.* -# iRiver -%if 0%{?with_ifp} -%{tde_datadir}/services/amarok_ifp-mediadevice.desktop -%{tde_tdelibdir}/libamarok_ifp-mediadevice.* -%endif -# Creative Zen -%if 0%{?with_njb} -%{tde_datadir}/services/amarok_njb-mediadevice.desktop -%{tde_tdelibdir}/libamarok_njb-mediadevice.* -%endif -# MTP players -%if 0%{?with_mtp} -%{tde_datadir}/services/amarok_mtp-mediadevice.desktop -%{tde_tdelibdir}/libamarok_mtp-mediadevice.* -%endif -# Rio Karma -%if 0%{?with_karma} -%{tde_datadir}/services/amarok_riokarma-mediadevice.desktop -%{tde_tdelibdir}/libamarok_riokarma-mediadevice.* -%endif -# Void engine (noop) -%{tde_datadir}/services/amarok_void-engine_plugin.desktop -%{tde_tdelibdir}/libamarok_void-engine_plugin.* -# Xine engine -%if 0%{?with_xine} -%{tde_datadir}/services/amarok_xine-engine.desktop -%{tde_tdelibdir}/libamarok_xine-engine.* -%endif -## Gstreamer engine -#%{tde_datadir}/services/amarok_gst10engine_plugin.desktop -#%{tde_tdelibdir}/libamarok_gst10engine_plugin.* -# YAUAP -%if 0%{?with_yauap} -%{tde_datadir}/services/amarok_yauap-engine_plugin.desktop -%{tde_tdelibdir}/libamarok_yauap-engine_plugin.* -%endif -# AKODE -%if 0%{?with_akode} -%{tde_datadir}/services/amarok_aKode-engine.desktop -%{tde_tdelibdir}/libamarok_aKode-engine.* -%endif - -%post -/sbin/ldconfig -xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : -xdg-desktop-menu forceupdate 2> /dev/null || : - -%postun -/sbin/ldconfig -xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : -xdg-desktop-menu forceupdate 2> /dev/null || : - - -########## - -%package ruby -Summary: %{name} Ruby support -Group: Applications/Multimedia -Requires: %{name} = %{version}-%{release} -# For dir ownership and some default plugins (lyrics) -Requires: ruby - -%description ruby -%{summary}. - -%files ruby -%defattr(-,root,root,-) -%{tde_libdir}/ruby_lib/* - -########## - -%package konqueror -Summary: Amarok konqueror (service menus, sidebar) support -Group: Applications/Multimedia - -Requires: %{name} = %{version}-%{release} -Requires: trinity-konqueror - -%description konqueror -%{summary}. - -%files konqueror -%defattr(-,root,root,-) -%{tde_datadir}/apps/konqueror/servicemenus/*.desktop -%{tde_tdelibdir}/konqsidebar_universalamarok.* -%{tde_datadir}/apps/konqsidebartng/*/amarok.desktop - - -########## - -%if 0%{?with_libvisual} - -%package visualisation -Summary: Visualisation plugins for Amarok -Group: Applications/Multimedia -Requires: %{name} = %{version}-%{release} -# No plugins by default, we need libvisual-plugins -#Requires: libvisual-plugins - -%description visualisation -Amarok can use visualisation plugins from different origins. -Right now, only xmms is supported, which means that you can -use any of xmms' visualisation plugins with Amarok. - -%files visualisation -%defattr(-,root,root,-) -%{tde_bindir}/amarok_libvisual - -%endif - -########## - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - -########## - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%if 0%{?rhel} == 4 -%patch3 -p1 -b .rhel4 -%endif - -%build -unset QTDIR QTINC QTLIB -. /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" - -# Do not build against any "/usr" installed KDE -export KDEDIR=%{tde_prefix} - -# 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 - -%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 \ - \ - -DBIN_INSTALL_DIR=%{tde_bindir} \ - -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \ - -DLIB_INSTALL_DIR=%{tde_libdir} \ - -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ - \ - %{?with_libvisual:-DWITH_LIBVISUAL=ON} \ - -DWITH_KONQSIDEBAR=ON \ - %{?with_xine:-DWITH_XINE=ON} \ - %{?with_yauap:-DWITH_YAUAP=ON} \ - %{?with_akode:-DWITH_AKODE=ON} \ - %{?with_gpod:-DWITH_IPOD=ON} \ - %{?with_ifp:-DWITH_IFP=ON} \ - %{?with_njb:-DWITH_NJB=ON} \ - %{?with_mtp:-DWITH_MTP=ON} \ - %{?with_karma:-DWITH_RIOKARMA=ON} \ - -DWITH_DAAP=ON \ - %{?with_mp4v2:-DWITH_MP4V2=ON} \ - %{?with_inotify:-DWITH_INOTIFY=ON} \ - -DBUILD_ALL=ON \ - .. - -%__make %{?_smp_mflags} || %__make - - -%install -%__rm -fr $RPM_BUILD_ROOT -%__make install DESTDIR=$RPM_BUILD_ROOT -C build - - -# unpackaged files -%__rm -f $RPM_BUILD_ROOT%{tde_libdir}/lib*.la -# Removes '.so' to avoid automatic -devel dependency -%__rm -f $RPM_BUILD_ROOT%{tde_libdir}/libamarok.so - -# Locales -%find_lang %{tde_pkg} - -# HTML -for lang_dir in $RPM_BUILD_ROOT%{tde_tdedocdir}/HTML/* ; do - if [ -d $lang_dir ]; then - lang=$(basename $lang_dir) - [ "$lang" == "en" ] && d=en/amarok || d=$lang - echo "%lang($lang) %doc %{tde_tdedocdir}/HTML/$d" >> amarok.lang - fi -done - - - -%clean -%__rm -fr $RPM_BUILD_ROOT - - -%changelog diff --git a/redhat/applications/amarok/amarok-14.0.0.spec b/redhat/applications/amarok/amarok.spec index a18b8f583..c483cd3ed 100644 --- a/redhat/applications/amarok/amarok-14.0.0.spec +++ b/redhat/applications/amarok/amarok.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg amarok %define tde_prefix /opt/trinity @@ -133,6 +133,9 @@ BuildRequires: dbus-qt BuildRequires: trinity-dbus-tqt-devel >= 1:0.63 %endif +# DAAP support +%define with_daap 0 + # IFP support # IFP package is broken under PCLinuxOS. %if 0%{?pclinuxos} == 0 @@ -207,17 +210,21 @@ BuildRequires: %{_lib}inotifytools-devel %endif # XINE support -%if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} == 18 || 0%{?fedora} == 19 || 0%{?rhel} >= 5 +%if 0%{?fedora} && 0%{?fedora} <= 31 %define with_xine 1 -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: %{_lib}xine1.2-devel +BuildRequires: xine-lib-devel %endif -%if 0%{?fedora} || 0%{?rhel} +%if 0%{?rhel} && 0%{?rhel} <= 7 +#define with_xine 1 BuildRequires: xine-lib-devel %endif -%if 0%{?suse_version} -BuildRequires: libxine-devel +%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} +%define with_xine 1 +BuildRequires: %{_lib}xine1.2-devel %endif +%if 0%{?sle_version} && 0%{?sle_version} <= 150000 +%define with_xine 1 +BuildRequires: libxine-devel %endif # YAUAP support @@ -285,18 +292,23 @@ Amarok is a multimedia player with: %{tde_tdeappdir}/*.desktop %{tde_datadir}/servicetypes/*.desktop %{tde_datadir}/apps/profiles/amarok.profile.xml -%{tde_confdir}/amarokrc +%config(noreplace) %{tde_confdir}/amarokrc %{tde_datadir}/config.kcfg/*.kcfg %{tde_datadir}/services/amarokitpc.protocol %{tde_datadir}/services/amaroklastfm.protocol %{tde_datadir}/services/amarokpcast.protocol +%{tde_mandir}/man1/amarok.1* +%{tde_mandir}/man1/amarokapp.1* +%{tde_mandir}/man1/amarokcollectionscanner.1* # -libs ? -- Rex %{tde_libdir}/libamarok.so.0 %{tde_libdir}/libamarok.so.0.0.0 # DAAP +%if 0%{?with_daap} %{tde_bindir}/amarok_daapserver.rb %{tde_tdelibdir}/libamarok_daap-mediadevice.* %{tde_datadir}/services/amarok_daap-mediadevice.desktop +%endif # Mass-storage %{tde_datadir}/services/amarok_massstorage-device.desktop %{tde_tdelibdir}/libamarok_massstorage-device.* @@ -343,8 +355,8 @@ Amarok is a multimedia player with: %{tde_tdelibdir}/libamarok_xine-engine.* %endif ## Gstreamer engine -#%{tde_datadir}/services/amarok_gst10engine_plugin.desktop -#%{tde_tdelibdir}/libamarok_gst10engine_plugin.* +#{tde_datadir}/services/amarok_gst10engine_plugin.desktop +#{tde_tdelibdir}/libamarok_gst10engine_plugin.* # YAUAP %if 0%{?with_yauap} %{tde_datadir}/services/amarok_yauap-engine_plugin.desktop @@ -358,22 +370,6 @@ Amarok is a multimedia player with: ########## -%package ruby -Summary: %{name} Ruby support -Group: Applications/Multimedia -Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} -# For dir ownership and some default plugins (lyrics) -Requires: ruby - -%description ruby -%{summary}. - -%files ruby -%defattr(-,root,root,-) -%{tde_libdir}/ruby_lib/ - -########## - %package konqueror Summary: Amarok konqueror (service menus, sidebar) support Group: Applications/Multimedia @@ -410,6 +406,7 @@ use any of xmms' visualisation plugins with Amarok. %files visualisation %defattr(-,root,root,-) %{tde_bindir}/amarok_libvisual +%{tde_mandir}/man1/amarok_libvisual.1* %endif @@ -431,6 +428,18 @@ if ! ruby -rrbconfig -e "puts Config.expand( Config::MAKEFILE_CONFIG['MAJOR'] )" -e "s|Config\.|RbConfig\.|g" fi +%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8 +%__sed -i "amarok/src/scripts/common/Publisher.py" \ + "amarok/src/scripts/common/Zeroconf.py" \ + "amarok/src/scripts/playlist2html/Playlist.py" \ + "amarok/src/scripts/playlist2html/playlist2html.py" \ + "amarok/src/scripts/playlist2html/PlaylistServer.py" \ + "amarok/src/scripts/webcontrol/Playlist.py" \ + "amarok/src/scripts/webcontrol/RequestHandler.py" \ + "amarok/src/scripts/webcontrol/WebControl.py" \ + -e "s|/usr/bin/env python|/usr/bin/env python2|" +%endif + %build unset QTDIR QTINC QTLIB @@ -466,7 +475,7 @@ fi \ %{?with_libvisual:-DWITH_LIBVISUAL=ON} \ -DWITH_KONQSIDEBAR=ON \ - %{?with_xine:-DWITH_XINE=ON} \ + %{?with_xine:-DWITH_XINE=ON} %{?!with_xine:-DWITH_XINE=OFF}\ %{?with_yauap:-DWITH_YAUAP=ON} \ -DWITH_AKODE=OFF \ %{?with_gpod:-DWITH_IPOD=ON} \ @@ -474,9 +483,10 @@ fi %{?with_njb:-DWITH_NJB=ON} \ %{?with_mtp:-DWITH_MTP=ON} \ %{?with_karma:-DWITH_RIOKARMA=ON} \ - -DWITH_DAAP=ON \ + %{!?with_daap:-DWITH_DAAP=OFF} \ %{?with_mp4v2:-DWITH_MP4V2=ON} \ %{?with_inotify:-DWITH_INOTIFY=ON} \ + -DWITH_SYSTEM_SQLITE=ON \ -DBUILD_ALL=ON \ .. diff --git a/redhat/applications/basket/basket-3.5.13.2.spec b/redhat/applications/basket/basket-3.5.13.2.spec deleted file mode 100644 index c392dea83..000000000 --- a/redhat/applications/basket/basket-3.5.13.2.spec +++ /dev/null @@ -1,157 +0,0 @@ -# Default version for this component -%define tde_pkg basket -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man - -%define tde_tdeappdir %{tde_datadir}/applications/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: Taking care of your ideas. -Version: 1.0.3.1 -Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: trinity-tdepim-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: gpgme-devel - -%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%{?suse_version} || 0%{?pclinuxos} -%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/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" - -# 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 - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -%find_lang %{tde_pkg} - -%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/ -%{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_datadir}/config/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 diff --git a/redhat/applications/basket/basket-14.0.0.spec b/redhat/applications/basket/basket.spec index 66138fcdb..99cc3f21b 100644 --- a/redhat/applications/basket/basket-14.0.0.spec +++ b/redhat/applications/basket/basket.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg basket %define tde_prefix /opt/trinity @@ -60,11 +60,12 @@ 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: trinity-kontact-devel >= %{tde_version} BuildRequires: desktop-file-utils BuildRequires: gpgme-devel -BuildRequires: autoconf automake libtool m4 +BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: libtool @@ -100,40 +101,43 @@ baskets to HTML. %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/"*"/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} \ +export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" + +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_INCLUDE_PATH="%{tde_tdeincludedir}" \ + -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=OFF \ + \ + -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \ + -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ + -DCONFIG_INSTALL_DIR="%{tde_confdir}" \ + -DLIB_INSTALL_DIR="%{tde_libdir}" \ \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --disable-final \ - --enable-closure \ - --enable-rpath \ - --disable-gcc-hidden-visibility + -DBUILD_ALL=ON \ + -DWITH_ALL_OPTIONS="ON" \ + .. -%__make %{?_smp_mflags} || %__make +%__make %{?_smp_mflags} %install export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} +%__make install DESTDIR=%{buildroot} -C build %find_lang %{tde_pkg} @@ -168,23 +172,21 @@ echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" %{tde_tdelibdir}/libbasketpart.so %{tde_tdelibdir}/libkontact_basket.la %{tde_tdelibdir}/libkontact_basket.so -%{tde_confdir}/magic/basket.magic +%config(noreplace) %{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/ -%{tde_confdir}/magic/basket.magic.mgc +%config(noreplace) %{tde_confdir}/magic/basket.magic.mgc +%{tde_mandir}/man1/basket.* %changelog diff --git a/redhat/applications/bibletime/bibletime-3.5.13.2.spec b/redhat/applications/bibletime/bibletime-3.5.13.2.spec deleted file mode 100644 index 8bec59af8..000000000 --- a/redhat/applications/bibletime/bibletime-3.5.13.2.spec +++ /dev/null @@ -1,146 +0,0 @@ -# Default version for this component -%define tde_pkg bibletime -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man - -%define tde_tdeappdir %{tde_datadir}/applications/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: A bible study tool for Trinity -Version: 1.6.6.0 -Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org - -Prefix: %{_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: gettext - -# Requires: clucene -%if 0%{?fedora} || 0%{?suse_version} -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%{?suse_version} || 0%{?pclinuxos} -%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/"*"/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 -. /etc/profile.d/qt3.sh -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 \ - \ -%if 0%{?fedora} >= 20 || 0%{?pclinuxos} || 0%{?rhel} >= 7 - --with-sword-dir=%{tde_prefix} -%endif - -# 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 - - -%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 diff --git a/redhat/applications/bibletime/bibletime-14.0.0.spec b/redhat/applications/bibletime/bibletime.spec index c6a0991a1..2efbcfb47 100644 --- a/redhat/applications/bibletime/bibletime-14.0.0.spec +++ b/redhat/applications/bibletime/bibletime.spec @@ -23,7 +23,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg bibletime %define tde_prefix /opt/trinity @@ -124,6 +124,10 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" +%if 0%{?fedora} >= 31 +CXXFLAGS="${RPM_OPT_FLAGS} -std=c++11" +%endif + %configure \ --prefix=%{tde_prefix} \ --exec-prefix=%{tde_prefix} \ diff --git a/redhat/applications/codeine/codeine.spec b/redhat/applications/codeine/codeine.spec new file mode 100644 index 000000000..13a395b94 --- /dev/null +++ b/redhat/applications/codeine/codeine.spec @@ -0,0 +1,165 @@ +# +# spec file for package kaffeine (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.1.0 +%endif +%define tde_pkg codeine +%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.0.1 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: Simple TDE video player +Group: Applications/Multimedia +URL: http://kaffeine.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: %{_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 +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 + +# XINE support +%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?rhel} || 0%{?suse_version} +%define with_xine 1 +%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} +BuildRequires: %{_lib}xine1.2-devel +%endif +%if 0%{?fedora} || 0%{?rhel} +BuildRequires: xine-lib-devel +%endif +%if 0%{?suse_version} +BuildRequires: libxine-devel +%endif +%endif + + +%description +A video player with a different philosophy: simple, uncluttered interface + +Features: +- Plays DVDs, VCDs, all video formats supported by Xine +- Bundled with a simple web-page KPart +- Starts quickly + + +########## + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%debug_package +%endif + +########## + +%prep +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} + + +%build +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 \ + \ + -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \ + -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ + -DLIB_INSTALL_DIR=%{tde_libdir} \ + -DBUILD_ALL=ON \ + .. + +%__make %{?_smp_mflags} + + +%install +export PATH="%{tde_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} -C build + + +%clean +rm -rf $RPM_BUILD_ROOT + + +%files +%defattr(-,root,root,-) +%doc COPYING FAQ README TODO +%{tde_bindir}/codeine +%{tde_tdeappdir}/codeine.desktop +%{tde_datadir}/apps/codeine/ +%{tde_datadir}/apps/konqueror/servicemenus/codeine_play_dvd.desktop +%{tde_tdedocdir}/HTML/en/codeine/ +%{tde_datadir}/icons/hicolor/*/apps/codeine.png +%{tde_mandir}/man1/codeine.1* +%{tde_datadir}/services/codeine_part.desktop +%{tde_tdelibdir}/libcodeine.la +%{tde_tdelibdir}/libcodeine.so + + +%changelog diff --git a/redhat/applications/compizconfig-backend-kconfig/compizconfig-backend-kconfig-3.5.12.spec b/redhat/applications/compizconfig-backend-kconfig/compizconfig-backend-kconfig-3.5.12.spec deleted file mode 100644 index 85a90a849..000000000 --- a/redhat/applications/compizconfig-backend-kconfig/compizconfig-backend-kconfig-3.5.12.spec +++ /dev/null @@ -1,86 +0,0 @@ -# Default version for this component -%if "%{?version}" == "" -%define kdecomp compizconfig-backend-kconfig -%define version 3.5.12 -%endif -%define release 1 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?_prefix}" != "/usr" -%define _docdir %{tde_prefix}/share/doc -%endif - -# TDE 3.5.12 specific building variables -BuildRequires: autoconf automake libtool m4 -%define tde_docdir %{_docdir} -%define tde_libdir %{tde_libdir}/kde3 - - -Name: trinity-%{?kdecomp} -Version: %{?version} -Release: %{?release}%{?dist} -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -Summary: kconfig backend for compizconfig - -Group: System Environment/Libraries -License: GPLv2+ -URL: http://www.opencompositing.org - -Prefix: %{tde_prefix} - -Source0: %{kdecomp}-%{version}.tar.gz - -BuildRequires: tqtinterface-devel -BuildRequires: trinity-tdelibs-devel -BuildRequires: trinity-tdebase-devel -BuildRequires: desktop-file-utils - -BuildRequires: libcompizconfig-devel intltool -Requires: compiz - - -%description -The Compiz Fusion Project brings 3D desktop visual effects that improve -usability of the X Window System and provide increased productivity -through plugins and themes contributed by the community giving a -rich desktop experience. - -This package contains the kconfig backend for libcompizconfig - -%prep -%setup -q -n applications/%{kdecomp} - -%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" -%__make -f admin/Makefile.common - - -%build -unset QTDIR || : ; . /etc/profile.d/qt.sh -export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" - -%configure \ - --with-extra-includes=%{tde_includedir}/tqt - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{?buildroot} -%make_install - - -%clean -%__rm -rf %{?buildroot} - - -%files -%defattr(-,root,root,-) -%doc COPYING.GPL COPYING.LGPL -%{_usr}/%{_lib}/compizconfig/backends/*.so -%exclude %{_usr}/%{_lib}/compizconfig/backends/*.la - -%changelog diff --git a/redhat/applications/digikam/digikam-3.5.13.2-fix_png12_support.patch b/redhat/applications/digikam/digikam-3.5.13.2-fix_png12_support.patch deleted file mode 100644 index 8a5262dda..000000000 --- a/redhat/applications/digikam/digikam-3.5.13.2-fix_png12_support.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- trinity-digikam-3.5.13.2/digikam/libs/dimg/loaders/pngloader.cpp.ORI 2013-03-10 21:44:37.468543760 +0100 -+++ trinity-digikam-3.5.13.2/digikam/libs/dimg/loaders/pngloader.cpp 2013-03-10 21:45:23.246560198 +0100 -@@ -258,7 +258,7 @@ - #ifdef ENABLE_DEBUG_MESSAGES - DDebug() << "PNG in PNG_COLOR_TYPE_GRAY" << endl; - #endif -- png_set_expand_gray_1_2_4_to_8(png_ptr); -+ png_set_gray_1_2_4_to_8(png_ptr); - png_set_gray_to_rgb(png_ptr); - - if (TQImage::systemByteOrder() == TQImage::LittleEndian) // Intel ---- trinity-digikam-3.5.13.2/digikam/kioslave/digikamthumbnail.cpp.ORI 2013-03-10 21:50:56.994910746 +0100 -+++ trinity-digikam-3.5.13.2/digikam/kioslave/digikamthumbnail.cpp 2013-03-10 21:51:09.150668622 +0100 -@@ -465,7 +465,7 @@ - { - png_set_gray_to_rgb(png_ptr); - if (png_get_bit_depth(png_ptr, info_ptr) < 8) -- png_set_expand_gray_1_2_4_to_8(png_ptr); -+ png_set_gray_1_2_4_to_8(png_ptr); - } - - int sizeOfUint = sizeof(unsigned int); diff --git a/redhat/applications/digikam/digikam-3.5.13.2.spec b/redhat/applications/digikam/digikam-3.5.13.2.spec deleted file mode 100644 index 46bb635af..000000000 --- a/redhat/applications/digikam/digikam-3.5.13.2.spec +++ /dev/null @@ -1,311 +0,0 @@ -# Default version for this component -%define tde_pkg digikam -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man - -%define tde_tdeappdir %{tde_datadir}/applications/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: digital photo management application for TDE [Trinity] -Version: 0.9.6 -Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Prefix: %{_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -# [Digikam] Revert PNG support to libpng12 (for RHEL4) -Patch1: digikam-3.5.13.2-fix_png12_support.patch - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: trinity-libkexiv2-devel -BuildRequires: trinity-libkdcraw-devel -BuildRequires: trinity-libkipi-devel - -BuildRequires: libtiff-devel -BuildRequires: gettext - -# GPHOTO2 support -%if 0%{?rhel} == 4 || 0%{?rhel} == 5 || 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: gphoto2-devel -%else -BuildRequires: libgphoto2-devel -%endif - -# JASPER support -%if 0%{?suse_version} -BuildRequires: libjasper-devel -%else -BuildRequires: jasper-devel -%endif - -# EXIV2 support -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: %{_lib}exiv2-devel -%endif -%if 0%{?suse_version} -BuildRequires: libexiv2-devel -%endif -%if 0%{?rhel} || 0%{?fedora} -BuildRequires: exiv2-devel -%endif - -Requires: trinity-libkexiv2 -Requires: trinity-libkdcraw -Requires: trinity-libkipi - -%description -An easy to use and powerful digital photo management -application, which makes importing, organizing and manipulating -digital photos a "snap". An interface is provided to connect to -your digital camera, preview the images and download and/or -delete them. - -The digiKam built-in image editor makes the common photo correction -a simple task. The image editor is extensible via plugins and, -the digikamimageplugins project has been merged to digiKam core -since release 0.9.2, all useful image editor plugins are available -in the base installation. - -digiKam can also make use of the KIPI image handling plugins to -extend its capabilities even further for photo manipulations, -import and export, etc. The kipi-plugins package contains many -very useful extentions. - -digiKam is based in part on the work of the Independent JPEG Group. - - -%package devel -Group: Development/Libraries -Summary: Development files for %{name} -Requires: %{name} = %{version}-%{release} - -%description devel -%{summary} - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%if 0%{?rhel} == 4 -%patch1 -p1 -b .png12 -%endif - -%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR || : ; source /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export KDEDIR="%{tde_prefix}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --libdir=%{tde_libdir} \ - --datadir=%{tde_datadir} \ - --mandir=%{tde_mandir} \ - --includedir=%{tde_tdeincludedir} \ - \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath - -%__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 || : -/sbin/ldconfig -update-desktop-database %{tde_appdir} 2> /dev/null || : - -%postun -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : -/sbin/ldconfig -update-desktop-database %{tde_appdir} 2> /dev/null || : - -%post devel -/sbin/ldconfig || : - -%postun devel -/sbin/ldconfig || : - - -%files -f %{tde_pkg}.lang -%defattr(-,root,root,-) -%doc AUTHORS COPYING -%{tde_bindir}/digikam -%{tde_bindir}/digikamthemedesigner -%{tde_bindir}/digitaglinktree -%{tde_bindir}/showfoto -%{tde_libdir}/libdigikam.so.0 -%{tde_libdir}/libdigikam.so.0.0.0 -%{tde_tdelibdir}/kio_digikamalbums.la -%{tde_tdelibdir}/kio_digikamalbums.so -%{tde_tdelibdir}/kio_digikamdates.la -%{tde_tdelibdir}/kio_digikamdates.so -%{tde_tdelibdir}/digikamimageplugin_adjustcurves.la -%{tde_tdelibdir}/digikamimageplugin_adjustcurves.so -%{tde_tdelibdir}/digikamimageplugin_adjustlevels.la -%{tde_tdelibdir}/digikamimageplugin_adjustlevels.so -%{tde_tdelibdir}/digikamimageplugin_antivignetting.la -%{tde_tdelibdir}/digikamimageplugin_antivignetting.so -%{tde_tdelibdir}/digikamimageplugin_blurfx.la -%{tde_tdelibdir}/digikamimageplugin_blurfx.so -%{tde_tdelibdir}/digikamimageplugin_border.la -%{tde_tdelibdir}/digikamimageplugin_border.so -%{tde_tdelibdir}/digikamimageplugin_channelmixer.la -%{tde_tdelibdir}/digikamimageplugin_channelmixer.so -%{tde_tdelibdir}/digikamimageplugin_charcoal.la -%{tde_tdelibdir}/digikamimageplugin_charcoal.so -%{tde_tdelibdir}/digikamimageplugin_colorfx.la -%{tde_tdelibdir}/digikamimageplugin_colorfx.so -%{tde_tdelibdir}/digikamimageplugin_core.la -%{tde_tdelibdir}/digikamimageplugin_core.so -%{tde_tdelibdir}/digikamimageplugin_distortionfx.la -%{tde_tdelibdir}/digikamimageplugin_distortionfx.so -%{tde_tdelibdir}/digikamimageplugin_emboss.la -%{tde_tdelibdir}/digikamimageplugin_emboss.so -%{tde_tdelibdir}/digikamimageplugin_filmgrain.la -%{tde_tdelibdir}/digikamimageplugin_filmgrain.so -%{tde_tdelibdir}/digikamimageplugin_freerotation.la -%{tde_tdelibdir}/digikamimageplugin_freerotation.so -%{tde_tdelibdir}/digikamimageplugin_hotpixels.la -%{tde_tdelibdir}/digikamimageplugin_hotpixels.so -%{tde_tdelibdir}/digikamimageplugin_infrared.la -%{tde_tdelibdir}/digikamimageplugin_infrared.so -%{tde_tdelibdir}/digikamimageplugin_inpainting.la -%{tde_tdelibdir}/digikamimageplugin_inpainting.so -%{tde_tdelibdir}/digikamimageplugin_inserttext.la -%{tde_tdelibdir}/digikamimageplugin_inserttext.so -%{tde_tdelibdir}/digikamimageplugin_lensdistortion.la -%{tde_tdelibdir}/digikamimageplugin_lensdistortion.so -%{tde_tdelibdir}/digikamimageplugin_noisereduction.la -%{tde_tdelibdir}/digikamimageplugin_noisereduction.so -%{tde_tdelibdir}/digikamimageplugin_oilpaint.la -%{tde_tdelibdir}/digikamimageplugin_oilpaint.so -%{tde_tdelibdir}/digikamimageplugin_perspective.la -%{tde_tdelibdir}/digikamimageplugin_perspective.so -%{tde_tdelibdir}/digikamimageplugin_raindrop.la -%{tde_tdelibdir}/digikamimageplugin_raindrop.so -%{tde_tdelibdir}/digikamimageplugin_restoration.la -%{tde_tdelibdir}/digikamimageplugin_restoration.so -%{tde_tdelibdir}/digikamimageplugin_sheartool.la -%{tde_tdelibdir}/digikamimageplugin_sheartool.so -%{tde_tdelibdir}/digikamimageplugin_superimpose.la -%{tde_tdelibdir}/digikamimageplugin_superimpose.so -%{tde_tdelibdir}/digikamimageplugin_texture.la -%{tde_tdelibdir}/digikamimageplugin_texture.so -%{tde_tdelibdir}/digikamimageplugin_whitebalance.la -%{tde_tdelibdir}/digikamimageplugin_whitebalance.so -%{tde_tdelibdir}/kio_digikamsearch.la -%{tde_tdelibdir}/kio_digikamsearch.so -%{tde_tdelibdir}/kio_digikamtags.la -%{tde_tdelibdir}/kio_digikamtags.so -%{tde_tdelibdir}/kio_digikamthumbnail.la -%{tde_tdelibdir}/kio_digikamthumbnail.so -%{tde_tdeappdir}/digikam.desktop -%{tde_tdeappdir}/showfoto.desktop -%{tde_datadir}/apps/digikam/ -%{tde_datadir}/apps/konqueror/servicemenus/digikam-download.desktop -%{tde_datadir}/apps/konqueror/servicemenus/digikam-gphoto2-camera.desktop -%{tde_datadir}/apps/konqueror/servicemenus/digikam-mount-and-download.desktop -%{tde_datadir}/apps/showfoto/ -%{tde_datadir}/icons/hicolor/*/apps/digikam.png -%{tde_datadir}/icons/hicolor/*/apps/showfoto.png -%{tde_datadir}/services/digikamalbums.protocol -%{tde_datadir}/services/digikamdates.protocol -%{tde_datadir}/services/digikamimageplugin_adjustcurves.desktop -%{tde_datadir}/services/digikamimageplugin_adjustlevels.desktop -%{tde_datadir}/services/digikamimageplugin_antivignetting.desktop -%{tde_datadir}/services/digikamimageplugin_blurfx.desktop -%{tde_datadir}/services/digikamimageplugin_border.desktop -%{tde_datadir}/services/digikamimageplugin_channelmixer.desktop -%{tde_datadir}/services/digikamimageplugin_charcoal.desktop -%{tde_datadir}/services/digikamimageplugin_colorfx.desktop -%{tde_datadir}/services/digikamimageplugin_core.desktop -%{tde_datadir}/services/digikamimageplugin_distortionfx.desktop -%{tde_datadir}/services/digikamimageplugin_emboss.desktop -%{tde_datadir}/services/digikamimageplugin_filmgrain.desktop -%{tde_datadir}/services/digikamimageplugin_freerotation.desktop -%{tde_datadir}/services/digikamimageplugin_hotpixels.desktop -%{tde_datadir}/services/digikamimageplugin_infrared.desktop -%{tde_datadir}/services/digikamimageplugin_inpainting.desktop -%{tde_datadir}/services/digikamimageplugin_inserttext.desktop -%{tde_datadir}/services/digikamimageplugin_lensdistortion.desktop -%{tde_datadir}/services/digikamimageplugin_noisereduction.desktop -%{tde_datadir}/services/digikamimageplugin_oilpaint.desktop -%{tde_datadir}/services/digikamimageplugin_perspective.desktop -%{tde_datadir}/services/digikamimageplugin_raindrop.desktop -%{tde_datadir}/services/digikamimageplugin_restoration.desktop -%{tde_datadir}/services/digikamimageplugin_sheartool.desktop -%{tde_datadir}/services/digikamimageplugin_superimpose.desktop -%{tde_datadir}/services/digikamimageplugin_texture.desktop -%{tde_datadir}/services/digikamimageplugin_whitebalance.desktop -%{tde_datadir}/services/digikamsearch.protocol -%{tde_datadir}/services/digikamtags.protocol -%{tde_datadir}/services/digikamthumbnail.protocol -%{tde_datadir}/servicetypes/digikamimageplugin.desktop -%{tde_mandir}/man*/* -#%{tde_tdedocdir}/HTML/en/digikam-apidocs/ - - -%files devel -%{tde_tdeincludedir}/digikam_export.h -%{tde_tdeincludedir}/digikam/ -%{tde_libdir}/libdigikam.so -%{tde_libdir}/libdigikam.la - - -%changelog diff --git a/redhat/applications/digikam/digikam-14.0.0.spec b/redhat/applications/digikam/digikam.spec index dc95cb8c7..11ea6135a 100644 --- a/redhat/applications/digikam/digikam-14.0.0.spec +++ b/redhat/applications/digikam/digikam.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg digikam %define tde_prefix /opt/trinity diff --git a/redhat/applications/dolphin/dolphin-3.5.13.2.spec b/redhat/applications/dolphin/dolphin-3.5.13.2.spec deleted file mode 100644 index 30db977f4..000000000 --- a/redhat/applications/dolphin/dolphin-3.5.13.2.spec +++ /dev/null @@ -1,139 +0,0 @@ -# Default version for this component -%define tde_pkg dolphin -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man - -%define tde_tdeappdir %{tde_datadir}/applications/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: File manager for TDE focusing on usability -Version: 0.9.2 -Release: %{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Prefix: %{_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: gettext - - -%description -Dolphin focuses on being only a file manager. -This approach allows to optimize the user -interface for the task of file management. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%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/"*"/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 -. /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --includedir=%{tde_tdeincludedir} \ - --docdir=%{tde_tdedocdir} \ - --libdir=%{tde_libdir} \ - \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -# Makes 'media_safelyremove.desktop' an alternative -%__mv -f %{buildroot}%{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop %{buildroot}%{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop_d3lphin - -#ย Locales -%find_lang d3lphin - - -%clean -%__rm -rf %{buildroot} - - -%post -update-desktop-database %{tde_tdeappdir} -q &> /dev/null -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : -update-alternatives --install \ - %{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop \ - media_safelyremove.desktop_d3lphin \ - %{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop_d3lphin \ - 15 - -%preun -if [ $1 -eq 0 ]; then - update-alternatives --remove \ - media_safelyremove.desktop_d3lphin \ - %{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop_d3lphin || : -fi - -%postun -update-desktop-database %{tde_tdeappdir} -q &> /dev/null -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : - - -%files -f d3lphin.lang -%defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING TODO -%{tde_bindir}/d3lphin -%{tde_tdeappdir}/d3lphin.desktop -%{tde_datadir}/apps/d3lphin/ -%{tde_datadir}/icons/hicolor/*/apps/d3lphin.png -%lang(en) %{tde_tdedocdir}/HTML/en/d3lphin/ - - -%changelog diff --git a/redhat/applications/dolphin/dolphin.spec b/redhat/applications/dolphin/dolphin.spec index de4f5d627..6d18340c2 100644 --- a/redhat/applications/dolphin/dolphin.spec +++ b/redhat/applications/dolphin/dolphin.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg dolphin %define tde_prefix /opt/trinity diff --git a/redhat/applications/filelight-l10n/filelight-l10n.spec b/redhat/applications/filelight-l10n/filelight-l10n.spec index 5feb96b8f..1525e5eb3 100644 --- a/redhat/applications/filelight-l10n/filelight-l10n.spec +++ b/redhat/applications/filelight-l10n/filelight-l10n.spec @@ -5,6 +5,7 @@ # TDE 3.5.13 specific building variables +%define tde_prefix /opt/trinity %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc @@ -40,7 +41,6 @@ BuildArch: noarch Source0: %{kdecomp}-3.5.13.tar.gz -BuildRequires: tqtinterface-devel BuildRequires: trinity-tdelibs-devel BuildRequires: trinity-tdebase-devel BuildRequires: desktop-file-utils diff --git a/redhat/applications/filelight/filelight-3.5.13.2.spec b/redhat/applications/filelight/filelight-3.5.13.2.spec deleted file mode 100644 index f1b71ae47..000000000 --- a/redhat/applications/filelight/filelight-3.5.13.2.spec +++ /dev/null @@ -1,134 +0,0 @@ -# Default version for this component -%define tde_pkg filelight -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man - -%define tde_tdeappdir %{tde_datadir}/applications/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: Graphical disk usage display -Version: 1.0 -Release: %{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Prefix: %{_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -Obsoletes: filelight-l10n < %{version}-%{release} -Provides: filelight-l10n = %{version}-%{release} - -%description -Filelight creates a complex, but data-rich graphical representation of the files and -directories on your computer. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%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/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR || : ; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --includedir=%{tde_tdeincludedir} \ - --docdir=%{tde_tdedocdir} \ - --libdir=%{tde_libdir} \ - \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -%find_lang %{tde_pkg} - -%clean -%__rm -rf %{buildroot} - - -%post -for f in crystalsvg hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : -done - -%postun -for f in crystalsvg hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : -done - - -%files -f %{tde_pkg}.lang -%defattr(-,root,root,-) -%doc AUTHORS COPYING -%{tde_bindir}/filelight -%{tde_tdeappdir}/filelight.desktop -%{tde_datadir}/apps/filelight/ -%{tde_datadir}/icons/crystalsvg/*/actions/view_filelight.png -%{tde_datadir}/icons/hicolor/*/apps/filelight.png -%{tde_datadir}/config/filelightrc -%{tde_datadir}/services/*.desktop -%{tde_tdelibdir}/libfilelight.so -%{tde_tdelibdir}/libfilelight.la -%lang(da) %{tde_tdedocdir}/HTML/da/filelight/ -%lang(en) %{tde_tdedocdir}/HTML/en/filelight/ -%lang(es) %{tde_tdedocdir}/HTML/es/filelight/ -%lang(et) %{tde_tdedocdir}/HTML/et/filelight/ -%lang(it) %{tde_tdedocdir}/HTML/it/filelight/ -%lang(pt) %{tde_tdedocdir}/HTML/pt/filelight/ -%lang(ru) %{tde_tdedocdir}/HTML/ru/filelight/ -%lang(sv) %{tde_tdedocdir}/HTML/sv/filelight/ - -%changelog diff --git a/redhat/applications/filelight/filelight-14.0.0.spec b/redhat/applications/filelight/filelight.spec index 674b56560..312b507fc 100644 --- a/redhat/applications/filelight/filelight-14.0.0.spec +++ b/redhat/applications/filelight/filelight.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg filelight %define tde_prefix /opt/trinity @@ -155,7 +155,7 @@ export PATH="%{tde_bindir}:${PATH}" # Updates applications categories for openSUSE %if 0%{?suse_version} -%suse_update_desktop_file filelight FileManager +%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/filelight.desktop FileManager %endif @@ -171,7 +171,7 @@ export PATH="%{tde_bindir}:${PATH}" %{tde_datadir}/apps/filelight/ %{tde_datadir}/icons/crystalsvg/*/actions/view_filelight.png %{tde_datadir}/icons/hicolor/*/apps/filelight.png -%{tde_confdir}/filelightrc +%config(noreplace) %{tde_confdir}/filelightrc %{tde_datadir}/services/*.desktop %{tde_tdelibdir}/libfilelight.so %{tde_tdelibdir}/libfilelight.la @@ -183,6 +183,7 @@ export PATH="%{tde_bindir}:${PATH}" %lang(pt) %{tde_tdedocdir}/HTML/pt/filelight/ %lang(ru) %{tde_tdedocdir}/HTML/ru/filelight/ %lang(sv) %{tde_tdedocdir}/HTML/sv/filelight/ +%{tde_mandir}/man1/filelight.1* %changelog diff --git a/redhat/applications/fusion-icon/fusion-icon-14.0.0.spec b/redhat/applications/fusion-icon/fusion-icon-14.0.0.spec deleted file mode 100644 index 8f2e0cd6d..000000000 --- a/redhat/applications/fusion-icon/fusion-icon-14.0.0.spec +++ /dev/null @@ -1,92 +0,0 @@ -# Default version for this component -%define tde_pkg fusion-icon -%if "%{?tde_version}" == "" -%define tde_version 14.0.0 -%endif - -%if "%{?python2_sitelib}" == "" -%define python2_sitelib %(python2 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())") -%endif - - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: tray icon to launch and manage Compiz Fusion [Trinity] -Version: 0.0.0+git20071028 -Release: 2%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Prefix: %{_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: tqtinterface-devel -BuildRequires: trinity-tdelibs-devel -BuildRequires: trinity-tdebase-devel -BuildRequires: desktop-file-utils -BuildRequires: python -Requires: python -Requires: trinity-compizconfig-backend-kconfig - -%description -The OpenCompositing Project brings 3D desktop visual effects that -improve the usability and eye candy of the X Window System and provide -increased productivity. - -This package contains a tray icon that can launch Compiz and its -decorators. - - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} - - -%build -unset QTDIR QTINC QTLIB -export PATH="%{tde_bindir}:${PATH}" - -%__make - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install \ - DESTDIR=%{buildroot} \ - PREFIX=%{tde_prefix} - -# Removes 'egg-info' -find "%{?buildroot}%{python2_sitelib}" -name "*.egg-info" -delete - - -%clean -%__rm -rf %{buildroot} - - -%files -%defattr(-,root,root,-) -%{tde_bindir}/fusion-icon -%{python2_sitelib}/FusionIcon/ -%{tde_datadir}/applications/fusion-icon.desktop -%{tde_datadir}/icons/hicolor/*/apps/fusion-icon.png -%{tde_datadir}/icons/hicolor/scalable/apps/fusion-icon.svg - - -%changelog diff --git a/redhat/applications/fusion-icon/fusion-icon-3.5.13-fix_python_sitelib.patch b/redhat/applications/fusion-icon/fusion-icon-3.5.13-fix_python_sitelib.patch deleted file mode 100644 index 6ad5c045c..000000000 --- a/redhat/applications/fusion-icon/fusion-icon-3.5.13-fix_python_sitelib.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- fusion-icon/Makefile.ori 2012-08-04 11:13:26.208733002 +0200 -+++ fusion-icon/Makefile 2012-08-04 11:16:13.354858961 +0200 -@@ -1,12 +1,13 @@ - PREFIX = '/usr' - DESTDIR = '/' -+PYTHON_SITELIB = '/usr/lib/python2.7/site-packages' - #interfaces = 'gtk qt4' - - all: - @python setup.py build - - install: -- @python setup.py install --prefix=${PREFIX} --root=${DESTDIR} -+ @python setup.py install --prefix=${PREFIX} --root=${DESTDIR} --install-lib=${PYTHON_SITELIB} - - uninstall: - @python setup.py uninstall diff --git a/redhat/applications/fusion-icon/fusion-icon.spec b/redhat/applications/fusion-icon/fusion-icon.spec index 99f8992ff..e3f8bf5cb 100644 --- a/redhat/applications/fusion-icon/fusion-icon.spec +++ b/redhat/applications/fusion-icon/fusion-icon.spec @@ -1,6 +1,6 @@ # Default version for this component %define tde_pkg fusion-icon -%define tde_version 14.0.0 +%define tde_version 14.1.0 %if "%{?python2_sitelib}" == "" %define python2_sitelib %(python2 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())") @@ -23,10 +23,10 @@ %define _docdir %{tde_docdir} -Name: trinity-%{tde_pkg} -Summary: tray icon to launch and manage Compiz Fusion [Trinity] -Version: 0.0.0+git20071028 -Release: 2%{?dist} +Name: trinity-%{tde_pkg} +Summary: tray icon to launch and manage Compiz Fusion [Trinity] +Version: 0.0.0+git20071028 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities diff --git a/redhat/applications/gtk-qt-engine/1383169502:f181fbbb337a75257089e64afabd04dac2e1d466.diff b/redhat/applications/gtk-qt-engine/1383169502:f181fbbb337a75257089e64afabd04dac2e1d466.diff deleted file mode 100644 index 8548d545c..000000000 --- a/redhat/applications/gtk-qt-engine/1383169502:f181fbbb337a75257089e64afabd04dac2e1d466.diff +++ /dev/null @@ -1,50 +0,0 @@ -commit f181fbbb337a75257089e64afabd04dac2e1d466 -Author: Timothy Pearson <kb9vqf@pearsoncomputing.net> -Date: 1383169502 -0500 - - Fix severe iceweasel/icedove tab bar corruption - Clean up minor build warnings - -diff --git a/src/qt_qt_wrapper.cpp b/src/qt_qt_wrapper.cpp -index 067cf24..d3e13bb 100644 ---- a/src/qt_qt_wrapper.cpp -+++ b/src/qt_qt_wrapper.cpp -@@ -337,7 +337,7 @@ void createTQApp() - #endif // USE_FREEBSD - #endif // USE_SOLARIS - -- mozillaFix = (cmdLine.contains("mozilla") || cmdLine.contains("firefox") || cmdLine.contains("thunderbird")); -+ mozillaFix = (cmdLine.contains("mozilla") || cmdLine.contains("firefox") || cmdLine.contains("iceweasel") || cmdLine.contains("thunderbird") || cmdLine.contains("icedove")); - - openOfficeFix = (cmdLine.endsWith("soffice.bin")) - | (cmdLine.endsWith("swriter.bin")) -@@ -692,10 +692,9 @@ void drawButton(GdkWindow* window, GtkStyle* style, GtkStateType state, int defa - TQPushButton button(meepWidget); - button.setBackgroundOrigin(TQWidget::ParentOrigin); - button.setGeometry(x, y, w, h); -- if (style->rc_style->bg[GTK_STATE_NORMAL].pixel != 0) -+ if (style->rc_style->bg[GTK_STATE_NORMAL].pixel != 0) { - button.setPaletteBackgroundColor(gdkColorToTQColor(&style->rc_style->bg[GTK_STATE_NORMAL])); -- TQPoint p = button.backgroundOffset(); -- TQPoint pos = button.pos(); -+ } - - TQStyle::SFlags sflags = stateToSFlags(state); - -@@ -730,8 +729,6 @@ void drawButton(GdkWindow* window, GtkStyle* style, GtkStateType state, int defa - button.setGeometry(x, y, w, h); - if (style->rc_style->bg[GTK_STATE_NORMAL].pixel != 0) - button.setPaletteBackgroundColor(gdkColorToTQColor(&style->rc_style->bg[GTK_STATE_NORMAL])); -- TQPoint p = button.backgroundOffset(); -- TQPoint pos = button.pos(); - - TQStyle::SFlags sflags = stateToSFlags(state); - -@@ -1802,6 +1799,7 @@ void drawArrow(GdkWindow* window, GtkStyle* style, GtkStateType state, GtkArrowT - case GTK_ARROW_LEFT: element = TQStyle::PE_ArrowLeft; break; - case GTK_ARROW_RIGHT: element = TQStyle::PE_ArrowRight; break; - case GTK_ARROW_NONE: return; -+ default: return; - } - - diff --git a/redhat/applications/gtk-qt-engine/1387752298:6e6dbb068e03a8bb818a76ba774d6f94ade7389f.diff b/redhat/applications/gtk-qt-engine/1387752298:6e6dbb068e03a8bb818a76ba774d6f94ade7389f.diff deleted file mode 100644 index fadce37cf..000000000 --- a/redhat/applications/gtk-qt-engine/1387752298:6e6dbb068e03a8bb818a76ba774d6f94ade7389f.diff +++ /dev/null @@ -1,553 +0,0 @@ -commit 6e6dbb068e03a8bb818a76ba774d6f94ade7389f -Author: Timothy Pearson <kb9vqf@pearsoncomputing.net> -Date: 1387752298 -0600 - - Fix numerous drawing glitches in Firefox - -diff --git a/src/qt_qt_wrapper.cpp b/src/qt_qt_wrapper.cpp -index d3e13bb..928aef3 100644 ---- a/src/qt_qt_wrapper.cpp -+++ b/src/qt_qt_wrapper.cpp -@@ -640,7 +640,7 @@ void drawButton(GdkWindow* window, GtkStyle* style, GtkStateType state, int defa - } - - if (gwidget) { -- TQString gwLabel(gtk_button_get_label(gwidget)); -+ TQString gwLabel(gtk_button_get_label(gwidget)); - if (gtk_button_get_use_stock(gwidget)) { - GtkStockItem stockData; - gtk_stock_lookup(gwLabel.ascii(), &stockData); -@@ -649,8 +649,8 @@ void drawButton(GdkWindow* window, GtkStyle* style, GtkStateType state, int defa - gwLabel.replace("&", "&&"); - gwLabel.replace("_", "&"); - -- TQPixmap buttonicon; -- TQBitmap buttonicon_mask; -+ TQPixmap buttonicon; -+ TQBitmap buttonicon_mask; - - GtkWidget* giconwidget = gtk_button_get_image(gwidget); - if (giconwidget) { -@@ -735,9 +735,9 @@ void drawButton(GdkWindow* window, GtkStyle* style, GtkStateType state, int defa - if (defaultButton) - sflags |= TQStyle::Style_ButtonDefault; - button.setDefault(defaultButton); -- -+ - painter.fillRect(0, 0, w, h, tqApp->palette().active().background()); -- -+ - tqApp->style().drawControl(TQStyle::CE_PushButton, &painter, &button, - TQRect(0,0,w,h), button.palette().active(), sflags); - -diff --git a/src/qt_theme_draw.c b/src/qt_theme_draw.c -index 20d8c87..e84c4f7 100644 ---- a/src/qt_theme_draw.c -+++ b/src/qt_theme_draw.c -@@ -676,8 +676,9 @@ draw_box(GtkStyle * style, - int nbpages; - sanitize_size(window, &width, &height); - -- if (gtkQtDebug) -+ if (gtkQtDebug) { - printf("Box (%d,%d,%d,%d) Widget: %s Detail: %s\n",x,y,width,height,gtk_widget_get_name(widget),detail); -+ } - - if (GTK_IS_SCROLLBAR(widget)) - { -@@ -685,38 +686,54 @@ draw_box(GtkStyle * style, - { - GtkAdjustment* adj = (GtkAdjustment*)gtk_range_get_adjustment(GTK_RANGE(widget)); - int orientation = ((width>height) ? GTK_ORIENTATION_HORIZONTAL : GTK_ORIENTATION_VERTICAL); -- -+ -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area); - drawScrollBar(window, style, state_type, orientation, adj, x, y, width, height); -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL); - } - return; - } - if (DETAIL("menuitem")) - { - /* Crude way of checking if it's a menu item, or a menubar item */ -- if (x != 0) -+ if (x != 0) { -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area); - drawMenuBarItem(window,style,state_type,x,y,width,height); -- else -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL); -+ } -+ else { -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area); - drawMenuItem(window,style,state_type,x,y,width,height); -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL); -+ } - return; - } - if (DETAIL("menubar")) - { -- if (openOfficeFix == 1) -+ if (openOfficeFix == 1) { - parent_class->draw_box (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height); -- else if (mozillaFix == 1) -+ } -+ else if (mozillaFix == 1) { - parent_class->draw_box (style, window, state_type, GTK_SHADOW_NONE, area, widget, detail, x, y, width, height); -- else -+ } -+ else { -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area); - drawMenubar(window,style,state_type,x,y,width,height); -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL); -+ } - return; - } - if (DETAIL("menu")) - { -- if (openOfficeFix == 1) -+ if (openOfficeFix == 1) { - parent_class->draw_box (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height); -- else -- { -- if ((x >= 0) && (y >= 0)) /* Work around weirdness in firefox */ -+ } -+ else { -+ if ((x >= 0) && (y >= 0)) { /* Work around weirdness in firefox */ -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area); - drawMenu(window,style,state_type,x,y,width,height); -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL); -+ } - } - return; - } -@@ -724,16 +741,15 @@ draw_box(GtkStyle * style, - { - double fraction = gtk_progress_bar_get_fraction(GTK_PROGRESS_BAR(widget)); - GtkProgressBarOrientation orientation = gtk_progress_bar_get_orientation(GTK_PROGRESS_BAR(widget)); -- -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area); - drawProgressBar(window,style,state_type,orientation,fraction,x,y,width,height); -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL); - return; - } - if (GTK_IS_PROGRESS(widget) && DETAIL("bar")) - { - if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area); -- - drawProgressChunk(window,style,state_type,x,y,width,height); -- - if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL); - return; - } -@@ -742,8 +758,7 @@ draw_box(GtkStyle * style, - GtkAdjustment* adj; - int inverted; - GValue *val = (GValue*)g_malloc( sizeof(GValue) ); -- if (gdk_window_is_viewable(gtk_widget_get_parent_window(widget))) -- { -+ if (gdk_window_is_viewable(gtk_widget_get_parent_window(widget))) { - GdkPixbuf *gpix; - gpix = gdk_pixbuf_get_from_drawable(NULL, gtk_widget_get_parent_window(widget),NULL, x, y, 0, 0, width, height); - setFillPixmap(gpix); -@@ -758,7 +773,9 @@ draw_box(GtkStyle * style, - g_free(val); - - adj = gtk_range_get_adjustment((GtkRange *) widget); -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area); - drawSlider(window,style,state_type,adj,x,y,width,height, (GTK_RANGE(widget))->orientation, inverted); -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL); - return; - } - if (DETAIL("button")) -@@ -767,18 +784,15 @@ draw_box(GtkStyle * style, - int toolbutton = 0; - parent = gtk_widget_get_parent(widget); - -- if (parent && (GTK_IS_CLIST(parent) || GTK_IS_LIST(parent) || GTK_IS_TREE_VIEW(parent))) -- { -+ if (parent && (GTK_IS_CLIST(parent) || GTK_IS_LIST(parent) || GTK_IS_TREE_VIEW(parent))) { - drawListHeader(window,style,state_type,x,y,width,height); - return; - } - - /* this is a very very bad hack but there seems to be no way to find if a button is on a - * toolbar in gtk */ -- while (1) -- { -- if (GTK_IS_WIDGET(parent)) -- { -+ while (1) { -+ if (GTK_IS_WIDGET(parent)) { - #ifdef HAVE_BONOBO - if (GTK_IS_TOOLBAR(parent) || BONOBO_IS_UI_TOOLBAR(parent)) - #else -@@ -789,17 +803,20 @@ draw_box(GtkStyle * style, - break; - } - } -- else -+ else { - break; -+ } - parent = gtk_widget_get_parent(parent); - } - - parent = gtk_widget_get_parent(widget); - -- if (toolbutton) -+ if (toolbutton) { -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area); - drawToolButton(window,style,state_type,x,y,width,height); -- else -- { -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL); -+ } -+ else { - /* Baghira hack -- rounded buttons really ugly when they are small like - on a dropdown entry box -- eg. search/replace in gedit */ - /* Draw square buttons only if number of children in the hbox is 2 and -@@ -807,31 +824,35 @@ draw_box(GtkStyle * style, - int defaultButton = gtk_widget_has_focus(widget); - GtkWindow* toplevel; - -- if (isBaghira && GTK_IS_BOX(parent) && (g_list_length(GTK_BOX(parent)->children) == 2)) -- { -+ if (isBaghira && GTK_IS_BOX(parent) && (g_list_length(GTK_BOX(parent)->children) == 2)) { - child_list = g_list_first((GTK_BOX(parent)->children)); - child = (GtkWidget *)child_list->data; -- if (GTK_IS_ENTRY(child)) -- { -+ if (GTK_IS_ENTRY(child)) { -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area); - drawSquareButton(window,style,state_type,x,y,width,height); -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL); - return; - } - - child_list = g_list_last((GTK_BOX(parent)->children)); - child = ((GtkBoxChild *)child_list->data)->widget; -- if (GTK_IS_ENTRY(child)) -- { -+ if (GTK_IS_ENTRY(child)) { -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area); - drawSquareButton(window,style,state_type,x,y,width,height); -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL); - return; - } - - } - - toplevel = GTK_WINDOW(gtk_widget_get_toplevel(widget)); -- if (toplevel && toplevel->default_widget == widget) -+ if (toplevel && toplevel->default_widget == widget) { - defaultButton = 1; -- -+ } -+ -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area); - drawButton(window,style,state_type,defaultButton,x,y,width,height,GTK_BUTTON(widget)); -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL); - } - return; - } -@@ -860,43 +881,55 @@ draw_box(GtkStyle * style, - - /* Now draw the tab -- tab position is also calculated in this function - checkout drawTabFrame() for drawing tabbarbase. */ -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area); - drawTabNG(window,style,state_type,x, y, width/*-2*/, height, nb ); -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL); - } - else { -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area); - drawTab(window,style,state_type,x,y,width/*-2*/,height); -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL); - } - return; - } -- if (DETAIL("optionmenu")) -- { -+ if (DETAIL("optionmenu")) { -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area); - drawComboBox(window,style,state_type,x,y,width,height); -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL); - return; - } -- if (DETAIL("toolbar")) -- { -+ if (DETAIL("toolbar")) { - if (openOfficeFix == 1) - parent_class->draw_box (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height); - else -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area); - drawToolbar(window,style,state_type,x,y,width,height); -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL); - return; - } -- if (DETAIL("spinbutton_up")) -- { -+ if (DETAIL("spinbutton_up")) { -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area); - drawSpinButton(window, style, state_type, 0, x, y, width, height); -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL); - return; - } -- if (DETAIL("spinbutton_down")) -- { -+ if (DETAIL("spinbutton_down")) { -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area); - drawSpinButton(window, style, state_type, 1, x, y, width, height); -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL); - return; - } -- if (DETAIL("spinbutton")) -+ if (DETAIL("spinbutton")) { - return; -+ } - -- if (DETAIL("optionmenutab") || DETAIL("buttondefault")) -+ if (DETAIL("optionmenutab") || DETAIL("buttondefault")) { - return; -- -+ } -+ -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area); - drawFrame(window,style,state_type,shadow_type,x,y,width,height); -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL); - } - - -@@ -916,11 +949,11 @@ draw_flat_box(GtkStyle * style, - { - sanitize_size(window, &width, &height); - -- if (gtkQtDebug) -+ if (gtkQtDebug) { - printf("Flat Box (%d,%d,%d,%d) Widget: %s Detail: %s %d %d\n",x,y,width,height,gtk_widget_get_name(widget),detail, state_type, GTK_STATE_SELECTED); -+ } - -- if (DETAIL("tooltip")) -- { -+ if (DETAIL("tooltip")) { - GdkColor tooltipColor; - GdkGCValues gc_values; - GdkGCValuesMask gc_values_mask; -@@ -940,21 +973,25 @@ draw_flat_box(GtkStyle * style, - gtk_gc_release(tooltipGc); - } - -- if ((DETAILHAS("cell_even") || DETAILHAS("cell_odd")) && (state_type == GTK_STATE_SELECTED)) -- { -+ if ((DETAILHAS("cell_even") || DETAILHAS("cell_odd")) && (state_type == GTK_STATE_SELECTED)) { -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area); - drawListViewItem(window,style,state_type,x,y,width,height); -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL); - } -- else if (DETAIL("listitem")) -- { -+ else if (DETAIL("listitem")) { -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area); - drawListViewItem(window,style,state_type,x,y,width,height); -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL); - } -- else if (DETAILHAS("cell_even")) -- { -+ else if (DETAILHAS("cell_even")) { -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area); - gdk_draw_rectangle(window, style->base_gc[GTK_STATE_NORMAL], TRUE, x, y, width, height); -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL); - } -- else if (DETAILHAS("cell_odd")) -- { -+ else if (DETAILHAS("cell_odd")) { -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area); - gdk_draw_rectangle(window, alternateBackgroundGc(style), TRUE, x, y, width, height); -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL); - } - } - -@@ -972,26 +1009,28 @@ draw_check(GtkStyle * style, - gint width, - gint height) - { -- if (gtkQtDebug) -+ if (gtkQtDebug) { - printf("Check (%d,%d,%d,%d) Widget: %s Detail: %s\n", x, y, width, height,gtk_widget_get_name(widget),detail); -+ } - -- if (GTK_IS_MENU_ITEM(widget)) -- { -- if (shadow_type == GTK_SHADOW_IN) -- { -- if (gdk_window_is_viewable(gtk_widget_get_parent_window(widget))) -- { -+ if (GTK_IS_MENU_ITEM(widget)) { -+ if (shadow_type == GTK_SHADOW_IN) { -+ if (gdk_window_is_viewable(gtk_widget_get_parent_window(widget))) { - GdkPixbuf *gpix; - gpix = gdk_pixbuf_get_from_drawable(NULL, gtk_widget_get_parent_window(widget), NULL, x, y, 0, 0, width, height); - setFillPixmap(gpix); - g_object_unref(gpix); - } -- -+ -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area); - drawMenuCheck(window,style,state_type,x,y,width,height); -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL); - } - return; - } -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area); - drawCheckBox(window,style,state_type,(shadow_type==GTK_SHADOW_IN),x,y,width,height); -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL); - } - - -@@ -1009,11 +1048,11 @@ draw_option(GtkStyle * style, - gint width, - gint height) - { -- if (gtkQtDebug) -+ if (gtkQtDebug) { - printf("Option (%d,%d,%d,%d) Widget: %s Detail: %s\n", x, y, width, height,gtk_widget_get_name(widget),detail); -+ } - -- if (gdk_window_is_viewable(gtk_widget_get_parent_window(widget))) -- { -+ if (gdk_window_is_viewable(gtk_widget_get_parent_window(widget))) { - GdkPixbuf *gpix; - gpix = gdk_pixbuf_get_from_drawable(NULL, gtk_widget_get_parent_window(widget),NULL, x, y, 0, 0, width, height); - setFillPixmap(gpix); -@@ -1022,11 +1061,16 @@ draw_option(GtkStyle * style, - - if (GTK_IS_MENU_ITEM(widget)) - { -- if (shadow_type == GTK_SHADOW_IN) -+ if (shadow_type == GTK_SHADOW_IN) { -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area); - drawMenuCheck(window,style,state_type,x,y,width,height); -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL); -+ } - return; - } -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area); - drawRadioButton(window,style,state_type,(shadow_type==GTK_SHADOW_IN),x,y,width,height); -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL); - } - - -@@ -1043,8 +1087,9 @@ draw_tab(GtkStyle * style, - gint width, - gint height) - { -- if (gtkQtDebug) -+ if (gtkQtDebug) { - printf("Tab (%d,%d,%d,%d) Widget: %s Detail: %s\n", x, y, width, height,gtk_widget_get_name(widget),detail); -+ } - - gtk_paint_box(style, window, state_type, shadow_type, area, widget, detail, x, y, width, height); - } -@@ -1218,11 +1263,15 @@ draw_box_gap(GtkStyle* style, - - if (width<0 || height<0) return; /* Eclipse really can be this stupid! */ - -- if (gtkQtDebug) -+ if (gtkQtDebug) { - printf("Box_gap (%d,%d,%d,%d) Widget: %s Detail: %s\n", x, y, width, height,gtk_widget_get_name(widget),detail); -+ } - -- if (DETAIL("notebook")) -+ if (DETAIL("notebook")) { -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area); - drawTabFrame(window,style,state_type,x,y-2,width,height+2, gtk_notebook_get_tab_pos((GtkNotebook *)widget)); -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL); -+ } - } - - -@@ -1245,8 +1294,9 @@ draw_extension(GtkStyle * style, - - sanitize_size (window, &width, &height); - -- if (gtkQtDebug) -+ if (gtkQtDebug) { - printf("Extension (%d,%d,%d,%d) Widget: %s Detail: %s\n", x, y, width, height,gtk_widget_get_name(widget),detail); -+ } - - gtk_paint_box(style, window, state_type, shadow_type, area, widget, detail, - x, y, width, height); -@@ -1265,8 +1315,9 @@ draw_focus (GtkStyle *style, - gint width, - gint height) - { -- if (gtkQtDebug) -+ if (gtkQtDebug) { - printf("Focus Rect (%d,%d,%d,%d) Widget: %s Detail: %s\n", x, y, width, height,gtk_widget_get_name(widget),detail); -+ } - - GtkWidget* parent = gtk_widget_get_parent(widget); - -@@ -1274,7 +1325,9 @@ draw_focus (GtkStyle *style, - GTK_IS_RADIO_BUTTON(widget) || - (parent && (GTK_IS_CLIST(parent) || GTK_IS_LIST(parent) || GTK_IS_TREE_VIEW(parent)))) - { -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area); - drawFocusRect(window, style, x, y, width, height); -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL); - } - return; - } -@@ -1293,24 +1346,31 @@ draw_slider(GtkStyle * style, - gint height, - GtkOrientation orientation) - { -- if (gtkQtDebug) -+ if (gtkQtDebug) { - printf("Slider (%d,%d,%d,%d) Widget: %s Detail: %s\n", x, y, width, height,gtk_widget_get_name(widget),detail); -+ } - -- if (DETAIL("slider")) -- { -+ if (DETAIL("slider")) { - GtkAdjustment* adj = gtk_range_get_adjustment(GTK_RANGE(widget)); - int widgetX, widgetY; - - GtkWidget* parent = widget; -- while (gtk_widget_get_parent(parent) != NULL) -+ while (gtk_widget_get_parent(parent) != NULL) { - parent = gtk_widget_get_parent(parent); -+ } - - gtk_widget_translate_coordinates(widget, parent, 0, 0, &widgetX, &widgetY); - -- if (orientation == GTK_ORIENTATION_VERTICAL) -+ if (orientation == GTK_ORIENTATION_VERTICAL) { -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area); - drawScrollBarSlider(window, style, state_type, orientation, adj, x-1, y, width+2, height, y-widgetY, widget->allocation.height); -- else -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL); -+ } -+ else { -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area); - drawScrollBarSlider(window, style, state_type, orientation, adj, x, y-1, width, height+2, x-widgetX, widget->allocation.width); -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL); -+ } - return; - } - } -@@ -1334,10 +1394,13 @@ draw_handle(GtkStyle * style, - - sanitize_size(window, &width, &height); - -- if (gtkQtDebug) -+ if (gtkQtDebug) { - printf("Handle (%d,%d,%d,%d) Widget: %s Detail: %s State Type: %d\n",x,y,width,height,gtk_widget_get_name(widget),detail, state_type); -- -+ } -+ -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area); - drawSplitter(window,style,state_type,orientation,x,y,width,height); -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL); - return; - } - diff --git a/redhat/applications/gtk-qt-engine/1387757695:a90aa09722d47f5f4009b089d8d874354899bdb8.diff b/redhat/applications/gtk-qt-engine/1387757695:a90aa09722d47f5f4009b089d8d874354899bdb8.diff deleted file mode 100644 index 2985283a6..000000000 --- a/redhat/applications/gtk-qt-engine/1387757695:a90aa09722d47f5f4009b089d8d874354899bdb8.diff +++ /dev/null @@ -1,435 +0,0 @@ -commit a90aa09722d47f5f4009b089d8d874354899bdb8 -Author: Timothy Pearson <kb9vqf@pearsoncomputing.net> -Date: 1387757695 -0600 - - Fix Firefox scrollbars - -diff --git a/kcm_gtk/kcmgtk.cpp b/kcm_gtk/kcmgtk.cpp -index 28faded..ccd18c1 100644 ---- a/kcm_gtk/kcmgtk.cpp -+++ b/kcm_gtk/kcmgtk.cpp -@@ -185,6 +185,5 @@ KcmGtk::KcmGtk(TQWidget *parent, const char *name, const TQStringList&) - widget->styleIcon->setPixmap(iconLoader.loadIcon("style", KIcon::Desktop)); - widget->fontIcon->setPixmap(iconLoader.loadIcon("fonts", KIcon::Desktop)); -- widget->firefoxIcon->setPixmap(iconLoader.loadIcon("firefox", KIcon::Desktop)); - widget->keyboardIcon->setPixmap(iconLoader.loadIcon("keyboard", KIcon::Desktop)); - - getInstalledThemes(); -@@ -199,5 +198,4 @@ KcmGtk::KcmGtk(TQWidget *parent, const char *name, const TQStringList&) - connect(widget->emacsBox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(itemChanged())); - connect(widget->fontChange, TQT_SIGNAL(clicked()), TQT_SLOT(fontChangeClicked())); -- connect(widget->firefoxFix, TQT_SIGNAL(clicked()), TQT_SLOT(firefoxFixClicked())); - connect(widget->emacsDetails, TQT_SIGNAL(clicked()), TQT_SLOT(emacsDetailsClicked())); - connect(widget->warning3, TQT_SIGNAL(clicked()), TQT_SLOT(searchPathsClicked())); -@@ -453,190 +451,6 @@ TQString KcmGtk::quickHelp() const - return i18n(""); - } - -- --void KcmGtk::firefoxFixClicked() --{ -- profiles.clear(); -- getProfiles(TQDir::homeDirPath() + "/.mozilla/firefox/", 0); -- getProfiles(TQDir::homeDirPath() + "/.thunderbird/", 1); -- -- TQString profilePath; -- if (profiles.count() == 0) -- { -- KMessageBox::error(this, i18n("No Mozilla profiles found"), i18n("Could not load Mozilla profiles")); -- return; -- } -- else if (profiles.count() == 1) -- { -- fixProfile(profiles.begin().data()); -- } -- else -- { -- KDialogBase* dialog = new KDialogBase(this, "", true, i18n("Mozilla profile"), KDialogBase::Ok | KDialogBase::Cancel); -- MozillaProfileWidget* w = new MozillaProfileWidget(dialog); -- w->profilesList->header()->hide(); -- w->profilesList->hideColumn(1); -- -- TQPixmap icon = KGlobal::iconLoader()->loadIcon("kuser", KIcon::Small); -- -- for ( TQMapIterator<TQString,TQString> it = profiles.begin(); it != profiles.end(); ++it ) -- { -- KListViewItem* i = new KListViewItem(w->profilesList); -- i->setPixmap(0, icon); -- i->setText(0, it.key()); -- i->setText(1, it.data()); -- } -- -- dialog->setMainWidget(w); -- if (dialog->exec() == TQDialog::Rejected) -- { -- delete dialog; -- return; -- } -- -- TQListViewItemIterator it2(w->profilesList, TQListViewItemIterator::Selected); -- while (it2.current()) -- { -- KListViewItem* i = (KListViewItem*) it2.current(); -- ++it2; -- -- fixProfile(i->text(1)); -- } -- delete dialog; -- } -- -- KMessageBox::information(this, i18n("Your Mozilla profile was updated sucessfully. You must close and restart all Firefox and Thunderbird windows for the changes to take effect"), i18n("Mozilla profile")); --} -- --void KcmGtk::getProfiles(const TQString& basePath, int type) --{ -- TQString fileName = basePath + "/profiles.ini"; -- if (TQFile::exists(fileName)) -- { -- KConfig config(fileName, true, false); -- TQStringList groups = config.groupList(); -- -- for ( TQStringList::Iterator it = groups.begin(); it != groups.end(); ++it ) -- { -- if (!(*it).lower().startsWith("profile")) -- continue; -- -- config.setGroup(*it); -- TQString name = (type ? i18n("Thunderbird") : i18n("Firefox")) + " - " + config.readEntry("Name"); -- TQString path = config.readEntry("Path"); -- if (!path.startsWith("/")) -- path = basePath + path; -- profiles.insert(name, path); -- } -- } --} -- --void KcmGtk::fixProfile(const TQString& path) --{ -- if (!TQFile::exists(path + "/chrome")) -- { -- TQDir dir(path); -- dir.mkdir("chrome"); -- } -- -- TQString data = scrollBarCSS(); -- writeFirefoxCSS(path + "/chrome/userChrome.css", data); -- writeFirefoxCSS(path + "/chrome/userContent.css", data); --} -- --TQString KcmGtk::scrollBarCSS() --{ -- // The following code determines how many buttons are on a scrollbar -- // It works by looking at each pixel of the scrollbar's area not taken up by the groove, -- // and asking the style which subcontrol is at that location. -- TQScrollBar sbar(NULL); -- sbar.setOrientation(Qt::Horizontal); -- sbar.setValue(1); -- sbar.resize(200,25); -- -- TQRect rect = tqApp->style().querySubControlMetrics(TQStyle::CC_ScrollBar, &sbar, TQStyle::SC_ScrollBarGroove); -- -- bool back1 = false; -- bool forward1 = false; -- bool back2 = false; -- bool forward2 = false; -- -- TQStyle::SubControl sc = TQStyle::SC_None; -- for (TQPoint pos(0,7) ; pos.x()<rect.x() ; pos.setX(pos.x()+1)) -- { -- TQStyle::SubControl sc2 = tqApp->style().querySubControl(TQStyle::CC_ScrollBar, &sbar, pos); -- if (sc != sc2) -- { -- if (sc2 == TQStyle::SC_ScrollBarAddLine) forward1 = true; -- if (sc2 == TQStyle::SC_ScrollBarSubLine) back1 = true; -- sc = sc2; -- } -- } -- sc = TQStyle::SC_None; -- for (TQPoint pos(rect.x()+rect.width(),7) ; pos.x()<200 ; pos.setX(pos.x()+1)) -- { -- TQStyle::SubControl sc2 = tqApp->style().querySubControl(TQStyle::CC_ScrollBar, &sbar, pos); -- if (sc != sc2) -- { -- if (sc2 == TQStyle::SC_ScrollBarAddLine) forward2 = true; -- if (sc2 == TQStyle::SC_ScrollBarSubLine) back2 = true; -- sc = sc2; -- } -- } -- -- TQString upTop = (back1 ? "-moz-box" : "none"); -- TQString downTop = (forward1 ? "-moz-box" : "none"); -- TQString upBottom = (back2 ? "-moz-box" : "none"); -- TQString downBottom = (forward2 ? "-moz-box" : "none"); -- -- TQString data; -- data += "/* The following four lines were added by KDE */\n"; -- data += "scrollbarbutton[sbattr=\"scrollbar-up-top\"] { display: " + upTop + " !important; }\n"; -- data += "scrollbarbutton[sbattr=\"scrollbar-down-top\"] { display: " + downTop + " !important; }\n"; -- data += "scrollbarbutton[sbattr=\"scrollbar-up-bottom\"] { display: " + upBottom + " !important; }\n"; -- data += "scrollbarbutton[sbattr=\"scrollbar-down-bottom\"] { display: " + downBottom + " !important; }\n"; -- -- return data; --} -- --void KcmGtk::writeFirefoxCSS(const TQString& path, const TQString& data) --{ -- TQString fileData; -- TQFile file(path); -- if (file.open(IO_ReadOnly)) -- { -- TQTextStream stream(&file); -- for (;;) -- { -- TQString line = stream.readLine(); -- if (line.isNull()) -- break; -- -- if ((line == "# The following four lines were added by KDE") || -- (line == "/* The following four lines were added by KDE */")) -- { -- for (int i=0 ; i<4 ; i++) -- stream.readLine(); -- continue; -- } -- -- fileData += line + "\n"; -- } -- file.close(); -- } -- -- if (!file.open(IO_WriteOnly | IO_Truncate)) -- { -- KMessageBox::error(this, i18n("Could not write to %1").arg(path), i18n("Mozilla profile")); -- return; -- } -- TQTextStream stream(&file); -- stream << fileData << data; -- file.close(); -- -- return; --} -- - void KcmGtk::emacsDetailsClicked() - { - if (emacsDetailsDialog == NULL) -diff --git a/kcm_gtk/kcmgtk.h b/kcm_gtk/kcmgtk.h -index 542a043..2c04919 100644 ---- a/kcm_gtk/kcmgtk.h -+++ b/kcm_gtk/kcmgtk.h -@@ -71,7 +71,6 @@ public slots: - void styleChanged(); - void fontChangeClicked(); - void itemChanged(); -- void firefoxFixClicked(); - void emacsDetailsClicked(); - void searchPathsClicked(); - void searchPathsOk(); -@@ -82,10 +81,6 @@ public slots: - - private: - void updateFontPreview(); -- void getProfiles(const TQString& basePath, int type); -- void fixProfile(const TQString& path); -- TQString scrollBarCSS(); -- void writeFirefoxCSS(const TQString& path, const TQString& data); - void getInstalledThemes(); - - TQString env(TQString key); -diff --git a/kcm_gtk/kcmgtkwidget.ui b/kcm_gtk/kcmgtkwidget.ui -index 512a610..705655b 100644 ---- a/kcm_gtk/kcmgtkwidget.ui -+++ b/kcm_gtk/kcmgtkwidget.ui -@@ -481,118 +481,6 @@ - </widget> - </hbox> - </widget> -- <widget class="TQGroupBox"> -- <property name="name"> -- <cstring>groupBox1</cstring> -- </property> -- <property name="sizePolicy"> -- <sizepolicy> -- <hsizetype>5</hsizetype> -- <vsizetype>4</vsizetype> -- <horstretch>0</horstretch> -- <verstretch>0</verstretch> -- </sizepolicy> -- </property> -- <property name="title"> -- <string>Firefox and Thunderbird</string> -- </property> -- <hbox> -- <property name="name"> -- <cstring>unnamed</cstring> -- </property> -- <widget class="TQLayoutWidget"> -- <property name="name"> -- <cstring>layout7_2_2</cstring> -- </property> -- <vbox> -- <property name="name"> -- <cstring>unnamed</cstring> -- </property> -- <widget class="TQLabel"> -- <property name="name"> -- <cstring>firefoxIcon</cstring> -- </property> -- <property name="scaledContents"> -- <bool>true</bool> -- </property> -- </widget> -- <spacer> -- <property name="name"> -- <cstring>spacer3_2_2</cstring> -- </property> -- <property name="orientation"> -- <enum>Vertical</enum> -- </property> -- <property name="sizeType"> -- <enum>Expanding</enum> -- </property> -- <property name="sizeHint"> -- <size> -- <width>20</width> -- <height>31</height> -- </size> -- </property> -- </spacer> -- </vbox> -- </widget> -- <widget class="TQLayoutWidget"> -- <property name="name"> -- <cstring>layout12</cstring> -- </property> -- <vbox> -- <property name="name"> -- <cstring>unnamed</cstring> -- </property> -- <widget class="TQLabel"> -- <property name="name"> -- <cstring>textLabel1</cstring> -- </property> -- <property name="text"> -- <string>Scrollbar buttons may sometimes be displayed incorrectly in Firefox and Thunderbird. This can be fixed by installing some files into your Mozilla profile.</string> -- </property> -- <property name="alignment"> -- <set>WordBreak|AlignVCenter</set> -- </property> -- </widget> -- <widget class="TQLayoutWidget"> -- <property name="name"> -- <cstring>layout11</cstring> -- </property> -- <hbox> -- <property name="name"> -- <cstring>unnamed</cstring> -- </property> -- <widget class="TQPushButton"> -- <property name="name"> -- <cstring>firefoxFix</cstring> -- </property> -- <property name="text"> -- <string>I&nstall scrollbar fix...</string> -- </property> -- </widget> -- <spacer> -- <property name="name"> -- <cstring>spacer11</cstring> -- </property> -- <property name="orientation"> -- <enum>Horizontal</enum> -- </property> -- <property name="sizeType"> -- <enum>Expanding</enum> -- </property> -- <property name="sizeHint"> -- <size> -- <width>101</width> -- <height>21</height> -- </size> -- </property> -- </spacer> -- </hbox> -- </widget> -- </vbox> -- </widget> -- </hbox> -- </widget> - <widget class="TQLabel"> - <property name="name"> - <cstring>textLabel1_2</cstring> -@@ -634,7 +522,6 @@ - <tabstop>fontChange</tabstop> - <tabstop>emacsBox</tabstop> - <tabstop>emacsDetails</tabstop> -- <tabstop>firefoxFix</tabstop> - </tabstops> - <layoutdefaults spacing="6" margin="11"/> - <includehints> -diff --git a/src/qt_qt_wrapper.cpp b/src/qt_qt_wrapper.cpp -index 928aef3..eebcc93 100644 ---- a/src/qt_qt_wrapper.cpp -+++ b/src/qt_qt_wrapper.cpp -@@ -2085,7 +2085,7 @@ void setRcProperties(GtkRcStyle* rc_style, int forceRecreate) - stream << parse_rc_string("GtkScrollbar::stepper-size = " + TQString::number(tqApp->style().querySubControlMetrics(TQStyle::CC_ScrollBar, &sbar, TQStyle::SC_ScrollBarSubLine).width() - 1), "*"); - - stream << parse_rc_string("GtkScrollbar::min-slider-length = " + TQString::number(tqApp->style().pixelMetric(TQStyle::PM_ScrollBarSliderMin)), "*"); -- stream << parse_rc_string("GtkScrollbar::slider-width = " + TQString::number(tqApp->style().pixelMetric(TQStyle::PM_ScrollBarExtent)-2), "*"); -+ stream << parse_rc_string("GtkScrollbar::slider-width = " + TQString::number(tqApp->style().pixelMetric(TQStyle::PM_ScrollBarExtent)), "*"); - - stream << parse_rc_string("GtkButton::child-displacement-x = " + TQString::number(tqApp->style().pixelMetric(TQStyle::PM_ButtonShiftHorizontal)), "*"); - stream << parse_rc_string("GtkButton::child-displacement-y = " + TQString::number(tqApp->style().pixelMetric(TQStyle::PM_ButtonShiftVertical)), "*"); -diff --git a/src/qt_theme_draw.c b/src/qt_theme_draw.c -index e84c4f7..4a2ee12 100644 ---- a/src/qt_theme_draw.c -+++ b/src/qt_theme_draw.c -@@ -506,13 +506,16 @@ draw_arrow(GtkStyle* style, - { - sanitize_size(window, &width, &height); - -- if (gtkQtDebug) -+ if (gtkQtDebug) { - printf("Arrow (%d,%d,%d,%d) Widget: %s Detail: %s\n", x, y, width, height,gtk_widget_get_name(widget),detail); -- -- if (DETAIL("hscrollbar") || DETAIL("vscrollbar")) -+ } -+ -+ if (DETAIL("hscrollbar") || DETAIL("vscrollbar")) { - return; -- if (DETAIL("spinbutton")) -+ } -+ if (DETAIL("spinbutton")) { - return; -+ } - if (DETAIL("notebook")) - { - drawArrow(window, style, state_type, arrow_type, x, y, width, height); -@@ -688,7 +691,12 @@ draw_box(GtkStyle * style, - int orientation = ((width>height) ? GTK_ORIENTATION_HORIZONTAL : GTK_ORIENTATION_VERTICAL); - - if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area); -- drawScrollBar(window, style, state_type, orientation, adj, x, y, width, height); -+ if (orientation == GTK_ORIENTATION_VERTICAL) { -+ drawScrollBar(window, style, state_type, orientation, adj, x+1, y, width, height); -+ } -+ else { -+ drawScrollBar(window, style, state_type, orientation, adj, x, y+1, width, height); -+ } - if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL); - } - return; -@@ -1363,12 +1371,12 @@ draw_slider(GtkStyle * style, - - if (orientation == GTK_ORIENTATION_VERTICAL) { - if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area); -- drawScrollBarSlider(window, style, state_type, orientation, adj, x-1, y, width+2, height, y-widgetY, widget->allocation.height); -+ drawScrollBarSlider(window, style, state_type, orientation, adj, x, y, width, height, y-widgetY, widget->allocation.height); - if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL); - } - else { - if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area); -- drawScrollBarSlider(window, style, state_type, orientation, adj, x, y-1, width, height+2, x-widgetX, widget->allocation.width); -+ drawScrollBarSlider(window, style, state_type, orientation, adj, x, y, width, height, x-widgetX, widget->allocation.width); - if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL); - } - return; diff --git a/redhat/applications/gtk-qt-engine/1387965535:0330b848db129b3dc4daa2a57272ec3b2fb7984c.diff b/redhat/applications/gtk-qt-engine/1387965535:0330b848db129b3dc4daa2a57272ec3b2fb7984c.diff deleted file mode 100644 index 66b206591..000000000 --- a/redhat/applications/gtk-qt-engine/1387965535:0330b848db129b3dc4daa2a57272ec3b2fb7984c.diff +++ /dev/null @@ -1,138 +0,0 @@ -commit 0330b848db129b3dc4daa2a57272ec3b2fb7984c -Author: Timothy Pearson <kb9vqf@pearsoncomputing.net> -Date: 1387965535 -0600 - - Fix Firefox text edit widget glitches - Clean up minor build warnings - -diff --git a/src/qt_theme_draw.c b/src/qt_theme_draw.c -index 4a2ee12..c7992d5 100644 ---- a/src/qt_theme_draw.c -+++ b/src/qt_theme_draw.c -@@ -29,7 +29,7 @@ - extern gboolean tde_showIconsOnPushButtons; - - static GdkPixbuf * (*stockRenderIcon)() = NULL; --static void * (*stockDrawString)() = NULL; -+// static void * (*stockDrawString)() = NULL; - - static void qtengine_style_init (QtEngineStyle *style); - static void qtengine_style_class_init (QtEngineStyleClass *klass); -@@ -128,13 +128,17 @@ draw_hline(GtkStyle* style, - gint x2, - gint y) - { -- if (gtkQtDebug) -+ if (gtkQtDebug) { - printf("HLINE (%d,%p,%d) Widget: %s Detail: %s\n",x1,y1,y,gtk_widget_get_name(widget),detail); -+ } - -- if (DETAIL("vscale")) -+ if (DETAIL("vscale")) { - return; -+ } - -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area); - drawHLine(window,style,state_type,y,x1,x2); -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL); - } - - -@@ -149,13 +153,17 @@ draw_vline(GtkStyle* style, - gint yDest, - gint x) - { -- if (gtkQtDebug) -+ if (gtkQtDebug) { - printf("VLINE (%d,%d,%d) Widget: %s Detail: %s\n",ySource ,yDest ,x,gtk_widget_get_name(widget),detail); -+ } - - -- if (DETAIL("hscale")) -+ if (DETAIL("hscale")) { - return; -+ } -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area); - drawVLine(window,style,state_type,x,ySource,yDest); -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL); - } - - static void -@@ -192,7 +200,9 @@ draw_shadow(GtkStyle *style, - return; - if (DETAIL("entry")) - { -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area); - drawLineEdit(window,style,state_type,gtk_widget_is_focus(widget),x,y,width,height); -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL); - return; - } - if (DETAIL("frame") || DETAIL("trough") || DETAIL("viewport")) -@@ -200,7 +210,9 @@ draw_shadow(GtkStyle *style, - if (!GTK_IS_SCALE(widget)) - { - /*printf("Frame (%d,%d) %dx%d %d %d\n", x,y,width,height,state_type, shadow_type);*/ -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area); - drawFrame(window,style,state_type,shadow_type,x,y,width,height); -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL); - return; - } - } -@@ -644,20 +656,20 @@ draw_diamond(GtkStyle * style, - { - } - --static void --draw_string(GtkStyle *style, -- GdkWindow *window, -- GtkStateType state_type, -- GdkRectangle *area, -- GtkWidget *widget, -- const gchar *detail, -- gint x, -- gint y, -- const gchar *string) --{ -- if (gtkQtDebug) -- printf("STRING Widget: %s Detail: %s\n",gtk_widget_get_name(widget),detail); --} -+// static void -+// draw_string(GtkStyle *style, -+// GdkWindow *window, -+// GtkStateType state_type, -+// GdkRectangle *area, -+// GtkWidget *widget, -+// const gchar *detail, -+// gint x, -+// gint y, -+// const gchar *string) -+// { -+// if (gtkQtDebug) -+// printf("STRING Widget: %s Detail: %s\n",gtk_widget_get_name(widget),detail); -+// } - - static void - draw_box(GtkStyle * style, -@@ -1464,13 +1476,11 @@ void draw_layout (GtkStyle *style, - PangoAttrList *layoutattr; - - const gchar *text; -- gint text_length = 0; - gint text_bytelen = 0; - text = pango_layout_get_text (layout); - if (text != 0) - { - PangoAttribute *textcolorattr; -- text_length = g_utf8_strlen (text, -1); - text_bytelen = strlen (text); - - textcolorattr = pango_attr_foreground_new(color.red, color.green, color.blue); -@@ -2040,7 +2050,7 @@ qtengine_style_class_init (QtEngineStyleClass *klass) - parent_class = g_type_class_peek_parent (klass); - - stockRenderIcon = style_class->render_icon; -- stockDrawString = style_class->draw_string; -+// stockDrawString = style_class->draw_string; - - style_class->render_icon = draw_icon; - diff --git a/redhat/applications/gtk-qt-engine/gtk-qt-engine-3.5.13.2.spec b/redhat/applications/gtk-qt-engine/gtk-qt-engine-3.5.13.2.spec deleted file mode 100644 index d6c1a5311..000000000 --- a/redhat/applications/gtk-qt-engine/gtk-qt-engine-3.5.13.2.spec +++ /dev/null @@ -1,146 +0,0 @@ -# Default version for this component -%define tde_pkg gtk-qt-engine -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: theme engine using Qt for GTK+ 2.x and Trinity -Version: 0.8 -Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Prefix: %{_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -Source1: gtk-qt-engine.rc.sh -Source2: gtkrc-2.0-kde4 -Source3: gtkrc-2.0-kde-kde4 - -# Fix severe iceweasel/icedove tab bar corruption -# Clean up minor build warnings -Patch1: 1383169502:f181fbbb337a75257089e64afabd04dac2e1d466.diff -# Fix numerous drawing glitches in Firefox -Patch2: 1387752298:6e6dbb068e03a8bb818a76ba774d6f94ade7389f.diff -# Fix Firefox scrollbars -Patch3: 1387757695:a90aa09722d47f5f4009b089d8d874354899bdb8.diff -# Fix Firefox text edit widget glitches -# Clean up minor build warnings -Patch4: 1387965535:0330b848db129b3dc4daa2a57272ec3b2fb7984c.diff - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: gettext - - -%description -The GTK-Qt Theme Engine (also known as gtk-qt-engine) is a GTK 2 theme engine -that calls Qt to do the actual drawing. This makes your GTK 2 applications -look almost like real Qt applications and gives you a more unified desktop -experience. - -Please note that this package is targeted at Trinity users and therefore provides -a way to configure it from within KControl. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n %{name}-3.5.13.2%{?preversion:~%{preversion}} - -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 - - -%build -unset QTDIR QTINC QTLIB -. /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" - -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 \ - \ - -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \ - -DDATA_INSTALL_DIR=%{tde_datadir} \ - -DLIB_INSTALL_DIR=%{tde_libdir} \ - -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ - .. - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} -C build - -%find_lang gtkqtengine - -# Adds TDE's specific GTKRC -%__install -D -m 644 %{SOURCE1} %{buildroot}%{tde_datadir}/kgtk/gtk-qt-engine.rc.sh -%__install -D -m 644 %{SOURCE2} %{buildroot}%{tde_datadir}/kgtk/.gtkrc-2.0-kde4 -%__install -D -m 644 %{SOURCE3} %{buildroot}%{tde_datadir}/kgtk/.gtkrc-2.0-kde-kde4 - - -%clean -%__rm -rf %{buildroot} - - -%files -f gtkqtengine.lang -%defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING NEWS README TODO -%{tde_tdelibdir}/kcm_kcmgtk.la -%{tde_tdelibdir}/kcm_kcmgtk.so -%{tde_appdir}/kcmgtk.desktop -%{tde_datadir}/kgtk/gtk-qt-engine.rc.sh -%{tde_datadir}/kgtk/.gtkrc-2.0-kde4 -%{tde_datadir}/kgtk/.gtkrc-2.0-kde-kde4 - -# The following files are outside TDE's directory -%{_libdir}/gtk-2.0/2.10.0/engines/libqtengine.so -%{_datadir}/themes/Qt/gtk-2.0/gtkrc - - -%changelog diff --git a/redhat/applications/gtk-qt-engine/gtk-qt-engine.rc.sh b/redhat/applications/gtk-qt-engine/gtk-qt-engine.rc.sh index d22c56f35..0c82b8b5f 120000 --- a/redhat/applications/gtk-qt-engine/gtk-qt-engine.rc.sh +++ b/redhat/applications/gtk-qt-engine/gtk-qt-engine.rc.sh @@ -1 +1 @@ -../../../ubuntu/maverick/applications/gtk-qt-engine/debian/gtk-qt-engine.rc.sh
\ No newline at end of file +../../../ubuntu/xenial/applications/gtk-qt-engine/debian/gtk-qt-engine.rc.sh
\ No newline at end of file diff --git a/redhat/applications/gtk-qt-engine/gtk-qt-engine-14.0.0.spec b/redhat/applications/gtk-qt-engine/gtk-qt-engine.spec index ef32736f0..6f5f6b3b7 100644 --- a/redhat/applications/gtk-qt-engine/gtk-qt-engine-14.0.0.spec +++ b/redhat/applications/gtk-qt-engine/gtk-qt-engine.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg gtk-qt-engine %define tde_prefix /opt/trinity @@ -141,7 +141,7 @@ fi -DWITH_GCC_VISIBILITY=OFF \ \ -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \ - -DDATA_INSTALL_DIR=%{tde_datadir} \ + -DDATA_INSTALL_DIR=%{tde_datadir}/apps \ -DLIB_INSTALL_DIR=%{tde_libdir} \ -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ .. @@ -157,9 +157,9 @@ export PATH="%{tde_bindir}:${PATH}" %find_lang gtkqtengine # Adds TDE's specific GTKRC -%__install -D -m 644 "%{SOURCE1}" "%{buildroot}%{tde_datadir}/kgtk/gtk-qt-engine.rc.sh" -%__install -D -m 644 "%{SOURCE2}" "%{buildroot}%{tde_datadir}/kgtk/.gtkrc-2.0-kde4" -%__install -D -m 644 "%{SOURCE3}" "%{buildroot}%{tde_datadir}/kgtk/.gtkrc-2.0-kde-kde4" +%__install -D -m 644 "%{SOURCE1}" "%{buildroot}%{tde_datadir}/apps/kgtk/gtk-qt-engine.rc.sh" +%__install -D -m 644 "%{SOURCE2}" "%{buildroot}%{tde_datadir}/apps/kgtk/.gtkrc-2.0-kde4" +%__install -D -m 644 "%{SOURCE3}" "%{buildroot}%{tde_datadir}/apps/kgtk/.gtkrc-2.0-kde-kde4" %clean @@ -172,10 +172,10 @@ export PATH="%{tde_bindir}:${PATH}" %{tde_tdelibdir}/kcm_kcmgtk.la %{tde_tdelibdir}/kcm_kcmgtk.so %{tde_appdir}/kcmgtk.desktop -%dir %{tde_datadir}/kgtk -%{tde_datadir}/kgtk/gtk-qt-engine.rc.sh -%{tde_datadir}/kgtk/.gtkrc-2.0-kde4 -%{tde_datadir}/kgtk/.gtkrc-2.0-kde-kde4 +%dir %{tde_datadir}/apps/kgtk +%{tde_datadir}/apps/kgtk/gtk-qt-engine.rc.sh +%{tde_datadir}/apps/kgtk/.gtkrc-2.0-kde4 +%{tde_datadir}/apps/kgtk/.gtkrc-2.0-kde-kde4 %{tde_tdedocdir}/HTML/en/kcmgtk/ # The following files are outside TDE's directory diff --git a/redhat/applications/gtk-qt-engine/gtkrc-2.0-kde-kde4 b/redhat/applications/gtk-qt-engine/gtkrc-2.0-kde-kde4 index fbb967811..f71a6795b 120000 --- a/redhat/applications/gtk-qt-engine/gtkrc-2.0-kde-kde4 +++ b/redhat/applications/gtk-qt-engine/gtkrc-2.0-kde-kde4 @@ -1 +1 @@ -../../../ubuntu/maverick/applications/gtk-qt-engine/debian/.gtkrc-2.0-kde-kde4
\ No newline at end of file +../../../ubuntu/xenial/applications/gtk-qt-engine/debian/.gtkrc-2.0-kde-kde4
\ No newline at end of file diff --git a/redhat/applications/gtk-qt-engine/gtkrc-2.0-kde4 b/redhat/applications/gtk-qt-engine/gtkrc-2.0-kde4 index 122ae8e16..8e006a46b 120000 --- a/redhat/applications/gtk-qt-engine/gtkrc-2.0-kde4 +++ b/redhat/applications/gtk-qt-engine/gtkrc-2.0-kde4 @@ -1 +1 @@ -../../../ubuntu/maverick/applications/gtk-qt-engine/debian/.gtkrc-2.0-kde4
\ No newline at end of file +../../../ubuntu/xenial/applications/gtk-qt-engine/debian/.gtkrc-2.0-kde4
\ No newline at end of file diff --git a/redhat/applications/gtk3-tqt-engine/gtk3-tqt-engine-14.0.0.spec b/redhat/applications/gtk3-tqt-engine/gtk3-tqt-engine.spec index be57d2f0e..e4100aaca 100644 --- a/redhat/applications/gtk3-tqt-engine/gtk3-tqt-engine-14.0.0.spec +++ b/redhat/applications/gtk3-tqt-engine/gtk3-tqt-engine.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg gtk3-tqt-engine %define tde_prefix /opt/trinity diff --git a/redhat/applications/gwenview-i18n/gwenview-i18n-3.5.13.2.spec b/redhat/applications/gwenview-i18n/gwenview-i18n-3.5.13.2.spec deleted file mode 100644 index f04999d0e..000000000 --- a/redhat/applications/gwenview-i18n/gwenview-i18n-3.5.13.2.spec +++ /dev/null @@ -1,167 +0,0 @@ -# Default version for this component -%define tde_pkg gwenview-i18n -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: Internationalization support for Gwenview [Trinity] -Version: 1.4.2 -Release: %{?!preversion:3}%{?preversion:2_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Prefix: %{_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildArch: noarch - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: gettext - -# EXIV2 support -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: %{_lib}exiv2-devel -%endif -%if 0%{?suse_version} -BuildRequires: libexiv2-devel -%endif -%if 0%{?rhel} || 0%{?fedora} -BuildRequires: exiv2-devel -%endif - -%if "%{?tde_prefix}" == "/usr" -Conflicts: kdegraphics -%endif - - -%description -Gwenview is a fast and easy to use image viewer/browser for TDE. -All common image formats are supported, such as PNG(including transparency), -JPEG(including EXIF tags and lossless transformations), GIF, XCF (Gimp -image format), BMP, XPM and others. Standard features include slideshow, -fullscreen view, image thumbnails, drag'n'drop, image zoom, full network -transparency using the KIO framework, including basic file operations and -browsing in compressed archives, non-blocking GUI with adjustable views. -Gwenview also provides image and directory KParts components for use e.g. in -Konqueror. Additional features, such as image renaming, comparing, -converting, and batch processing, HTML gallery and others are provided by the -KIPI image framework. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%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/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR || : ; source /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" -export KDEDIR="%{tde_prefix}" - -./configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --docdir=%{tde_tdedocdir} \ - --includedir=%{tde_tdeincludedir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ - \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -## File lists -%find_lang gwenview - -# Removes useless files (-devel ?) -%__rm -f %{?buildroot}%{tde_libdir}/libgwenviewcore.so - - -%clean -%__rm -rf %{buildroot} - - -%post -for f in crystalsvg hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : -done -/sbin/ldconfig - - -%postun -for f in crystalsvg hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : -done -/sbin/ldconfig - - -%files -f gwenview.lang -%defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING TODO -%lang(da) %{tde_tdedocdir}/HTML/da/gwenview/ -%lang(de) %{tde_tdedocdir}/HTML/de/gwenview/ -%lang(et) %{tde_tdedocdir}/HTML/et/gwenview/ -%lang(fr) %{tde_tdedocdir}/HTML/fr/gwenview/ -%lang(it) %{tde_tdedocdir}/HTML/it/gwenview/ -%lang(nl) %{tde_tdedocdir}/HTML/nl/gwenview/ -%lang(pl) %{tde_tdedocdir}/HTML/pl/gwenview/ -%lang(pt) %{tde_tdedocdir}/HTML/pt/gwenview/ -%lang(pt_BR) %{tde_tdedocdir}/HTML/pt_BR/gwenview/ -%lang(ru) %{tde_tdedocdir}/HTML/ru/gwenview/ -%lang(sv) %{tde_tdedocdir}/HTML/sv/gwenview/ - - -%changelog diff --git a/redhat/applications/gwenview-i18n/gwenview-i18n.spec b/redhat/applications/gwenview-i18n/gwenview-i18n.spec index 59bbfaa5b..ab08edf97 100644 --- a/redhat/applications/gwenview-i18n/gwenview-i18n.spec +++ b/redhat/applications/gwenview-i18n/gwenview-i18n.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg gwenview-i18n %define tde_prefix /opt/trinity diff --git a/redhat/applications/gwenview/gwenview-3.5.13.2.spec b/redhat/applications/gwenview/gwenview-3.5.13.2.spec deleted file mode 100644 index 55105a6c9..000000000 --- a/redhat/applications/gwenview/gwenview-3.5.13.2.spec +++ /dev/null @@ -1,187 +0,0 @@ -# Default version for this component -%define tde_pkg gwenview -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: Gwenview is an image viewer for TDE. -Version: 1.4.2 -Release: %{?!preversion:11}%{?preversion:10_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Prefix: %{_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: gettext - -# EXIV2 support -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: %{_lib}exiv2-devel -%endif -%if 0%{?suse_version} -BuildRequires: libexiv2-devel -%endif -%if 0%{?rhel} || 0%{?fedora} -BuildRequires: exiv2-devel -%endif - -%if "%{?tde_prefix}" == "/usr" -Conflicts: kdegraphics -%endif - - -%description -Gwenview is a fast and easy to use image viewer/browser for TDE. -All common image formats are supported, such as PNG(including transparency), -JPEG(including EXIF tags and lossless transformations), GIF, XCF (Gimp -image format), BMP, XPM and others. Standard features include slideshow, -fullscreen view, image thumbnails, drag'n'drop, image zoom, full network -transparency using the KIO framework, including basic file operations and -browsing in compressed archives, non-blocking GUI with adjustable views. -Gwenview also provides image and directory KParts components for use e.g. in -Konqueror. Additional features, such as image renaming, comparing, -converting, and batch processing, HTML gallery and others are provided by the -KIPI image framework. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%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/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR || : ; source /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --docdir=%{tde_tdedocdir} \ - --includedir=%{tde_tdeincludedir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ - \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -# Removes useless files (-devel ?) -%__rm -f %{?buildroot}%{tde_libdir}/libgwenviewcore.so - - -%clean -%__rm -rf %{buildroot} - - -%post -for f in crystalsvg hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : -done -/sbin/ldconfig - - -%postun -for f in crystalsvg hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : -done -/sbin/ldconfig - - -%files -%defattr(-,root,root,-) -%doc AUTHORS COPYING -%{tde_bindir}/gwenview -%{tde_libdir}/libgwenviewcore.la -%{tde_libdir}/libgwenviewcore.so.1 -%{tde_libdir}/libgwenviewcore.so.1.0.0 -%{tde_libdir}/libkdeinit_gwenview.la -%{tde_libdir}/libkdeinit_gwenview.so -%{tde_tdelibdir}/gwenview.la -%{tde_tdelibdir}/gwenview.so -%{tde_tdelibdir}/libgvdirpart.la -%{tde_tdelibdir}/libgvdirpart.so -%{tde_tdelibdir}/libgvimagepart.la -%{tde_tdelibdir}/libgvimagepart.so -%{tde_tdeappdir}/gwenview.desktop -%{tde_datadir}/apps/gwenview/ -%{tde_datadir}/apps/gvdirpart/gvdirpart.rc -%{tde_datadir}/apps/gvimagepart/gvimagepart.rc -%{tde_datadir}/apps/gvimagepart/gvimagepartpopup.rc -%{tde_datadir}/apps/kconf_update/gwenview_1.4_osdformat.sh -%{tde_datadir}/apps/kconf_update/gwenview_1.4_osdformat.upd -%{tde_datadir}/apps/kconf_update/gwenview_thumbnail_size.sh -%{tde_datadir}/apps/kconf_update/gwenview_thumbnail_size.upd -%{tde_datadir}/apps/konqueror/servicemenus/konqgwenview.desktop -%{tde_datadir}/config.kcfg/fileoperationconfig.kcfg -%{tde_datadir}/config.kcfg/fileviewconfig.kcfg -%{tde_datadir}/config.kcfg/fullscreenconfig.kcfg -%{tde_datadir}/config.kcfg/gvdirpartconfig.kcfg -%{tde_datadir}/config.kcfg/imageviewconfig.kcfg -%{tde_datadir}/config.kcfg/miscconfig.kcfg -%{tde_datadir}/config.kcfg/slideshowconfig.kcfg -%{tde_datadir}/icons/crystalsvg/*/apps/gvdirpart.png -%{tde_datadir}/icons/crystalsvg/scalable/apps/gvdirpart.svg -%{tde_datadir}/icons/hicolor/*/apps/gwenview.png -%{tde_datadir}/icons/hicolor/*/apps/gvdirpart.png -%{tde_datadir}/icons/hicolor/scalable/apps/gvdirpart.svg -%{tde_datadir}/icons/hicolor/scalable/apps/gwenview.svgz -%{tde_datadir}/man/man1/gwenview.1* -%{tde_datadir}/services/gvdirpart.desktop -%{tde_datadir}/services/gvimagepart.desktop -%lang(en) %{tde_tdedocdir}/HTML/en/gwenview/ - -%changelog diff --git a/redhat/applications/gwenview/gwenview-14.0.0.spec b/redhat/applications/gwenview/gwenview.spec index 8f635bf08..723996a29 100644 --- a/redhat/applications/gwenview/gwenview-14.0.0.spec +++ b/redhat/applications/gwenview/gwenview.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg gwenview %define tde_prefix /opt/trinity diff --git a/redhat/applications/k3b-i18n/k3b-i18n-3.5.13.2.spec b/redhat/applications/k3b-i18n/k3b-i18n-3.5.13.2.spec deleted file mode 100644 index 13ce2e60f..000000000 --- a/redhat/applications/k3b-i18n/k3b-i18n-3.5.13.2.spec +++ /dev/null @@ -1,405 +0,0 @@ -# Default version for this component -%define tde_pkg k3n-i18n -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-k3b-i18n -Summary: Internationalization support for TDE [Trinity] -Version: 1.0.5 -Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist} - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -BuildArch: noarch - -# Speed build options -%define debug_package %{nil} -%define __spec_install_post %{nil} -AutoReq: no - -Prefix: %{_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Group: Applications/Archiving -License: GPLv2+ - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: gettext - -Requires(post): coreutils -Requires(postun): coreutils - -Requires: trinity-k3b - - -%description -K3b provides a comfortable user interface to perform most CD/DVD -burning tasks. While the experienced user can take influence in all -steps of the burning process the beginner may find comfort in the -automatic settings and the reasonable k3b defaults which allow a quick -start. - -########## - -%package Danish -Group: Applications/Archiving -Requires: trinity-k3b -Summary: Danish (da) translations for K3B [Trinity] - -Obsoletes: trinity-k3b-i18n-da < %{version}-%{release} -Provides: trinity-k3b-i18n-da = %{version}-%{release} - -%description Danish -This package contains the Danish translations for K3B. - -%files Danish -%defattr(-,root,root,-) -%{tde_tdedocdir}/HTML/da/k3b -%{tde_datadir}/locale/da/LC_MESSAGES/*.mo - -########## - -%package German -Group: Applications/Archiving -Requires: trinity-k3b -Summary: German (de) translations for K3B [Trinity] - -Obsoletes: trinity-k3b-i18n-de < %{version}-%{release} -Provides: trinity-k3b-i18n-de = %{version}-%{release} - -%description German -This package contains the German translations for K3B. - -%files German -%defattr(-,root,root,-) -%{tde_tdedocdir}/HTML/de/k3b -%{tde_datadir}/locale/de/LC_MESSAGES/*.mo - -########## - -%package Greek -Group: Applications/Archiving -Requires: trinity-k3b >= %{version} -Summary: Greek (el) translations for K3B [Trinity] - -Obsoletes: trinity-k3b-i18n-el < %{version}-%{release} -Provides: trinity-k3b-i18n-el = %{version}-%{release} - -%description Greek -This package contains the greek translations for K3B. - -%files Greek -%defattr(-,root,root,-) -#%{tde_tdedocdir}/HTML/el/k3b -%{tde_datadir}/locale/el/LC_MESSAGES/*.mo - -########## - -%package Spanish -Group: Applications/Archiving -Requires: trinity-k3b -Summary: Spanish (es) translations for K3B [Trinity] - -Obsoletes: trinity-k3b-i18n-es < %{version}-%{release} -Provides: trinity-k3b-i18n-es = %{version}-%{release} - -%description Spanish -This package contains the Spanish translations for K3B. - -%files Spanish -%defattr(-,root,root,-) -%{tde_tdedocdir}/HTML/es/k3b -%{tde_datadir}/locale/es/LC_MESSAGES/*.mo - -########## - -%package Estonian -Group: Applications/Archiving -Requires: trinity-k3b -Summary: Estonian (et) translations for K3B [Trinity] - -Obsoletes: trinity-k3b-i18n-et < %{version}-%{release} -Provides: trinity-k3b-i18n-et = %{version}-%{release} - -%description Estonian -This package contains the Estonian translations for K3B. - -%files Estonian -%defattr(-,root,root,-) -%{tde_tdedocdir}/HTML/et/k3b -%{tde_datadir}/locale/et/LC_MESSAGES/*.mo - -########## - -%package French -Group: Applications/Archiving -Requires: trinity-k3b -Summary: French (fr) translations for K3B [Trinity] - -Obsoletes: trinity-k3b-i18n-fr < %{version}-%{release} -Provides: trinity-k3b-i18n-fr = %{version}-%{release} - -%description French -This package contains the French translations for K3B. - -%files French -%defattr(-,root,root,-) -%{tde_tdedocdir}/HTML/fr/k3b -%{tde_datadir}/locale/fr/LC_MESSAGES/*.mo - -########## - -%package Italian -Group: Applications/Archiving -Requires: trinity-k3b -Summary: Italian (it) translations for K3B [Trinity] - -Obsoletes: trinity-k3b-i18n-it < %{version}-%{release} -Provides: trinity-k3b-i18n-it = %{version}-%{release} - -%description Italian -This package contains the Italian translations for K3B. - -%files Italian -%defattr(-,root,root,-) -%{tde_tdedocdir}/HTML/it/k3b -%{tde_datadir}/locale/it/LC_MESSAGES/*.mo - -########## - -%package Dutch -Group: Applications/Archiving -Requires: trinity-k3b -Summary: Dutch (nl) translations for K3B [Trinity] - -Obsoletes: trinity-k3b-i18n-nl < %{version}-%{release} -Provides: trinity-k3b-i18n-nl = %{version}-%{release} - -%description Dutch -This package contains the Dutch translations for K3B. - -%files Dutch -%defattr(-,root,root,-) -%{tde_tdedocdir}/HTML/nl/k3b -%{tde_datadir}/locale/nl/LC_MESSAGES/*.mo - -########## - -%package Polish -Group: Applications/Archiving -Requires: trinity-k3b -Summary: Polish (pl) translations for K3B [Trinity] - -Obsoletes: trinity-k3b-i18n-pl < %{version}-%{release} -Provides: trinity-k3b-i18n-pl = %{version}-%{release} - -%description Polish -This package contains the Polish translations for K3B. - -%files Polish -%defattr(-,root,root,-) -%{tde_tdedocdir}/HTML/pl/k3b -%{tde_datadir}/locale/pl/LC_MESSAGES/*.mo - -########## - -%package Portuguese -Group: Applications/Archiving -Requires: trinity-k3b -Summary: Portuguese (pt) translations for K3B [Trinity] - -Obsoletes: trinity-k3b-i18n-pt < %{version}-%{release} -Provides: trinity-k3b-i18n-pt = %{version}-%{release} - -%description Portuguese -This package contains the Portuguese translations for K3B. - -%files Portuguese -%defattr(-,root,root,-) -%{tde_tdedocdir}/HTML/pt/k3b -%{tde_datadir}/locale/pt/LC_MESSAGES/*.mo - -########## - -%package Brazil -Group: Applications/Archiving -Requires: trinity-k3b -Summary: Brazilian Portuguese (pt_BR) translations for K3B [Trinity] - -Obsoletes: trinity-k3b-i18n-pt_BR < %{version}-%{release} -Provides: trinity-k3b-i18n-pt_BR = %{version}-%{release} -Obsoletes: trinity-k3b-i18n-ptbr < %{version}-%{release} -Provides: trinity-k3b-i18n-ptbr = %{version}-%{release} - -%description Brazil -This package contains the Brazilian Portuguese translations for K3B. - -%files Brazil -%defattr(-,root,root,-) -%{tde_tdedocdir}/HTML/pt_BR/k3b -%{tde_datadir}/locale/pt_BR/LC_MESSAGES/*.mo - -########## - -%package Russian -Group: Applications/Archiving -Requires: trinity-k3b -Summary: Russian (ru) translations for K3B [Trinity] - -Obsoletes: trinity-k3b-i18n-ru < %{version}-%{release} -Provides: trinity-k3b-i18n-ru = %{version}-%{release} - -%description Russian -This package contains the Russian translations for K3B. - -%files Russian -%defattr(-,root,root,-) -%{tde_tdedocdir}/HTML/ru/k3b -%{tde_datadir}/locale/ru/LC_MESSAGES/*.mo - -########## - -%package Swedish -Group: Applications/Archiving -Requires: trinity-k3b -Summary: Swedish (sv) translations for K3B [Trinity] - -Obsoletes: trinity-k3b-i18n-sv < %{version}-%{release} -Provides: trinity-k3b-i18n-sv = %{version}-%{release} - -%description Swedish -This package contains the Swedish translations for K3B. - -%files Swedish -%defattr(-,root,root,-) -%{tde_tdedocdir}/HTML/sv/k3b -%{tde_datadir}/locale/sv/LC_MESSAGES/*.mo - -########## - -%package Ukrainian -Group: Applications/Archiving -Requires: trinity-k3b -Summary: Ukrainian (uk) translations for K3B [Trinity] - -Obsoletes: trinity-k3b-i18n-uk < %{version}-%{release} -Provides: trinity-k3b-i18n-uk = %{version}-%{release} - -%description Ukrainian -This package contains the Ukrainian translations for K3B. - -%files Ukrainian -%defattr(-,root,root,-) -%{tde_tdedocdir}/HTML/uk/k3b -%{tde_datadir}/locale/uk/LC_MESSAGES/*.mo - -########## - -%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/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR || : ; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" - -./configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --docdir=%{tde_tdedocdir} \ - --includedir=%{tde_tdeincludedir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ - \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath - -%__make %{?_smp_mflags} - - -%install -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -%__rm -rf %{buildroot}%{tde_datadir}/locale/af -%__rm -rf %{buildroot}%{tde_datadir}/locale/ar -%__rm -rf %{buildroot}%{tde_datadir}/locale/bg -%__rm -rf %{buildroot}%{tde_datadir}/locale/br -%__rm -rf %{buildroot}%{tde_datadir}/locale/bs -%__rm -rf %{buildroot}%{tde_datadir}/locale/ca -%__rm -rf %{buildroot}%{tde_datadir}/locale/cs -%__rm -rf %{buildroot}%{tde_datadir}/locale/cy -%__rm -rf %{buildroot}%{tde_datadir}/locale/en_GB -%__rm -rf %{buildroot}%{tde_datadir}/locale/eu -%__rm -rf %{buildroot}%{tde_datadir}/locale/fa -%__rm -rf %{buildroot}%{tde_datadir}/locale/fi -%__rm -rf %{buildroot}%{tde_datadir}/locale/ga -%__rm -rf %{buildroot}%{tde_datadir}/locale/gl -%__rm -rf %{buildroot}%{tde_datadir}/locale/he -%__rm -rf %{buildroot}%{tde_datadir}/locale/hi -%__rm -rf %{buildroot}%{tde_datadir}/locale/hu -%__rm -rf %{buildroot}%{tde_datadir}/locale/is -%__rm -rf %{buildroot}%{tde_datadir}/locale/ja -%__rm -rf %{buildroot}%{tde_datadir}/locale/ka -%__rm -rf %{buildroot}%{tde_datadir}/locale/km -%__rm -rf %{buildroot}%{tde_datadir}/locale/lt -%__rm -rf %{buildroot}%{tde_datadir}/locale/mk -%__rm -rf %{buildroot}%{tde_datadir}/locale/ms -%__rm -rf %{buildroot}%{tde_datadir}/locale/nb -%__rm -rf %{buildroot}%{tde_datadir}/locale/nds -%__rm -rf %{buildroot}%{tde_datadir}/locale/ne -%__rm -rf %{buildroot}%{tde_datadir}/locale/nn -%__rm -rf %{buildroot}%{tde_datadir}/locale/pa -%__rm -rf %{buildroot}%{tde_datadir}/locale/rw -%__rm -rf %{buildroot}%{tde_datadir}/locale/se -%__rm -rf %{buildroot}%{tde_datadir}/locale/sk -%__rm -rf %{buildroot}%{tde_datadir}/locale/sr -%__rm -rf %{buildroot}%{tde_datadir}/locale/sr@Latn -%__rm -rf %{buildroot}%{tde_datadir}/locale/ta -%__rm -rf %{buildroot}%{tde_datadir}/locale/tr -%__rm -rf %{buildroot}%{tde_datadir}/locale/uz -%__rm -rf %{buildroot}%{tde_datadir}/locale/uz@cyrillic -%__rm -rf %{buildroot}%{tde_datadir}/locale/zh_CN -%__rm -rf %{buildroot}%{tde_datadir}/locale/zh_TW - - -%clean -%__rm -rf %{buildroot} - - -%changelog diff --git a/redhat/applications/k3b-i18n/k3b-i18n-14.0.0.spec b/redhat/applications/k3b-i18n/k3b-i18n.spec index c641a739f..37b598615 100644 --- a/redhat/applications/k3b-i18n/k3b-i18n-14.0.0.spec +++ b/redhat/applications/k3b-i18n/k3b-i18n.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg k3b-i18n %define tde_prefix /opt/trinity diff --git a/redhat/applications/k3b/k3b-3.5.13.2.spec b/redhat/applications/k3b/k3b-3.5.13.2.spec deleted file mode 100644 index 851cf978e..000000000 --- a/redhat/applications/k3b/k3b-3.5.13.2.spec +++ /dev/null @@ -1,468 +0,0 @@ -# Default version for this component -%define tde_pkg k3b -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: CD/DVD burning application -Epoch: 1 -Version: 1.0.5 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Group: Applications/Archiving -License: GPLv2+ - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -Source2: k3brc - -# Fix FTBFS because AVCODEC_MAX_AUDIO_FRAME_SIZE is obsolete -Patch1: k3b-3.5.13.2-fix_ffmpeg_support.patch - -# Legacy RedHat / Fedora patches -# manual bufsize (upstream?) -Patch4: k3b-1.0.4-manualbufsize.patch -# RHEL6: Fix K3B icon -Patch106: trinity-k3b-icons.patch - - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: alsa-lib-devel -BuildRequires: audiofile-devel -BuildRequires: hal-devel -BuildRequires: gettext -BuildRequires: libmpcdec-devel -BuildRequires: libmusicbrainz-devel -BuildRequires: libvorbis-devel -BuildRequires: taglib-devel -BuildRequires: zlib-devel - -Requires(post): coreutils -Requires(postun): coreutils - -Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release} -Requires: %{name}-common = %{?epoch:%{epoch}:}%{version}-%{release} - -%if 0%{?suse_version} >= 1310 -Requires: wodim -REquires: genisoimage -%else -Requires: cdrecord -REquires: mkisofs -%endif -Requires: dvd+rw-tools - -# CDRDAO support -%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 5 -Requires: cdrdao -%endif - -# DBUS support -# TQT bindings not available for RHEL4 -%if 0%{?rhel} == 4 -# Dbus bindings were rebuilt with Qt support -BuildRequires: dbus-devel >= 0.22-12.EL.9p1 -Requires: dbus-qt >= 0.22-12.EL.9p1 -%else -BuildRequires: trinity-dbus-tqt-devel >= 1:0.63 -Requires: trinity-dbus-tqt >= 1:0.63 -%endif - -# SNDFILE support -%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 4 -%define with_sndfile 1 -BuildRequires: libsndfile-devel -%endif - -# SAMPLERATE support -%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 4 -%define with_samplerate 1 -BuildRequires: libsamplerate-devel -%endif - -# DVDREAD support -%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 4 -%define with_dvdread 1 -%if 0%{?mdkversion} || 0%{?mgaversion} -BuildRequires: %{_lib}dvdread-devel -%else -BuildRequires: libdvdread-devel -%endif -%endif - -# FLAC support -%if 0%{?mgaversion} || 0%{?mdkversion} -%if 0%{?pclinuxos} -BuildRequires: libflac-devel -BuildRequires: libflac++-devel -%else -BuildRequires: %{_lib}flac-devel -BuildRequires: %{_lib}flac++-devel -%endif -%else -BuildRequires: flac-devel -%endif - -# MAD support -%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} -%define with_libmad 1 -%if 0%{?mdkversion} || 0%{?mgaversion} -BuildRequires: %{_lib}mad-devel -%endif -%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} -BuildRequires: libmad-devel -%endif -%endif - -# LAME support -%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} -%define with_lame 1 -%if 0%{?mgaversion} || 0%{?mdkversion} -%if 0%{?pclinuxos} -BuildRequires: liblame-devel -%else -BuildRequires: %{_lib}lame-devel -%endif -%endif -%if 0%{?suse_version} -BuildRequires: libmp3lame-devel -%endif -%if 0%{?fedora} || 0%{?rhel} -BuildRequires: lame-devel -%endif -%endif - -# FFMPEG support -%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} -%define with_ffmpeg 1 -%if 0%{?mdkversion} || 0%{?mgaversion} -BuildRequires: %{_lib}ffmpeg-devel -%endif -%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} -BuildRequires: ffmpeg-devel -%endif -%endif - - -%description -K3b provides a comfortable user interface to perform most CD/DVD -burning tasks. While the experienced user can take influence in all -steps of the burning process the beginner may find comfort in the -automatic settings and the reasonable k3b defaults which allow a quick -start. - - -%files -%defattr(-,root,root,-) -%doc AUTHORS README COPYING TODO ChangeLog -%{tde_bindir}/k3b -%{tde_tdelibdir}/kfile_k3b.la -%{tde_tdelibdir}/kfile_k3b.so -%{tde_tdelibdir}/kio_videodvd.la -%{tde_tdelibdir}/kio_videodvd.so -%{tde_tdelibdir}/libk3balsaoutputplugin.la -%{tde_tdelibdir}/libk3balsaoutputplugin.so -%{tde_tdelibdir}/libk3bartsoutputplugin.la -%{tde_tdelibdir}/libk3bartsoutputplugin.so -%{tde_tdelibdir}/libk3baudiometainforenamerplugin.la -%{tde_tdelibdir}/libk3baudiometainforenamerplugin.so -%{tde_tdelibdir}/libk3baudioprojectcddbplugin.la -%{tde_tdelibdir}/libk3baudioprojectcddbplugin.so -%{tde_tdelibdir}/libk3bexternalencoder.la -%{tde_tdelibdir}/libk3bexternalencoder.so -%{tde_tdelibdir}/libk3bflacdecoder.la -%{tde_tdelibdir}/libk3bflacdecoder.so -%if 0%{?with_sndfile} -%{tde_tdelibdir}/libk3blibsndfiledecoder.la -%{tde_tdelibdir}/libk3blibsndfiledecoder.so -%endif -%{tde_tdelibdir}/libk3bmpcdecoder.la -%{tde_tdelibdir}/libk3bmpcdecoder.so -%{tde_tdelibdir}/libk3boggvorbisdecoder.la -%{tde_tdelibdir}/libk3boggvorbisdecoder.so -%{tde_tdelibdir}/libk3boggvorbisencoder.la -%{tde_tdelibdir}/libk3boggvorbisencoder.so -%{tde_tdelibdir}/libk3bsoxencoder.la -%{tde_tdelibdir}/libk3bsoxencoder.so -%{tde_tdelibdir}/libk3bwavedecoder.la -%{tde_tdelibdir}/libk3bwavedecoder.so -%lang(en) %{tde_tdedocdir}/HTML/en/k3b/ - - -########## - -%package common -Summary: Common files of %{name} -Group: Applications/Archiving -Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} -%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} -BuildArch: noarch -%endif - -%description common -%{summary}. - -%files common -%defattr(-,root,root,-) -%{tde_tdeappdir}/k3b.desktop -%{tde_datadir}/applnk/.hidden/k3b-cue.desktop -%{tde_datadir}/applnk/.hidden/k3b-iso.desktop -%{tde_datadir}/apps/k3b/ -%{tde_datadir}/apps/konqsidebartng/virtual_folders/services/videodvd.desktop -%{tde_datadir}/apps/konqueror/servicemenus/k3b_audiocd_rip.desktop -%{tde_datadir}/apps/konqueror/servicemenus/k3b_cd_copy.desktop -%{tde_datadir}/apps/konqueror/servicemenus/k3b_dvd_copy.desktop -%{tde_datadir}/apps/konqueror/servicemenus/k3b_handle_empty_cd.desktop -%{tde_datadir}/apps/konqueror/servicemenus/k3b_handle_empty_dvd.desktop -%{tde_datadir}/apps/konqueror/servicemenus/k3b_videodvd_rip.desktop -%{tde_datadir}/config/k3brc -%{tde_datadir}/mimelnk/application/x-k3b.desktop -%{tde_datadir}/icons/hicolor/*/apps/k3b.png -%{tde_datadir}/services/kfile_k3b.desktop -%{tde_datadir}/services/videodvd.protocol -%{tde_datadir}/sounds/k3b_error1.wav -%{tde_datadir}/sounds/k3b_success1.wav -%{tde_datadir}/sounds/k3b_wait_media1.wav - - -%post common -touch --no-create %{tde_datadir}/icons/hicolor ||: - -%postun common -if [ $1 -eq 0 ] ; then - touch --no-create %{tde_datadir}/icons/hicolor &> /dev/null - gtk-update-icon-cache %{tde_datadir}/icons/hicolor &> /dev/null || : - update-desktop-database %{tde_appdir} -q &> /dev/null -fi - -%posttrans common -gtk-update-icon-cache %{tde_datadir}/icons/hicolor &> /dev/null || : -update-desktop-database %{tde_appdir} -q &> /dev/null - -########## - -%package libs -Summary: Runtime libraries for %{name} -Group: System Environment/Libraries -Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} - -%description libs -%{summary}. - -%files libs -%defattr(-,root,root,-) -%{tde_libdir}/libk3b.so.3 -%{tde_libdir}/libk3b.so.3.0.0 -%{tde_libdir}/libk3bdevice.so.5 -%{tde_libdir}/libk3bdevice.so.5.0.0 - -%post libs -/sbin/ldconfig - -%postun libs -/sbin/ldconfig - -########## - -%package devel -Summary: Files for the development of applications which will use %{name} -Group: Development/Libraries -Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release} - -%description devel -%{summary}. - -%files devel -%defattr(-,root,root,-) -%{tde_tdeincludedir}/*.h -%{tde_libdir}/libk3b.so -%{tde_libdir}/libk3bdevice.so - -%post devel -/sbin/ldconfig - -%postun devel -/sbin/ldconfig - -########## - -%if 0%{?with_libmad} -%package plugin-mad -Summary: The MAD plugin for K3B -Group: System Environment/Libraries -Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} - -%description plugin-mad -%{summary}. - -MAD is a high-quality MPEG audio decoder. It currently supports MPEG-1 -and the MPEG-2 extension to Lower Sampling Frequencies, as well as the -so-called MPEG 2.5 format. All three audio layers (Layer I, Layer II, -and Layer III a.k.a. MP3) are fully implemented. - -%files plugin-mad -%defattr(-,root,root,-) -%{tde_tdelibdir}/libk3bmaddecoder.la -%{tde_tdelibdir}/libk3bmaddecoder.so -%endif - -########## - -%if 0%{?with_lame} -%package plugin-lame -Summary: The LAME plugin for K3B -Group: System Environment/Libraries -Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} - -%description plugin-lame -%{summary}. - -Personal and commercial use of compiled versions of LAME (or any other mp3 -encoder) requires a patent license in some countries. - -This package is in tainted, as MP3 encoding is covered by software patents. - -%files plugin-lame -%defattr(-,root,root,-) -%{tde_tdelibdir}/libk3blameencoder.la -%{tde_tdelibdir}/libk3blameencoder.so -%endif - -########## - -%if 0%{?with_ffmpeg} -%package plugin-ffmpeg -Summary: The FFMPEG plugin for K3B -Group: System Environment/Libraries -Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} - -%description plugin-ffmpeg -%{summary}. - -ffmpeg is a hyper fast realtime audio/video encoder, a streaming server -and a generic audio and video file converter. - -%files plugin-ffmpeg -%defattr(-,root,root,-) -%{tde_tdelibdir}/libk3bffmpegdecoder.la -%{tde_tdelibdir}/libk3bffmpegdecoder.so -%endif - -########## - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - -########## - - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} - -%patch1 -p1 -b .ffmpeg -%patch4 -p1 -b .manualbufsize -%patch106 -p1 -b .desktopfile - -%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/"*"/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 -. /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" - -# FFMPEG trick ... -if [ -d /usr/include/ffmpeg ]; then - export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/include/ffmpeg" -fi - -# Notice: extra-includes is required to find arts headers -%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-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath \ - \ - --with-extra-includes=%{tde_includedir} \ - \ - --with-k3bsetup=no \ - --without-cdrecord-suid-root \ - --with-oggvorbis \ - --with-flac \ - %{?with_samplerate:--with-external-libsamplerate} \ - %{?with_dvdread:--with-libdvdread} %{?!with_dvdread:--without-libdvdread} \ - --with-musicbrainz \ - %{?with_sndfile:--with-sndfile} %{?!with_sndfile:--without-sndfile} \ - %{?with_ffmpeg:--with-ffmpeg} %{?!with_ffmpeg:--without-ffmpeg} \ - %{?with_lame:--with-lame} %{?!with_lame:--without-lame} \ - %{?with_libmad:--with-libmad} %{?!with_libmad:--without-libmad} \ - --with-musepack \ - --without-resmgr \ - --with-hal - -# Strange behaviour on RHEL4 ... -%if 0%{?rhel} == 4 -%__sed -i "libk3b/jobs/Makefile" -e "/^am_libjobs_la_final_OBJECTS/ s/ lo//g" -%__mkdir_p "libk3bdevice/.libs" -%__ln_s . "libk3bdevice/.libs/.libs" -%endif - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} -%__install -D -m 644 -p %{SOURCE2} %{buildroot}%{tde_datadir}/config/k3brc - -# remove the .la files -%__rm -f %{buildroot}%{tde_libdir}/libk3b*.la - - -%clean -%__rm -rf %{buildroot} - - -%changelog diff --git a/redhat/applications/k3b/k3b-14.0.0.spec b/redhat/applications/k3b/k3b.spec index fd33e5a7a..5cddbd662 100644 --- a/redhat/applications/k3b/k3b-14.0.0.spec +++ b/redhat/applications/k3b/k3b.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg k3b %define tde_prefix /opt/trinity diff --git a/redhat/applications/k3b/k3brc b/redhat/applications/k3b/k3brc new file mode 100644 index 000000000..5d967f599 --- /dev/null +++ b/redhat/applications/k3b/k3brc @@ -0,0 +1,6 @@ +[General Options] +check system config=false +Manual buffer size=true + +[Notification Messages] +Don't prompt me again.=No diff --git a/redhat/applications/k9copy/k9copy-3.5.13.2.spec b/redhat/applications/k9copy/k9copy-3.5.13.2.spec deleted file mode 100644 index a7a026ab9..000000000 --- a/redhat/applications/k9copy/k9copy-3.5.13.2.spec +++ /dev/null @@ -1,146 +0,0 @@ -# Default version for this component -%define tde_pkg k9copy -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: DVD backup tool for Trinity -Version: 1.2.3 -Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -Patch1: k9copy-3.5.13.2-fix_k3b_link.patch -Patch2: k9copy-3.5.13.2-ftbfs.patch -Patch3: k9copy-3.5.13.2-use_external_dvdread.patch -Patch4: k9copy-3.5.13.2-avcodec.patch - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: trinity-k3b-devel - -# 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%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%patch1 -p1 -b .ftbfs -%patch2 -p1 -b .ftbfs -%patch3 -p1 -b .dvdread -%patch4 -p1 -b .avcodec - -# Removes internal dvdread headers -%__rm -rf dvdread - -%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR || : ; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" - -# 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 \ - \ - --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 diff --git a/redhat/applications/k9copy/k9copy-14.0.0.spec b/redhat/applications/k9copy/k9copy.spec index f03137ba4..656727906 100644 --- a/redhat/applications/k9copy/k9copy-14.0.0.spec +++ b/redhat/applications/k9copy/k9copy.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg k9copy %define tde_prefix /opt/trinity diff --git a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13-fix_nspr_include.patch b/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13-fix_nspr_include.patch deleted file mode 100644 index 210fff5f1..000000000 --- a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13-fix_nspr_include.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- kaffeine-mozilla/src/jni_md.h.ORI 2012-04-26 20:44:15.080210122 +0200 -+++ kaffeine-mozilla/src/jni_md.h 2012-04-26 20:44:28.006895031 +0200 -@@ -40,7 +40,7 @@ - #ifndef JNI_MD_H - #define JNI_MD_H - --#include <nspr/prtypes.h> /* needed for _declspec */ -+#include <nspr4/prtypes.h> /* needed for _declspec */ - - /******************************************************************************* - * WHAT'S UP WITH THIS FILE? ---- kaffeine-mozilla/src/jri_md.h.ORI 2012-04-26 20:44:20.528077329 +0200 -+++ kaffeine-mozilla/src/jri_md.h 2012-04-26 20:44:36.239694357 +0200 -@@ -43,7 +43,7 @@ - #define JRI_MD_H - - #include <assert.h> --#include <nspr/prtypes.h> /* Needed for HAS_LONG_LONG ifdefs */ -+#include <nspr4/prtypes.h> /* Needed for HAS_LONG_LONG ifdefs */ - - #ifdef __cplusplus - extern "C" { diff --git a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.1.spec b/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.1.spec deleted file mode 100644 index e00b81a06..000000000 --- a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.1.spec +++ /dev/null @@ -1,120 +0,0 @@ -# Default version for this component -%define kdecomp kaffeine-mozilla - -# TDE 3.5.13 specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{kdecomp} -Summary: mozilla plugin that lanches kaffeine for supported media types [Trinity] -Version: 0.4.3.1 -Release: 3%{?dist} - -License: GPLv2+ -Group: Applications/Multimedia - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{kdecomp}-3.5.13.1.tar.gz - -# Fix 'nspr' includes location -Patch1: kaffeine-mozilla-3.5.13-fix_nspr_include.patch - -BuildRequires: trinity-tqtinterface-devel >= 3.5.13.1 -BuildRequires: trinity-tdelibs-devel >= 3.5.13.1 -BuildRequires: trinity-tdebase-devel >= 3.5.13.1 -BuildRequires: desktop-file-utils - -%if 0%{?suse_version} -BuildRequires: mozilla-nspr-devel -%else -BuildRequires: nspr-devel -%endif - -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: %{_lib}xaw-devel -%else -BuildRequires: libXaw-devel -%endif - -Requires: trinity-kaffeine - -%description -This mozilla plugin launches kaffeine, the xine-based media player for KDE, -when a page containing a supported media format is loaded. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -unset QTDIR; . /etc/profile.d/qt3.sh -%setup -q -n %{kdecomp}-3.5.13.1 -%patch1 -p1 - -%__cp -f "/usr/share/aclocal/libtool.m4" . -%__cp -f "/usr/share/libtool/"*"/ltmain.sh" . || %__cp "/usr/share/libtool/ltmain.sh" . - -autoreconf -fiv - - -%build -export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" - -%configure \ - --disable-rpath \ - --with-extra-includes=%{tde_includedir}/tqt \ - --enable-closure \ - --prefix=%{_libdir}/mozilla - -%__make %{?_smp_mflags} - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -# Remove useless filess -%__rm -f %{?buildroot}%{_libdir}/mozilla/plugins/kaffeineplugin.a - -%clean -%__rm -rf %{buildroot} - - -%post -/sbin/ldconfig || : - -%postun -/sbin/ldconfig || : - - -%files -%defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING README -# These files are installed outside TDE prefix -%{_libdir}/mozilla/plugins/kaffeineplugin.la -%{_libdir}/mozilla/plugins/kaffeineplugin.so - - -%changelog diff --git a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.2-fix_automake.patch b/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.2-fix_automake.patch deleted file mode 100644 index e4a255dce..000000000 --- a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.2-fix_automake.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- trinity-kaffeine-mozilla-3.5.13.2/admin/cvs.sh.ORI 2014-03-23 11:29:59.873837637 +0100 -+++ trinity-kaffeine-mozilla-3.5.13.2/admin/cvs.sh 2014-03-23 11:30:39.942924217 +0100 -@@ -130,7 +130,7 @@ - fi - - echo "*** Creating Makefile templates" --$AUTOMAKE || exit 1 -+$AUTOMAKE --add-missing || exit 1 - - if test "$UNSERMAKE" = no; then - echo "*** Postprocessing Makefile templates" diff --git a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.2.spec b/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.2.spec deleted file mode 100644 index b2230c6b3..000000000 --- a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.2.spec +++ /dev/null @@ -1,131 +0,0 @@ -# Default version for this component -%define tde_pkg kaffeine-mozilla -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: mozilla plugin that lanches kaffeine for supported media types [Trinity] -Version: 0.4.3.1 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Multimedia - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -# Fix 'nspr' includes location -Patch1: kaffeine-mozilla-3.5.13-fix_nspr_include.patch -# Fix build with newer automake -Patch2: kaffeine-mozilla-3.5.13.2-fix_automake.patch - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -%if 0%{?suse_version} -BuildRequires: mozilla-nspr-devel -%else -BuildRequires: nspr-devel -%endif - -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: %{_lib}xaw-devel -%endif -%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220 -BuildRequires: libXaw-devel -%endif - -Requires: trinity-kaffeine - -%description -This mozilla plugin launches kaffeine, the xine-based media player for TDE, -when a page containing a supported media format is loaded. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%patch1 -p1 -b .nspr -%patch2 -p1 -b .automake - -%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/"*"/ltmain.sh" "ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR QTINC QTLIB -. /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" - -%configure \ - --prefix=%{_libdir}/mozilla \ - \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -# Remove useless filess -%__rm -f %{?buildroot}%{_libdir}/mozilla/plugins/kaffeineplugin.a - - -%clean -%__rm -rf %{buildroot} - - -%post -/sbin/ldconfig || : - -%postun -/sbin/ldconfig || : - - -%files -%defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING README -# These files are installed outside TDE prefix -%{_libdir}/mozilla/plugins/kaffeineplugin.la -%{_libdir}/mozilla/plugins/kaffeineplugin.so - - -%changelog diff --git a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.spec b/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.spec deleted file mode 100644 index fdaafa4b0..000000000 --- a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.spec +++ /dev/null @@ -1,110 +0,0 @@ -# Default version for this component -%define kdecomp kaffeine-mozilla - -# TDE 3.5.13 specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/kde -%define tde_tdeincludedir %{tde_includedir}/kde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{kdecomp} -Summary: mozilla plugin that lanches kaffeine for supported media types [Trinity] -Version: 0.4.3.1 -Release: 2%{?dist} - -License: GPLv2+ -Group: Applications/Multimedia - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{kdecomp}-3.5.13.tar.gz - -# Fix 'nspr' includes location -Patch1: kaffeine-mozilla-3.5.13-fix_nspr_include.patch - -BuildRequires: tqtinterface-devel -BuildRequires: trinity-tdelibs-devel -BuildRequires: trinity-tdebase-devel -BuildRequires: desktop-file-utils -BuildRequires: nspr-devel - -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: %{_lib}xaw-devel -%else -BuildRequires: libXaw-devel -%endif - -Requires: trinity-kaffeine - -%description -This mozilla plugin launches kaffeine, the xine-based media player for KDE, -when a page containing a supported media format is loaded. - - -%prep -unset QTDIR; . /etc/profile.d/qt.sh -%setup -q -n applications/%{kdecomp} -%patch1 -p1 - -%__cp -f "/usr/share/aclocal/libtool.m4" . -%__cp -f "/usr/share/libtool/"*"/ltmain.sh" . || %__cp "/usr/share/libtool/ltmain.sh" . - -autoreconf -fiv - - -%build -export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" - -%configure \ - --disable-rpath \ - --with-extra-includes=%{tde_includedir}/tqt \ - --enable-closure \ - --prefix=%{_libdir}/mozilla - -%__make %{?_smp_mflags} - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -# Remove useless filess -%__rm -f %{?buildroot}%{_libdir}/mozilla/plugins/kaffeineplugin.a - -%clean -%__rm -rf %{buildroot} - - -%post -/sbin/ldconfig || : - -%postun -/sbin/ldconfig || : - - -%files -%defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING README -# These files are installed outside TDE prefix -%{_libdir}/mozilla/plugins/kaffeineplugin.la -%{_libdir}/mozilla/plugins/kaffeineplugin.so - - -%changelog diff --git a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-14.0.0.spec b/redhat/applications/kaffeine-mozilla/kaffeine-mozilla.spec index f9d3be544..775501caa 100644 --- a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-14.0.0.spec +++ b/redhat/applications/kaffeine-mozilla/kaffeine-mozilla.spec @@ -17,8 +17,9 @@ # Default version for this component %define tde_pkg kaffeine-mozilla +%define tde_prefix /opt/trinity %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif # TDE specific building variables @@ -37,7 +38,7 @@ %define _docdir %{tde_docdir} -%if 0%{?fedora} >= 27 +%if 0%{?fedora} >= 27 || 0%{?mgaversion} >= 7 || 0%{?rhel} >= 8 %define debug_package %{nil} %endif @@ -58,8 +59,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -# Fix 'nspr' includes location -Patch1: kaffeine-mozilla-3.5.13-fix_nspr_include.patch +BuildRequires: autoconf automake libtool m4 +BuildRequires: gcc-c++ +BuildRequires: pkgconfig +BuildRequires: libtool BuildRequires: trinity-tqtinterface-devel >= %{tde_version} BuildRequires: trinity-arts-devel >= 1:1.5.10 @@ -94,7 +97,6 @@ when a page containing a supported media format is loaded. %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%patch1 -p1 -b .nspr %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp "/usr/share/libtool/"*"/ltmain.sh" "ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "ltmain.sh" @@ -136,6 +138,8 @@ export PATH="%{tde_bindir}:${PATH}" %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING README # These files are installed outside TDE prefix +%dir %{_libdir}/mozilla +%dir %{_libdir}/mozilla/plugins %{_libdir}/mozilla/plugins/kaffeineplugin.la %{_libdir}/mozilla/plugins/kaffeineplugin.so diff --git a/redhat/applications/kaffeine/kaffeine-3.5.13.2.spec b/redhat/applications/kaffeine/kaffeine-3.5.13.2.spec deleted file mode 100644 index e46e985cc..000000000 --- a/redhat/applications/kaffeine/kaffeine-3.5.13.2.spec +++ /dev/null @@ -1,289 +0,0 @@ -# Default version for this component -%define tde_pkg kaffeine -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man - -%define tde_tdeappdir %{tde_datadir}/applications/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - -Name: trinity-%{tde_pkg} -Summary: Xine-based media player - -Version: 0.8.8 -Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Multimedia -URL: http://kaffeine.sourceforge.net/ - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: gettext - -# VORBIS support -BuildRequires: libvorbis-devel - -# CDDA support -BuildRequires: libcdio-devel -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: libcdda-devel -%endif -%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} -BuildRequires: cdparanoia -BuildRequires: cdparanoia-devel -%endif -%if 0%{?suse_version} >= 1210 || 0%{?fedora} >= 19 || 0%{?rhel} >= 7 -BuildRequires: libcdio-paranoia-devel -%endif - -# X11 stuff -%if 0%{?mgaversion} || 0%{?mdkversion} -%if 0%{?mgaversion} >= 4 -BuildRequires: %{_lib}xext-devel -BuildRequires: %{_lib}xtst-devel -BuildRequires: %{_lib}xinerama-devel -%else -BuildRequires: %{_lib}xext%{?mgaversion:6}-devel -BuildRequires: %{_lib}xtst%{?mgaversion:6}-devel -BuildRequires: %{_lib}xinerama%{?mgaversion:1}-devel -%endif -%endif -%if 0%{?rhel} == 4 -BuildRequires: xorg-x11-devel -%endif -%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220 -BuildRequires: libXext-devel -BuildRequires: libXtst-devel -BuildRequires: libXinerama-devel -%endif -%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 -BuildRequires: libxcb-devel -%endif - -# GSTREAMER support -%if 0%{?rhel} >= 5 || 0%{?suse_version} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} -%define with_gstreamer 1 -%if 0%{?suse_version} -BuildRequires: gstreamer-0_10-devel -BuildRequires: gstreamer-0_10-plugins-base-devel -%endif -%if 0%{?rhel} == 4 -BuildRequires: gstreamer-devel -BuildRequires: gstreamer-plugins-devel -%endif -%if 0%{?rhel} >= 5 || 0%{?fedora} -BuildRequires: gstreamer-plugins-base-devel >= 0.10 -%endif -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: libgstreamer-devel >= 0.10 -BuildRequires: libgstreamer-plugins-base-devel >= 0.10 -%endif -%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 - -# LAME support -%if 0%{?suse_version} -BuildRequires: libmp3lame-devel -%else -BuildRequires: lame-devel -%endif - -# WTF support -%if 0%{?mgaversion} || 0%{?mdkversion} -%if 0%{?pclinuxos} == 0 -BuildRequires: kernel-headers -%endif -%endif -%if 0%{?rhel} >= 5 || 0%{?fedora} -BuildRequires: glibc-kernheaders -%endif - -Requires: %{name}-libs = %{version}-%{release} - -%description -Kaffeine is a xine-based media player for TDE. It plays back CDs, -and VCDs, and can decode all (local or streamed) multimedia formats -supported by xine-lib. -Additionally, Kaffeine is fully integrated in TDE, it supports drag -and drop and provides an editable playlist, a bookmark system, a -Konqueror plugin, OSD and much more. - -%files -f %{tde_pkg}.lang -%defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING README TODO -%{tde_bindir}/kaffeine -%{tde_libdir}/libkaffeinepart.so -%{tde_tdelibdir}/lib*.* -%{tde_datadir}/appl*/*/*.desktop -%if 0%{?with_gstreamer} -%{tde_datadir}/apps/gstreamerpart/ -%endif -%{tde_datadir}/apps/kaffeine/ -%{tde_datadir}/apps/konqueror/servicemenus/*.desktop -%{tde_datadir}/apps/profiles/ -%{tde_datadir}/icons/hicolor/*/*/* -%{tde_datadir}/mimelnk/*/*.desktop -%{tde_datadir}/service*/*.desktop -%{tde_tdedocdir}/HTML/en/kaffeine/ - -%post -touch --no-create %{tde_datadir}/icons/hicolor ||: -gtk-update-icon-cache -q %{tde_datadir}/icons/hicolor 2> /dev/null ||: -update-desktop-database >& /dev/null ||: -/sbin/ldconfig || : - -%postun -touch --no-create %{_datadir}/icons/hicolor ||: -gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||: -update-desktop-database >& /dev/null ||: -/sbin/ldconfig || : - -########## - -%package devel -Summary: Development files for %{name} -Group: Development/Libraries -Requires: %{name}-libs = %{version}-%{release} -Requires: trinity-tdelibs-devel - -%description devel -%{summary}. - -%files devel -%defattr(-,root,root,-) -%{tde_tdeincludedir}/kaffeine/ -%{tde_libdir}/lib*.so -%exclude %{tde_libdir}/libkaffeinepart.so - -%post devel -/sbin/ldconfig || : - -%postun devel -/sbin/ldconfig || : - -########## - -%package libs -Summary: %{name} runtime libraries -Group: System Environment/Libraries - -# include to be paranoid, installing libs-only is still mostly untested -- Rex -Requires: %{name} = %{version}-%{release} - -%description libs -%{summary}. - -%files libs -%defattr(-,root,root,-) -%{tde_libdir}/lib*.so.* - -%post libs -/sbin/ldconfig || : - -%postun libs -/sbin/ldconfig || : - -########## - -%if 0%{?suse_version} || 0%{?pclinuxos} -%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/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR QTINC QTLIB -. /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export KDEDIR=%{tde_prefix} - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --libdir=%{tde_libdir} \ - --datadir=%{tde_datadir} \ - --includedir=%{tde_tdeincludedir} \ - --mandir=%{tde_mandir} \ - \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath \ - \ - --with-xinerama \ - --with-gstreamer \ - --with-lame \ -%if 0%{?rhel} > 0 && 0%{?rhel} <= 5 - --without-dvb \ -%endif - - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf $RPM_BUILD_ROOT -%__make install DESTDIR=$RPM_BUILD_ROOT - -## File lists -# locale's -%find_lang %{tde_pkg} - -# Unpackaged files -rm -f $RPM_BUILD_ROOT%{tde_libdir}/lib*.la -rm -f $RPM_BUILD_ROOT%{tde_datadir}/mimelnk/application/x-mplayer2.desktop - - -%clean -rm -rf $RPM_BUILD_ROOT - - -%changelog diff --git a/redhat/applications/kaffeine/kaffeine-14.0.0.spec b/redhat/applications/kaffeine/kaffeine.spec index d38e6a27d..2ff080f22 100644 --- a/redhat/applications/kaffeine/kaffeine-14.0.0.spec +++ b/redhat/applications/kaffeine/kaffeine.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg kaffeine %define tde_prefix /opt/trinity @@ -140,9 +140,9 @@ BuildRequires: gstreamer1-plugins-base-devel >= 1.0 %endif # XINE support -%if 0%{?fedora} || 0%{?rhel} >= 4 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?rhel} || 0%{?suse_version} %define with_xine 1 -%if 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} BuildRequires: %{_lib}xine1.2-devel %endif %if 0%{?fedora} || 0%{?rhel} diff --git a/redhat/applications/kasablanca/kasablanca-14.0.0.spec b/redhat/applications/kasablanca/kasablanca.spec index 3a92fd87c..7680c1cff 100644 --- a/redhat/applications/kasablanca/kasablanca-14.0.0.spec +++ b/redhat/applications/kasablanca/kasablanca.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg kasablanca %define tde_prefix /opt/trinity @@ -63,7 +63,7 @@ BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: autoconf automake libtool m4 +BuildRequires: cmake >= 2.8 BuildRequires: gcc-c++ BuildRequires: pkgconfig @@ -77,6 +77,12 @@ BuildRequires: update-desktop-files BuildRequires: brp-check-trinity %endif +# ACL support +BuildRequires: libacl-devel + +# IDN support +BuildRequires: libidn-devel + # OPENSSL support BuildRequires: openssl-devel @@ -117,43 +123,44 @@ Kasablanca is an ftp client, among its features are currently: %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/"*"/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" -## Needed(?) for older/legacy setups, harmless otherwise -if pkg-config openssl ; then - export CPPFLAGS="$CPPFLAGS $(pkg-config --cflags-only-I openssl)" +if ! rpm -E %%cmake|grep -q "cd build"; then + %__mkdir_p build + cd build fi -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --libdir=%{tde_libdir} \ - --includedir=%{tde_tdeincludedir} \ - --datadir=%{tde_datadir} \ +%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 \ + \ + -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \ + -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \ + \ + -DWITH_ALL_OPTIONS=ON \ + -DWITH_GCC_VISIBILITY=ON \ \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath \ - --disable-gcc-hidden-visibility + -DBUILD_ALL=ON \ + -DBUILD_DOC=ON \ + -DBUILD_TRANSLATIONS=ON \ + .. -%__make %{?_smp_mflags} +%__make %{?_smp_mflags} || %__make %install export PATH="%{tde_bindir}:${PATH}" %__rm -rf $RPM_BUILD_ROOT -%__make install DESTDIR=$RPM_BUILD_ROOT +%__make install DESTDIR=$RPM_BUILD_ROOT -C build # locale's %find_lang %{tde_pkg} @@ -170,13 +177,14 @@ export PATH="%{tde_bindir}:${PATH}" %files -f %{tde_pkg}.lang %defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING NEWS README +%doc AUTHORS ChangeLog COPYING README %{tde_bindir}/kasablanca %{tde_datadir}/apps/kasablanca/ %{tde_datadir}/config.kcfg/kbconfig.kcfg %{tde_datadir}/icons/hicolor/*/apps/kasablanca.png %{tde_tdedocdir}/HTML/en/kasablanca/ %{tde_tdeappdir}/kasablanca.desktop +%{tde_mandir}/man1/kasablanca.* %changelog diff --git a/redhat/applications/katapult/katapult-3.5.13.2.spec b/redhat/applications/katapult/katapult-3.5.13.2.spec deleted file mode 100644 index c26f46fbd..000000000 --- a/redhat/applications/katapult/katapult-3.5.13.2.spec +++ /dev/null @@ -1,173 +0,0 @@ -# Default version for this component -%define tde_pkg katapult -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: Faster access to applications, bookmarks, and other items. -Version: 0.3.2.1 -Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - - -%description -Katapult is an application for TDE, designed to allow faster access to -applications, bookmarks, and other items. It is plugin-based, so it can -launch anything that is has a plugin for. Its display is driven by -plugins as well, so its appearance is completely customizable. It was -inspired by Quicksilver for OS X. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%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/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f admin/Makefile.common - - -%build -unset QTDIR; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" - -%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 - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -%find_lang %{tde_pkg} - -# Removes useless files (-devel ?) -%__rm -f %{?buildroot}%{tde_libdir}/*.so -%__rm -f %{?buildroot}%{tde_libdir}/*.la - -%clean -%__rm -rf %{buildroot} - - -%post -for f in crystalsvg hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : -done -/sbin/ldconfig || : -update-desktop-database %{tde_appdir} &> /dev/null - -%postun -for f in crystalsvg hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : -done -/sbin/ldconfig || : -update-desktop-database %{tde_appdir} &> /dev/null - - -%files -f %{tde_pkg}.lang -%defattr(-,root,root,-) -%doc AUTHORS COPYING -%{tde_bindir}/katapult -%{tde_libdir}/libkatapult.so.2 -%{tde_libdir}/libkatapult.so.2.0.0 -%{tde_tdelibdir}/katapult_amarokcatalog.la -%{tde_tdelibdir}/katapult_amarokcatalog.so -%{tde_tdelibdir}/katapult_bookmarkcatalog.la -%{tde_tdelibdir}/katapult_bookmarkcatalog.so -%{tde_tdelibdir}/katapult_calculatorcatalog.la -%{tde_tdelibdir}/katapult_calculatorcatalog.so -%{tde_tdelibdir}/katapult_documentcatalog.la -%{tde_tdelibdir}/katapult_documentcatalog.so -%{tde_tdelibdir}/katapult_execcatalog.la -%{tde_tdelibdir}/katapult_execcatalog.so -%{tde_tdelibdir}/katapult_glassdisplay.la -%{tde_tdelibdir}/katapult_glassdisplay.so -%{tde_tdelibdir}/katapult_googlecatalog.la -%{tde_tdelibdir}/katapult_googlecatalog.so -%{tde_tdelibdir}/katapult_o2display.la -%{tde_tdelibdir}/katapult_o2display.so -%{tde_tdelibdir}/katapult_programcatalog.la -%{tde_tdelibdir}/katapult_programcatalog.so -%{tde_tdelibdir}/katapult_puredisplay.la -%{tde_tdelibdir}/katapult_puredisplay.so -%{tde_tdelibdir}/katapult_spellcatalog.la -%{tde_tdelibdir}/katapult_spellcatalog.so -%{tde_tdeappdir}/katapult.desktop -%{tde_datadir}/icons/crystalsvg/128x128/actions/katapultspellcheck.png -%{tde_datadir}/icons/crystalsvg/scalable/actions/katapultspellcheck.svgz -%{tde_datadir}/icons/hicolor/128x128/actions/checkmark.png -%{tde_datadir}/icons/hicolor/128x128/actions/no.png -%{tde_datadir}/icons/hicolor/128x128/apps/xcalc.png -%{tde_datadir}/icons/hicolor/*/apps/katapult.png -%{tde_datadir}/icons/hicolor/scalable/apps/katapult.svgz -%{tde_datadir}/services/katapult_amarokcatalog.desktop -%{tde_datadir}/services/katapult_bookmarkcatalog.desktop -%{tde_datadir}/services/katapult_calculatorcatalog.desktop -%{tde_datadir}/services/katapult_documentcatalog.desktop -%{tde_datadir}/services/katapult_execcatalog.desktop -%{tde_datadir}/services/katapult_glassdisplay.desktop -%{tde_datadir}/services/katapult_googlecatalog.desktop -%{tde_datadir}/services/katapult_o2display.desktop -%{tde_datadir}/services/katapult_programcatalog.desktop -%{tde_datadir}/services/katapult_puredisplay.desktop -%{tde_datadir}/services/katapult_spellcatalog.desktop -%{tde_datadir}/servicetypes/katapultcatalog.desktop -%{tde_datadir}/servicetypes/katapultdisplay.desktop -%{tde_tdedocdir}/HTML/en/katapult/ - - -%changelog diff --git a/redhat/applications/katapult/katapult.spec b/redhat/applications/katapult/katapult.spec index f0e281a27..1e71f52d7 100644 --- a/redhat/applications/katapult/katapult.spec +++ b/redhat/applications/katapult/katapult.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg katapult %define tde_prefix /opt/trinity @@ -153,7 +153,7 @@ export PATH="%{tde_bindir}:${PATH}" # Fix desktop files (openSUSE only) echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" %if 0%{?suse_version} -%suse_update_desktop_file -G "Application Launcher" katapult DesktopUtility +%suse_update_desktop_file -G "Application Launcher" "%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" DesktopUtility %endif diff --git a/redhat/applications/kbarcode/kbarcode-3.5.13.2.spec b/redhat/applications/kbarcode/kbarcode-3.5.13.2.spec deleted file mode 100644 index 1713feaab..000000000 --- a/redhat/applications/kbarcode/kbarcode-3.5.13.2.spec +++ /dev/null @@ -1,154 +0,0 @@ -# Default version for this component -%define tde_pkg kbarcode -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: barcode and label printing application for Trinity -Version: 2.0.6 -Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.kbarcode.net - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: gettext - - -%description -KBarcode is a barcode and label printing application for Trinity. It can be used -to print everything from simple business cards up to complex labels with -several barcodes (e.g. article descriptions). - -KBarcode comes with an easy to use WYSIWYG label designer, a setup wizard, -batch import of data for batch printing labels (directly from the delivery -note), thousands of predefined labels, database management tools and -translations in many languages. Even printing more than 10.000 labels in one -go is no problem for KBarcode. Data for printing can be imported from several -different data sources, including SQL databases, CSV files and the TDE address -book. - -Additionally it is a simple barcode generator (similar to the old xbarcode you -might know). All major types of barcodes like EAN, UPC, CODE39 and ISBN are -supported. Even complex 2D barcodes are supported using third party tools. The -generated barcodes can be directly printed or you can export them into images -to use them in another application. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%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/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --libdir=%{tde_libdir} \ - --datadir=%{tde_datadir} \ - --includedir=%{tde_tdeincludedir} \ - \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath \ - \ - --with-extra-includes=%{_includedir}/pcre - -# SMP safe ! -%__make %{?_smp_mflags} - - -%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 ChangeLog COPYING NEWS README TODO -%{tde_bindir}/kbarcode -%{tde_tdelibdir}/kfile_kbarcode.la -%{tde_tdelibdir}/kfile_kbarcode.so -%{tde_tdeappdir}/kbarcode-batch.desktop -%{tde_tdeappdir}/kbarcode-editor.desktop -%{tde_tdeappdir}/kbarcode-label.desktop -%{tde_tdeappdir}/kbarcode-single.desktop -%{tde_tdeappdir}/kbarcode.desktop -%{tde_datadir}/apps/kbarcode/ -%{tde_datadir}/icons/hicolor/*/actions/barcode.png -%{tde_datadir}/icons/hicolor/*/actions/kbarcodeellipse.png -%{tde_datadir}/icons/hicolor/*/actions/kbarcodegrid.png -%{tde_datadir}/icons/hicolor/*/actions/kbarcodelinetool.png -%{tde_datadir}/icons/hicolor/*/actions/kbarcoderect.png -%{tde_datadir}/icons/hicolor/*/apps/kbarcode.png -%{tde_datadir}/services/kfile_kbarcode.desktop - - -%changelog diff --git a/redhat/applications/kbarcode/kbarcode.spec b/redhat/applications/kbarcode/kbarcode.spec index a10cd0ab1..423d99ebe 100644 --- a/redhat/applications/kbarcode/kbarcode.spec +++ b/redhat/applications/kbarcode/kbarcode.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg kbarcode %define tde_prefix /opt/trinity @@ -114,7 +114,7 @@ to use them in another application. %files -f %{tde_pkg}.lang %defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING NEWS README TODO +%doc AUTHORS ChangeLog COPYING README TODO %{tde_bindir}/kbarcode %{tde_tdeappdir}/kbarcode-batch.desktop %{tde_tdeappdir}/kbarcode-editor.desktop @@ -136,7 +136,6 @@ to use them in another application. %package tdefile-plugin Summary: tdefile-plugin for %{name} Group: Applications/Utilities -#Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} %description tdefile-plugin %{summary}. @@ -207,10 +206,10 @@ export PATH="%{tde_bindir}:${PATH}" # Updates applications categories for openSUSE %if 0%{?suse_version} -%suse_update_desktop_file -r kbarcode Utility PrintingUtility -%suse_update_desktop_file -r kbarcode-batch Utility PrintingUtility -%suse_update_desktop_file -r kbarcode-editor Utility PrintingUtility -%suse_update_desktop_file -r kbarcode-single Utility PrintingUtility +%suse_update_desktop_file -r "%{buildroot}%{tde_tdeappdir}/kbarcode.desktop" Utility PrintingUtility +%suse_update_desktop_file -r "%{buildroot}%{tde_tdeappdir}/kbarcode-batch.desktop" Utility PrintingUtility +%suse_update_desktop_file -r "%{buildroot}%{tde_tdeappdir}/kbarcode-editor.desktop" Utility PrintingUtility +%suse_update_desktop_file -r "%{buildroot}%{tde_tdeappdir}/kbarcode-single.desktop" Utility PrintingUtility %endif diff --git a/redhat/applications/kbfx/kbfx-3.5.13.2.spec b/redhat/applications/kbfx/kbfx-3.5.13.2.spec deleted file mode 100644 index f3e9f4694..000000000 --- a/redhat/applications/kbfx/kbfx-3.5.13.2.spec +++ /dev/null @@ -1,173 +0,0 @@ -# Default version for this component -%define tde_pkg kbfx -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: an alternative to K-Menu for TDE [Trinity] -Version: 0.4.9.3.1 -Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - - -%description -KBFX is an alternative to the classical K-Menu button and its menu. -It improves the user experience by enabling him to set a bigger (and thus more -visible) start button and by finally replacing the Win95-like K-Menu. -If you still want the old menu, because you're used to it, it is still -available as an option in kbfx. We recommend, however, that you give the Spinx -bar a try. - -Homepage: http://www.kbfx.org - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} - -# Fix TDE executable path in 'CMakeLists.txt' ... -%__sed -i "CMakeLists.txt" \ - -e "s|/usr/bin/uic-tqt|%{tde_bindir}/uic-tqt|" \ - -e "s|/usr/bin/tmoc|%{tde_bindir}/tmoc|" \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|" - -%build -unset QTDIR QTINC QTLIB -. /etc/profile.d/qt3.sh -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 \ - \ - -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \ - -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \ - -DDATA_INSTALL_DIR=%{tde_datadir}/apps \ - -DMIME_INSTALL_DIR=%{tde_datadir}/mimelnk \ - -DXDG_APPS_INSTALL_DIR=%{tde_tdeappdir} \ - -DSHARE_INSTALL_PREFIX="%{tde_datadir}"\ - -DDOC_INSTALL_DIR=%{tde_tdedocdir} \ - -DLIB_INSTALL_DIR=%{tde_libdir} \ - \ - -DUSE_STRIGI=OFF \ - -DUSE_MENUDRAKE=OFF \ - -DBUILD_DOC=ON \ - -DBUILD_ALL=OFF \ - .. - -# Not SMP safe ! -%__make - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} -C build VERBOSE=1 - - -%clean -%__rm -rf %{buildroot} - - -%post -/sbin/ldconfig -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : -update-desktop-database %{tde_appdir} &> /dev/null - -%postun -/sbin/ldconfig -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : -update-desktop-database %{tde_appdir} &> /dev/null - - -%files -%defattr(-,root,root,-) -%{tde_bindir}/kbfxconfigapp -%{tde_tdeincludedir}/kbfx/ -%{tde_libdir}/kbfx/plugins/libkbfxplasmadataplasmoid.la -%{tde_libdir}/kbfx/plugins/libkbfxplasmadataplasmoid.so -%{tde_libdir}/kbfx/plugins/libkbfxplasmadatasettings.la -%{tde_libdir}/kbfx/plugins/libkbfxplasmadatasettings.so -%{tde_libdir}/kbfx/plugins/libkbfxplasmadatastub.la -%{tde_libdir}/kbfx/plugins/libkbfxplasmadatastub.so -%{tde_libdir}/kbfx/plugins/libkbfxplasmarecentstuff.la -%{tde_libdir}/kbfx/plugins/libkbfxplasmarecentstuff.so -%{tde_libdir}/libkbfxcommon.la -%{tde_libdir}/libkbfxcommon.so -%{tde_libdir}/libkbfxdata.la -%{tde_libdir}/libkbfxdata.so -%{tde_tdelibdir}/kbfxspinx.la -%{tde_tdelibdir}/kbfxspinx.so -%{tde_tdeappdir}/kbfx_theme.desktop -%{tde_tdeappdir}/kbfxconfigapp.desktop -%{tde_datadir}/apps/kbfx/skins/*/* -%{tde_datadir}/apps/kbfxconfigapp/kbfxconfigappui.rc -%{tde_datadir}/apps/kicker/applets/kbfxspinx.desktop -%{tde_datadir}/apps/konqueror/servicemenus/kbfx_install_theme.desktop -%{tde_datadir}/apps/konqueror/servicemenus/kbfx_prepare_theme.desktop -#%{tde_tdedocdir}/HTML/en/common/kbfx-*.jpg -#%{tde_tdedocdir}/HTML/en/kbfxconfigapp/ -%{tde_tdedocdir}/kbfx/ -%{tde_datadir}/icons/hicolor/*/apps/kbfx.png -%{tde_datadir}/icons/hicolor/*/apps/kbfxconfigapp.png -#%{tde_datadir}/locale/*/LC_MESSAGES/kbfxconfigapp.mo -%{tde_datadir}/mimelnk/application/x-kbfxtheme.desktop - - -%changelog diff --git a/redhat/applications/kbfx/kbfx.spec b/redhat/applications/kbfx/kbfx.spec index 50da69568..b38c55ab2 100644 --- a/redhat/applications/kbfx/kbfx.spec +++ b/redhat/applications/kbfx/kbfx.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg kbfx %define tde_prefix /opt/trinity @@ -222,6 +222,7 @@ export PATH="%{tde_bindir}:${PATH}" %{tde_datadir}/icons/hicolor/*/apps/kbfx.png %{tde_datadir}/icons/hicolor/*/apps/kbfxconfigapp.png %lang(bg) %{tde_datadir}/locale/bg/LC_MESSAGES/kbfxconfigapp.mo +%lang(de) %{tde_datadir}/locale/de/LC_MESSAGES/kbfxconfigapp.mo %lang(hu) %{tde_datadir}/locale/hu/LC_MESSAGES/kbfxconfigapp.mo %lang(it) %{tde_datadir}/locale/it/LC_MESSAGES/kbfxconfigapp.mo %lang(nl) %{tde_datadir}/locale/nl/LC_MESSAGES/kbfxconfigapp.mo diff --git a/redhat/applications/kbibtex/kbibtex.spec b/redhat/applications/kbibtex/kbibtex.spec index 9148c5f29..2a822f934 100644 --- a/redhat/applications/kbibtex/kbibtex.spec +++ b/redhat/applications/kbibtex/kbibtex.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg kbibtex %define tde_prefix /opt/trinity @@ -152,7 +152,7 @@ fi # Updates applications categories for openSUSE %if 0%{?suse_version} -%suse_update_desktop_file -G "Bibliography Manager" kbibtex TDE Office Database +%suse_update_desktop_file -G "Bibliography Manager" "%{?buildroot}%{tde_tdeappdir}/kbibtex.desktop" TDE Office Database %endif @@ -162,7 +162,7 @@ fi %files -f %{tde_pkg}.lang %defattr(-,root,root,-) -%doc AUTHORS BUGS COPYING NEWS README TODO ChangeLog +%doc AUTHORS COPYING NEWS README TODO ChangeLog %{tde_bindir}/kbibtex %{tde_tdelibdir}/libkbibtexpart.la %{tde_tdelibdir}/libkbibtexpart.so diff --git a/redhat/applications/kbiff/kbiff.spec b/redhat/applications/kbiff/kbiff.spec index 52a298657..10a297c6a 100644 --- a/redhat/applications/kbiff/kbiff.spec +++ b/redhat/applications/kbiff/kbiff.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg kbiff %define tde_prefix /opt/trinity @@ -147,14 +147,10 @@ fi %find_lang %{tde_pkg} -# Fix icon location -%__mkdir_p "%{?buildroot}%{tde_tdeappdir}" -%__mv -f "%{?buildroot}%{tde_datadir}/applnk/Internet/kbiff.desktop" "%{?buildroot}%{tde_tdeappdir}/kbiff.desktop" - # Updates applications categories for openSUSE %if 0%{?suse_version} echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/kbiff.desktop" -%suse_update_desktop_file kbiff Applet +%suse_update_desktop_file "%{?buildroot}%{tde_tdeappdir}/kbiff.desktop" Applet %endif diff --git a/redhat/applications/kbookreader/kbookreader-3.5.13.2.spec b/redhat/applications/kbookreader/kbookreader-3.5.13.2.spec deleted file mode 100644 index 61f8a726c..000000000 --- a/redhat/applications/kbookreader/kbookreader-3.5.13.2.spec +++ /dev/null @@ -1,118 +0,0 @@ -# Default version for this component -%define tde_pkg kbookreader -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: eBook reader for Trinity. -Version: 0.2.0 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Prefix: %{_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - - -%description -kbookreader is an application which allows you to view eBooks -within the Trinity Desktop Environment. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%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/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f admin/Makefile.common - - -%build -unset QTDIR; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" - -%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 - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - - -%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 AUTHORS COPYING -%{tde_bindir}/bookreader -%{tde_bindir}/bookreader_client -%{tde_datadir}/applnk/Utilities/bookreader.desktop -%{tde_datadir}/apps/bookreader/ -%{tde_datadir}/config.kcfg/bookreader.kcfg -%{tde_tdedocdir}/HTML/en/bookreader/ -%{tde_datadir}/icons/hicolor/*/apps/bookreader.png - - -%changelog diff --git a/redhat/applications/kbookreader/kbookreader.spec b/redhat/applications/kbookreader/kbookreader.spec index 90e316458..a0832ce80 100644 --- a/redhat/applications/kbookreader/kbookreader.spec +++ b/redhat/applications/kbookreader/kbookreader.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg kbookreader %define tde_prefix /opt/trinity @@ -142,21 +142,19 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} -C build -# Fix desktop icon location -%__mkdir_p "%{?buildroot}%{tde_tdeappdir}" -%__mv -f "%{?buildroot}%{tde_datadir}/applnk/Office/bookreader.desktop" "%{?buildroot}%{tde_tdeappdir}/bookreader.desktop" - # Updates applications categories for openSUSE %if 0%{?suse_version} %suse_update_desktop_file "%{?buildroot}%{tde_tdeappdir}/bookreader.desktop" Office Viewer %endif +%find_lang %{tde_pkg} || touch %{tde_pkg}.lang + %clean %__rm -rf %{buildroot} -%files +%files -f %{tde_pkg}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING %{tde_bindir}/bookreader diff --git a/redhat/applications/kchmviewer/kchmviewer-3.5.13.2.spec b/redhat/applications/kchmviewer/kchmviewer-3.5.13.2.spec deleted file mode 100644 index 36012a73f..000000000 --- a/redhat/applications/kchmviewer/kchmviewer-3.5.13.2.spec +++ /dev/null @@ -1,145 +0,0 @@ -# Default version for this component -%define tde_pkg kchmviewer -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: CHM viewer for Trinity -Version: 3.1.2 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Prefix: %{_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - - -%description -KchmViewer is a chm (MS HTML help file format) viewer, written in C++. -Unlike most existing CHM viewers for Unix, it uses Trolltech Qt widget -library, and does not depend on TDE or GNOME. However, it may be compiled -with full Trinity support, including Trinity widgets and KIO/KHTML. - -The main advantage of KchmViewer is non-English language support. Unlike -others, KchmViewer in most cases correctly detects help file encoding, -correctly shows tables of context of Russian, Korean, Chinese and Japanese -help files, and correctly searches in non-English help files (search for -MBCS languages - ja/ko/ch is still in progress). - -Completely safe and harmless. Does not support JavaScript in any way, -optionally warns you before opening an external web page, or switching to -another help file. Shows an appropriate image for every TOC entry. - -KchmViewer Has complete chm index support, including multiple index entries, -cross-links and parent/child entries in index as well as Persistent bookmarks -support. Correctly detects and shows encoding of any valid chm file. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%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/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR || : ; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" - -# Specific path for RHEL4 -if [ -d /usr/X11R6 ]; then - export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" -fi - -# Warning: --enable-final causes FTBFS ! -%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 \ - --disable-final \ - --enable-closure \ - --enable-rpath \ - \ - --with-x \ - --with-kde - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -%find_lang %{tde_pkg} - -# Removes useless files -%__rm -f %{?buildroot}%{tde_libdir}/*.a - -%clean -%__rm -rf %{buildroot} - - -%post -touch --no-create %{tde_datadir}/icons/crystalsvg || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || : - -%postun -touch --no-create %{tde_datadir}/icons/crystalsvg || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || : - - -%files -f %{tde_pkg}.lang -%defattr(-,root,root,-) -%doc ChangeLog COPYING FAQ README -%{tde_bindir}/kchmviewer -%{tde_tdelibdir}/kio_msits.la -%{tde_tdelibdir}/kio_msits.so -%{tde_datadir}/applnk/kchmviewer.desktop -%{tde_datadir}/icons/crystalsvg/*/apps/kchmviewer.png -%{tde_datadir}/services/msits.protocol - - -%changelog diff --git a/redhat/applications/kchmviewer/kchmviewer-14.0.0.spec b/redhat/applications/kchmviewer/kchmviewer.spec index dca19c1d4..b03422fb8 100644 --- a/redhat/applications/kchmviewer/kchmviewer-14.0.0.spec +++ b/redhat/applications/kchmviewer/kchmviewer.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg kchmviewer %define tde_prefix /opt/trinity @@ -61,7 +61,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils -BuildRequires: autoconf automake libtool m4 +BuildRequires: cmake >= 2.8 BuildRequires: gcc-c++ BuildRequires: pkgconfig @@ -76,8 +76,21 @@ BuildRequires: brp-check-trinity %endif # CHMLIB support +%if 0%{?rhel} == 8 +%define with_chmlib 0 +%else +%define with_chmlib 1 BuildRequires: chmlib-devel +%endif + +# ACL support +BuildRequires: libacl-devel + +# IDN support +BuildRequires: libidn-devel +# OPENSSL support +BuildRequires: openssl-devel %description KchmViewer is a chm (MS HTML help file format) viewer, written in C++. @@ -112,47 +125,47 @@ support. Correctly detects and shows encoding of any valid chm file. %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/"*"/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" -# Specific path for RHEL4 -if [ -d /usr/X11R6 ]; then - export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" +if ! rpm -E %%cmake|grep -q "cd build"; then + %__mkdir_p build + cd build fi -# Warning: --enable-final causes FTBFS ! -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --libdir=%{tde_libdir} \ - --datadir=%{tde_datadir} \ - --includedir=%{tde_tdeincludedir} \ +%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 \ + \ + -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \ + -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \ + -DLIB_INSTALL_DIR="%{tde_libdir}" \ + -DPLUGIN_INSTALL_DIR="%{tde_tdelibdir}" \ \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --disable-final \ - --enable-closure \ - --enable-rpath \ - --disable-gcc-hidden-visibility \ + -DWITH_ALL_OPTIONS=ON \ + -DWITH_GCC_VISIBILITY=ON \ + -DWITH_CHMLIB=%{?with_chmlib} \ \ - --with-x \ - --with-kde + -DBUILD_ALL=ON \ + -DBUILD_DOC=ON \ + -DBUILD_TRANSLATIONS=ON \ + .. -%__make %{?_smp_mflags} +%__make %{?_smp_mflags} || %__make %install export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} +%__make install DESTDIR=%{buildroot} -C build %find_lang %{tde_pkg} @@ -160,8 +173,11 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -f %{?buildroot}%{tde_libdir}/*.a # Fix desktop icon location -%__mkdir_p "%{?buildroot}%{tde_tdeappdir}" -%__mv -f "%{?buildroot}%{tde_datadir}/applnk/kchmviewer.desktop" "%{?buildroot}%{tde_tdeappdir}/kchmviewer.desktop" +if [ -d "%{?buildroot}%{tde_datadir}/applnk" ]; then + %__mkdir_p "%{?buildroot}%{tde_tdeappdir}" + %__mv -f "%{?buildroot}%{tde_datadir}/applnk/kchmviewer.desktop" "%{?buildroot}%{tde_tdeappdir}/kchmviewer.desktop" + %__rm -r "%{buildroot}%{tde_datadir}/applnk" +fi # Updates applications categories for openSUSE echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/kchmviewer.desktop" @@ -185,6 +201,7 @@ echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/kchmviewer.desktop" %{tde_datadir}/services/msits.protocol %{tde_tdedocdir}/HTML/en/kchmviewer/ %{tde_tdedocdir}/HTML/en/tdeioslave/msits/ +%{tde_mandir}/man1/kchmviewer.* %changelog diff --git a/redhat/applications/kcmautostart/kcmautostart-3.5.13.2.spec b/redhat/applications/kcmautostart/kcmautostart-3.5.13.2.spec deleted file mode 100644 index 0ccd9d6d5..000000000 --- a/redhat/applications/kcmautostart/kcmautostart-3.5.13.2.spec +++ /dev/null @@ -1,124 +0,0 @@ -# Default version for this component -%define tde_pkg kchmviewer -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-kcmautostart -Summary: Manage applications automatic startup. -Version: 1.0 -Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Prefix: %{_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: kcmautostart-3.5.13.tar.gz - -# [kcmautostart] Fix FTBFS with TDE 3.5.13 -Patch1: kcmautostart-3.5.13-ftbfs.patch -#ย [kcmautostart] Add French support -Patch2: kcmautostart-3.5.13-add_french.patch -# [kcmautostart] kcmautostart crash on exit -Patch3: kcmautostart-3.5.13-fix_crash_on_exit.patch -# [kcmautostart] Fix french translation -Patch4: kcmautostart-3.5.13-fix_fr_translation.patch - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: gcc-c++ - -Requires: trinity-tdebase >= %{tde_version} - -%description -%{summary} - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n applications/kcmautostart -%patch1 -p1 -b .ftbfs -%patch2 -p1 -%patch3 -p1 -b .crash_on_exit -%patch4 -p1 -b .fr_translation - -%__sed -i admin/acinclude.m4.in \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" - -%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR || : ; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" - -%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 - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -%find_lang autostart - - -%clean -%__rm -rf %{buildroot} - - -%files -f autostart.lang -%defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING INSTALL NEWS README TODO -%{tde_tdelibdir}/kcm_autostart.la -%{tde_tdelibdir}/kcm_autostart.so -%{tde_tdeappdir}/autostart.desktop -%{tde_tdedocdir}/HTML/en/autostart/ - - -%changelog diff --git a/redhat/applications/kcmautostart/kcmautostart-fr.po b/redhat/applications/kcmautostart/kcmautostart-fr.po deleted file mode 100644 index 6d898bc97..000000000 --- a/redhat/applications/kcmautostart/kcmautostart-fr.po +++ /dev/null @@ -1,52 +0,0 @@ -msgid "" -msgstr "" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"PO-Revision-Date: 2012-05-10 12:01+0100\n" -"Project-Id-Version: autostart_ca\n" -"Language-Team: <ca@li.org>\n" -"X-Generator: KBabel 1.11.4\n" -"MIME-Version: 1.0\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"Last-Translator: Josep Febrer <josep@extens.info>\n" - -#: ../src/autostart.cpp:61 -msgid "Startup" -msgstr "Dรฉmarrage" - -#: ../src/autostart.cpp:62 -msgid "Shutdown" -msgstr "Arrรชt" - -#: ../src/autostart.cpp:63 -msgid "ENV" -msgstr "ENV" - -#: ../src/autostart.cpp:102 -msgid "Name" -msgstr "Nom" - -#: ../src/autostart.cpp:103 -msgid "Command" -msgstr "Comande" - -#: ../src/autostart.cpp:104 -msgid "Run on" -msgstr "Executer" - -#: ../src/autostart.cpp:129 -msgid "&Add" -msgstr "&Ajouter" - -#: ../src/autostart.cpp:131 -msgid "&Remove" -msgstr "&Supprimer" - -#: ../src/autostart.cpp:133 -msgid "&Properties" -msgstr "&Propiรฉtรฉs" - -#: ../src/autostart.cpp:317 -msgid "This module helps you configure which applications KDE runs When starting up and shutting down." -msgstr "Ce module vous aide ร configurer quelles applications sont exรฉcutรฉes ร l'ouverture et ร la fermeture de session de TDE." - diff --git a/redhat/applications/kcmautostart/kcmautostart.spec b/redhat/applications/kcmautostart/kcmautostart.spec index 0006b6f31..76ab3145d 100644 --- a/redhat/applications/kcmautostart/kcmautostart.spec +++ b/redhat/applications/kcmautostart/kcmautostart.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg kcmautostart %define tde_prefix /opt/trinity @@ -152,7 +152,7 @@ export PATH="%{tde_bindir}:${PATH}" %files -f autostart.lang %defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING INSTALL NEWS README TODO +%doc AUTHORS ChangeLog COPYING INSTALL README %{tde_tdelibdir}/kcm_autostart.la %{tde_tdelibdir}/kcm_autostart.so %{tde_tdeappdir}/autostart.desktop diff --git a/redhat/applications/kcmldap/kcmldap.spec b/redhat/applications/kcmldap/kcmldap.spec index 5fcf25a9b..5fd5cef1e 100644 --- a/redhat/applications/kcmldap/kcmldap.spec +++ b/redhat/applications/kcmldap/kcmldap.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg kcmldap %define tde_prefix /opt/trinity @@ -101,13 +101,16 @@ BuildRequires: openldap2-devel BuildRequires: openldap24-libs-devel %endif +# KRB5 support +#BuildRequires: krb5-devel + # HEIMDAL support -%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} -BuildRequires: heimdal-devel -%endif -%if 0%{?suse_version} -BuildRequires: libheimdal-devel -%endif +#%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} +#BuildRequires: heimdal-devel +#%endif +#%if 0%{?suse_version} +#BuildRequires: libheimdal-devel +#%endif # UDEV support %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6 @@ -141,7 +144,7 @@ This is a TDE control center module to manage TDE connections to Kerberos realms %files -n trinity-kcontrol-ldap-bonding %defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING +%doc AUTHORS COPYING %{tde_bindir}/tdeldapbonding %{tde_tdelibdir}/kcm_ldapbonding.la %{tde_tdelibdir}/kcm_ldapbonding.so @@ -162,7 +165,7 @@ This is a small daemon which keeps the LDAP root certificate up to date with the %files -n trinity-tde-ldap-cert-updater %defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING +%doc AUTHORS COPYING %{tde_bindir}/tdeldapcertupdater ########## @@ -208,11 +211,6 @@ fi -DBUILD_DOC=ON \ -DBUILD_TRANSLATIONS=ON \ \ -%if 0%{?suse_version} - -DKRB5_FOUND=1 \ - -DKRB5_LIBRARIES="-lkrb5" \ - -DKRB5_INCLUDE_DIRS="/usr/include" \ -%endif .. %__make %{?_smp_mflags} || %__make diff --git a/redhat/applications/kcmldapcontroller/kcmldapcontroller-14.0.0.spec b/redhat/applications/kcmldapcontroller/kcmldapcontroller.spec index 88a889e4e..b84e6d939 100644 --- a/redhat/applications/kcmldapcontroller/kcmldapcontroller-14.0.0.spec +++ b/redhat/applications/kcmldapcontroller/kcmldapcontroller.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg kcmldapcontroller %define tde_prefix /opt/trinity @@ -63,7 +63,7 @@ BuildRequires: desktop-file-utils BuildRequires: gettext BuildRequires: trinity-libtdeldap-devel >= 0.5 -BuildRequires: autoconf automake libtool m4 +BuildRequires: cmake >= 2.8 BuildRequires: gcc-c++ BuildRequires: pkgconfig @@ -91,13 +91,16 @@ BuildRequires: openldap2-devel BuildRequires: openldap24-libs-devel %endif +# KRB5 support +#BuildRequires: krb5-devel + # HEIMDAL support -%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} -BuildRequires: heimdal-devel -%endif -%if 0%{?suse_version} -BuildRequires: libheimdal-devel -%endif +#%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} +#BuildRequires: heimdal-devel +#%endif +#%if 0%{?suse_version} +#BuildRequires: libheimdal-devel +#%endif # UDEV support %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6 @@ -113,6 +116,15 @@ BuildRequires: libcom_err-devel BuildRequires: %{_lib}ext2fs-devel %endif +# ACL support +BuildRequires: libacl-devel + +# IDN support +BuildRequires: libidn-devel + +# OPENSSL support +BuildRequires: openssl-devel + Requires: trinity-kcontrol-ldap-controller = %{?epoch:%{epoch}:}%{version}-%{release} @@ -132,9 +144,9 @@ This is a TDE control center module to manage users, groups, and machines in Ker %files -n trinity-kcontrol-ldap-controller %defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING +%doc AUTHORS COPYING %{tde_bindir}/primaryrccertupdater -%if 0%{?pclinuxos} == 0 +%if 0%{?fedora} || 0%{?mgaversion} || 0%{?rhel} >= 7 %{tde_libdir}/slapi-acl-manager.la %{tde_libdir}/slapi-acl-manager.so %endif @@ -161,55 +173,48 @@ This is a TDE control center module to manage users, groups, and machines in Ker %__rm -rf acl-updater %endif -%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/"*"/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" -extra_includes="%{_includedir}" -extra_libs="%{_libdir}" - -if [ -d "%{_includedir}/openldap24" ]; then - extra_includes="%{_includedir}/openldap24:${extra_includes}" - extra_libs="%{_libdir}/openldap24:${extra_libs}" -fi - -if [ -d "%{_includedir}/heimdal" ]; then - extra_includes="%{_includedir}/heimdal:${extra_includes}" - extra_libs="%{_libdir}/heimdal:${extra_libs}" +if ! rpm -E %%cmake|grep -q "cd build"; then + %__mkdir_p build + cd build fi -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --includedir=%{tde_tdeincludedir} \ - --docdir=%{tde_tdedocdir} \ - --libdir=%{tde_libdir} \ +%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 \ + \ + -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \ + -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \ + -DLIB_INSTALL_DIR="%{tde_libdir}" \ + -DPLUGIN_INSTALL_DIR="%{tde_tdelibdir}" \ + \ + -DWITH_ALL_OPTIONS=ON \ + -DWITH_GCC_VISIBILITY=ON \ \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath \ - --disable-gcc-hidden-visibility \ + -DBUILD_ALL=ON \ + -DBUILD_DOC=ON \ + -DBUILD_TRANSLATIONS=ON \ \ - --with-extra-includes=${extra_includes} \ - --with-extra-libs=${extra_libs} \ + .. -%__make %{?_smp_mflags} +%__make %{?_smp_mflags} || %__make %install export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} +%__make install DESTDIR=%{buildroot} -C build %clean diff --git a/redhat/applications/kcmldapmanager/kcmldapmanager-14.0.0.spec b/redhat/applications/kcmldapmanager/kcmldapmanager.spec index 008da620d..86c7b27d3 100644 --- a/redhat/applications/kcmldapmanager/kcmldapmanager-14.0.0.spec +++ b/redhat/applications/kcmldapmanager/kcmldapmanager.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg kcmldapmanager %define tde_prefix /opt/trinity @@ -63,7 +63,7 @@ BuildRequires: desktop-file-utils BuildRequires: gettext BuildRequires: trinity-libtdeldap-devel >= 0.5 -BuildRequires: autoconf automake libtool m4 +BuildRequires: cmake >= 2.8 BuildRequires: gcc-c++ BuildRequires: pkgconfig @@ -88,13 +88,16 @@ BuildRequires: openldap2-devel BuildRequires: openldap24-libs-devel %endif +# KRB5 support +#BuildRequires: krb5-devel + # HEIMDAL support -%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} -BuildRequires: heimdal-devel -%endif -%if 0%{?suse_version} -BuildRequires: libheimdal-devel -%endif +#%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} +#BuildRequires: heimdal-devel +#%endif +#%if 0%{?suse_version} +#BuildRequires: libheimdal-devel +#%endif # UDEV support %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6 @@ -110,6 +113,15 @@ BuildRequires: libcom_err-devel BuildRequires: %{_lib}ext2fs-devel %endif +# ACL support +BuildRequires: libacl-devel + +# IDN support +BuildRequires: libidn-devel + +# OPENSSL support +BuildRequires: openssl-devel + Requires: trinity-kcontrol-ldap-manager = %{?epoch:%{epoch}:}%{version}-%{release} @@ -127,9 +139,9 @@ Group: Applications/Utilities %description -n trinity-kcontrol-ldap-manager This is a TDE control center module to manage users, groups, and machines in Kerberos realms. -%files -n trinity-kcontrol-ldap-manager +%files -n trinity-kcontrol-ldap-manager -f %{tde_pkg}.lang %defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING +%doc AUTHORS COPYING %{tde_bindir}/tdeldapmanager %{tde_tdelibdir}/kcm_ldapmanager.la %{tde_tdelibdir}/kcm_ldapmanager.so @@ -146,55 +158,49 @@ This is a TDE control center module to manage users, groups, and machines in Ker %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/"*"/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" -extra_includes="%{_includedir}" -extra_libs="%{_libdir}" - -if [ -d "%{_includedir}/openldap24" ]; then - extra_includes="%{_includedir}/openldap24:${extra_includes}" - extra_libs="%{_libdir}/openldap24:${extra_libs}" -fi - -if [ -d "%{_includedir}/heimdal" ]; then - extra_includes="%{_includedir}/heimdal:${extra_includes}" - extra_libs="%{_libdir}/heimdal:${extra_libs}" +if ! rpm -E %%cmake|grep -q "cd build"; then + %__mkdir_p build + cd build fi -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --includedir=%{tde_tdeincludedir} \ - --docdir=%{tde_tdedocdir} \ - --libdir=%{tde_libdir} \ +%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 \ \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath \ - --disable-gcc-hidden-visibility \ + -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \ + -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \ + -DLIB_INSTALL_DIR="%{tde_libdir}" \ + -DPLUGIN_INSTALL_DIR="%{tde_tdelibdir}" \ \ - --with-extra-includes=${extra_includes} \ - --with-extra-libs=${extra_libs} \ + -DWITH_ALL_OPTIONS=ON \ + -DWITH_GCC_VISIBILITY=ON \ + \ + -DBUILD_ALL=ON \ + -DBUILD_DOC=ON \ + -DBUILD_TRANSLATIONS=ON \ + \ + .. -%__make %{?_smp_mflags} +%__make %{?_smp_mflags} || %__make %install export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} +%__make install DESTDIR=%{buildroot} -C build + +%find_lang %{tde_pkg} || touch %{tde_pkg}.lang %clean diff --git a/redhat/applications/kcpuload/kcpuload-3.5.13.2.spec b/redhat/applications/kcpuload/kcpuload-3.5.13.2.spec deleted file mode 100644 index df8ec2705..000000000 --- a/redhat/applications/kcpuload/kcpuload-3.5.13.2.spec +++ /dev/null @@ -1,125 +0,0 @@ -# Default version for this component -%define tde_pkg kcpuload -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/tde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: a CPU meter for Kicker [Trinity] -Version: 2.00 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Prefix: %{_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: gettext - - -%description -KCPULoad is a small program for Kicker (the TDE panel). It shows a -recent history of CPU usage in the form of one or two configurable -diagrams in the system tray. These diagrams have settings for colours -and various different styles. - -KCPULoad has support for SMP and separate user/system loads. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%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/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR || : ; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" - -%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 - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - - -%clean -%__rm -rf %{buildroot} - - -%post -for f in crystalsvg locolor ; do - touch --no-create %{tde_datadir}/icons/${f} || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : -done - -%postun -for f in crystalsvg locolor ; do - touch --no-create %{tde_datadir}/icons/${f} || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : -done - - -%files -%defattr(-,root,root,-) -%{tde_bindir}/kcpuload -%{tde_datadir}/applnk/System/kcpuload.desktop -%{tde_datadir}/apps/kcpuload/icons/*/*/*/*.png -%{tde_datadir}/icons/crystalsvg/*/apps/kcpuload.png -%{tde_datadir}/icons/locolor/*/apps/kcpuload.png -%{tde_tdedocdir}/HTML/en/kcpuload/ - - -%changelog diff --git a/redhat/applications/kcpuload/kcpuload.spec b/redhat/applications/kcpuload/kcpuload.spec index cda688320..437b8b9dd 100644 --- a/redhat/applications/kcpuload/kcpuload.spec +++ b/redhat/applications/kcpuload/kcpuload.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg kcpuload %define tde_prefix /opt/trinity @@ -144,14 +144,12 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} -C build -# Fix desktop icon location -%__mkdir_p "%{?buildroot}%{tde_tdeappdir}" -%__mv -f "%{?buildroot}%{tde_datadir}/applnk/System/%{tde_pkg}.desktop" "%{?buildroot}%{tde_tdeappdir}" +%find_lang %{tde_pkg} || touch %{tde_pkg}.lang # Fix desktop files (openSUSE only) echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" %if 0%{?suse_version} -%suse_update_desktop_file kcpuload System Monitor +%suse_update_desktop_file "%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" System Monitor %endif @@ -159,7 +157,7 @@ echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" %__rm -rf %{buildroot} -%files +%files -f %{tde_pkg}.lang %defattr(-,root,root,-) %{tde_bindir}/kcpuload %{tde_tdeappdir}/kcpuload.desktop diff --git a/redhat/applications/kdbg/kdbg-14.0.0.spec b/redhat/applications/kdbg/kdbg.spec index 0728d9ad7..b37eef30f 100644 --- a/redhat/applications/kdbg/kdbg-14.0.0.spec +++ b/redhat/applications/kdbg/kdbg.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg kdbg %define tde_prefix /opt/trinity @@ -161,7 +161,7 @@ export PATH="%{tde_bindir}:${PATH}" %{tde_bindir}/kdbg %{tde_tdeappdir}/kdbg.desktop %{tde_datadir}/apps/kdbg/ -%{tde_confdir}/kdbgrc +%config(noreplace) %{tde_confdir}/kdbgrc %lang(de) %{tde_tdedocdir}/HTML/de/kdbg/ %lang(en) %{tde_tdedocdir}/HTML/en/kdbg/ %lang(ru) %{tde_tdedocdir}/HTML/ru/kdbg/ diff --git a/redhat/applications/kdbusnotification/kdbusnotification-3.5.13.2-fix_utf8.patch b/redhat/applications/kdbusnotification/kdbusnotification-3.5.13.2-fix_utf8.patch deleted file mode 100644 index 4ed8c1c52..000000000 --- a/redhat/applications/kdbusnotification/kdbusnotification-3.5.13.2-fix_utf8.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- trinity-kdbusnotification-14.0.0~pre89+e169a4e3/src/daemon/daemon.cpp.ORI 2013-07-20 11:16:18.010011618 +0200 -+++ trinity-kdbusnotification-14.0.0~pre89+e169a4e3/src/daemon/daemon.cpp 2013-07-20 11:27:19.135889426 +0200 -@@ -231,9 +231,10 @@ - } - - // Send a notification request to KDE here... -- TQString messageText = TQString(body); -+ TQString messageCaption = TQString::fromLocal8Bit(summary); -+ TQString messageText = TQString::fromLocal8Bit(body); - -- GTKNotifierContainer->displayMessage(TQString(summary), TQString(body), TQString(icon), x, y); -+ GTKNotifierContainer->displayMessage(messageCaption, messageText, TQString(icon), x, y); - - return_id = 0; - diff --git a/redhat/applications/kdbusnotification/kdbusnotification-3.5.13.2.spec b/redhat/applications/kdbusnotification/kdbusnotification-3.5.13.2.spec deleted file mode 100644 index 36202497b..000000000 --- a/redhat/applications/kdbusnotification/kdbusnotification-3.5.13.2.spec +++ /dev/null @@ -1,117 +0,0 @@ -# Default version for this component -%define tde_pkg kdbusnotification -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: a DBUS notification service [Trinity] - -Version: 0.1 -Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -Patch1: kdbusnotification-3.5.13.2-fix_utf8.patch - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: gtk2-devel - -%if 0%{?suse_version} -BuildRequires: dbus-1-glib-devel -%else -BuildRequires: dbus-glib-devel -%endif - -%description -kdbusnotification is a small program for Trinity that displays -DBUS notifications via unobtrusive, easily dismissed passive popups. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%patch1 -p1 -b .utf8 - -%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR || : ; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --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 - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - - - -%clean -%__rm -rf %{buildroot} - - - -%files -%defattr(-,root,root,-) -%{tde_bindir}/notification-daemon-tde -%{tde_datadir}/autostart/kdbusnotification-autostart.desktop - - - -%changelog diff --git a/redhat/applications/kdbusnotification/kdbusnotification-14.0.0.spec b/redhat/applications/kdbusnotification/kdbusnotification.spec index 25fbabe11..28fb3058d 100644 --- a/redhat/applications/kdbusnotification/kdbusnotification-14.0.0.spec +++ b/redhat/applications/kdbusnotification/kdbusnotification.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg kdbusnotification %define tde_prefix /opt/trinity @@ -59,7 +59,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils -BuildRequires: autoconf automake libtool m4 +BuildRequires: cmake >= 2.8 BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: libtool @@ -84,6 +84,15 @@ BuildRequires: dbus-1-glib-devel BuildRequires: dbus-glib-devel %endif +# ACL support +BuildRequires: libacl-devel + +# IDN support +BuildRequires: libidn-devel + +# OPENSSL support +BuildRequires: openssl-devel + %description kdbusnotification is a small program for Trinity that displays @@ -102,38 +111,53 @@ DBUS notifications via unobtrusive, easily dismissed passive popups. %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/"*"/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} \ - --libdir=%{tde_libdir} \ - --datadir=%{tde_datadir} \ - --includedir=%{tde_tdeincludedir} \ +export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" + +# Fix for Fedora 31 +if [ -r "/usr/include/harfbuzz/hb.h" ]; then + #export CMAKE_INCLUDE_PATH="/usr/include/harfbuzz" + RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/include/harfbuzz" +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 \ + \ + -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \ + -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \ + -DLIB_INSTALL_DIR="%{tde_libdir}" \ + -DPLUGIN_INSTALL_DIR="%{tde_tdelibdir}" \ + \ + -DWITH_ALL_OPTIONS=ON \ + -DWITH_GCC_VISIBILITY=ON \ + \ + -DBUILD_ALL=ON \ + -DBUILD_DOC=ON \ + -DBUILD_TRANSLATIONS=ON \ \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath \ - --disable-gcc-hidden-visibility + .. -%__make %{?_smp_mflags} +%__make %{?_smp_mflags} || %__make %install export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} +%__make install DESTDIR=%{buildroot} -C build diff --git a/redhat/applications/kdiff3/kdiff3-3.5.13.2.spec b/redhat/applications/kdiff3/kdiff3-3.5.13.2.spec deleted file mode 100644 index e4099e05b..000000000 --- a/redhat/applications/kdiff3/kdiff3-3.5.13.2.spec +++ /dev/null @@ -1,138 +0,0 @@ -# Default version for this component -%define tde_pkg kdiff3 -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/tde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: KDiff3 is a utility for comparing and/or merging two or three text files or directories. -Version: 0.9.91 -Release: %{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - - -%description -Shows the differences line by line and character by character (!). -Provides an automatic merge-facility and -an integrated editor for comfortable solving of merge-conflicts. -Supports KIO on TDE (allows accessing ftp, sftp, fish, smb etc.). -Unicode & UTF-8 support - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%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/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" - -%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 - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -# Unwanted files -#ย These are not HTML files but weird files in wrong place ?? -%__rm -rf %{?buildroot}%{tde_tdedocdir}/HTML/kdiff3/ - -%find_lang %{tde_pkg} - - -%clean -%__rm -rf %{buildroot} - - -%post -for f in hicolor locolor; do - touch --no-create %{tde_datadir}/icons/${f} || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} &>/dev/null || : -done - -%postun -for f in hicolor locolor; do - touch --no-create %{tde_datadir}/icons/${f} || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} &>/dev/null || : -done - - -%files -f %{tde_pkg}.lang -%defattr(-,root,root,-) -%doc AUTHORS COPYING -%{tde_bindir}/kdiff3 -%{tde_datadir}/apps/kdiff3/ -%{tde_datadir}/apps/kdiff3part/ -%{tde_datadir}/icons/hicolor/*/apps/kdiff3.png -%{tde_datadir}/icons/locolor/*/apps/kdiff3.png -%{tde_tdedocdir}/HTML/*/kdiff3/ -%{tde_datadir}/services/kdiff3_plugin.desktop -%{tde_datadir}/services/kdiff3part.desktop -%{tde_datadir}/applnk/Development/*.desktop -%{tde_datadir}/applnk/.hidden/kdiff3plugin.desktop -%{tde_mandir}/man*/* -%{tde_tdelibdir}/libkdiff3part.la -%{tde_tdelibdir}/libkdiff3part.so -%{tde_tdelibdir}/libkdiff3plugin.la -%{tde_tdelibdir}/libkdiff3plugin.so - -%changelog diff --git a/redhat/applications/kdiff3/kdiff3-14.0.0.spec b/redhat/applications/kdiff3/kdiff3.spec index 50a13a04c..964ca2151 100644 --- a/redhat/applications/kdiff3/kdiff3-14.0.0.spec +++ b/redhat/applications/kdiff3/kdiff3.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg kdiff3 %define tde_prefix /opt/trinity @@ -60,7 +60,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils -BuildRequires: autoconf automake libtool m4 +BuildRequires: cmake >= 2.8 BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: libtool @@ -70,6 +70,15 @@ BuildRequires: libtool BuildRequires: update-desktop-files %endif +# ACL support +BuildRequires: libacl-devel + +# IDN support +BuildRequires: libidn-devel + +# OPENSSL support +BuildRequires: openssl-devel + %description Shows the differences line by line and character by character (!). @@ -91,52 +100,66 @@ Unicode & UTF-8 support %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/"*"/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} \ - --includedir=%{tde_tdeincludedir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ +export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" + +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 \ + \ + -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \ + -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \ + -DLIB_INSTALL_DIR="%{tde_libdir}" \ + -DPLUGIN_INSTALL_DIR="%{tde_tdelibdir}" \ \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath \ - --disable-gcc-hidden-visibility + -DWITH_ALL_OPTIONS=ON \ + -DWITH_GCC_VISIBILITY=ON \ + \ + -DBUILD_ALL=ON \ + -DBUILD_DOC=ON \ + -DBUILD_TRANSLATIONS=ON \ + \ + .. -%__make %{?_smp_mflags} +%__make %{?_smp_mflags} || %__make %install export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} +%__make install DESTDIR=%{buildroot} -C build + +# Updates applications categories for openSUSE +%if 0%{?suse_version} +%suse_update_desktop_file -r "%{buildroot}%{tde_tdeappdir}/kdiff3.desktop" Development RevisionControl +%endif # Unwanted files #ย These are not HTML files but weird files in wrong place ?? %__rm -rf %{?buildroot}%{tde_tdedocdir}/HTML/kdiff3/ %find_lang %{tde_pkg} +%find_lang %{tde_pkg}_plugin %clean %__rm -rf %{buildroot} -%files -f %{tde_pkg}.lang +%files -f %{tde_pkg}.lang -f %{tde_pkg}_plugin.lang %defattr(-,root,root,-) %doc AUTHORS COPYING %{tde_bindir}/kdiff3 @@ -144,10 +167,11 @@ export PATH="%{tde_bindir}:${PATH}" %{tde_datadir}/apps/kdiff3part/ %{tde_datadir}/icons/hicolor/*/apps/kdiff3.png %{tde_datadir}/icons/locolor/*/apps/kdiff3.png +%{tde_docdir}/kdiff3/ %{tde_tdedocdir}/HTML/*/kdiff3/ %{tde_datadir}/services/kdiff3_plugin.desktop %{tde_datadir}/services/kdiff3part.desktop -%{tde_datadir}/applnk/Development/*.desktop +%{tde_tdeappdir}/kdiff3.desktop %{tde_datadir}/applnk/.hidden/kdiff3plugin.desktop %{tde_mandir}/man*/* %{tde_tdelibdir}/libkdiff3part.la diff --git a/redhat/applications/kdirstat/kdirstat-3.5.13.2.spec b/redhat/applications/kdirstat/kdirstat-3.5.13.2.spec deleted file mode 100644 index 7eae449e0..000000000 --- a/redhat/applications/kdirstat/kdirstat-3.5.13.2.spec +++ /dev/null @@ -1,133 +0,0 @@ -# Default version for this component -%define tde_pkg kdirstat -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: graphical disk usage display with cleanup facilities [Trinity] -Version: 2.4.4 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: gettext - - -%description -KDirStat (TDE Directory Statistics) is a small utility program that sums -up disk usage for directory trees, very much like the Unix 'du' command. -It displays the disk space used up by a directory tree, both numerically -and graphically. It is network transparent (i.e., you can use it to sum -up FTP servers), and comes with predefined and user configurable cleanup -actions. You can directly open a directory branch in Konqueror or the -shell of your choice, compress it to a .tar.bz2 archive, or define your -own cleanup actions. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%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/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" - -%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 - -# SMP safe ! -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -%find_lang %{tde_pkg} - - -%clean -%__rm -rf %{buildroot} - - -%post -for f in hicolor locolor; do - touch --no-create %{tde_datadir}/icons/${f} || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : -done - -%postun -for f in hicolor locolor; do - touch --no-create %{tde_datadir}/icons/${f} || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : -done - - -%files -f %{tde_pkg}.lang -%defattr(-,root,root,-) -%{tde_bindir}/kdirstat -%{tde_datadir}/applnk/Utilities/kdirstat.desktop -%{tde_datadir}/apps/kconf_update/fix_move_to_trash_bin.pl -%{tde_datadir}/apps/kconf_update/kdirstat.upd -%{tde_datadir}/apps/kdirstat/ -%{tde_tdedocdir}/HTML/en/kdirstat/ -%{tde_datadir}/icons/hicolor/*/apps/kdirstat.png -%{tde_datadir}/icons/locolor/*/apps/kdirstat.png - - -%changelog diff --git a/redhat/applications/kdirstat/kdirstat.spec b/redhat/applications/kdirstat/kdirstat.spec index bdb19ef5d..cd63cfcc3 100644 --- a/redhat/applications/kdirstat/kdirstat.spec +++ b/redhat/applications/kdirstat/kdirstat.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg kdirstat %define tde_prefix /opt/trinity @@ -151,13 +151,9 @@ export PATH="%{tde_bindir}:${PATH}" %find_lang %{tde_pkg} -# Fix desktop file location -%__mkdir_p "%{?buildroot}%{tde_tdeappdir}" -%__mv -f "%{?buildroot}%{tde_datadir}/applnk/Utilities/kdirstat.desktop" "%{?buildroot}%{tde_tdeappdir}" - # Updates applications categories for openSUSE %if 0%{?suse_version} -%suse_update_desktop_file -N "KDirStat" -G "Directory Statistics" kdirstat Filesystem +%suse_update_desktop_file -N "KDirStat" -G "Directory Statistics" "%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" Filesystem %endif diff --git a/redhat/applications/keep/keep-3.5.13.2.spec b/redhat/applications/keep/keep-3.5.13.2.spec deleted file mode 100644 index 7dba42000..000000000 --- a/redhat/applications/keep/keep-3.5.13.2.spec +++ /dev/null @@ -1,128 +0,0 @@ -# Default version for this component -%define tde_pkg keep -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: backup system for TDE [Trinity] -Version: 0.4.0 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: gettext - -Requires: rdiff-backup - -%description -Keep is an automatic backup program that allows users to set the parameters of -the backup, including the frequency and the number of backups. - -Homepage: http://jr.falleri.free.fr/keep - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%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/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --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 - -%__make %{?_smp_mflags} - - -%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,-) -%{tde_bindir}/keep -%{tde_tdelibdir}/kded_keep.la -%{tde_tdelibdir}/kded_keep.so -%{tde_tdeappdir}/keep.desktop -%{tde_datadir}/icons/hicolor/scalable/apps/keep.svgz -%{tde_datadir}/apps/keep/ -%{tde_datadir}/config.kcfg/keepsettings.kcfg -%{tde_datadir}/icons/hicolor/*/apps/keep.png -%{tde_datadir}/services/kded/keep.desktop - - -%changelog diff --git a/redhat/applications/keep/keep-14.0.0.spec b/redhat/applications/keep/keep.spec index 56557f0e5..93e9627ee 100644 --- a/redhat/applications/keep/keep-14.0.0.spec +++ b/redhat/applications/keep/keep.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg keep %define tde_prefix /opt/trinity @@ -62,7 +62,7 @@ BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: autoconf automake libtool m4 +BuildRequires: cmake >= 2.8 BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: libtool @@ -77,6 +77,15 @@ BuildRequires: update-desktop-files BuildRequires: brp-check-trinity %endif +# ACL support +BuildRequires: libacl-devel + +# IDN support +BuildRequires: libidn-devel + +# OPENSSL support +BuildRequires: openssl-devel + Requires: rdiff-backup @@ -99,39 +108,47 @@ Homepage: http://jr.falleri.free.fr/keep %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/"*"/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} \ - --includedir=%{tde_tdeincludedir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ +export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" + +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 \ + \ + -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \ + -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \ + -DLIB_INSTALL_DIR="%{tde_libdir}" \ + -DPLUGIN_INSTALL_DIR="%{tde_tdelibdir}" \ + \ + -DWITH_ALL_OPTIONS=ON \ + -DWITH_GCC_VISIBILITY=ON \ + \ + -DBUILD_ALL=ON \ + -DBUILD_DOC=ON \ + -DBUILD_TRANSLATIONS=ON \ \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath \ - --disable-gcc-hidden-visibility + .. -%__make %{?_smp_mflags} +%__make %{?_smp_mflags} || %__make %install export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} +%__make install DESTDIR=%{buildroot} -C build %find_lang %{tde_pkg} @@ -156,6 +173,7 @@ export PATH="%{tde_bindir}:${PATH}" %{tde_datadir}/config.kcfg/keepsettings.kcfg %{tde_datadir}/icons/hicolor/*/apps/keep.png %{tde_datadir}/services/kded/keep.desktop +%{tde_mandir}/man1/keep.* %changelog diff --git a/redhat/applications/kerberostray/kerberostray-14.0.0.spec b/redhat/applications/kerberostray/kerberostray.spec index de55e48e7..4bd5a4c85 100644 --- a/redhat/applications/kerberostray/kerberostray-14.0.0.spec +++ b/redhat/applications/kerberostray/kerberostray.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg kerberostray %define tde_prefix /opt/trinity @@ -63,7 +63,7 @@ BuildRequires: desktop-file-utils BuildRequires: gettext BuildRequires: trinity-libtdeldap-devel >= 0.5 -BuildRequires: autoconf automake libtool m4 +BuildRequires: cmake >= 2.8 BuildRequires: gcc-c++ BuildRequires: pkgconfig @@ -88,13 +88,16 @@ BuildRequires: openldap2-devel BuildRequires: openldap24-libs-devel %endif +# KRB5 support +#BuildRequires: krb5-devel + # HEIMDAL support -%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} -BuildRequires: heimdal-devel -%endif -%if 0%{?suse_version} -BuildRequires: libheimdal-devel -%endif +#%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} +#BuildRequires: heimdal-devel +#%endif +#%if 0%{?suse_version} +#BuildRequires: libheimdal-devel +#%endif # UDEV support %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6 @@ -110,6 +113,15 @@ BuildRequires: libcom_err-devel BuildRequires: %{_lib}ext2fs-devel %endif +# ACL support +BuildRequires: libacl-devel + +# IDN support +BuildRequires: libidn-devel + +# OPENSSL support +BuildRequires: openssl-devel + %description Kerberos ticket manager which sits in the system tray and allows viewing/control of Kerberos tickets @@ -125,55 +137,49 @@ Kerberos ticket manager which sits in the system tray and allows viewing/control %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/"*"/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" -extra_includes="%{_includedir}" -extra_libs="%{_libdir}" - -if [ -d "%{_includedir}/openldap24" ]; then - extra_includes="%{_includedir}/openldap24:${extra_includes}" - extra_libs="%{_libdir}/openldap24:${extra_libs}" -fi - -if [ -d "%{_includedir}/heimdal" ]; then - extra_includes="%{_includedir}/heimdal:${extra_includes}" - extra_libs="%{_libdir}/heimdal:${extra_libs}" +if ! rpm -E %%cmake|grep -q "cd build"; then + %__mkdir_p build + cd build fi -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --includedir=%{tde_tdeincludedir} \ - --docdir=%{tde_tdedocdir} \ - --libdir=%{tde_libdir} \ +%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 \ \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath \ - --disable-gcc-hidden-visibility \ + -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \ + -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \ + -DLIB_INSTALL_DIR="%{tde_libdir}" \ + -DPLUGIN_INSTALL_DIR="%{tde_tdelibdir}" \ \ - --with-extra-includes=${extra_includes} \ - --with-extra-libs=${extra_libs} \ + -DWITH_ALL_OPTIONS=ON \ + -DWITH_GCC_VISIBILITY=ON \ + \ + -DBUILD_ALL=ON \ + -DBUILD_DOC=ON \ + -DBUILD_TRANSLATIONS=ON \ + \ + .. -%__make %{?_smp_mflags} +%__make %{?_smp_mflags} || %__make %install export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} +%__make install DESTDIR=%{buildroot} -C build + +%find_lang %{tde_pkg} # Apps that should stay in TDE echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" @@ -183,7 +189,7 @@ echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" %__rm -rf %{buildroot} -%files +%files -f %{tde_pkg}.lang %{tde_bindir}/kerberostray %{tde_tdeappdir}/kerberostray.desktop %{tde_datadir}/apps/kerberostray/ diff --git a/redhat/applications/keximdb/keximdb.spec b/redhat/applications/keximdb/keximdb.spec index 6627c48ec..cfdef0f13 100644 --- a/redhat/applications/keximdb/keximdb.spec +++ b/redhat/applications/keximdb/keximdb.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg keximdb %define tde_prefix /opt/trinity @@ -61,12 +61,22 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils +BuildRequires: trinity-koffice-devel +BuildRequires: trinity-koffice-kexi + BuildRequires: cmake >= 2.8 BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: libtool -BuildRequires: trinity-koffice-devel +# IDN support +BuildRequires: libidn-devel + +# ACL support +BuildRequires: libacl-devel + +# OPENSSL support +BuildRequires: openssl-devel # SUSE desktop files utility %if 0%{?suse_version} diff --git a/redhat/applications/kftpgrabber/kftpgrabber-14.0.0.patch b/redhat/applications/kftpgrabber/kftpgrabber-14.0.0.patch deleted file mode 100644 index f8e019e63..000000000 --- a/redhat/applications/kftpgrabber/kftpgrabber-14.0.0.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/kftpgrabber/src/engine/ftpdirectoryparser.cpp b/kftpgrabber/src/engine/ftpdirectoryparser.cpp -index 981d0b6..71e2cd2 100644 ---- a/kftpgrabber/src/engine/ftpdirectoryparser.cpp -+++ b/kftpgrabber/src/engine/ftpdirectoryparser.cpp -@@ -421,6 +421,8 @@ bool FtpDirectoryParser::parseUnixPermissions(const TQString &permissions, Direc - if (permissions[9] == 't' || permissions[9] == 'T') p |= S_ISVTX; - - entry.setPermissions(p); -+ -+ return(p); - } - - bool FtpDirectoryParser::parseLine(const TQString &line, DirectoryEntry &entry) -diff --git a/kftpgrabber/src/misc/desencryptor.cpp b/kftpgrabber/src/misc/desencryptor.cpp -index 126fad7..fac681f 100644 ---- a/kftpgrabber/src/misc/desencryptor.cpp -+++ b/kftpgrabber/src/misc/desencryptor.cpp -@@ -65,8 +65,8 @@ void DESEncryptor::DESExec(const TQString &str, int mode) - char *o_message = (char*) malloc(8); - char *o_output = (char*) malloc(8); - -- memset(o_message, 0, 9); -- memset(o_output, 0, 9); -+ memset(o_message, 0, sizeof o_message); -+ memset(o_output, 0, sizeof o_output); - //out.resize(in.size() * 2); - - while (i < in.size()) { -@@ -79,8 +79,8 @@ void DESEncryptor::DESExec(const TQString &str, int mode) - i += 8; - - // Clear everything -- memset(o_message, 0, 9); -- memset(o_output, 0, 9); -+ memset(o_message, 0, sizeof o_message); -+ memset(o_output, 0, sizeof o_output); - } - - free(o_message); diff --git a/redhat/applications/kftpgrabber/kftpgrabber-14.0.0.spec b/redhat/applications/kftpgrabber/kftpgrabber.spec index 75cb03836..07c03d26e 100644 --- a/redhat/applications/kftpgrabber/kftpgrabber-14.0.0.spec +++ b/redhat/applications/kftpgrabber/kftpgrabber.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg kftpgrabber %define tde_prefix /opt/trinity @@ -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}-14.0.0.patch BuildRequires: trinity-tdelibs-devel >= %{tde_version} @@ -124,7 +123,6 @@ Requires: %{name} = %{version}-%{release} %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%patch0 -p1 -b .orig %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" diff --git a/redhat/applications/kgtk-qt3/kgtk-qt3-3.5.13.2.spec b/redhat/applications/kgtk-qt3/kgtk-qt3-3.5.13.2.spec deleted file mode 100644 index 6bde2ebd1..000000000 --- a/redhat/applications/kgtk-qt3/kgtk-qt3-3.5.13.2.spec +++ /dev/null @@ -1,126 +0,0 @@ -# Default version for this component -%define tde_pkg kgtk-qt3 -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: Use TDE dialogs in Gtk apps -Version: 0.10.2 -Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: gettext - - -%description -This is an LD_PRELOAD hack that allows most GTK -applications to use Trinity's file dialogs when run under Trinity. - -The Gtk file chooser functions have been overridden to communicate -with this TDE module/application. - -This package includes the kqt3-wrapper - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} - -%build -unset QTDIR; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" - -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 \ - \ - -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \ - -DBIN_INSTALL_DIR=%{tde_bindir} \ - -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \ - -DLIB_INSTALL_DIR=%{tde_libdir} \ - -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ - \ - -DBUILD_ALL=ON \ - .. - -# SMP safe ! -%__make %{?_smp_mflags} || %__make - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} -C build - -# The "preload" file is used by "startkde" script -%__install -d -m 755 "%{buildroot}%{tde_datadir}/kgtk" -echo "%{tde_libdir}/kgtk/libkgtk2.so" >"%{buildroot}%{tde_datadir}/kgtk/preload" - -%find_lang kgtk - - - -%clean -%__rm -rf %{buildroot} - - -%files -f kgtk.lang -%defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING README TODO -%{tde_bindir}/kdialogd-wrapper -%{tde_bindir}/kdialogd3 -%{tde_bindir}/kgtk-wrapper -%{tde_bindir}/kgtk2-wrapper -%{tde_bindir}/kqt3-wrapper -%{tde_libdir}/kgtk/libkgtk2.so -%{tde_libdir}/kgtk/libkqt3.so -%{tde_datadir}/kgtk/preload - -%changelog diff --git a/redhat/applications/kgtk-qt3/kgtk-qt3-14.0.0.spec b/redhat/applications/kgtk-qt3/kgtk-qt3.spec index c78610f1c..0f5e282f7 100644 --- a/redhat/applications/kgtk-qt3/kgtk-qt3-14.0.0.spec +++ b/redhat/applications/kgtk-qt3/kgtk-qt3.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg kgtk-qt3 %define tde_prefix /opt/trinity diff --git a/redhat/applications/kile/kile-3.5.13.2.spec b/redhat/applications/kile/kile-3.5.13.2.spec deleted file mode 100644 index 9967337e3..000000000 --- a/redhat/applications/kile/kile-3.5.13.2.spec +++ /dev/null @@ -1,194 +0,0 @@ -# Default version for this component -%define tde_pkg kile -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: TDE Integrated LaTeX Environment [Trinity] -Version: 2.0.2 -Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Publishing - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: gettext - -Obsoletes: %{name}-i18n-ar -Obsoletes: %{name}-i18n-bg -Obsoletes: %{name}-i18n-br -Obsoletes: %{name}-i18n-ca -Obsoletes: %{name}-i18n-cs -Obsoletes: %{name}-i18n-cy -Obsoletes: %{name}-i18n-da -Obsoletes: %{name}-i18n-de -Obsoletes: %{name}-i18n-el -Obsoletes: %{name}-i18n-engb -Obsoletes: %{name}-i18n-es -Obsoletes: %{name}-i18n-et -Obsoletes: %{name}-i18n-eu -Obsoletes: %{name}-i18n-fi -Obsoletes: %{name}-i18n-fr -Obsoletes: %{name}-i18n-ga -Obsoletes: %{name}-i18n-gl -Obsoletes: %{name}-i18n-hi -Obsoletes: %{name}-i18n-hu -Obsoletes: %{name}-i18n-is -Obsoletes: %{name}-i18n-it -Obsoletes: %{name}-i18n-ja -Obsoletes: %{name}-i18n-lt -Obsoletes: %{name}-i18n-ms -Obsoletes: %{name}-i18n-mt -Obsoletes: %{name}-i18n-nb -Obsoletes: %{name}-i18n-nds -Obsoletes: %{name}-i18n-nl -Obsoletes: %{name}-i18n-nn -Obsoletes: %{name}-i18n-pa -Obsoletes: %{name}-i18n-pl -Obsoletes: %{name}-i18n-pt -Obsoletes: %{name}-i18n-ptbr -Obsoletes: %{name}-i18n-ro -Obsoletes: %{name}-i18n-ru -Obsoletes: %{name}-i18n-rw -Obsoletes: %{name}-i18n-sk -Obsoletes: %{name}-i18n-sr -Obsoletes: %{name}-i18n-srlatin -Obsoletes: %{name}-i18n-sv -Obsoletes: %{name}-i18n-ta -Obsoletes: %{name}-i18n-th -Obsoletes: %{name}-i18n-tr -Obsoletes: %{name}-i18n-uk -Obsoletes: %{name}-i18n-zhcn - - -%description -Kile is a user-friendly LaTeX source editor and TeX shell for TDE. - -The source editor is a multi-document editor designed for .tex and .bib -files. Menus, wizards and auto-completion are provided to assist with -tag insertion and code generation. A structural view of the document -assists with navigation within source files. - -The TeX shell integrates the various tools required for TeX processing. -It assists with LaTeX compilation, DVI and postscript document viewing, -generation of bibliographies and indices and other common tasks. - -Kile can support large projects consisting of several smaller files. - -%if 0%{?suse_version} || 0%{?pclinuxos} -%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/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" - -%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 - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -%__chmod +x %{buildroot}%{tde_datadir}/apps/kile/test/runTests.sh - -# Unwanted files ... -%__rm -f %{?buildroot}%{tde_datadir}/apps/katepart/syntax/bibtex.xml -%__rm -f %{?buildroot}%{tde_datadir}/apps/katepart/syntax/latex.xml - -%find_lang %{tde_pkg} - -%clean -%__rm -rf %{buildroot} - - -%post -update-desktop-database %{tde_appdir} > /dev/null -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : - -%postun -update-desktop-database %{tde_appdir} > /dev/null -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : - - -%files -f %{tde_pkg}.lang -%defattr(-,root,root,-) -%{tde_bindir}/kile -%{tde_tdeappdir}/kile.desktop -%{tde_datadir}/apps/kconf_update -%{tde_datadir}/apps/kile -%{tde_datadir}/config.kcfg/kile.kcfg -%{tde_datadir}/icons/hicolor/*/apps/kile.png -%{tde_datadir}/icons/hicolor/scalable/apps/kile.svgz -%{tde_tdedocdir}/HTML/en/kile -%{tde_datadir}/mimelnk/text/x-kilepr.desktop - -%lang(da) %{tde_tdedocdir}/HTML/da/kile/ -%lang(es) %{tde_tdedocdir}/HTML/es/kile/ -%lang(et) %{tde_tdedocdir}/HTML/et/kile/ -%lang(it) %{tde_tdedocdir}/HTML/it/kile/ -%lang(nl) %{tde_tdedocdir}/HTML/nl/kile/ -%lang(pt) %{tde_tdedocdir}/HTML/pt/kile/ -%lang(sv) %{tde_tdedocdir}/HTML/sv/kile/ - - - -%changelog diff --git a/redhat/applications/kile/kile-14.0.0.spec b/redhat/applications/kile/kile.spec index 33bc88722..75d27dd5c 100644 --- a/redhat/applications/kile/kile-14.0.0.spec +++ b/redhat/applications/kile/kile.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg kile %define tde_prefix /opt/trinity diff --git a/redhat/applications/kima/kima-3.5.13.2.spec b/redhat/applications/kima/kima-3.5.13.2.spec deleted file mode 100644 index aad28627b..000000000 --- a/redhat/applications/kima/kima-3.5.13.2.spec +++ /dev/null @@ -1,121 +0,0 @@ -# Default version for this component -%define tde_pkg kima -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: kicker monitoring applet [Trinity] -Version: 0.7.3.2 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.elliptique.net/~ken/kima/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: gettext - -# HAL support -# On RHEL4, we do not use HAL (too old) -%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version} -%define with_hal 1 -BuildRequires: hal-devel >= 0.4.8 -%endif - - -%description -This applet monitors various temperature, -frequency and fan sources in your kicker -panel. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%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/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" - -%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 - -# SMP safe ! -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - - -%find_lang %{tde_pkg} - - - -%clean -%__rm -rf %{buildroot} - - -%files -f %{tde_pkg}.lang -%defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING NEWS README TODO -%{tde_tdelibdir}/libkima.la -%{tde_tdelibdir}/libkima.so -%{tde_datadir}/apps/kicker/applets/kima.desktop -%{tde_tdedocdir}/HTML/en/kima/ - - -%changelog diff --git a/redhat/applications/kima/kima-14.0.0.spec b/redhat/applications/kima/kima.spec index 8cbd7bce1..99765d364 100644 --- a/redhat/applications/kima/kima-14.0.0.spec +++ b/redhat/applications/kima/kima.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg kima %define tde_prefix /opt/trinity @@ -63,7 +63,7 @@ BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: autoconf automake libtool m4 +BuildRequires: cmake >= 2.8 BuildRequires: gcc-c++ BuildRequires: pkgconfig @@ -83,6 +83,12 @@ BuildRequires: brp-check-trinity BuildRequires: libudev-devel %endif +# IDN support +BuildRequires: libidn-devel + +# OPENSSL support +BuildRequires: openssl-devel + %description This applet monitors various temperature, @@ -102,40 +108,48 @@ panel. %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/"*"/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} \ - --includedir=%{tde_tdeincludedir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ +export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" + +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 \ + \ + -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \ + -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \ + -DLIB_INSTALL_DIR="%{tde_libdir}" \ + -DPLUGIN_INSTALL_DIR="%{tde_tdelibdir}" \ + \ + -DWITH_ALL_OPTIONS=ON \ + -DWITH_GCC_VISIBILITY=ON \ + -DWITH_NVCONTROL=OFF \ + \ + -DBUILD_ALL=ON \ + -DBUILD_DOC=ON \ + -DBUILD_TRANSLATIONS=ON \ \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath \ - --disable-gcc-hidden-visibility + .. -# SMP safe ! -%__make %{?_smp_mflags} +%__make %{?_smp_mflags} || %__make %install export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} +%__make install DESTDIR=%{buildroot} -C build %find_lang %{tde_pkg} @@ -148,7 +162,7 @@ export PATH="%{tde_bindir}:${PATH}" %files -f %{tde_pkg}.lang %defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING NEWS README TODO +%doc AUTHORS ChangeLog COPYING README TODO %{tde_tdelibdir}/libkima.la %{tde_tdelibdir}/libkima.so %{tde_datadir}/apps/kicker/applets/kima.desktop diff --git a/redhat/applications/kiosktool/kiosktool-3.5.13.2.spec b/redhat/applications/kiosktool/kiosktool-3.5.13.2.spec deleted file mode 100644 index 68c088ba5..000000000 --- a/redhat/applications/kiosktool/kiosktool-3.5.13.2.spec +++ /dev/null @@ -1,125 +0,0 @@ -# Default version for this component -%define tde_pkg kiosktool -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Version: 1.0 -Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist} -Summary: tool to configure the TDE kiosk framework - -License: GPLv2+ -Group: Applications/Multimedia - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: gettext - - -%description -A Point&Click tool for system administrators to enable -TDE's KIOSK features or otherwise preconfigure TDE for -groups of users. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%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/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR || : ; source /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" - -%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 - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf $RPM_BUILD_ROOT -%__make install DESTDIR=$RPM_BUILD_ROOT - -%find_lang %{tde_pkg} - - -%clean -%__rm -rf $RPM_BUILD_ROOT - - -%post -touch --no-create %{tde_datadir}/icons/crystalsvg ||: -gtk-update-icon-cache -q %{tde_datadir}/icons/crystalsvg 2> /dev/null ||: -update-desktop-database >& /dev/null ||: - -%postun -touch --no-create %{tde_datadir}/icons/crystalsvg ||: -gtk-update-icon-cache -q %{tde_datadir}/icons/crystalsvg 2> /dev/null ||: -update-desktop-database >& /dev/null ||: - - - -%files -f %{tde_pkg}.lang -%defattr(-,root,root,-) -%doc ChangeLog COPYING README TODO -%{tde_bindir}/kiosktool -%{tde_bindir}/kiosktool-kdedirs -%{tde_tdeappdir}/kiosktool.desktop -%{tde_datadir}/apps/kiosktool/*.png -%{tde_tdedocdir}/HTML/en/kiosktool/ -%{tde_datadir}/icons/crystalsvg/*/apps/kiosktool.png -%{tde_datadir}/apps/kiosktool/kiosk_data.xml -%{tde_datadir}/apps/kiosktool/kiosktoolui.rc - -%changelog diff --git a/redhat/applications/kiosktool/kiosktool.spec b/redhat/applications/kiosktool/kiosktool.spec index 3112132a4..083103000 100644 --- a/redhat/applications/kiosktool/kiosktool.spec +++ b/redhat/applications/kiosktool/kiosktool.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg kiosktool %define tde_prefix /opt/trinity @@ -157,7 +157,7 @@ EOF # Updates applications categories for openSUSE echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" %if 0%{?suse_version} -%suse_update_desktop_file %{tde_pkg} System SystemSetup +%suse_update_desktop_file "%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" System SystemSetup %endif @@ -179,7 +179,7 @@ echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" %lang(pt) %{tde_tdedocdir}/HTML/pt/kiosktool/ %lang(sv) %{tde_tdedocdir}/HTML/sv/kiosktool/ %{tde_datadir}/icons/crystalsvg/*/apps/kiosktool.png -%{tde_confdir}/kiosktoolrc +%config(noreplace) %{tde_confdir}/kiosktoolrc %{tde_mandir}/man1/*.1* diff --git a/redhat/applications/kkbswitch/kkbswitch.spec b/redhat/applications/kkbswitch/kkbswitch.spec index b4ef8ddb4..d83aa58af 100644 --- a/redhat/applications/kkbswitch/kkbswitch.spec +++ b/redhat/applications/kkbswitch/kkbswitch.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg kkbswitch %define tde_prefix /opt/trinity @@ -156,12 +156,15 @@ export PATH="%{tde_bindir}:${PATH}" %find_lang %{tde_pkg} # Fix desktop icon location -%__mkdir_p "%{?buildroot}%{tde_tdeappdir}" -%__mv -f "%{?buildroot}%{tde_datadir}/applnk/"*"/%{tde_pkg}.desktop" "%{?buildroot}%{tde_tdeappdir}" +if [ -d "%{?buildroot}%{tde_datadir}/applnk" ]; then + %__mkdir_p "%{?buildroot}%{tde_tdeappdir}" + %__mv -f "%{?buildroot}%{tde_datadir}/applnk/"*"/%{tde_pkg}.desktop" "%{?buildroot}%{tde_tdeappdir}" + %__rm -r "%{buildroot}%{tde_datadir}/applnk" +fi # Updates applications categories for openSUSE %if 0%{?suse_version} -%suse_update_desktop_file -r %{tde_pkg} System TrayIcon +%suse_update_desktop_file -r "%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" System TrayIcon %endif diff --git a/redhat/applications/klcddimmer/klcddimmer.spec b/redhat/applications/klcddimmer/klcddimmer.spec index b50b36d10..73dd98e28 100644 --- a/redhat/applications/klcddimmer/klcddimmer.spec +++ b/redhat/applications/klcddimmer/klcddimmer.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg klcddimmer %define tde_prefix /opt/trinity @@ -138,16 +138,18 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} -C build +%find_lang %{tde_pkg} || touch %{tde_pkg}.lang + %clean %__rm -rf %{buildroot} -%files +%files -f %{tde_pkg}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING LICENSE NEWS README -%{tde_libdir}/libklcddimmer_panelapplet.la -%{tde_libdir}/libklcddimmer_panelapplet.so +%{tde_libdir}/klcddimmer_panelapplet.la +%{tde_libdir}/klcddimmer_panelapplet.so %{tde_datadir}/apps/kicker/applets/klcddimmer.desktop %{tde_tdedocdir}/HTML/en/klcddimmer/ %{tde_datadir}/icons/hicolor/*/apps/klcddimmer.png diff --git a/redhat/applications/kmplayer/kmplayer-3.5.13.2.spec b/redhat/applications/kmplayer/kmplayer-3.5.13.2.spec deleted file mode 100644 index ef8bb091c..000000000 --- a/redhat/applications/kmplayer/kmplayer-3.5.13.2.spec +++ /dev/null @@ -1,275 +0,0 @@ -# Default version for this component -%define tde_pkg kmplayer -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: media player for Trinity -Version: 0.10.0c -Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Multimedia - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://kmplayer.kde.org - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -# 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 = %{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 - - -%package base -Group: Applications/Multimedia -Summary: Base files for KMPlayer [Trinity] - -%description base -Core files needed for KMPlayer. - - -%package konq-plugins -Group: Applications/Multimedia -Requires: %{name}-base = %{version}-%{release} -Requires: trinity-tdebase >= %{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. - - -%package doc -Group: Applications/Multimedia -Requires: %{name} = %{version}-%{release} -Summary: Handbook for KMPlayer [Trinity] - -%description doc -Documention for KMPlayer, a basic audio/video viewer application for TDE. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%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/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" - -%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 - -%__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 - - -%clean -%__rm -rf %{buildroot} - - -%post -/sbin/ldconfig || : - -%postun -/sbin/ldconfig || : - -%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 -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}/libkdeinit_kmplayer.la -%{tde_libdir}/libkdeinit_kmplayer.so -%{tde_tdelibdir}/kmplayer.la -%{tde_tdelibdir}/kmplayer.so -%{tde_tdeappdir}/kmplayer.desktop -%{tde_datadir}/apps/kmplayer -%{tde_datadir}/services/kmplayer_part.desktop - -%files base -%defattr(-,root,root,-) -%{tde_libdir}/libkmplayercommon.la -%{tde_libdir}/libkmplayercommon.so -%{tde_bindir}/kgstplayer -%{tde_bindir}/kxineplayer -%{tde_datadir}/config/kmplayerrc -%{tde_datadir}/apps/kmplayer/bookmarks.xml -%{tde_datadir}/apps/kmplayer/noise.gif -%{tde_datadir}/apps/kmplayer/pluginsinfo -%{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 - -%files doc -%defattr(-,root,root,-) -%{tde_tdedocdir}/HTML/*/kmplayer - -%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 - - -%changelog diff --git a/redhat/applications/kmplayer/kmplayer-14.0.0.spec b/redhat/applications/kmplayer/kmplayer.spec index f68698644..2dd05dd51 100644 --- a/redhat/applications/kmplayer/kmplayer-14.0.0.spec +++ b/redhat/applications/kmplayer/kmplayer.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg kmplayer %define tde_prefix /opt/trinity @@ -101,9 +101,9 @@ BuildRequires: gstreamer1-plugins-base-devel >= 1.0 %endif # XINE support -%if 0%{?fedora} || 0%{?rhel} >= 4 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?rhel} || 0%{?suse_version} %define with_xine 1 -%if 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} BuildRequires: %{_lib}xine1.2-devel %endif %if 0%{?fedora} || 0%{?rhel} @@ -160,7 +160,7 @@ KMPlayer can: %files -f %{tde_pkg}.lang %defattr(-,root,root,-) -%doc AUTHORS COPYING ChangeLog INSTALL README TODO kmplayer.lsm +%doc AUTHORS COPYING ChangeLog INSTALL README TODO %{tde_bindir}/kmplayer %{tde_bindir}/knpplayer %{tde_bindir}/kxvplayer @@ -190,7 +190,7 @@ Core files needed for KMPlayer. %{tde_libdir}/libkmplayercommon.so %{tde_bindir}/kgstplayer %{tde_bindir}/kxineplayer -%{tde_confdir}/kmplayerrc +%config(noreplace) %{tde_confdir}/kmplayerrc %{tde_datadir}/apps/kmplayer/bookmarks.xml %{tde_datadir}/apps/kmplayer/noise.gif %{tde_datadir}/icons/hicolor/*/apps/kmplayer.png diff --git a/redhat/applications/kmyfirewall/kmyfirewall-3.5.13.2.spec b/redhat/applications/kmyfirewall/kmyfirewall-3.5.13.2.spec deleted file mode 100644 index ffea0e925..000000000 --- a/redhat/applications/kmyfirewall/kmyfirewall-3.5.13.2.spec +++ /dev/null @@ -1,193 +0,0 @@ -# Default version for this component -%define tde_pkg kmyfirewall -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: iptables based firewall configuration tool for TDE [Trinity] -Version: 1.1.1 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - - -%description -KMyFirewall attempts to make it easier to setup iptables based firewalls on -Linux systems. It will be the right tool if you like to have a so called -"Personal Firewall" running on your Linux box, but don't have the time and/or -the interest to spend hours in front of the iptables manual just to setup a -Firewall that keeps the "bad" people out. - -There is also the possibility to save entire rule sets, so you only have to -configure your rule set one time and then you can use it on several computers -giving each of them a similar configuration (p.e. school networks, office, -university etc.) - -%package devel -Summary: Development files for %{name} -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} - -%description devel -%{summary} - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%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/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" - -%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-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath - -%__make %{?_smp_mflags} - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - - -%clean -%__rm -rf %{buildroot} - - -%post -update-desktop-database %{tde_appdir} > /dev/null -for f in hicolor locolor; do - touch --no-create %{tde_datadir}/icons/${f} || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : -done -/sbin/ldconfig || : - -%postun -update-desktop-database %{tde_appdir} > /dev/null -for f in hicolor locolor; do - touch --no-create %{tde_datadir}/icons/${f} || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : -done -/sbin/ldconfig || : - - -%files -%defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING COPYING-DOCS README TODO -%{tde_bindir}/kmyfirewall -%{tde_libdir}/libkmfcore.so.* -%{tde_libdir}/libkmfwidgets.so.* -%{tde_tdelibdir}/libkmfcompiler_ipt.la -%{tde_tdelibdir}/libkmfcompiler_ipt.so -%{tde_tdelibdir}/libkmfgenericinterfacepart.la -%{tde_tdelibdir}/libkmfgenericinterfacepart.so -%{tde_tdelibdir}/libkmfinstaller_linux.la -%{tde_tdelibdir}/libkmfinstaller_linux.so -%{tde_tdelibdir}/libkmfinstallerplugin.la -%{tde_tdelibdir}/libkmfinstallerplugin.so -%{tde_tdelibdir}/libkmfipteditorpart.la -%{tde_tdelibdir}/libkmfipteditorpart.so -%{tde_tdelibdir}/libkmfruleoptionedit_custom.la -%{tde_tdelibdir}/libkmfruleoptionedit_custom.so -%{tde_tdelibdir}/libkmfruleoptionedit_interface.la -%{tde_tdelibdir}/libkmfruleoptionedit_interface.so -%{tde_tdelibdir}/libkmfruleoptionedit_ip.la -%{tde_tdelibdir}/libkmfruleoptionedit_ip.so -%{tde_tdelibdir}/libkmfruleoptionedit_limit.la -%{tde_tdelibdir}/libkmfruleoptionedit_limit.so -%{tde_tdelibdir}/libkmfruleoptionedit_mac.la -%{tde_tdelibdir}/libkmfruleoptionedit_mac.so -%{tde_tdelibdir}/libkmfruleoptionedit_protocol.la -%{tde_tdelibdir}/libkmfruleoptionedit_protocol.so -%{tde_tdelibdir}/libkmfruleoptionedit_state.la -%{tde_tdelibdir}/libkmfruleoptionedit_state.so -%{tde_tdelibdir}/libkmfruleoptionedit_tos.la -%{tde_tdelibdir}/libkmfruleoptionedit_tos.so -%{tde_tdelibdir}/libkmfruletargetoptionedit_log.la -%{tde_tdelibdir}/libkmfruletargetoptionedit_log.so -%{tde_tdelibdir}/libkmfruletargetoptionedit_mark.la -%{tde_tdelibdir}/libkmfruletargetoptionedit_mark.so -%{tde_tdelibdir}/libkmfruletargetoptionedit_nat.la -%{tde_tdelibdir}/libkmfruletargetoptionedit_nat.so -%{tde_tdelibdir}/libkmfruletargetoptionedit_tos.la -%{tde_tdelibdir}/libkmfruletargetoptionedit_tos.so -%{tde_tdeappdir}/kmyfirewall.desktop -%{tde_datadir}/apps/kmfgenericinterfacepart/kmfgenericinterfacepartui.rc -%{tde_datadir}/apps/kmfipteditorpart/kmfipteditorpartui.rc -%{tde_datadir}/apps/kmfsystray -%{tde_datadir}/apps/kmyfirewall -%{tde_datadir}/config.kcfg/kmfconfig.kcfg -%{tde_datadir}/config/kmyfirewallrc -%{tde_tdedocdir}/HTML/en/kmyfirewall/ -%{tde_datadir}/icons/hicolor/*/apps/kmyfirewall.png -%{tde_datadir}/icons/locolor/*/apps/kmyfirewall.png -%{tde_datadir}/mimelnk/application/kmfgrs.desktop -%{tde_datadir}/mimelnk/application/kmfnet.desktop -%{tde_datadir}/mimelnk/application/kmfpkg.desktop -%{tde_datadir}/mimelnk/application/kmfrs.desktop -%{tde_datadir}/services/kmf*.desktop -%{tde_datadir}/servicetypes/kmf*.desktop - -%files devel -%{tde_tdeincludedir}/kmyfirewall -%{tde_libdir}/libkmfcore.la -%{tde_libdir}/libkmfcore.so -%{tde_libdir}/libkmfwidgets.la -%{tde_libdir}/libkmfwidgets.so - -%changelog diff --git a/redhat/applications/kmyfirewall/kmyfirewall-14.0.0.spec b/redhat/applications/kmyfirewall/kmyfirewall.spec index a24777758..7998140e5 100644 --- a/redhat/applications/kmyfirewall/kmyfirewall-14.0.0.spec +++ b/redhat/applications/kmyfirewall/kmyfirewall.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg kmyfirewall %define tde_prefix /opt/trinity @@ -136,7 +136,7 @@ university etc.) %{tde_datadir}/apps/kmfsystray/ %{tde_datadir}/apps/kmyfirewall/ %{tde_datadir}/config.kcfg/kmfconfig.kcfg -%{tde_confdir}/kmyfirewallrc +%config(noreplace) %{tde_confdir}/kmyfirewallrc %{tde_tdedocdir}/HTML/en/kmyfirewall/ %{tde_datadir}/icons/hicolor/*/apps/kmyfirewall.png %{tde_datadir}/icons/locolor/*/apps/kmyfirewall.png diff --git a/redhat/applications/kmymoney/kmymoney-3.5.13.2.spec b/redhat/applications/kmymoney/kmymoney-3.5.13.2.spec deleted file mode 100644 index ce17fff0b..000000000 --- a/redhat/applications/kmymoney/kmymoney-3.5.13.2.spec +++ /dev/null @@ -1,268 +0,0 @@ -# Default version for this component -%define tde_pkg kmymoney -%define tde_version 3.5.13.2 - -# Required for Mageia 2: removes the ldflag '--no-undefined' -%define _disable_ld_no_undefined 1 - -%if 0%{?mgaversion} || 0%{?mdkversion} -%define qt3pluginsdir %{_libdir}/qt3/plugins -%endif -%if 0%{?rhel} || 0%{?fedora} -%define qt3pluginsdir %{_libdir}/qt-3.3/plugins -%endif -%if 0%{?suse_version} -%define qt3pluginsdir /usr/lib/qt3/plugins -%endif - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: personal finance manager for TDE - -Version: 1.0.5 -Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -Source1: kmymoneytitlelabel.png - -# [kmymoney] Fix FTBFS -Patch1: kmymoney-3.5.13.2-ftbfs.patch - -# [admin] Fix automake 1.13 build issue -Patch2: admin-fix-parallel-test.diff - -# [kmymoney] Missing LDFLAGS causing FTBFS -Patch4: kmymoney-3.5.13-missing_ldflags.patch - -# [kmymoney] Fix QT3 plugins directory location -Patch5: kmymoney-3.5.13-fix_qt3_plugins_location.patch - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: recode -BuildRequires: libofx-devel - -# OPENSP support -%if 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?mdkversion} -%if 0%{?mgaversion} || 0%{?pclinuxos} -%if 0%{?mgaversion} >= 4 -BuildRequires: %{_lib}osp-devel -%else -BuildRequires: %{_lib}OpenSP5-devel -%endif -%else -BuildRequires: opensp-devel -%endif -%endif -%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} -BuildRequires: opensp-devel -%endif -%if 0%{?rhel} == 4 -BuildRequires: openjade-devel -%endif - -Requires: %{name}-common == %{version}-%{release} - -%description -KMyMoney is the Personal Finance Manager for TDE. It operates similar to -MS-Money and Quicken, supports different account types, categorisation of -expenses, QIF import/export, multiple currencies and initial online banking -support. - - -%package common -Summary: KMyMoney architecture independent files -Group: Applications/Utilities -Requires: %{name} == %{version} - -%description common -This package contains architecture independent files needed for KMyMoney to -run properly. It also provides KMyMoney documentation. Therefore, unless you -have '%{name}' package installed, you will hardly find this package useful. - - -%package devel -Summary: KMyMoney development files -Group: Development/Libraries -Requires: %{name} == %{version} - -%description devel -This package contains development files needed for KMyMoney plugins. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%patch1 -p1 -b .ftbfs -%patch2 -p1 -b .automake113 -%if 0%{?mgaversion} || 0%{?mdkversion} -%patch5 -p1 -b .qtpluginsdir -%endif - -%__install -m644 %{SOURCE1} kmymoney2/widgets/ - -%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR QTINC QTLIB -. /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" -export KDEDIR="%{tde_prefix}" - -# Required to find the QT3 plugins directory -%if 0%{?mgaversion} || 0%{?mdkversion} -export QTPLUGINS="%{_libdir}/qt3/plugins" -%endif - -# Fix strange FTBFS on RHEL4 -%if 0%{?rhel} == 4 -grep -v "^#~" po/it.po >/tmp/it.po && mv -f /tmp/it.po po/it.po -%endif - -# Warning: --enable-final causes FTBFS -%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-new-ldflags \ - --disable-final \ - --enable-closure \ - --enable-rpath \ - \ - --disable-pdf-docs \ - --enable-ofxplugin \ - --enable-ofxbanking \ - --enable-qtdesigner \ - --enable-sqlite3 - -# Fix FTBFS inside sqlite3 archive -patch -p1 < %{PATCH4} - -%__make %{?_smp_mflags} || %__make - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} - -# Required to find the QT3 plugins directory -%if 0%{?mgaversion} || 0%{?mdkversion} -export QTPLUGINS=%{_libdir}/qt3/plugins -%endif - -%__make install DESTDIR=%{buildroot} - -%find_lang kmymoney2 - - -%clean -%__rm -rf %{buildroot} - - -%post -update-desktop-database %{tde_appdir} > /dev/null -/sbin/ldconfig -for f in hicolor locolor Tango oxygen; do - touch --no-create %{tde_datadir}/icons/${f} || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : -done - -%postun -update-desktop-database %{tde_appdir} > /dev/null -/sbin/ldconfig -for f in hicolor locolor Tango oxygen; do - touch --no-create %{tde_datadir}/icons/${f} || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : -done - - -%files -%defattr(-,root,root,-) -%{tde_bindir}/kmymoney -%{tde_bindir}/kmymoney2 -%{tde_tdeappdir}/kmymoney2.desktop -%{tde_datadir}/mimelnk/application/x-kmymoney2.desktop -%{tde_datadir}/servicetypes/kmymoneyimporterplugin.desktop -%{tde_datadir}/servicetypes/kmymoneyplugin.desktop -%{tde_libdir}/*.so.* -%{tde_tdelibdir}/kmm_ofximport.la -%{tde_tdelibdir}/kmm_ofximport.so - -%files common -f kmymoney2.lang -%defattr(-,root,root,-) -%{tde_datadir}/apps/kmymoney2/html/ -%{tde_datadir}/apps/kmymoney2/icons/*/*/*/*.png -%{tde_datadir}/apps/kmymoney2/kmymoney2ui.rc -%{tde_datadir}/apps/kmymoney2/misc/financequote.pl -%{tde_datadir}/apps/kmymoney2/pics/*.png -%{tde_datadir}/apps/kmymoney2/templates/*/*.kmt -%{tde_datadir}/apps/kmymoney2/tips -%{tde_datadir}/config.kcfg/kmymoney2.kcfg -%{tde_datadir}/icons/hicolor/*/*/*.png -%{tde_datadir}/icons/Tango/*/*/*.png -%{tde_datadir}/icons/Tango/scalable/*.svgz -%{tde_datadir}/icons/locolor/*/*/*.png -%{tde_datadir}/icons/oxygen/*/*/*.png -%{tde_datadir}/icons/oxygen/scalable/*.svgz -%{tde_tdedocdir}/HTML/en/kmymoney2/ -%{tde_mandir}/man1/kmymoney2.* -%{tde_datadir}/apps/kmm_ofximport/kmm_ofximport.rc -%{tde_datadir}/services/kmm_ofximport.desktop - - -%files devel -%defattr(-,root,root,-) -%{tde_tdeincludedir}/kmymoney/*.h -%{tde_libdir}/libkmm_kdchart.la -%{tde_libdir}/libkmm_mymoney.la -%{tde_libdir}/libkmm_plugin.la -%{tde_libdir}/*.so -%{qt3pluginsdir}/sqldrivers/libsqlite3*.so -%{qt3pluginsdir}/designer/libkmymoney.so - -%changelog diff --git a/redhat/applications/kmymoney/kmymoney-14.0.0.spec b/redhat/applications/kmymoney/kmymoney.spec index 7ad17a36b..bbe79ffb4 100644 --- a/redhat/applications/kmymoney/kmymoney-14.0.0.spec +++ b/redhat/applications/kmymoney/kmymoney.spec @@ -1,4 +1,4 @@ -%if 0%{?fedora} >= 23 +%if 0%{?fedora} >= 23 || 0%{?rhel} >= 8 %define _configure_libtool_hardening_hack 0 %endif @@ -22,7 +22,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg kmymoney %define tde_prefix /opt/trinity @@ -181,7 +181,7 @@ This package contains development files needed for KMyMoney plugins. %{tde_libdir}/libkmm_mymoney.la %{tde_libdir}/libkmm_plugin.la %{tde_libdir}/*.so -%{_libdir}/tqt3/plugins/designer/libkmymoney.so +#{_libdir}/tqt3/plugins/designer/libkmymoney.so ########## @@ -207,7 +207,7 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" -%if 0%{?fedora} >= 29 +%if 0%{?fedora} >= 29 || 0%{?rhel} >= 8 LDFLAGS="-Wl,--allow-shlib-undefined" %endif diff --git a/redhat/applications/knemo/knemo-3.5.13.2.spec b/redhat/applications/knemo/knemo-3.5.13.2.spec deleted file mode 100644 index efdd7ccfc..000000000 --- a/redhat/applications/knemo/knemo-3.5.13.2.spec +++ /dev/null @@ -1,136 +0,0 @@ -# Default version for this component -%define tde_pkg knemo -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: network interfaces monitor for the Trinity systray -Version: 0.4.8 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://beta.smileaf.org/projects - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: gettext - -%if 0%{?fedora} >= 18 -BuildRequires: net-tools -%endif - - -%description -KNemo displays an icon in the systray for every network interface. -Tooltips and an info dialog provide further information about the -interface. Passive popups inform about interface changes. -A traffic plotter is also integrated. - -knemo polls the network interface status every second using the -ifconfig, route and iwconfig tools. - -Homepage: http://extragear.kde.org/apps/knemo/ - - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%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/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ - --includedir=%{tde_tdeincludedir} \ - \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -%clean -%__rm -rf %{buildroot} - - -%post -update-desktop-database %{tde_appdir} > /dev/null -touch --no-create %{tde_datadir}/icons/crystalsvg || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || : - -%postun -update-desktop-database %{tde_appdir} > /dev/null -touch --no-create %{tde_datadir}/icons/crystalsvg || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || : - - -%files -%defattr(-,root,root,-) -%{tde_tdelibdir}/kcm_knemo.la -%{tde_tdelibdir}/kcm_knemo.so -%{tde_tdelibdir}/kded_knemod.la -%{tde_tdelibdir}/kded_knemod.so -%{tde_tdeappdir}/kcm_knemo.desktop -%{tde_datadir}/apps/knemo/eventsrc -%{tde_datadir}/icons/crystalsvg/*/*/*.png -%{tde_datadir}/locale/*/LC_MESSAGES/knemod.mo -%{tde_datadir}/locale/*/LC_MESSAGES/kcm_knemo.mo -%{tde_datadir}/services/kded/knemod.desktop - - -%changelog diff --git a/redhat/applications/knemo/knemo-14.0.0.spec b/redhat/applications/knemo/knemo.spec index 8ccd55fda..793129a92 100644 --- a/redhat/applications/knemo/knemo-14.0.0.spec +++ b/redhat/applications/knemo/knemo.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg knemo %define tde_prefix /opt/trinity @@ -61,7 +61,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils -BuildRequires: autoconf automake libtool m4 +BuildRequires: cmake >= 2.8 BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: libtool @@ -88,6 +88,29 @@ BuildRequires: net-tools-deprecated Requires: net-tools-deprecated %endif +# ACL support +BuildRequires: libacl-devel + +# IDN support +BuildRequires: libidn-devel + +# OPENSSL support +BuildRequires: openssl-devel + +# 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 + %description KNemo displays an icon in the systray for every network interface. @@ -111,40 +134,45 @@ Homepage: http://extragear.kde.org/apps/knemo/ %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/"*"/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} \ - --mandir=%{tde_mandir} \ - --includedir=%{tde_tdeincludedir} \ +export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" + +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 \ + \ + -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \ + -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \ + -DLIB_INSTALL_DIR="%{tde_libdir}" \ + \ + -DWITH_ALL_OPTIONS=ON \ + -DWITH_GCC_VISIBILITY=ON \ \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath \ - --disable-gcc-hidden-visibility + -DBUILD_ALL=ON \ + -DBUILD_DOC=ON \ + -DBUILD_TRANSLATIONS=ON \ + .. -%__make %{?_smp_mflags} +%__make %{?_smp_mflags} || %__make %install export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} +%__make install DESTDIR=%{buildroot} -C build %clean diff --git a/redhat/applications/knetload/knetload-3.5.13.2.spec b/redhat/applications/knetload/knetload-3.5.13.2.spec deleted file mode 100644 index f61799be5..000000000 --- a/redhat/applications/knetload/knetload-3.5.13.2.spec +++ /dev/null @@ -1,132 +0,0 @@ -# Default version for this component -%define tde_pkg knetload -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: a network meter for Kicker [Trinity] -Version: 2.3 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: gettext - - -%description -KNetLoad is a small network meter for Kicker (the TDE panel). It shows -a recent history of network usage in the form of two configurable -diagrams in the system tray, one for incoming and one for outgoing -data. These diagrams have settings for colours and various different -styles. - -KNetLoad can monitor just about any network device. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%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/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" - -%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-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath - -# SMP safe ! -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -%find_lang %{tde_pkg} - - - -%clean -%__rm -rf %{buildroot} - - -%post -update-desktop-database %{tde_appdir} > /dev/null -for f in crystalsvg locolor ; do - touch --no-create %{tde_datadir}/icons/${f} || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : -done - -%postun -update-desktop-database %{tde_appdir} > /dev/null -for f in crystalsvg locolor ; do - touch --no-create %{tde_datadir}/icons/${f} || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : -done - - -%files -f %{tde_pkg}.lang -%defattr(-,root,root,-) -%{tde_bindir}/knetload -%{tde_tdeappdir}/knetload.desktop -%{tde_datadir}/apps/knetload -%{tde_datadir}/icons/crystalsvg/*/apps/knetload.png -%{tde_datadir}/icons/locolor/*/apps/knetload.png - - -%changelog diff --git a/redhat/applications/knetload/knetload.spec b/redhat/applications/knetload/knetload.spec index 13e71be7f..b4830fbf0 100644 --- a/redhat/applications/knetload/knetload.spec +++ b/redhat/applications/knetload/knetload.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg knetload %define tde_prefix /opt/trinity diff --git a/redhat/applications/knetstats/knetstats-3.5.13.2.spec b/redhat/applications/knetstats/knetstats-3.5.13.2.spec deleted file mode 100644 index d38b4db5c..000000000 --- a/redhat/applications/knetstats/knetstats-3.5.13.2.spec +++ /dev/null @@ -1,123 +0,0 @@ -# Default version for this component -%define tde_pkg knetstats -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: network interfaces monitor for the Trinity systray -Version: 1.6.1 -Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: gettext - - -%description -A simple TDE network monitor that show rx/tx LEDs of any -network interface on a system tray icon - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%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/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" - -%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-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath - -# SMP safe ! -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -%find_lang %{tde_pkg} - - - -%clean -%__rm -rf %{buildroot} - - -%post -update-desktop-database %{tde_appdir} > /dev/null -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : - -%postun -update-desktop-database %{tde_appdir} > /dev/null -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : - - -%files -f %{tde_pkg}.lang -%defattr(-,root,root,-) -%{tde_bindir}/knetstats -%{tde_tdeappdir}/knetstats.desktop -%{tde_datadir}/apps/knetstats -%{tde_tdedocdir}/HTML/en/knetstats/ -%{tde_datadir}/icons/hicolor/*/apps/knetstats.png - - -%changelog diff --git a/redhat/applications/knetstats/knetstats.spec b/redhat/applications/knetstats/knetstats.spec index d519f2224..d94faebc6 100644 --- a/redhat/applications/knetstats/knetstats.spec +++ b/redhat/applications/knetstats/knetstats.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg knetstats %define tde_prefix /opt/trinity diff --git a/redhat/applications/knetworkmanager8/knetworkmanager-3.5.13-missing_includes.patch b/redhat/applications/knetworkmanager8/knetworkmanager-3.5.13-missing_includes.patch deleted file mode 100644 index 175d299e7..000000000 --- a/redhat/applications/knetworkmanager8/knetworkmanager-3.5.13-missing_includes.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- knetworkmanager8/knetworkmanager-0.8/src/CMakeLists.txt.ORI 2011-11-11 15:06:49.854247242 -0500 -+++ knetworkmanager8/knetworkmanager-0.8/src/CMakeLists.txt 2011-11-11 15:06:58.662060747 -0500 -@@ -18,6 +18,7 @@ - ${CMAKE_BINARY_DIR} - ${TDE_INCLUDE_DIR} - ${TQT_INCLUDE_DIRS} -+ ${DBUS_INCLUDE_DIRS} - ${DBUS_TQT_INCLUDE_DIRS} - ${NM_UTIL_INCLUDE_DIRS} - ) diff --git a/redhat/applications/knetworkmanager8/knetworkmanager-3.5.13-subdir_version.patch b/redhat/applications/knetworkmanager8/knetworkmanager-3.5.13-subdir_version.patch deleted file mode 100644 index 9db3ab5de..000000000 --- a/redhat/applications/knetworkmanager8/knetworkmanager-3.5.13-subdir_version.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- knetworkmanager9/CMakeLists.txt.ORI 2011-11-11 13:36:01.462536187 -0500 -+++ knetworkmanager9/CMakeLists.txt 2011-11-11 13:36:10.762446937 -0500 -@@ -63,7 +63,7 @@ - - ##### source directories ######################## - --add_subdirectory( knetworkmanager-0.8 ) -+add_subdirectory( knetworkmanager-0.9 ) - - - ##### write configure files ##################### ---- knetworkmanager9/knetworkmanager-0.9/src/dbus/CMakeLists.txt.ORI 2011-11-11 13:39:32.866229477 -0500 -+++ knetworkmanager9/knetworkmanager-0.9/src/dbus/CMakeLists.txt 2011-11-11 13:39:48.169042904 -0500 -@@ -18,7 +18,7 @@ - - ##### knm_dbus (static) ######################### - --set( INTROSPECTIONPATH "${CMAKE_SOURCE_DIR}/knetworkmanager-0.8/introspection" ) -+set( INTROSPECTIONPATH "${CMAKE_SOURCE_DIR}/knetworkmanager-0.9/introspection" ) - - # options: - # p - generate proxy files diff --git a/redhat/applications/knetworkmanager8/knetworkmanager8-3.5.13.2.spec b/redhat/applications/knetworkmanager8/knetworkmanager8-3.5.13.2.spec deleted file mode 100644 index 0ada2aed4..000000000 --- a/redhat/applications/knetworkmanager8/knetworkmanager8-3.5.13.2.spec +++ /dev/null @@ -1,179 +0,0 @@ -# Default version for this component -%define tde_pkg knetworkmanager8 -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_tdedocdir} - - -Name: trinity-%{tde_pkg} -Version: 0.8 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} - -Summary: Trinity applet for Network Manager - -Group: Applications/Internet -License: GPLv2+ -URL: http://en.opensuse.org/Projects/KNetworkManager - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -Patch0: knetworkmanager-3.5.13-missing_includes.patch - -# For knetworkmanager 0.9 only ! -Patch10: knetworkmanager-3.5.13-subdir_version.patch - -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildRequires: desktop-file-utils - -# NETWORKMANAGER support -%if 0%{?rhel} || 0%{?fedora} -Requires: NetworkManager-gnome -%endif -%if 0%{?mdkversion} || 0%{?mgaversion} -Requires: networkmanager -%endif -%if 0%{?rhel} || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} -BuildRequires: NetworkManager-glib-devel -%endif -%if 0%{?suse_version} -BuildRequires: NetworkManager-devel -Requires: NetworkManager -%endif - -BuildRequires: trinity-dbus-1-tqt-devel >= 1:0.9 -BuildRequires: trinity-dbus-tqt-devel >= 1:0.63 - -Obsoletes: trinity-knetworkmanager < %{version}-%{release} -Provides: trinity-knetworkmanager = %{version}-%{release} - -%description -KNetworkManager is a system tray applet for controlling network -connections on systems that use the NetworkManager daemon. - - -%package devel -Summary: Common data shared among the MySQL GUI Suites -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} - -Obsoletes: trinity-knetworkmanager-devel < %{version}-%{release} -Provides: trinity-knetworkmanager-devel = %{version}-%{release} - -%description devel -Development headers for knetworkmanager - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} - -%if "%{?version}" == "0.9" -%patch10 -p1 -%endif - -cd knetworkmanager-0.*/src -%patch0 -p3 - - - -%build -unset QTDIR || : ; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" - -# Missing TDE macros -%__mkdir_p cmake -%__ln_s %{tde_datadir}/cmake cmake/modules - -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 \ - \ - -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \ - -DBIN_INSTALL_DIR=%{tde_bindir} \ - -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \ - -DLIB_INSTALL_DIR=%{tde_libdir} \ - -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ - .. - -%__make %{?_smp_mflags} - -%install -%__rm -rf $RPM_BUILD_ROOT -%__make install DESTDIR=%{?buildroot} -C build - - -%clean -%__rm -rf $RPM_BUILD_ROOT - - -%post -update-desktop-database %{tde_appdir} > /dev/null -/sbin/ldconfig -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : - - -%postun -update-desktop-database %{tde_appdir} > /dev/null -/sbin/ldconfig -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : - - -%post devel -/sbin/ldconfig - - -%postun devel -/sbin/ldconfig - - -%files -%defattr(-,root,root,-) -%{tde_bindir}/knetworkmanager -%{tde_libdir}/*.la -%{tde_libdir}/*.so -%{_sysconfdir}/dbus-1/system.d/knetworkmanager.conf -%{tde_tdeappdir}/knetworkmanager.desktop -%{tde_datadir}/apps/knetworkmanager -%{tde_datadir}/icons/hicolor/*/apps/knetworkmanager* -%{tde_datadir}/servicetypes/knetworkmanager_plugin.desktop -%{tde_datadir}/servicetypes/knetworkmanager_vpnplugin.desktop - - -%files devel -%defattr(-,root,root,-) -%{tde_tdeincludedir}/*.h -%{tde_tdelibdir}/*.la -%{tde_tdelibdir}/*.so - -%changelog diff --git a/redhat/applications/knetworkmanager8/knetworkmanager8-14.0.0.spec b/redhat/applications/knetworkmanager8/knetworkmanager8.spec index f1434e905..334a82076 100644 --- a/redhat/applications/knetworkmanager8/knetworkmanager8-14.0.0.spec +++ b/redhat/applications/knetworkmanager8/knetworkmanager8.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg knetworkmanager %define tde_prefix /opt/trinity diff --git a/redhat/applications/knights/knights-3.5.13.2.spec b/redhat/applications/knights/knights-3.5.13.2.spec deleted file mode 100644 index 523111ac8..000000000 --- a/redhat/applications/knights/knights-3.5.13.2.spec +++ /dev/null @@ -1,132 +0,0 @@ -# Default version for this component -%define tde_pkg knights -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: A chess interface for the K Desktop Environment [Trinity] -Version: 0.6 -Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Amusements/Games - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: gettext - -Requires: gnuchess - -%description -Knights aims to be the ultimate chess resource on your computer. -Written for the K Desktop Environment, it's designed to be both friendly -to new chess players and functional for Grand Masters. - -Here's a quick list of Knights' key features: -* Play against yourself, against computer opponents, - or against others over the Internet. -* Customize your board and pieces with over 30 different themes, - or make your own! -* Audio cues help alert you to important events. -* Novice players can preview potential moves. -* Save your unfinished matches and play them again later. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%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/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" - -# Warning: --enable-final causes FTBFS -%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-new-ldflags \ - --disable-final \ - --enable-closure \ - --enable-rpath - -%__make %{?_smp_mflags} - - -%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 || : - -%postun -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : - - -%files -f %{tde_pkg}.lang -%defattr(-,root,root,-) -%{tde_bindir}/knights -%{tde_datadir}/applnk/Games/Board/knights.desktop -%{tde_datadir}/apps/knights -%{tde_tdedocdir}/HTML/*/knights -%{tde_datadir}/icons/hicolor/*/*/*.png -%{tde_datadir}/mimelnk/application/pgn.desktop - - -%changelog diff --git a/redhat/applications/knights/knights.spec b/redhat/applications/knights/knights.spec index eb75677b9..9684594d8 100644 --- a/redhat/applications/knights/knights.spec +++ b/redhat/applications/knights/knights.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg knights %define tde_prefix /opt/trinity @@ -157,6 +157,18 @@ export PATH="%{tde_bindir}:${PATH}" %find_lang %{tde_pkg} +# Fix desktop icon location +if [ -d "%{?buildroot}%{tde_datadir}/applnk" ]; then + %__mkdir_p "%{?buildroot}%{tde_tdeappdir}" + %__mv -f "%{?buildroot}%{tde_datadir}/applnk/Games/Board/knights.desktop" "%{?buildroot}%{tde_tdeappdir}" + %__rm -r "%{buildroot}%{tde_datadir}/applnk" +fi + +# Updates applications categories for openSUSE +%if 0%{?suse_version} +%suse_update_desktop_file -r "%{buildroot}%{tde_tdeappdir}/knights.desktop" Game BoardGame +%endif + %clean %__rm -rf %{buildroot} @@ -165,7 +177,7 @@ export PATH="%{tde_bindir}:${PATH}" %files -f %{tde_pkg}.lang %defattr(-,root,root,-) %{tde_bindir}/knights -%{tde_datadir}/applnk/Games/Board/knights.desktop +%{tde_tdeappdir}/knights.desktop %{tde_datadir}/apps/knights %{tde_tdedocdir}/HTML/*/knights %{tde_datadir}/icons/hicolor/*/*/*.png diff --git a/redhat/applications/knmap/knmap.spec b/redhat/applications/knmap/knmap.spec index 76ac8c8c7..eb52e123d 100644 --- a/redhat/applications/knmap/knmap.spec +++ b/redhat/applications/knmap/knmap.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg knmap %define tde_prefix /opt/trinity @@ -156,10 +156,14 @@ fi %__rm -rf $RPM_BUILD_ROOT %__make install DESTDIR=$RPM_BUILD_ROOT -C build +%find_lang %{tde_pkg} + # Move desktop icon to XDG directory -%__mkdir_p %{buildroot}%{tde_tdeappdir} -%__mv "%{buildroot}%{tde_datadir}/applnk/"*"/%{tde_pkg}.desktop" "%{buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" -%__rm -r "%{buildroot}%{tde_datadir}/applnk" +if [ -d "%{buildroot}%{tde_datadir}/applnk" ]; then + %__mkdir_p %{buildroot}%{tde_tdeappdir} + %__mv "%{buildroot}%{tde_datadir}/applnk/"*"/%{tde_pkg}.desktop" "%{buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" + %__rm -r "%{buildroot}%{tde_datadir}/applnk" +fi # Updates applications categories for openSUSE %if 0%{?suse_version} @@ -171,7 +175,7 @@ fi %__rm -rf $RPM_BUILD_ROOT -%files +%files -f %{tde_pkg}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING README ChangeLog %{tde_bindir}/knmap diff --git a/redhat/applications/knowit/knowit-3.5.13.2.spec b/redhat/applications/knowit/knowit-3.5.13.2.spec deleted file mode 100644 index 00791f091..000000000 --- a/redhat/applications/knowit/knowit-3.5.13.2.spec +++ /dev/null @@ -1,135 +0,0 @@ -# Default version for this component -%define tde_pkg knowit -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: Tool for managing notes [Trinity] -Version: 0.10 -Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: gettext - - -%description -KnowIt is a tool for managing notes which are organized in -tree-like hierarchy. It is similar to TuxCards, -but TDE-based, and requires Trinity. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%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/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" - -# Warning: --enable-final causes FTBFS -%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-new-ldflags \ - --disable-final \ - --enable-closure \ - --enable-rpath - -# SMP safe ! -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -%__mkdir_p %{buildroot}%{tde_tdeappdir} -%__mv %{buildroot}%{tde_datadir}/applnk/Applications/knowit.desktop %{buildroot}%{tde_tdeappdir}/knowit.desktop -%__rm -r %{buildroot}%{tde_datadir}/applnk - - -%find_lang %{tde_pkg} - - - -%clean -%__rm -rf %{buildroot} - - -%post -update-desktop-database %{tde_appdir} > /dev/null -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : - -%postun -update-desktop-database %{tde_appdir} > /dev/null -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : - - -%files -f %{tde_pkg}.lang -%defattr(-,root,root,-) -%{tde_bindir}/knowit -%{tde_tdeappdir}/knowit.desktop -%{tde_datadir}/apps/knowit/knowitui.rc -%{tde_datadir}/apps/knowit/tips -%{tde_tdedocdir}/HTML/en/knowit/common -%{tde_tdedocdir}/HTML/en/knowit/index.cache.bz2 -%{tde_tdedocdir}/HTML/en/knowit/index.docbook -%{tde_tdedocdir}/HTML/en/knowit/screenshot.png -%{tde_datadir}/icons/hicolor/*/apps/knowit.png - - -%changelog diff --git a/redhat/applications/knowit/knowit.spec b/redhat/applications/knowit/knowit.spec index 67cac8595..0c04143fc 100644 --- a/redhat/applications/knowit/knowit.spec +++ b/redhat/applications/knowit/knowit.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg knowit %define tde_prefix /opt/trinity diff --git a/redhat/applications/knutclient/knutclient-3.5.13.2.spec b/redhat/applications/knutclient/knutclient-3.5.13.2.spec deleted file mode 100644 index 016bb891e..000000000 --- a/redhat/applications/knutclient/knutclient-3.5.13.2.spec +++ /dev/null @@ -1,126 +0,0 @@ -# Default version for this component -%define tde_pkg knutclient -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: A TDE GUI that displays UPS statistics from NUT's upsd [Trinity] -Version: 0.9.5 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.knut.noveradsl.cz/knutclient/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - - -%description -KNutClient monitors UPS statistics through the NUT (Network UPS Tools, -http://www.networkupstools.org/) framework on Linux and other systems. This -information, presented in a nice visual format, can be invaluable on -stations using an UPS. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%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/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" - -%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-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -%find_lang %{tde_pkg} - -%clean -%__rm -rf %{buildroot} - - -%post -for f in hicolor locolor; do - touch --no-create %{tde_datadir}/icons/${f} || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : -done - -%postun -for f in hicolor locolor; do - touch --no-create %{tde_datadir}/icons/${f} || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : -done - - -%files -f %{tde_pkg}.lang -%defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING NEWS README TODO -%{tde_bindir}/knutclient -%{tde_datadir}/applnk/Utilities/knutclient.desktop -%{tde_datadir}/apps/knutclient/knutclientui.rc -%{tde_datadir}/apps/knutclient -%{tde_tdedocdir}/HTML/cs/knutclient -%{tde_tdedocdir}/HTML/en/knutclient -%{tde_datadir}/icons/hicolor/*/apps/*.png -%{tde_datadir}/icons/locolor/*/apps/*.png - -%changelog diff --git a/redhat/applications/knutclient/knutclient.spec b/redhat/applications/knutclient/knutclient.spec index 2c729fb71..588addd4e 100644 --- a/redhat/applications/knutclient/knutclient.spec +++ b/redhat/applications/knutclient/knutclient.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg knutclient %define tde_prefix /opt/trinity @@ -106,7 +106,7 @@ stations using an UPS. %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} # Fix permissions -chmod 644 AUTHORS README TODO COPYING ChangeLog +chmod 644 AUTHORS README COPYING ChangeLog %build @@ -150,6 +150,13 @@ export PATH="%{tde_bindir}:${PATH}" %find_lang %{tde_pkg} +# Move desktop icon to XDG directory +if [ -d "%{buildroot}%{tde_datadir}/applnk" ]; then + %__mkdir_p %{buildroot}%{tde_tdeappdir} + %__mv "%{buildroot}%{tde_datadir}/applnk/Utilities/knutclient.desktop" "%{buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" + %__rm -r "%{buildroot}%{tde_datadir}/applnk" +fi + # Links duplicate files %fdupes "%{?buildroot}%{tde_datadir}" @@ -162,7 +169,7 @@ export PATH="%{tde_bindir}:${PATH}" %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING README %{tde_bindir}/knutclient -%{tde_datadir}/applnk/Utilities/knutclient.desktop +%{tde_tdeappdir}/knutclient.desktop %{tde_datadir}/apps/knutclient/knutclientui.rc %{tde_datadir}/apps/knutclient %{tde_tdedocdir}/HTML/cs/knutclient diff --git a/redhat/applications/koffice-i18n/koffice-i18n-3.5.13.2.spec b/redhat/applications/koffice-i18n/koffice-i18n-3.5.13.2.spec deleted file mode 100644 index 88a4619fb..000000000 --- a/redhat/applications/koffice-i18n/koffice-i18n-3.5.13.2.spec +++ /dev/null @@ -1,1045 +0,0 @@ -# Default version for this component -%define tde_pkg koffice-i18n -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - -# Builds all supported languages (not unsupported ones) -%if "%{?TDE_LANGS}" == "" -%define TDE_LANGS bg ca cs da de el en_GB es et fi fr hu it ja km lv ms nb nds ne nl pl pt pt_BR ru sk sl sr sv tr uk zh_CN zh_TW -%endif - - -Name: trinity-%{tde_pkg} -Summary: Internationalization support for Koffice [Trinity] -Version: 1.6.3 -Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist} - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -# GFDL, with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. -License: GFDL -Group: User Interface/Desktops -BuildArch: noarch - -# Speed build options -%define debug_package %{nil} -%define __spec_install_post %{nil} -AutoReq: no - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: findutils -BuildRequires: gettext -BuildRequires: autoconf automake libtool m4 - -%description -%{summary}. - -%package Bulgarian -Summary: Bulgarian(bg) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-bg = %{version}-%{release} -%description Bulgarian -%{summary}. - -%package Bengali -Summary: Bengali(bn) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-bn = %{version}-%{release} -%description Bengali -%{summary}. - -%package Tibetan -Summary: Tibetan(bo) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-bo = %{version}-%{release} -%description Tibetan -%{summary}. - -%package Breton -Summary: Breton(br) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-br = %{version}-%{release} -%description Breton -%{summary}. - -%package Bosnian -Summary: Bosnian(bs) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-bs = %{version}-%{release} -%description Bosnian -%{summary}. - -%package Catalan -Summary: Catalan(ca) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-ca = %{version}-%{release} -%description Catalan -%{summary}. - -%package Czech -Summary: Czech(cs) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-cs = %{version}-%{release} -%description Czech -%{summary}. - -%package Cymraeg -Summary: Cymraeg language support for Koffice [Trinity] -Group: User Interface/Desktops -%description Cymraeg -%{summary}. - -%package Welsh -Summary: Welsh(cy) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-cy = %{version}-%{release} -%description Welsh -%{summary}. - -%package Danish -Summary: Danish(da) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-da = %{version}-%{release} -%description Danish -%{summary}. - -%package German -Summary: German(de) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-de = %{version}-%{release} -%description German -%{summary}. - -%package Greek -Summary: Greek(el) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-el = %{version}-%{release} -%description Greek -%{summary}. - -%package British -Summary: British(en_GB) English support for TDE -Group: User Interface/Desktops -Provides: %{name}-en_GB = %{version}-%{release} -%description British -%{summary}. - -%package Esperanto -Summary: Esperanto(eo) support for TDE -Group: User Interface/Desktops -Provides: %{name}-eo = %{version}-%{release} -%description Esperanto -%{summary}. - -%package Spanish -Summary: Spanish(es) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-es = %{version}-%{release} -%description Spanish -%{summary}. - -%package Estonian -Summary: Estonian(et) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-et = %{version}-%{release} -%description Estonian -%{summary}. - -%package Basque -Summary: Basque(eu) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-eu = %{version}-%{release} -%description Basque -%{summary}. - -%package Finnish -Summary: Finnish(fi) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-fi = %{version}-%{release} -%description Finnish -%{summary}. - -%package Faroese -Summary: Faroese(fo) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-fo = %{version}-%{release} -%description Faroese -%{summary}. - -%package French -Summary: French(fr) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-fr = %{version}-%{release} -%description French -%{summary}. - -%package Frisian -Summary: Frisian(fy) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-fy = %{version}-%{release} -%description Frisian -%{summary}. - -%package Irish -Summary: Irish(ga) language support for Koffice [Trinity] -Group: User Interface/Desktops -Obsoletes: kde-i18n-Gaeilge < %{version} -Provides: %{name}-ga = %{version}-%{release} -%description Irish -%{summary}. - -%package Galician -Summary: Galician(gl) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-gl = %{version}-%{release} -%description Galician -%{summary}. - -%package Hebrew -Summary: Hebrew(he) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-he = %{version}-%{release} -%description Hebrew -%{summary}. - -%package Hindi -Summary: Hindi(hi) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-hi = %{version}-%{release} -%description Hindi -%{summary}. - -%package Croatian -Summary: Croatian(hr) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-hr = %{version}-%{release} -%description Croatian -%{summary}. - -%package Hungarian -Summary: Hungarian(hu) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-hu = %{version}-%{release} -%description Hungarian -%{summary}. - -%package Indonesian -Summary: Indonesian(id) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-id = %{version}-%{release} -%description Indonesian -%{summary}. - -%package Icelandic -Summary: Icelandic(is) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-is = %{version}-%{release} -%description Icelandic -%{summary}. - -%package Italian -Summary: Italian(it) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-it = %{version}-%{release} -%description Italian -%{summary}. - -%package Japanese -Summary: Japanese(ja) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-ja = %{version}-%{release} -%description Japanese -%{summary}. - -%package Khmer -Summary: Khmer(km) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-km = %{version}-%{release} -%description Khmer -%{summary}. - -%package Korean -Summary: Korean(ko) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-ko = %{version}-%{release} -%description Korean -%{summary}. - -%package Kurdish -Summary: Kurdish(ku) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-ku = %{version}-%{release} -%description Kurdish -%{summary}. - -%package Lao -Summary: Lao(lo) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-lo = %{version}-%{release} -%description Lao -%{summary}. - -%package Lithuanian -Summary: Lithuanian(lt) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-lt = %{version}-%{release} -%description Lithuanian -%{summary}. - -%package Latvian -Summary: Latvian(lv) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-lv = %{version}-%{release} -%description Latvian -%{summary}. - -%package Maori -Summary: Maori(mi) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-mi = %{version}-%{release} -%description Maori -%{summary}. - -%package Macedonian -Summary: Macedonian(mk) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-mk = %{version}-%{release} -%description Macedonian -%{summary}. - -%package Malay -Summary: Malay(ms) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-ms = %{version}-%{release} -%description Malay -%{summary}. - -%package Maltese -Summary: Maltese(mt) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-mt = %{version}-%{release} -%description Maltese -%{summary}. - -%package LowSaxon -Summary: Low Saxon (nds) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-nds = %{version}-%{release} -%description LowSaxon -%{summary}. - -%package Nepali -Summary: Nepali(ne) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-ne = %{version}-%{release} -%description Nepali -%{summary}. - -%package Dutch -Summary: Dutch(nl) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-nl = %{version}-%{release} -%description Dutch -%{summary}. - -%package Norwegian -Summary: Norwegian(no) (Bokmaal) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-no = %{version}-%{release} -%description Norwegian -%{summary}. - -%package Norwegian-Nynorsk -Summary: Norwegian(nn) (Nynorsk) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-nn = %{version}-%{release} -%description Norwegian-Nynorsk -%{summary}. - -%package Occitan -Summary: Occitan(oc) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-oc = %{version}-%{release} -%description Occitan -%{summary}. - -%package Polish -Summary: Polish(pl) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-pl = %{version}-%{release} -%description Polish -%{summary}. - -%package Portuguese -Summary: Portuguese(pt) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-pt = %{version}-%{release} -%description Portuguese -%{summary}. - -%package Punjabi -Summary: Punjabi(pa) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-pa = %{version}-%{release} -%description Punjabi -%{summary}. - -%package Brazil -Summary: Brazil(pt_BR) Portuguese language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-pt_BR = %{version}-%{release} -%description Brazil -%{summary}. - -%package Romanian -Summary: Romanian(ro) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-ro = %{version}-%{release} -%description Romanian -%{summary}. - -%package Russian -Summary: Russian(ru) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-ru = %{version}-%{release} -%description Russian -%{summary}. - -%package Slovak -Summary: Slovak(sk) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-sk = %{version}-%{release} -%description Slovak -%{summary}. - -%package Slovenian -Summary: Slovenian(sl) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-sl = %{version}-%{release} -%description Slovenian -%{summary}. - -%package Serbian -Summary: Serbian(sr) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-sr = %{version}-%{release} -%description Serbian -%{summary}. - -%package Swedish -Summary: Swedish(sv) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-sv = %{version}-%{release} -%description Swedish -%{summary}. - -%package Tamil -Summary: Tamil(ta) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-ta = %{version}-%{release} -%description Tamil -%{summary}. - -%package Tajik -Summary: Tajik(tg) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-tg = %{version}-%{release} -%description Tajik -%{summary}. - -%package Thai -Summary: Thai(th) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-th = %{version}-%{release} -%description Thai -%{summary}. - -%package Turkish -Summary: Turkish(tr) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-tr = %{version}-%{release} -%description Turkish -%{summary}. - -%package Ukrainian -Summary: Ukrainian(uk) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-uk = %{version}-%{release} -%description Ukrainian -%{summary}. - -%package Venda -Summary: Venda(ven) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-ven = %{version}-%{release} -%description Venda -%{summary}. - -%package Vietnamese -Summary: Vietnamese(vi) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-vi = %{version}-%{release} -%description Vietnamese -%{summary}. - -%package Walloon -Summary: Walloon(wa) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-wa = %{version}-%{release} -%description Walloon -%{summary}. - -%package Xhosa -Summary: Xhosa(xh) (a Bantu language) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-xh = %{version}-%{release} -%description Xhosa -%{summary}. - -%package Chinese -Summary: Chinese(zh_CN) (Simplified Chinese) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-zh_CN = %{version}-%{release} -%description Chinese -%{summary}. - -%package Chinese-Big5 -Summary: Chinese(zh_TW) (Big5) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-tz_TW = %{version}-%{release} -%description Chinese-Big5 -%{summary}. - - - -%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/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" - - -%build -export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" - -export kde_htmldir="%{tde_tdedocdir}/HTML" - -for l in %{TDE_LANGS}; do - for f in koffice-i18n-${l}/; do - if [ -d "${f}" ]; then - pushd ${f} - %__sed -i "configure.in" -e "s|AM_CONFIG_HEADER|AC_CONFIG_HEADER|" - %__make -f "admin/Makefile.common" - %configure \ - --prefix=%{tde_prefix} \ - --datadir=%{tde_datadir} \ - --docdir=%{tde_tdedocdir} - %__make %{?_smp_mflags} - popd - fi - done -done - -%install -%__rm -rf %{?buildroot} -export PATH="%{tde_bindir}:${PATH}" - -for l in %{TDE_LANGS}; do - for f in koffice-i18n-${l}/; do - if [ -d "${f}" ] && [ -r "${f}/Makefile" ] ; then - %__make install DESTDIR="%{?buildroot}" -C "${f}" - fi - done -done - -# remove zero-length file -find "%{buildroot}%{tde_tdedocdir}/HTML" -size 0 -exec rm -f {} \; - -%clean -%__rm -rf %{buildroot} - -%if "%( grep -w af <<< '%{TDE_LANGS}' )" != "" -%files Afrikaans -%defattr(-,root,root,-) -%{tde_datadir}/locale/af/* -%endif - -%if "%( grep -w ar <<< '%{TDE_LANGS}' )" != "" -%files Arabic -%defattr(-,root,root,-) -%{tde_datadir}/locale/ar/* -%endif - -%if "%( grep -w az <<< '%{TDE_LANGS}' )" != "" -%files Azerbaijani -%defattr(-,root,root,-) -%{tde_datadir}/locale/az/* -%endif - -%if "%( grep -w be <<< '%{TDE_LANGS}' )" != "" -%files Belarusian -%defattr(-,root,root,-) -%{tde_datadir}/locale/be/* -%endif - -%if "%( grep -w bg <<< '%{TDE_LANGS}' )" != "" -%files Bulgarian -%defattr(-,root,root,-) -%{tde_datadir}/locale/bg/* -%endif - -%if "%( grep -w bn <<< '%{TDE_LANGS}' )" != "" -%files Bengali -%defattr(-,root,root,-) -%{tde_datadir}/locale/bn/* -%endif - -%if "%( grep -w bo <<< '%{TDE_LANGS}' )" != "" -%files Tibetan -%defattr(-,root,root,-) -%{tde_datadir}/locale/bo/* -%endif - -%if "%( grep -w br <<< '%{TDE_LANGS}' )" != "" -%files Breton -%defattr(-,root,root,-) -%{tde_datadir}/locale/br/* -%endif - -%if "%( grep -w bs <<< '%{TDE_LANGS}' )" != "" -%files Bosnian -%defattr(-,root,root,-) -%{tde_datadir}/locale/bs/* -%endif - -%if "%( grep -w ca <<< '%{TDE_LANGS}' )" != "" -%files Catalan -%defattr(-,root,root,-) -%{tde_datadir}/locale/ca/* -%{tde_tdedocdir}/HTML/ca/ -%{tde_datadir}/apps/koffice/autocorrect/ca.xml -%endif - -%if "%( grep -w cs <<< '%{TDE_LANGS}' )" != "" -%files Czech -%defattr(-,root,root,-) -%{tde_datadir}/locale/cs/* -%{tde_datadir}/apps/koffice/autocorrect/cs.xml -%endif - -%if "%( grep -w cy <<< '%{TDE_LANGS}' )" != "" -%files Welsh -%defattr(-,root,root,-) -%{tde_datadir}/locale/cy/* -%endif - -%if "%( grep -w da <<< '%{TDE_LANGS}' )" != "" -%files Danish -%defattr(-,root,root,-) -%{tde_datadir}/locale/da/* -%{tde_tdedocdir}/HTML/da/ -%endif - -%if "%( grep -w de <<< '%{TDE_LANGS}' )" != "" -%files German -%defattr(-,root,root,-) -%{tde_datadir}/locale/de/* -%{tde_tdedocdir}/HTML/de/ -%{tde_datadir}/apps/koffice/autocorrect/de.xml -%endif - -%if "%( grep -w el <<< '%{TDE_LANGS}' )" != "" -%files Greek -%defattr(-,root,root,-) -%{tde_datadir}/locale/el/* -%endif - -%if "%( grep -w en_GB <<< '%{TDE_LANGS}' )" != "" -%files British -%defattr(-,root,root,-) -%{tde_datadir}/locale/en_GB/* -%{tde_tdedocdir}/HTML/en_GB/ -%endif - -%if "%( grep -w eo <<< '%{TDE_LANGS}' )" != "" -%files Esperanto -%defattr(-,root,root,-) -%{tde_datadir}/locale/eo/* -%endif - -%if "%( grep -w es <<< '%{TDE_LANGS}' )" != "" -%files Spanish -%defattr(-,root,root,-) -%{tde_datadir}/locale/es/* -%{tde_tdedocdir}/HTML/es/ -%{tde_datadir}/apps/koffice/autocorrect/es.xml -%endif - -%if "%( grep -w et <<< '%{TDE_LANGS}' )" != "" -%files Estonian -%defattr(-,root,root,-) -%{tde_datadir}/locale/et/* -%{tde_tdedocdir}/HTML/et/ -%endif - -%if "%( grep -w eu <<< '%{TDE_LANGS}' )" != "" -%files Basque -%defattr(-,root,root,-) -%{tde_datadir}/locale/eu/* -%endif - -%if "%( grep -w fa <<< '%{TDE_LANGS}' )" != "" -%files Farsi -%defattr(-,root,root,-) -%{tde_datadir}/locale/fa/* -%endif - -%if "%( grep -w fi <<< '%{TDE_LANGS}' )" != "" -%files Finnish -%defattr(-,root,root,-) -%{tde_datadir}/locale/fi/* -%endif - -%if "%( grep -w fo <<< '%{TDE_LANGS}' )" != "" -%files Faroese -%defattr(-,root,root,-) -%{tde_datadir}/locale/fo/* -%endif - -%if "%( grep -w fr <<< '%{TDE_LANGS}' )" != "" -%files French -%defattr(-,root,root,-) -%{tde_datadir}/locale/fr/* -%{tde_tdedocdir}/HTML/fr/ -%{tde_datadir}/apps/koffice/autocorrect/fr.xml -%endif - -%if "%( grep -w fy <<< '%{TDE_LANGS}' )" != "" -%files Frisian -%defattr(-,root,root,-) -%{tde_datadir}/locale/fy/* -%endif - -%if "%( grep -w ga <<< '%{TDE_LANGS}' )" != "" -%files Irish -%defattr(-,root,root,-) -%{tde_datadir}/locale/ga/* -%endif - -%if "%( grep -w gl <<< '%{TDE_LANGS}' )" != "" -%files Galician -%defattr(-,root,root,-) -%{tde_datadir}/locale/gl/* -%endif - -%if "%( grep -w he <<< '%{TDE_LANGS}' )" != "" -%files Hebrew -%defattr(-,root,root,-) -%{tde_datadir}/locale/he/* -%endif - -%if "%( grep -w hi <<< '%{TDE_LANGS}' )" != "" -%files Hindi -%defattr(-,root,root,-) -%{tde_datadir}/locale/hi/* -%endif - -%if "%( grep -w hr <<< '%{TDE_LANGS}' )" != "" -%files Croatian -%defattr(-,root,root,-) -%{tde_datadir}/locale/hr/* -%endif - -%if "%( grep -w hu <<< '%{TDE_LANGS}' )" != "" -%files Hungarian -%defattr(-,root,root,-) -%{tde_datadir}/locale/hu/* -%{tde_datadir}/apps/koffice/autocorrect/hu.xml -%endif - -%if "%( grep -w id <<< '%{TDE_LANGS}' )" != "" -%files Indonesian -%defattr(-,root,root,-) -%{tde_datadir}/locale/id/* -%endif - -%if "%( grep -w is <<< '%{TDE_LANGS}' )" != "" -%files Icelandic -%defattr(-,root,root,-) -%{tde_datadir}/locale/is/* -%endif - -%if "%( grep -w it <<< '%{TDE_LANGS}' )" != "" -%files Italian -%defattr(-,root,root,-) -%{tde_datadir}/locale/it/* -%{tde_tdedocdir}/HTML/it/ -%{tde_datadir}/apps/koffice/autocorrect/it.xml -%endif - -%if "%( grep -w ja <<< '%{TDE_LANGS}' )" != "" -%files Japanese -%defattr(-,root,root,-) -%{tde_datadir}/locale/ja/* -%endif - -%if "%( grep -w km <<< '%{TDE_LANGS}' )" != "" -%files Khmer -%defattr(-,root,root,-) -%{tde_datadir}/locale/km/* -%endif - -%if "%( grep -w ko <<< '%{TDE_LANGS}' )" != "" -%files Korean -%defattr(-,root,root,-) -%{tde_datadir}/locale/ko/* -%endif - -%if "%( grep -w ku <<< '%{TDE_LANGS}' )" != "" -%files Kurdish -%defattr(-,root,root,-) -%{tde_datadir}/locale/ku/* -%endif - -%if "%( grep -w lao <<< '%{TDE_LANGS}' )" != "" -%files Lao -%defattr(-,root,root,-) -%{tde_datadir}/locale/lo/* -%endif - -%if "%( grep -w lt <<< '%{TDE_LANGS}' )" != "" -%files Lithuanian -%defattr(-,root,root,-) -%{tde_datadir}/locale/lt/* -%endif - -%if "%( grep -w lv <<< '%{TDE_LANGS}' )" != "" -%files Latvian -%defattr(-,root,root,-) -%{tde_datadir}/locale/lv/* -%endif - -%if "%( grep -w mi <<< '%{TDE_LANGS}' )" != "" -%files Maori -%defattr(-,root,root,-) -%{tde_datadir}/locale/mi/* -%endif - -%if "%( grep -w mk <<< '%{TDE_LANGS}' )" != "" -%files Macedonian -%defattr(-,root,root,-) -%{tde_datadir}/locale/mk/* -%endif - -%if "%( grep -w ms <<< '%{TDE_LANGS}' )" != "" -%files Malay -%defattr(-,root,root,-) -%{tde_datadir}/locale/ms/* -%endif - -%if "%( grep -w mt <<< '%{TDE_LANGS}' )" != "" -%files Maltese -%defattr(-,root,root,-) -%{tde_datadir}/locale/mt/* -%endif - -%if "%( grep -w nds <<< '%{TDE_LANGS}' )" != "" -%files LowSaxon -%defattr(-,root,root,-) -%{tde_datadir}/locale/nds/* -%endif - -%if "%( grep -w ne <<< '%{TDE_LANGS}' )" != "" -%files Nepali -%defattr(-,root,root,-) -%{tde_datadir}/locale/ne/* -%endif - -%if "%( grep -w nl <<< '%{TDE_LANGS}' )" != "" -%files Dutch -%defattr(-,root,root,-) -%{tde_datadir}/locale/nl/* -%{tde_tdedocdir}/HTML/nl/ -%endif - -%if "%( grep -w nb <<< '%{TDE_LANGS}' )" != "" -%files Norwegian -%defattr(-,root,root,-) -%{tde_datadir}/locale/nb/* -%endif - -%if "%( grep -w nn <<< '%{TDE_LANGS}' )" != "" -%files Norwegian-Nynorsk -%defattr(-,root,root,-) -%{tde_datadir}/locale/nn/* -%endif - -%if "%( grep -w oc <<< '%{TDE_LANGS}' )" != "" -%files Occitan -%defattr(-,root,root,-) -%{tde_datadir}/locale/oc/* -%endif - -%if "%( grep -w pa <<< '%{TDE_LANGS}' )" != "" -%files Punjabi -%defattr(-,root,root,-) -%{tde_datadir}/locale/pa/* -%endif - -%if "%( grep -w pl <<< '%{TDE_LANGS}' )" != "" -%files Polish -%defattr(-,root,root,-) -%{tde_datadir}/locale/pl/* -%endif - -%if "%( grep -w pt <<< '%{TDE_LANGS}' )" != "" -%files Portuguese -%defattr(-,root,root,-) -%{tde_datadir}/locale/pt/* -%{tde_tdedocdir}/HTML/pt/ -%endif - -%if "%( grep -w pt_BR <<< '%{TDE_LANGS}' )" != "" -%files Brazil -%defattr(-,root,root,-) -%{tde_datadir}/locale/pt_BR/* -%{tde_tdedocdir}/HTML/pt_BR/ -%endif - -%if "%( grep -w ro <<< '%{TDE_LANGS}' )" != "" -%files Romanian -%defattr(-,root,root,-) -%{tde_datadir}/locale/ro/* -%endif - -%if "%( grep -w ru <<< '%{TDE_LANGS}' )" != "" -%files Russian -%defattr(-,root,root,-) -%{tde_datadir}/locale/ru/* -%{tde_tdedocdir}/HTML/ru/ -%endif - -%if "%( grep -w sk <<< '%{TDE_LANGS}' )" != "" -%files Slovak -%defattr(-,root,root,-) -%{tde_datadir}/locale/sk/* -%{tde_tdedocdir}/HTML/sk/ -%{tde_datadir}/apps/koffice/autocorrect/sk.xml -%endif - -%if "%( grep -w sl <<< '%{TDE_LANGS}' )" != "" -%files Slovenian -%defattr(-,root,root,-) -%{tde_datadir}/locale/sl/* -%{tde_tdedocdir}/HTML/sl/ -%endif - -%if "%( grep -w sr <<< '%{TDE_LANGS}' )" != "" -%files Serbian -%defattr(-,root,root,-) -%{tde_datadir}/locale/sr/* -%endif - -%if "%( grep -w sv <<< '%{TDE_LANGS}' )" != "" -%files Swedish -%defattr(-,root,root,-) -%{tde_datadir}/locale/sv/* -%{tde_tdedocdir}/HTML/sv/ -%endif - -%if "%( grep -w ta <<< '%{TDE_LANGS}' )" != "" -%files Tamil -%defattr(-,root,root,-) -%{tde_datadir}/locale/ta/* -%endif - -%if "%( grep -w tg <<< '%{TDE_LANGS}' )" != "" -%files Tajik -%defattr(-,root,root,-) -%{tde_datadir}/locale/tg/* -%endif - -%if "%( grep -w th <<< '%{TDE_LANGS}' )" != "" -%files Thai -%defattr(-,root,root,-) -%{tde_datadir}/locale/th/* -%endif - -%if "%( grep -w tr <<< '%{TDE_LANGS}' )" != "" -%files Turkish -%defattr(-,root,root,-) -%{tde_datadir}/locale/tr/* -%endif - -%if "%( grep -w uk <<< '%{TDE_LANGS}' )" != "" -%files Ukrainian -%defattr(-,root,root,-) -%{tde_datadir}/locale/uk/* -%endif - -%if "%( grep -w ven <<< '%{TDE_LANGS}' )" != "" -%files Venda -%defattr(-,root,root,-) -%{tde_datadir}/locale/ven/* -%endif - -%if "%( grep -w vi <<< '%{TDE_LANGS}' )" != "" -%files Vietnamese -%defattr(-,root,root,-) -%{tde_datadir}/locale/vi/* -%endif - -%if "%( grep -w wa <<< '%{TDE_LANGS}' )" != "" -%files Walloon -%defattr(-,root,root,-) -%{tde_datadir}/locale/wa/* -%endif - -%if "%( grep -w xh <<< '%{TDE_LANGS}' )" != "" -%files Xhosa -%defattr(-,root,root,-) -%{tde_datadir}/locale/xh/* -%endif - -%if "%( grep -w zh_CN <<< '%{TDE_LANGS}' )" != "" -%files Chinese -%defattr(-,root,root,-) -%{tde_datadir}/locale/zh_CN/* -%endif - -%if "%( grep -w zh_TW <<< '%{TDE_LANGS}' )" != "" -%files Chinese-Big5 -%defattr(-,root,root,-) -%{tde_datadir}/locale/zh_TW/* -%endif - - -%changelog diff --git a/redhat/applications/koffice-i18n/koffice-i18n-14.0.0.spec b/redhat/applications/koffice-i18n/koffice-i18n.spec index 479a72b5f..5c4f1785a 100644 --- a/redhat/applications/koffice-i18n/koffice-i18n-14.0.0.spec +++ b/redhat/applications/koffice-i18n/koffice-i18n.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg koffice-i18n %define tde_prefix /opt/trinity diff --git a/redhat/applications/koffice/koffice-3.5.13.2.spec b/redhat/applications/koffice/koffice-3.5.13.2.spec deleted file mode 100644 index b620d022d..000000000 --- a/redhat/applications/koffice/koffice-3.5.13.2.spec +++ /dev/null @@ -1,1157 +0,0 @@ -# Default version for this component -%define tde_pkg koffice -%define tde_version 3.5.13.2 - -# Required for Mageia 2: removes the ldflag '--no-undefined' -%define _disable_ld_no_undefined 1 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - -# Disable Kross support for RHEL <= 5 (python is too old) -%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} -%define with_kross 1 -%endif - -# Ruby support -%define with_ruby 1 - -# Ruby 1.9 includes are located in strance directories ... (taken from ruby 1.9 spec file) -%global _normalized_cpu %(echo %{_target_cpu} | sed 's/^ppc/powerpc/;s/i.86/i386/;s/sparcv./sparc/;s/armv.*/arm/') - - -Name: trinity-%{tde_pkg} -Summary: An integrated office suite -Version: 1.6.3 -Release: %{?!preversion:9}%{?preversion:8_%{preversion}}%{?dist} - -Group: Applications/Productivity -License: GPLv2+ - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -# BuildRequires: world-devel ;) -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: trinity-tdegraphics-devel >= %{tde_version} -BuildRequires: trinity-tdegraphics-libpoppler-tqt-devel >= %{tde_version} -BuildRequires: automake libtool -BuildRequires: fontconfig-devel -BuildRequires: libart_lgpl-devel -BuildRequires: libtiff-devel -BuildRequires: libjpeg-devel -BuildRequires: ImageMagick-devel -BuildRequires: zlib-devel -BuildRequires: openssl-devel -BuildRequires: python-devel -BuildRequires: pcre-devel -BuildRequires: gettext-devel -BuildRequires: mysql-devel -BuildRequires: perl -BuildRequires: doxygen -BuildRequires: aspell-devel -BuildRequires: libxslt-devel -BuildRequires: OpenEXR-devel -BuildRequires: libexif-devel -BuildRequires: readline-devel - -%if 0%{?suse_version} -BuildRequires: libbz2-devel -BuildRequires: liblcms-devel -%else -BuildRequires: bzip2-devel -BuildRequires: lcms-devel - -BuildRequires: libpaper-devel -%endif - -# RUBY support -%if 0%{?with_ruby} -BuildRequires: ruby ruby-devel >= 1.8.1 -%endif - -# FREETYPE support -%if 0%{?suse_version} == 1140 -BuildRequires: freetype2-devel -%else -BuildRequires: freetype-devel -%endif - -# LIBPNG support -%if 0%{?mgaversion} -BuildRequires: %{_lib}png-devel -%endif -%if 0%{?mdkversion} && 0%{?pclinuxos} == 0 -BuildRequires: %{_lib}png15-devel -%endif -%if 0%{?suse_version} || 0%{?fedora} || 0%{?rhel} -BuildRequires: libpng-devel -%endif - -# GRAPHICSMAGICK support -%if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?rhel} >= 5 -%define with_graphicsmagick 1 -%if 0%{?suse_version} -BuildRequires: GraphicsMagick >= 1.1.0 -%endif -%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?rhel} >= 5 || 0%{?suse_version} -BuildRequires: GraphicsMagick-devel >= 1.1.0 -%endif -%endif - -# UTEMPTER support -%if 0%{?suse_version} -BuildRequires: utempter-devel -%endif -%if 0%{?rhel} == 4 -BuildRequires: utempter -%endif -%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?rhel} >= 5 -BuildRequires: libutempter-devel -%endif - -# POSTGRESQL support -# Requires 'libpqxx', for kexi-driver-pgqsl -%if 0%{?mdkversion} || 0%{?fedora} || 0%{?suse_version} -%define with_postgresql 1 -BuildRequires: postgresql-devel -BuildRequires: libpqxx-devel -%endif -Obsoletes: trinity-libpqxx - -# WPD support -# For chalk and filters -BuildRequires: libwpd-devel -Obsoletes: trinity-libwpd - -# WV2 support -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: %{_lib}wv2-devel -%endif -%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} -BuildRequires: wv2-devel -%endif - -# MESA support -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: %{_lib}mesagl1-devel -BuildRequires: %{_lib}mesaglu1-devel -%endif -%if 0%{?fedora} || 0%{?rhel} -BuildRequires: libGL-devel -BuildRequires: libGLU-devel -%endif -%if 0%{?suse_version} >= 1220 -BuildRequires: Mesa-libGL-devel -BuildRequires: Mesa-libGLU-devel -%endif - -# OPENJPEG -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: %{_lib}openjpeg-devel -%endif - -# LIBXI support -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: %{_lib}xi-devel -%endif -%if 0%{?rhel} >= 5 || 0%{?fedora} -BuildRequires: libXi-devel -%endif -%if 0%{?suse_version} == 1140 -BuildRequires: libXi6-devel -%endif -%if 0%{?suse_version} >= 1220 -BuildRequires: libXi-devel -%endif - - -%description -KOffice is an integrated office suite. - -########## - -%package suite -Summary: An integrated office suite -Group: Applications/Productivity -Obsoletes: %{name} <= %{version}-%{release} -Obsoletes: %{name}-i18n < 4:%{version} -Requires: %{name}-core = %{version}-%{release} -Requires: %{name}-kword = %{version}-%{release} -Requires: %{name}-kspread = %{version}-%{release} -Requires: %{name}-kpresenter = %{version}-%{release} -Requires: %{name}-kivio = %{version}-%{release} -Requires: %{name}-karbon = %{version}-%{release} -Requires: %{name}-kugar = %{version}-%{release} -Requires: %{name}-kexi = %{version}-%{release} -Requires: %{name}-kexi-driver-mysql = %{version}-%{release} -%{?with_postgresql:Requires: %{name}-kexi-driver-pgsql = %{version}-%{release}} -Requires: %{name}-kchart = %{version}-%{release} -Requires: %{name}-kformula = %{version}-%{release} -Requires: %{name}-filters = %{version}-%{release} -Requires: %{name}-kplato = %{version}-%{release} -Requires: %{name}-chalk = %{version}-%{release} - -%description suite -KOffice is an integrated office suite. - -%files suite -#empty => virtual package - -########## - -%package core -Summary: Core support files for %{name} -Group: Applications/Productivity -Requires: %{name}-libs = %{version}-%{release} -Requires: perl - -%description core -%{summary}. - -%posttrans core -gtk-update-icon-cache %{tde_datadir}/icons/crystalsvg &> /dev/null || : -gtk-update-icon-cache %{tde_datadir}/icons/hicolor &> /dev/null || : -gtk-update-icon-cache %{tde_datadir}/icons/locolor &> /dev/null || : -update-desktop-database -q &> /dev/null ||: - -%post core -touch --no-create %{tde_datadir}/icons/crystalsvg &> /dev/null || : -touch --no-create %{tde_datadir}/icons/hicolor &> /dev/null || : -touch --no-create %{tde_datadir}/icons/locolor &> /dev/null || : - -%postun core -if [ $1 -eq 0 ]; then - gtk-update-icon-cache %{tde_datadir}/icons/crystalsvg &> /dev/null || : - gtk-update-icon-cache %{tde_datadir}/icons/hicolor &> /dev/null || : - gtk-update-icon-cache %{tde_datadir}/icons/locolor &> /dev/null || : - update-desktop-database -q &> /dev/null ||: -fi - -%files core -%defattr(-,root,root,-) -%doc AUTHORS COPYING README -%{tde_bindir}/koshell -%{tde_bindir}/kthesaurus -%{tde_bindir}/koconverter -%{tde_libdir}/libkdeinit_koshell.so -%{tde_libdir}/libkdeinit_kthesaurus.so -%{tde_tdelibdir}/kfile_koffice.* -%{tde_tdelibdir}/kfile_ooo.* -%{tde_tdelibdir}/kfile_abiword.* -%{tde_tdelibdir}/kfile_gnumeric.* -%{tde_tdelibdir}/kodocinfopropspage.* -%{tde_tdelibdir}/kofficescan.* -%{tde_tdelibdir}/kofficethumbnail.* -%{tde_tdelibdir}/koshell.* -%{tde_tdelibdir}/kthesaurus.* -%{tde_tdelibdir}/kwmailmerge_classic.* -%{tde_tdelibdir}/kwmailmerge_kabc.* -%{tde_tdelibdir}/kwmailmerge_qtsqldb_power.* -%{tde_tdelibdir}/kwmailmerge_qtsqldb.* -%{tde_tdelibdir}/libkounavailpart.* -%{tde_tdelibdir}/libkprkword.* -%{tde_tdelibdir}/libthesaurustool.* -%{tde_tdelibdir}/clipartthumbnail.* -%{tde_datadir}/apps/koffice/ -%{tde_datadir}/apps/konqueror/servicemenus/* -%{tde_datadir}/apps/koshell/ -%{tde_datadir}/apps/thesaurus/ -%{tde_datadir}/config.kcfg/koshell.kcfg -%{tde_tdedocdir}/HTML/en/koffice/ -%{tde_tdedocdir}/HTML/en/koshell/ -%{tde_tdedocdir}/HTML/en/thesaurus/ -%{tde_datadir}/icons/crystalsvg/*/*/* -%{tde_datadir}/icons/hicolor/*/*/* -%{tde_datadir}/icons/locolor/*/*/* -%{tde_datadir}/services/clipartthumbnail.desktop -%{tde_datadir}/services/kfile*.desktop -%{tde_datadir}/services/kwmailmerge*.desktop -%{tde_datadir}/services/kodocinfopropspage.desktop -%{tde_datadir}/services/kofficethumbnail.desktop -%{tde_datadir}/services/kounavail.desktop -%{tde_datadir}/services/kprkword.desktop -%{tde_datadir}/services/thesaurustool.desktop -%{tde_datadir}/servicetypes/kochart.desktop -%{tde_datadir}/servicetypes/kofficepart.desktop -%{tde_datadir}/servicetypes/koplugin.desktop -%{tde_datadir}/servicetypes/kwmailmerge.desktop -%{tde_datadir}/servicetypes/widgetfactory.desktop -%{tde_tdeappdir}/*koffice.desktop -%{tde_tdeappdir}/*KThesaurus.desktop -%{tde_tdeappdir}/*koshell.desktop -%{tde_datadir}/apps/kofficewidgets/ -%if 0%{?with_kross} -%{tde_datadir}/apps/kross/ -%{tde_tdelibdir}/krosspython.* -%if 0%{?with_ruby} -%{tde_tdelibdir}/krossruby.* -%endif -%endif - -########## - -%package libs -Summary: Runtime libraries for %{name} -Group: System Environment/Libraries -Conflicts: %{name} <= %{version}-%{release} -Requires: trinity-tdelibs -License: LGPLv2+ - -%description libs -%{summary}. - -%files libs -%defattr(-,root,root,-) -%doc COPYING.LIB -#_libdir/libk*common.so.* -%{tde_libdir}/libkarboncommon.so.* -%{tde_libdir}/libkspreadcommon.so.* -%{tde_libdir}/libkdchart.so.* -%{tde_libdir}/libkochart.so.* -%{tde_libdir}/libkofficecore.so.* -%{tde_libdir}/libkofficeui.so.* -%{tde_libdir}/libkotext.so.* -%{tde_libdir}/libkowmf.so.* -%{tde_libdir}/libkopainter.so.* -%{tde_libdir}/libkstore.so.* -%{tde_libdir}/libkwmailmerge_interface.so.* -%{tde_libdir}/libkwmf.so.* -%{tde_libdir}/libkformulalib.so.* -%{tde_libdir}/libkopalette.so.* -%{tde_libdir}/libkoproperty.so.* -%if 0%{?with_kross} -%{tde_libdir}/libkrossapi.so.* -%{tde_libdir}/libkrossmain.so.* -%endif - -%post libs -/sbin/ldconfig || : - -%postun libs -/sbin/ldconfig || : - -########## - -%package devel -Summary: Development files for %{name} -Group: Development/Libraries -Requires: %{name}-libs = %{version}-%{release} -License: LGPLv2+ - -%description devel -%{summary}. - -%files devel -%defattr(-,root,root,-) -%lang(en) %{tde_tdedocdir}/HTML/en/koffice-apidocs/ -%{tde_includedir}/* -# FIXME: include only shlib symlinks we know/want to export -%{tde_libdir}/lib*.so -%exclude %{tde_libdir}/libkdeinit_*.so -%exclude %{tde_libdir}/libkudesignercore.so - -########## - -%package kword -Summary: A frame-based word processor capable of professional standard documents -Group: Applications/Productivity -Requires: %{name}-core = %{version}-%{release} - -%description kword -%{summary}. - -%post kword -/sbin/ldconfig || : - -%postun kword -/sbin/ldconfig || : - -%posttrans kword -update-desktop-database -q &> /dev/null ||: - -%files kword -%defattr(-,root,root,-) -%lang(en) %{tde_tdedocdir}/HTML/en/kword/ -%{tde_bindir}/kword -%{tde_libdir}/libkdeinit_kword.so -%{tde_libdir}/libkwordprivate.so.* -%{tde_tdelibdir}/libkwordpart.* -%{tde_tdelibdir}/kword.* -%{tde_datadir}/apps/kword/ -%{tde_datadir}/services/kword*.desktop -%{tde_datadir}/services/kwserial*.desktop -%{tde_datadir}/templates/TextDocument.desktop -%{tde_datadir}/templates/.source/TextDocument.kwt -%{tde_tdeappdir}/*kword.desktop - -########## - -%package kspread -Summary: A powerful spreadsheet application -Group: Applications/Productivity -Requires: %{name}-core = %{version}-%{release} - -%description kspread -%{summary}. - -%files kspread -%defattr(-,root,root,-) -%lang(en) %{tde_tdedocdir}/HTML/en/kspread/ -%{tde_bindir}/kspread -%{tde_libdir}/libkdeinit_kspread.so -%{tde_tdelibdir}/kspread.* -%{tde_tdelibdir}/libkspreadpart.* -%{tde_tdelibdir}/kwmailmerge_kspread.* -%{tde_tdelibdir}/libcsvexport.* -%{tde_tdelibdir}/libcsvimport.* -%{tde_tdelibdir}/libgnumericexport.* -%{tde_tdelibdir}/libgnumericimport.* -%{tde_tdelibdir}/libkspreadhtmlexport.* -%{tde_tdelibdir}/libkspreadinsertcalendar.* -%{tde_tdelibdir}/libopencalcexport.* -%{tde_tdelibdir}/libopencalcimport.* -%{tde_tdelibdir}/libqproimport.* -%{tde_datadir}/apps/kspread/ -%{tde_datadir}/services/kspread*.desktop -%{tde_datadir}/templates/SpreadSheet.desktop -%{tde_datadir}/templates/.source/SpreadSheet.kst -%{tde_tdeappdir}/*kspread.desktop -%if 0%{?with_kross} -%{tde_tdelibdir}/kspreadscripting.* -%{tde_tdelibdir}/krosskspreadcore.* -%endif - -########## - -%package kpresenter -Summary: A full-featured presentation program -Group: Applications/Productivity -Requires: %{name}-core = %{version}-%{release} - -%description kpresenter -%{summary}. - -%post kpresenter -/sbin/ldconfig || : - -%postun kpresenter -/sbin/ldconfig || : - -%posttrans kpresenter -update-desktop-database -q &> /dev/null ||: - -%files kpresenter -%defattr(-,root,root,-) -%lang(en) %{tde_tdedocdir}/HTML/en/kpresenter/ -%{tde_bindir}/kpresenter -%{tde_bindir}/kprconverter.pl -%{tde_libdir}/libkdeinit_kpresenter.so -%{tde_libdir}/libkpresenterimageexport.so.* -%{tde_libdir}/libkpresenterprivate.so.* -%{tde_tdelibdir}/*kpresenter*.* -%{tde_datadir}/apps/kpresenter/ -%{tde_datadir}/services/kpresenter*.desktop -%{tde_datadir}/templates/Presentation.desktop -%{tde_datadir}/templates/.source/Presentation.kpt -%{tde_tdeappdir}/*kpresenter.desktop - -########## - -%package kivio -Summary: A flowcharting application -Group: Applications/Productivity -Requires: %{name}-core = %{version}-%{release} -Obsoletes: kivio < %{version}-%{release} - -%description kivio -%{summary}. - -%files kivio -%defattr(-,root,root,-) -%lang(en) %{tde_tdedocdir}/HTML/en/kivio/ -%{tde_bindir}/kivio -%{tde_libdir}/libkdeinit_kivio.so -%{tde_libdir}/libkiviocommon.so.* -%{tde_tdelibdir}/*kivio*.* -%{tde_tdelibdir}/straight_connector.* -%{tde_datadir}/apps/kivio/ -%{tde_datadir}/config.kcfg/kivio.kcfg -%{tde_datadir}/services/kivio*.desktop -%{tde_tdeappdir}/*kivio.desktop - -########## - -%package karbon -Summary: A vector drawing application -Group: Applications/Productivity -Requires: %{name}-core = %{version}-%{release} - -%description karbon -%{summary}. - -%post karbon -/sbin/ldconfig || : - -%postun karbon -/sbin/ldconfig || : - -%files karbon -%defattr(-,root,root,-) -%lang(en) %{tde_tdedocdir}/HTML/en/karbon/ -%{tde_bindir}/karbon -%{tde_libdir}/libkdeinit_karbon.so -%{tde_tdelibdir}/*karbon*.* -%{tde_tdelibdir}/libwmfexport.* -%{tde_tdelibdir}/libwmfimport.* -%{tde_datadir}/apps/karbon/ -%{tde_datadir}/services/karbon* -%{tde_datadir}/servicetypes/karbon_module.desktop -%{tde_datadir}/templates/Illustration.desktop -%{tde_datadir}/templates/.source/Illustration.karbon -%{tde_tdeappdir}/*karbon.desktop - -########## - -%package kugar -Summary: A tool for generating business quality reports -Group: Applications/Productivity -Requires: %{name}-core = %{version}-%{release} - -%description kugar -%{summary}. - -%post kugar -/sbin/ldconfig || : - -%postun kugar -/sbin/ldconfig || : - -%posttrans kugar -update-desktop-database -q &> /dev/null ||: - -%files kugar -%defattr(-,root,root,-) -%lang(en) %{tde_tdedocdir}/HTML/en/kugar/ -%{tde_bindir}/kugar -%{tde_bindir}/kudesigner -%{tde_libdir}/libkdeinit_kugar.so -%{tde_libdir}/libkdeinit_kudesigner.so -%{tde_libdir}/libkugarlib.so.* -%{tde_libdir}/libkudesignercore.so -%{tde_tdelibdir}/kudesigner.* -%{tde_tdelibdir}/kugar.* -%{tde_tdelibdir}/libkudesignerpart.* -%{tde_tdelibdir}/libkugarpart.* -%{tde_datadir}/apps/kudesigner/ -%{tde_datadir}/apps/kugar/ -%{tde_datadir}/services/kugar*.desktop -%{tde_tdeappdir}/*kugar.desktop -%{tde_tdeappdir}/*kudesigner.desktop - -########## - -%package kexi -Summary: An integrated environment for managing data -Group: Applications/Productivity -Requires: %{name}-core = %{version}-%{release} - -%if 0%{?with_postgresql} == 0 -Obsoletes: %{name}-kexi-driver-pgsql -%endif - -%description kexi -%{summary}. -For additional database drivers take a look at %{name}-kexi-driver-* - -%post kexi -/sbin/ldconfig || : - -%postun kexi -/sbin/ldconfig || : - -%posttrans kexi -update-desktop-database -q &> /dev/null ||: - -%files kexi -%defattr(-,root,root,-) -%lang(en) %{tde_tdedocdir}/HTML/en/kexi/ -%{tde_bindir}/kexi* -%{tde_bindir}/ksqlite* -%{tde_libdir}/libkdeinit_kexi.so -%{tde_libdir}/libkexi*.so.* -%{tde_libdir}/libkformdesigner.so.* -%{tde_tdelibdir}/kformdesigner_*.* -%{tde_tdelibdir}/kexidb_sqlite2driver.* -%{tde_tdelibdir}/kexidb_sqlite3driver.* -%{tde_tdelibdir}/kexihandler_*.* -%{tde_tdelibdir}/kexi.* -# moved here to workaround bug #394101, alternative is to move libkexi(db|dbparser|utils) to -libs) -%{tde_tdelibdir}/libkspreadkexiimport.* -%{tde_datadir}/config/kexirc -%{tde_datadir}/config/magic/kexi.magic -%{tde_datadir}/mimelnk/application/* -%{tde_datadir}/servicetypes/kexi*.desktop -%{tde_datadir}/services/kexi/ -%{tde_datadir}/apps/kexi/ -%{tde_datadir}/services/kformdesigner/* -%{tde_tdeappdir}/*kexi.desktop -%{tde_datadir}/services/kexidb_sqlite*driver.desktop -%if 0%{?with_kross} -%{tde_bindir}/krossrunner -%{tde_tdelibdir}/krosskexiapp.* -%{tde_tdelibdir}/krosskexidb.* -%endif - -########## - -%package kexi-driver-mysql -Summary: Mysql-driver for kexi -Group: Applications/Productivity -Requires: %{name}-kexi = %{version}-%{release} - -%description kexi-driver-mysql -%{summary}. - -%files kexi-driver-mysql -%defattr(-,root,root,-) -%{tde_tdelibdir}/kexidb_mysqldriver.* -%{tde_tdelibdir}/keximigrate_mysql.* -%{tde_datadir}/services/keximigrate_mysql.desktop -%{tde_datadir}/services/kexidb_mysqldriver.desktop - -########## - -%if 0%{?with_postgresql} - -%package kexi-driver-pgsql -Summary: Postgresql driver for kexi -Group: Applications/Productivity -Requires: %{name}-kexi = %{version}-%{release} - -%description kexi-driver-pgsql -%{summary}. - -%files kexi-driver-pgsql -%defattr(-,root,root,-) -%{tde_tdelibdir}/kexidb_pqxxsqldriver.* -%{tde_tdelibdir}/keximigrate_pqxx.* -%{tde_datadir}/services/kexidb_pqxxsqldriver.desktop -%{tde_datadir}/services/keximigrate_pqxx.desktop - -%endif - -########## - -%package kchart -Summary: An integrated graph and chart drawing tool -Group: Applications/Productivity -Requires: %{name}-core = %{version}-%{release} - -%description kchart -%{summary}. - -%post kchart -/sbin/ldconfig || : - -%postun kchart -/sbin/ldconfig || : - -%posttrans kchart -update-desktop-database -q &> /dev/null ||: - -%files kchart -%defattr(-,root,root,-) -%lang(en) %{tde_tdedocdir}/HTML/en/kchart/ -%{tde_bindir}/kchart -%{tde_libdir}/libkchart*.so.* -%{tde_libdir}/libkdeinit_kchart.so -%{tde_tdelibdir}/*kchart*.* -%{tde_datadir}/apps/kchart/ -%{tde_datadir}/services/kchart*.desktop -%{tde_tdeappdir}/*kchart.desktop - -########## - -%package kformula -Summary: A powerful formula editor -Group: Applications/Productivity -Requires: %{name}-core = %{version}-%{release} - -%if 0%{?mgaversion} || 0%{?mdkversion} -Requires: fonts-ttf-dejavu -%else -%if 0%{?fedora} >= 11 || 0%{?rhel} >= 6 -Requires: dejavu-lgc-sans-fonts -Requires: lyx-cmex10-fonts -%endif -%if 0%{?rhel} == 5 -Requires: dejavu-lgc-fonts -Requires: lyx-cmex10-fonts -%endif -%if 0%{?suse_version} >= 1220 -Requires: dejavu-fonts -%endif -%if 0%{?suse_version} == 1140 -Requires: dejavu -%endif -%endif - -%description kformula -%{summary}. - -%files kformula -%defattr(-,root,root,-) -%lang(en) %{tde_tdedocdir}/HTML/en/kformula/ -%{tde_bindir}/kformula -%{tde_libdir}/libkdeinit_kformula.so -%{tde_tdelibdir}/*kformula*.* -%{tde_datadir}/apps/kformula/ -%{tde_datadir}/services/kformula*.desktop -%{tde_tdeappdir}/*kformula.desktop - -########## - -%package filters -Summary: Import and Export Filters for KOffice -Group: Applications/Productivity -Requires: %{name}-core = %{version}-%{release} - -%description filters -%{summary}. - -%post filters -/sbin/ldconfig || : - -%postun filters -/sbin/ldconfig || : - -%files filters -%defattr(-,root,root,-) -%{tde_libdir}/libkwordexportfilters.so.* -%{tde_tdelibdir}/libabiwordexport.* -%{tde_tdelibdir}/libabiwordimport.* -%{tde_tdelibdir}/libamiproexport.* -%{tde_tdelibdir}/libamiproimport.* -%{tde_tdelibdir}/libapplixspreadimport.* -%{tde_tdelibdir}/libapplixwordimport.* -%{tde_tdelibdir}/libasciiexport.* -%{tde_tdelibdir}/libasciiimport.* -%{tde_tdelibdir}/libdbaseimport.* -%{tde_tdelibdir}/libdocbookexport.* -%{tde_tdelibdir}/libexcelimport.* -%{tde_tdelibdir}/libgenerickofilter.* -%{tde_tdelibdir}/libhtmlexport.* -%{tde_tdelibdir}/libhtmlimport.* -%{tde_tdelibdir}/libkarbonepsimport.* -%{tde_tdelibdir}/libkfolatexexport.* -%{tde_tdelibdir}/libkfomathmlexport.* -%{tde_tdelibdir}/libkfomathmlimport.* -%{tde_tdelibdir}/libkfopngexport.* -%{tde_tdelibdir}/libkspreadlatexexport.* -%{tde_tdelibdir}/libkugarnopimport.* -%{tde_tdelibdir}/libkwordkword1dot3import.* -%{tde_tdelibdir}/libkwordlatexexport.* -%{tde_tdelibdir}/libmswriteexport.* -%{tde_tdelibdir}/libmswriteimport.* -%{tde_tdelibdir}/libooimpressexport.* -%{tde_tdelibdir}/libooimpressimport.* -%{tde_tdelibdir}/liboowriterexport.* -%{tde_tdelibdir}/liboowriterimport.* -%{tde_tdelibdir}/libpalmdocexport.* -%{tde_tdelibdir}/libpalmdocimport.* -%{tde_tdelibdir}/libpdfimport.* -%{tde_tdelibdir}/librtfexport.* -%{tde_tdelibdir}/librtfimport.* -%{tde_tdelibdir}/libwmlexport.* -%{tde_tdelibdir}/libwmlimport.* -%{tde_tdelibdir}/libwpexport.* -%{tde_tdelibdir}/libwpimport.* -%{tde_tdelibdir}/libmswordimport.* -%{tde_tdelibdir}/libxsltimport.* -%{tde_tdelibdir}/libxsltexport.* -%{tde_tdelibdir}/libhancomwordimport.* -%{tde_tdelibdir}/libkfosvgexport.* -%{tde_tdelibdir}/liboodrawimport.* -%{tde_tdelibdir}/libolefilter.* -%{tde_datadir}/apps/xsltfilter/ -%{tde_datadir}/services/generic_filter.desktop -%{tde_datadir}/services/ole_powerpoint97_import.desktop -%{tde_datadir}/services/xslt*.desktop -%{tde_datadir}/servicetypes/kofilter*.desktop - -########## - -%package kplato -Summary: An integrated project management and planning tool -Group: Applications/Productivity -Requires: %{name}-core = %{version}-%{release} - -%description kplato -%{summary}. - -%files kplato -%defattr(-,root,root,-) -%lang(en) %{tde_tdedocdir}/HTML/en/kplato/ -%{tde_bindir}/kplato -%{tde_libdir}/libkdeinit_kplato.so -%{tde_tdelibdir}/kplato.* -%{tde_tdelibdir}/libkplatopart.* -%{tde_datadir}/apps/kplato/ -%{tde_datadir}/services/kplatopart.desktop -%{tde_tdeappdir}/*kplato.desktop - -########## - -%package chalk -Summary: pixel-based image manipulation program for the TDE Office Suite [Trinity] -Group: Applications/Productivity -Requires: %{name}-core = %{version}-%{release} -Requires: %{name}-chalk-data = %{version}-%{release} -Requires: %{name}-filters - -%description chalk -Chalk is a painting and image editing application for KOffice. Chalk contains -both ease-of-use and fun features like guided painting. - -This package is part of the TDE Office Suite. - -%post chalk -/sbin/ldconfig || : - -%postun chalk -/sbin/ldconfig || : - -%posttrans chalk -update-desktop-database -q &> /dev/null ||: - -%files chalk -%defattr(-,root,root,-) -%{tde_bindir}/chalk -%{tde_tdelibdir}/chalkblurfilter.la -%{tde_tdelibdir}/chalkblurfilter.so -%{tde_tdelibdir}/chalkbumpmap.la -%{tde_tdelibdir}/chalkbumpmap.so -%{tde_tdelibdir}/chalkcimg.la -%{tde_tdelibdir}/chalkcimg.so -%{tde_tdelibdir}/chalk_cmyk_* -%{tde_tdelibdir}/chalkcmykplugin.la -%{tde_tdelibdir}/chalkcmykplugin.so -%{tde_tdelibdir}/chalkcolorify.la -%{tde_tdelibdir}/chalkcolorify.so -%{tde_tdelibdir}/chalkcolorrange.la -%{tde_tdelibdir}/chalkcolorrange.so -%{tde_tdelibdir}/chalkcolorsfilters.la -%{tde_tdelibdir}/chalkcolorsfilters.so -%{tde_tdelibdir}/chalkcolorspaceconversion.la -%{tde_tdelibdir}/chalkcolorspaceconversion.so -%{tde_tdelibdir}/chalkconvolutionfilters.la -%{tde_tdelibdir}/chalkconvolutionfilters.so -%{tde_tdelibdir}/chalkdefaultpaintops.la -%{tde_tdelibdir}/chalkdefaultpaintops.so -%{tde_tdelibdir}/chalkdefaulttools.la -%{tde_tdelibdir}/chalkdefaulttools.so -%{tde_tdelibdir}/chalkdropshadow.la -%{tde_tdelibdir}/chalkdropshadow.so -%{tde_tdelibdir}/chalkembossfilter.la -%{tde_tdelibdir}/chalkembossfilter.so -%{tde_tdelibdir}/chalkexample.la -%{tde_tdelibdir}/chalkexample.so -%{tde_tdelibdir}/chalkextensioncolorsfilters.la -%{tde_tdelibdir}/chalkextensioncolorsfilters.so -%{tde_tdelibdir}/chalkfastcolortransfer.la -%{tde_tdelibdir}/chalkfastcolortransfer.so -%{tde_tdelibdir}/chalkfiltersgallery.la -%{tde_tdelibdir}/chalkfiltersgallery.so -%{tde_tdelibdir}/chalk_gray_* -%{tde_tdelibdir}/chalkgrayplugin.la -%{tde_tdelibdir}/chalkgrayplugin.so -%{tde_tdelibdir}/chalkhistogramdocker.la -%{tde_tdelibdir}/chalkhistogramdocker.so -%{tde_tdelibdir}/chalkhistogram.la -%{tde_tdelibdir}/chalkhistogram.so -%{tde_tdelibdir}/chalkimageenhancement.la -%{tde_tdelibdir}/chalkimageenhancement.so -%{tde_tdelibdir}/chalkimagesize.la -%{tde_tdelibdir}/chalkimagesize.so -%{tde_tdelibdir}/chalk.la -%{tde_tdelibdir}/chalklenscorrectionfilter.la -%{tde_tdelibdir}/chalklenscorrectionfilter.so -%{tde_tdelibdir}/chalklevelfilter.la -%{tde_tdelibdir}/chalklevelfilter.so -%{tde_tdelibdir}/chalk_lms_* -%{tde_tdelibdir}/chalkmodifyselection.la -%{tde_tdelibdir}/chalkmodifyselection.so -%{tde_tdelibdir}/chalknoisefilter.la -%{tde_tdelibdir}/chalknoisefilter.so -%{tde_tdelibdir}/chalkoilpaintfilter.la -%{tde_tdelibdir}/chalkoilpaintfilter.so -%{tde_tdelibdir}/chalkpixelizefilter.la -%{tde_tdelibdir}/chalkpixelizefilter.so -%{tde_tdelibdir}/chalkraindropsfilter.la -%{tde_tdelibdir}/chalkraindropsfilter.so -%{tde_tdelibdir}/chalkrandompickfilter.la -%{tde_tdelibdir}/chalkrandompickfilter.so -%{tde_tdelibdir}/chalk_rgb_* -%{tde_tdelibdir}/chalkrgbplugin.la -%{tde_tdelibdir}/chalkrgbplugin.so -%{tde_tdelibdir}/chalkrotateimage.la -%{tde_tdelibdir}/chalkrotateimage.so -%{tde_tdelibdir}/chalkroundcornersfilter.la -%{tde_tdelibdir}/chalkroundcornersfilter.so -%{tde_tdelibdir}/chalkselectiontools.la -%{tde_tdelibdir}/chalkselectiontools.so -%{tde_tdelibdir}/chalkselectopaque.la -%{tde_tdelibdir}/chalkselectopaque.so -%{tde_tdelibdir}/chalkseparatechannels.la -%{tde_tdelibdir}/chalkseparatechannels.so -%{tde_tdelibdir}/chalkshearimage.la -%{tde_tdelibdir}/chalkshearimage.so -%{tde_tdelibdir}/chalksmalltilesfilter.la -%{tde_tdelibdir}/chalksmalltilesfilter.so -%{tde_tdelibdir}/chalk.so -%{tde_tdelibdir}/chalkscreenshot.la -%{tde_tdelibdir}/chalkscreenshot.so -%{tde_tdelibdir}/chalksobelfilter.la -%{tde_tdelibdir}/chalksobelfilter.so -%{tde_tdelibdir}/chalksubstrate.la -%{tde_tdelibdir}/chalksubstrate.so -%{tde_tdelibdir}/chalktoolcrop.la -%{tde_tdelibdir}/chalktoolcrop.so -%{tde_tdelibdir}/chalktoolcurves.la -%{tde_tdelibdir}/chalktoolcurves.so -%{tde_tdelibdir}/chalktoolfilter.la -%{tde_tdelibdir}/chalktoolfilter.so -%{tde_tdelibdir}/chalktoolperspectivegrid.la -%{tde_tdelibdir}/chalktoolperspectivegrid.so -%{tde_tdelibdir}/chalktoolperspectivetransform.la -%{tde_tdelibdir}/chalktoolperspectivetransform.so -%{tde_tdelibdir}/chalktoolpolygon.la -%{tde_tdelibdir}/chalktoolpolygon.so -%{tde_tdelibdir}/chalktoolpolyline.la -%{tde_tdelibdir}/chalktoolpolyline.so -%{tde_tdelibdir}/chalktoolselectsimilar.la -%{tde_tdelibdir}/chalktoolselectsimilar.so -%{tde_tdelibdir}/chalktoolstar.la -%{tde_tdelibdir}/chalktoolstar.so -%{tde_tdelibdir}/chalktooltransform.la -%{tde_tdelibdir}/chalktooltransform.so -%{tde_tdelibdir}/chalkunsharpfilter.la -%{tde_tdelibdir}/chalkunsharpfilter.so -%{tde_tdelibdir}/chalkwavefilter.la -%{tde_tdelibdir}/chalkwavefilter.so -%{tde_tdelibdir}/chalkwetplugin.la -%{tde_tdelibdir}/chalkwetplugin.so -%{tde_tdelibdir}/chalk_ycbcr_* -%if 0%{?with_graphicsmagick} -%{tde_tdelibdir}/libchalkgmagickexport.la -%{tde_tdelibdir}/libchalkgmagickexport.so -%{tde_tdelibdir}/libchalkgmagickimport.la -%{tde_tdelibdir}/libchalkgmagickimport.so -%{tde_tdelibdir}/libchalkjpegexport.la -%{tde_tdelibdir}/libchalkjpegexport.so -%{tde_tdelibdir}/libchalkjpegimport.la -%{tde_tdelibdir}/libchalkjpegimport.so -%endif -%{tde_tdelibdir}/libchalk_openexr_export.la -%{tde_tdelibdir}/libchalk_openexr_export.so -%{tde_tdelibdir}/libchalk_openexr_import.la -%{tde_tdelibdir}/libchalk_openexr_import.so -%{tde_tdelibdir}/libchalkpart.la -%{tde_tdelibdir}/libchalkpart.so -%{tde_tdelibdir}/libchalkpdfimport.la -%{tde_tdelibdir}/libchalkpdfimport.so -%{tde_tdelibdir}/libchalkpngexport.la -%{tde_tdelibdir}/libchalkpngexport.so -%{tde_tdelibdir}/libchalkpngimport.la -%{tde_tdelibdir}/libchalkpngimport.so -%{tde_tdelibdir}/libchalk_raw_import.la -%{tde_tdelibdir}/libchalk_raw_import.so -%if 0%{?with_graphicsmagick} -%{tde_tdelibdir}/libchalktiffexport.la -%{tde_tdelibdir}/libchalktiffexport.so -%{tde_tdelibdir}/libchalktiffimport.la -%{tde_tdelibdir}/libchalktiffimport.so -%endif -%{tde_libdir}/libkdeinit_chalk.so -%{tde_libdir}/libchalk_cmyk_*.so.* -%{tde_libdir}/libchalkcolor.so.* -%{tde_libdir}/libchalkcommon.so.* -%{tde_libdir}/libchalkgrayscale.so.* -%{tde_libdir}/libchalk_gray_*.so.* -%{tde_libdir}/libchalkimage.so.* -%{tde_libdir}/libchalk_lms_*.so.* -%{tde_libdir}/libchalk_rgb_*.so.* -%{tde_libdir}/libchalkrgb.so.* -%{tde_libdir}/libchalkui.so.* -%{tde_libdir}/libchalk_ycbcr_*.so.* -%if 0%{?with_kross} -%{tde_tdelibdir}/krosschalkcore.la -%{tde_tdelibdir}/krosschalkcore.so -%{tde_tdelibdir}/chalkscripting.la -%{tde_tdelibdir}/chalkscripting.so -%{tde_libdir}/libchalkscripting.so.* -%endif - -########## - -%package chalk-data -Summary: data files for Chalk painting program [Trinity] -Group: Applications/Productivity - -%description chalk-data -This package contains architecture-independent data files for Chalk, -the painting program shipped with the TDE Office Suite. - -See the chalk package for further information. - -This package is part of the TDE Office Suite. - -%files chalk-data -%defattr(-,root,root,-) -%{tde_tdeappdir}/chalk.desktop -%{tde_datadir}/applnk/.hidden/chalk_*.desktop -%{tde_datadir}/apps/konqueror/servicemenus/chalk_konqi.desktop -%{tde_datadir}/apps/chalk/ -%{tde_datadir}/apps/chalkplugins/ -%lang(en) %{tde_tdedocdir}/HTML/en/chalk/ -%{tde_datadir}/icons/hicolor/*/apps/chalk.png -%{tde_datadir}/services/chalk*.desktop -%{tde_datadir}/servicetypes/chalk*.desktop - -########## - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - -########## - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} - -# use LGC variant instead -%__sed -i.dejavu-lgc \ - -e 's|DejaVu Sans|DejaVu LGC Sans|' \ - -e 's|dejavu sans|dejavu lgc sans|' \ - lib/kformula/{contextstyle,fontstyle,symboltable}.cc - -%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/"*"/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; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" -export KDEDIR="%{tde_prefix}" - -%if 0%{?suse_version} == 1220 -RD=$(ruby -r rbconfig -e 'printf("%s",Config::CONFIG["rubyhdrdir"])') -export CXXFLAGS="${CXXFLAGS} -I${RD}/%_normalized_cpu-linux" -%endif - -%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-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath \ - \ - --with-extra-libs=%{tde_libdir} \ - --with-extra-includes=%{tde_includedir}/arts \ - \ - --disable-kexi-macros \ - %{?with_kross:--enable-scripting} %{!?with_kross:--disable-scripting} \ - %{?with_postgresql:--enable-pgsql} %{!?with_postgresql:--disable-pgsql} \ - -%__make %{?_smp_mflags} || %__make - - -%install -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -# Moves menu elements to XDG folder -desktop-file-install \ - --dir=%{buildroot}%{tde_tdeappdir} \ - --vendor="" \ - --delete-original \ - %{buildroot}%{tde_datadir}/applnk/Office/*.desktop - -# Replace absolute symlinks with relative ones -pushd %{buildroot}%{tde_tdedocdir}/HTML -for lang in *; do - if [ -d $lang ]; then - pushd $lang - for i in */*; do - [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../../common $i/common - done - popd - fi -done -popd - - -## unpackaged files -# fonts -rm -rfv %{buildroot}%{tde_datadir}/apps/kformula/fonts/ -# libtool archives -rm -f %{buildroot}%{tde_libdir}/lib*.la -# shouldn't these be in koffice-l10n? -rm -f %{buildroot}%{tde_datadir}/locale/pl/LC_MESSAGES/kexi_{add,delete}_column_gui_transl_pl.sh -# -devel symlinks to nuke -rm -f %{buildroot}%{tde_libdir}/lib*common.so -rm -f %{buildroot}%{tde_libdir}/lib*filters.so -rm -f %{buildroot}%{tde_libdir}/lib*private.so -rm -f %{buildroot}%{tde_libdir}/libkarbon*.so -rm -f %{buildroot}%{tde_libdir}/libkchart*.so -rm -f %{buildroot}%{tde_libdir}/libkexi*.so -rm -f %{buildroot}%{tde_libdir}/libkisexiv2.so -rm -f %{buildroot}%{tde_libdir}/libkformdesigner.so -rm -f %{buildroot}%{tde_libdir}/libkplato*.so -rm -f %{buildroot}%{tde_libdir}/libkpresenter*.so -rm -f %{buildroot}%{tde_libdir}/libkword*.so -rm -f %{buildroot}%{tde_libdir}/libkross*.so -rm -f %{buildroot}%{tde_libdir}/libkugar*.so - - -%clean -%__rm -rf %{buildroot} - - -%changelog diff --git a/redhat/applications/koffice/koffice-14.0.0.spec b/redhat/applications/koffice/koffice.spec index ce0cec112..420a08dc3 100644 --- a/redhat/applications/koffice/koffice-14.0.0.spec +++ b/redhat/applications/koffice/koffice.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg koffice %define tde_prefix /opt/trinity @@ -101,7 +101,6 @@ BuildRequires: libjpeg-devel BuildRequires: ImageMagick-devel BuildRequires: zlib-devel BuildRequires: openssl-devel -BuildRequires: python-devel BuildRequires: pcre-devel BuildRequires: gettext-devel BuildRequires: mysql-devel @@ -113,6 +112,18 @@ BuildRequires: OpenEXR-devel BuildRequires: libexif-devel BuildRequires: readline-devel +# PYTHON support +%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 +%global python python2 +%global __python %__python2 +%global python_sitearch %{python2_sitearch} +%else +%global python python +%endif +%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} +BuildRequires: %{python} +BuildRequires: %{python}-devel + # LCMS support %if 0%{?suse_version} || 0%{?rhel} >= 7 BuildRequires: liblcms-devel @@ -625,8 +636,8 @@ For additional database drivers take a look at %{name}-kexi-driver-* %{tde_tdelibdir}/kexi.* # moved here to workaround bug #394101, alternative is to move libkexi(db|dbparser|utils) to -libs) %{tde_tdelibdir}/libkspreadkexiimport.* -%{tde_confdir}/kexirc -%{tde_confdir}/magic/kexi.magic +%config(noreplace) %{tde_confdir}/kexirc +%config(noreplace) %{tde_confdir}/magic/kexi.magic %{tde_datadir}/mimelnk/application/* %{tde_datadir}/servicetypes/kexi*.desktop %{tde_datadir}/services/kexi/ @@ -639,7 +650,7 @@ For additional database drivers take a look at %{name}-kexi-driver-* %{tde_tdelibdir}/krosskexiapp.* %{tde_tdelibdir}/krosskexidb.* %endif -%{tde_confdir}/magic/kexi.magic.mgc +%config(noreplace) %{tde_confdir}/magic/kexi.magic.mgc ########## @@ -710,8 +721,10 @@ Requires: %{name}-core = %{?epoch:%{epoch}:}%{version}-%{release} %if 0%{?mgaversion} || 0%{?mdkversion} Requires: fonts-ttf-dejavu %else -%if 0%{?fedora} >= 11 || 0%{?rhel} >= 6 +%if 0%{?fedora} >= 11 || 0%{?rhel} == 6 || 0%{?rhel} == 7 Requires: dejavu-lgc-sans-fonts +%endif +%if 0%{?fedora} >= 11 || 0%{?rhel} == 6 || 0%{?rhel} == 7 Requires: lyx-cmex10-fonts %endif %if 0%{?rhel} == 5 @@ -1054,7 +1067,11 @@ export kde_confdir="%{tde_confdir}" %if 0%{?suse_version} == 1220 RD=$(ruby -r rbconfig -e 'printf("%s",Config::CONFIG["rubyhdrdir"])') -export CXXFLAGS="${CXXFLAGS} -I${RD}/%_normalized_cpu-linux" +CXXFLAGS="${CXXFLAGS} -I${RD}/%_normalized_cpu-linux" +%endif + +%if 0%{?suse_version} >= 1550 +CXXFLAGS="${CXXFLAGS} -std=c++11" %endif # FTBFS on RHEL 5 diff --git a/redhat/applications/koffice/koshell.png b/redhat/applications/koffice/koshell.png Binary files differnew file mode 100644 index 000000000..c66ef99e8 --- /dev/null +++ b/redhat/applications/koffice/koshell.png diff --git a/redhat/applications/konversation/konversation-3.5.13.2.spec b/redhat/applications/konversation/konversation-3.5.13.2.spec deleted file mode 100644 index 98f1f0472..000000000 --- a/redhat/applications/konversation/konversation-3.5.13.2.spec +++ /dev/null @@ -1,174 +0,0 @@ -# Default version for this component -%define tde_pkg konversation -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: user friendly Internet Relay Chat (IRC) client for TDE [Trinity] -Version: 1.1 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: gettext - -BuildRequires: libxslt-devel -%if 0%{?suse_version} -BuildRequires: docbook-xsl-stylesheets -%else -BuildRequires: docbook-style-xsl -%endif - -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: %{_lib}xi-devel -%endif -%if 0%{?rhel} >= 5|| 0%{?fedora} || 0%{?suse_version} >= 1220 -BuildRequires: libXi-devel -%endif -%if 0%{?suse_version} == 1140 -BuildRequires: libXi6-devel -%endif - -%description -Konversation is a client for the Internet Relay Chat (IRC) protocol. -It is easy to use and well-suited for novice IRC users, but novice -and experienced users alike will appreciate its many features: - - * Standard IRC features - * Easy to use graphical interface - * Multiple server and channel tabs in a single window - * IRC color support - * Pattern-based message highlighting and OnScreen Display - * Multiple identities for different servers - * Multi-language scripting support (with DCOP) - * Customizable command aliases - * NickServ-aware log-on (for registered nicknames) - * Smart logging - * Traditional or enhanced-shell-style nick completion - * DCC file transfer with resume support - - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%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/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR || : ; source /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" - -%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-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath - -%__make %{?_smp_mflags} - - -%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 || : - -%postun -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : - - -%files -f %{tde_pkg}.lang -%defattr(-,root,root,-) -%doc AUTHORS COPYING -%{tde_bindir}/konversation -%{tde_tdeappdir}/konversation.desktop -%{tde_datadir}/apps/kconf_update/konversation-0.19-appearance.pl -%{tde_datadir}/apps/kconf_update/konversation-0.19-colorcodes.pl -%{tde_datadir}/apps/kconf_update/konversation-0.19-colors.pl -%{tde_datadir}/apps/kconf_update/konversation-0.19-custombrowser.pl -%{tde_datadir}/apps/kconf_update/konversation-0.19-notifylists.pl -%{tde_datadir}/apps/kconf_update/konversation-0.19-sortorder.pl -%{tde_datadir}/apps/kconf_update/konversation-0.19-tabplacement.pl -%{tde_datadir}/apps/kconf_update/konversation-0.20-customfonts.pl -%{tde_datadir}/apps/kconf_update/konversation-0.20-quickbuttons.pl -%{tde_datadir}/apps/kconf_update/konversation.upd -%{tde_datadir}/apps/konversation/ -%{tde_datadir}/config.kcfg/konversation.kcfg -%{tde_datadir}/services/konvirc.protocol -%{tde_datadir}/services/konvirc6.protocol -%{tde_tdedocdir}/HTML/*/konversation/ -%{tde_datadir}/icons/crystalsvg/*/actions/kimproxyaway.png -%{tde_datadir}/icons/crystalsvg/*/actions/kimproxyoffline.png -%{tde_datadir}/icons/crystalsvg/*/actions/kimproxyonline.png -%{tde_datadir}/icons/crystalsvg/*/actions/char.png -%{tde_datadir}/icons/crystalsvg/*/actions/konv_message.png -%{tde_datadir}/icons/crystalsvg/scalable/actions/kimproxyaway.svgz -%{tde_datadir}/icons/crystalsvg/scalable/actions/kimproxyoffline.svgz -%{tde_datadir}/icons/crystalsvg/scalable/actions/kimproxyonline.svgz -%{tde_datadir}/icons/crystalsvg/scalable/actions/konv_message.svgz -%{tde_datadir}/icons/hicolor/*/apps/konversation.png -%{tde_datadir}/icons/hicolor/scalable/apps/konversation.svgz - - -%changelog diff --git a/redhat/applications/konversation/konversation.spec b/redhat/applications/konversation/konversation.spec index 27aa8edaa..389edbe64 100644 --- a/redhat/applications/konversation/konversation.spec +++ b/redhat/applications/konversation/konversation.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg konversation %define tde_prefix /opt/trinity @@ -109,7 +109,7 @@ BuildRequires: libXi6-devel # RHEL 5: available in centos-extras # RHEL 6: available in EPEL # RHEL 7: available in NUX -%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version} +%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} == 5 || 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?suse_version} %define with_xscreensaver 1 %if 0%{?fedora} || 0%{?rhel} >= 5 @@ -176,6 +176,12 @@ and experienced users alike will appreciate its many features: %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} +%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8 +%__sed -i "konversation/scripts/media" \ + "konversation/scripts/weather" \ + -e "s|/usr/bin/env python|/usr/bin/env python2|" +%endif + %build unset QTDIR QTINC QTLIB diff --git a/redhat/applications/kooldock/kooldock.spec b/redhat/applications/kooldock/kooldock.spec index 647d511c7..0adc94cb8 100644 --- a/redhat/applications/kooldock/kooldock.spec +++ b/redhat/applications/kooldock/kooldock.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.1 +%define tde_version 14.1.0 %endif %define tde_pkg kooldock %define tde_prefix /opt/trinity @@ -67,6 +67,15 @@ BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: libtool +# IDN support +BuildRequires: libidn-devel + +# ACL support +BuildRequires: libacl-devel + +# OPENSSL support +BuildRequires: openssl-devel + # SUSE desktop files utility %if 0%{?suse_version} BuildRequires: update-desktop-files @@ -154,30 +163,7 @@ export PATH="%{tde_bindir}:${PATH}" %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING README TODO %{tde_bindir}/kooldock -%{tde_datadir}/apps/kooldock/backgrounds/border-black/background-center.png -%{tde_datadir}/apps/kooldock/backgrounds/border-black/background-left.png -%{tde_datadir}/apps/kooldock/backgrounds/border-black/background-right.png -%{tde_datadir}/apps/kooldock/backgrounds/border-white/background-center.png -%{tde_datadir}/apps/kooldock/backgrounds/border-white/background-left.png -%{tde_datadir}/apps/kooldock/backgrounds/border-white/background-right.png -%{tde_datadir}/apps/kooldock/backgrounds/crystal/background-center.png -%{tde_datadir}/apps/kooldock/backgrounds/crystal/background-left.png -%{tde_datadir}/apps/kooldock/backgrounds/crystal/background-right.png -%{tde_datadir}/apps/kooldock/backgrounds/default/background-center.png -%{tde_datadir}/apps/kooldock/backgrounds/default/background-left.png -%{tde_datadir}/apps/kooldock/backgrounds/default/background-right.png -%{tde_datadir}/apps/kooldock/backgrounds/fadeout/background-center.png -%{tde_datadir}/apps/kooldock/backgrounds/fadeout/background-left.png -%{tde_datadir}/apps/kooldock/backgrounds/fadeout/background-right.png -%{tde_datadir}/apps/kooldock/backgrounds/fadeout2/background-center.png -%{tde_datadir}/apps/kooldock/backgrounds/fadeout2/background-left.png -%{tde_datadir}/apps/kooldock/backgrounds/fadeout2/background-right.png -%{tde_datadir}/apps/kooldock/backgrounds/fadeout3/background-center.png -%{tde_datadir}/apps/kooldock/backgrounds/fadeout3/background-left.png -%{tde_datadir}/apps/kooldock/backgrounds/fadeout3/background-right.png -%{tde_datadir}/apps/kooldock/backgrounds/osx/background-center.png -%{tde_datadir}/apps/kooldock/backgrounds/osx/background-left.png -%{tde_datadir}/apps/kooldock/backgrounds/osx/background-right.png +%{tde_datadir}/apps/kooldock/ %{tde_datadir}/icons/crystalsvg/16x16/apps/kooldock.png %{tde_datadir}/icons/crystalsvg/32x32/apps/kooldock.png %{tde_datadir}/icons/crystalsvg/64x64/apps/kooldock.png diff --git a/redhat/applications/kopete-otr/kopete-otr-3.5.13.2.spec b/redhat/applications/kopete-otr/kopete-otr-3.5.13.2.spec deleted file mode 100644 index 6b1eee75b..000000000 --- a/redhat/applications/kopete-otr/kopete-otr-3.5.13.2.spec +++ /dev/null @@ -1,151 +0,0 @@ -# openSUSE 12.3: do NOT install libotr-devel, use libotr2-devel instead ! - -# Default version for this component -%define tde_pkg kopete-otr -%define tde_version 3.5.13.2 - -# Required for Mageia 2: removes the ldflag '--no-undefined' -%define _disable_ld_no_undefined 1 - -# Under Mageia 3, we require "libotr3" package - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: Off-The-Record encryption for Kopete [Trinity] -Version: 0.7 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: trinity-tdenetwork-devel >= %{tde_version} - -# Kopete is provided by kdenetwork -Requires: trinity-kopete >= %{tde_version} -%if 0%{?suse_version} >= 1230 -BuildRequires: libotr2-devel -%else -BuildRequires: libotr-devel -%endif - -%description -This plugin enables Off-The-Record encryption for the TDE instant -messenger Kopete. Using this plugin you can encrypt chatsessions to other -users with IM-Cients supporting the OTR encryption method. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%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/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR QTINC QTLIB -. /etc/profile.d/qt3.sh -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-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath \ - \ - --with-extra-includes=/usr/include/tqt - -%__make %{_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -# Unwanted files -%__rm -f %{?buildroot}%{tde_libdir}/libkotr.so - -%find_lang kopete_otr - - -%clean -%__rm -rf %{buildroot} - - -%post -touch --no-create %{tde_datadir}/icons/crystalsvg || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || : -/sbin/ldconfig || : - -%postun -touch --no-create %{tde_datadir}/icons/crystalsvg || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || : -/sbin/ldconfig || : - - -%files -f kopete_otr.lang -%defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING README TODO -%{tde_libdir}/libkotr.la -%{tde_libdir}/libkotr.so.0 -%{tde_libdir}/libkotr.so.0.0.0 -%{tde_tdelibdir}/kcm_kopete_otr.la -%{tde_tdelibdir}/kcm_kopete_otr.so -%{tde_tdelibdir}/kopete_otr.la -%{tde_tdelibdir}/kopete_otr.so -%{tde_datadir}/apps/kopete_otr -%{tde_datadir}/config.kcfg/kopete_otr.kcfg -%{tde_tdedocdir}/HTML/en/kopete_otr/ -%{tde_datadir}/icons/crystalsvg/16x16/apps/kopete_otr.png -%{tde_datadir}/services/kconfiguredialog/kopete_otr_config.desktop -%{tde_datadir}/services/kopete_otr.desktop - - -%changelog diff --git a/redhat/applications/kopete-otr/kopete-otr-14.0.0.spec b/redhat/applications/kopete-otr/kopete-otr.spec index 602ab32c3..b2f6fe6fa 100644 --- a/redhat/applications/kopete-otr/kopete-otr-14.0.0.spec +++ b/redhat/applications/kopete-otr/kopete-otr.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg kopete-otr %define tde_prefix /opt/trinity diff --git a/redhat/applications/kpicosim/kpicosim-3.5.13.2.spec b/redhat/applications/kpicosim/kpicosim-3.5.13.2.spec deleted file mode 100644 index 284de9ad5..000000000 --- a/redhat/applications/kpicosim/kpicosim-3.5.13.2.spec +++ /dev/null @@ -1,124 +0,0 @@ -# Default version for this component -%define tde_pkg kpicosim -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: IDE and simulator for the Xilinx PicoBlaze-3 [Trinity] -Version: 0.6a -Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: gettext - - -%description -kpicosim is a development environment for the Xilinx -PicoBlaze-3 soft-core processor for the TDE Desktop (Linux). -The environment has an editor with syntax highlighting, compiler, -simulator and export functions to VHDL, HEX and MEM files. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%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/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" - -# Warning: --enable-final causes FTBFS -%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-new-ldflags \ - --disable-final \ - --enable-closure \ - --enable-rpath - -# SMP safe ! -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - - -%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 AUTHORS ChangeLog COPYING NEWS README -%{tde_bindir}/kpicosim -%{tde_datadir}/applnk/Development/kpicosim.desktop -%{tde_datadir}/apps/katepart/syntax/psm.xml -%{tde_datadir}/apps/kpicosim -%{tde_tdedocdir}/HTML/en/kpicosim -%{tde_datadir}/icons/hicolor/*/apps/kpicosim.png - - -%changelog diff --git a/redhat/applications/kpicosim/kpicosim.spec b/redhat/applications/kpicosim/kpicosim.spec index a1623f95b..d8161830b 100644 --- a/redhat/applications/kpicosim/kpicosim.spec +++ b/redhat/applications/kpicosim/kpicosim.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg kpicosim %define tde_prefix /opt/trinity @@ -137,16 +137,31 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} -C build +%find_lang %{tde_pkg} + +# Move desktop icon to XDG directory +if [ -d "%{buildroot}%{tde_datadir}/applnk" ]; then + %__mkdir_p %{buildroot}%{tde_tdeappdir} + %__mv "%{buildroot}%{tde_datadir}/applnk/Development/kpicosim.desktop" "%{buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" + %__rm -r "%{buildroot}%{tde_datadir}/applnk" +fi + + +# Updates applications categories for openSUSE +%if 0%{?suse_version} +%suse_update_desktop_file -D kpicosim -C "%summary" kpicosim Development IDE +%endif + %clean %__rm -rf %{buildroot} -%files +%files -f %{tde_pkg}.lang %defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING NEWS README +%doc AUTHORS ChangeLog COPYING README %{tde_bindir}/kpicosim -%{tde_datadir}/applnk/Development/kpicosim.desktop +%{tde_tdeappdir}/kpicosim.desktop %{tde_datadir}/apps/katepart/syntax/psm.xml %{tde_datadir}/apps/kpicosim %{tde_tdedocdir}/HTML/en/kpicosim diff --git a/redhat/applications/kpilot/kpilot-3.5.13.2.spec b/redhat/applications/kpilot/kpilot-3.5.13.2.spec deleted file mode 100644 index 4bfb1a46e..000000000 --- a/redhat/applications/kpilot/kpilot-3.5.13.2.spec +++ /dev/null @@ -1,173 +0,0 @@ -# Default version for this component -%define tde_pkg kpilot -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: TDE Palm Pilot hot-sync tool -Version: 0.7 -Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: flex-devel -BuildRequires: gettext -BuildRequires: pilot-link-devel >= 0.12 -BuildRequires: trinity-tdepim-devel >= %{tde_version} - -%description -KPilot is an application that synchronizes your Palm Pilot or similar device -(like the Handspring Visor) with your TDE desktop, much like the Palm HotSync -software does for Windows. KPilot can back-up and restore your Palm Pilot -and synchronize the built-in applications with their TDE counterparts. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%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/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR QTINC QTLIB -. /etc/profile.d/qt3.sh -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-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath - -# SMP safe ! -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -# Unwanted files -%__rm -f %{?buildroot}%{tde_libdir}/libkpilot.so - - - -%clean -%__rm -rf %{buildroot} - - -%post -update-desktop-database %{tde_appdir} > /dev/null -for f in hicolor locolor crystalsvg; do - touch --no-create %{tde_datadir}/icons/${f} || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : -done -/sbin/ldconfig || : - -%postun -update-desktop-database %{tde_appdir} > /dev/null -for f in hicolor locolor crystalsvg; do - touch --no-create %{tde_datadir}/icons/${f} || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : -done -/sbin/ldconfig || : - - -%files -%defattr(-,root,root,-) -%{tde_bindir}/kpalmdoc -%{tde_bindir}/kpilot -%{tde_bindir}/kpilotDaemon -%{tde_tdeincludedir}/kpilot -%{tde_libdir}/libkpilot.la -%{tde_libdir}/libkpilot.so.0 -%{tde_libdir}/libkpilot.so.0.0.0 -%{tde_tdelibdir}/conduit_address.la -%{tde_tdelibdir}/conduit_address.so -%{tde_tdelibdir}/conduit_doc.la -%{tde_tdelibdir}/conduit_doc.so -%{tde_tdelibdir}/conduit_knotes.la -%{tde_tdelibdir}/conduit_knotes.so -%{tde_tdelibdir}/conduit_memofile.la -%{tde_tdelibdir}/conduit_memofile.so -%{tde_tdelibdir}/conduit_notepad.la -%{tde_tdelibdir}/conduit_notepad.so -%{tde_tdelibdir}/conduit_popmail.la -%{tde_tdelibdir}/conduit_popmail.so -%{tde_tdelibdir}/conduit_sysinfo.la -%{tde_tdelibdir}/conduit_sysinfo.so -%{tde_tdelibdir}/conduit_time.la -%{tde_tdelibdir}/conduit_time.so -%{tde_tdelibdir}/conduit_todo.la -%{tde_tdelibdir}/conduit_todo.so -%{tde_tdelibdir}/conduit_vcal.la -%{tde_tdelibdir}/conduit_vcal.so -%{tde_tdelibdir}/kcm_kpilot.la -%{tde_tdelibdir}/kcm_kpilot.so -%{tde_tdeappdir}/kpalmdoc.desktop -%{tde_tdeappdir}/kpilot.desktop -%{tde_tdeappdir}/kpilotdaemon.desktop -%{tde_datadir}/apps/kaddressbook/contacteditorpages/KPilotCustomFieldEditor.ui -%{tde_datadir}/apps/kconf_update/kpalmdoc.upd -%{tde_datadir}/apps/kconf_update/kpilot.upd -%{tde_datadir}/apps/kpilot -%{tde_datadir}/config.kcfg/*.kcfg -%{tde_datadir}/icons/crystalsvg/*/apps/*.png -%{tde_datadir}/icons/hicolor/*/apps/*.png -%{tde_datadir}/icons/locolor/*/apps/*.png -%{tde_datadir}/services/*.desktop -%{tde_datadir}/servicetypes/kpilotconduit.desktop - - -%changelog diff --git a/redhat/applications/kpilot/kpilot.spec b/redhat/applications/kpilot/kpilot.spec index 179e464d2..c8cc0e565 100644 --- a/redhat/applications/kpilot/kpilot.spec +++ b/redhat/applications/kpilot/kpilot.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg kpilot %define tde_prefix /opt/trinity diff --git a/redhat/applications/kplayer/kplayer.spec b/redhat/applications/kplayer/kplayer.spec index 45a4ae38f..8bbad32df 100644 --- a/redhat/applications/kplayer/kplayer.spec +++ b/redhat/applications/kplayer/kplayer.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg kplayer %define tde_prefix /opt/trinity diff --git a/redhat/applications/kpowersave/kpowersave-3.5.13.2.spec b/redhat/applications/kpowersave/kpowersave-3.5.13.2.spec deleted file mode 100644 index 9abc1468c..000000000 --- a/redhat/applications/kpowersave/kpowersave-3.5.13.2.spec +++ /dev/null @@ -1,158 +0,0 @@ -# Default version for this component -%define tde_pkg kpowersave -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Version: 0.7.3 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} -Summary: HAL based power management applet for Trinityfiles or directories. - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: hal-devel -BuildRequires: trinity-dbus-tqt-devel >= 1:0.63 - - -%description -KPowersave is a TDE systray applet which allows to control the power -management settings and policies of your computer. -It relies on HAL to do the heavy lifting. - -Current feature list: - * support for ACPI, APM and PMU - * trigger suspend to disk/ram and standby - * switch cpu frequency policy (between: performance, dynamic and powersave) - * applet icon with information about AC state, battery fill and battery - (warning) states - * applet tooltip with information about battery fill and remaining battery - time/percentage - * autosuspend (to suspend the machine if the user has been inactive for a - defined time) - * a global configurable blacklist with programs which prevent autosuspend - (e.g. videoplayer and cd burning tools) - * trigger lock screen and select the lock method - * KNotify support - * online help - * localisations for many languages - -KPowersave supports schemes with following configurable specific -settings for: - * screensaver - * DPMS - * autosuspend - * scheme specific blacklist for autosuspend - * notification settings - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} - -%build -unset QTDIR || : ; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" - -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 \ - \ - -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \ - -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 - - -%clean -%__rm -rf %{buildroot} - - -%post -update-desktop-database %{tde_appdir} > /dev/null -/sbin/ldconfig -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : - -%postun -update-desktop-database %{tde_appdir} > /dev/null -/sbin/ldconfig -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : - - -%files -%defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING NEWS README TODO -%{tde_bindir}/kpowersave -%{tde_libdir}/libkdeinit_kpowersave.la -%{tde_libdir}/libkdeinit_kpowersave.so -%{tde_tdelibdir}/kpowersave.la -%{tde_tdelibdir}/kpowersave.so -%{tde_tdeappdir}/kpowersave.desktop -%{tde_datadir}/apps/kpowersave/eventsrc -%{tde_datadir}/apps/kpowersave/icons/*/*/*/*.png -%{tde_datadir}/icons/hicolor/*/*/*.png -%{tde_datadir}/autostart/kpowersave-autostart.desktop -%{tde_datadir}/config/kpowersaverc - -%changelog diff --git a/redhat/applications/kpowersave/kpowersave-14.0.0.spec b/redhat/applications/kpowersave/kpowersave.spec index 2bb9fe60a..992e6c7d3 100644 --- a/redhat/applications/kpowersave/kpowersave-14.0.0.spec +++ b/redhat/applications/kpowersave/kpowersave.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg kpowersave %define tde_prefix /opt/trinity @@ -82,7 +82,7 @@ BuildRequires: brp-check-trinity # 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} +%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} == 5 || 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?suse_version} %define with_xscreensaver 1 %if 0%{?fedora} || 0%{?rhel} >= 5 diff --git a/redhat/applications/krecipes/krecipes-14.0.0.spec b/redhat/applications/krecipes/krecipes.spec index b04652b96..69c3d81f8 100644 --- a/redhat/applications/krecipes/krecipes-14.0.0.spec +++ b/redhat/applications/krecipes/krecipes.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg krecipes %define tde_prefix /opt/trinity diff --git a/redhat/applications/krename/krename-3.5.13.2.spec b/redhat/applications/krename/krename-3.5.13.2.spec deleted file mode 100644 index f5267c587..000000000 --- a/redhat/applications/krename/krename-3.5.13.2.spec +++ /dev/null @@ -1,127 +0,0 @@ -# Default version for this component -%define tde_pkg krename -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: A TDE batch file renaming utility. -Version: 3.0.14 -Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - - -%description -KRename is a powerful batch renamer for TDE. It allows you to easily rename hundreds or -even more files in one go. The filenames can be created by parts of the original filename, -numbering the files or accessing hundreds of informations about the file, like creation date -or Exif informations of an image. - -%if 0%{?suse_version} || 0%{?pclinuxos} -%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/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" - -%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-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -%find_lang %{tde_pkg} - - -%clean -%__rm -rf %{buildroot} - - -%post -for f in hicolor locolor ; do - touch --no-create %{tde_datadir}/icons/${f} || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : -done -update-desktop-database %{tde_appdir} &> /dev/null - -%postun -for f in hicolor locolor ; do - touch --no-create %{tde_datadir}/icons/${f} || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : -done -update-desktop-database %{tde_appdir} &> /dev/null - -%files -f %{tde_pkg}.lang -%defattr(-,root,root,-) -%doc AUTHORS COPYING -%{tde_bindir}/krename -%{tde_tdeappdir}/krename.desktop -%{tde_datadir}/apps/konqueror/servicemenus/krename_dir.desktop -%{tde_datadir}/apps/konqueror/servicemenus/krenameservicemenu.desktop -%{tde_datadir}/apps/krename/ -%{tde_tdedocdir}/HTML/en/krename/ -%{tde_datadir}/icons/hicolor/*/apps/krename.png -%{tde_datadir}/icons/locolor/*/apps/krename.png - - -%changelog diff --git a/redhat/applications/krename/krename.spec b/redhat/applications/krename/krename.spec index c0f464690..f1bd53432 100644 --- a/redhat/applications/krename/krename.spec +++ b/redhat/applications/krename/krename.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg krename %define tde_prefix /opt/trinity diff --git a/redhat/applications/krusader/krusader-3.5.13.2-tmpvfs-ftbfs.patch b/redhat/applications/krusader/krusader-3.5.13.2-tmpvfs-ftbfs.patch deleted file mode 100644 index eb1f41ffd..000000000 --- a/redhat/applications/krusader/krusader-3.5.13.2-tmpvfs-ftbfs.patch +++ /dev/null @@ -1,62 +0,0 @@ -diff --git a/krusader/VFS/temp_vfs.cpp b/krusader/VFS/temp_vfs.cpp -index 25f3a15..ee68521 100644 ---- a/krusader/VFS/temp_vfs.cpp -+++ b/krusader/VFS/temp_vfs.cpp -@@ -56,7 +56,7 @@ temp_vfs::temp_vfs( TQString origin, TQString type, TQWidget* panel, bool ): - } - - temp_vfs::~temp_vfs(){ -- if( vfs_type == "-iso" ){ -+ if( tmpvfs_type == ISO ){ - // unmount the ISO image - KShellProcess umount; - umount << "umount -f" << tmpDir; -@@ -94,6 +94,13 @@ bool temp_vfs::vfs_refresh(const KURL& origin){ - } - - void temp_vfs::handleAceArj(TQString origin, TQString type){ -+ if (type == "-ace") { -+ tmpvfs_type = ACE; -+ } -+ else if (type == "-arj") { -+ tmpvfs_type = ARJ; -+ } -+ - // for ace and arj we just unpack to the tmpDir - if( !KRarcHandler::arcHandled(type) ){ - if (!quietMode) KMessageBox::error(krApp,"This archive type is NOT supported"); -@@ -117,6 +124,7 @@ void temp_vfs::handleRpm(TQString origin){ - rpm.clearArguments(); - rpm << "rpm -lpq"<<"\""+origin+"\""+" > "+tmpDir+"/filelist.txt"; - rpm.start(KProcess::Block); -+ tmpvfs_type = RPM; - } - - void temp_vfs::handleIso(TQString origin){ -@@ -124,4 +132,5 @@ void temp_vfs::handleIso(TQString origin){ - KShellProcess mount; - mount << KrServices::fullPathName( "mount" ) << "-o loop" << origin << tmpDir; - mount.start(KProcess::Block); -+ tmpvfs_type = ISO; - } -diff --git a/krusader/VFS/temp_vfs.h b/krusader/VFS/temp_vfs.h -index 3b94248..d35169b 100644 ---- a/krusader/VFS/temp_vfs.h -+++ b/krusader/VFS/temp_vfs.h -@@ -37,6 +37,8 @@ - - class temp_vfs : public normal_vfs { - public: -+ enum TMPVFS_TYPE{ERROR=0,ACE,ARJ,RPM,ISO}; -+ - temp_vfs( TQString origin, TQString type, TQWidget* panel, bool writeable); - ~temp_vfs(); - TQString vfs_workingDir(); -@@ -50,6 +52,7 @@ protected: - void handleAceArj(TQString origin, TQString type); - void handleRpm(TQString origin); - void handleIso(TQString origin); -+ TMPVFS_TYPE tmpvfs_type; //< the tmp vfs type. - TQString tmpDir; - - }; diff --git a/redhat/applications/krusader/krusader-3.5.13.2.spec b/redhat/applications/krusader/krusader-3.5.13.2.spec deleted file mode 100644 index 615b95ea4..000000000 --- a/redhat/applications/krusader/krusader-3.5.13.2.spec +++ /dev/null @@ -1,155 +0,0 @@ -# Default version for this component -%define tde_pkg krusader -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: twin-panel (commander-style) file manager for TDE (and other desktops) -Version: 1.90.0 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -Patch0: krusader-3.5.13.2-tmpvfs-ftbfs.patch - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: trinity-tdebindings-devel >= %{tde_version} - - -%description -Krusader is a simple, easy, powerful, twin-panel (commander-style) file -manager for TDE and other desktops, similar to Midnight Commander (C) or Total -Commander (C). - -It provides all the file management features you could possibly want. - -Plus: extensive archive handling, mounted filesystem support, FTP, -advanced search module, viewer/editor, directory synchronisation, -file content comparisons, powerful batch renaming and much much more. - -It supports archive formats: ace, arj, bzip2, deb, iso, lha, rar, rpm, tar, -zip and 7-zip. - -It handles KIOSlaves such as smb:// or fish://. - -Almost completely customizable, Krusader is very user friendly, fast and looks -great on your desktop. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%patch0 -p1 -b .ftbfs - -%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR QTINC QTLIB -. /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" - -# Warning: --enable-final causes FTBFS -%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-new-ldflags \ - --disable-final \ - --enable-closure \ - --enable-rpath - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -%find_lang %{tde_pkg} - -%clean -%__rm -rf %{buildroot} - - -%post -update-desktop-database %{tde_appdir} > /dev/null -for f in crystalsvg locolor ; do - touch --no-create %{tde_datadir}/icons/${f} || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : -done - -%postun -update-desktop-database %{tde_appdir} > /dev/null -for f in crystalsvg locolor ; do - touch --no-create %{tde_datadir}/icons/${f} || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : -done - - -%files -f %{tde_pkg}.lang -%defattr(-,root,root,-) -%doc AUTHORS COPYING FAQ README TODO -%{tde_bindir}/krusader -%{tde_tdelibdir}/kio_krarc.la -%{tde_tdelibdir}/kio_krarc.so -%{tde_tdelibdir}/kio_virt.la -%{tde_tdelibdir}/kio_virt.so -%{tde_tdeappdir}/krusader.desktop -%{tde_tdeappdir}/krusader_root-mode.desktop -%{tde_datadir}/apps/krusader -%{tde_tdedocdir}/HTML/en/krusader/ -%lang(ru) %{tde_tdedocdir}/HTML/ru/krusader/ -%{tde_datadir}/icons/crystalsvg/*/apps/*.png -%{tde_datadir}/icons/locolor/*/apps/*.png -%{tde_datadir}/services/krarc.protocol -%{tde_datadir}/services/virt.protocol -%{tde_mandir}/man1/krusader.1 - - -%changelog diff --git a/redhat/applications/krusader/krusader-14.0.0.spec b/redhat/applications/krusader/krusader.spec index 260c97e4a..cf314c68f 100644 --- a/redhat/applications/krusader/krusader-14.0.0.spec +++ b/redhat/applications/krusader/krusader.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg krusader %define tde_prefix /opt/trinity diff --git a/redhat/applications/kscope/kscope-14.0.0.spec b/redhat/applications/kscope/kscope.spec index c684c1e6e..0df980cff 100644 --- a/redhat/applications/kscope/kscope-14.0.0.spec +++ b/redhat/applications/kscope/kscope.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg kscope %define tde_prefix /opt/trinity diff --git a/redhat/applications/ksensors/ksensors-3.5.13.2.spec b/redhat/applications/ksensors/ksensors-3.5.13.2.spec deleted file mode 100644 index e1874db69..000000000 --- a/redhat/applications/ksensors/ksensors-3.5.13.2.spec +++ /dev/null @@ -1,139 +0,0 @@ -# Default version for this component -%define tde_pkg ksensors -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man - -%define tde_tdeappdir %{tde_datadir}/applications/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - -Name: trinity-ksensors -Version: 0.7.3 -Release: %{?!preversion:20}%{?preversion:19_%{preversion}}%{?dist} - -Summary: Trinity Frontend to lm_sensors -Group: Applications/System -License: GPLv2+ -URL: http://ksensors.sourceforge.net/ - -Source0: %{tde_pkg}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: gettext - -%if 0%{?suse_version} -BuildRequires: libsensors4-devel -%else -BuildRequires: lm_sensors-devel -%endif - -# Keep archs in sync with lm_sensors -ExcludeArch: s390 s390x - -%description -KSensors is a nice lm-sensors frontend for the K Desktop Environment. -Install the hddtemp package if you wish to monitor hard disk -temperatures with KSensors. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n %{tde_pkg}-%{version} - -%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/"*"/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 -. /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" - -# Warning: --enable-final causes FTBFS -%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 \ - --disable-final \ - --enable-closure \ - --enable-rpath \ - --disable-gcc-hidden-visibility - -%__make %{?_smp_mflags} - - -%install -%__rm -rf $RPM_BUILD_ROOT -%__make install DESTDIR=$RPM_BUILD_ROOT - -# Creates autostart shortcut -%__install -dm 755 $RPM_BUILD_ROOT%{tde_datadir}/autostart -%__ln_s ../applnk/Utilities/ksensors.desktop \ - $RPM_BUILD_ROOT%{tde_datadir}/autostart - -%find_lang %{tde_pkg} - - -%clean -%__rm -rf $RPM_BUILD_ROOT - - -%post -for f in locolor hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null || : - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null || : -done - -%postun -for f in locolor hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null || : - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null || : -done - - -%files -f %{tde_pkg}.lang -%defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING FAQ README TODO -%lang(es) %doc LEEME -%lang(de) %doc LIESMICH -%lang(fr) %doc LISEZMOI -%{tde_bindir}/ksensors -%{tde_datadir}/applnk/System/ksensors.desktop -%{tde_datadir}/apps/ksensors/ -%{tde_datadir}/autostart/ksensors.desktop -%{tde_datadir}/icons/hicolor/*/apps/ksensors.png -%{tde_datadir}/icons/locolor/*/apps/ksensors.png -%{tde_datadir}/sounds/ksensors_alert.wav -%{tde_tdedocdir}/HTML/en/ksensors/ - - -%changelog diff --git a/redhat/applications/ksensors/ksensors.spec b/redhat/applications/ksensors/ksensors.spec index ba1b1f917..e26f4f704 100644 --- a/redhat/applications/ksensors/ksensors.spec +++ b/redhat/applications/ksensors/ksensors.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg ksensors %define tde_prefix /opt/trinity @@ -149,10 +149,6 @@ fi %__rm -rf $RPM_BUILD_ROOT %__make install DESTDIR=$RPM_BUILD_ROOT -C build -# Move desktop icon to correct location -%__mkdir_p "%{?buildroot}%{tde_tdeappdir}" -%__mv -f "%{?buildroot}%{tde_datadir}/applnk/"*"/%{tde_pkg}.desktop" "%{?buildroot}%{tde_tdeappdir}" - %find_lang %{tde_pkg} # Updates applications categories for openSUSE @@ -168,9 +164,6 @@ fi %files -f %{tde_pkg}.lang %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING FAQ README TODO -%lang(es) %doc LEEME -%lang(de) %doc LIESMICH -%lang(fr) %doc LISEZMOI %{tde_bindir}/ksensors %{tde_tdeappdir}/ksensors.desktop %{tde_datadir}/apps/ksensors/ diff --git a/redhat/applications/kshowmail/kshowmail-14.0.0.spec b/redhat/applications/kshowmail/kshowmail.spec index 6fecd9bad..e560e72b5 100644 --- a/redhat/applications/kshowmail/kshowmail-14.0.0.spec +++ b/redhat/applications/kshowmail/kshowmail.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg kshowmail %define tde_prefix /opt/trinity @@ -61,7 +61,7 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils BuildRequires: trinity-tdepim-devel >= %{tde_version} -BuildRequires: autoconf automake libtool m4 +BuildRequires: cmake >= 2.8 BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: fdupes @@ -76,6 +76,15 @@ BuildRequires: update-desktop-files BuildRequires: brp-check-trinity %endif +# ACL support +BuildRequires: libacl-devel + +# IDN support +BuildRequires: libidn-devel + +# OPENSSL support +BuildRequires: openssl-devel + %description Very simply kshowmail is a program that allows you to look in on your mail server, @@ -93,44 +102,48 @@ All without dragging any messages into your computer. %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/"*"/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} \ - --libdir=%{tde_libdir} \ - --datadir=%{tde_datadir} \ - --includedir=%{tde_tdeincludedir} \ +export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" + +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 \ \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-final \ - --enable-new-ldflags \ - --enable-closure \ - --enable-rpath \ - --disable-gcc-hidden-visibility - -%__make %{?_smp_mflags} + -DCMAKE_INCLUDE_PATH="%{tde_tdeincludedir}" \ + -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \ + -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \ + -DLIB_INSTALL_DIR="%{tde_libdir}" \ + \ + -DWITH_ALL_OPTIONS=ON \ + -DWITH_GCC_VISIBILITY=ON \ + \ + -DBUILD_ALL=ON \ + -DBUILD_DOC=ON \ + -DBUILD_TRANSLATIONS=ON \ + .. + +%__make %{?_smp_mflags} || %__make %install %__rm -rf $RPM_BUILD_ROOT -%__make install DESTDIR=$RPM_BUILD_ROOT +%__make install DESTDIR=$RPM_BUILD_ROOT -C build %find_lang %{tde_pkg} -# Move desktop icon to correct location -%__mkdir_p "%{?buildroot}%{tde_tdeappdir}" -%__mv -f "%{?buildroot}%{tde_datadir}/applnk/"*"/%{tde_pkg}.desktop" "%{?buildroot}%{tde_tdeappdir}" - # Install missing icons install -D -m 644 "pics/cr16-app-kshowmail.png" "$RPM_BUILD_ROOT%{tde_datadir}/icons/hicolor/16x16/apps/kshowmail.png" install -D -m 644 "pics/kshowmail.png" "$RPM_BUILD_ROOT%{tde_datadir}/icons/hicolor/48x48/apps/kshowmail.png" @@ -174,6 +187,7 @@ install -D -m 644 "pics/kshowmail.png" "$RPM_BUILD_ROOT%{tde_datadir}/i %{tde_datadir}/services/kshowmailconfiggeneral.desktop %{tde_datadir}/services/kshowmailconfiglog.desktop %{tde_datadir}/services/kshowmailconfigspamcheck.desktop +%lang(cs) %{tde_tdedocdir}/HTML/cs/kshowmail/ %lang(de) %{tde_tdedocdir}/HTML/de/kshowmail/ %lang(en) %{tde_tdedocdir}/HTML/en/kshowmail/ %lang(es) %{tde_tdedocdir}/HTML/es/kshowmail/ @@ -182,6 +196,7 @@ install -D -m 644 "pics/kshowmail.png" "$RPM_BUILD_ROOT%{tde_datadir}/i %lang(it) %{tde_tdedocdir}/HTML/it/kshowmail/ %lang(ru) %{tde_tdedocdir}/HTML/ru/kshowmail/ %lang(sv) %{tde_tdedocdir}/HTML/sv/kshowmail/ +%{tde_mandir}/man1/kshowmail.* %changelog diff --git a/redhat/applications/kshutdown/kshutdown.spec b/redhat/applications/kshutdown/kshutdown.spec index 3e8fe4ee1..395324ec7 100644 --- a/redhat/applications/kshutdown/kshutdown.spec +++ b/redhat/applications/kshutdown/kshutdown.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg kshutdown %define tde_prefix /opt/trinity @@ -152,7 +152,7 @@ fi # Updates applications categories for openSUSE %if 0%{?suse_version} -echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_datadir}/applications/kshutdown.desktop" +echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/kshutdown.desktop" %suse_update_desktop_file %{tde_pkg} Utility DesktopUtility %endif @@ -167,7 +167,7 @@ echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_datadir}/applications/kshutdown.des %{tde_bindir}/kshutdown %{tde_tdelibdir}/kshutdownlockout_panelapplet.la %{tde_tdelibdir}/kshutdownlockout_panelapplet.so -%{tde_datadir}/applications/kshutdown.desktop +%{tde_tdeappdir}/kshutdown.desktop %{tde_datadir}/apps/kicker/applets/kshutdownlockout.desktop %{tde_datadir}/apps/kshutdown/ %{tde_datadir}/apps/tdeconf_update/kshutdown.upd diff --git a/redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin-3.5.13.2.spec b/redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin-3.5.13.2.spec deleted file mode 100644 index a27f7d851..000000000 --- a/redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin-3.5.13.2.spec +++ /dev/null @@ -1,121 +0,0 @@ -# Default version for this component -%define tde_pkg ksplash-engine-moodin -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: fading splash screen engine for Trinity -Version: 0.4.2 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: gettext - - -%description -Heavily customizable engine for various types of themes. - -Features: -* scale cache -* fading images -* use current icon set or custom images -* unlimited Custom text labels -* set fading delay and length -* custom image arrangement -* resolution independent themes - -This TDE splash screen engine is based upon Linspire's -engine by Sean Meiners <Sean.Meiners@LinspireInc.com> - -Homepage: http://moodwrod.com - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%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/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" - -%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 - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - - -%clean -%__rm -rf %{buildroot} - - -%files -%defattr(-,root,root,-) -%{tde_tdelibdir}/ksplashmoodin.la -%{tde_tdelibdir}/ksplashmoodin.so -%{tde_datadir}/apps/ksplash/Themes/FingerPrint/ -%{tde_datadir}/apps/ksplash/Themes/MoodinKDE/ -%{tde_datadir}/services/ksplashmoodin.desktop - - -%changelog diff --git a/redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin.spec b/redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin.spec index d22e32925..b12004bf5 100644 --- a/redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin.spec +++ b/redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg ksplash-engine-moodin %define tde_prefix /opt/trinity @@ -153,12 +153,14 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} -C build +%find_lang %{tde_pkg} + %clean %__rm -rf %{buildroot} -%files +%files -f %{tde_pkg}.lang %defattr(-,root,root,-) %{tde_tdelibdir}/ksplashmoodin.la %{tde_tdelibdir}/ksplashmoodin.so diff --git a/redhat/applications/ksquirrel/ksquirrel-3.5.13.2.spec b/redhat/applications/ksquirrel/ksquirrel-3.5.13.2.spec deleted file mode 100644 index d9b8d3d35..000000000 --- a/redhat/applications/ksquirrel/ksquirrel-3.5.13.2.spec +++ /dev/null @@ -1,146 +0,0 @@ -# Default version for this component -%define tde_pkg ksquirrel -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: Powerful Trinity image viewer -Version: 0.8.0 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Amusements/Games - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: gettext -BuildRequires: trinity-libkipi-devel -BuildRequires: trinity-libksquirrel-devel -#BuildRequires: libkexif-devel - -%description -KSquirrel is an image viewer for TDE with disk navigator, file tree, -multiple directory view, thumbnails, extended thumbnails, dynamic -format support, DCOP interface, KEXIF and KIPI plugins support. - -KSquirrel is a fast and convenient image viewer for TDE featuring -OpenGL and dynamic format support. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%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/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" - -# Specific path for RHEL4 -if [ -d /usr/X11R6 ]; then - export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" -fi - -# Warning: --enable-final causes FTBFS -%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 \ - --disable-final \ - --enable-new-ldflags \ - --enable-closure \ - --enable-rpath - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -%find_lang %{tde_pkg} - -%clean -%__rm -rf %{buildroot} - - -%post -update-desktop-database %{tde_appdir} > /dev/null -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : - -%postun -update-desktop-database %{tde_appdir} > /dev/null -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : - - -%files -f %{tde_pkg}.lang -%defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING LICENSE LICENSE.GFDL LICENSE.LGPL README TODO -%{tde_bindir}/ksquirrel -%{tde_bindir}/ksquirrel-libs-configurator -%{tde_bindir}/ksquirrel-libs-configurator-real -%{tde_tdelibdir}/libksquirrelpart.la -%{tde_tdelibdir}/libksquirrelpart.so -%{tde_tdeappdir}/ksquirrel.desktop -%{tde_datadir}/apps/dolphin/servicemenus/dolphksquirrel-dir.desktop -%{tde_datadir}/apps/konqueror/servicemenus/konqksquirrel-dir.desktop -%{tde_datadir}/apps/ksquirrel/ -%{tde_datadir}/apps/ksquirrelpart/ksquirrelpart.rc -%{tde_datadir}/config/magic/x-ras.magic -%{tde_datadir}/config/magic/x-sun.magic -%{tde_datadir}/config/magic/x-utah.magic -%{tde_tdedocdir}/HTML/*/ksquirrel -%{tde_datadir}/icons/hicolor/*/apps/ksquirrel.png -%{tde_datadir}/mimelnk/image/*.desktop -%{tde_datadir}/services/ksquirrelpart.desktop -%{tde_datadir}/locale/*/LC_MESSAGES/ksquirrel.mo -%{tde_mandir}/man1/ksquirrel.1 - -%changelog diff --git a/redhat/applications/ksquirrel/ksquirrel-14.0.0.spec b/redhat/applications/ksquirrel/ksquirrel.spec index 0a12ea867..fc17cceda 100644 --- a/redhat/applications/ksquirrel/ksquirrel-14.0.0.spec +++ b/redhat/applications/ksquirrel/ksquirrel.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg ksquirrel %define tde_prefix /opt/trinity @@ -179,17 +179,17 @@ export PATH="%{tde_bindir}:${PATH}" %{tde_datadir}/apps/konqueror/servicemenus/konqksquirrel-dir.desktop %{tde_datadir}/apps/ksquirrel/ %{tde_datadir}/apps/ksquirrelpart/ -%{tde_confdir}/magic/x-ras.magic -%{tde_confdir}/magic/x-sun.magic -%{tde_confdir}/magic/x-utah.magic +%config(noreplace) %{tde_confdir}/magic/x-ras.magic +%config(noreplace) %{tde_confdir}/magic/x-sun.magic +%config(noreplace) %{tde_confdir}/magic/x-utah.magic %{tde_tdedocdir}/HTML/*/ksquirrel %{tde_datadir}/icons/hicolor/*/apps/ksquirrel.png %{tde_datadir}/mimelnk/image/*.desktop %{tde_datadir}/services/ksquirrelpart.desktop %{tde_mandir}/man1/ksquirrel.1 -%{tde_confdir}/magic/x-ras.magic.mgc -%{tde_confdir}/magic/x-sun.magic.mgc -%{tde_confdir}/magic/x-utah.magic.mgc +%config(noreplace) %{tde_confdir}/magic/x-ras.magic.mgc +%config(noreplace) %{tde_confdir}/magic/x-sun.magic.mgc +%config(noreplace) %{tde_confdir}/magic/x-utah.magic.mgc %changelog diff --git a/redhat/applications/kstreamripper/kstreamripper-3.5.13.2.spec b/redhat/applications/kstreamripper/kstreamripper-3.5.13.2.spec deleted file mode 100644 index 215f398d3..000000000 --- a/redhat/applications/kstreamripper/kstreamripper-3.5.13.2.spec +++ /dev/null @@ -1,95 +0,0 @@ -# Default version for this component -%define tde_pkg kstreamripper -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: TDE frontend for streamripper - -Version: 0.3.4 -Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: scons - - -%description -KStreamRipper is a small frontend for the streamripper command -line utility. Streamripper captures internet shoutcast radio streams -on your harddisk and splits them up in mp3 files. KStreamRipper helps -you with managing/ripping your preferred streams. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} - -%__sed -i kde.py \ - -e "s|include/kde|include/tde|g" - -%build -unset QTDIR QTINC QTLIB -. /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" - -scons -Q -j4 \ - qtlibs=${QTLIB:-${QTDIR}/%{_lib}} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - - -%clean -%__rm -rf %{buildroot} - - -%files -%defattr(-,root,root,-) -%{tde_bindir}/kstreamripper -%{tde_datadir}/applnk/Utilities/kstreamripper.desktop -%{tde_datadir}/apps/kstreamripper/kstreamripperui.rc -%{tde_tdedocdir}/HTML/en/kstreamripper/ - - - -%changelog diff --git a/redhat/applications/kstreamripper/kstreamripper-14.0.0.spec b/redhat/applications/kstreamripper/kstreamripper.spec index d5395491a..430d5bfe3 100644 --- a/redhat/applications/kstreamripper/kstreamripper-14.0.0.spec +++ b/redhat/applications/kstreamripper/kstreamripper.spec @@ -15,14 +15,14 @@ # Please submit bugfixes or comments via http://www.trinitydesktop.org/ # -%if 0%{?fedora} >= 28 +%if 0%{?fedora} >= 28 || 0%{?mgaversion} >= 7 || 0%{?rhel} >= 8 %global debug_package %{nil} %endif # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg kstreamripper %define tde_prefix /opt/trinity @@ -59,6 +59,7 @@ Prefix: %{tde_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz +Source1: scons-local-2.5.1.tar.gz BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} @@ -79,8 +80,19 @@ BuildRequires: update-desktop-files BuildRequires: brp-check-trinity %endif -BuildRequires: scons -BuildRequires: python +#BuildRequires: scons + +# PYTHON support +%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 +%global python python2 +%global __python %__python2 +%global python_sitearch %{python2_sitearch} +%else +%global python python +%endif +%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} +BuildRequires: %{python} +BuildRequires: %{python}-devel %description @@ -100,7 +112,7 @@ you with managing/ripping your preferred streams. %prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -a 1 %__rm -f kde.py @@ -109,14 +121,14 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export QTDIR=/usr -scons configure prefix="%{_prefix}" -scons %{?_smp_mflags} +%__python ./scons.py configure prefix="%{_prefix}" +%__python ./scons.py %{?_smp_mflags} %install export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} -DESTDIR="%{?buildroot}" scons install +DESTDIR="%{?buildroot}" %__python ./scons.py install # Missing icon file will make this fail. echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" diff --git a/redhat/applications/kstreamripper/scons-local-2.5.1.tar.gz b/redhat/applications/kstreamripper/scons-local-2.5.1.tar.gz Binary files differnew file mode 100644 index 000000000..ef63468b1 --- /dev/null +++ b/redhat/applications/kstreamripper/scons-local-2.5.1.tar.gz diff --git a/redhat/applications/ksystemlog/ksystemlog-3.5.13.2.spec b/redhat/applications/ksystemlog/ksystemlog-3.5.13.2.spec deleted file mode 100644 index 8251cdf6d..000000000 --- a/redhat/applications/ksystemlog/ksystemlog-3.5.13.2.spec +++ /dev/null @@ -1,122 +0,0 @@ -# Default version for this component -%define tde_pkg ksystemlog -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: system log viewer tool for Trinity -Version: 0.3.2 -Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/System - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://ksystemlog.forum-software.org - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - - -%description -ksystemlog is a system log viewer tool for Trinity. - -This program is developed for being used by beginner users, which don't know -how to find information about their Linux system, and how the log files are in -their computer. But it is also designed for advanced users, who want to -quickly see problems occuring on their server. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%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/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" - -%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-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - - -%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 AUTHORS ChangeLog COPYING README -%{tde_bindir}/ksystemlog -%{tde_datadir}/applnk/Utilities/ksystemlog.desktop -%{tde_datadir}/apps/ksystemlog/ksystemlogui.rc -%{tde_datadir}/config.kcfg/ksystemlog.kcfg -%{tde_datadir}/icons/hicolor/*/apps/ksystemlog.png -%{tde_datadir}/icons/hicolor/*/apps/ksystemlog.svgz - - -%changelog diff --git a/redhat/applications/ksystemlog/ksystemlog-14.0.0.spec b/redhat/applications/ksystemlog/ksystemlog.spec index 874974b0b..38f6d8f7b 100644 --- a/redhat/applications/ksystemlog/ksystemlog-14.0.0.spec +++ b/redhat/applications/ksystemlog/ksystemlog.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg ksystemlog %define tde_prefix /opt/trinity @@ -131,19 +131,17 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} -# Move desktop file to XDG folder -%__mkdir_p "%{?buildroot}%{tde_tdeappdir}" -%__mv -f "%{?buildroot}%{tde_datadir}/applnk/"*"/%{tde_pkg}.desktop" "%{?buildroot}%{tde_tdeappdir}" - # Missing category will make this fail. echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" +%find_lang %{tde_pkg} + %clean %__rm -rf %{buildroot} -%files +%files -f %{tde_pkg}.lang %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING README %{tde_bindir}/ksystemlog diff --git a/redhat/applications/ktechlab/ktechlab-3.5.13.2-ftbfs.patch b/redhat/applications/ktechlab/ktechlab-3.5.13.2-ftbfs.patch deleted file mode 100644 index cee50ee8f..000000000 --- a/redhat/applications/ktechlab/ktechlab-3.5.13.2-ftbfs.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- trinity-ktechlab-3.5.13.2/microbe/pic14.cpp.ORI 2013-08-17 17:57:55.624307580 +0200 -+++ trinity-ktechlab-3.5.13.2/microbe/pic14.cpp 2013-08-17 17:58:11.174961943 +0200 -@@ -277,7 +277,7 @@ - - bool PIC14::isValidInterrupt( const TQString & interruptName ) const - { -- if(m_type == "P16F84" || m_type =="P16C84") -+ if(m_type == P16F84 || m_type == P16C84) - { - return ( interruptName == "change" || - interruptName == "timer" || diff --git a/redhat/applications/ktechlab/ktechlab-3.5.13.2.spec b/redhat/applications/ktechlab/ktechlab-3.5.13.2.spec deleted file mode 100644 index 9d0799c7f..000000000 --- a/redhat/applications/ktechlab/ktechlab-3.5.13.2.spec +++ /dev/null @@ -1,132 +0,0 @@ -# Default version for this component -%define tde_pkg ktechlab -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: circuit simulator for microcontrollers and electronics [Trinity] -Version: 0.3 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -Patch0: ktechlab-3.5.13.2-ftbfs.patch - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: gettext - - -%description -KTechlab is a circuit simulator with a nice, clickable and discoverable -interface. It supports many discrete components, logic circuits as well -as PIC programming in its own Basic dialect and some form of assembler. - -Homepage: http://ktechlab.org/ - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%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/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" - -# Warning: --enable-final causes FTBFS -%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 \ - --disable-final \ - --enable-new-ldflags \ - --enable-closure \ - --enable-rpath - -%__make %{?_smp_mflags} - - -%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 || : - -%postun -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : - - -%files -f %{tde_pkg}.lang -%defattr(-,root,root,-) -%{tde_bindir}/ktechlab -%{tde_bindir}/microbe -%{tde_datadir}/applnk/Development/ktechlab.desktop -%{tde_datadir}/apps/katepart/syntax/microbe.xml -%{tde_datadir}/apps/ktechlab -%{tde_datadir}/config.kcfg/ktechlab.kcfg -%{tde_tdedocdir}/HTML/en/ktechlab/ -%{tde_datadir}/icons/hicolor/*/*/*.png -%{tde_datadir}/mimelnk/application/x-circuit.desktop -%{tde_datadir}/mimelnk/application/x-flowcode.desktop -%{tde_datadir}/mimelnk/application/x-ktechlab.desktop -%{tde_datadir}/mimelnk/application/x-microbe.desktop - - -%changelog diff --git a/redhat/applications/ktechlab/ktechlab-14.0.0.spec b/redhat/applications/ktechlab/ktechlab.spec index 9fec6ce5a..848381fce 100644 --- a/redhat/applications/ktechlab/ktechlab-14.0.0.spec +++ b/redhat/applications/ktechlab/ktechlab.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg ktechlab %define tde_prefix /opt/trinity @@ -66,6 +66,10 @@ BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: fdupes +%if 0%{?fedora} +#BuildRequires: gpsim-devel +%endif + # SUSE desktop files utility %if 0%{?suse_version} BuildRequires: update-desktop-files diff --git a/redhat/applications/ktorrent/ktorrent-3.5.13.2.spec b/redhat/applications/ktorrent/ktorrent-3.5.13.2.spec deleted file mode 100644 index 992ef2e1a..000000000 --- a/redhat/applications/ktorrent/ktorrent-3.5.13.2.spec +++ /dev/null @@ -1,184 +0,0 @@ -# Default version for this component -%define tde_pkg ktorrent -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: BitTorrent client for Trinity -Version: 2.2.8 -Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://ktorrent.org - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: gettext - -# AVAHI support -# Disabled on RHEL4 and RHEL5 -%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 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%{?suse_version} || 0%{?pclinuxos} -%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/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR; . "/etc/profile.d/qt3.sh" -export PATH="%{tde_bindir}:${PATH}" - -%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 \ - \ - %{?!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_appdir} > /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_appdir} > /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 - -%if 0%{?with_avahi} -%{tde_tdelibdir}/ktzeroconfplugin.la -%{tde_tdelibdir}/ktzeroconfplugin.so -%endif - - -%changelog diff --git a/redhat/applications/ktorrent/ktorrent-14.0.0.spec b/redhat/applications/ktorrent/ktorrent.spec index 2ecf72dac..0b3b055f0 100644 --- a/redhat/applications/ktorrent/ktorrent-14.0.0.spec +++ b/redhat/applications/ktorrent/ktorrent.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg ktorrent %define tde_prefix /opt/trinity diff --git a/redhat/applications/kuickshow/kuickshow-3.5.13.2.spec b/redhat/applications/kuickshow/kuickshow-3.5.13.2.spec deleted file mode 100644 index e87b7ad2f..000000000 --- a/redhat/applications/kuickshow/kuickshow-3.5.13.2.spec +++ /dev/null @@ -1,127 +0,0 @@ -# Default version for this component -%define tde_pkg kuickshow -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: Quick picture viewer for TDE -Version: 0.8.13 -Release: %{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -%if 0%{?rhel} || 0%{?fedora} || 0%{?mdkversion} -BuildRequires: imlib-devel -%endif -%if 0%{?suse_version} || 0%{?mgaversion} -BuildRequires: imlib1-devel -%endif - -%description -Kuickshow is a picture viewer for TDE. It displays the directory structure, -displaying images as thumbnails. -Clicking on an image shows the image in its normal size. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%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/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" - -%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 - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{?buildroot} - - -%clean -%__rm -rf %{buildroot} - - -%post -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : -/sbin/ldconfig - -%postun -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : -/sbin/ldconfig - -%files -%defattr(-,root,root,-) -%doc AUTHORS COPYING -%{tde_bindir}/kuickshow -%{tde_datadir}/applications/*/*.desktop -%{tde_datadir}/apps/kuickshow/ -%{tde_datadir}/icons/hicolor/*/*/* -%{tde_libdir}/libkdeinit_%{tde_pkg}.so -%{tde_libdir}/*.la -%{tde_tdelibdir}/*.so -%{tde_tdelibdir}/*.la -%{tde_tdedocdir}/HTML/en/kuickshow/ - - -%changelog diff --git a/redhat/applications/kuickshow/kuickshow-14.0.0.spec b/redhat/applications/kuickshow/kuickshow.spec index 1862df13f..d8a94d07c 100644 --- a/redhat/applications/kuickshow/kuickshow-14.0.0.spec +++ b/redhat/applications/kuickshow/kuickshow.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg kuickshow %define tde_prefix /opt/trinity diff --git a/redhat/applications/kvirc/kvirc-3.5.13.2.spec b/redhat/applications/kvirc/kvirc-3.5.13.2.spec deleted file mode 100644 index 32c340e5b..000000000 --- a/redhat/applications/kvirc/kvirc-3.5.13.2.spec +++ /dev/null @@ -1,211 +0,0 @@ -# REMOVE KDELIBS4-DEVEL before building !!!! - -# Default version for this component -%define tde_pkg kvirc -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: Trinity based next generation IRC client with module support -Version: 3.4.0 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://kvirc.net/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -# [kvirc] Modules do not install in correct folder [RHEL/Fedora] -Patch0: kvirc-3.5.13.2-fix_ftbfs.patch -# [kvirc] FTBFS because of missing link libraries [Bug #991] -Patch1: kvirc-3.5.13-ftbfs.patch -Patch2: kvirc-3.5.13.2-install_directory.patch - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: gettext - -Requires: %{name}-data = %{version}-%{release} - -%description -A highly configurable graphical IRC client with an MDI interface, -built-in scripting language, support for IRC DCC, drag & drop file -browsing, and much more. KVIrc uses the TDE widget set, can be extended -using its own scripting language, integrates with TDE, and supports -custom plugins. - -If you are a developer and you want to write a custom module for KVIrc, -you need to install the kvirc-dev package. - -%package data -Group: Applications/Utilities -Summary: Data files for KVIrc -Requires: %{name} = %{version}-%{release} - -%description data -This package contains the architecture-independent data needed by KVIrc in -order to run, such as icons and images, language files, and shell scripts. -It also contains complete reference guides on scripting and functions -within KVIrc in its internal help format. Unless you want to use KVIrc only -as a very simple IRC client you are likely to want to write scripts to -tailor KVIrc to your needs. - -KVIrc is a graphical IRC client based on the TDE widget set which integrates -with the Trinity Desktop Environment version 3. - -%package devel -Group: Development/Libraries -Summary: Development files for KVIrc -Requires: %{name} = %{version}-%{release} - -%description devel -This package contains KVIrc libraries and include files you need if you -want to develop plugins for KVIrc. - -KVIrc is a graphical IRC client based on the TDE widget set which integrates -with the K Desktop Environment version 3. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -#patch0 -p1 -%patch1 -p1 -%patch2 -p1 -b .installdir - -# Hardcoded absolute PATH to KDEDIR in source code ! That sucks ! -%__sed -i "src/kvirc/kernel/kvi_app_fs.cpp" \ - -e "s|/opt/kde3/lib|%{tde_prefix}/%{_lib}|g" -%__sed -i "src/kvirc/kernel/kvi_app_setup.cpp" \ - -e "s|/opt/kde3|%{tde_prefix}|g" - -%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -./autogen.sh - - -%build -unset QTDIR; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export KDEDIR=%{tde_prefix} - -%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-wall \ - \ - --with-pic \ - \ - --with-big-channels \ - --enable-perl \ - --with-ix86-asm \ - --with-kde-services-dir=%{tde_datadir}/services \ - --with-kde-library-dir=%{tde_libdir} \ - --with-kde-include-dir=%{tde_tdeincludedir} \ - --with-qt-library-dir=${QTLIB:-${QTDIR}/%{_lib}} \ - --with-qt-include-dir=${QTINC:-${QTDIR}/include} \ - --with-qt-moc=${QTDIR}/bin/moc - -# Symbolic links must exist prior to parallel building -%__make symlinks -C src/kvilib/build -%__make symlinks -C src/kvirc/build - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -# Debian maintainer has renamed 'COPYING' file to 'EULA', so we do the same ... -%__mv \ - %{?buildroot}%{tde_datadir}/kvirc/3.4/license/COPYING \ - %{?buildroot}%{tde_datadir}/kvirc/3.4/license/EULA - - -%clean -%__rm -rf %{buildroot} - - -%post -/sbin/ldconfig -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : - -%postun -/sbin/ldconfig -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : - - -%files -%defattr(-,root,root,-) -%doc ChangeLog FAQ README TODO -%{tde_bindir}/kvirc -%{tde_libdir}/*.so.* -%{tde_libdir}/kvirc/*/modules/*.so - -%files data -%defattr(-,root,root,-) -%{tde_bindir}/kvi_run_netscape -%{tde_bindir}/kvi_search_help -%{tde_libdir}/kvirc/ -%{tde_datadir}/applnk/Internet/kvirc.desktop -%{tde_datadir}/icons/hicolor/*/*/*.png -%{tde_datadir}/icons/hicolor/*/*/*.svgz -%{tde_datadir}/icons/hicolor/*/*/*.xpm -%{tde_datadir}/kvirc -%{tde_datadir}/mimelnk/text/*.desktop -%{tde_datadir}/services/*.protocol -%{tde_mandir}/man1/kvirc.1 - -%files devel -%defattr(-,root,root,-) -%{tde_bindir}/kvirc-config -%{tde_includedir}/kvirc/ -%{tde_libdir}/*.la -%{tde_libdir}/*.so -%{tde_libdir}/kvirc/*/modules/*.la - - -%changelog diff --git a/redhat/applications/kvirc/kvirc-14.0.0.spec b/redhat/applications/kvirc/kvirc.spec index 46d6a6d21..da3af96ad 100644 --- a/redhat/applications/kvirc/kvirc-14.0.0.spec +++ b/redhat/applications/kvirc/kvirc.spec @@ -22,7 +22,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg kvirc %define tde_prefix /opt/trinity diff --git a/redhat/applications/kvkbd/kvkbd-3.5.13.2.spec b/redhat/applications/kvkbd/kvkbd-3.5.13.2.spec deleted file mode 100644 index 0e66dd2ad..000000000 --- a/redhat/applications/kvkbd/kvkbd-3.5.13.2.spec +++ /dev/null @@ -1,117 +0,0 @@ -# Default version for this component -%define tde_pkg kvkbd -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: Virtual keyboard for TDE [Trinity] -Version: 0.4.8 -Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/System - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://pan4os.info/main/index.php - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - - -%description -Virtual keyboard for TDE for use with accessibility. Application contains -a systray widget as well as a dockwidget. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%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/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --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 - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - - -%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 AUTHORS ChangeLog COPYING NEWS README TODO -%{tde_bindir}/kvkbd -%{tde_datadir}/applnk/Utilities/kvkbd.desktop -%{tde_datadir}/apps/kvkbd/pics/dock.png -%{tde_datadir}/apps/kvkbd/pics/tray.png -%{tde_datadir}/icons/hicolor/*/apps/kvkbd.png - - -%changelog diff --git a/redhat/applications/kvkbd/kvkbd.spec b/redhat/applications/kvkbd/kvkbd.spec index a39ca1f22..9488cccd1 100644 --- a/redhat/applications/kvkbd/kvkbd.spec +++ b/redhat/applications/kvkbd/kvkbd.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg kvkbd %define tde_prefix /opt/trinity @@ -143,9 +143,7 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} -C build -# Move desktop file to XDG location -%__mkdir_p "%{?buildroot}%{tde_tdeappdir}" -%__mv -f "%{?buildroot}%{tde_datadir}/applnk/"*"/%{tde_pkg}.desktop" "%{?buildroot}%{tde_tdeappdir}" +%find_lang %{tde_pkg} # Updates applications categories for openSUSE %if 0%{?suse_version} @@ -157,9 +155,9 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} -%files +%files -f %{tde_pkg}.lang %defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING NEWS README TODO +%doc AUTHORS COPYING README %{tde_bindir}/kvkbd %{tde_tdeappdir}/kvkbd.desktop %{tde_datadir}/apps/kvkbd/ diff --git a/redhat/applications/kvpnc/kvpnc-14.0.0.patch b/redhat/applications/kvpnc/kvpnc-14.0.0.patch deleted file mode 100644 index 1d5b6b300..000000000 --- a/redhat/applications/kvpnc/kvpnc-14.0.0.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- trinity-kvpnc-14.0.0~pre118+1ae72fe0/src/Makefile.am.ORI 2013-07-20 12:35:51.155931996 +0200 -+++ trinity-kvpnc-14.0.0~pre118+1ae72fe0/src/Makefile.am 2013-07-20 12:37:49.601226585 +0200 -@@ -57,13 +57,13 @@ - - - install-data-local: -- $(mkinstalldirs) $(kde_appsdir)/ -- $(INSTALL_DATA) $(srcdir)/kvpnc.desktop $(kde_appsdir)/kvpnc.desktop -+ $(mkinstalldirs) $(xdg_appsdir)/ -+ $(INSTALL_DATA) $(srcdir)/kvpnc.desktop $(xdg_appsdir)/kvpnc.desktop - $(mkinstalldirs) $(kde_datadir)/kvpnc/ - $(INSTALL_DATA) $(srcdir)/kvpncui.rc $(kde_datadir)/kvpnc/kvpncui.rc - $(mkinstalldirs) $(kde_datadir)/kvpnc/ - $(INSTALL_DATA) $(srcdir)/eventsrc $(kde_datadir)/kvpnc/eventsrc -- $(INSTALL_DATA) $(srcdir)/ping_check.sh $(kde_datadir)/kvpnc/ping_check.sh -+ $(INSTALL_SCRIPT) $(srcdir)/ping_check.sh $(kde_datadir)/kvpnc/ping_check.sh - $(INSTALL_DATA) $(srcdir)/newprofilewizard.png $(kde_datadir)/kvpnc/newprofilewizard.png - $(INSTALL_DATA) $(srcdir)/newprofilewizard_final.png $(kde_datadir)/kvpnc/newprofilewizard_final.png - # $(INSTALL_DATA) $(srcdir)/x-cisco.desktop $(kde_mimedir)/application/x-cisco.desktop diff --git a/redhat/applications/kvpnc/kvpnc.spec b/redhat/applications/kvpnc/kvpnc.spec index d2d9fc81b..ad44e6173 100644 --- a/redhat/applications/kvpnc/kvpnc.spec +++ b/redhat/applications/kvpnc/kvpnc.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg kvpnc %define tde_prefix /opt/trinity @@ -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 @@ -111,7 +109,6 @@ It supports : %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%patch0 -p1 -b .installdir %build diff --git a/redhat/applications/kxmleditor/kxmleditor.spec b/redhat/applications/kxmleditor/kxmleditor.spec index cf0447a98..846645b56 100644 --- a/redhat/applications/kxmleditor/kxmleditor.spec +++ b/redhat/applications/kxmleditor/kxmleditor.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg kxmleditor %define tde_prefix /opt/trinity @@ -61,7 +61,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils -BuildRequires: autoconf automake libtool m4 +BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: libtool @@ -98,40 +98,36 @@ contents. %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/"*"/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}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --includedir=%{tde_tdeincludedir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ +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 \ \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath \ - --disable-gcc-hidden-visibility + -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \ + -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ + -DDATA_INSTALL_DIR=%{tde_datadir}/apps \ + -DLIB_INSTALL_DIR=%{tde_libdir} \ + -DBUILD_ALL=ON \ + .. -%__make %{?_smp_mflags} || %__make +%__make %{?_smp_mflags} %install export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} +%__make install DESTDIR=%{buildroot} -C build %find_lang %{tde_pkg} @@ -152,16 +148,17 @@ export PATH="%{tde_bindir}:${PATH}" %files -f %{tde_pkg}.lang %defattr(-,root,root,-) %{tde_bindir}/kxmleditor -%{tde_tdelibdir}/libkxmleditorpart.la -%{tde_tdelibdir}/libkxmleditorpart.so -%{tde_tdelibdir}/libkxmleditorpart.so.1 -%{tde_tdelibdir}/libkxmleditorpart.so.1.0.0 +%{tde_libdir}/libkxmleditorpart.la +%{tde_libdir}/libkxmleditorpart.so +%{tde_libdir}/libkxmleditorpart.so.1 +%{tde_libdir}/libkxmleditorpart.so.1.0.0 %{tde_tdeappdir}/kxmleditor.desktop %{tde_datadir}/apps/kxmleditor/ %{tde_tdedocdir}/HTML/en/kxmleditor/ %{tde_datadir}/icons/hicolor/*/apps/kxmleditor.png %{tde_datadir}/icons/locolor/*/apps/kxmleditor.png %{tde_datadir}/services/kxmleditorpart.desktop +%{tde_mandir}/man1/kxmleditor.1* %post diff --git a/redhat/applications/mathemagics/mathemagics.spec b/redhat/applications/mathemagics/mathemagics.spec new file mode 100644 index 000000000..7825222a4 --- /dev/null +++ b/redhat/applications/mathemagics/mathemagics.spec @@ -0,0 +1,130 @@ +# +# spec file for package mathemagics (version R14.0.0) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" +%define tde_version 14.1.0 +%endif +%define tde_pkg mathemagics +%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_mandir %{tde_datadir}/man +%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 + + +Name: trinity-%{tde_pkg} +Summary: Mathemagics is a RPN Calculator. +Version: 1.1 +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +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: cmake +BuildRequires: gcc-c++ +BuildRequires: pkgconfig +BuildRequires: libtool + + +%description +Mathemagics is a RPN Calculator. + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%debug_package +%endif + + +%prep +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} + + +%build +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 \ + \ + -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \ + -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ + -DDATA_INSTALL_DIR=%{tde_datadir}/apps \ + -DLIB_INSTALL_DIR=%{tde_libdir} \ + -DBUILD_ALL=ON \ + .. + +%__make %{?_smp_mflags} + + +%install +export PATH="%{tde_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} -C build + + +%clean +%__rm -rf $RPM_BUILD_ROOT + + +%files +%defattr(-,root,root,-) +%doc AUTHORS COPYING README +%{tde_bindir}/mathemagics +%{tde_tdeappdir}/mathemagics.desktop +%{tde_datadir}/apps/mathemagics/mathemagicsui.rc +%{tde_datadir}/icons/hicolor/22x22/apps/mathemagics.png +%{tde_datadir}/icons/hicolor/32x32/apps/mathemagics.png +%{tde_datadir}/icons/hicolor/48x48/apps/mathemagics.png +%{tde_datadir}/icons/locolor/16x16/apps/mathemagics.png +%{tde_datadir}/icons/locolor/32x32/apps/mathemagics.png +%{tde_tdedocdir}/HTML/en/mathemagics/ +%{tde_mandir}/man1/mathemagics.1* + + +%changelog diff --git a/redhat/applications/mplayerthumbs/mplayerthumbs.spec b/redhat/applications/mplayerthumbs/mplayerthumbs.spec index 625d7d810..96e9c7042 100644 --- a/redhat/applications/mplayerthumbs/mplayerthumbs.spec +++ b/redhat/applications/mplayerthumbs/mplayerthumbs.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg mplayerthumbs %define tde_prefix /opt/trinity @@ -147,12 +147,14 @@ fi %__rm -rf $RPM_BUILD_ROOT %__make install DESTDIR=%{buildroot} -C build +%find_lang %{tde_pkg} + %clean %__rm -rf $RPM_BUILD_ROOT -%files +%files -f %{tde_pkg}.lang %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING README %{tde_bindir}/mplayerthumbsconfig diff --git a/redhat/applications/piklab/piklab-3.5.13.2.spec b/redhat/applications/piklab/piklab-3.5.13.2.spec deleted file mode 100644 index 425bb42a5..000000000 --- a/redhat/applications/piklab/piklab-3.5.13.2.spec +++ /dev/null @@ -1,145 +0,0 @@ -# Default version for this component -%define tde_pkg piklab -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_tdedocdir} - - -Name: trinity-%{tde_pkg} -Summary: IDE for PIC-microcontroller development [Trinity] -Version: 0.15.2 -Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: gettext -BuildRequires: readline-devel - -%description -Piklab is an integrated development environment for applications based on -Microchip PIC and dsPIC microcontrollers similar to the MPLAB environment. - -Support for several compiler and assembler toolchains is integrated. The -GPSim simulator, the ICD1 programmer, the ICD2 debugger, the PICkit1 and -PICkit2 programmers, the PicStart+ programmer, and most direct programmers -are supported. A command-line programmer and debugger are also available. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%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/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" - -# 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} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ - --includedir=%{tde_tdeincludedir} \ - \ - --disable-dependency-tracking \ - --disable-debug \ - --disable-final \ - --enable-new-ldflags \ - --enable-closure \ - --enable-rpath \ -%if 0%{?rhel} == 5 - --disable-libreadline \ -%endif - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -# Incorrect extension on manpage -%__mv -f %{buildroot}%{tde_mandir}/man1/piklab.1x %{buildroot}%{tde_mandir}/man1/piklab.1 - -%find_lang %{tde_pkg} - -%clean -%__rm -rf %{buildroot} - - -%post -update-desktop-database %{tde_appdir} > /dev/null -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : - -%postun -update-desktop-database %{tde_appdir} > /dev/null -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : - - -%files -f %{tde_pkg}.lang -%defattr(-,root,root,-) -%{tde_bindir}/piklab -%{tde_bindir}/piklab-coff -%{tde_bindir}/piklab-hex -%{tde_bindir}/piklab-prog -%{tde_tdeappdir}/piklab.desktop -%{tde_datadir}/apps/katepart/syntax/asm-pic.xml -%{tde_datadir}/apps/katepart/syntax/coff-c-pic.xml -%{tde_datadir}/apps/katepart/syntax/coff-pic.xml -%{tde_datadir}/apps/katepart/syntax/jal-pic.xml -%{tde_datadir}/apps/piklab -%{tde_tdedocdir}/HTML/en/piklab -%{tde_datadir}/icons/hicolor/*/*/*.png -%{tde_datadir}/mimelnk/application/x-piklab.desktop -%{tde_mandir}/man1/piklab-coff.1 -%{tde_mandir}/man1/piklab-hex.1 -%{tde_mandir}/man1/piklab-prog.1 -%{tde_mandir}/man1/piklab.1 - - -%changelog diff --git a/redhat/applications/piklab/piklab-14.0.0.spec b/redhat/applications/piklab/piklab.spec index 7bcffe525..ff8d574d2 100644 --- a/redhat/applications/piklab/piklab-14.0.0.spec +++ b/redhat/applications/piklab/piklab.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg piklab %define tde_prefix /opt/trinity diff --git a/redhat/applications/potracegui/potracegui-3.5.13.2.spec b/redhat/applications/potracegui/potracegui-3.5.13.2.spec deleted file mode 100644 index d8b4709c7..000000000 --- a/redhat/applications/potracegui/potracegui-3.5.13.2.spec +++ /dev/null @@ -1,122 +0,0 @@ -# Default version for this component -%define tde_pkg potracegui -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_tdedocdir} - - -Name: trinity-%{tde_pkg} -Summary: TDE frontend for potrace [Trinity] -Version: 1.3 -Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Multimedia - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://potracegui.sourceforge.net - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - - -%description -A TDE interface for the commandline tracing tools potrace and/or autotrace. It -supports drag and drop as well as all image types recognized by TDE, which are -a lot more than the 4 recognized by the potrace commandline tool. Loading of -remote files (web, ftp, ...) is also supported. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%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/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" - -%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 - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - - -%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 AUTHORS ChangeLog COPYING NEWS README TODO -%{tde_bindir}/potracegui -%{tde_datadir}/applnk/Utilities/potracegui.desktop -%{tde_datadir}/apps/potracegui/potraceguiui.rc -%{tde_tdedocdir}/HTML/en/potracegui/common -%{tde_tdedocdir}/HTML/en/potracegui/index.cache.bz2 -%{tde_tdedocdir}/HTML/en/potracegui/index.docbook -%{tde_datadir}/icons/hicolor/16x16/apps/potracegui.png -%{tde_datadir}/icons/hicolor/32x32/apps/potracegui.png -%lang(de) %{tde_datadir}/locale/de/LC_MESSAGES/potracegui.mo - - -%changelog diff --git a/redhat/applications/potracegui/potracegui.spec b/redhat/applications/potracegui/potracegui.spec index 8b54c5611..79938421f 100644 --- a/redhat/applications/potracegui/potracegui.spec +++ b/redhat/applications/potracegui/potracegui.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg potracegui %define tde_prefix /opt/trinity @@ -144,9 +144,7 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} -C build -# Move desktop file to XDG location -%__mkdir_p "%{?buildroot}%{tde_tdeappdir}" -%__mv -f "%{?buildroot}%{tde_datadir}/applnk/"*"/%{tde_pkg}.desktop" "%{?buildroot}%{tde_tdeappdir}" +%find_lang %{tde_pkg} # Updates applications categories for openSUSE %if 0%{?suse_version} @@ -158,16 +156,14 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} -%files +%files -f %{tde_pkg}.lang %defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING NEWS README TODO +%doc AUTHORS ChangeLog COPYING README %{tde_bindir}/potracegui %{tde_tdeappdir}/potracegui.desktop %{tde_datadir}/apps/potracegui/ %{tde_tdedocdir}/HTML/en/potracegui/ -%{tde_datadir}/icons/hicolor/16x16/apps/potracegui.png -%{tde_datadir}/icons/hicolor/32x32/apps/potracegui.png -%lang(de) %{tde_datadir}/locale/de/LC_MESSAGES/potracegui.mo +%{tde_datadir}/icons/hicolor/*/apps/potracegui.png %{tde_mandir}/man1/*.1* diff --git a/redhat/applications/qalculate-tde/qalculate-tde.spec b/redhat/applications/qalculate-tde/qalculate-tde.spec index 365e96bd8..ccfd3eac8 100644 --- a/redhat/applications/qalculate-tde/qalculate-tde.spec +++ b/redhat/applications/qalculate-tde/qalculate-tde.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg qalculate-tde %define tde_prefix /opt/trinity @@ -74,6 +74,9 @@ BuildRequires: cln-devel %if 0%{?pclinuxos} >= 2018 BuildRequires: libcln-devel %endif +%if 0%{?mgaversion} >= 7 +BuildRequires: %{_lib}cln-devel +%endif # SUSE desktop files utility %if 0%{?suse_version} @@ -106,6 +109,9 @@ This package contains the TDE user interface of qalculate. %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} +# Fix build on r14.0.x +%__sed -i *"/Makefile.am" -e "s|\$(LIB_TQT)|-ltqt-mt|" + %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" diff --git a/redhat/applications/qt4-tqt-theme-engine/qt4-tqt-theme-engine-14.0.0.spec b/redhat/applications/qt4-tqt-theme-engine/qt4-tqt-theme-engine.spec index bced59322..d564e576e 100644 --- a/redhat/applications/qt4-tqt-theme-engine/qt4-tqt-theme-engine-14.0.0.spec +++ b/redhat/applications/qt4-tqt-theme-engine/qt4-tqt-theme-engine.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg qt4-tqt-theme-engine %define tde_prefix /opt/trinity @@ -81,7 +81,11 @@ BuildRequires: brp-check-trinity # QT4 support %if 0%{?suse_version} +%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150200 +BuildRequires: libqt4-devel +%else BuildRequires: qt-devel +%endif %else BuildRequires: qt4-devel %endif diff --git a/redhat/applications/rosegarden/rosegarden-3.5.13.2.spec b/redhat/applications/rosegarden/rosegarden-3.5.13.2.spec deleted file mode 100644 index 6a96604e9..000000000 --- a/redhat/applications/rosegarden/rosegarden-3.5.13.2.spec +++ /dev/null @@ -1,217 +0,0 @@ -# Default version for this component -%define tde_pkg rosegarden -%define tde_version 3.5.13.2 - -# Required for Mageia 2: removes the ldflag '--no-undefined' -%define _disable_ld_no_undefined 1 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_tdedocdir} - - -Name: trinity-%{tde_pkg} -Summary: music editor and MIDI/audio sequencer [Trinity] -Version: 1.7.0 -Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Multimedia - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.rosegardenmusic.com/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: gettext -BuildRequires: fftw-devel -BuildRequires: liblo-devel -BuildRequires: fontconfig-devel - -#ย DSSI support -%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?suse_version} -BuildRequires: dssi-devel -%endif - -# LRDF support -%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?suse_version} -BuildRequires: liblrdf-devel -%endif - -# JACK support -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: %{_lib}jack-devel -%else -BuildRequires: jack-audio-connection-kit-devel -%endif - -# LIRC support -%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 -%define with_lirc 1 -BuildRequires: lirc-devel -%endif - -Requires: lilypond -Requires: perl-XML-Twig - -%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} -Requires: libsndfile-progs -%else -%if 0%{?rhel} -Requires: libsndfile -%else -Requires: libsndfile-utils -%endif -%endif - - -Requires: %{name}-data == %{version}-%{release} - -%description -Rosegarden is a TDE application which provides a mixed Audio/MIDI -sequencer (for playback and recording), a multi-track editor, music -editing using both piano-roll and score notation, MIDI file IO, -lilypond and Csound files export, etc. - -%package data -Group: Applications/Multimedia -Requires: %{name} == %{version}-%{release} -Summary: music editor and MIDI/audio sequencer data files [Trinity] - -%description data -Rosegarden is a TDE application which provides a mixed Audio/MIDI -sequencer (for playback and recording), a multi-track editor, music -editing using both piano-roll and score notation, MIDI file IO, -lilypond and Csound files export, etc. - -This package provides the data files necessary for running Rosegarden - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} - - -%build -unset QTDIR QTINC QTLIB -. %{_sysconfdir}/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" - -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" -export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_tdeincludedir}" - -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 \ - \ - -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \ - -DBIN_INSTALL_DIR=%{tde_bindir} \ - -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \ - -DLIB_INSTALL_DIR=%{tde_libdir} \ - -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ - \ - -DWANT_SOUND=ON \ - -DWANT_JACK=ON \ - -DWANT_DSSI=ON \ - %{?with_lirc:-DWANT_LIRC=ON} %{?!with_lirc:-DWANT_LIRC=OFF} \ - -DWANT_PCH=OFF \ - -DWANT_TEST=OFF \ - -DWANT_DEBUG=OFF \ - -DWANT_FULLDBG=OFF \ - -DBUILD_ALL=ON \ - .. - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} -C build - -# Unwanted files -%__rm -f %{?buildroot}%{tde_libdir}/*.a - -%find_lang %{tde_pkg} - - -%clean -%__rm -rf %{buildroot} - - -%post -update-desktop-database %{tde_appdir} > /dev/null -for f in hicolor locolor; do - touch --no-create %{tde_datadir}/icons/${f} || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : -done - -%postun -update-desktop-database %{tde_appdir} > /dev/null -for f in hicolor locolor; do - touch --no-create %{tde_datadir}/icons/${f} || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : -done - - -%files -%defattr(-,root,root,-) -%{tde_bindir}/rosegarden -%{tde_bindir}/rosegarden-audiofile-importer -%{tde_bindir}/rosegarden-lilypondview -%{tde_bindir}/rosegarden-project-package -%{tde_bindir}/rosegardensequencer - -%files data -f %{tde_pkg}.lang -%defattr(-,root,root,-) -%{tde_tdeappdir}/rosegarden.desktop -%{tde_datadir}/apps/profiles/rosegarden.profile.xml -%lang(en) %{tde_tdedocdir}/HTML/en/rosegarden -%lang(es) %{tde_tdedocdir}/HTML/es/rosegarden -%lang(ja) %{tde_tdedocdir}/HTML/ja/rosegarden -%lang(sv) %{tde_tdedocdir}/HTML/sv/rosegarden -%{tde_datadir}/apps/rosegarden -%{tde_datadir}/icons/hicolor/*/*/* -%{tde_datadir}/icons/locolor/*/*/* -%{tde_datadir}/mimelnk/audio/x-rosegarden-device.desktop -%{tde_datadir}/mimelnk/audio/x-rosegarden.desktop -%{tde_datadir}/mimelnk/audio/x-rosegarden21.desktop -%{tde_datadir}/mimelnk/audio/x-soundfont.desktop - - -%changelog diff --git a/redhat/applications/rosegarden/rosegarden-14.0.0.spec b/redhat/applications/rosegarden/rosegarden.spec index ddc7115cd..1ecc20f45 100644 --- a/redhat/applications/rosegarden/rosegarden-14.0.0.spec +++ b/redhat/applications/rosegarden/rosegarden.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg rosegarden %define tde_prefix /opt/trinity diff --git a/redhat/applications/smartcardauth/smartcardauth-3.5.13.2.spec b/redhat/applications/smartcardauth/smartcardauth-3.5.13.2.spec deleted file mode 100644 index 18d214b2c..000000000 --- a/redhat/applications/smartcardauth/smartcardauth-3.5.13.2.spec +++ /dev/null @@ -1,138 +0,0 @@ -# Default version for this component -%define tde_pkg smartcardauth -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_tdedocdir} - - -Name: trinity-%{tde_pkg} -Summary: SmartCard Login and LUKS Decrypt, Setup Utility -Version: 1.0 -Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/System - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -#BuildRequires: perl-PAR-Packer -%if 0%{?mgaversion} || 0%{?mdkversion} -Requires: perl-pcsc-perl -%endif -%if 0%{?rhel} || 0%{?fedora} -Requires: pcsc-perl -%endif -%if 0%{?suse_version} -Requires: perl-pcsc -%endif - -%description -This utility will allow you to set up your computer to accept a SmartCard as an authentication source for: -- Your encrypted LUKS partition -- TDE3.x, including automatic login, lock, and unlock features - -It is designed to work with any ISO 7816-1,2,3,4 compliant smartcard -Examples of such cards are: -- The Schlumberger MultiFlex -- The ACS ACOS5 / ACOS6 series of cryptographic ISO 7816 cards - -If a card is chosen that has PKSC support, such as the ACOS cards, this utility can run -simultaneously with the certificate reading program(s) to provide single sign on -in addition to the PKCS certificate functionality - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} - -%__sed -i "Makefile" \ - -e "s|/usr/lib/perl5/Chipcard|%{_libdir}/perl5/vendor_perl/Chipcard|g" - - -%build -export PATH="%{tde_bindir}:${PATH}" - -./build_ckpasswd - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} - -%__install -D -m 755 scriptor_standalone.pl %{buildroot}%{tde_bindir}/scriptor.pl -%__install -D -m 755 src/ckpasswd %{buildroot}%{tde_bindir}/smartauthckpasswd -#%__install -D -m 755 src/ckpasswd %{buildroot}%{tde_bindir}/smartauthmon -%__ln_s smartauthckpasswd %{buildroot}%{tde_bindir}/smartauthmon -%__cp -Rp usr/* %{buildroot}%{tde_prefix} - -%__mkdir_p %{buildroot}%{_sysconfdir} -%__cp -Rp etc/* %{buildroot}%{_sysconfdir} - - -%clean -%__rm -rf %{buildroot} - - -%post -update-desktop-database %{tde_appdir} > /dev/null -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : - -%postun -update-desktop-database %{tde_appdir} > /dev/null -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : - - -%files -%defattr(-,root,root,-) -%doc gpl.txt -%{_sysconfdir}/init/smartauthlogin.conf -%{_sysconfdir}/smartauth/smartauth.sh.in -%{_sysconfdir}/smartauth/smartauthmon.sh.in -%{tde_bindir}/cryptosmartcard.sh -%{tde_bindir}/scriptor.pl -%{tde_bindir}/setupcard.sh -%{tde_bindir}/setupslavecard.sh -%{tde_bindir}/smartauth.sh -%{tde_bindir}/smartauthckpasswd -%{tde_bindir}/smartauthmon -%{tde_datadir}/applications/smartcardauth.desktop -%{tde_datadir}/applications/smartcardrestrict.desktop -%{tde_datadir}/icons/hicolor/16x16/apps/smartcardauth.png -%{tde_datadir}/icons/hicolor/32x32/apps/smartcardauth.png -%{tde_datadir}/initramfs-tools/hooks/cryptlukssc - - -%changelog diff --git a/redhat/applications/smartcardauth/smartcardauth-14.0.0.spec b/redhat/applications/smartcardauth/smartcardauth.spec index 27ed4338c..15e037274 100644 --- a/redhat/applications/smartcardauth/smartcardauth-14.0.0.spec +++ b/redhat/applications/smartcardauth/smartcardauth.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg smartcardauth %define tde_prefix /opt/trinity @@ -33,10 +33,11 @@ %define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdelibdir %{tde_libdir}/trinity -%if 0%{?fedora} >= 27 +%if 0%{?fedora} >= 27 || 0%{?mgaversion} %define debug_package %{nil} %endif +%define dont_check_desktop_files 1 Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} @@ -65,7 +66,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils -BuildRequires: autoconf automake libtool m4 +BuildRequires: cmake >= 2.8 BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: fdupes @@ -80,10 +81,8 @@ BuildRequires: update-desktop-files BuildRequires: brp-check-trinity %endif -#BuildRequires: perl-PAR-Packer - # PCSC support -%if 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} Requires: perl-pcsc-perl %endif %if 0%{?rhel} || 0%{?fedora} @@ -105,12 +104,8 @@ BuildRequires: pkcs11-helper-devel %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} >= 1220 || 0%{?mdkversion} || 0%{?mgaversion} %define with_db 1 %if 0%{?mgaversion} || 0%{?mdkversion} -%if 0%{?pclinuxos} -BuildRequires: db4-devel -%else BuildRequires: db5-devel %endif -%endif %if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 BuildRequires: libdb-devel BuildRequires: libdb-cxx-devel @@ -133,6 +128,9 @@ BuildRequires: libgnutls-devel BuildRequires: gnutls-devel %endif +# The 'pp' utility +BuildRequires: perl-PAR-Packer + %description This utility will allow you to set up your computer to accept a SmartCard as an authentication source for: @@ -162,27 +160,52 @@ in addition to the PKCS certificate functionality %build +unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" -cd src -make CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" +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_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=OFF \ + \ + -DCMAKE_INSTALL_PREFIX="%{_prefix}" \ + \ + -DWITH_ALL_OPTIONS=ON \ + -DWITH_GCC_VISIBILITY=ON \ +%if 0%{?mgaversion} || 0%{?pclinuxos} + -DPERL_PAR_PACKER="pp.pl" \ +%endif +%if 0%{?mgaversion} == 6 || 0%{?pclinuxos} + -DPERL_LIB_CHIPCARD="%{perl_sitearch}" \ +%endif +%if 0%{?suse_version} + -DPERL_LIB_CHIPCARD="%{perl_vendorarch}" \ +%endif + \ + -DBUILD_ALL=ON \ + -DBUILD_DOC=ON \ + -DBUILD_TRANSLATIONS=ON \ + \ + .. + +%__make %{?_smp_mflags} || %__make %install export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} +%__make install DESTDIR="%{?buildroot}" -C build -%if "%{tde_version}" == "14.1.0" -%__make install DESTDIR="%{?buildroot}" -%else -%__install -D -m 755 "scriptor_standalone.pl" "%{buildroot}%{_bindir}/scriptor.pl" -%__install -D -m 755 "src/ckpasswd" "%{buildroot}%{_bindir}/smartauthckpasswd" -%__ln_s "smartauthckpasswd" "%{buildroot}%{_bindir}/smartauthmon" -%__cp -Rp "usr/"* "%{buildroot}%{_prefix}" - -echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{_datadir}/applications/smartcardauth.desktop" -echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{_datadir}/applications/smartcardrestrict.desktop" -%endif +# Debian stuff +%__rm -f %{buildroot}/usr/share/initramfs-tools/hooks/cryptlukssc %clean @@ -192,22 +215,8 @@ echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{_datadir}/applications/smartcardrestric %files %defattr(-,root,root,-) %doc gpl.txt -%{_bindir}/cryptosmartcard.sh -%{_datadir}/initramfs-tools/ -%if "%{tde_version}" == "14.1.0" %{_bindir}/cardpincheck -%else -%{_bindir}/scriptor.pl -%{_bindir}/setupcard.sh -%{_bindir}/setupslavecard.sh -%{_bindir}/smartauth.sh -%{_bindir}/smartauthckpasswd -%{_bindir}/smartauthmon -%{_datadir}/applications/smartcardauth.desktop -%{_datadir}/applications/smartcardrestrict.desktop -%{_datadir}/icons/hicolor/16x16/apps/smartcardauth.png -%{_datadir}/icons/hicolor/32x32/apps/smartcardauth.png -%endif +%{_bindir}/cryptosmartcard.sh %changelog diff --git a/redhat/applications/smb4k/smb4k-3.5.13.2.spec b/redhat/applications/smb4k/smb4k-3.5.13.2.spec deleted file mode 100644 index de9634699..000000000 --- a/redhat/applications/smb4k/smb4k-3.5.13.2.spec +++ /dev/null @@ -1,174 +0,0 @@ -# Default version for this component -%define tde_pkg smb4k -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_tdedocdir} - - -Name: trinity-%{tde_pkg} -Summary: A Samba (SMB) share advanced browser for Trinity -Version: 0.9.4 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: gettext - - -%description -Smb4K is a SMB (Windows) share browser for TDE. It uses the Samba software -suite to access the SMB shares of the local network neighborhood. Its purpose -is to provide a program that's easy to use and has as many features as -possible. - -%files -f %{tde_pkg}.lang -%defattr(-,root,root,-) -%{tde_bindir}/smb4k -%{tde_bindir}/smb4k_cat -%{tde_bindir}/smb4k_kill -%{tde_bindir}/smb4k_mount -%{tde_bindir}/smb4k_mv -%{tde_bindir}/smb4k_umount -%{tde_libdir}/libsmb4kcore.so.2 -%{tde_libdir}/libsmb4kcore.so.2.0.0 -%{tde_libdir}/libsmb4kdialogs.la -%{tde_libdir}/libsmb4kdialogs.so -%{tde_tdelibdir}/konqsidebar_smb4k.la -%{tde_tdelibdir}/konqsidebar_smb4k.so -%{tde_tdelibdir}/libsmb4kconfigdialog.la -%{tde_tdelibdir}/libsmb4kconfigdialog.so -%{tde_tdelibdir}/libsmb4knetworkbrowser.la -%{tde_tdelibdir}/libsmb4knetworkbrowser.so -%{tde_tdelibdir}/libsmb4ksearchdialog.la -%{tde_tdelibdir}/libsmb4ksearchdialog.so -%{tde_tdelibdir}/libsmb4ksharesiconview.la -%{tde_tdelibdir}/libsmb4ksharesiconview.so -%{tde_tdelibdir}/libsmb4kshareslistview.la -%{tde_tdelibdir}/libsmb4kshareslistview.so -%{tde_tdeappdir}/smb4k.desktop -%{tde_datadir}/apps/konqsidebartng/add/smb4k_add.desktop -%{tde_datadir}/apps/smb4k/smb4k_shell.rc -%{tde_datadir}/apps/smb4knetworkbrowserpart/smb4knetworkbrowser_part.rc -%{tde_datadir}/apps/smb4ksharesiconviewpart/smb4ksharesiconview_part.rc -%{tde_datadir}/apps/smb4kshareslistviewpart/smb4kshareslistview_part.rc -%{tde_datadir}/config.kcfg/smb4k.kcfg -%{tde_datadir}/icons/crystalsvg/*/apps/smb4k.png -%{tde_tdedocdir}/HTML/en/smb4k/ - -%post -update-desktop-database %{tde_appdir} > /dev/null -touch --no-create %{tde_datadir}/icons/crystalsvg || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || : -/sbin/ldconfig || : - -%postun -update-desktop-database %{tde_appdir} > /dev/null -touch --no-create %{tde_datadir}/icons/crystalsvg || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || : -/sbin/ldconfig || : - -########## - -%package devel -Summary: Development files for %{name} -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} - -%description devel -%{summary} - -%files devel -%{tde_tdeincludedir}/*.h -%{tde_libdir}/libsmb4kcore.la -%{tde_libdir}/libsmb4kcore.so - -%post devel -/sbin/ldconfig || : - -%postun devel -/sbin/ldconfig || : - -########## - -%if 0%{?suse_version} || 0%{?pclinuxos} -%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/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" - -export KDEDIR="%{tde_prefix}" - -%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 - -# SMP safe ! -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -%find_lang %{tde_pkg} - - -%clean -%__rm -rf %{buildroot} - - -%changelog diff --git a/redhat/applications/smb4k/smb4k-14.0.0.spec b/redhat/applications/smb4k/smb4k.spec index 9e30a9b06..8d1ee44d5 100644 --- a/redhat/applications/smb4k/smb4k-14.0.0.spec +++ b/redhat/applications/smb4k/smb4k.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg smb4k %define tde_prefix /opt/trinity @@ -160,6 +160,7 @@ export PATH="%{tde_bindir}:${PATH}" --libdir=%{tde_libdir} \ --mandir=%{tde_mandir} \ --includedir=%{tde_tdeincludedir} \ + --program-prefix="" \ \ --disable-dependency-tracking \ --disable-debug \ diff --git a/redhat/applications/soundkonverter/soundkonverter-3.5.13.2.spec b/redhat/applications/soundkonverter/soundkonverter-3.5.13.2.spec deleted file mode 100644 index c64351829..000000000 --- a/redhat/applications/soundkonverter/soundkonverter-3.5.13.2.spec +++ /dev/null @@ -1,171 +0,0 @@ -# Default version for this component -%define tde_pkg soundkonverter -%define tde_version 3.5.13.2 - -# TDE 3.5.13 specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_tdedocdir} - - -Name: trinity-%{tde_pkg} -Summary: audio converter frontend for Trinity -Version: 0.3.8 -Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Application/Multimedia - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://potracegui.sourceforge.net - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - - -%description -soundKonverter is a frontend to various audio converters. - -The key features are: - - Audio conversion - - Replay Gain calculation - - CD ripping - -soundKonverter supports reading and writing tags for many formats, so the tags -are preserved when converting files. - -It comes with an Amarok script. - -See 'soundkonverter-amarok' package for more informations. - -See README.Debian for more informations on supported formats. - - -%package amarok -Summary: audio converter frontend for Trinity (Amarok script) -Group: Application/Multimedia -Requires: %{name} = %{version}-%{release} -Requires: trinity-amarok - -%description amarok -Amarok script for soundKonverter. It allows you to easily transcode files when -transferring them to your media device. - -See the 'soundkonverter-trinity' package for more information. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%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/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" - -%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 \ - \ - --with-extra-includes=/usr/include/cdda - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -%find_lang %{tde_pkg} - -%clean -%__rm -rf %{buildroot} - - -%post -update-desktop-database %{tde_appdir} > /dev/null -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : - -%postun -update-desktop-database %{tde_appdir} > /dev/null -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : - - -%files -f %{tde_pkg}.lang -%defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING NEWS README TODO -%{tde_bindir}/soundkonverter -%{tde_bindir}/userscript.sh -%{tde_tdeappdir}/soundkonverter.desktop -%{tde_datadir}/apps/konqueror/servicemenus/audiocd_extract_with_soundkonverter.desktop -%{tde_datadir}/apps/soundkonverter -%exclude %{tde_datadir}/apps/soundkonverter/amarokscript/README -%exclude %{tde_datadir}/apps/soundkonverter/amarokscript/soundKonverter.rb -%{tde_tdedocdir}/HTML/en/soundkonverter/common -%{tde_tdedocdir}/HTML/en/soundkonverter/index.cache.bz2 -%{tde_tdedocdir}/HTML/en/soundkonverter/index.docbook -%{tde_datadir}/icons/hicolor/*/apps/soundkonverter*.png -%{tde_datadir}/mimelnk/application/x-la.soundkonverter.desktop -%{tde_datadir}/mimelnk/application/x-ofc.soundkonverter.desktop -%{tde_datadir}/mimelnk/application/x-ofr.soundkonverter.desktop -%{tde_datadir}/mimelnk/application/x-ofs.soundkonverter.desktop -%{tde_datadir}/mimelnk/application/x-shorten.soundkonverter.desktop -%{tde_datadir}/mimelnk/audio/amr.soundkonverter.desktop -%{tde_datadir}/mimelnk/audio/x-ape.soundkonverter.desktop -%{tde_datadir}/mimelnk/audio/x-bonk.soundkonverter.desktop -%{tde_datadir}/mimelnk/audio/x-pac.soundkonverter.desktop -%{tde_datadir}/mimelnk/audio/x-tta.soundkonverter.desktop -%{tde_datadir}/mimelnk/audio/x-wavpack-correction.soundkonverter.desktop -%{tde_datadir}/mimelnk/audio/x-wavpack.soundkonverter.desktop -%{tde_datadir}/mimelnk/video/x-flv.soundkonverter.desktop - -%files amarok -%defattr(-,root,root,-) -%{tde_datadir}/apps/soundkonverter/amarokscript/README -%{tde_datadir}/apps/soundkonverter/amarokscript/soundKonverter.rb - - -%changelog diff --git a/redhat/applications/soundkonverter/soundkonverter-14.0.0.spec b/redhat/applications/soundkonverter/soundkonverter.spec index 25ee3424d..6c3ffae19 100644 --- a/redhat/applications/soundkonverter/soundkonverter-14.0.0.spec +++ b/redhat/applications/soundkonverter/soundkonverter.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg soundkonverter %define tde_prefix /opt/trinity @@ -146,6 +146,7 @@ export PATH="%{tde_bindir}:${PATH}" --libdir=%{tde_libdir} \ --mandir=%{tde_mandir} \ --includedir=%{tde_tdeincludedir} \ + --program-prefix="" \ \ --disable-dependency-tracking \ --disable-debug \ diff --git a/redhat/applications/tastymenu/tastymenu.spec b/redhat/applications/tastymenu/tastymenu.spec index 984912246..096a7d580 100644 --- a/redhat/applications/tastymenu/tastymenu.spec +++ b/redhat/applications/tastymenu/tastymenu.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg tastymenu %define tde_prefix /opt/trinity diff --git a/redhat/applications/tde-guidance/tde-guidance-3.5.13.2-fix_mountconfig.patch b/redhat/applications/tde-guidance/tde-guidance-3.5.13.2-fix_mountconfig.patch deleted file mode 100644 index 34b15b791..000000000 --- a/redhat/applications/tde-guidance/tde-guidance-3.5.13.2-fix_mountconfig.patch +++ /dev/null @@ -1,51 +0,0 @@ -commit 3b6ac8e5301bb482b02af7e2b1f0ec613be61218 -Author: Francois Andriot <albator78@libertysurf.fr> -Date: 1371158323 -0500 - - Work around mountconfig incorrectly handling LABEL tag - This resolves Bug 1545 - Add ext4 support - -diff --git a/mountconfig/MicroHAL.py b/mountconfig/MicroHAL.py -index 9ce8b83..9a913fa 100755 ---- a/mountconfig/MicroHAL.py -+++ b/mountconfig/MicroHAL.py -@@ -669,6 +669,10 @@ class MicroHAL(object): - - if u"volume.label" in parsed_hash: - new_device.label = self._parseString(parsed_hash[u"volume.label"][0]) -+ # If HAL returns label beginning with '#', it usually means that the -+ # actual label contains an Unix path. So we replace '#' with '/'. -+ if len(new_device.label) and new_device.label[0]=='%': -+ new_device.label = new_device.label.replace('%', '/') - - if u"volume.size" in parsed_hash: - size = parsed_hash[u"volume.size"][0] -diff --git a/mountconfig/mountconfig.py b/mountconfig/mountconfig.py -index eefa9fd..9c00b7d 100755 ---- a/mountconfig/mountconfig.py -+++ b/mountconfig/mountconfig.py -@@ -82,6 +82,7 @@ Supported filesystems - nfs - ext2 - ext3 -+ext4 - reiserfs - vfat - ntfs -@@ -1047,6 +1048,7 @@ class MountEntry(object): - - 'ext2' : (MountEntryExtCommonUnixLocal,i18n("Ext2 - Second Extended FS")), - 'ext3' : (MountEntryExtCommonUnixLocal,i18n("Ext3 - Third Extended FS")), -+ 'ext4' : (MountEntryExtCommonUnixLocal,i18n("Ext4 - Fourth Extended FS")), - 'reiserfs' : (MountEntryExtCommonUnixLocal,i18n("ReiserFS")), - 'reiser4' : (MountEntryExtCommonUnixLocal,i18n("Reiser4")), - 'xfs' : (MountEntryExtCommonUnixLocal,i18n("XFS - SGI's journaling filesystem")), -@@ -2389,6 +2391,7 @@ class MountEntryDialog(KDialogBase): - MountTypeEditorsDisk = { - 'ext2' : MountEntryDialogOptionsCommonUnix, - 'ext3' : MountEntryDialogOptionsCommonUnix, -+ 'ext4' : MountEntryDialogOptionsCommonUnix, - 'reiserfs' : MountEntryDialogOptionsCommonUnix, - 'reiser4' : MountEntryDialogOptionsCommonUnix, - 'xfs' : MountEntryDialogOptionsCommonUnix, diff --git a/redhat/applications/tde-guidance/tde-guidance-3.5.13.2.spec b/redhat/applications/tde-guidance/tde-guidance-3.5.13.2.spec deleted file mode 100644 index 7fbb91222..000000000 --- a/redhat/applications/tde-guidance/tde-guidance-3.5.13.2.spec +++ /dev/null @@ -1,466 +0,0 @@ -# Default version for this component -%define tde_pkg tde-guidance -%define tde_version 3.5.13.2 - -# REMOVE KDELIBS4-DEVEL before building !!!! - -%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - -%define __arch_install_post %{nil} - -Name: trinity-%{tde_pkg} -Summary: A collection of system administration tools for Trinity -Version: 0.8.0svn20080103 -Release: %{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.simonzone.com/software/guidance - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -# [tde-guidance] Work around mountconfig incorrectly handling LABEL tag -# This resolves Bug 1545 -# Add ext4 support -Patch1: tde-guidance-3.5.13.2-fix_mountconfig.patch - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: trinity-pytdeextensions -BuildRequires: trinity-libpythonize0-devel -BuildRequires: trinity-python-trinity -BuildRequires: chrpath -BuildRequires: gcc-c++ - -# SIP support -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: python-sip -%endif -%if 0%{?suse_version} -BuildRequires: python-sip-devel -%endif -%if 0%{?rhel} == 5 -BuildRequires: trinity-sip-devel -%endif -%if 0%{?rhel} >= 6 || 0%{?fedora} -BuildRequires: sip-devel -%endif - -# PYTHON-QT support -BuildRequires: python-qt3-devel -BuildRequires: trinity-python-trinity-devel - -Requires: python-qt3 -Requires: trinity-python-trinity -Requires: trinity-pytdeextensions -Requires: python -%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} -Requires: hwdata -%endif - -Requires: %{name}-backends = %{version}-%{release} - -# POWERMANAGER support (requires HAL) -%define with_powermanager 1 - -# DISPLAYCONFIG support (deprecated) -#define with_displayconfig 1 - -Obsoletes: trinity-guidance < %{version}-%{release} -Provides: trinity-guidance = %{version}-%{release} - -%description -Guidance currently consists of four programs designed to help you -look after your system: - o userconfig - User and Group administration - o serviceconfig - Service/daemon administration - o mountconfig - Disk and filesystem administration - o wineconfig - Wine configuration - -These tools are available in Trinity Control Center, System Settings -or can be run as standalone applications. - -%files -%defattr(-,root,root,-) -%doc ChangeLog COPYING README TODO -%if 0%{?with_displayconfig} -%{tde_bindir}/displayconfig -%{tde_bindir}/displayconfig-restore -%endif -%{tde_bindir}/grubconfig -%{tde_bindir}/mountconfig -%{tde_bindir}/serviceconfig -%{tde_bindir}/userconfig -%{tde_bindir}/wineconfig -%attr(0644,root,root) %{tde_tdelibdir}/*.so -%attr(0644,root,root) %{tde_tdelibdir}/*.la -%{tde_datadir}/apps/guidance/ -%{tde_tdeappdir}/*.desktop -%{tde_datadir}/icons/crystalsvg/*/*/*.png -%{tde_datadir}/icons/crystalsvg/*/*/*.svg -%{python_sitearch}/%{name}/SMBShareSelectDialog.py* -%{python_sitearch}/%{name}/SimpleCommandRunner.py* -%{python_sitearch}/%{name}/fuser.py* -%{python_sitearch}/%{name}/fuser_ui.py* -%{python_sitearch}/%{name}/grubconfig.py* -%{python_sitearch}/%{name}/ktimerdialog.py* -%{python_sitearch}/%{name}/mountconfig.py* -%{python_sitearch}/%{name}/servertestdialog.py* -%{python_sitearch}/%{name}/serviceconfig.py* -%{python_sitearch}/%{name}/sizeview.py* -%{python_sitearch}/%{name}/unixauthdb.py* -%{python_sitearch}/%{name}/userconfig.py* -%{python_sitearch}/%{name}/wineconfig.py* -%{tde_tdedocdir}/HTML/en/guidance/ - -# Files from backends -%exclude %{tde_datadir}/apps/guidance/vesamodes -%exclude %{tde_datadir}/apps/guidance/extramodes -%exclude %{tde_datadir}/apps/guidance/widescreenmodes -%exclude %{tde_datadir}/apps/guidance/Cards+ -%exclude %{tde_datadir}/apps/guidance/pcitable -%exclude %{tde_datadir}/apps/guidance/MonitorsDB - -# Files from powermanager -%if 0%{?with_powermanager} -%exclude %{tde_datadir}/icons/hicolor/22x22/apps/power-manager.png -%endif -%exclude %{tde_datadir}/apps/guidance/pics/ac-adapter.png -%exclude %{tde_datadir}/apps/guidance/pics/battery*.png -%exclude %{tde_datadir}/apps/guidance/pics/processor.png - -%post -touch --no-create %{tde_datadir}/icons/crystalsvg || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || : -/sbin/ldconfig || : - -%postun -touch --no-create %{tde_datadir}/icons/crystalsvg || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || : -/sbin/ldconfig || : - -########## - -%package backends -Group: Applications/Utilities -Summary: collection of system administration tools for GNU/Linux [Trinity] -%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} -Requires: hwdata -%endif -Requires: python - -Obsoletes: trinity-guidance-backends < %{version}-%{release} -Provides: trinity-guidance-backends = %{version}-%{release} - -%description backends -This package contains the platform neutral backends used in the -Guidance configuration tools. - -%files backends -%defattr(-,root,root,-) -%{python_sitearch}/%{name}/MicroHAL.py* -%{python_sitearch}/%{name}/ScanPCI.py* -%{python_sitearch}/%{name}/infimport.py* -%if 0%{?with_displayconfig} -%{python_sitearch}/%{name}/displayconfigabstraction.py* -%{python_sitearch}/%{name}/displayconfig-hwprobe.py* -%{python_sitearch}/%{name}/displayconfig-restore.py* -%endif -%{python_sitearch}/%{name}/drivedetect.py* -%{python_sitearch}/%{name}/execwithcapture.py* -%{python_sitearch}/%{name}/wineread.py* -%{python_sitearch}/%{name}/winewrite.py* -%{python_sitearch}/%{name}/xf86misc.py* -%{python_sitearch}/%{name}/xorgconfig.py* -%{python_sitearch}/ixf86misc.so -%{tde_datadir}/apps/guidance/vesamodes -%{tde_datadir}/apps/guidance/extramodes -%{tde_datadir}/apps/guidance/widescreenmodes -%{tde_datadir}/apps/guidance/Cards+ -%{tde_datadir}/apps/guidance/pcitable -%{tde_datadir}/apps/guidance/MonitorsDB - -########## - -%if 0%{?with_powermanager} - -%package powermanager -Group: Applications/Utilities -Summary: HAL based power manager applet [Trinity] -Requires: %{name} = %{version}-%{release} -Requires: hal - -Obsoletes: trinity-guidance-powermanager < %{version}-%{release} -Provides: trinity-guidance-powermanager = %{version}-%{release} - -%if "%{tde_prefix}" == "/usr" -Conflicts: guidance-power-manager -Conflicts: kde-guidance-powermanager -%endif - -%description powermanager -A power management applet to indicate battery levels and perform hibernate or -suspend using HAL. - -%files powermanager -%defattr(-,root,root,-) -%{tde_bindir}/guidance-power-manager -%{python_sitearch}/%{name}/MicroHAL.py* -%{python_sitearch}/%{name}/guidance-power-manager.py* -%{python_sitearch}/%{name}/powermanage.py* -%{python_sitearch}/%{name}/gpmhelper.py* -%{python_sitearch}/%{name}/powermanager_ui.py* -%{python_sitearch}/%{name}/guidance_power_manager_ui.py* -%{python_sitearch}/%{name}/notify.py* -%{python_sitearch}/%{name}/tooltip.py* -%{tde_datadir}/icons/hicolor/22x22/apps/power-manager.png -%{tde_datadir}/apps/guidance/pics/ac-adapter.png -%{tde_datadir}/apps/guidance/pics/battery*.png -%{tde_datadir}/apps/guidance/pics/processor.png -%{tde_datadir}/autostart/guidance-power-manager.desktop - -%post powermanager -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : - -%postun powermanager -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : - -%endif - -########## - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - -########## - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -#patch1 -p1 -b .mountconfig - -%if 0%{?rhel} || 0%{?mgaversion} || 0%{?mdkversion} -%__sed -i "userconfig/unixauthdb.py" \ - -e "s|self.first_uid = .*|self.first_uid = 500|" \ - -e "s|self.first_gid = .*|self.first_gid = 500|" -%endif - - -%build -unset QTDIR QTINC QTLIB -. /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export PYTHONPATH=%{python_sitearch}/trinity-sip:%{python_sitearch}/python-qt3 -export KDEDIR=%{tde_prefix} - -# Avoids 'error: byte-compiling is disabled.' on Mandriva/Mageia -export PYTHONDONTWRITEBYTECODE= - -# FTBFS on PCLOS ... -export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I%{tde_tdeincludedir} -I%{tde_includedir}" - -# Specific path for RHEL4 -if [ -d /usr/X11R6 ]; then - export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" - %__sed -i "setup.py" -e "s|/usr/X11R6/lib|/usr/X11R6/%{_lib}|g" -fi - -./setup.py build - - -%install -unset QTDIR QTINC QTLIB -. /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export EXTRA_MODULE_DIR="%{python_sitearch}/%{name}" - -# For RHEL4 only -export PYTHONPATH=%{python_sitearch}/trinity-sip:%{python_sitearch}/python-qt3 - -# For Mageia/Mandriva: Avoids 'error: byte-compiling must be disabled. -export PYTHONDONTWRITEBYTECODE= - -%__rm -rf %{buildroot} -./setup.py install \ - --prefix=%{tde_prefix} \ - --root=%{buildroot} - -# Fix temporary build directories remaining inside .py files -for f in %{buildroot}%{tde_datadir}/apps/guidance/*.py; do - %__sed -i "${f}" -e "s|%{buildroot}||g" -done - -##### MAIN PACKAGE INSTALLATION (based on Debian/Ubuntu packaging rules) -# install icons to right place -%__mkdir_p %{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps -%__cp -f %{buildroot}%{tde_datadir}/apps/guidance/pics/hi32-app-daemons.png \ - %{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps/daemons.png -%__cp -f %{buildroot}%{tde_datadir}/apps/guidance/pics/kcmpartitions.png \ - %{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps/disksfilesystems.png -%__cp -f %{buildroot}%{tde_datadir}/apps/guidance/pics/hi32-user.png \ - %{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps/userconfig.png -#%__cp -f %{buildroot}%{tde_datadir}/apps/guidance/pics/hi32-display.png \ -# %{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps/displayconfig.png -%__cp -f %{buildroot}%{tde_datadir}/apps/guidance/pics/32-wine.png \ - %{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps/wineconfig.png -%__install -D -p -m0644 kde/wineconfig/pics/16x16/wineconfig.png \ - %{buildroot}%{tde_datadir}/icons/crystalsvg/16x16/apps/wineconfig.png - -# fix binary-or-shlib-defines-rpath -chrpath -r %{tde_libdir} %{buildroot}%{tde_tdelibdir}/kcm_*.so - -# fix executable-not-elf-or-script -%__chmod 0644 %{buildroot}%{tde_datadir}/apps/guidance/pics/kdewinewizard.png - -# move python modules in %{python_sitearch} (/usr/lib/pythonXX/site-packages) -%__mkdir_p %{buildroot}%{python_sitearch}/%{name} -%__mv -f %{buildroot}%{tde_datadir}/apps/guidance/*.py* %{buildroot}%{python_sitearch}/%{name} - -# Generates the startup scripts -%__rm -f %{buildroot}%{tde_bindir}/* -#%__ln_s -f %{python_sitearch}/%{name}/displayconfig.py %{buildroot}%{tde_bindir}/displayconfig -%__ln_s -f %{python_sitearch}/%{name}/mountconfig.py %{buildroot}%{tde_bindir}/mountconfig -%__ln_s -f %{python_sitearch}/%{name}/serviceconfig.py %{buildroot}%{tde_bindir}/serviceconfig -%__ln_s -f %{python_sitearch}/%{name}/userconfig.py %{buildroot}%{tde_bindir}/userconfig -%__ln_s -f %{python_sitearch}/%{name}/wineconfig.py %{buildroot}%{tde_bindir}/wineconfig -%__ln_s -f %{python_sitearch}/%{name}/grubconfig.py %{buildroot}%{tde_bindir}/grubconfig - -# (obsolete) put this here since gnome people probably don't want it by default -#%__ln_s -f %{_python_sitearch}/%{name}/displayconfig-restore.py %{buildroot}%{tde_bindir}/displayconfig-restore - -# fix script-not-executable -%__chmod 0755 %{buildroot}%{python_sitearch}/%{name}/fuser.py -%__chmod 0755 %{buildroot}%{python_sitearch}/%{name}/grubconfig.py - -#%__mv -f %{buildroot}%{tde_tdeappdir}/displayconfig.desktop %{buildroot}%{tde_tdeappdir}/guidance-displayconfig.desktop - -##### BACKENDS INSTALLATION -# install displayconfig-hwprobe.py script -#%__install -D -p -m0755 displayconfig/displayconfig-hwprobe.py \ -# %{buildroot}%{python_sitearch}/%{name}/displayconfig-hwprobe.py - -# The xf86misc stuff should not go under /opt/trinity bur under /usr !!! -%__mv -f %{buildroot}%{tde_libdir}/python*/site-packages/ixf86misc.so %{buildroot}%{python_sitearch} -%__mv -f %{buildroot}%{tde_libdir}/python*/site-packages/xf86misc.py* %{buildroot}%{python_sitearch}/%{name} - -%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} -%__rm -f %{buildroot}%{tde_datadir}/apps/guidance/MonitorsDB -%__ln_s -f /usr/share/hwdata/MonitorsDB %{buildroot}%{tde_datadir}/apps/guidance/MonitorsDB -%endif - -%if 0%{?with_powermanager} -##### POWERMANAGER INSTALLATION -# install icon to right place -%__install -D -p -m0644 kde/powermanager/pics/battery-charging-100.png \ - %{buildroot}%{tde_datadir}/icons/hicolor/22x22/apps/power-manager.png -%__install -D -p -m0644 kde/powermanager/pics/*.png \ - %{buildroot}%{tde_datadir}/apps/guidance/pics/ - -# install desktop file -%__install -D -p -m0644 powermanager/guidance-power-manager.desktop \ - %{buildroot}%{tde_datadir}/autostart/guidance-power-manager.desktop - -# copy python modules in PYSUPPORT_PATH -%__cp powermanager/guidance_power_manager_ui.py %{buildroot}%{python_sitearch}/%{name} -%__cp powermanager/notify.py %{buildroot}%{python_sitearch}/%{name} -%__cp powermanager/tooltip.py %{buildroot}%{python_sitearch}/%{name} - -# generate guidance-power-manager script -cat <<EOF >%{?buildroot}%{tde_bindir}/guidance-power-manager -#!/bin/sh -export PYTHONPATH=%{python_sitearch}/%{name}:%{python_sitearch}/python-qt3 -%{python_sitearch}/%{name}/guidance-power-manager.py & -EOF -chmod +x %{buildroot}%{tde_bindir}/guidance-power-manager - -# fix script-not-executable -chmod 0755 %{buildroot}%{python_sitearch}/%{name}/powermanage.py -chmod 0755 %{buildroot}%{python_sitearch}/%{name}/gpmhelper.py - -%else - -%__rm -f %{buildroot}%{python_sitearch}/%{name}/gpmhelper.py* -%__rm -f %{buildroot}%{python_sitearch}/%{name}/guidance-power-manager.py* -%__rm -f %{buildroot}%{python_sitearch}/%{name}/guidance_power_manager_ui.py* -%__rm -f %{buildroot}%{python_sitearch}/%{name}/powermanage.py* -%__rm -f %{buildroot}%{python_sitearch}/%{name}/powermanager_ui.py* -%__rm -f %{buildroot}%{tde_datadir}/apps/guidance/powermanager_ui.ui - -%endif - -# DISPLAYCONFIG (obsolete) -%if 0%{?with_displayconfig} -%__cp -f %{buildroot}%{tde_datadir}/apps/guidance/pics/hi32-display.png \ - %{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps/displayconfig.png -%__ln_s -f %{python_sitearch}/%{name}/displayconfig.py %{buildroot}%{tde_bindir}/displayconfig -%__mv -f %{buildroot}%{tde_tdeappdir}/displayconfig.desktop %{buildroot}%{tde_tdeappdir}/guidance-displayconfig.desktop - -# install displayconfig-hwprobe.py script -%__install -D -p -m0755 displayconfig/displayconfig-hwprobe.py \ - %{buildroot}%{python_sitearch}/%{name}/displayconfig-hwprobe.py - -%else -# Removes obsolete display config manager -%__rm -f %{?buildroot}%{python_sitearch}/%{name}/displayconfig* -%__rm -f %{?buildroot}/etc/X11/Xsession.d/40guidance-displayconfig_restore -%__rm -f %{?buildroot}%{tde_tdelibdir}/kcm_displayconfig.* -%__rm -f %{?buildroot}%{python_sitearch}/%{name}/displayconfig.py* -%__rm -f %{?buildroot}%{python_sitearch}/%{name}/displayconfigwidgets.py* -%__rm -f %{buildroot}%{tde_tdeappdir}/displayconfig.desktop -%__rm -f %{buildroot}%{tde_datadir}/icons/*/*/apps/displayconfig.png -%__rm -fr %{buildroot}%{tde_datadir}/apps/guidance/pics/displayconfig -%endif - - -# Replace all '#!' calls to python with /usr/bin/python -# and make them executable -for i in `find %{buildroot} -type f`; do - sed '1s,#!.*python[^ ]*\(.*\),#! /usr/bin/python\1,' \ - $i > $i.temp; - if cmp --quiet $i $i.temp; then - rm -f $i.temp; - else - mv -f $i.temp $i; - chmod 755 $i; - echo "fixed interpreter: $i"; - fi; -done - -# Removes useless files -find %{buildroot} -name "*.egg-info" -exec rm -f {} \; -find %{buildroot}%{tde_libdir} -name "*.a" -exec rm -f {} \; - - -%clean -%__rm -rf %{buildroot} - - -%changelog diff --git a/redhat/applications/tde-guidance/tde-guidance-14.0.0.spec b/redhat/applications/tde-guidance/tde-guidance.spec index 02b6c3b33..e2c865bbd 100644 --- a/redhat/applications/tde-guidance/tde-guidance-14.0.0.spec +++ b/redhat/applications/tde-guidance/tde-guidance.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg tde-guidance %define tde_prefix /opt/trinity @@ -33,7 +33,6 @@ %define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdelibdir %{tde_libdir}/trinity -%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} %define __arch_install_post %{nil} @@ -105,7 +104,7 @@ BuildRequires: libXxf86vm-devel # 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} +%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} == 5 || 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?suse_version} %define with_xscreensaver 1 %if 0%{?fedora} || 0%{?rhel} >= 5 @@ -140,10 +139,21 @@ BuildRequires: xscreensaver-gl %endif %endif +# PYTHON support +%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 +%global python python2 +%global __python %__python2 +%global python_sitearch %{python2_sitearch} +%else +%global python python +%endif +%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} +BuildRequires: %{python} +BuildRequires: %{python}-devel + Requires: python-tqt Requires: trinity-python-trinity Requires: trinity-pytdeextensions -Requires: python %if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} Requires: hwdata %endif @@ -212,7 +222,7 @@ Summary: collection of system administration tools for GNU/Linux [Trinity] %if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} Requires: hwdata %endif -Requires: python +Requires: %{python} Obsoletes: trinity-guidance-backends < %{?epoch:%{epoch}:}%{version}-%{release} Provides: trinity-guidance-backends = %{?epoch:%{epoch}:}%{version}-%{release} @@ -307,7 +317,7 @@ if [ -d /usr/X11R6 ]; then %__sed -i "setup.py" -e "s|/usr/X11R6/lib|/usr/X11R6/%{_lib}|g" fi -./setup.py build +%__python ./setup.py build %install @@ -324,7 +334,7 @@ export PYTHONPATH="%{python_sitearch}/sip4_tqt:${PYTHONPATH}" export PYTHONDONTWRITEBYTECODE= %__rm -rf %{buildroot} -./setup.py install \ +%__python ./setup.py install \ --prefix=%{tde_prefix} \ --root=%{buildroot} @@ -421,8 +431,13 @@ chmod 0755 %{buildroot}%{python_sitearch}/%{name}/gpmhelper.py # Replace all '#!' calls to python with /usr/bin/python # and make them executable +%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8 +%define python /usr/bin/python2 +%else +%define python /usr/bin/python +%endif for i in `find %{buildroot} -type f`; do - sed '1s,#!.*python[^ ]*\(.*\),#! /usr/bin/python\1,' \ + sed '1s,#!.*python[^ ]*\(.*\),#! %python\1,' \ $i > $i.temp; if cmp --quiet $i $i.temp; then rm -f $i.temp; diff --git a/redhat/applications/tde-style-baghira/tde-style-baghira.spec b/redhat/applications/tde-style-baghira/tde-style-baghira.spec index 41fa8fb19..2736edb74 100644 --- a/redhat/applications/tde-style-baghira/tde-style-baghira.spec +++ b/redhat/applications/tde-style-baghira/tde-style-baghira.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg tde-style-baghira %define tde_prefix /opt/trinity @@ -62,7 +62,7 @@ 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: cmake BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: libtool @@ -90,38 +90,36 @@ Panther and Jaguar looks, and also includes its own 'Baghira' look %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/"*"/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} \ - --includedir=%{tde_tdeincludedir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ +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 \ \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath \ - --disable-gcc-hidden-visibility + -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \ + -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ + -DDATA_INSTALL_DIR=%{tde_datadir}/apps \ + -DLIB_INSTALL_DIR=%{tde_libdir} \ + -DBUILD_ALL=ON \ + .. %__make %{?_smp_mflags} %install -%__rm -rf $RPM_BUILD_ROOT -%__make install DESTDIR=$RPM_BUILD_ROOT +export PATH="%{tde_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} -C build %clean @@ -146,9 +144,8 @@ export PATH="%{tde_bindir}:${PATH}" %{tde_libdir}/usermanager_panelapplet.la %{tde_libdir}/usermanager_panelapplet.so %{tde_datadir}/apps/baghira/ -%{tde_datadir}/apps/kicker/applets/b_menuapplet.desktop -%{tde_datadir}/apps/kicker/applets/starter.desktop -%{tde_datadir}/apps/kicker/applets/usermanager.desktop +%{tde_datadir}/apps/kicker/applets/baghira-starter.desktop +%{tde_datadir}/apps/kicker/applets/baghira-usermanager.desktop %{tde_datadir}/apps/tdedisplay/color-schemes/AquaBlue.kcsrc %{tde_datadir}/apps/tdedisplay/color-schemes/AquaGraphite.kcsrc %{tde_datadir}/apps/tdestyle/themes/baghira.themerc @@ -191,6 +188,8 @@ export PATH="%{tde_bindir}:${PATH}" %{tde_datadir}/icons/crystalsvg/64x64/apps/baghira_grey.png %{tde_datadir}/icons/crystalsvg/64x64/apps/baghira_white.png %{tde_datadir}/icons/crystalsvg/64x64/apps/baghira_yellow.png +%lang(de) %{tde_datadir}/locale/de/LC_MESSAGES/baghira-starter.mo +%{tde_mandir}/man1/bab.1* %changelog diff --git a/redhat/applications/tde-style-domino/tde-style-domino.spec b/redhat/applications/tde-style-domino/tde-style-domino.spec index a2dfdd079..20230ce2c 100644 --- a/redhat/applications/tde-style-domino/tde-style-domino.spec +++ b/redhat/applications/tde-style-domino/tde-style-domino.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg tde-style-domino %define tde_prefix /opt/trinity @@ -62,7 +62,7 @@ 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: cmake BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: libtool @@ -86,38 +86,36 @@ of the widgets by customizable color gradients. %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/"*"/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} \ - --includedir=%{tde_tdeincludedir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ +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 \ \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath \ - --disable-gcc-hidden-visibility + -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \ + -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ + -DDATA_INSTALL_DIR=%{tde_datadir}/apps \ + -DLIB_INSTALL_DIR=%{tde_libdir} \ + -DBUILD_ALL=ON \ + .. %__make %{?_smp_mflags} %install -%__rm -rf $RPM_BUILD_ROOT -%__make install DESTDIR=$RPM_BUILD_ROOT +export PATH="%{tde_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} -C build %clean @@ -137,6 +135,7 @@ export PATH="%{tde_bindir}:${PATH}" %{tde_datadir}/apps/tdedisplay/color-schemes/Domino.kcsrc %{tde_datadir}/apps/tdestyle/themes/domino.themerc %{tde_datadir}/apps/twin/domino.desktop +%lang(de) %{tde_datadir}/locale/de/LC_MESSAGES/tdestyle_domino_config.mo %changelog diff --git a/redhat/applications/tde-style-ia-ora/tde-style-ia-ora.spec b/redhat/applications/tde-style-ia-ora/tde-style-ia-ora.spec index bd89d6687..0e6fec2a9 100644 --- a/redhat/applications/tde-style-ia-ora/tde-style-ia-ora.spec +++ b/redhat/applications/tde-style-ia-ora/tde-style-ia-ora.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg tde-style-ia-ora %define tde_prefix /opt/trinity diff --git a/redhat/applications/tde-style-lipstik/tde-style-lipstik-3.5.13.2.spec b/redhat/applications/tde-style-lipstik/tde-style-lipstik-3.5.13.2.spec deleted file mode 100644 index 08e51de57..000000000 --- a/redhat/applications/tde-style-lipstik/tde-style-lipstik-3.5.13.2.spec +++ /dev/null @@ -1,116 +0,0 @@ -# Default version for this component -%define tde_pkg tde-style-lipstik -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-tde-style-lipstik -Summary: Lipstik style for TDE -Version: 2.2.3 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -Obsoletes: trinity-kde-style-lipstik < %{version}-%{release} -Provides: trinity-kde-style-lipstik = %{version}-%{release} -Obsoletes: trinity-style-lipstik < %{version}-%{release} -Provides: trinity-style-lipstik = %{version}-%{release} - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - - -%description -Based on the plastik style, Lipstik is a purified style with many options to -tune your desktop look. - -Lipstik also provides Lipstik-color-schemes - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} - -%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --datadir=%{tde_datadir} \ - --includedir=%{tde_tdeincludedir} \ - --libdir=%{tde_libdir} \ - \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-final \ - --enable-new-ldflags \ - --enable-closure \ - --enable-rpath - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - - -%clean -%__rm -rf %{buildroot} - - - -%files -%defattr(-,root,root,-) -%doc AUTHORS COPYING -%{tde_tdelibdir}/kstyle_lipstik_config.la -%{tde_tdelibdir}/kstyle_lipstik_config.so -%{tde_tdelibdir}/plugins/styles/lipstik.la -%{tde_tdelibdir}/plugins/styles/lipstik.so -%{tde_datadir}/apps/kdisplay/color-schemes/lipstiknoble.kcsrc -%{tde_datadir}/apps/kdisplay/color-schemes/lipstikstandard.kcsrc -%{tde_datadir}/apps/kdisplay/color-schemes/lipstikwhite.kcsrc -%{tde_datadir}/apps/kstyle/themes/lipstik.themerc - - -%changelog diff --git a/redhat/applications/tde-style-lipstik/tde-style-lipstik-14.0.0.spec b/redhat/applications/tde-style-lipstik/tde-style-lipstik.spec index 055ca88d7..01a6a9352 100644 --- a/redhat/applications/tde-style-lipstik/tde-style-lipstik-14.0.0.spec +++ b/redhat/applications/tde-style-lipstik/tde-style-lipstik.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg tde-style-lipstik %define tde_prefix /opt/trinity @@ -65,7 +65,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils -BuildRequires: autoconf automake libtool m4 +BuildRequires: cmake >= 2.8 BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: fdupes @@ -80,6 +80,12 @@ BuildRequires: update-desktop-files BuildRequires: brp-check-trinity %endif +# IDN support +BuildRequires: libidn-devel + +# OPENSSL support +BuildRequires: openssl-devel + %description Based on the plastik style, Lipstik is a purified style with many options to @@ -100,37 +106,46 @@ Lipstik also provides Lipstik-color-schemes %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/"*"/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} \ - --datadir=%{tde_datadir} \ - --includedir=%{tde_tdeincludedir} \ - --libdir=%{tde_libdir} \ +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_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=OFF \ + \ + -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \ + -DDATA_INSTALL_DIR="%{tde_datadir}/apps" \ + -DLIB_INSTALL_DIR="%{tde_libdir}" \ \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-final \ - --enable-new-ldflags \ - --enable-closure \ - --enable-rpath \ - --disable-gcc-hidden-visibility + -DWITH_ALL_OPTIONS=ON \ + -DWITH_GCC_VISIBILITY=ON \ + \ + -DBUILD_ALL=ON \ + -DBUILD_DOC=ON \ + -DBUILD_TRANSLATIONS=ON \ + \ + .. -%__make %{?_smp_mflags} +%__make %{?_smp_mflags} || %__make %install export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} +%__make install DESTDIR=%{buildroot} -C build + +%find_lang %{tde_pkg} %clean @@ -138,7 +153,7 @@ export PATH="%{tde_bindir}:${PATH}" -%files +%files -f %{tde_pkg}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING %{tde_tdelibdir}/tdestyle_lipstik_config.la diff --git a/redhat/applications/tde-style-qtcurve/tde-style-qtcurve-3.5.13.2.spec b/redhat/applications/tde-style-qtcurve/tde-style-qtcurve-3.5.13.2.spec deleted file mode 100644 index 562fb4510..000000000 --- a/redhat/applications/tde-style-qtcurve/tde-style-qtcurve-3.5.13.2.spec +++ /dev/null @@ -1,139 +0,0 @@ -# Default version for this component -%define tde_pkg tde-style-qtcurve -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-tde-style-qtcurve -Summary: This is a set of widget styles for Trinity based apps -Version: 0.55.2 -Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: gettext - -Obsoletes: trinity-kde-style-qtcurve < %{version}-%{release} -Provides: trinity-kde-style-qtcurve = %{version}-%{release} -Obsoletes: trinity-style-qtcurve < %{version}-%{release} -Provides: trinity-style-qtcurve = %{version}-%{release} - -%description -This package together with gtk2-engines-qtcurve aim to provide a unified look -and feel on the desktop when using TDE and Gnome applications. - -This package is most useful when installed together with -gtk2-engines-qtcurve. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} - - - -%build -unset QTDIR QTINC QTLIB -. /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export KDEDIR="%{tde_prefix}" - -# 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 - -# Error in "po/tr.po" -%if 0%{?rhel} == 4 -%__rm -f "po/tr.po" -%endif - -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 \ - \ - -DBIN_INSTALL_DIR=%{tde_bindir} \ - -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \ - -DLIB_INSTALL_DIR=%{tde_libdir} \ - -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ - \ - -DTDE_INCLUDE_DIR=%{tde_tdeincludedir} \ - -DQTC_QT_ONLY=false \ - -DQTC_STYLE_SUPPORT=true \ - -DBUILD_ALL=on \ - .. - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} -C build - -%find_lang qtcurve || touch qtcurve.lang - - -%clean -%__rm -rf %{buildroot} - - - -%files -f qtcurve.lang -%defattr(-,root,root,-) -%doc AUTHORS COPYING -%{tde_tdelibdir}/kstyle_qtcurve_config.la -%{tde_tdelibdir}/kstyle_qtcurve_config.so -%{tde_tdelibdir}/plugins/styles/qtcurve.so -%{tde_tdelibdir}/plugins/styles/qtcurve.la -%{tde_datadir}/apps/kdisplay/color-schemes/QtCurve.kcsrc -%{tde_datadir}/apps/kstyle/themes/qtcurve.themerc -%{tde_datadir}/apps/QtCurve/*.qtcurve - - -%changelog diff --git a/redhat/applications/tde-style-qtcurve/tde-style-qtcurve-14.0.0.spec b/redhat/applications/tde-style-qtcurve/tde-style-qtcurve.spec index 3bb94eadd..f9f788779 100644 --- a/redhat/applications/tde-style-qtcurve/tde-style-qtcurve-14.0.0.spec +++ b/redhat/applications/tde-style-qtcurve/tde-style-qtcurve.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg tde-style-qtcurve %define tde_prefix /opt/trinity diff --git a/redhat/applications/tde-systemsettings/kde-settings-laptops.directory b/redhat/applications/tde-systemsettings/tde-settings-laptops.directory index d37d9ba13..d37d9ba13 100644 --- a/redhat/applications/tde-systemsettings/kde-settings-laptops.directory +++ b/redhat/applications/tde-systemsettings/tde-settings-laptops.directory diff --git a/redhat/applications/tde-systemsettings/tde-systemsettings-3.5.13.2.spec b/redhat/applications/tde-systemsettings/tde-systemsettings-3.5.13.2.spec deleted file mode 100644 index c06af35f6..000000000 --- a/redhat/applications/tde-systemsettings/tde-systemsettings-3.5.13.2.spec +++ /dev/null @@ -1,145 +0,0 @@ -# Default version for this component -%define tde_pkg tde-systemsettings -%define tde_version 3.5.13.2 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -# Currently, menu files under /etc/xdg conflict with KDE4 -%define tde_sysconfdir %{tde_prefix}/etc -%endif - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-tde-systemsettings -Summary: easy to use control centre for TDE -Version: 0.0svn20070312 -Release: %{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -Source1: kde-settings-laptops.directory - -Provides: trinity-kde-systemsettings = %{version}-%{release} -Obsoletes: trinity-kde-systemsettings < %{version}-%{release} -Provides: trinity-systemsettings = %{version}-%{release} -Obsoletes: trinity-systemsettings < %{version}-%{release} - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -Requires: trinity-guidance - -%description -System preferences is a replacement for the TDE -Control Centre with an improved user interface. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%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/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export KDEDIR="%{tde_prefix}" - -%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 - -%__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/kde-settings-laptops.directory - -# Unwanted files -%__rm -f %{buildroot}%{tde_datadir}/applications/kde/kcmfontinst.desktop -%__rm -f %{buildroot}%{tde_datadir}/desktop-directories/kde-settings-power.directory -%__rm -f %{buildroot}%{tde_datadir}/desktop-directories/kde-settings-system.directory - -%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 -%{tde_sysconfdir}/xdg/menus/applications-merged/system-settings-merge.menu -%{tde_sysconfdir}/xdg/menus/system-settings.menu -%{tde_bindir}/systemsettings -%{tde_datadir}/applications/kde/audioencoding.desktop -%{tde_datadir}/applications/kde/defaultapplication.desktop -%{tde_datadir}/applications/kde/kcm_knetworkconfmodule_ss.desktop -%{tde_datadir}/applications/kde/laptoppowermanagement.desktop -%{tde_datadir}/applications/kde/medianotifications.desktop -%{tde_datadir}/applications/kde/systemsettings.desktop -%{tde_datadir}/apps/systemsettings/systemsettingsui.rc -%{tde_datadir}/config/systemsettingsrc -%{tde_datadir}/desktop-directories/*.directory -%{tde_datadir}/icons/crystalsvg/*/apps/systemsettings.png - - - -%changelog diff --git a/redhat/applications/tde-systemsettings/tde-systemsettings-14.0.0.spec b/redhat/applications/tde-systemsettings/tde-systemsettings.spec index 812b2329d..74527fb76 100644 --- a/redhat/applications/tde-systemsettings/tde-systemsettings-14.0.0.spec +++ b/redhat/applications/tde-systemsettings/tde-systemsettings.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg tde-systemsettings %define tde_prefix /opt/trinity @@ -57,7 +57,7 @@ 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 +Source1: tde-settings-laptops.directory Provides: trinity-kde-systemsettings = %{?epoch:%{epoch}:}%{version}-%{release} @@ -120,6 +120,8 @@ export kde_confdir="%{tde_confdir}" --datadir=%{tde_datadir} \ --includedir=%{tde_tdeincludedir} \ --sysconfdir=%{tde_sysconfdir} \ + --mandir=%{tde_mandir} \ + --program-prefix="" \ \ --disable-dependency-tracking \ --disable-debug \ @@ -152,12 +154,19 @@ echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/kcm_knetworkconfmodule_s echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/medianotifications.desktop" echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/systemsettings.desktop" +# Fix translation names +for d in "%{buildroot}%{tde_datadir}/locale/"*"/LC_MESSAGES"; do + mv "${d}/"*".mo" "${d}/%{tde_pkg}.mo" +done + +%find_lang %{tde_pkg} + %clean %__rm -rf %{buildroot} -%files +%files -f %{tde_pkg}.lang %defattr(-,root,root,-) %doc README TODO %dir %{tde_sysconfdir}/xdg @@ -169,14 +178,13 @@ echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/systemsettings.desktop" %{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 +%config(noreplace) %{tde_confdir}/systemsettingsrc %{tde_datadir}/desktop-directories/*.directory %{tde_datadir}/icons/crystalsvg/*/apps/systemsettings.png %{tde_tdedocdir}/HTML/en/systemsettings/ - +%{tde_mandir}/man1/systemsettings.1* %changelog diff --git a/redhat/applications/tdedocker/tdedocker.spec b/redhat/applications/tdedocker/tdedocker.spec index 5685e4075..66e8c3132 100644 --- a/redhat/applications/tdedocker/tdedocker.spec +++ b/redhat/applications/tdedocker/tdedocker.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg tdedocker %define tde_prefix /opt/trinity @@ -77,6 +77,28 @@ BuildRequires: openssl-devel # XKBFILES support BuildRequires: libxkbfile-devel +# XMU support +%if 0%{?suse_version} == 1140 +BuildRequires: xorg-x11-libXmu-devel +%endif +%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} >= 1210 +BuildRequires: libXmu-devel +%endif +%if 0%{?mdkversion} || 0%{?mgaversion} >= 4 +BuildRequires: libxmu-devel +%endif +%if 0%{?mgaversion} == 2 || 0%{?mgaversion} == 3 +BuildRequires: %{_lib}xmu%{?mgaversion:6}-devel +%endif + +# XPM support +%if 0%{?suse_version} || 0%{?rhel} || 0%{?fedora} +BuildRequires: libXpm-devel +%endif +%if 0%{?mdkversion} || 0%{?mgaversion} +BuildRequires: %{_lib}xpm-devel +%endif + # SUSE desktop files utility %if 0%{?suse_version} BuildRequires: update-desktop-files @@ -89,7 +111,7 @@ BuildRequires: brp-check-trinity %description -KDocker will help you dock any application into the system tray. +tdedocker will help you dock any application into the system tray. This means you can dock openoffice, xmms, firefox, thunderbird, anything! Just point and click. Works for all NET WM compliant window managers - that includes TDE, KDE, GNOME, Xfce, Fluxbox @@ -148,19 +170,22 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} -C build -%find_lang kdocker +%find_lang %{tde_pkg} + %clean %__rm -rf %{buildroot} -%files -f kdocker.lang +%files -f %{tde_pkg}.lang %defattr(-,root,root,-) %doc AUTHORS BUGS ChangeLog COPYING CREDITS HACKING INSTALL README TODO VERSION -%{tde_bindir}/kdocker -%{tde_tdeappdir}/kdocker.desktop -%{tde_datadir}/apps/kdocker/icons/kdocker.png -%{tde_datadir}/apps/kdocker/icons/question.png +%{tde_bindir}/tdedocker +%{tde_tdeappdir}/tdedocker.desktop +%{tde_datadir}/apps/tdedocker/ +%{tde_datadir}/icons/hicolor/*/apps/tdedocker.png +%{tde_datadir}/apps/tdedocker/icons/question.png +%{tde_mandir}/man1/tdedocker.1* %changelog diff --git a/redhat/applications/tdeio-apt/tdeio-apt-3.5.13.2-ftbfs.patch b/redhat/applications/tdeio-apt/tdeio-apt-3.5.13.2-ftbfs.patch deleted file mode 100644 index b83b3f3ad..000000000 --- a/redhat/applications/tdeio-apt/tdeio-apt-3.5.13.2-ftbfs.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- trinity-tdeio-apt-14.0.0~pre105+c7bc8b76/src/apt.cpp.ORI 2013-07-29 11:26:26.740982531 +0200 -+++ trinity-tdeio-apt-14.0.0~pre105+c7bc8b76/src/apt.cpp 2013-07-29 11:26:53.970250335 +0200 -@@ -143,10 +143,10 @@ - */ - - static const TQString -- html_form_begin("\n<form action=\"apt:/\" method=\"GET\">\n" -+ html_form_begin_apt("\n<form action=\"apt:/\" method=\"GET\">\n" - "<table class=\"query\">\n"); - static const TQString -- html_form_end("<tr>\n" -+ html_form_end_apt("<tr>\n" - "\t<td class=\"button\" colspan=\"2\"><input type=\"submit\" value=\"%1\"></td>\n" - "</tr>\n" - "</table>\n" -@@ -197,7 +197,7 @@ - if (online) - stream << "<table class=\"queryform\"><tr><td>\n"; - -- stream << html_form_begin; -+ stream << html_form_begin_apt; - stream << "<tr><td colspan=\"2\" class=\"title\">" + i18n("Offline search") + "</td></tr>" << endl; - stream << make_html_form_line("search", i18n("Package search")); - if (ext_form) -@@ -206,7 +206,7 @@ - stream << make_html_form_line("fsearch", i18n("File search")); - stream << make_html_form_line("show", i18n("Package info")); - } -- stream << html_form_end.arg( i18n("Search") ); -+ stream << html_form_end_apt.arg( i18n("Search") ); - - if (online) - { diff --git a/redhat/applications/tdeio-apt/tdeio-apt-3.5.13.2.spec b/redhat/applications/tdeio-apt/tdeio-apt-3.5.13.2.spec deleted file mode 100644 index e45848c73..000000000 --- a/redhat/applications/tdeio-apt/tdeio-apt-3.5.13.2.spec +++ /dev/null @@ -1,121 +0,0 @@ -# Default version for this component -%define tde_pkg tdeio-apt -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: An apt-cache ioslave for Trinity -Version: 0.13.2 -Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://lpnotfr.free.fr/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -Patch1: tdeio-apt-3.5.13.2-ftbfs.patch - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - - -%description -tdeio-apt is an ioslave which provides the apt:/ protocol. It -integrates apt-cache functionalities into Konqueror, making -browsing the packages easier. It provides: - - apt-cache search: apt:/search?expression - - apt-cache show: apt:/show?package . The show? target - prints the policy too. - - apt-cache policy: apt:/policy?package - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%patch1 -p1 -b .ftbfs - -%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" - -%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-final \ - --enable-new-ldflags \ - --enable-closure \ - --enable-rpath - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -%find_lang kio-apt - - -%clean -%__rm -rf %{buildroot} - - -%files -f kio-apt.lang -%defattr(-,root,root,-) -%doc AUTHORS CHANGELOG ChangeLog COPYING -%{tde_tdelibdir}/kio_apt.la -%{tde_tdelibdir}/kio_apt.so -%{tde_datadir}/apps/kio_apt/kdedeb_logo.png -%{tde_datadir}/apps/kio_apt/kio_apt.css -%{tde_datadir}/services/apt+http.protocol -%{tde_datadir}/services/apt.protocol -%{tde_datadir}/services/searchproviders/apt-file.desktop -%{tde_datadir}/services/searchproviders/apt-files.desktop -%{tde_datadir}/services/searchproviders/apt-search.desktop - - -%changelog diff --git a/redhat/applications/tdeio-apt/tdeio-apt-14.0.0.spec b/redhat/applications/tdeio-apt/tdeio-apt.spec index c405bfa07..cd085ba18 100644 --- a/redhat/applications/tdeio-apt/tdeio-apt-14.0.0.spec +++ b/redhat/applications/tdeio-apt/tdeio-apt.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg tdeio-apt %define tde_prefix /opt/trinity @@ -60,11 +60,17 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils -BuildRequires: autoconf automake libtool m4 +BuildRequires: cmake >= 2.8 BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: fdupes +# ACL support +BuildRequires: libacl-devel + +# IDN support +BuildRequires: libidn-devel + # SUSE desktop files utility %if 0%{?suse_version} BuildRequires: update-desktop-files @@ -97,39 +103,43 @@ browsing the packages easier. It provides: %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/"*"/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} \ - --includedir=%{tde_tdeincludedir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ +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 \ + \ + -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \ + -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \ + -DLIB_INSTALL_DIR="%{tde_libdir}" \ + \ + -DWITH_ALL_OPTIONS=ON \ + -DWITH_GCC_VISIBILITY=ON \ \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-final \ - --enable-new-ldflags \ - --enable-closure \ - --enable-rpath \ - --disable-gcc-hidden-visibility + -DBUILD_ALL=ON \ + -DBUILD_TRANSLATIONS=ON \ + .. -%__make %{?_smp_mflags} +%__make %{?_smp_mflags} || %__make %install export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} +%__make install DESTDIR=%{buildroot} -C build %find_lang %{tde_pkg} diff --git a/redhat/applications/tdeio-ftps/tdeio-ftps.spec b/redhat/applications/tdeio-ftps/tdeio-ftps.spec index cd0b89d14..13ca048d8 100644 --- a/redhat/applications/tdeio-ftps/tdeio-ftps.spec +++ b/redhat/applications/tdeio-ftps/tdeio-ftps.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg tdeio-ftps %define tde_prefix /opt/trinity @@ -144,8 +144,15 @@ fi %__rm -rf %{?buildroot} %__make install DESTDIR=%{buildroot} -C build +%find_lang %{tde_pkg} -%files + +%clean +%__rm -rf %{?buildroot} + + +%files -f %{tde_pkg}.lang +%defattr(-,root,root,-) %defattr(-,root,root,-) %doc README Changelog COPYING AUTHORS %{tde_tdelibdir}/tdeio_ftps.la diff --git a/redhat/applications/tdeio-gopher/tdeio-gopher.spec b/redhat/applications/tdeio-gopher/tdeio-gopher.spec index e13482992..4c36b407a 100644 --- a/redhat/applications/tdeio-gopher/tdeio-gopher.spec +++ b/redhat/applications/tdeio-gopher/tdeio-gopher.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg tdeio-gopher %define tde_prefix /opt/trinity diff --git a/redhat/applications/tdeio-locate/tdeio-locate-3.5.13.2.spec b/redhat/applications/tdeio-locate/tdeio-locate-3.5.13.2.spec deleted file mode 100644 index 508da013b..000000000 --- a/redhat/applications/tdeio-locate/tdeio-locate-3.5.13.2.spec +++ /dev/null @@ -1,128 +0,0 @@ -# Default version for this component -%define tde_pkg tdeio-locate -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: kio-slave for the locate command [Trinity] -Version: 0.4.5 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: cmake >= 2.8 - -Obsoletes: trinity-kio-locate < %{version}-%{release} -Provides: trinity-kio-locate = %{version}-%{release} - -%description -Adds support for the "locate" and "locater:" -protocols to Konqueror and other TDE applications. - -This enables you to perform locate searches as you -would in a terminal. The result is displayed just -as a directory. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} - - -%build -unset QTDIR QTINC QTLIB -. /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" - -# 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 - -%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 \ - \ - -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \ - -DBIN_INSTALL_DIR=%{tde_bindir} \ - -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \ - -DLIB_INSTALL_DIR=%{tde_libdir} \ - -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ - \ - -DBUILD_ALL=ON \ - .. - -# SMP safe ! -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} -C build - -%find_lang kio-locate - -%clean -%__rm -rf %{buildroot} - - - -%files -f kio-locate.lang -%defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING TODO -%{tde_tdelibdir}/kio_locate.la -%{tde_tdelibdir}/kio_locate.so -%{tde_tdedocdir}/HTML/en/kio-locate/ -%{tde_datadir}/services/locate.protocol -%{tde_datadir}/services/locater.protocol -%{tde_datadir}/services/rlocate.protocol -%{tde_datadir}/services/searchproviders/locate.desktop - -%changelog diff --git a/redhat/applications/tdeio-locate/tdeio-locate-14.0.0.spec b/redhat/applications/tdeio-locate/tdeio-locate.spec index 2c389bbee..d1784e171 100644 --- a/redhat/applications/tdeio-locate/tdeio-locate-14.0.0.spec +++ b/redhat/applications/tdeio-locate/tdeio-locate.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg tdeio-locate %define tde_prefix /opt/trinity diff --git a/redhat/applications/tdeio-sword/tdeio-sword.spec b/redhat/applications/tdeio-sword/tdeio-sword.spec index bd1e3f003..ea214101d 100644 --- a/redhat/applications/tdeio-sword/tdeio-sword.spec +++ b/redhat/applications/tdeio-sword/tdeio-sword.spec @@ -23,7 +23,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg tdeio-sword %define tde_prefix /opt/trinity @@ -154,8 +154,14 @@ fi %__rm -rf %{?buildroot} %__make install DESTDIR=%{buildroot} -C build +%find_lang %{tde_pkg} -%files + +%clean +%__rm -rf %{?buildroot} + + +%files -f %{tde_pkg}.lang %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING README TODO %{tde_tdelibdir}/tdeio_sword.la diff --git a/redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper-3.5.13.2.spec b/redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper-3.5.13.2.spec deleted file mode 100644 index 22903f422..000000000 --- a/redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper-3.5.13.2.spec +++ /dev/null @@ -1,130 +0,0 @@ -# Default version for this component -%define tde_pkg tdeio-umountwrapper -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: progress dialog for safely removing devices in Trinity. -Version: 0.2 -Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://frode.kde.no/misc/tdeio_umountwrapper/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -Source1: media_safelyremove.desktop - - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -Obsoletes: trinity-kio-umountwrapper < %{version}-%{release} -Provides: trinity-kio-umountwrapper = %{version}-%{release} - -%description -Wrapper around kio_media_mountwrapper. -Provides a progress dialog for Safely Removing of devices in Trinity. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%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/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR QTINC QTLIB -. /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" - -%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-final \ - --enable-new-ldflags \ - --enable-closure \ - --enable-rpath - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -%__install -D -m 644 %{SOURCE1} %{?buildroot}%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_kio-umountwrapper -%__install -D -m 644 %{SOURCE1} %{?buildroot}%{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop_kio-umountwrapper - - -%clean -%__rm -rf %{buildroot} - -%post -for f in konqueror d3lphin; do - update-alternatives --install \ - %{tde_datadir}/apps/${f}/servicemenus/media_safelyremove.desktop \ - media_safelyremove.desktop_${f} \ - %{tde_datadir}/apps/${f}/servicemenus/media_safelyremove.desktop_kio-umountwrapper \ - 20 -done - -%postun -if [ $1 -eq 0 ]; then - for f in konqueror d3lphin; do - update-alternatives --remove \ - media_safelyremove.desktop_${f} \ - %{tde_datadir}/apps/${f}/servicemenus/media_safelyremove.desktop_kio-umountwrapper - done -fi - -%files -%defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING NEWS README TODO -%{tde_bindir}/kio_umountwrapper -%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_kio-umountwrapper -%{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop_kio-umountwrapper - - -%changelog diff --git a/redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper.spec b/redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper.spec index 81e416d4e..53a8b0f8c 100644 --- a/redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper.spec +++ b/redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg tdeio-umountwrapper %define tde_prefix /opt/trinity @@ -150,10 +150,13 @@ export PATH="%{tde_bindir}:${PATH}" %__install -D -m 644 "%{SOURCE1}" %{?buildroot}%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdeio-umountwrapper %__install -D -m 644 "%{SOURCE1}" %{?buildroot}%{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop_tdeio-umountwrapper +%find_lang tdeio_umountwrapper + %clean %__rm -rf %{buildroot} + %post for f in konqueror d3lphin; do update-alternatives --install \ @@ -163,6 +166,7 @@ for f in konqueror d3lphin; do 20 done + %postun if [ $1 -eq 0 ]; then for f in konqueror d3lphin; do @@ -172,9 +176,10 @@ if [ $1 -eq 0 ]; then done fi -%files + +%files -f tdeio_umountwrapper.lang %defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING NEWS README TODO +%doc AUTHORS COPYING README %{tde_bindir}/tdeio_umountwrapper %{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdeio-umountwrapper %dir %{tde_datadir}/apps/d3lphin diff --git a/redhat/applications/tdenetworkmanager/tdenetworkmanager.spec b/redhat/applications/tdenetworkmanager/tdenetworkmanager.spec index cf3edd2bb..9f1a67da7 100644 --- a/redhat/applications/tdenetworkmanager/tdenetworkmanager.spec +++ b/redhat/applications/tdenetworkmanager/tdenetworkmanager.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg tdenetworkmanager %define tde_prefix /opt/trinity @@ -84,7 +84,7 @@ Provides: trinity-knetworkmanager = %{version}-%{release} %if 0%{?rhel} || 0%{?fedora} %if 0%{?fedora} >= 20 || 0%{?rhel} >= 7 Requires: NetworkManager -%if 0%{?fedora} >= 29 +%if 0%{?fedora} >= 29 || 0%{?rhel} >= 8 BuildRequires: NetworkManager-libnm-devel %else BuildRequires: NetworkManager-devel @@ -98,7 +98,7 @@ Requires: networkmanager %endif %if 0%{?rhel} || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} %if 0%{?pclinuxos} == 0 -%if 0%{?fedora} >= 29 +%if 0%{?fedora} >= 29 || 0%{?rhel} >= 8 BuildRequires: NetworkManager-libnm-devel %else BuildRequires: NetworkManager-glib-devel @@ -151,7 +151,7 @@ if [ -r "/etc/xdg/autostart/nm-applet.desktop" ]; then fi fi -%files -f %{tde_pkg}.lang +%files %defattr(-,root,root,-) %{tde_bindir}/tdenetworkmanager %{tde_libdir}/*.la @@ -163,11 +163,11 @@ fi %{tde_datadir}/servicetypes/tdenetworkmanager_plugin.desktop %{tde_datadir}/servicetypes/tdenetworkmanager_vpnplugin.desktop %{tde_datadir}/autostart/tdenetworkmanager.desktop -%{tde_datadir}/services/tdenetman_openvpn.desktop -%{tde_datadir}/services/tdenetman_pptp.desktop -%{tde_datadir}/services/tdenetman_strongswan.desktop -%{tde_datadir}/services/tdenetman_vpnc.desktop -%{tde_tdedocdir}/HTML/en/tdenetworkmanager/ +#{tde_datadir}/services/tdenetman_openvpn.desktop +#{tde_datadir}/services/tdenetman_pptp.desktop +#{tde_datadir}/services/tdenetman_strongswan.desktop +#{tde_datadir}/services/tdenetman_vpnc.desktop +#{tde_tdedocdir}/HTML/en/tdenetworkmanager/ ########## @@ -231,8 +231,6 @@ fi %__rm -rf $RPM_BUILD_ROOT %__make install DESTDIR=%{?buildroot} -C build -%find_lang %{tde_pkg} - # Updates applications categories for openSUSE %if 0%{?suse_version} %suse_update_desktop_file -r %{tde_pkg} Utility TrayIcon System Applet diff --git a/redhat/applications/tdepacman/tdepacman.spec b/redhat/applications/tdepacman/tdepacman.spec new file mode 100644 index 000000000..4588b8bb6 --- /dev/null +++ b/redhat/applications/tdepacman/tdepacman.spec @@ -0,0 +1,149 @@ +# +# spec file for package tdepacman (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/ +# + +# Default version for this component +%define tde_pkg tdepacman +%if "%{?tde_version}" == "" +%define tde_version 14.1.0 +%endif + +# TDE specific building variables +%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_appdir %{tde_datadir}/applications + +%define tde_tdeappdir %{tde_appdir}/tde +%define tde_tdedocdir %{tde_docdir}/tde +%define tde_tdeincludedir %{tde_includedir}/tde +%define tde_tdelibdir %{tde_libdir}/trinity + +%define _docdir %{tde_docdir} + + +Name: trinity-%{tde_pkg} +Summary: A pacman game for the Trinity Desktop +Version: 0.3.2 +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} + +License: GPLv2+ +Group: Applications/Utilities + +Vendor: Trinity Project +Packager: Francois Andriot <francois.andriot@free.fr> +URL: http://www.trinitydesktop.org/ + +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz + +BuildRequires: trinity-tqtinterface-devel >= %{tde_version} +BuildRequires: trinity-arts-devel >= 1:1.5.10 +BuildRequires: trinity-tdelibs-devel >= %{tde_version} +BuildRequires: trinity-tdebase-devel >= %{tde_version} +BuildRequires: trinity-tdegames-devel >= %{tde_version} +BuildRequires: desktop-file-utils + +BuildRequires: gettext + +BuildRequires: cmake +BuildRequires: gcc-c++ +BuildRequires: pkgconfig +BuildRequires: libtool + + +%description +Pacman is a legendary game with an enthusiastic following from around +the world. Since its introduction in 1980, Pacman's image has been +splashed across magazine covers, television screens, T-shirts, and +bumper stickers. Created by Japan's Namco, and distributed in the +United States by Bally, Pacman is an icon of 1980's popular culture + +%if 0%{?suse_version} || 0%{?pclinuxos} +%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" + +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 \ + \ + -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \ + -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ + -DDATA_INSTALL_DIR=%{tde_datadir}/apps \ + -DLIB_INSTALL_DIR=%{tde_libdir} \ + -DBUILD_ALL=ON \ + .. + +%__make %{?_smp_mflags} + + +%install +export PATH="%{tde_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} -C build + +%find_lang %{tde_pkg} + + +%clean +%__rm -rf %{buildroot} + + +%files -f %{tde_pkg}.lang +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog COPYING README TODO +%{tde_bindir}/tdepacman +%{tde_tdeappdir}/tdepacman.desktop +%{tde_datadir}/apps/tdepacman/ +%dir %{tde_datadir}/config +%{tde_datadir}/config/tdepacmanrc +%lang(de) %{tde_tdedocdir}/HTML/de/tdepacman/ +%{tde_tdedocdir}/HTML/en/tdepacman/ +%{tde_datadir}/icons/hicolor/16x16/apps/tdepacman.png +%{tde_datadir}/icons/hicolor/32x32/apps/tdepacman.png +%{tde_datadir}/icons/locolor/16x16/apps/tdepacman.png +%{tde_datadir}/icons/locolor/32x32/apps/tdepacman.png +%{tde_mandir}/man1/tdepacman.1* + + +%changelog diff --git a/redhat/applications/tdepowersave/tdepowersave-14.0.0.spec b/redhat/applications/tdepowersave/tdepowersave.spec index 613e0ba2f..2b80f902d 100644 --- a/redhat/applications/tdepowersave/tdepowersave-14.0.0.spec +++ b/redhat/applications/tdepowersave/tdepowersave.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg tdepowersave %define tde_prefix /opt/trinity @@ -86,7 +86,7 @@ BuildRequires: libudev-devel # XSCREENSAVER support # Disabled on RHEL4 -%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version} +%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} == 5 || 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?suse_version} %define with_xscreensaver 1 %if 0%{?rhel} == 5 BuildRequires: xorg-x11-proto-devel @@ -240,7 +240,8 @@ fi %{tde_datadir}/apps/tdepowersave/ %{tde_datadir}/icons/hicolor/*/*/*.png %{tde_datadir}/autostart/tdepowersave-autostart.desktop -%{tde_confdir}/tdepowersaverc +%config(noreplace) %{tde_confdir}/tdepowersaverc +%{tde_mandir}/man1/tdepowersave.* %lang(cs) %{tde_tdedocdir}/HTML/cs/tdepowersave/ %lang(de) %{tde_tdedocdir}/HTML/de/tdepowersave/ diff --git a/redhat/applications/tderadio/tderadio-3.5.13.2.spec b/redhat/applications/tderadio/tderadio-3.5.13.2.spec deleted file mode 100644 index 04b82fc4e..000000000 --- a/redhat/applications/tderadio/tderadio-3.5.13.2.spec +++ /dev/null @@ -1,171 +0,0 @@ -# Default version for this component -%define tde_pkg tderadio -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - -%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} -%define with_lirc 1 -%endif - -Name: trinity-%{tde_pkg} -Summary: Comfortable Radio Application for TDE [Trinity] -Version: 0.1.1.1 -Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: gettext -BuildRequires: libsndfile-devel -%{?with_lirc:BuildRequires: lirc-devel} - -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: %{_lib}twolame-devel -%endif -%if 0%{?suse_version} -BuildRequires: libtwolame-devel -%endif -%if 0%{?rhel} || 0%{?fedora} -BuildRequires: lame-devel -%endif - -Obsoletes: trinity-kradio < %{version}-%{release} -Provides: trinity-kradio = %{version}-%{release} - -%description -KRadio is a comfortable radio application for Trinity with support for -V4L and V4L2 radio cards drivers. - -KRadio currently provides - - * V4L/V4L2 radio support -%if 0%{?with_lirc} - * Remote control support (LIRC) -%endif - * Alarms, sleep Countdown - * Several GUI Controls (Docking Menu, Station Quickbar, Radio Display) - * Recording capabilities, including MP3 and Ogg/Vorbis encoding - * Timeshifter functionality - * Extendable plugin architecture - -This package also includes a growing collection of station preset -files for many cities around the world contributed by KRadio users. - -As KRadio is based on an extendable plugin architecture, contributions -of new plugins (e.g. Internet Radio Streams, new cool GUIs) are welcome. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} - -%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - - -%build -unset QTDIR; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" - -%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 \ - \ - %{?with_lirc:--enable-lirc} %{?!with_lirc:--disable-lirc} \ - --enable-v4l2 \ - --enable-lame \ - --enable-ogg \ - --enable-alsa \ - --enable-oss - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -%find_lang kradio - -%clean -%__rm -rf %{buildroot} - - -%post -for f in hicolor locolor ; do - touch --no-create %{tde_datadir}/icons/${f} || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : -done -update-desktop-database %{tde_appdir} -q &> /dev/null ||: - -%postun -for f in hicolor locolor ; do - touch --no-create %{tde_datadir}/icons/${f} || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : -done -update-desktop-database %{tde_appdir} -q &> /dev/null ||: - - -%files -f kradio.lang -%defattr(-,root,root,-) -%{tde_bindir}/convert-presets -%{tde_bindir}/kradio -%{tde_libdir}/kradio/plugins/*.la -%{tde_libdir}/kradio/plugins/*.so -%{tde_tdeappdir}/kradio.desktop -%{tde_datadir}/apps/kradio/ -%{tde_datadir}/icons/hicolor/*/*/kradio*.png -%{tde_datadir}/icons/locolor/*/*/kradio*.png -%lang(de) %{tde_datadir}/locale/de/LC_MESSAGES/*.mo -%lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/*.mo - -%changelog diff --git a/redhat/applications/tderadio/tderadio-14.0.0.spec b/redhat/applications/tderadio/tderadio.spec index 7b15298df..57216d054 100644 --- a/redhat/applications/tderadio/tderadio-14.0.0.spec +++ b/redhat/applications/tderadio/tderadio.spec @@ -22,7 +22,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg tderadio %define tde_prefix /opt/trinity @@ -166,6 +166,7 @@ export PATH="%{tde_bindir}:${PATH}" --libdir=%{tde_libdir} \ --mandir=%{tde_mandir} \ --includedir=%{tde_tdeincludedir} \ + --program-prefix="" \ \ --disable-dependency-tracking \ --disable-debug \ @@ -221,6 +222,8 @@ export PATH="%{tde_bindir}:${PATH}" %{tde_datadir}/icons/hicolor/*/*/tderadio*.png %{tde_datadir}/icons/locolor/*/*/tderadio*.png %lang(de) %{tde_datadir}/locale/de/LC_MESSAGES/*.mo +%lang(nl) %{tde_datadir}/locale/nl/LC_MESSAGES/*.mo +%lang(pt) %{tde_datadir}/locale/pt/LC_MESSAGES/*.mo %lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/*.mo %{tde_tdedocdir}/HTML/en/tderadio/ diff --git a/redhat/applications/tdesudo/tdesudo-3.5.13.2.spec b/redhat/applications/tdesudo/tdesudo-3.5.13.2.spec deleted file mode 100644 index e7dd22faf..000000000 --- a/redhat/applications/tdesudo/tdesudo-3.5.13.2.spec +++ /dev/null @@ -1,110 +0,0 @@ -# Default version for this component -%define tde_pkg tdesudo -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: sudo frontend for Trinity - -Version: 2.5.1 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Prefix: %{_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -Obsoletes: trinity-kdesudo < %{version}-%{release} -Provides: trinity-kdesudo = %{version}-%{release} - -Requires: sudo - -%description -TdeSudo is a graphical frontend for the sudo utility. -It allows you to run programs as another user by entering your password. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} - -%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR || : ; source /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --docdir=%{tde_docdir} \ - --includedir=%{tde_tdeincludedir} \ - \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-final \ - --enable-new-ldflags \ - --enable-closure \ - --enable-rpath - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -%find_lang kdesudo - - -%clean -%__rm -rf %{buildroot} - - - -%files -f kdesudo.lang -%defattr(-,root,root,-) -%{tde_bindir}/kdesudo -%{tde_tdedocdir}/HTML/en/kdesudo/ - - -%changelog diff --git a/redhat/applications/tdesudo/tdesudo.spec b/redhat/applications/tdesudo/tdesudo.spec index 83e1bff8f..2b4d8509d 100644 --- a/redhat/applications/tdesudo/tdesudo.spec +++ b/redhat/applications/tdesudo/tdesudo.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg tdesudo %define tde_prefix /opt/trinity diff --git a/redhat/applications/tdesvn/tdesvn-14.0.0.patch b/redhat/applications/tdesvn/tdesvn-14.0.0.patch deleted file mode 100644 index b22e7f2e4..000000000 --- a/redhat/applications/tdesvn/tdesvn-14.0.0.patch +++ /dev/null @@ -1,57 +0,0 @@ ---- trinity-tdesvn-14.0.0~pre185+fddfb277/src/svnqt/CMakeLists.txt.sqlite3 2013-12-30 17:57:05.867723485 +0100 -+++ trinity-tdesvn-14.0.0~pre185+fddfb277/src/svnqt/CMakeLists.txt 2014-09-16 21:49:29.774968683 +0200 -@@ -45,19 +45,6 @@ - cache/DatabaseException.cpp - ) - --# IF (SQLITE_FOUND) -- MESSAGE(STATUS "Build own sqlite3 database modul") -- SET(SOURCES -- ${SOURCES} -- cache/sqlite3/qsqlcachedresult.cpp -- cache/sqlite3/qsql_sqlite3.cpp -- cache/sqlite3/qsqlcachedresult.h -- cache/sqlite3/qsql_sqlite3.h -- ) --# ELSE (SQLITE_FOUND) --# MESSAGE(SEND_ERROR "The QT3 version requires sqlite3 but could not found") --# ENDIF (SQLITE_FOUND) -- - SET(CACHEINST_HEADERS - cache/LogCache.hpp - cache/ReposLog.hpp -@@ -150,7 +137,7 @@ - - # IF (SQLITE_FOUND) - TARGET_LINK_LIBRARIES(${svnqt-name} ${SQLITE_LIBRARIES}) -- INCLUDE_DIRECTORIES(SQLITE_INCLUDE_DIR) -+ INCLUDE_DIRECTORIES(${SQLITE_INCLUDE_DIR}) - # ELSE (SQLITE_FOUND) - # TARGET_LINK_LIBRARIES(${svnqt-name} ${QT_QTSQL_LIBRARY}) - # ENDIF (SQLITE_FOUND) ---- trinity-tdesvn-14.0.0~pre185+fddfb277/src/svnqt/cache/LogCache.cpp.sqlite3 2014-01-28 20:25:28.711539518 +0100 -+++ trinity-tdesvn-14.0.0~pre185+fddfb277/src/svnqt/cache/LogCache.cpp 2014-09-16 21:51:37.826387614 +0200 -@@ -10,9 +10,10 @@ - #include "svnqt/cache/DatabaseException.hpp" - - #ifndef NO_SQLITE3 --#include "sqlite3/qsql_sqlite3.h" -+#include <qsql_sqlite3.h> - #define SQLTYPE "QSQLITE3" - #else -+#include <qsql_sqlite.h> - #define SQLTYPE "QSQLITE" - #endif - -@@ -262,11 +263,6 @@ - - void LogCache::setupMainDb() - { --#ifndef NO_SQLITE3 -- if (!TQSqlDatabase::isDriverAvailable(SQLTYPE)) { -- TQSqlDatabase::registerSqlDriver(SQLTYPE,new TQSqlDriverCreator<TQSQLite3Driver>); -- } --#endif - TQDataBase mainDB = m_CacheData->getMainDB(); - if (!mainDB || !mainDB->open()) { - tqWarning("Failed to open main database: %s", (mainDB?mainDB->lastError().text().TOUTF8().data():"No database object.")); diff --git a/redhat/applications/tdesvn/tdesvn-3.5.13.2.spec b/redhat/applications/tdesvn/tdesvn-3.5.13.2.spec deleted file mode 100644 index 06473162e..000000000 --- a/redhat/applications/tdesvn/tdesvn-3.5.13.2.spec +++ /dev/null @@ -1,255 +0,0 @@ -# Default version for this component -%define tde_pkg tdesvn -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: subversion client with tight TDE integration [Trinity] -Version: 1.0.4 -Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.elliptique.net/~ken/kima/ - -Prefix: %{_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: subversion-devel -Requires: %{name}-tdeio-plugins = %{version}-%{release} - -Obsoletes: trinity-kdesvn < %{version}-%{release} -Provides: trinity-kdesvn = %{version}-%{release} - -%description -TDESvn is a graphical client for the subversion revision control -system (svn). - -Besides offering common and advanced svn operations, it features -a tight integration into TDE and can be embedded into other TDE -applications like konqueror via the TDE component technology KParts. - - -%package -n trinity-libsvnqt -Group: Development/Libraries -Summary: Qt wrapper library for subversion [Trinity] - -%description -n trinity-libsvnqt -This package provides svnqt, a Qt wrapper library around the -subversion library. - -It is based on the RapidSvn SvnCpp library, a subversion client API -written in C++. - -%package -n trinity-libsvnqt-devel -Group: Development/Libraries -Requires: trinity-libsvnqt = %{version}-%{release} -Requires: qt-devel -Requires: subversion-devel -Summary: Qt wrapper library for subversion (development files) [Trinity] - -%description -n trinity-libsvnqt-devel -This package contains the header files and symbolic links that developers -using svnqt will need. - - -%package tdeio-plugins -Group: Development/Libraries -Conflicts: trinity-kdesdk-tdeio-plugins -Summary: subversion I/O slaves for Trinity - -Obsoletes: trinity-kdesvn-kio-plugins < %{version}-%{release} -Provides: trinity-kdesvn-kio-plugins = %{version}-%{release} -Obsoletes: trinity-tdesvn-kio-plugins < %{version}-%{release} -Provides: trinity-tdesvn-kio-plugins = %{version}-%{release} - -%description tdeio-plugins -This packages includes KIO slaves for svn, svn+file, svn+http, -svn+https, svn+ssh. This allows you to access subversion repositories -inside any KIO enabled TDE application. - -This package is part of tdesvn-trinity. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} - -# Moves HTML files to the correect location -find . -name "*.cmake" -exec %__sed -i {} \ - -e "s,/doc/HTML,/doc/tde/HTML,g" \ - \; - - -%build -unset QTDIR QTINC QTLIB -. /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${QTDIR}/bin:${PATH}" -export CMAKE_INCLUDE_PATH="%{tde_tdeincludedir}" - -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 \ - \ - -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \ - -DBIN_INSTALL_DIR=%{tde_bindir} \ - -DINCLUDE_INSTALL_DIR=%{tde_includedir} \ - -DLIB_INSTALL_DIR=%{tde_libdir} \ - -DMAN_INSTALL_DIR=%{tde_mandir}/man1 \ - -DDATA_INSTALL_DIR=%{tde_datadir} \ - -DPKGCONFIG_INSTALL_DIR=%{tde_tdelibdir}/pkgconfig \ - -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ - \ - -DBUILD_DOC=ON \ - -DBUILD_TRANSLATIONS=ON \ - .. - -# SMP safe ! -%__make %{?_smp_mflags} || %__make - - -%install -export PATH="%{_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} -C build - -# Installs SVN protocols as alternatives -%__mv -f %{?buildroot}%{tde_datadir}/services/svn+file.protocol %{?buildroot}%{tde_datadir}/services/svn+file.protocol_tdesvn -%__mv -f %{?buildroot}%{tde_datadir}/services/svn+http.protocol %{?buildroot}%{tde_datadir}/services/svn+http.protocol_tdesvn -%__mv -f %{?buildroot}%{tde_datadir}/services/svn+https.protocol %{?buildroot}%{tde_datadir}/services/svn+https.protocol_tdesvn -%__mv -f %{?buildroot}%{tde_datadir}/services/svn+ssh.protocol %{?buildroot}%{tde_datadir}/services/svn+ssh.protocol_tdesvn -%__mv -f %{?buildroot}%{tde_datadir}/services/svn.protocol %{?buildroot}%{tde_datadir}/services/svn.protocol_tdesvn - -# Locales -%find_lang kdesvn - - -%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 || : - -%post -n trinity-libsvnqt -/sbin/ldconfig || : - -%post tdeio-plugins -for proto in svn+file svn+http svn+https svn+ssh svn; do - update-alternatives --install \ - %{tde_datadir}/services/${proto}.protocol \ - ${proto}.protocol \ - %{tde_datadir}/services/${proto}.protocol_tdesvn \ - 20 -done - -%preun tdeio-plugins -if [ $1 -eq 0 ]; then - for proto in svn+file svn+http svn+https svn+ssh svn; do - update-alternatives --remove \ - ${proto}.protocol \ - %{tde_datadir}/services/${proto}.protocol_tdesvn - done -fi - - - -%postun -n trinity-libsvnqt -/sbin/ldconfig || : - - -%files -f kdesvn.lang -%defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING NEWS README TODO -%{tde_bindir}/kdesvn -%{tde_bindir}/kdesvnaskpass -%{tde_tdelibdir}/libkdesvnpart.la -%{tde_tdelibdir}/libkdesvnpart.so -%{tde_datadir}/applications/kde/kdesvn.desktop -%{tde_datadir}/apps/kconf_update/kdesvn-use-external-update.sh -%{tde_datadir}/apps/kconf_update/kdesvnpartrc-use-external.upd -%{tde_datadir}/apps/kdesvn/kdesvnui.rc -%{tde_datadir}/apps/kdesvnpart/kdesvn_part.rc -%{tde_datadir}/apps/konqueror/servicemenus/kdesvn_subversion.desktop -%{tde_datadir}/config.kcfg/kdesvn_part.kcfg -%{tde_datadir}/icons/hicolor/*/*/*.png -%{tde_datadir}/icons/hicolor/*/*/*.svgz -%{tde_mandir}/man1/kdesvn.1 -%{tde_mandir}/man1/kdesvnaskpass.1 -%{tde_tdedocdir}/HTML/*/ - -%files -n trinity-libsvnqt -%defattr(-,root,root,-) -%{tde_libdir}/libsvnqt.so.4 -%{tde_libdir}/libsvnqt.so.4.2.2 - -%files -n trinity-libsvnqt-devel -%defattr(-,root,root,-) -%{tde_includedir}/svnqt -%{tde_libdir}/libsvnqt.so - -%files tdeio-plugins -%defattr(-,root,root,-) -%{tde_datadir}/services/kded/kdesvnd.desktop -%{tde_datadir}/services/ksvn+file.protocol -%{tde_datadir}/services/ksvn+http.protocol -%{tde_datadir}/services/ksvn+https.protocol -%{tde_datadir}/services/ksvn+ssh.protocol -%{tde_datadir}/services/ksvn.protocol -%{tde_datadir}/services/svn+file.protocol_tdesvn -%{tde_datadir}/services/svn+http.protocol_tdesvn -%{tde_datadir}/services/svn+https.protocol_tdesvn -%{tde_datadir}/services/svn+ssh.protocol_tdesvn -%{tde_datadir}/services/svn.protocol_tdesvn -%{tde_tdelibdir}/kio_ksvn.la -%{tde_tdelibdir}/kio_ksvn.so -%{tde_tdelibdir}/kded_kdesvnd.la -%{tde_tdelibdir}/kded_kdesvnd.so - - -%changelog diff --git a/redhat/applications/tdesvn/tdesvn-14.0.0.spec b/redhat/applications/tdesvn/tdesvn.spec index 675f25b7f..5b418701a 100644 --- a/redhat/applications/tdesvn/tdesvn-14.0.0.spec +++ b/redhat/applications/tdesvn/tdesvn.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg tdesvn %define tde_prefix /opt/trinity @@ -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} @@ -247,10 +246,9 @@ fi %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%patch0 -p1 rm -f src/svnqt/CMakeLists.txt.orig -rm -fr src/svnqt/cache/sqlite3/ +#rm -fr src/svnqt/cache/sqlite3/ %build diff --git a/redhat/applications/tdmtheme/tdmtheme-3.5.13.2.spec b/redhat/applications/tdmtheme/tdmtheme-3.5.13.2.spec deleted file mode 100644 index 8691353fc..000000000 --- a/redhat/applications/tdmtheme/tdmtheme-3.5.13.2.spec +++ /dev/null @@ -1,119 +0,0 @@ -# Default version for this component -%define tde_pkg tdmtheme -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: theme manager for TDM [Trinity] -Version: 1.2.2 -Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://beta.smileaf.org/projects - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: gettext - -Obsoletes: trinity-kdmtheme < %{version}-%{release} -Provides: trinity-kdmtheme = %{version}-%{release} - - -%description -kdmtheme is a theme manager for KDM. It provides a Trinity Control Module (KCM) -that allows you to easily install, remove and change your KDM themes. - - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%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/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" - -%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-final \ - --enable-new-ldflags \ - --enable-closure \ - --enable-rpath - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - - -%clean -%__rm -rf %{buildroot} - - - -%files -%defattr(-,root,root,-) -%{tde_tdelibdir}/kcm_kdmtheme.la -%{tde_tdelibdir}/kcm_kdmtheme.so -%{tde_tdeappdir}/kdmtheme.desktop -%{tde_tdedocdir}/HTML/en/kdmtheme/ - - -%post -update-desktop-database %{tde_appdir} &> /dev/null - -%postun -update-desktop-database %{tde_appdir} &> /dev/null - - -%changelog diff --git a/redhat/applications/tdmtheme/tdmtheme.spec b/redhat/applications/tdmtheme/tdmtheme.spec index 5d44a1bbd..fac2e95c6 100644 --- a/redhat/applications/tdmtheme/tdmtheme.spec +++ b/redhat/applications/tdmtheme/tdmtheme.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg tdmtheme %define tde_prefix /opt/trinity @@ -144,12 +144,14 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} -C build +%find_lang %{tde_pkg} + %clean %__rm -rf %{buildroot} -%files +%files -f %{tde_pkg}.lang %defattr(-,root,root,-) %{tde_tdelibdir}/kcm_tdmtheme.la %{tde_tdelibdir}/kcm_tdmtheme.so diff --git a/redhat/applications/tellico/tellico-3.5.13.2.spec b/redhat/applications/tellico/tellico-3.5.13.2.spec deleted file mode 100644 index ce72709c0..000000000 --- a/redhat/applications/tellico/tellico-3.5.13.2.spec +++ /dev/null @@ -1,232 +0,0 @@ -# Default version for this component -%define tde_pkg tellico -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_tdedocdir} - - -Name: trinity-%{tde_pkg} -Summary: Icollection manager for books, videos, music [Trinity] -Version: 1.3.2.1 -Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://periapsis.org/tellico/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -Patch1: tellico-3.5.13.2-videodev.patch -Patch2: tellico-3.5.13.2-ftbfs.patch - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: gettext - -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: yaz -BuildRequires: %{_lib}yaz-devel -%endif - -# V4L support -%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?suse_version} -BuildRequires: libv4l-devel -%endif -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: %{_lib}v4l-devel -%endif - -Requires: %{name}-data = %{version}-%{release} -Requires: %{name}-scripts = %{version}-%{release} - -%description -Tellico is a collection manager for TDE. It includes default collections for -books, bibliographies, comic books, videos, music, coins, stamps, trading -cards, and wines, and also allows custom collections; with unlimited -user-defined fields allowed. Automatically formatted names, sorting by any -property, filters, automatic ISBN validation and full customization for -printing or display through XSLT files are some of the features present. It -can import CSV, RIS, BibTeX, and BibTeXML files; and export CSV, HTML, BibTeX, -BibTeXML, and PilotDB. Tellico can also import data from Amazon, IMDb, CDDB, -or any US-MARC compliant z39.50 server. - -The files are stored in XML format, avoiding the need for database server. -It also makes it easy for other softwares to use the Tellico data. - - -%package data -Group: Applications/Utilities -Summary: collection manager for books, videos, music [data] [Trinity] - -%description data -Tellico is a collection manager for TDE. It includes default collections for -books, bibliographies, comic books, videos, music, coins, stamps, trading -cards, and wines, and also allows custom collections; with unlimited -user-defined fields allowed. Automatically formatted names, sorting by any -property, filters, automatic ISBN validation and full customization for -printing or display through XSLT files are some of the features present. It -can import CSV, RIS, BibTeX, and BibTeXML files; and export CSV, HTML, BibTeX, -BibTeXML, and PilotDB. Tellico can also import data from Amazon, IMDb, CDDB, -or any US-MARC compliant z39.50 server. - -The files are stored in XML format, avoiding the need for database server. -It also makes it easy for other softwares to use the Tellico data. - -This package contains the architecture independent files, such data files and -documentation. - -%package scripts -Group: Applications/Utilities -Summary: collection manager for books, videos, music [scripts] [Trinity] - -%description scripts -Tellico is a collection manager for TDE. It includes default collections for -books, bibliographies, comic books, videos, music, coins, stamps, trading -cards, and wines, and also allows custom collections; with unlimited -user-defined fields allowed. Automatically formatted names, sorting by any -property, filters, automatic ISBN validation and full customization for -printing or display through XSLT files are some of the features present. It -can import CSV, RIS, BibTeX, and BibTeXML files; and export CSV, HTML, BibTeX, -BibTeXML, and PilotDB. Tellico can also import data from Amazon, IMDb, CDDB, -or any US-MARC compliant z39.50 server. - -The files are stored in XML format, avoiding the need for database server. -It also makes it easy for other softwares to use the Tellico data. - -This package contains the scripts to import data from external sources, such -as websites. As the format of the data may change, these scripts are provided -as a separate package which can be updated through debian-volatile. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} - -if [ -r /usr/include/libv4l1-videodev.h ]; then -%patch1 -p1 -b .videodev -fi -%patch2 -p1 -b .ftbfs - -%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" - -# Warning, --enable-final causes FTBFS ยง -%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 \ - --disable-final \ - --enable-new-ldflags \ - --enable-closure \ - --enable-rpath \ - \ - --enable-webcam - -%__make %{?_smp_mflags} || %__make - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -# Add svg icons to xdg directories -%__install -D -c -p -m 644 icons/tellico.svg %{?buildroot}%{tde_datadir}/icons/hicolor/scalable/apps/tellico.svg -%__install -D -c -p -m 644 icons/tellico_mime.svg %{?buildroot}%{tde_datadir}/icons/hicolor/scalable/mimetypes/application-x-tellico.svg - - -%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 || : - -%postun -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : - - -%files -f %{tde_pkg}.lang -%defattr(-,root,root,-) -%{tde_bindir}/tellico -#%{tde_datadir}/pixmaps -%{tde_datadir}/applications -%{tde_datadir}/config/tellicorc - -%files data -%defattr(-,root,root,-) -%{tde_datadir}/apps/tellico/*.xsl -%{tde_datadir}/apps/tellico/*.xml -%{tde_datadir}/apps/tellico/*.png -%{tde_datadir}/apps/tellico/entry-templates -%{tde_datadir}/apps/tellico/*.py* -%{tde_datadir}/apps/tellico/pics -%{tde_datadir}/apps/tellico/report-templates -%{tde_datadir}/apps/tellico/tellico.dtd -%{tde_datadir}/apps/tellico/tellico.tips -%{tde_datadir}/apps/tellico/tellico2html.js -%{tde_datadir}/apps/tellico/tellicoui.rc -%{tde_datadir}/apps/tellico/welcome.html -%{tde_datadir}/config.kcfg -%{tde_tdedocdir}/HTML/*/tellico/ -%{tde_datadir}/icons -%{tde_datadir}/apps/mime -%{tde_datadir}/mimelnk -%{tde_datadir}/apps/kconf_update/tellico-1-3-update.pl -%{tde_datadir}/apps/kconf_update/tellico-rename.upd -%{tde_datadir}/apps/kconf_update/tellico.upd - -%files scripts -%defattr(-,root,root,-) -%{tde_datadir}/apps/tellico/data-sources -%{tde_datadir}/apps/tellico/z3950-servers.cfg - - -%changelog diff --git a/redhat/applications/tellico/tellico-14.0.0.spec b/redhat/applications/tellico/tellico.spec index 8cb0aae90..c2a7d58fc 100644 --- a/redhat/applications/tellico/tellico-14.0.0.spec +++ b/redhat/applications/tellico/tellico.spec @@ -22,7 +22,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg tellico %define tde_prefix /opt/trinity @@ -176,7 +176,7 @@ It also makes it easy for other softwares to use the Tellico data. %defattr(-,root,root,-) %{tde_bindir}/tellico %{tde_datadir}/applications -%{tde_confdir}/tellicorc +%config(noreplace) %{tde_confdir}/tellicorc ########## @@ -272,6 +272,14 @@ if [ -r /usr/include/libv4l1-videodev.h ]; then %__sed -i "src/barcode/barcode_v4l.h" -e "s|linux/videodev.h|libv4l1.h|" fi +%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8 +%__sed -i "src/fetch/scripts/dark_horse_comics.py" \ + "src/fetch/scripts/ministerio_de_cultura.py" \ + "src/fetch/scripts/fr.allocine.py" \ + "src/translators/griffith2tellico.py" \ + -e "s|/usr/bin/env python|/usr/bin/env python2|" +%endif + %build unset QTDIR QTINC QTLIB diff --git a/redhat/applications/tork/tork-14.0.0.spec b/redhat/applications/tork/tork.spec index 4682ab764..5d4ed718d 100644 --- a/redhat/applications/tork/tork-14.0.0.spec +++ b/redhat/applications/tork/tork.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg tork %define tde_prefix /opt/trinity @@ -117,6 +117,7 @@ export PATH="%{tde_bindir}:${PATH}" --datadir=%{tde_datadir} \ --includedir=%{tde_tdeincludedir} \ --mandir=%{tde_mandir} \ + --program-prefix="" \ \ --disable-dependency-tracking \ --disable-debug \ diff --git a/redhat/applications/twin-style-crystal/twin-style-crystal-3.5.13.2.spec b/redhat/applications/twin-style-crystal/twin-style-crystal-3.5.13.2.spec deleted file mode 100644 index 328988582..000000000 --- a/redhat/applications/twin-style-crystal/twin-style-crystal-3.5.13.2.spec +++ /dev/null @@ -1,117 +0,0 @@ -# Default version for this component -%define tde_pkg twin-style-crystal -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_tdedocdir} - - -Name: trinity-%{tde_pkg} -Summary: Semi transparant window decoration for Trinity. -Version: 1.0.5 -Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: gettext - -Obsoletes: trinity-kwin-style-crystal < %{version}-%{release} -Provides: trinity-kwin-style-crystal = %{version}-%{release} - -%description -Crystal offers you pseudo transparent titlebar, buttons and borders -transparent, so you can see more of your lovely background image -Transparancy and buttons can be costumized to match your wishes. -Offers rounded corners as well - -And it is of course nice to look at. Upstream says: -"- Don't forget to breathe, while drooling." - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%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/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" - -%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-final \ - --enable-new-ldflags \ - --enable-closure \ - --enable-rpath - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - - -%clean -%__rm -rf %{buildroot} - - - -%files -%defattr(-,root,root,-) -%doc AUTHORS COPYING -%{tde_tdelibdir}/kwin3_crystal.la -%{tde_tdelibdir}/kwin3_crystal.so -%{tde_tdelibdir}/kwin_crystal_config.la -%{tde_tdelibdir}/kwin_crystal_config.so -%{tde_datadir}/apps/kwin/crystal.desktop - - -%changelog diff --git a/redhat/applications/twin-style-crystal/twin-style-crystal-14.0.0.spec b/redhat/applications/twin-style-crystal/twin-style-crystal.spec index 9f22e2596..2f5611335 100644 --- a/redhat/applications/twin-style-crystal/twin-style-crystal-14.0.0.spec +++ b/redhat/applications/twin-style-crystal/twin-style-crystal.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg twin-style-crystal %define tde_prefix /opt/trinity diff --git a/redhat/applications/wlassistant/wlassistant-3.5.13.2.spec b/redhat/applications/wlassistant/wlassistant-3.5.13.2.spec deleted file mode 100644 index 264a650c2..000000000 --- a/redhat/applications/wlassistant/wlassistant-3.5.13.2.spec +++ /dev/null @@ -1,140 +0,0 @@ -# Default version for this component -%define tde_pkg wlassistant -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_tdedocdir} - - -Name: trinity-%{tde_pkg} -Summary: User friendly TDE frontend for wireless network connection [Trinity] -Version: 0.5.7 -Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://wlassistant.sourceforge.net/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: gettext - -BuildRequires: python -BuildRequires: cmake >= 2.8 - -%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%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} - - -%build -unset QTDIR QTINC QTLIB -. /etc/profile.d/qt3.sh -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 \ - \ - -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 - -%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 diff --git a/redhat/applications/wlassistant/wlassistant-14.0.0.spec b/redhat/applications/wlassistant/wlassistant.spec index fdd4e9b31..8fdb8da81 100644 --- a/redhat/applications/wlassistant/wlassistant-14.0.0.spec +++ b/redhat/applications/wlassistant/wlassistant.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg wlassistant %define tde_prefix /opt/trinity @@ -99,8 +99,18 @@ BuildRequires: libidn-devel %define with_gamin 1 BuildRequires: gamin-devel %endif + # PYTHON support -BuildRequires: python +%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 +%global python python2 +%global __python %__python2 +%global python_sitearch %{python2_sitearch} +%else +%global python python +%endif +%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} +BuildRequires: %{python} +BuildRequires: %{python}-devel # OPENSSL support BuildRequires: openssl-devel @@ -171,28 +181,17 @@ export PATH="%{tde_bindir}:${PATH}" %suse_update_desktop_file -i -r "%{?buildroot}%{tde_tdeappdir}/wlassistant.desktop" System Network %endif +%find_lang %{tde_pkg} + %clean %__rm -rf %{buildroot} -%files +%files -f %{tde_pkg}.lang %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 diff --git a/redhat/applications/yakuake/yakuake-3.5.13.2.spec b/redhat/applications/yakuake/yakuake-3.5.13.2.spec deleted file mode 100644 index 2cca734ce..000000000 --- a/redhat/applications/yakuake/yakuake-3.5.13.2.spec +++ /dev/null @@ -1,114 +0,0 @@ -# Default version for this component -%define tde_pkg yakuake -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_tdedocdir} - - -Name: trinity-%{tde_pkg} -Summary: Yakuake is a Quake-style terminal emulator based on TDE Konsole technology. -Version: 2.8.1 -Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - - -%description -Yakuake is a Quake-style terminal emulator based on TDE Konsole technology. - -%if 0%{?suse_version} || 0%{?pclinuxos} -%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/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" - -%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 - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - - -%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 AUTHORS COPYING -%{tde_bindir}/* -%{tde_datadir}/applications/*/*.desktop -%{tde_datadir}/apps/*/ -%{tde_datadir}/icons/hicolor/*/*/* -%{tde_datadir}/locale/*/*/*.mo -%{tde_datadir}/config.kcfg/*.kcfg - -%changelog diff --git a/redhat/applications/yakuake/yakuake.spec b/redhat/applications/yakuake/yakuake.spec index 165aedac1..c8ace3af0 100644 --- a/redhat/applications/yakuake/yakuake.spec +++ b/redhat/applications/yakuake/yakuake.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg yakuake %define tde_prefix /opt/trinity |
