diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2014-10-06 12:16:27 -0500 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2014-10-06 12:16:27 -0500 |
commit | ecd088049d4aa2e8262f4cc1e0ac45e135964229 (patch) | |
tree | 49ed22e9e7852fd3f26854aecf41c96169d59629 /redhat/dependencies/dbus-tqt | |
parent | 855439d3f99b0c152c33ae76a06cce9853f9b8dd (diff) | |
parent | 01a7863524342e1aec31679e55d08830cc571066 (diff) | |
download | tde-packaging-ecd088049d4aa2e8262f4cc1e0ac45e135964229.tar.gz tde-packaging-ecd088049d4aa2e8262f4cc1e0ac45e135964229.zip |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'redhat/dependencies/dbus-tqt')
-rw-r--r-- | redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec | 38 | ||||
-rw-r--r-- | redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.1.spec | 125 | ||||
-rw-r--r-- | redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.spec | 135 |
3 files changed, 23 insertions, 275 deletions
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 a3f7d268f..1916afe60 100644 --- a/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec +++ b/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec @@ -15,9 +15,15 @@ # Please submit bugfixes or comments via http:/www.trinitydesktop.org/ # -# TDE specific building variables +# TDE variables %define tde_version 14.0.0 +%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} +%define libdbus %{_lib}dbus +%else +%define libdbus libdbus +%endif + Name: trinity-dbus-tqt Epoch: 2 @@ -42,7 +48,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz BuildRequires: libtqt3-mt-devel >= 3.5.0 -BuildRequires: libtqt4-devel >= 1:4.2.0 +BuildRequires: libtqt4-devel >= 2:4.2.0 BuildRequires: cmake >= 2.8 BuildRequires: gcc-c++ @@ -67,14 +73,15 @@ See the dbus description for more information about D-BUS in general. ########## -%package -n libdbus-tqt-1-0 -Summary: Simple inter-process messaging system (TQt-based shared library) -Group: System/Libraries +%package -n %{libdbus}-tqt-1-0 +Summary: Simple inter-process messaging system (TQt-based shared library) +Group: System/Libraries +Provides: libdbus-tqt-1-0 = %{?epoch:%{epoch}:}%{version}-%{release} Obsoletes: trinity-dbus-tqt < %{?epoch:%{epoch}:}%{version}-%{release} Provides: trinity-dbus-tqt = %{?epoch:%{epoch}:}%{version}-%{release} -%description -n libdbus-tqt-1-0 +%description -n %{libdbus}-tqt-1-0 D-BUS is a message bus, used for sending messages between applications. Conceptually, it fits somewhere in between raw sockets and CORBA in terms of complexity. @@ -84,28 +91,29 @@ Qt interface to D-BUS. See the dbus description for more information about D-BUS in general. -%post -n libdbus-tqt-1-0 +%post -n %{libdbus}-tqt-1-0 /sbin/ldconfig || : -%postun -n libdbus-tqt-1-0 +%postun -n %{libdbus}-tqt-1-0 /sbin/ldconfig || : -%files -n libdbus-tqt-1-0 +%files -n %{libdbus}-tqt-1-0 %defattr(-,root,root,-) %{_libdir}/libdbus-tqt-1.so.0 %{_libdir}/libdbus-tqt-1.so.0.0.0 ########## -%package -n libdbus-tqt-1-0-devel +%package -n %{libdbus}-tqt-1-devel Summary: Simple inter-process messaging system (TQt interface) Group: Development/Libraries/C and C++ -Requires: libdbus-tqt-1-0 = %{?epoch:%{epoch}:}%{version}-%{release} +Provides: libdbus-tqt-1-devel = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{libdbus}-tqt-1-0 = %{?epoch:%{epoch}:}%{version}-%{release} Obsoletes: trinity-dbus-tqt-devel < %{?epoch:%{epoch}:}%{version}-%{release} Provides: trinity-dbus-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release} -%description -n libdbus-tqt-1-0-devel +%description -n %{libdbus}-tqt-1-devel D-BUS is a message bus, used for sending messages between applications. Conceptually, it fits somewhere in between raw sockets and CORBA in terms of complexity. @@ -115,13 +123,13 @@ Qt interface to D-BUS. See the dbus description for more information about D-BUS in general. -%post -n libdbus-tqt-1-0-devel +%post -n %{libdbus}-tqt-1-devel /sbin/ldconfig || : -%postun -n libdbus-tqt-1-0-devel +%postun -n %{libdbus}-tqt-1-devel /sbin/ldconfig || : -%files -n libdbus-tqt-1-0-devel +%files -n %{libdbus}-tqt-1-devel %defattr(-,root,root,-) %{_includedir}/dbus-1.0/* %{_libdir}/libdbus-tqt-1.so diff --git a/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.1.spec b/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.1.spec deleted file mode 100644 index f9953eb5a..000000000 --- a/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.1.spec +++ /dev/null @@ -1,125 +0,0 @@ -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} - -Name: trinity-dbus-tqt -Version: 3.5.13.1 -Release: 1%{?dist}%{?_variant} -License: GPL -Summary: Dbus TQT Interface -Group: System Environment/Libraries - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: dbus-tqt-3.5.13.1.tar.gz - -# [dbus-tqt] Fix build on RHEL 4 -Patch1: dbus-tqt-3.5.13-fix_old_dbus_types.patch - -BuildRequires: gcc-c++ -%if 0%{?suse_version} -BuildRequires: dbus-1-devel -%else -BuildRequires: dbus-devel -%endif -BuildRequires: trinity-tqtinterface-devel >= %{version} - -# TDE 3.5.13 specific building variables -BuildRequires: cmake >= 2.8 -BuildRequires: qt3-devel - -Requires: qt3 - -Obsoletes: dbus-tqt < %{version}-%{release} -Provides: dbus-tqt = %{version}-%{release} - - -%description -Dbus TQT Interface - - -%package devel -Requires: %{name} -Summary: %{name} - Development files -Group: Development/Libraries - -Obsoletes: dbus-tqt-devel < %{version}-%{release} -Provides: dbus-tqt-devel = %{version}-%{release} - -%description devel -Development files for %{name} - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n dbus-tqt-3.5.13.1 - -%if 0%{?rhel} == 4 -%patch1 -p1 -b .dbustypes -%endif - -%build -unset QTDIR || : ; . /etc/profile.d/qt?.sh -export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" - -%if 0%{?rhel} == 4 -export CXXFLAGS="-DDBUS_API_SUBJECT_TO_CHANGE ${CXXFLAGS}" -%endif - -%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} -%__mkdir_p build -cd build -%endif - -%cmake \ - -DINCLUDE_INSTALL_DIR=%{tde_includedir} \ - -DLIB_INSTALL_DIR=%{tde_libdir} \ - .. - -%__make %{?_smp_mflags} - - -%install -%__rm -rf %{?buildroot} -%__make install DESTDIR=%{?buildroot} -C build - -%clean -%__rm -rf %{?buildroot} - -%post -/sbin/ldconfig || : - -%postun -/sbin/ldconfig || : - -%post devel -/sbin/ldconfig || : - -%postun devel -/sbin/ldconfig || : - -%files -%{tde_libdir}/libdbus-tqt-1.so.0 -%{tde_libdir}/libdbus-tqt-1.so.0.0.0 - -%files devel -%{tde_includedir}/dbus-1.0/* -%{tde_libdir}/libdbus-tqt-1.so -%{tde_libdir}/libdbus-tqt-1.la -%{tde_libdir}/pkgconfig/dbus-tqt.pc - -%changelog -* Tue Sep 11 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13.1-1 -- Initial release for TDE 3.5.13.1 diff --git a/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.spec b/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.spec deleted file mode 100644 index 2ee2c1a8a..000000000 --- a/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.spec +++ /dev/null @@ -1,135 +0,0 @@ -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} - -Name: trinity-dbus-tqt -Version: 3.5.13 -Release: 3%{?dist}%{?_variant} -License: GPL -Summary: Dbus TQT Interface -Group: System Environment/Libraries - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: dbus-tqt-3.5.13.tar.gz - -# [dbus-tqt] Fix build on RHEL 4 -Patch1: dbus-tqt-3.5.13-fix_old_dbus_types.patch - -BuildRequires: gcc-c++ -%if 0%{?suse_version} -BuildRequires: dbus-1-devel -%else -BuildRequires: dbus-devel -%endif -BuildRequires: tqtinterface-devel >= 3.5.13 - -# TDE 3.5.13 specific building variables -BuildRequires: cmake >= 2.8 -BuildRequires: qt3-devel - -Requires: qt3 - -Obsoletes: dbus-tqt < %{version}-%{release} -Provides: dbus-tqt = %{version}-%{release} - - -%description -Dbus TQT Interface - - -%package devel -Requires: %{name} -Summary: %{name} - Development files -Group: Development/Libraries - -Obsoletes: dbus-tqt-devel < %{version}-%{release} -Provides: dbus-tqt-devel = %{version}-%{release} - -%description devel -Development files for %{name} - - -%if 0%{?suse_version} -%debug_package -%endif - - -%prep -%setup -q -n dependencies/dbus-tqt - -%if 0%{?rhel} == 4 -%patch1 -p1 -b .dbustypes -%endif - -%build -unset QTDIR || : ; . /etc/profile.d/qt?.sh -export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" - -%if 0%{?rhel} == 4 -export CXXFLAGS="-DDBUS_API_SUBJECT_TO_CHANGE ${CXXFLAGS}" -%endif - -%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} -%__mkdir_p build -cd build -%endif - -%cmake \ - -DINCLUDE_INSTALL_DIR=%{tde_includedir} \ - -DLIB_INSTALL_DIR=%{tde_libdir} \ - .. - -%__make %{?_smp_mflags} - - -%install -%__rm -rf %{?buildroot} -%__make install DESTDIR=%{?buildroot} -C build - -%clean -%__rm -rf %{?buildroot} - -%post -/sbin/ldconfig || : - -%postun -/sbin/ldconfig || : - -%post devel -/sbin/ldconfig || : - -%postun devel -/sbin/ldconfig || : - -%files -%{tde_libdir}/libdbus-tqt-1.so.0 -%{tde_libdir}/libdbus-tqt-1.so.0.0.0 - -%files devel -%{tde_includedir}/dbus-1.0/* -%{tde_libdir}/libdbus-tqt-1.so -%{tde_libdir}/libdbus-tqt-1.la -%{tde_libdir}/pkgconfig/dbus-tqt.pc - -%changelog -* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-3 -- Updates BuildRequires - -* Tue Nov 07 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-2 -- Updates BuildRequires - -* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1 -- Initial release for RHEL 6, RHEL 5 and Fedora 15 - -* Sun Sep 02 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13.0 -- Import to GIT -- Built with future TDE version (3.5.13 + cmake + QT3.3.8d) |