RPM packaging: update tqt3 and avahi-tqt spec files

pull/3/head
François Andriot 8 years ago
parent 6ddde32ec4
commit d750de0ca5

@ -52,6 +52,7 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: libtqt4-devel >= %{tde_epoch}:4.2.0 BuildRequires: libtqt4-devel >= %{tde_epoch}:4.2.0
BuildRequires: cmake
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: libtool BuildRequires: libtool
@ -189,6 +190,7 @@ into a TQt main loop application.
%files -n %{libavahi}-tqt-devel %files -n %{libavahi}-tqt-devel
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{_includedir}/avahi-tqt/ %{_includedir}/avahi-tqt/
%{_libdir}/libavahi-tqt.a
%{_libdir}/libavahi-tqt.so %{_libdir}/libavahi-tqt.so
%{_libdir}/libavahi-tqt.la %{_libdir}/libavahi-tqt.la
%{_libdir}/pkgconfig/avahi-tqt.pc %{_libdir}/pkgconfig/avahi-tqt.pc
@ -203,40 +205,31 @@ into a TQt main loop application.
%prep %prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
export NOCONFIGURE=1
./autogen.sh
%build %build
unset QTDIR QTINC QTLIB unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
if ! rpm -E %%cmake|grep -q "cd build"; then
%configure \ %__mkdir_p build
--exec-prefix=%{_prefix} \ cd build
--includedir=%{_includedir} \ fi
--libdir=%{_libdir} \
\ %cmake \
--disable-static \ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
--disable-dependency-tracking \ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
\ -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
--enable-compat-libdns_sd \ -DCMAKE_SKIP_RPATH=ON \
--with-systemdsystemunitdir=/lib/systemd/system \ -DCMAKE_VERBOSE_MAKEFILE=ON \
%if 0%{?suse_version} -DWITH_GCC_VISIBILITY=OFF \
--with-distro=suse \ ..
%endif
%if 0%{?fedora} || 0%{?rhel}
--with-distro=fedora \
%endif
%if 0%{?mdkversion} || 0%{?mgaversion}
--with-distro=mandriva \
%endif
%__make %{?_smp_mflags} || %__make %__make %{?_smp_mflags} || %__make
%install %install
%__rm -rf %{?buildroot} %__rm -rf %{?buildroot}
%__make install DESTDIR=%{?buildroot} %__make install DESTDIR="%{?buildroot}" -C build
%clean %clean

@ -287,6 +287,11 @@ BuildRequires: postgresql-devel
BuildRequires: firebird-devel BuildRequires: firebird-devel
%endif %endif
# FBCLIENT support
%if 0%{?mgaversion} >= 6
BuildRequires: %{_lib}fbclient-devel
%endif
# x86_64 specific stuff # x86_64 specific stuff
%if "%{_lib}" != "lib" %if "%{_lib}" != "lib"
%if 0%{?mdkversion} || ( 0%{?mgaversion} && 0%{?mgaversion} <= 2) %if 0%{?mdkversion} || ( 0%{?mgaversion} && 0%{?mgaversion} <= 2)

Loading…
Cancel
Save