diff options
Diffstat (limited to 'redhat/dependencies')
20 files changed, 543 insertions, 171 deletions
diff --git a/redhat/dependencies/akode/akode.spec b/redhat/dependencies/akode/akode.spec index 6b6369e7a..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: cmake >= 2.8 +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 062fb1415..5e7809a97 100644 --- a/redhat/dependencies/arts/arts.spec +++ b/redhat/dependencies/arts/arts.spec @@ -32,6 +32,7 @@ %define tde_docdir %{tde_datadir}/doc %define tde_includedir %{tde_prefix}/include %define tde_libdir %{tde_prefix}/%{_lib} +%define tde_mandir %{tde_datadir}/man %define tde_sbindir %{tde_prefix}/sbin %define tde_tdeappdir %{tde_datadir}/applications/tde %define tde_tdedocdir %{tde_docdir}/tde @@ -66,7 +67,7 @@ BuildRequires: libtqt4-devel >= %{tde_epoch}:4.2.0 BuildRequires: trinity-filesystem >= %{tde_version} Requires: trinity-filesystem >= %{tde_version} -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig @@ -162,6 +163,9 @@ playing a wave file with some effects. %{tde_bindir}/artswrapper # The '.la' files are needed for runtime, not devel ! %{tde_libdir}/lib*.la +%{tde_mandir}/man1/artsc-config-trinity.1* +%{tde_mandir}/man1/artscat-trinity.1* +%{tde_mandir}/man1/artsdsp-trinity.1* ########## @@ -250,6 +254,7 @@ fi -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \ -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \ -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_SKIP_INSTALL_RPATH=OFF \ -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ -DCMAKE_NO_BUILTIN_CHRPATH=ON \ -DCMAKE_VERBOSE_MAKEFILE=ON \ @@ -257,8 +262,9 @@ fi \ -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \ -DBIN_INSTALL_DIR="%{tde_bindir}" \ - -DINCLUDE_INSTALL_DIR="%{tde_tdeincludedir}/arts" \ + -DINCLUDE_INSTALL_DIR="%{tde_tdeincludedir}" \ -DLIB_INSTALL_DIR="%{tde_libdir}" \ + -DMAN_INSTALL_DIR="%{tde_mandir}" \ -DPKGCONFIG_INSTALL_DIR="%{tde_libdir}/pkgconfig" \ \ -DWITH_ALSA=ON \ diff --git a/redhat/dependencies/avahi-tqt/avahi-tqt.spec b/redhat/dependencies/avahi-tqt/avahi-tqt.spec index 527f7d305..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: cmake +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 d79016dc7..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: cmake >= 2.8 +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 1617316b9..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: cmake >= 2.8 +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 924074c91..039697747 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: cmake >= 2.8 +BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: libtool @@ -194,6 +194,7 @@ fi -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \ -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \ -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_SKIP_INSTALL_RPATH=OFF \ -DCMAKE_VERBOSE_MAKEFILE=ON \ -DWITH_GCC_VISIBILITY=OFF \ \ diff --git a/redhat/dependencies/libcaldav/libcaldav.spec b/redhat/dependencies/libcaldav/libcaldav.spec index bbfdaa22a..29569afb4 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: cmake >= 2.8 +BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: make BuildRequires: libtool BuildRequires: fdupes @@ -166,6 +166,7 @@ fi -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \ -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \ -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_SKIP_INSTALL_RPATH=OFF \ -DCMAKE_VERBOSE_MAKEFILE=ON \ -DWITH_GCC_VISIBILITY=OFF \ \ diff --git a/redhat/dependencies/libcarddav/libcarddav.spec b/redhat/dependencies/libcarddav/libcarddav.spec index 9a58cc122..a06752bc1 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: cmake >= 2.8 +BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: make BuildRequires: libtool @@ -168,6 +168,7 @@ fi -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \ -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \ -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_SKIP_INSTALL_RPATH=OFF \ -DCMAKE_VERBOSE_MAKEFILE=ON \ -DWITH_GCC_VISIBILITY=OFF \ \ diff --git a/redhat/dependencies/polkit-tqt/polkit-tqt.spec b/redhat/dependencies/polkit-tqt/polkit-tqt.spec new file mode 100644 index 000000000..aa965f98c --- /dev/null +++ b/redhat/dependencies/polkit-tqt/polkit-tqt.spec @@ -0,0 +1,232 @@ +# +# spec file for package polkit-tqt (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 polkit-tqt + +%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} +%define libpolkit_tqt %{_lib}%{tde_pkg} +%else +%define libpolkit_tqt lib%{tde_pkg} +%endif + + +Name: trinity-%{tde_pkg} +Version: 0.103.0 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: PolicyKit-tqt library +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) + +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz +Source1: %{name}-rpmlintrc + +BuildRequires: trinity-tde-cmake >= %{tde_version} +BuildRequires: trinity-dbus-1-tqt-devel +BuildRequires: trinity-filesystem >= %{tde_version} +BuildRequires: libtqt4-devel + +BuildRequires: desktop-file-utils +BuildRequires: gcc-c++ +BuildRequires: gettext + +BuildRequires: polkit-devel + +%description +PolicyKit is an application-level toolkit for defining and handling the policy +that allows unprivileged processes to speak to privileged processes. + +It is a framework for centralizing the decision making process with respect to +granting access to privileged operations for unprivileged (desktop) applications. + +libpolkit-tqt provides convenience classes and methods for TQt/TDE +applications that want to use PolicyKit. + +This package contains the files necessary for running applications that use +the libpolkit-tqt library. + +########## + +%package -n %{libpolkit_tqt}0 +Summary: TQt source code editing component based on Scintilla +Group: Development/Libraries/C and C++ +Provides: libpolkit-tqt = %{version}-%{release} +Requires: libtqt3-mt >= 3.5.0 + +%description -n %{libpolkit_tqt}0 +PolicyKit is an application-level toolkit for defining and handling the policy +that allows unprivileged processes to speak to privileged processes. + +It is a framework for centralizing the decision making process with respect to +granting access to privileged operations for unprivileged (desktop) applications. + +libpolkit-tqt provides convenience classes and methods for TQt/TDE +applications that want to use PolicyKit. + +This package contains the files necessary for running applications that use +the libpolkit-tqt library. + +%post -n %{libpolkit_tqt}0 +/sbin/ldconfig + +%postun -n %{libpolkit_tqt}0 +/sbin/ldconfig + +%files -n %{libpolkit_tqt}0 +%defattr(-,root,root,-) +%{_libdir}/libpolkit-tqt-agent.so.0 +%{_libdir}/libpolkit-tqt-agent.so.0.0.0 +%{_libdir}/libpolkit-tqt-core.so.0 +%{_libdir}/libpolkit-tqt-core.so.0.0.0 +%{_libdir}/libpolkit-tqt-gui.so.0 +%{_libdir}/libpolkit-tqt-gui.so.0.0.0 + +########## + +%package -n %{libpolkit_tqt}-devel +Summary: PolicyKit-tqt development files +Group: Development/Libraries/C and C++ +Provides: libpolkit-tqt-devel = %{version}-%{release} +Requires: %{libpolkit_tqt}0 = %{version}-%{release} +Requires: libtqt3-mt-devel >= 3.5.0 + +%description -n %{libpolkit_tqt}-devel +PolicyKit is an application-level toolkit for defining and handling the policy +that allows unprivileged processes to speak to privileged processes. + +It is a framework for centralizing the decision making process with respect to +granting access to privileged operations for unprivileged (desktop) applications. + +libpolkit-tqt provides convenience classes and methods for TQt/TDE +applications that want to use PolicyKit. +. +This package contains the development libraries and headers. + +%post -n %{libpolkit_tqt}-devel +/sbin/ldconfig + +%postun -n %{libpolkit_tqt}-devel +/sbin/ldconfig + +%files -n %{libpolkit_tqt}-devel +%defattr(-,root,root,-) +%{_includedir}/polkit-tqt/ +%{_libdir}/cmake/polkit-tqt.cmake +%{_libdir}/libpolkit-tqt-agent.so +%{_libdir}/libpolkit-tqt-core.so +%{_libdir}/libpolkit-tqt-gui.so +%{_libdir}/pkgconfig/polkit-tqt-agent.pc +%{_libdir}/pkgconfig/polkit-tqt-core.pc +%{_libdir}/pkgconfig/polkit-tqt-gui.pc +%{_libdir}/pkgconfig/polkit-tqt.pc + +########## + +%package -n %{libpolkit_tqt}-examples +Summary: Polkit-tqt Documentation +Group: Development/Libraries/C and C++ +Provides: libpolkit-tqt-doc = %{version}-%{release} +Requires: %{libpolkit_tqt}0 = %{version}-%{release} +Requires: trinity-filesystem >= %{tde_version} + +%description -n %{libpolkit_tqt}-examples +PolicyKit is an application-level toolkit for defining and handling the policy +that allows unprivileged processes to speak to privileged processes. + +It is a framework for centralizing the decision making process with respect to +granting access to privileged operations for unprivileged (desktop) applications. + +libpolkit-tqt provides convenience classes and methods for TQt/TDE +applications that want to use PolicyKit. + +This package contains example files and applications. + +%files -n %{libpolkit_tqt}-examples +%defattr(-,root,root,-) +%{_sysconfdir}/dbus-1/system.d/org.tqt.policykit.examples.conf +%{_bindir}/polkit-tqt-agent-example +%{_bindir}/polkit-tqt-example +%{_bindir}/polkit-tqt-example-helper +%{_datadir}/apps/polkit-tqt/ +%{_datadir}/dbus-1/system-services/org.tqt.policykit.examples.service +%{_datadir}/polkit-1/actions/org.tqt.policykit.examples.policy + +########## + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%debug_package +%endif + +########## + +%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_C_FLAGS="${RPM_OPT_FLAGS}" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \ + -DCMAKE_NO_BUILTIN_CHRPATH=ON \ + -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} + +# Unwanted files +%__rm -f %{buildroot}%{_libdir}/libpolkit-tqt-agent.la +%__rm -f %{buildroot}%{_libdir}/libpolkit-tqt-core.la +%__rm -f %{buildroot}%{_libdir}/libpolkit-tqt-gui.la + + +%clean +%__rm -rf $RPM_BUILD_ROOT + + +%changelog diff --git a/redhat/dependencies/polkit-tqt/trinity-polkit-tqt-rpmlintrc b/redhat/dependencies/polkit-tqt/trinity-polkit-tqt-rpmlintrc new file mode 100644 index 000000000..1a56a48f9 --- /dev/null +++ b/redhat/dependencies/polkit-tqt/trinity-polkit-tqt-rpmlintrc @@ -0,0 +1,2 @@ +setBadness('polkit-unauthorized-privilege', 0) +setBadness('suse-dbus-unauthorized-service', 0) diff --git a/redhat/dependencies/python-tqt/python-tqt.spec b/redhat/dependencies/pytqt/pytqt.spec index 5d8aa43d0..d7285cd3c 100644 --- a/redhat/dependencies/python-tqt/python-tqt.spec +++ b/redhat/dependencies/pytqt/pytqt.spec @@ -1,5 +1,5 @@ # -# spec file for package python-tqt (version R14) +# spec file for package pytqt (version R14) # # Copyright (c) 2014 Trinity Desktop Environment # @@ -24,7 +24,7 @@ %if "%{?tde_version}" == "" %define tde_version 14.1.0 %endif -%define tde_pkg python-tqt +%define tde_pkg pytqt %define tde_prefix /opt/trinity %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -61,6 +61,8 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz Obsoletes: trinity-PyQt < %{?epoch:%{epoch}:}%{version}-%{release} Obsoletes: trinity-python-qt3 < %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-python-tqt < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-python-tqt = %{?epoch:%{epoch}:}%{version}-%{release} BuildRequires: tqt3-apps-devel >= 3.5.0 BuildRequires: libtqt4-devel >= %{?epoch:%{epoch}:}4.2.0 @@ -71,14 +73,10 @@ BuildRequires: libtqscintilla-devel >= %{?epoch:%{epoch}:}1.7.1 BuildRequires: gcc-c++ # PYTHON support -%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?mgaversion} >= 8 -%global python python2 -%global __python %__python2 -%global python_sitearch %{python2_sitearch} -%else -%global python python -%endif -%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} +%global python python3 +%global __python %__python3 +%global python_sitearch %{python3_sitearch} +%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} BuildRequires: %{python} BuildRequires: %{python}-devel @@ -113,81 +111,94 @@ BuildRequires: %{_lib}xmu%{?mgaversion:6}-devel Python binding module that allows use of TQt X Window toolkit v3. You can use it to create portable graphics-capable scripts. -At this moment python-tqt offers a vast subset of TQt API. There are +At this moment pytqt offers a vast subset of TQt API. There are some minor issues related to the differences between C++ and Python (types, etc), but usually you'll be able to write code pretty much the same way in both languages (with syntax differences, of course) ########## -%package -n python-tqt +%package -n pytqt Summary: TQt bindings for Python Group: Development/Libraries/Python Requires: trinity-filesystem >= %{tde_version} Requires: sip4-tqt >= %{?epoch:%{epoch}:}4.10.5 Requires: libtqt4 >= %{?epoch:%{epoch}:}4.2.0 +Obsoletes: python-tqt < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: python-tqt = %{?epoch:%{epoch}:}%{version}-%{release} -%description -n python-tqt +%description -n pytqt Python binding module that allows use of TQt X Window toolkit v3. You can use it to create portable graphics-capable scripts. -At this moment python-tqt offers a vast subset of TQt API. There are +At this moment pytqt offers a vast subset of TQt API. There are some minor issues related to the differences between C++ and Python (types, etc), but usually you'll be able to write code pretty much the same way in both languages (with syntax differences, of course) -%files -n python-tqt +%files -n pytqt %defattr(-,root,root,-) %doc NEWS README -%dir %{python_sitearch}/python_tqt -%{python_sitearch}/python_tqt/__init__.py* -%{python_sitearch}/python_tqt/qt.so -%{python_sitearch}/python_tqt/qtcanvas.so -%{python_sitearch}/python_tqt/qtnetwork.so -%{python_sitearch}/python_tqt/qtsql.so -%{python_sitearch}/python_tqt/qttable.so -%{python_sitearch}/python_tqt/qtui.so -%{python_sitearch}/python_tqt/qtxml.so +%dir %{python_sitearch}/PyTQt +%if 0%{?rhel} == 7 || 0%{?suse_version} +%{python_sitearch}/PyTQt/__init__.py* +%if 0%{?rhel} == 7 +%{python_sitearch}/PyTQt/__pycache__/__init__.*.pyc +%endif +%else +%pycached %{python_sitearch}/PyTQt/__init__.py +%endif +%{python_sitearch}/PyTQt/tqt.so +%{python_sitearch}/PyTQt/tqtcanvas.so +%{python_sitearch}/PyTQt/tqtnetwork.so +%{python_sitearch}/PyTQt/tqtsql.so +%{python_sitearch}/PyTQt/tqttable.so +%{python_sitearch}/PyTQt/tqtui.so +%{python_sitearch}/PyTQt/tqtxml.so ########## -%package -n python-tqt-gl +%package -n pytqt-gl Summary: TQt OpenGL bindings for Python Group: Development/Libraries/Python -Requires: python-tqt = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: pytqt = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: python-tqt-gl < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: python-tqt-gl = %{?epoch:%{epoch}:}%{version}-%{release} -%description -n python-tqt-gl +%description -n pytqt-gl Python binding module that allows use of the OpenGL facilities offered by the TQt X Window toolkit v3. You can use it to create portable graphics-capable scripts. -%files -n python-tqt-gl +%files -n pytqt-gl %defattr(-,root,root,-) -%{python_sitearch}/python_tqt/qtgl.so +%{python_sitearch}/PyTQt/tqtgl.so ########## -%package -n python-tqt-tqtext -Summary: TQtext extensions for python-tqt +%package -n pytqt-tqtext +Summary: TQtext extensions for pytqt Group: Development/Libraries/Python -Requires: python-tqt = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: pytqt = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: python-tqt-tqtext < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: python-tqt-tqtext = %{?epoch:%{epoch}:}%{version}-%{release} -%description -n python-tqt-tqtext -python-tqt Extensions. Contains: +%description -n pytqt-tqtext +pytqt Extensions. Contains: * TQScintilla: a featureful TQt source code editing component based on Scintilla. -%files -n python-tqt-tqtext +%files -n pytqt-tqtext %defattr(-,root,root,-) -%{python_sitearch}/python_tqt/qtext.so +%{python_sitearch}/PyTQt/tqtext.so ########## %package -n trinity-pytqt-tools Summary: Pyuic and pylupdate for TQt Group: Development/Libraries/Python -Requires: python-tqt = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: pytqt = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-pytqt-tools pyuic is the PyQt counterpart for TQt's uic. It takes an XML @@ -198,26 +209,35 @@ Linguist translation files from Python code. %files -n trinity-pytqt-tools %defattr(-,root,root,-) -%{tde_bindir}/pylupdate -%{tde_bindir}/pyuic +%{tde_bindir}/pytqlupdate +%{tde_bindir}/pytquic ########## -%package -n python-tqt-devel +%package -n pytqt-devel Summary: TQt bindings for Python - Development files Group: Development/Libraries/Python -Requires: python-tqt = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: pytqt = %{?epoch:%{epoch}:}%{version}-%{release} Requires: trinity-pytqt-tools = %{?epoch:%{epoch}:}%{version}-%{release} Requires: libtqt4-devel >= %{?epoch:%{epoch}:}4.2.0 +Obsoletes: python-tqt-devel < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: python-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release} -%description -n python-tqt-devel +%description -n pytqt-devel Development .sip files with definitions of PyQt classes. They are needed to build PyQt, but also as building blocks of other packages based on them, like PyTDE. -%files -n python-tqt-devel +%files -n pytqt-devel %defattr(-,root,root,-) -%{python_sitearch}/python_tqt/pyqtconfig.py* +%if 0%{?rhel} == 7 || 0%{?suse_version} +%{python_sitearch}/PyTQt/pytqtconfig.py* +%if 0%{?rhel} == 7 +%{python_sitearch}/PyTQt/__pycache__/pytqtconfig.*.pyc +%endif +%else +%pycached %{python_sitearch}/PyTQt/pytqtconfig.py +%endif %dir %{_datadir}/sip %{_datadir}/sip/tqt/ @@ -240,16 +260,13 @@ export PATH="%{tde_bindir}:${PATH}" mkdir build cd build -# WTF ? CentOS 6 ! -cp -rf ../pyuic3 ../pylupdate3 - echo yes | %__python ../configure.py \ - -c -n %{_includedir}/tqscintilla \ + -c -n %{_includedir}/tqt3 \ -g %{_includedir}/tqt3 \ -q %{_datadir}/tqt3 \ -y tqt-mt \ -o %{_libdir} -u -j 10 \ - -d %{python_sitearch}/python_tqt \ + -d %{python_sitearch}/PyTQt \ -v %{_datadir}/sip/tqt \ -b %{tde_bindir} \ -w \ @@ -267,7 +284,6 @@ echo yes | %__python ../configure.py \ %clean -%__rm -rf %{?buildroot}%{python_sitearch}/python_tqt/__init__.py %changelog diff --git a/redhat/dependencies/sip4-tqt/sip4-tqt.spec b/redhat/dependencies/sip4-tqt/sip4-tqt.spec index 23789e97e..0c60df09d 100644 --- a/redhat/dependencies/sip4-tqt/sip4-tqt.spec +++ b/redhat/dependencies/sip4-tqt/sip4-tqt.spec @@ -70,19 +70,27 @@ BuildRequires: trinity-filesystem >= %{tde_version} BuildRequires: gcc-c++ +# BISON support +BuildRequires: bison + +# FLEX support +BuildRequires: flex + # PYTHON support -%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?mgaversion} >= 8 -%global python python2 -%global __python %__python2 -%global python_sitearch %{python2_sitearch} -%else -%global python python -%endif -%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} +%global python python3 +%global __python %__python3 +%global python_sitearch %{python3_sitearch} +%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} BuildRequires: %{python} BuildRequires: %{python}-devel +# YACC support +%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 +BuildRequires: byacc +%endif + %description + SIP is a tool for generating bindings for C++ classes with some ideas borrowed from SWIG, but capable of tighter bindings because of its specificity towards C++ and Python. @@ -102,7 +110,18 @@ specificity towards C++ and Python. %files -n sip4-tqt %defattr(-,root,root,-) -%{python_sitearch}/sip4_tqt/ +%{python_sitearch}/sip_tqt.so +%if 0%{?rhel} == 7 || 0%{?suse_version} +%{python_sitearch}/sip_tqt_config.py* +%{python_sitearch}/sip_tqt_distutils.py* +%if 0%{?rhel} == 7 +%{python_sitearch}/__pycache__/sip_tqt_config.*.pyc +%{python_sitearch}/__pycache__/sip_tqt_distutils.*.pyc +%endif +%else +%pycached %{python_sitearch}/sip_tqt_config.py +%pycached %{python_sitearch}/sip_tqt_distutils.py +%endif ########## @@ -136,8 +155,8 @@ needed to develop Python bindings with sip. %files -n sip4-tqt-devel %defattr(-,root,root,-) -%{tde_bindir}/sip -%{tde_includedir}/sip.h +%{tde_bindir}/sip-tqt +%{tde_includedir}/sip-tqt.h ########## @@ -159,7 +178,7 @@ mkdir build cd build %__python ../configure.py \ -b %{tde_bindir} \ - -d %{python_sitearch}/sip4_tqt \ + -d %{python_sitearch} \ -e %{tde_includedir} \ -u STRIP="" \ CFLAGS="${RPM_OPT_FLAGS} -I%{_includedir}/tqt -I%{_includedir}/tqt3 -I${PWD}/../sipgen -DYYERROR_VERBOSE" \ 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 4c391d70b..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: cmake +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 e230248f9..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: cmake +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 46f6cb1e5..b926e184e 100644 --- a/redhat/dependencies/tqscintilla/tqscintilla.spec +++ b/redhat/dependencies/tqscintilla/tqscintilla.spec @@ -21,9 +21,6 @@ %define tde_version 14.1.0 %endif %define tde_pkg tqscintilla -%define tde_prefix /opt/trinity -%define tde_datadir %{tde_prefix}/share -%define tde_tdedocdir %{tde_datadir}/doc/tde %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} %define libtqscintilla %{_lib}tqscintilla @@ -58,9 +55,10 @@ Source1: trinity-tqscintilla-rpmlintrc BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-filesystem >= %{tde_version} +BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: desktop-file-utils -BuildRequires: gettext BuildRequires: gcc-c++ +BuildRequires: gettext %description Scintilla is a free source code editing component. It has features found @@ -93,9 +91,8 @@ TQScintilla is a port or Scintilla to the TQt GUI toolkit. %files -n %{libtqscintilla}7 %defattr(-,root,root,-) %doc ChangeLog LICENSE NEWS README -%{_libdir}/libqscintilla.so.7 -%{_libdir}/libqscintilla.so.7.0 -%{_libdir}/libqscintilla.so.7.0.1 +%{_libdir}/libtqscintilla.so.7 +%{_libdir}/libtqscintilla.so.7.0.1 %{_libdir}/tqt3/plugins/designer/*.so %dir %{_datadir}/tqt3/translations/ %{_datadir}/tqt3/translations/*.qm @@ -120,9 +117,40 @@ This package contains the development files for tqscintilla. %files -n %{libtqscintilla}-devel %defattr(-,root,root,-) -%doc doc/Scintilla example -%{_includedir}/tqscintilla/ -%{_libdir}/libqscintilla.so +#%{_includedir}/tqscintilla/ +%{_includedir}/tqt3/tqextscintilla.h +%{_includedir}/tqt3/tqextscintillaapis.h +%{_includedir}/tqt3/tqextscintillabase.h +%{_includedir}/tqt3/tqextscintillacommand.h +%{_includedir}/tqt3/tqextscintillacommandset.h +%{_includedir}/tqt3/tqextscintilladocument.h +%{_includedir}/tqt3/tqextscintillaglobal.h +%{_includedir}/tqt3/tqextscintillalexer.h +%{_includedir}/tqt3/tqextscintillalexerbash.h +%{_includedir}/tqt3/tqextscintillalexerbatch.h +%{_includedir}/tqt3/tqextscintillalexercpp.h +%{_includedir}/tqt3/tqextscintillalexercsharp.h +%{_includedir}/tqt3/tqextscintillalexercss.h +%{_includedir}/tqt3/tqextscintillalexerdiff.h +%{_includedir}/tqt3/tqextscintillalexerhtml.h +%{_includedir}/tqt3/tqextscintillalexeridl.h +%{_includedir}/tqt3/tqextscintillalexerjava.h +%{_includedir}/tqt3/tqextscintillalexerjavascript.h +%{_includedir}/tqt3/tqextscintillalexerlua.h +%{_includedir}/tqt3/tqextscintillalexermakefile.h +%{_includedir}/tqt3/tqextscintillalexerperl.h +%{_includedir}/tqt3/tqextscintillalexerpov.h +%{_includedir}/tqt3/tqextscintillalexerproperties.h +%{_includedir}/tqt3/tqextscintillalexerpython.h +%{_includedir}/tqt3/tqextscintillalexerruby.h +%{_includedir}/tqt3/tqextscintillalexersql.h +%{_includedir}/tqt3/tqextscintillalexertex.h +%{_includedir}/tqt3/tqextscintillamacro.h +%{_includedir}/tqt3/tqextscintillaprinter.h +%{_libdir}/libtqscintilla.so +%{_libdir}/pkgconfig/tqscintilla.pc +%exclude %{_libdir}/libtqscintilla.la +%exclude %{_libdir}/tqt3/plugins/designer/*.la ########## @@ -138,7 +166,7 @@ This package contains the documentation for tqscintilla. %files -n %{libtqscintilla}-doc %defattr(-,root,root,-) -%{tde_tdedocdir}/HTML/en/%{name}/ +%{_docdir}/libtqscintilla/ ########## @@ -151,74 +179,39 @@ This package contains the documentation for tqscintilla. %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -# Fix path in project files -%__sed -i "qt/qscintilla.pro" \ - -e "s|^INCLUDEPATH = .*|INCLUDEPATH = . ../include ../src /usr/include/tqt /usr/include/tqt3|" \ - -e "s|^header.path = .*|header.path = %{_includedir}/tqt3|" \ - -e "s|^trans.path = .*|trans.path = %{_datadir}/tqt3/translations|" - -%__sed -i "designer/designer.pro" \ - -e "s|\$(TQTDIR)|%{_libdir}/tqt3|" \ - -e "s|# DESTDIR|DESTDIR|" - -export QTDIR=%{_libdir}/tqt3 -export TQTDIR=%{_prefix} -( cd qt; tqmake "DESTDIR=$PWD/../tmplib" ) -( cd designer; tqmake ) - %build unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" -# Workaround strange tqmake behaviour in RHEL5 -%if 0%{?rhel} == 5 -%__sed -i "qt/Makefile" -e "s|..\/..\/..\/..\/..|%{_prefix}|g" -%endif +if ! rpm -E %%cmake|grep -q "cd build"; then + %__mkdir_p build + cd build +fi + +%cmake \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \ + -DCMAKE_NO_BUILTIN_CHRPATH=ON \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=ON \ + \ + -DBUILD_ALL="ON" \ + -DWITH_ALL_OPTIONS="ON" \ + .. -export QTDIR=%{_libdir}/tqt3 -export TQTDIR=%{_prefix} -%__make %{?_smp_mflags} -C qt -%__make %{?_smp_mflags} -C designer +%__make %{?_smp_mflags} || %__make %install -unset QTDIR QTINC QTLIB -export QTDIR=%{_libdir}/tqt3 -export TQTDIR=%{_prefix} -%__rm -rf $RPM_BUILD_ROOT +%__rm -rf %{?buildroot} +%__make install -C build DESTDIR=%{?buildroot} -# Installs the QT part -%__make INSTALL_ROOT=$RPM_BUILD_ROOT -C qt install - -# Installs supplementary headers -for i in include/*.h; do - %__install -D -m 644 $i %{buildroot}${QTINC}/private/${i##*/} -done - -# Installs the HTML documentation correctly -for i in doc/html/*; do - %__install -D -m 644 $i %{buildroot}%{tde_tdedocdir}/HTML/en/%{name}/${i##*/} -done - -# Installs the Designer plugin -for i in designer/*.so ${QTDIR}/plugins/designer/*.so ${TQTDIR}/plugins/designer/*.so; do - [ -r "${i}" ] || continue - %__install -D -m 644 $i %{buildroot}${QTDIR}/plugins/designer/${i##*/} -done - -# Installs libraries -%__mkdir_p %{buildroot}%{_libdir} -%__mv -f tmplib/* %{buildroot}%{_libdir} - -# Fix private headers location -%__mkdir_p %{buildroot}%{_includedir} -%__mv -f %{buildroot}/private %{buildroot}%{_includedir}/tqt3 -%__mv -f %{buildroot}%{_includedir}/tqt3 %{buildroot}%{_includedir}/tqscintilla - -# Fix permissions -chmod a-x %{buildroot}%{_includedir}/tqscintilla/*.h -chmod a-x %{buildroot}%{_includedir}/tqscintilla/*.h +%if "%{?_docdir}" != "%{_datadir}/doc" +%__mkdir_p "%{?buildroot}%{_docdir}" +%__mv "%{?buildroot}%{_datadir}/doc/libtqscintilla/" "%{?buildroot}%{_docdir}/libtqscintilla/" +%endif %clean diff --git a/redhat/dependencies/tqt3/build-examples.sh b/redhat/dependencies/tqt3/build-examples.sh index f8ef0b95c..4d654fcc9 120000 --- a/redhat/dependencies/tqt3/build-examples.sh +++ b/redhat/dependencies/tqt3/build-examples.sh @@ -1 +1 @@ -../../../ubuntu/trusty/dependencies/tqt3/debian/maintain/build-examples.sh
\ No newline at end of file +../../../debian/_base/dependencies/tqt3/debian/maintain/build-examples.sh
\ No newline at end of file diff --git a/redhat/dependencies/tqt3/tqt3.spec b/redhat/dependencies/tqt3/tqt3.spec index 2d63b6548..4d79d2247 100644 --- a/redhat/dependencies/tqt3/tqt3.spec +++ b/redhat/dependencies/tqt3/tqt3.spec @@ -48,6 +48,7 @@ BuildRoot: %{_tmppath}/%{name}-%{tde_version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz Source1: build-examples.sh +Source2: trinity-tqt3-rpmlintrc BuildRequires: glibc-devel BuildRequires: gcc-c++ @@ -267,17 +268,12 @@ BuildRequires: sqlite3-devel %endif # POSTGRESQL support -%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150200 -BuildRequires: postgresql10 -BuildRequires: postgresql10-devel -%else -BuildRequires: postgresql -%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8 +BuildRequires: postgresql +%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8 || 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150200 BuildRequires: postgresql-server-devel %else BuildRequires: postgresql-devel %endif -%endif # Firebird support %if 0%{?mdkversion} || 0%{?mgaversion} @@ -1200,6 +1196,7 @@ for full internationalization support of the application towards the end user. %{_datadir}/tqt3/translations/qt_it.qm %{_datadir}/tqt3/translations/qt_ja.qm %{_datadir}/tqt3/translations/qt_nb.qm +%{_datadir}/tqt3/translations/qt_pt.qm %{_datadir}/tqt3/translations/qt_pt-br.qm %{_datadir}/tqt3/translations/qt_ru.qm %{_datadir}/tqt3/translations/qt_sk.qm @@ -1314,6 +1311,7 @@ done # Checks for supplementary library dirs LIBDIRS="" for d in \ + %{_libdir}/libglvnd \ %{_libdir}/mysql \ %{_libdir}/pgsql \ ; do diff --git a/redhat/dependencies/tqt3/trinity-tqt3-rpmlintrc b/redhat/dependencies/tqt3/trinity-tqt3-rpmlintrc new file mode 100644 index 000000000..d131ff5e9 --- /dev/null +++ b/redhat/dependencies/tqt3/trinity-tqt3-rpmlintrc @@ -0,0 +1 @@ +setBadness('shlib-policy-name-error', 0) diff --git a/redhat/dependencies/tqtinterface/tqtinterface.spec b/redhat/dependencies/tqtinterface/tqtinterface.spec index be71f7f6e..475aeac18 100644 --- a/redhat/dependencies/tqtinterface/tqtinterface.spec +++ b/redhat/dependencies/tqtinterface/tqtinterface.spec @@ -25,7 +25,6 @@ %define tde_version 14.1.0 %endif %define tde_pkg tqtinterface -%define cmake_modules_dir %{_datadir}/cmake/Modules %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} %define libtqt4 %{_lib}tqt4 @@ -57,12 +56,8 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz BuildRequires: libtqt3-mt-devel >= 3.5.0 BuildRequires: tqt3-dev-tools >= 3.5.0 +BuildRequires: trinity-tde-cmake >= %{tde_version} -%if 0%{?suse_version} && 0%{?suse_version} < 1300 -BuildRequires: trinity-cmake-macros -%endif - -BuildRequires: cmake >= 2.8 BuildRequires: gcc-c++ BuildRequires: pkgconfig @@ -137,10 +132,6 @@ Provides: libtqt4 = %{?epoch:%{epoch}:}%{version}-%{release} Requires: libtqt3-mt >= 3.5.0 -%if 0%{?suse_version} && 0%{?suse_version} < 1300 -Requires: trinity-cmake-macros -%endif - Obsoletes: trinity-tqtinterface < %{?epoch:%{epoch}:}%{version}-%{release} Provides: trinity-tqtinterface = %{?epoch:%{epoch}:}%{version}-%{release} @@ -171,10 +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 - -%if 0%{?suse_version} && 0%{?suse_version} < 1300 -Requires: trinity-cmake-macros -%endif +Requires: trinity-tde-cmake >= %{version}-%{release} Obsoletes: trinity-tqtinterface-devel < %{?epoch:%{epoch}:}%{version}-%{release} Provides: trinity-tqtinterface-devel = %{?epoch:%{epoch}:}%{version}-%{release} @@ -210,7 +198,6 @@ although some code has been added for useful functions that are no longer part o %{_libdir}/libtqt.so %{_libdir}/pkgconfig/tqt.pc %{_libdir}/pkgconfig/tqtqui.pc -%{cmake_modules_dir}/*.cmake ########## @@ -265,12 +252,6 @@ fi %__rm -rf "%{?buildroot}" %__make install DESTDIR="%{?buildroot}" -C build -# Install 'cmake' modules for development use -%__mkdir_p "%{?buildroot}%{cmake_modules_dir}" -for i in cmake/modules/*.cmake; do - %__install -m 644 "$i" "%{?buildroot}%{cmake_modules_dir}" -done - %clean %__rm -rf "%{?buildroot}" |