diff options
Diffstat (limited to 'redhat/dependencies/tqt3/tqt3.spec')
| -rw-r--r-- | redhat/dependencies/tqt3/tqt3.spec | 82 |
1 files changed, 36 insertions, 46 deletions
diff --git a/redhat/dependencies/tqt3/tqt3.spec b/redhat/dependencies/tqt3/tqt3.spec index 4dae6cea7..daa0c8f29 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.0.0 +%define tde_version 14.1.0 %endif %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} @@ -49,12 +49,6 @@ BuildRoot: %{_tmppath}/%{name}-%{tde_version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz Source1: build-examples.sh -Source11: tqassistant.desktop -Source12: tqdesigner.desktop -Source13: tqlinguist.desktop -Source14: tqtconfig.desktop - - BuildRequires: glibc-devel BuildRequires: gcc-c++ BuildRequires: make @@ -273,8 +267,17 @@ 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-server-devel +%else BuildRequires: postgresql-devel +%endif +%endif # Firebird support %if 0%{?mdkversion} || 0%{?mgaversion} @@ -291,12 +294,12 @@ BuildRequires: %{_lib}fbclient-devel %define with_nis 1 # RPC support -%if 0%{?fedora} >= 28 || 0%{?suse_version} >= 1500 -%if 0%{?fedora} +%if 0%{?rhel} >= 8 || 0%{?fedora} >= 28 BuildRequires: libnsl2-devel -%else -BuildRequires: libnsl-devel +BuildRequires: libtirpc-devel %endif +%if 0%{?suse_version} >= 1500 +BuildRequires: libnsl-devel BuildRequires: libtirpc-devel %endif @@ -342,9 +345,6 @@ applications. %files -n %{libtqt3}-mt %defattr(-,root,root,-) %doc FAQ LICENSE* README* changes* -%dir %{_datadir}/icons/hicolor -%dir %{_datadir}/icons/hicolor/32x32 -%dir %{_datadir}/icons/hicolor/32x32/apps %dir %{_datadir}/tqt3/ %dir %{_datadir}/tqt3/doc/ %dir %{_datadir}/tqt3/doc/html/ @@ -912,7 +912,6 @@ libtqt3-headers. %{_includedir}/tqt3/ntqrangect.h %{_includedir}/tqt3/ntqscrbar.h %{_includedir}/tqt3/ntqsocknot.h -%{_includedir}/tqt3/ntqstack.h %{_includedir}/tqt3/ntqtabdlg.h %{_includedir}/tqt3/ntqtstream.h %{_includedir}/tqt3/ntqwidcoll.h @@ -943,10 +942,7 @@ For TQt3 development, you most likely want to install this package. %{_bindir}/tquic %{_bindir}/tqmoc %{_bindir}/tqembed -%{_mandir}/man1/lupdate-tqt3.1* -%{_mandir}/man1/lrelease-tqt3.1* -%{_mandir}/man1/moc-tqt3.1* -%{_mandir}/man1/uic-tqt3.1* +%{_mandir}/man1/*.1* ########## @@ -1005,7 +1001,7 @@ or automake. %{_datadir}/tqt3/tools/tqtcreatecw/main.cpp %{_datadir}/tqt3/tools/tqtcreatecw/tqtcreatecw.pro %{_datadir}/applications/tqdesigner.desktop -%{_datadir}/icons/hicolor/32x32/apps/tqdesigner.png +%{_datadir}/pixmaps/tqdesigner.png ########### @@ -1072,7 +1068,7 @@ development files by the translator. %dir %{_docdir}/tqt3-linguist %{_docdir}/tqt3-linguist/qt_untranslated.ts %{_datadir}/applications/tqlinguist.desktop -%{_datadir}/icons/hicolor/32x32/apps/tqlinguist.png +%{_datadir}/pixmaps/tqlinguist.png ########## @@ -1097,11 +1093,10 @@ the package tqt3-apps-devel. %files -n tqt3-assistant %defattr(-,root,root,-) %{_bindir}/tqassistant -%{_datadir}/icons/hicolor/32x32/apps/tqassistant.png %{_datadir}/tqt3/doc/html/assistant*html %{_datadir}/tqt3/doc/html/assistant*dcf %{_datadir}/applications/tqassistant.desktop -%{_datadir}/icons/hicolor/32x32/apps/tqassistant.png +%{_datadir}/pixmaps/tqassistant.png ########## @@ -1124,7 +1119,7 @@ install this package. %defattr(-,root,root,-) %{_bindir}/tqtconfig %{_datadir}/applications/tqtconfig.desktop -%{_datadir}/icons/hicolor/32x32/apps/tqtconfig.png +%{_datadir}/pixmaps/tqtconfig.png ########### @@ -1264,18 +1259,14 @@ things that are possible with TQt3. %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -# Fix strange FTBFS on RHEL5 -%if 0%{?rhel} == 5 -%__sed -i "src/kernel/ntqstyle.h" -e "s|#ifdef ENABLE_T*QSTYLECONTROLELEMENTDATA_SLOW_COPY|#if 1|" -%endif - %if 0%{?suse_version} echo "suse_version = %{?suse_version}" echo "sle_version = %{?sle_version}" %endif -# Add missing sqlite3 header -%__ln_s ../src/sql/drivers/sqlite3/qsql_sqlite3.h include/qsql_sqlite3.h +%if 0%{?rhel} == 5 +%__sed -i "src/sql/drivers/mysql/qsql_mysql.cpp" -e "s|bool reconnect = 0;|my_bool reconnect = 0;|g" +%endif # fix variables in 'qmake.conf' %__sed -i mkspecs/*/qmake.conf \ @@ -1344,6 +1335,7 @@ echo yes | ./configure \ -docdir "%{_datadir}/tqt3/doc" \ -plugindir "%{_libdir}/tqt3/plugins" \ -translationdir "%{_datadir}/tqt3/translations" \ + -sysshare "%{_datadir}" \ \ -thread \ -shared \ @@ -1400,7 +1392,9 @@ echo yes | ./configure \ -v # proceed -%__make %{?_smp_mflags} sub-src sub-plugins sub-tools +%__make %{?_smp_mflags} sub-src || %__make sub-src +%__make %{?_smp_mflags} sub-plugins || %__make sub-plugins +%__make %{?_smp_mflags} sub-tools # build tqtconv2ui %__make -C tools/designer/tools/tqtconv2ui @@ -1457,12 +1451,6 @@ for i in designer/designer assistant linguist/linguist; do popd done -# desktop lnk files -%__install -m644 -D "%{SOURCE11}" "%{?buildroot}%{_datadir}/applications/tqassistant.desktop" -%__install -m644 -D "%{SOURCE12}" "%{?buildroot}%{_datadir}/applications/tqdesigner.desktop" -%__install -m644 -D "%{SOURCE13}" "%{?buildroot}%{_datadir}/applications/tqlinguist.desktop" -%__install -m644 -D "%{SOURCE14}" "%{?buildroot}%{_datadir}/applications/tqtconfig.desktop" - %if 0%{?suse_version} %suse_update_desktop_file tqassistant Documentation %suse_update_desktop_file tqdesigner GUIDesigner @@ -1471,10 +1459,10 @@ done %endif # Install applications icons -%__install -m644 -D "tools/assistant/images/appicon.png" "%{?buildroot}%{_datadir}/icons/hicolor/32x32/apps/tqassistant.png" -%__install -m644 -D "tools/designer/designer/images/designer_appicon.png" "%{?buildroot}%{_datadir}/icons/hicolor/32x32/apps/tqdesigner.png" -%__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" +#__install -m644 -D "tools/assistant/images/appicon.png" "%{?buildroot}%{_datadir}/icons/hicolor/32x32/apps/tqassistant.png" +#__install -m644 -D "tools/designer/designer/images/designer_appicon.png" "%{?buildroot}%{_datadir}/icons/hicolor/32x32/apps/tqdesigner.png" +#__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 @@ -1483,10 +1471,12 @@ install -D -m644 "attic.tar.gz" "%{?buildroot}%{_docdir}/tqt3-compat-headers/att popd # install the man pages -install -D -m644 "doc/man/man1/moc.1" "%{?buildroot}%{_mandir}/man1/moc-tqt3.1" -install -D -m644 "doc/man/man1/uic.1" "%{?buildroot}%{_mandir}/man1/uic-tqt3.1" -install -D -m644 "doc/man/man1/lrelease.1" "%{?buildroot}%{_mandir}/man1/lrelease-tqt3.1" -install -D -m644 "doc/man/man1/lupdate.1" "%{?buildroot}%{_mandir}/man1/lupdate-tqt3.1" +%__install -d "%{?buildroot}%{_mandir}/man1" +%__install -m644 "doc/man/man1/"*"embed.1" "%{?buildroot}%{_mandir}/man1/" +%__install -m644 "doc/man/man1/"*"lrelease.1" "%{?buildroot}%{_mandir}/man1/" +%__install -m644 "doc/man/man1/"*"lupdate.1" "%{?buildroot}%{_mandir}/man1/" +%__install -m644 "doc/man/man1/"*"moc.1" "%{?buildroot}%{_mandir}/man1/" +%__install -m644 "doc/man/man1/"*"uic.1" "%{?buildroot}%{_mandir}/man1/" # Install source for the designer tools, such as tqtcreatecw. cp -ra tools/designer/tools %{?buildroot}%{_datadir}/tqt3/tools |