diff options
| author | François Andriot <albator78@libertysurf.fr> | 2013-11-24 16:48:53 +0100 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2013-11-24 16:48:53 +0100 |
| commit | e9e7fa543273fffa8131b2244e5c994fe22616e2 (patch) | |
| tree | 6934c069a51e0e17a4a2df4b0521d3f00364a5ac /redhat/tdenetwork | |
| parent | 2bdb0ca57d3ad95d94d1c20a395c5bf210bbcacd (diff) | |
| download | tde-packaging-e9e7fa543273fffa8131b2244e5c994fe22616e2.tar.gz tde-packaging-e9e7fa543273fffa8131b2244e5c994fe22616e2.zip | |
RPM Packaging: fix build issue on openSUSE 13.1
Diffstat (limited to 'redhat/tdenetwork')
| -rw-r--r-- | redhat/tdenetwork/tdenetwork-14.0.0.spec | 12 | ||||
| -rw-r--r-- | redhat/tdenetwork/tdenetwork-3.5.13.2.spec | 11 |
2 files changed, 12 insertions, 11 deletions
diff --git a/redhat/tdenetwork/tdenetwork-14.0.0.spec b/redhat/tdenetwork/tdenetwork-14.0.0.spec index ada8480f6..d1d20c7bd 100644 --- a/redhat/tdenetwork/tdenetwork-14.0.0.spec +++ b/redhat/tdenetwork/tdenetwork-14.0.0.spec @@ -80,7 +80,7 @@ BuildRequires: sqlite-devel # GADU support %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} -%define with_gadu 1tdenetwork-14.0.0-fix_kget.patch +%define with_gadu 1 BuildRequires: libgadu-devel %endif @@ -1090,13 +1090,13 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" # 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 -%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} -%__mkdir_p build -cd build -%endif +if ! rpm -E %%cmake|grep -q "cd build"; then + %__mkdir_p build + cd build +fi %cmake \ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ diff --git a/redhat/tdenetwork/tdenetwork-3.5.13.2.spec b/redhat/tdenetwork/tdenetwork-3.5.13.2.spec index 4b5b65217..3f88a7e93 100644 --- a/redhat/tdenetwork/tdenetwork-3.5.13.2.spec +++ b/redhat/tdenetwork/tdenetwork-3.5.13.2.spec @@ -1086,7 +1086,8 @@ update-desktop-database 2> /dev/null || : %endif %build -unset QTDIR || : ; . /etc/profile.d/qt3.sh +unset QTDIR QTINC QTLIB +. /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" @@ -1095,10 +1096,10 @@ if [ -d /usr/X11R6 ]; then export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" fi -%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} -%__mkdir_p build -cd build -%endif +if ! rpm -E %%cmake|grep -q "cd build"; then + %__mkdir_p build + cd build +fi %cmake \ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ |