From 700ec263535470631ef4f6fb816000500eb4227e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Tue, 23 Jul 2013 13:24:21 +0200 Subject: RPM Packaging: remove old redhat macros --- redhat/applications/kbiff/kbiff-14.0.0-ftbfs.patch | 11 ----------- redhat/applications/kbiff/kbiff-14.0.0.spec | 2 -- 2 files changed, 13 deletions(-) delete mode 100644 redhat/applications/kbiff/kbiff-14.0.0-ftbfs.patch (limited to 'redhat/applications/kbiff') diff --git a/redhat/applications/kbiff/kbiff-14.0.0-ftbfs.patch b/redhat/applications/kbiff/kbiff-14.0.0-ftbfs.patch deleted file mode 100644 index 789918cdc..000000000 --- a/redhat/applications/kbiff/kbiff-14.0.0-ftbfs.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- trinity-kbiff-14.0.0~pre6+b63c54d4/kbiff/Makefile.am.ORI 2013-07-07 13:17:16.270257111 +0200 -+++ trinity-kbiff-14.0.0~pre6+b63c54d4/kbiff/Makefile.am 2013-07-07 13:17:41.911536825 +0200 -@@ -24,7 +24,7 @@ - - # the libraries to link against. Be aware of the order. First the libraries, - # that depend on the following ones. --kbiff_la_LIBADD = $(LIB_KFILE) $(LIB_KIO) -+kbiff_la_LIBADD = $(LIB_KFILE) $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE) -lDCOP $(LIB_TDEUI) - - # this option you can leave out. Just, if you use "make dist", you need it - noinst_HEADERS = setupdlg.h kbiff.h kbiffmonitor.h notify.h kbiffurl.h \ diff --git a/redhat/applications/kbiff/kbiff-14.0.0.spec b/redhat/applications/kbiff/kbiff-14.0.0.spec index af040b45c..15e7c3862 100644 --- a/redhat/applications/kbiff/kbiff-14.0.0.spec +++ b/redhat/applications/kbiff/kbiff-14.0.0.spec @@ -34,7 +34,6 @@ URL: http://sourceforge.net/projects/knmap/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -Patch0: kbiff-14.0.0-ftbfs.patch BuildRequires: trinity-tqtinterface-devel >= %{tde_version} BuildRequires: trinity-tdelibs-devel >= %{tde_version} @@ -55,7 +54,6 @@ NNTP mailboxes. %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/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -- cgit v1.2.1