diff options
| author | Francois Andriot <francois.andriot@free.fr> | 2012-08-03 13:59:43 +0200 |
|---|---|---|
| committer | Francois Andriot <francois.andriot@free.fr> | 2012-08-03 13:59:43 +0200 |
| commit | be9f9f70d960e0789e024c8285dc681302c3c3f1 (patch) | |
| tree | bc4c568eb13a62af120ba51f9145337541b35be3 /redhat/dependencies/avahi-tqt | |
| parent | 1f76bf54b70463addf27bc503bb58af60dc8ae58 (diff) | |
| download | tde-packaging-be9f9f70d960e0789e024c8285dc681302c3c3f1.tar.gz tde-packaging-be9f9f70d960e0789e024c8285dc681302c3c3f1.zip | |
RHEL/Fedora: adds support for Mandriva 2011 in packaging
Diffstat (limited to 'redhat/dependencies/avahi-tqt')
| -rw-r--r-- | redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.spec | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.spec b/redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.spec index 938db048f..2c9c763cf 100644 --- a/redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.spec +++ b/redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.spec @@ -1,15 +1,15 @@ # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?_prefix}" != "/usr" +%if "%{?tde_prefix}" != "/usr" %define _variant .opt %endif # TDE 3.5.13 specific building variables -%define tde_bindir %{_prefix}/bin -%define tde_includedir %{_prefix}/include -%define tde_datadir %{_prefix}/share +%define tde_bindir %{tde_prefix}/bin +%define tde_includedir %{tde_prefix}/include +%define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc %define tde_tdedocdir %{tde_docdir}/kde -%define tde_libdir %{_prefix}/%{_lib} +%define tde_libdir %{tde_prefix}/%{_lib} Name: avahi-tqt @@ -23,7 +23,7 @@ Vendor: Trinity Project Packager: Francois Andriot <francois.andriot@free.fr> URL: http://www.trinitydesktop.org/ -Prefix: %{_prefix} +Prefix: %{tde_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{version}.tar.gz @@ -35,9 +35,10 @@ BuildRequires: tqtinterface-devel >= 3.5.13 BuildRequires: gettext-devel BuildRequires: dbus-devel -%if 0%{?mgaversion} +%if 0%{?mgaversion} || 0%{?mdkversion} BuildRequires: %{_lib}avahi-client-devel -BuildRequires: %{_lib}expat1-devel +# On Mageia 2, package is 'lib64expat1-devel', but on Mandriva, 'lib64expat-devel' +BuildRequires: %{_lib}expat%{?mgaversion:1}-devel Provides: %{_lib}avahi-qt3 %else BuildRequires: avahi-devel @@ -58,7 +59,7 @@ Requires: %{name} Summary: %{name} - Development files Group: Development/Libraries -%if 0%{?mgaversion} +%if 0%{?mgaversion} || 0%{?mdkversion} Provides: %{_lib}avahi-qt3-devel %endif @@ -89,7 +90,7 @@ export CXXFLAGS="${CXXFLAGS} ${LDFLAGS}" ./autogen.sh %configure \ - --exec-prefix=%{_prefix} \ + --exec-prefix=%{tde_prefix} \ --bindir=%{tde_bindir} \ --datadir=%{tde_datadir} \ --docdir=%{tde_docdir} \ @@ -105,6 +106,9 @@ export CXXFLAGS="${CXXFLAGS} ${LDFLAGS}" %__rm -rf %{?buildroot} %__make install DESTDIR=%{?buildroot} +# Removes '.a' file +%__rm -f %{?buildroot}%{tde_libdir}/libavahi-tqt.a + %clean %__rm -rf %{?buildroot} @@ -117,7 +121,6 @@ export CXXFLAGS="${CXXFLAGS} ${LDFLAGS}" %{tde_libdir}/*.so %{tde_libdir}/*.la %{tde_libdir}/pkgconfig/*.pc -%exclude %{tde_libdir}/libavahi-tqt.a %changelog * Mon Jul 30 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1 |