RPM Packaging: massive update

3 files changed, 0 insertions, 208 deletions

diff --git a/redhat/applications/k9copy/k9copy-14.0.0.patch b/redhat/applications/k9copy/k9copy-14.0.0.patch
deleted file mode 100644
index 5f20b85a6..000000000
--- a/redhat/applications/k9copy/k9copy-14.0.0.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- trinity-k9copy-14.0.0~pre130+76443cbb/src/Makefile.am.ftbfs	2013-07-21 09:56:44.000000000 +0200
-+++ trinity-k9copy-14.0.0~pre130+76443cbb/src/Makefile.am	2013-08-02 11:00:55.291717387 +0200
-@@ -35,7 +35,7 @@
- 	$(top_builddir)/k9author/libk9author.la $(top_builddir)/k9decmpeg/libk9decmpeg.la \
- 	$(top_builddir)/k9devices/libk9devices.la $(top_builddir)/k9vamps/libk9vamps.la \
- 	$(top_builddir)/libdvdnav/libk9dvdnav.la $(top_builddir)/libk9copy/libk9copy.la \
--	$(LIB_TDEUI) -ltdemdi $(LIBDL) -ldvdread
-+	$(LIB_TDEUI) -ltdemdi $(LIBDL) -ldvdread -lk3b -lk3bdevice
- 
- # this is where the desktop file will go 
- shelldesktopdir = $(kde_appsdir)/Utilities
---- trinity-k9copy-3.5.13.2/k9decmpeg/mpeg2_internal.h.ORI	2013-07-28 19:42:30.331485057 +0200
-+++ trinity-k9copy-3.5.13.2/k9decmpeg/mpeg2_internal.h	2013-07-28 19:43:09.713519110 +0200
-@@ -21,6 +21,9 @@
-  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-  */
- 
-+#ifndef __MPEG2_INTERNAL_H__
-+#define __MPEG2_INTERNAL_H__
-+
- /* macroblock modes */
- #define MACROBLOCK_INTRA 1
- #define MACROBLOCK_PATTERN 2
-@@ -298,3 +301,5 @@
- extern mpeg2_mc_t mpeg2_mc_altivec;
- extern mpeg2_mc_t mpeg2_mc_alpha;
- extern mpeg2_mc_t mpeg2_mc_vis;
-+
-+#endif // __MPEG2_INTERNAL_H__
diff --git a/redhat/applications/k9copy/k9copy-14.0.0.spec b/redhat/applications/k9copy/k9copy-14.0.0.spec
index 3ffdded5c..6f4fd1dc2 100644
--- a/redhat/applications/k9copy/k9copy-14.0.0.spec
+++ b/redhat/applications/k9copy/k9copy-14.0.0.spec
@@ -56,7 +56,6 @@ Prefix:			%{_prefix}
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-Patch0:			%{tde_pkg}-%{tde_version}.patch
 
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
@@ -100,7 +99,6 @@ This is the Trinity version.
 
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-%patch0 -p1 -b .ftbfs
 
 # Removes internal dvdread headers
 %__rm -rf dvdread
diff --git a/redhat/applications/k9copy/k9copy-14.0.1.spec b/redhat/applications/k9copy/k9copy-14.0.1.spec
deleted file mode 100644
index 6f4fd1dc2..000000000
--- a/redhat/applications/k9copy/k9copy-14.0.1.spec
+++ /dev/null
@@ -1,177 +0,0 @@
-#
-# spec file for package k9copy (version R14)
-#
-# Copyright (c) 2014 Trinity Desktop Environment
-#
-# All modifications and additions to the file contributed by third parties
-# remain the property of their copyright owners, unless otherwise agreed
-# upon. The license for this file, and modifications and additions to the
-# file, is the same license as for the pristine package itself (unless the
-# license for the pristine package is not an Open Source License, in which
-# case the license is the MIT License). An "Open Source License" is a
-# license that conforms to the Open Source Definition (Version 1.9)
-# published by the Open Source Initiative.
-#
-# Please submit bugfixes or comments via http://www.trinitydesktop.org/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.0
-%endif
-%define tde_pkg k9copy
-%define tde_prefix /opt/trinity
-%define tde_appdir %{tde_datadir}/applications
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:			trinity-%{tde_pkg}
-Epoch:			%{tde_epoch}
-Version:		1.2.3
-Release:		%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
-Summary:		DVD backup tool for Trinity
-Group:			Applications/Utilities
-URL:			http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:			%{_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-
-BuildRequires:	desktop-file-utils
-BuildRequires:	trinity-k3b-devel
-
-BuildRequires:	autoconf automake libtool m4
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-# Warning: the target distribution must have ffmpeg !
-BuildRequires:	ffmpeg-devel
-Requires:		ffmpeg
-
-
-%description
-k9copy is a tabbed tool that allows to copy of one or more titles from a DVD9
-to a DVD5, in thesame way than DVDShrink for Microsoft Windows (R).
-This is the Trinity version.
-
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%debug_package
-%endif
-
-##########
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-# Removes internal dvdread headers
-%__rm -rf dvdread
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR QTINC QTLIB
-export PATH="%{tde_bindir}:${PATH}"
-
-# FFMPEG ...
-if [ -d /usr/include/ffmpeg ]; then
-  export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/include/ffmpeg"
-fi
- 
-# NOTICE: --enable-final causes FTBFS !
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --disable-final \
-  --enable-new-ldflags \
-  --enable-closure \
-  --enable-rpath \
-  --disable-gcc-hidden-visibility \
-  \
-  --enable-k3bdevices
-
-%__make %{?_smp_mflags} || %__make
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{tde_pkg}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-update-desktop-database %{tde_appdir} &> /dev/null
-
-%postun
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-update-desktop-database %{tde_appdir} &> /dev/null
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{tde_bindir}/k9copy
-%{tde_tdeappdir}/k9copy.desktop
-%{tde_datadir}/apps/k9copy/
-%{tde_datadir}/apps/konqueror/servicemenus/k9copy_open.desktop
-%lang(en) %{tde_tdedocdir}/HTML/en/k9copy/
-%{tde_datadir}/icons/hicolor/*/apps/k9copy.png
-
-
-%changelog
-* Mon Jul 29 2013 Francois Andriot <francois.andriot@free.fr> - 2:1.2.3-1
-- Initial release for TDE 14.0.0