From 06a8f7549010b575249cd868dbdae8801723eb02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Sun, 5 Oct 2014 13:18:38 +0200 Subject: RPM Packaging: update dependencies --- redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec | 5 +---- redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec | 4 ++-- redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec | 2 +- redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec | 4 +++- redhat/dependencies/tqt3/tqt3-14.0.0.spec | 2 +- redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec | 2 +- redhat/extras/fileshareset/fileshareset.spec | 2 +- 7 files changed, 10 insertions(+), 11 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 11a706c68..42c73bff1 100644 --- a/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec +++ b/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec @@ -17,11 +17,8 @@ # TDE variables %define tde_version 14.0.0 -%define tde_prefix /opt/trinity -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%if 0%{?mdkversion} || 0%{?mdkversion} || 0%{?pclinuxos} +%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} %define libavahi %{_lib}avahi %else %define libavahi libavahi diff --git a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec index efe09daf6..cc19f5ed6 100644 --- a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec +++ b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_version 14.0.0 -%if 0%{?mdkversion} || 0%{?mdkversion} || 0%{?pclinuxos} +%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} %define libdbus %{_lib}dbus %else %define libdbus libdbus @@ -42,7 +42,7 @@ License: GPLv2+ #Vendor: Trinity Project #Packager: Francois Andriot -Prefix: %{tde_prefix} +Prefix: /usr BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz diff --git a/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec b/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec index 49495c7a2..1916afe60 100644 --- a/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec +++ b/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_version 14.0.0 -%if 0%{?mdkversion} || 0%{?mdkversion} || 0%{?pclinuxos} +%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} %define libdbus %{_lib}dbus %else %define libdbus libdbus diff --git a/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec b/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec index ecce24978..29b3a4f5e 100644 --- a/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec +++ b/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec @@ -19,7 +19,7 @@ # TDE variables %define tde_version 14.0.0 -%if 0%{?mdkversion} || 0%{?mdkversion} || 0%{?pclinuxos} +%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} %define libart %{_lib}art %else %define libart libart @@ -65,6 +65,8 @@ Summary: Library of functions for 2D graphics - runtime files Group: System/Libraries Obsoletes: libart_lgpl < %{version}-%{release} Provides: libart_lgpl = %{version}-%{release} +Obsoletes: %{_lib}art_lgpl2 < %{version}-%{release} +Provides: %{_lib}art_lgpl2 = %{version}-%{release} Provides: libart_lgpl_2-2 = %{version}-%{release} %description -n %{libart}_lgpl_2-2 diff --git a/redhat/dependencies/tqt3/tqt3-14.0.0.spec b/redhat/dependencies/tqt3/tqt3-14.0.0.spec index 6a4b583e6..43d1f1d3b 100644 --- a/redhat/dependencies/tqt3/tqt3-14.0.0.spec +++ b/redhat/dependencies/tqt3/tqt3-14.0.0.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_version 14.0.0 -%if 0%{?mdkversion} || 0%{?mdkversion} || 0%{?pclinuxos} +%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} %define libtqt3 %{_lib}tqt3 %else %define libtqt3 libtqt3 diff --git a/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec b/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec index 0470c1feb..6f781b4ca 100755 --- a/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec +++ b/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec @@ -23,7 +23,7 @@ %define tde_libdir %{tde_prefix}/%{_lib} %define cmake_modules_dir %{_datadir}/cmake/Modules -%if 0%{?mdkversion} || 0%{?mdkversion} || 0%{?pclinuxos} +%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} %define libtqt4 %{_lib}tqt4 %else %define libtqt4 libtqt4 diff --git a/redhat/extras/fileshareset/fileshareset.spec b/redhat/extras/fileshareset/fileshareset.spec index 01a6d42c6..96c69e81d 100644 --- a/redhat/extras/fileshareset/fileshareset.spec +++ b/redhat/extras/fileshareset/fileshareset.spec @@ -81,7 +81,7 @@ export LDFLAGS="$LDFLAGS -pie" %__install -D -m 644 man/fileshareset.8 %{?buildroot}%{_mandir}/man8/fileshareset.8 # Install the default configuration file -mkdir -p "${RPM_BUILD_ROOT}/etc/security/" +mkdir -p "${RPM_BUILD_ROOT}%{_sysconfdir}/security/" echo "RESTRICT=yes" > "${RPM_BUILD_ROOT}%{_sysconfdir}/security/fileshare.conf" -- cgit v1.2.3