From 4f411154e747b655fce18f115d0d893040c618fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Wed, 24 Jul 2013 20:48:35 +0200 Subject: [PATCH] RPM Packaging: Update kvirc, tdepowersave. Add mplayerthumbs. --- redhat/applications/kvirc/kvirc-14.0.0.spec | 8 +- .../mplayerthumbs/mplayerthumbs-14.0.0.spec | 114 ++++++++++++++++++ .../tdepowersave-14.0.0-fix_hibernate.patch | 11 ++ .../tdepowersave/tdepowersave-14.0.0.spec | 6 +- 4 files changed, 131 insertions(+), 8 deletions(-) create mode 100644 redhat/applications/mplayerthumbs/mplayerthumbs-14.0.0.spec create mode 100644 redhat/applications/tdepowersave/tdepowersave-14.0.0-fix_hibernate.patch diff --git a/redhat/applications/kvirc/kvirc-14.0.0.spec b/redhat/applications/kvirc/kvirc-14.0.0.spec index ef3690e8f..5eedd7db3 100644 --- a/redhat/applications/kvirc/kvirc-14.0.0.spec +++ b/redhat/applications/kvirc/kvirc-14.0.0.spec @@ -100,7 +100,7 @@ with the K Desktop Environment version 3. # Hardcoded absolute PATH to TDEDIR in source code ! That sucks ! %__sed -i "src/kvirc/kernel/kvi_app_fs.cpp" \ - -e "s|/opt/kde3/lib|%{tde_prefix}/%{_lib}|g" + -e "s|/opt/kde3/lib|%{tde_libdir}|g" %__sed -i "src/kvirc/kernel/kvi_app_setup.cpp" \ -e "s|/opt/kde3|%{tde_prefix}|g" @@ -108,10 +108,6 @@ with the K Desktop Environment version 3. %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" ./autogen.sh -# Fix Q_OBJECT => TQ_OBJECT -%__sed -i src/*/*/*.h src/*/*/*.sh \ - -e "s|Q_OBJECT|TQ_OBJECT|" - %build unset QTDIR QTINC QTLIB @@ -135,7 +131,7 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" --with-qt-name=tqt \ --with-qt-library-dir=%{_libdir} \ --with-qt-include-dir=%{_includedir}/tqt3 \ - --with-qt-moc=%{_bindir}/tqmoc + --with-qt-moc=%{_bindir}/tmoc # Symbolic links must exist prior to parallel building %__make symlinks -C src/kvilib/build diff --git a/redhat/applications/mplayerthumbs/mplayerthumbs-14.0.0.spec b/redhat/applications/mplayerthumbs/mplayerthumbs-14.0.0.spec new file mode 100644 index 000000000..1836d8d96 --- /dev/null +++ b/redhat/applications/mplayerthumbs/mplayerthumbs-14.0.0.spec @@ -0,0 +1,114 @@ +# 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 + +# Default version for this component +%define tde_pkg mplayerthumbs +%define tde_version 14.0.0 + +# 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/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-mplayerthumbs +Version: 0.5b +Release: 2%{?dist}%{?_variant} +Summary: A video thumbnail generator for TDE file managers. + +Group: Applications/Multimedia +License: GPLv2+ +URL: http://kde-apps.org/content/show.php?content=41180 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz + +BuildRequires: desktop-file-utils +BuildRequires: trinity-tdelibs-devel >= 14.0.0 + +Requires: mplayer + +%description +MPlayerThumbs is a video thumbnail generator for TDE file managers +(Konqueror, Dolphin, ...). +It needs mplayer (of course) to generate thumbnails, and it contains no +linking to any library, so in a x86_64 system you can freely use the +32bit mplayer binary with win32codecs by configuring the application +launching the mplayerthumbsconfig helper application. +It catches a random frame from 15% to 70%, checking also how contrasted +is the image, and dropping bad frames. + + +%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/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__make -f "admin/Makefile.common" + + +%build +unset QTDIR QTINC QTLIB +export PATH="%{tde_bindir}:${PATH}" +export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" + +%configure \ + --prefix=%{tde_prefix} \ + --exec-prefix=%{tde_prefix} \ + --disable-dependency-tracking \ + --disable-rpath \ + --bindir=%{tde_bindir} \ + --libdir=%{tde_libdir} \ + --datadir=%{tde_datadir} \ + --htmldir=%{tde_tdedocdir}/HTML \ + --includedir=%{tde_tdeincludedir} \ + --enable-closure + +%__make %{?_smp_mflags} + + +%install +%__rm -rf $RPM_BUILD_ROOT +%__make install DESTDIR=$RPM_BUILD_ROOT + +# Useless files .. +%__rm -f %{?buildroot}%{tde_tdelibdir}/*.a + +%clean +%__rm -rf $RPM_BUILD_ROOT + + +%files +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog COPYING README +%{tde_bindir}/mplayerthumbsconfig +%{tde_tdelibdir}/videopreview.la +%{tde_tdelibdir}/videopreview.so +%{tde_datadir}/apps/videopreview/ +%{tde_datadir}/config.kcfg/mplayerthumbs.kcfg +%{tde_datadir}/services/videopreview.desktop +%{tde_tdedocdir}/HTML/en/videopreview/ + + +%changelog +* Fri Jul 05 2013 Francois Andriot - 0.5b-2 +- Initial release for TDE 14.0.0 + +* Mon Apr 08 2013 Francois Andriot - 0.5b-1 +- Initial release for TDE 3.5.13.2 diff --git a/redhat/applications/tdepowersave/tdepowersave-14.0.0-fix_hibernate.patch b/redhat/applications/tdepowersave/tdepowersave-14.0.0-fix_hibernate.patch new file mode 100644 index 000000000..08492a890 --- /dev/null +++ b/redhat/applications/tdepowersave/tdepowersave-14.0.0-fix_hibernate.patch @@ -0,0 +1,11 @@ +--- trinity-tdepowersave/src/hardware.cpp.ORI 2013-07-24 12:19:52.432706499 +0200 ++++ trinity-tdepowersave/src/hardware.cpp 2013-07-24 12:20:01.956723548 +0200 +@@ -546,7 +546,7 @@ + } + if ((*it) == TDESystemPowerState::Hibernate) { + suspend_states.suspend2disk = true; +- suspend_states.suspend2disk_allowed = rdevice->canSuspend(); ++ suspend_states.suspend2disk_allowed = rdevice->canHibernate(); + suspend_states.suspend2disk_can = suspend_states.suspend2disk_allowed & suspend_states.suspend2disk; + } + if ((*it) == TDESystemPowerState::PowerOff) { diff --git a/redhat/applications/tdepowersave/tdepowersave-14.0.0.spec b/redhat/applications/tdepowersave/tdepowersave-14.0.0.spec index 72733522b..4e20bd204 100644 --- a/redhat/applications/tdepowersave/tdepowersave-14.0.0.spec +++ b/redhat/applications/tdepowersave/tdepowersave-14.0.0.spec @@ -1,5 +1,5 @@ # Default version for this component -%define tdecomp tdepowersave +%define tde_pkg tdepowersave %define tde_version 14.0.0 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". @@ -24,7 +24,7 @@ %define _docdir %{tde_docdir} -Name: trinity-%{tdecomp} +Name: trinity-%{tde_pkg} Version: 0.7.3 Release: %{?!preversion:5}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} Summary: Power management applet for Trinityfiles or directories. @@ -41,6 +41,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz +Patch1: tdepowersave-14.0.0-fix_hibernate.patch BuildRequires: trinity-tqtinterface-devel >= %{tde_version} BuildRequires: trinity-dbus-tqt-devel >= %{tde_version} @@ -88,6 +89,7 @@ settings for: %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} +%patch1 -p1 -b .hibernate %build