diff options
Diffstat (limited to 'redhat/dependencies')
-rw-r--r-- | redhat/dependencies/akode/akode.spec | 2 | ||||
-rw-r--r-- | redhat/dependencies/arts/arts.spec | 2 | ||||
-rw-r--r-- | redhat/dependencies/avahi-tqt/avahi-tqt.spec | 2 | ||||
-rw-r--r-- | redhat/dependencies/dbus-1-tqt/dbus-1-tqt.spec | 2 | ||||
-rw-r--r-- | redhat/dependencies/dbus-tqt/dbus-tqt.spec | 2 | ||||
-rw-r--r-- | redhat/dependencies/libart-lgpl/libart-lgpl.spec | 2 | ||||
-rw-r--r-- | redhat/dependencies/libart-lgpl/trinity-libart-lgpl-rpmlintrc | 1 | ||||
-rw-r--r-- | redhat/dependencies/libcaldav/libcaldav.spec | 2 | ||||
-rw-r--r-- | redhat/dependencies/libcarddav/libcarddav.spec | 2 | ||||
-rw-r--r-- | redhat/dependencies/polkit-tqt/polkit-tqt.spec | 2 | ||||
-rw-r--r-- | redhat/dependencies/pytqt/pytqt.spec | 2 | ||||
-rw-r--r-- | redhat/dependencies/sip4-tqt/sip4-tqt.spec | 2 | ||||
-rw-r--r-- | redhat/dependencies/tde-cmake/tde-cmake.spec | 2 | ||||
-rw-r--r-- | redhat/dependencies/tqca-tls/tqca-tls.spec | 2 | ||||
-rw-r--r-- | redhat/dependencies/tqca/tqca.spec | 2 | ||||
-rw-r--r-- | redhat/dependencies/tqscintilla/tqscintilla.spec | 2 | ||||
-rw-r--r-- | redhat/dependencies/tqt3/tqt3.spec | 17 | ||||
-rw-r--r-- | redhat/dependencies/tqtinterface/tqtinterface.spec | 3 |
18 files changed, 20 insertions, 31 deletions
diff --git a/redhat/dependencies/akode/akode.spec b/redhat/dependencies/akode/akode.spec index 11b6ee27a..7cc92149a 100644 --- a/redhat/dependencies/akode/akode.spec +++ b/redhat/dependencies/akode/akode.spec @@ -22,7 +22,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.0 +%define tde_version 14.1.1 %endif %define tde_prefix /opt/trinity %define tde_bindir %{tde_prefix}/bin diff --git a/redhat/dependencies/arts/arts.spec b/redhat/dependencies/arts/arts.spec index 5e7809a97..9846dcedd 100644 --- a/redhat/dependencies/arts/arts.spec +++ b/redhat/dependencies/arts/arts.spec @@ -22,7 +22,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.0 +%define tde_version 14.1.1 %endif %define tde_pkg arts %define tde_prefix /opt/trinity diff --git a/redhat/dependencies/avahi-tqt/avahi-tqt.spec b/redhat/dependencies/avahi-tqt/avahi-tqt.spec index 3937f6ff3..ac637cd33 100644 --- a/redhat/dependencies/avahi-tqt/avahi-tqt.spec +++ b/redhat/dependencies/avahi-tqt/avahi-tqt.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.0 +%define tde_version 14.1.1 %endif %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} diff --git a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt.spec b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt.spec index 5c2aef17e..7f543c58b 100644 --- a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt.spec +++ b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.0 +%define tde_version 14.1.1 %endif %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} diff --git a/redhat/dependencies/dbus-tqt/dbus-tqt.spec b/redhat/dependencies/dbus-tqt/dbus-tqt.spec index 2fd896c2f..a6d12a5af 100644 --- a/redhat/dependencies/dbus-tqt/dbus-tqt.spec +++ b/redhat/dependencies/dbus-tqt/dbus-tqt.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.0 +%define tde_version 14.1.1 %endif %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} diff --git a/redhat/dependencies/libart-lgpl/libart-lgpl.spec b/redhat/dependencies/libart-lgpl/libart-lgpl.spec index 039697747..ea549667f 100644 --- a/redhat/dependencies/libart-lgpl/libart-lgpl.spec +++ b/redhat/dependencies/libart-lgpl/libart-lgpl.spec @@ -19,7 +19,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.0 +%define tde_version 14.1.1 %endif %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} diff --git a/redhat/dependencies/libart-lgpl/trinity-libart-lgpl-rpmlintrc b/redhat/dependencies/libart-lgpl/trinity-libart-lgpl-rpmlintrc new file mode 100644 index 000000000..5d46238fc --- /dev/null +++ b/redhat/dependencies/libart-lgpl/trinity-libart-lgpl-rpmlintrc @@ -0,0 +1 @@ +setBadness('lto-no-text-in-archive', 0) diff --git a/redhat/dependencies/libcaldav/libcaldav.spec b/redhat/dependencies/libcaldav/libcaldav.spec index 29569afb4..f679983fe 100644 --- a/redhat/dependencies/libcaldav/libcaldav.spec +++ b/redhat/dependencies/libcaldav/libcaldav.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.0 +%define tde_version 14.1.1 %endif %define tde_pkg libcaldav %define tde_prefix /opt/trinity diff --git a/redhat/dependencies/libcarddav/libcarddav.spec b/redhat/dependencies/libcarddav/libcarddav.spec index a06752bc1..f029b9d3b 100644 --- a/redhat/dependencies/libcarddav/libcarddav.spec +++ b/redhat/dependencies/libcarddav/libcarddav.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.0 +%define tde_version 14.1.1 %endif %define tde_pkg libcarddav %define tde_prefix /opt/trinity diff --git a/redhat/dependencies/polkit-tqt/polkit-tqt.spec b/redhat/dependencies/polkit-tqt/polkit-tqt.spec index aa965f98c..d7123cd24 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.1.0 +%define tde_version 14.1.1 %endif %define tde_pkg polkit-tqt diff --git a/redhat/dependencies/pytqt/pytqt.spec b/redhat/dependencies/pytqt/pytqt.spec index a400ee336..b96c52efb 100644 --- a/redhat/dependencies/pytqt/pytqt.spec +++ b/redhat/dependencies/pytqt/pytqt.spec @@ -22,7 +22,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.0 +%define tde_version 14.1.1 %endif %define tde_pkg pytqt %define tde_prefix /opt/trinity diff --git a/redhat/dependencies/sip4-tqt/sip4-tqt.spec b/redhat/dependencies/sip4-tqt/sip4-tqt.spec index 9a4d12774..ed63e325e 100644 --- a/redhat/dependencies/sip4-tqt/sip4-tqt.spec +++ b/redhat/dependencies/sip4-tqt/sip4-tqt.spec @@ -28,7 +28,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.0 +%define tde_version 14.1.1 %endif %define tde_pkg sip4-tqt %define tde_prefix /opt/trinity diff --git a/redhat/dependencies/tde-cmake/tde-cmake.spec b/redhat/dependencies/tde-cmake/tde-cmake.spec index 71b89c4fb..ce25d61a0 100644 --- a/redhat/dependencies/tde-cmake/tde-cmake.spec +++ b/redhat/dependencies/tde-cmake/tde-cmake.spec @@ -17,7 +17,7 @@ # TDE variables %if "%{?tde_version}" == "" -%define tde_version 14.1.0 +%define tde_version 14.1.1 %endif %define tde_pkg tde-cmake diff --git a/redhat/dependencies/tqca-tls/tqca-tls.spec b/redhat/dependencies/tqca-tls/tqca-tls.spec index 567649b9a..9427f60e2 100644 --- a/redhat/dependencies/tqca-tls/tqca-tls.spec +++ b/redhat/dependencies/tqca-tls/tqca-tls.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.0 +%define tde_version 14.1.1 %endif %define tde_pkg tqca-tls %define tde_prefix /opt/trinity diff --git a/redhat/dependencies/tqca/tqca.spec b/redhat/dependencies/tqca/tqca.spec index 258b6a3c5..ca99d18ef 100644 --- a/redhat/dependencies/tqca/tqca.spec +++ b/redhat/dependencies/tqca/tqca.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.0 +%define tde_version 14.1.1 %endif %define tde_pkg tqca %define tde_prefix /opt/trinity diff --git a/redhat/dependencies/tqscintilla/tqscintilla.spec b/redhat/dependencies/tqscintilla/tqscintilla.spec index b926e184e..001aa64df 100644 --- a/redhat/dependencies/tqscintilla/tqscintilla.spec +++ b/redhat/dependencies/tqscintilla/tqscintilla.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.0 +%define tde_version 14.1.1 %endif %define tde_pkg tqscintilla diff --git a/redhat/dependencies/tqt3/tqt3.spec b/redhat/dependencies/tqt3/tqt3.spec index 4039a0c1e..c73abd7fd 100644 --- a/redhat/dependencies/tqt3/tqt3.spec +++ b/redhat/dependencies/tqt3/tqt3.spec @@ -17,7 +17,7 @@ # TDE variables %if "%{?tde_version}" == "" -%define tde_version 14.1.0 +%define tde_version 14.1.1 %endif %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} @@ -259,12 +259,11 @@ BuildRequires: mysql-devel # unixODBC support BuildRequires: unixODBC-devel -# SQLITE support -BuildRequires: sqlite-devel - # SQLITE3 support %if 0%{?mgaversion} BuildRequires: sqlite3-devel +%else +BuildRequires: sqlite-devel %endif # POSTGRESQL support @@ -737,8 +736,6 @@ before you send a bugreport. %{_includedir}/tqt3/qsql_sqlite3.h %{_includedir}/tqt3/qsqlcachedresult.h %{_includedir}/tqt3/qt_pch.h -%{_includedir}/tqt3/qtmultilineedit.h -%{_includedir}/tqt3/qttableview.h %{_includedir}/tqt3/qwindow.h %{_includedir}/tqt3/sourcetemplateiface.h %{_includedir}/tqt3/templatewizardiface.h @@ -916,8 +913,6 @@ libtqt3-headers. %{_includedir}/tqt3/ntqtstream.h %{_includedir}/tqt3/ntqwidcoll.h %{_includedir}/tqt3/ntqwindefs.h -%dir %{_docdir}/tqt3-compat-headers -%{_docdir}/tqt3-compat-headers/attic.tar.gz ########### @@ -1492,12 +1487,6 @@ done #__install -m644 -D "tools/linguist/linguist/images/appicon.png" "%{?buildroot}%{_datadir}/icons/hicolor/32x32/apps/tqlinguist.png" #__install -m644 -D "tools/qtconfig/images/appicon.png" "%{?buildroot}%{_datadir}/icons/hicolor/32x32/apps/tqtconfig.png" -# build attic package and copy it to tqt3-compat-headers -pushd src -tar cvvfz "attic.tar.gz" attic/ -install -D -m644 "attic.tar.gz" "%{?buildroot}%{_docdir}/tqt3-compat-headers/attic.tar.gz" -popd - # install the man pages %__install -d "%{?buildroot}%{_mandir}/man1" %__install -m644 "doc/man/man1/"*"embed.1" "%{?buildroot}%{_mandir}/man1/" diff --git a/redhat/dependencies/tqtinterface/tqtinterface.spec b/redhat/dependencies/tqtinterface/tqtinterface.spec index 475aeac18..e2948abea 100644 --- a/redhat/dependencies/tqtinterface/tqtinterface.spec +++ b/redhat/dependencies/tqtinterface/tqtinterface.spec @@ -22,7 +22,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.0 +%define tde_version 14.1.1 %endif %define tde_pkg tqtinterface @@ -191,7 +191,6 @@ although some code has been added for useful functions that are no longer part o %{_bindir}/moc-tqt %{_bindir}/tmoc %{_bindir}/tqt-replace -%{_bindir}/tqt-replace-stream %{_bindir}/uic-tqt %{_includedir}/tqt/ %{_libdir}/libtqt.la |