Branch: master

e8ff9859 2014-12-09 13:53:42 François Andriot
RPM packaging: update tdetoys
M redhat/main/tdetoys/tdetoys-14.0.0.spec
R redhat/main/tdetoys/kdetoys-3.5.12.spec
R redhat/main/tdetoys/kdetoys-3.5.13-missing_ldflags.patch
R redhat/main/tdetoys/kdetoys-3.5.13.1.spec
R redhat/main/tdetoys/kdetoys-3.5.13.spec
diff --git a/redhat/main/tdetoys/kdetoys-3.5.12.spec b/redhat/main/tdetoys/kdetoys-3.5.12.spec
deleted file mode 100644
index 6641945..0000000
--- a/redhat/main/tdetoys/kdetoys-3.5.12.spec
+++ /dev/null
@@ -1,165 +0,0 @@
-# Default version for this component
-%if "%{?version}" == ""
-%define version 3.5.12
-%endif
-%define release 4
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
-%define _variant .opt
-%define _docdir %{_prefix}/share/doc
-%endif
-
-# TDE 3.5.12 specific building variables
-BuildRequires: autoconf automake libtool m4
-%define tde_docdir %{_docdir}
-%define tde_includedir %{_includedir}/kde
-%define tde_libdir %{_libdir}/kde3
-
-
-Summary: K Desktop Environment - Toys and Amusements
-Name: 	 trinity-kdetoys
-Group:	 Amusements/Graphics
-Version: %{?version}
-Release: %{?release}%{?dist}%{?_variant}
-
-License: GPLv2+
-Source0: kdetoys-%{version}.tar.gz
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@...>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:		%{_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires: desktop-file-utils
-BuildRequires: tqtinterface-devel >= %{version}
-BuildRequires: trinity-kdelibs-devel >= %{version}
-BuildRequires: gettext
-
-
-%description
-Includes: 
-* amor: Amusing Misuse Of Resources put's comic figures above your windows
-* eyesapplet: a kicker applet similar to XEyes
-* fifteenapplet: kicker applet, order 15 pieces in a 4x4 square by moving them
-* kmoon: system tray applet showing the moon phase
-* kodo: mouse movement meter
-* kteatime: system tray applet that makes sure your tea doesn't get too strong
-* ktux: Tux-in-a-Spaceship screen saver
-* kweather: kicker applet that will display the current weather outside
-* kworldwatch: application and kicker applet showing daylight area on the world
-               globe
-
-NOTE: kicker applets and screen savers require kdebase to be installed, 
-and user to be logged-in to KDE.
-
-
-%prep
-%setup -q -n kdetoys
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR || : ; . /etc/profile.d/qt.sh
-export PATH="%{_bindir}:${PATH}"
-export LDFLAGS="-L%{_libdir} -I%{_includedir}"
-
-%configure \
-  --includedir=%{_includedir}/kde \
-  --disable-rpath \
-  --enable-new-ldflags \
-  --disable-debug --disable-warnings \
-  --disable-dependency-tracking --enable-final \
-  --with-extra-includes=%{_includedir}/tqt
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{_bindir}:${PATH}"
-%__rm -rf "%{buildroot}"
-%__make install DESTDIR=%{buildroot}
-
-desktop-file-install \
-  --dir=%{buildroot}%{_datadir}/applnk/System/ScreenSavers \
-  --vendor="" \
-  %{buildroot}%{_datadir}/applnk/System/ScreenSavers/*.desktop ||:
-
-desktop-file-install \
-  --dir=%{buildroot}%{_datadir}/applications/kde \
-  --vendor="" \
-  %{buildroot}%{_datadir}/applications/kde/*.desktop ||:
-
-# replace absolute symlink with relative
-ln -nfs tips-en %{buildroot}%{_datadir}/apps/amor/tips
-
-## File lists
-# locale's
-%find_lang %{name} || touch %{name}.lang
-# HTML (1.0)
-HTML_DIR=$(kde-config --expandvars --install html)
-if [ -d %{buildroot}$HTML_DIR ]; then
-for lang_dir in %{buildroot}$HTML_DIR/* ; do
-  if [ -d $lang_dir ]; then
-    lang=$(basename $lang_dir)
-    echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
-    # replace absolute symlinks with relative ones
-    pushd $lang_dir
-      for i in *; do
-        [ -d $i -a -L $i/common ] && ln -nsf ../common $i/common
-      done
-    popd
-  fi
-done
-fi
-
-## Unpackaged files
-# not sure the point of just one header file 'AmorIface.h', omit (for now).
-%__rm -rf %{buildroot}%{_includedir}
-
-
-%post
-touch --no-create %{_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
-
-%postun
-touch --no-create %{_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
-
-
-%files -f %{name}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING README
-%{_bindir}/*
-%{_libdir}/libkdeinit_*.*
-%{tde_libdir}/*
-%{_datadir}/applications/kde/*.desktop
-%{_datadir}/applnk/System/ScreenSavers/*.desktop
-%{_datadir}/apps/*
-%{_datadir}/icons/hicolor/*/*/*
-%{_datadir}/service*/*.desktop
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%changelog
-* Mon Sep 19 2011 Francois Andriot <francois.andriot@...> - 3.5.12-4
-- Add support for RHEL5
-
-* Sun Sep 11 2011 Francois Andriot <francois.andriot@...> - 3.5.12-3
-- Import to GIT
-
-* Mon Aug 22 2011 Francois Andriot <francois.andriot@...> - 3.5.12-2
-- Correct macro to install under "/opt", if desired
-
-* Fri Aug 05 2011 Francois Andriot <francois.andriot@...> - 3.5.12-1
-- Initial version
-- Spec file based on Fedora 8 "kdetoys 7:3.5.10-1"
-
diff --git a/redhat/main/tdetoys/kdetoys-3.5.13-missing_ldflags.patch b/redhat/main/tdetoys/kdetoys-3.5.13-missing_ldflags.patch
deleted file mode 100644
index ef7e8b9..0000000
--- a/redhat/main/tdetoys/kdetoys-3.5.13-missing_ldflags.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- kdetoys/kweather/Makefile.am.ORI	2012-08-01 10:42:11.015544034 +0200
-+++ kdetoys/kweather/Makefile.am	2012-08-01 10:44:37.144904650 +0200
-@@ -26,7 +26,8 @@
-                                  weatherIface.skel weatherservice.stub \
-                                  weatherbutton.cpp
- weather_panelapplet_la_LDFLAGS = $(KDE_PLUGIN) -module $(all_libraries)
--weather_panelapplet_la_LIBADD = $(LIB_KHTML)
-+weather_panelapplet_la_LIBADD = $(LIB_KHTML) $(LIB_QT) -lDCOP
-+
- 
- appletdir = $(kde_datadir)/kicker/applets
- applet_DATA = kweather.desktop
-@@ -67,7 +68,7 @@
- kde_services_DATA = kcmweather.desktop kcmweatherservice.desktop
- 
- kweatherreport_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version
--kweatherreport_la_LIBADD = $(LIB_KHTML) reportview.lo
-+kweatherreport_la_LIBADD = $(LIB_KHTML) reportview.lo $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) -lDCOP 
- kweatherreport_la_SOURCES = reportmain.cpp weatherservice.stub
- 
- KDE_ICON = kweather
diff --git a/redhat/main/tdetoys/kdetoys-3.5.13.1.spec b/redhat/main/tdetoys/kdetoys-3.5.13.1.spec
deleted file mode 100644
index 364cb87..0000000
--- a/redhat/main/tdetoys/kdetoys-3.5.13.1.spec
+++ /dev/null
@@ -1,450 +0,0 @@
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-
-%define tde_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}
-
-
-Summary:		Trinity Desktop Environment - Toys and Amusements
-Name:			trinity-tdetoys
-Group:			Amusements/Graphics
-Version:		3.5.13.1
-Release:		1%{?dist}%{?_variant}
-
-License: GPLv2+
-Source0: kdetoys-3.5.13.1.tar.gz
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@...>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires: autoconf automake libtool m4
-BuildRequires: desktop-file-utils
-BuildRequires: trinity-tqtinterface-devel >= %{version}
-BuildRequires: trinity-tdelibs-devel >= %{version}
-BuildRequires: gettext
-
-Obsoletes:		trinity-kdetoys < %{version}-%{release}
-Provides:		trinity-kdetoys = %{version}-%{release}
-
-# Metapackage
 ** Diff limit reached (max: 250 lines) **