RPM: rename 'common/cmake' package to 'dependencies/tde-cmake'

Signed-off-by: François Andriot <albator78@libertysurf.fr>

14 files changed, 135 insertions, 14 deletions

diff --git a/redhat/dependencies/akode/akode.spec b/redhat/dependencies/akode/akode.spec
index 6176c2d49..11b6ee27a 100644
--- a/redhat/dependencies/akode/akode.spec
+++ b/redhat/dependencies/akode/akode.spec
@@ -62,7 +62,7 @@ Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 Prefix:		%{tde_prefix}
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-cmake >= %{tde_version}
 BuildRequires:  gcc-c++
 BuildRequires:	libtool
 
diff --git a/redhat/dependencies/arts/arts.spec b/redhat/dependencies/arts/arts.spec
index 6ef5f4d70..4c41914d3 100644
--- a/redhat/dependencies/arts/arts.spec
+++ b/redhat/dependencies/arts/arts.spec
@@ -67,7 +67,7 @@ BuildRequires:	libtqt4-devel >= %{tde_epoch}:4.2.0
 BuildRequires:	trinity-filesystem >= %{tde_version}
 Requires:		trinity-filesystem >= %{tde_version}
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 
diff --git a/redhat/dependencies/avahi-tqt/avahi-tqt.spec b/redhat/dependencies/avahi-tqt/avahi-tqt.spec
index df1e72379..3937f6ff3 100644
--- a/redhat/dependencies/avahi-tqt/avahi-tqt.spec
+++ b/redhat/dependencies/avahi-tqt/avahi-tqt.spec
@@ -52,7 +52,7 @@ Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
 BuildRequires:	libtqt4-devel >= %{tde_epoch}:4.2.0
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	libtool
diff --git a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt.spec b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt.spec
index 2915ce93e..5c2aef17e 100644
--- a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt.spec
+++ b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt.spec
@@ -53,7 +53,7 @@ Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 BuildRequires:	libtqt3-mt-devel >= 3.5.0
 BuildRequires:	libtqt4-devel >= %{tde_epoch}:4.2.0
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 
diff --git a/redhat/dependencies/dbus-tqt/dbus-tqt.spec b/redhat/dependencies/dbus-tqt/dbus-tqt.spec
index f9bddec2e..2fd896c2f 100644
--- a/redhat/dependencies/dbus-tqt/dbus-tqt.spec
+++ b/redhat/dependencies/dbus-tqt/dbus-tqt.spec
@@ -52,7 +52,7 @@ Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
 BuildRequires:	libtqt4-devel >= %{tde_epoch}:4.2.0
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 
diff --git a/redhat/dependencies/libart-lgpl/libart-lgpl.spec b/redhat/dependencies/libart-lgpl/libart-lgpl.spec
index 95d16308f..b52c8a39f 100644
--- a/redhat/dependencies/libart-lgpl/libart-lgpl.spec
+++ b/redhat/dependencies/libart-lgpl/libart-lgpl.spec
@@ -51,7 +51,7 @@ BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	libtool
diff --git a/redhat/dependencies/libcaldav/libcaldav.spec b/redhat/dependencies/libcaldav/libcaldav.spec
index d0287ec28..77013b279 100644
--- a/redhat/dependencies/libcaldav/libcaldav.spec
+++ b/redhat/dependencies/libcaldav/libcaldav.spec
@@ -54,7 +54,7 @@ BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-cmake >= %{tde_version}
 BuildRequires:	make
 BuildRequires:	libtool
 BuildRequires:	fdupes
diff --git a/redhat/dependencies/libcarddav/libcarddav.spec b/redhat/dependencies/libcarddav/libcarddav.spec
index 09970f7a0..6abd67519 100644
--- a/redhat/dependencies/libcarddav/libcarddav.spec
+++ b/redhat/dependencies/libcarddav/libcarddav.spec
@@ -54,7 +54,7 @@ BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	make
 BuildRequires:	libtool
diff --git a/redhat/dependencies/polkit-tqt/polkit-tqt.spec b/redhat/dependencies/polkit-tqt/polkit-tqt.spec
index 9d723122b..4b8f8fa63 100644
--- a/redhat/dependencies/polkit-tqt/polkit-tqt.spec
+++ b/redhat/dependencies/polkit-tqt/polkit-tqt.spec
@@ -50,7 +50,7 @@ BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 Source1:		%{name}-rpmlintrc
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-cmake >= %{tde_version}
 BuildRequires:	trinity-dbus-1-tqt-devel
 BuildRequires:	trinity-filesystem >= %{tde_version}
 
diff --git a/redhat/dependencies/tde-cmake/tde-cmake.spec b/redhat/dependencies/tde-cmake/tde-cmake.spec
new file mode 100644
index 000000000..71b89c4fb
--- /dev/null
+++ b/redhat/dependencies/tde-cmake/tde-cmake.spec
@@ -0,0 +1,121 @@
+#
+# spec file for package cmake-trinity (version R14)
+#
+# Copyright (c) 2014 Trinity Desktop Environment
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+#
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
+#
+
+# TDE variables
+%if "%{?tde_version}" == ""
+%define tde_version 14.1.0
+%endif
+%define tde_pkg tde-cmake
+
+%if 0%{?rhel} == 6 || 0%{?rhel} == 7
+%define cmake_datadir %{_datadir}/cmake3
+%else
+%define cmake_datadir %{_datadir}/cmake
+%endif
+
+
+Name:		trinity-%{tde_pkg}
+Version:	%{tde_version}
+Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	TDE CMake modules
+Group:		Development/Libraries/C and C++
+URL:		http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch:	noarch
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	cmake
+BuildRequires:	desktop-file-utils
+
+Requires:		cmake
+
+Obsoletes:		trinity-cmake < %{version}-%{release}
+Provides:		trinity-cmake = %{version}-%{release}
+
+%description
+TDE uses its own set of modules and macros to simplify CMake rules.
+
+This also includes the TDEL10n module that is used to generate and
+update templates for translations and the modified version of
+intltool-merge used to merge translations into desktop files.
+
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+
+%build
+unset QTDIR QTINC QTLIB
+
+if ! rpm -E %%cmake|grep -q "cd build"; then
+  %__mkdir_p build
+  cd build
+fi
+
+%cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=ON \
+  \
+  -DBUILD_ALL="ON" \
+  -DWITH_ALL_OPTIONS="ON" \
+  ..
+
+%__make %{?_smp_mflags} || %__make
+
+
+%install
+%__rm -rf %{?buildroot}
+%__make install -C build DESTDIR=%{?buildroot}
+
+
+%clean
+%__rm -rf $RPM_BUILD_ROOT
+
+
+%files
+%defattr(-,root,root,-)
+%{cmake_datadir}/Modules/FindTDE.cmake
+%{cmake_datadir}/Modules/FindTQt.cmake
+%{cmake_datadir}/Modules/FindTQtQUI.cmake
+%{cmake_datadir}/Modules/TDEL10n.cmake
+%{cmake_datadir}/Modules/TDEMacros.cmake
+%{cmake_datadir}/Modules/TDESetupPaths.cmake
+%{cmake_datadir}/Modules/TDEVersion.cmake
+%{cmake_datadir}/Modules/tde_automoc.cmake
+%{cmake_datadir}/Modules/tde_l10n_merge.pl
+%{cmake_datadir}/Modules/tde_uic.cmake
+%{cmake_datadir}/Templates/tde_dummy_cpp.cmake
+%{cmake_datadir}/Templates/tde_export_library.cmake
+%{cmake_datadir}/Templates/tde_libtool_file.cmake
+%{cmake_datadir}/Templates/tde_tdeinit_executable.cmake
+%{cmake_datadir}/Templates/tde_tdeinit_module.cmake
+
+
+%changelog
diff --git a/redhat/dependencies/tqca-tls/tqca-tls.spec b/redhat/dependencies/tqca-tls/tqca-tls.spec
index ca5b7c49a..567649b9a 100644
--- a/redhat/dependencies/tqca-tls/tqca-tls.spec
+++ b/redhat/dependencies/tqca-tls/tqca-tls.spec
@@ -57,7 +57,7 @@ Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 BuildRequires:  libtqt4-devel >= %{tde_epoch}:4.2.0
 BuildRequires:	libtqca-devel >= %{tde_epoch}:1.0
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	openssl-devel >= 0.9.8
 
diff --git a/redhat/dependencies/tqca/tqca.spec b/redhat/dependencies/tqca/tqca.spec
index ff7f51a8a..258b6a3c5 100644
--- a/redhat/dependencies/tqca/tqca.spec
+++ b/redhat/dependencies/tqca/tqca.spec
@@ -65,7 +65,7 @@ Obsoletes:		%{libtqt3}-mt-tqca-tls < %{version}-%{release}
 Provides:		%{libtqt3}-mt-tqca-tls = %{version}-%{release}
 
 BuildRequires:  libtqt4-devel >= %{tde_epoch}:4.2.0
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	openssl-devel >= 0.9.8
 
diff --git a/redhat/dependencies/tqscintilla/tqscintilla.spec b/redhat/dependencies/tqscintilla/tqscintilla.spec
index 7e152751d..8facd87e5 100644
--- a/redhat/dependencies/tqscintilla/tqscintilla.spec
+++ b/redhat/dependencies/tqscintilla/tqscintilla.spec
@@ -55,7 +55,7 @@ Source1:		trinity-tqscintilla-rpmlintrc
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-filesystem >= %{tde_version}
 
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-cmake >= %{tde_version}
 BuildRequires:	desktop-file-utils
 BuildRequires:	gcc-c++
 BuildRequires:	gettext
diff --git a/redhat/dependencies/tqtinterface/tqtinterface.spec b/redhat/dependencies/tqtinterface/tqtinterface.spec
index 4d9b6b348..475aeac18 100644
--- a/redhat/dependencies/tqtinterface/tqtinterface.spec
+++ b/redhat/dependencies/tqtinterface/tqtinterface.spec
@@ -56,7 +56,7 @@ Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
 BuildRequires:	libtqt3-mt-devel >= 3.5.0
 BuildRequires:	tqt3-dev-tools >= 3.5.0
-BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-tde-cmake >= %{tde_version}
 
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
@@ -162,7 +162,7 @@ Provides:	libtqt4-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:	%{libtqt4} = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:	libtqt3-mt-devel >= 3.5.0
 Requires:	tqt3-dev-tools >= 3.5.0
-Requires:	trinity-cmake >= %{version}-%{release}
+Requires:	trinity-tde-cmake >= %{version}-%{release}
 
 Obsoletes:	trinity-tqtinterface-devel < %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:	trinity-tqtinterface-devel = %{?epoch:%{epoch}:}%{version}-%{release}