From ed0fc65a82f723d0e1ad4bce647758d322cb9482 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Sat, 17 Aug 2013 23:18:55 +0200 Subject: RPM Packaging: remove obsolete patches --- .../dependencies/libcarddav/libcarddav-3.5.12.spec | 132 --------------------- .../dependencies/tqt3/tqt3-14.0.0-fix_ftbfs.patch | 18 --- 2 files changed, 150 deletions(-) delete mode 100644 redhat/dependencies/libcarddav/libcarddav-3.5.12.spec delete mode 100644 redhat/dependencies/tqt3/tqt3-14.0.0-fix_ftbfs.patch (limited to 'redhat/dependencies') diff --git a/redhat/dependencies/libcarddav/libcarddav-3.5.12.spec b/redhat/dependencies/libcarddav/libcarddav-3.5.12.spec deleted file mode 100644 index 3bb4deca1..000000000 --- a/redhat/dependencies/libcarddav/libcarddav-3.5.12.spec +++ /dev/null @@ -1,132 +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 - -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} - -Name: trinity-libcarddav -Version: 0.6.2 -Release: 3%{?dist}%{?_variant} - -Vendor: Trinity Project -URL: http://www.trinitydesktop.org/ -Packager: Francois Andriot - -License: GPL -Group: System Environment/Libraries -Summary: A portable CardDAV client implementation originally developed for the Trinity PIM suite. - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: libcarddav_0.6.2-2debian2.tar.gz - -# [libcarddav] Fix messy installation directories -Patch1: libcarddav-0.6.5-fix_installation.patch - -%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version} -BuildRequires: libcurl-devel -%else -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: %{_lib}curl-devel -%else -# Specific CURL version for TDE on RHEL 5 (and older) -BuildRequires: trinity-libcurl-devel -%endif -%endif - -%if 0%{?rhel} == 4 -BuildRequires: evolution28-gtk2-devel -%else -BuildRequires: glib2-devel -BuildRequires: gtk2-devel -%endif -BuildRequires: make - -Obsoletes: libcarddav < %{version}-%{release} -Provides: libcarddav = %{version}-%{release} - -%description -Libcarddav is a portable CardDAV client implementation originally developed for the Trinity PIM suite. -It incorporates full list, get, add, modify, and delete functionality per the latest CardDAV standards. -Build dependencies are minimal, requiring only libcurl. - -%package devel -Summary: Development files for %{name} -Group: Development/Libraries -Requires: %{name} - -Obsoletes: libcarddav-devel < %{version}-%{release} -Provides: libcarddav-devel = %{version}-%{release} - -%description devel -%{summary} - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n libcarddav-%{version} -%patch1 -p1 -b .dir - -%build -# CFLAGS required if CURL is installed on /opt/trinity, e.g. RHEL 5 -export CFLAGS="-I%{tde_includedir} -L%{tde_libdir} ${CFLAGS}" -export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" - -if [ -d /usr/evolution28 ]; then - export PKG_CONFIG_PATH="/usr/evolution28/%{_lib}/pkgconfig:${PKG_CONFIG_PATH}" -fi - -autoreconf --force --install --symlink -%configure \ - --includedir=%{tde_includedir} \ - --libdir=%{tde_libdir} \ - -%__make %{?_smp_mflags} LIBTOOL=$(which libtool) - -%install -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} LIBTOOL=$(which libtool) - -%__rm -f %{buildroot}%{tde_libdir}/libcarddav.a - -%clean -%__rm -rf %{buildroot} - - -%files -%defattr(-,root,root,-) -%{tde_libdir}/*.so.* - -%files devel -%defattr(-,root,root,-) -%{tde_includedir}/*.h -%{tde_libdir}/*.la -%{tde_libdir}/*.so -%{tde_libdir}/pkgconfig/libcarddav.pc - -%post -/sbin/ldconfig - -%postun -/sbin/ldconfig - -%post devel -/sbin/ldconfig - -%postun devel -/sbin/ldconfig - - -%Changelog -* Sun Jul 28 2012 Francois Andriot - 0.6.5-3 -- Renames to 'trinity-libcaldav' -- Build on MGA2 - -* Sun Oct 30 2011 Francois Andriot - 0.6.5-2debian2 .1 -- Initial release for RHEL 6, RHEL 5, and Fedora 15 diff --git a/redhat/dependencies/tqt3/tqt3-14.0.0-fix_ftbfs.patch b/redhat/dependencies/tqt3/tqt3-14.0.0-fix_ftbfs.patch deleted file mode 100644 index 38c729d60..000000000 --- a/redhat/dependencies/tqt3/tqt3-14.0.0-fix_ftbfs.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- ./tools/qvfb/qanimationwriter.cpp.ori 2013-06-25 20:52:34.636153035 +0200 -+++ ./tools/qvfb/qanimationwriter.cpp 2013-06-25 20:52:59.673642835 +0200 -@@ -101,7 +101,15 @@ - - void writePNG(const TQImage& image) - { -+#if PNG_LIBPNG_VER_MAJOR>1 || ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=5 ) -+#warning XXXtnn not too sure about this -+/* -+according to png.h, channels is only used on read, not writes, so we -+should be able to comment this out. -+*/ -+#else /* LIBPNG 1.5 */ - info_ptr->channels = 4; -+#endif - png_set_sig_bytes(png_ptr, 8); // Pretend we already wrote the sig - png_set_IHDR(png_ptr, info_ptr, image.width(), image.height(), - 8, image.hasAlphaBuffer() -- cgit v1.2.1