diff options
Diffstat (limited to 'redhat/dependencies')
18 files changed, 274 insertions, 107 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 8480ddc7e..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: trinity-cmake >= %{tde_version} +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 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..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: trinity-cmake >= %{tde_version} +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 d0287ec28..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: trinity-cmake >= %{tde_version} +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 09970f7a0..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: trinity-cmake >= %{tde_version} +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 index 403ddbf5a..aa965f98c 100644 --- a/redhat/dependencies/polkit-tqt/polkit-tqt.spec +++ b/redhat/dependencies/polkit-tqt/polkit-tqt.spec @@ -17,7 +17,7 @@ # TDE variables %if "%{?tde_version}" == "" -%define tde_version 14.0.11 +%define tde_version 14.1.0 %endif %define tde_pkg polkit-tqt @@ -50,9 +50,10 @@ 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} +BuildRequires: libtqt4-devel BuildRequires: desktop-file-utils BuildRequires: gcc-c++ diff --git a/redhat/dependencies/python-tqt/python-tqt.spec b/redhat/dependencies/pytqt/pytqt.spec index be24592b2..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,19 +73,10 @@ BuildRequires: libtqscintilla-devel >= %{?epoch:%{epoch}:}1.7.1 BuildRequires: gcc-c++ # PYTHON support -%if 0%{?sle_version} >= 150400 -%define python python3 -%define __python %__python3 -%else -%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)")} -%endif +%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 @@ -118,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 @@ -203,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/ @@ -245,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 \ @@ -272,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 a2bf18df4..0c60df09d 100644 --- a/redhat/dependencies/sip4-tqt/sip4-tqt.spec +++ b/redhat/dependencies/sip4-tqt/sip4-tqt.spec @@ -77,19 +77,10 @@ BuildRequires: bison 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 -%if 0%{?sle_version} >= 150400 %global python python3 %global __python %__python3 -%else -%global python python -%endif -%endif -%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} +%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 @@ -119,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 ########## @@ -153,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 ########## @@ -176,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 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..b926e184e 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 @@ -91,8 +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.1 +%{_libdir}/libtqscintilla.so.7 +%{_libdir}/libtqscintilla.so.7.0.1 %{_libdir}/tqt3/plugins/designer/*.so %dir %{_datadir}/tqt3/translations/ %{_datadir}/tqt3/translations/*.qm @@ -117,10 +117,39 @@ This package contains the development files for tqscintilla. %files -n %{libtqscintilla}-devel %defattr(-,root,root,-) -%{_includedir}/tqscintilla/ -%{_libdir}/libqscintilla.so -%{_libdir}/pkgconfig/qscintilla.pc -%exclude %{_libdir}/libqscintilla.la +#%{_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 ########## @@ -137,12 +166,7 @@ This package contains the documentation for tqscintilla. %files -n %{libtqscintilla}-doc %defattr(-,root,root,-) -%{_docdir}/libtqscintilla7/ -%exclude %{_docdir}/libtqscintilla7/ChangeLog -%exclude %{_docdir}/libtqscintilla7/LICENSE -%exclude %{_docdir}/libtqscintilla7/NEWS -%exclude %{_docdir}/libtqscintilla7/README -/usr/share/doc/libtqscintilla/ +%{_docdir}/libtqscintilla/ ########## @@ -184,8 +208,10 @@ fi %__rm -rf %{?buildroot} %__make install -C build DESTDIR=%{?buildroot} -# Fix headers location -%__mv "%{?buildroot}%{_includedir}/tqt3" "%{?buildroot}%{_includedir}/tqscintilla" +%if "%{?_docdir}" != "%{_datadir}/doc" +%__mkdir_p "%{?buildroot}%{_docdir}" +%__mv "%{?buildroot}%{_datadir}/doc/libtqscintilla/" "%{?buildroot}%{_docdir}/libtqscintilla/" +%endif %clean diff --git a/redhat/dependencies/tqt3/tqt3.spec b/redhat/dependencies/tqt3/tqt3.spec index 5441fc8f4..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} 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 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} |