summaryrefslogtreecommitdiffstats
path: root/redhat/tdewebdev
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2014-10-03 22:08:25 +0200
committerFrançois Andriot <albator78@libertysurf.fr>2014-10-03 22:08:25 +0200
commite6514292cef38549a22e8bd792663ad5c9b31567 (patch)
tree7252c6dec2ac4d83dc261cd49bdf3b157a3144ff /redhat/tdewebdev
parentc64029af7aba4d885977f5d9aab2b5c5536d5c9f (diff)
downloadtde-packaging-e6514292cef38549a22e8bd792663ad5c9b31567.tar.gz
tde-packaging-e6514292cef38549a22e8bd792663ad5c9b31567.zip
RPM Packaging: update some packages
Diffstat (limited to 'redhat/tdewebdev')
-rw-r--r--redhat/tdewebdev/tdewebdev-14.0.0.spec9
1 files changed, 1 insertions, 8 deletions
diff --git a/redhat/tdewebdev/tdewebdev-14.0.0.spec b/redhat/tdewebdev/tdewebdev-14.0.0.spec
index cc00be441..6da94dfe9 100644
--- a/redhat/tdewebdev/tdewebdev-14.0.0.spec
+++ b/redhat/tdewebdev/tdewebdev-14.0.0.spec
@@ -41,9 +41,6 @@ Source3: http://download.sourceforge.net/quanta/php_manual_en_20030401.tar.bz2
Source4: http://download.sourceforge.net/quanta/javascript.tar.bz2
Source5: hi48-app-kxsldbg.png
-Patch0: tdewebdev-14.0.0-ftbfs.patch
-Patch1: kdewebdev-3.5.4-kxsldbg-icons.patch
-
BuildRequires: autoconf automake libtool m4
BuildRequires: desktop-file-utils
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
@@ -491,9 +488,6 @@ Requires: trinity-kommander-devel = %{version}-%{release}
%prep
%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} -a 1 -a 2 -a 3 -a 4
-%patch0 -p1 -b .ftbfs
-%patch1 -p1 -b .kxsldbg-icons
-rm -rf lib/compatibility
%__install -m644 -p %{SOURCE5} kxsldbg/
%if 0%{?build_kxsldbg} == 0
@@ -508,11 +502,10 @@ rm -rf lib/compatibility
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
# Specific path for RHEL4
if [ -d "/usr/X11R6" ]; then
- export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
+ export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
fi
# Warning: GCC visibility causes FTBFS [Bug #1285]