summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2017-03-22 21:58:07 +0100
committerFrançois Andriot <albator78@libertysurf.fr>2017-03-22 21:58:07 +0100
commitd750de0ca563d3c7329466780918513ac4a9bcfc (patch)
treed671de78f953990a84bbe24daf3b0e746232126b
parent6ddde32ec4113ca2574a6d63f85b312db776a40c (diff)
downloadtde-packaging-d750de0ca563d3c7329466780918513ac4a9bcfc.tar.gz
tde-packaging-d750de0ca563d3c7329466780918513ac4a9bcfc.zip
RPM packaging: update tqt3 and avahi-tqt spec files
-rw-r--r--redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec41
-rw-r--r--redhat/dependencies/tqt3/tqt3-14.0.0.spec5
2 files changed, 22 insertions, 24 deletions
diff --git a/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec b/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec
index bba311b0e..1989ceb7b 100644
--- a/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec
+++ b/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec
@@ -52,6 +52,7 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: libtqt4-devel >= %{tde_epoch}:4.2.0
+BuildRequires: cmake
BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: libtool
@@ -189,6 +190,7 @@ into a TQt main loop application.
%files -n %{libavahi}-tqt-devel
%defattr(-,root,root,-)
%{_includedir}/avahi-tqt/
+%{_libdir}/libavahi-tqt.a
%{_libdir}/libavahi-tqt.so
%{_libdir}/libavahi-tqt.la
%{_libdir}/pkgconfig/avahi-tqt.pc
@@ -203,40 +205,31 @@ into a TQt main loop application.
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-export NOCONFIGURE=1
-./autogen.sh
%build
unset QTDIR QTINC QTLIB
-export PATH="%{tde_bindir}:${PATH}"
-
-%configure \
- --exec-prefix=%{_prefix} \
- --includedir=%{_includedir} \
- --libdir=%{_libdir} \
- \
- --disable-static \
- --disable-dependency-tracking \
- \
- --enable-compat-libdns_sd \
- --with-systemdsystemunitdir=/lib/systemd/system \
-%if 0%{?suse_version}
- --with-distro=suse \
-%endif
-%if 0%{?fedora} || 0%{?rhel}
- --with-distro=fedora \
-%endif
-%if 0%{?mdkversion} || 0%{?mgaversion}
- --with-distro=mandriva \
-%endif
+
+if ! rpm -E %%cmake|grep -q "cd build"; then
+ %__mkdir_p build
+ cd build
+fi
+
+%cmake \
+ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+ -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+ -DCMAKE_SKIP_RPATH=ON \
+ -DCMAKE_VERBOSE_MAKEFILE=ON \
+ -DWITH_GCC_VISIBILITY=OFF \
+ ..
%__make %{?_smp_mflags} || %__make
%install
%__rm -rf %{?buildroot}
-%__make install DESTDIR=%{?buildroot}
+%__make install DESTDIR="%{?buildroot}" -C build
%clean
diff --git a/redhat/dependencies/tqt3/tqt3-14.0.0.spec b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
index 97dc337f2..9f216c803 100644
--- a/redhat/dependencies/tqt3/tqt3-14.0.0.spec
+++ b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
@@ -287,6 +287,11 @@ BuildRequires: postgresql-devel
BuildRequires: firebird-devel
%endif
+# FBCLIENT support
+%if 0%{?mgaversion} >= 6
+BuildRequires: %{_lib}fbclient-devel
+%endif
+
# x86_64 specific stuff
%if "%{_lib}" != "lib"
%if 0%{?mdkversion} || ( 0%{?mgaversion} && 0%{?mgaversion} <= 2)