diff options
| author | albator <albator@arcadia.vtf> | 2011-10-30 18:36:20 +0100 |
|---|---|---|
| committer | albator <albator@arcadia.vtf> | 2011-10-30 18:36:20 +0100 |
| commit | 0061571b57d37f17c074ba869a674fb774fb49b4 (patch) | |
| tree | 4e907ead034121a05cdebdfff12160eb8bc6d165 /redhat | |
| parent | f16f2e4b84cfb3bd3045ccbcab47277b01550530 (diff) | |
| download | tde-packaging-0061571b57d37f17c074ba869a674fb774fb49b4.tar.gz tde-packaging-0061571b57d37f17c074ba869a674fb774fb49b4.zip | |
TDE 3.5.13 stable release for RHEL/Fedora
Diffstat (limited to 'redhat')
35 files changed, 298 insertions, 1372 deletions
diff --git a/redhat/applications/k3b/k3b-i18n-trinity.patch b/redhat/applications/k3b/k3b-i18n-trinity.patch index 49ac8a816..0b85e98cf 100644 --- a/redhat/applications/k3b/k3b-i18n-trinity.patch +++ b/redhat/applications/k3b/k3b-i18n-trinity.patch @@ -72,3 +72,10 @@ AC_MSG_ERROR([ I can't find the designer plugins. These are required and should have been installed by kdelibs]) +@@ -1852,7 +1852,7 @@ + fi + + if test -n "$kde_widgetdir"; then +- kde_widgetdir="$kde_widgetdir/kde3/plugins/designer" ++ kde_widgetdir="$kde_widgetdir/trinity/plugins/designer" + fi diff --git a/redhat/applications/k3b/trinity-k3b-3.5.12.spec b/redhat/applications/k3b/trinity-k3b-3.5.12.spec index 423655f54..e58543d38 100644 --- a/redhat/applications/k3b/trinity-k3b-3.5.12.spec +++ b/redhat/applications/k3b/trinity-k3b-3.5.12.spec @@ -26,6 +26,9 @@ Vendor: Trinity Project Packager: Francois Andriot <francois.andriot@free.fr> URL: http://www.trinitydesktop.org/ +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + %if "%{?_prefix}" == "/usr" Obsoletes: k3b %endif @@ -33,10 +36,6 @@ Obsoletes: k3b Group: Applications/Archiving License: GPLv2+ -Prefix: %{_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - - Source0: k3b-%{version}.tar.gz Source1: k3b-i18n-1.0.5.tar.bz2 Source2: k3brc @@ -62,7 +61,7 @@ BuildRequires: dbus-qt-devel hal-devel BuildRequires: flac-devel BuildRequires: gettext BuildRequires: libdvdread-devel -%if 0%{?fedora} >= 15 || 0%{?rhel} && 0%{?rhel} <= 5 +%if 0%{?fedora} >= 15 || 0%{?rhel} <= 5 BuildRequires: libmpcdec-devel %else BuildRequires: musepack-tools-devel diff --git a/redhat/applications/k3b/trinity-k3b-3.5.13.spec b/redhat/applications/k3b/trinity-k3b-3.5.13.spec index 59ae57c8e..a40db17d6 100644 --- a/redhat/applications/k3b/trinity-k3b-3.5.13.spec +++ b/redhat/applications/k3b/trinity-k3b-3.5.13.spec @@ -2,7 +2,7 @@ %if "%{?version}" == "" %define version 3.5.13 %endif -%define release 0 +%define release 1 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -26,12 +26,16 @@ Vendor: Trinity Project Packager: Francois Andriot <francois.andriot@free.fr> URL: http://www.trinitydesktop.org/ +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + %if "%{?_prefix}" == "/usr" Obsoletes: k3b %endif Group: Applications/Archiving License: GPLv2+ + Source0: k3b-%{version}.tar.gz Source1: k3b-i18n-1.0.5.tar.bz2 Source2: k3brc @@ -53,7 +57,7 @@ BuildRequires: dbus-qt-devel hal-devel BuildRequires: flac-devel BuildRequires: gettext BuildRequires: libdvdread-devel -%if 0%{?fedora} >= 15 +%if 0%{?fedora} >= 15 || 0%{?rhel} <= 5 BuildRequires: libmpcdec-devel %else BuildRequires: musepack-tools-devel @@ -92,7 +96,9 @@ start. Summary: Common files of %{name} Group: Applications/Archiving Requires: %{name} = %{version}-%{release} +%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 BuildArch: noarch +%endif %description common %{summary}. @@ -240,5 +246,8 @@ update-desktop-database -q &> /dev/null %changelog +* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1 +- Initial release for RHEL 6, RHEL 5 and Fedora 15 + * Sun Sep 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-0 - Import to GIT diff --git a/redhat/components.txt b/redhat/components.txt index 19164cd87..03544ec7e 100644 --- a/redhat/components.txt +++ b/redhat/components.txt @@ -24,3 +24,15 @@ kdeaddons kdewebdev kde-i18n applications/k3b +applications/abakus +applications/dolphin +applications/gwenview +applications/krename +applications/yakuake +#applications/desktop-effects-kde +applications/filelight +applications/kdiff3 +#applications/kuickshow +#applications/basket +#applications/katapult +#compizconfig-backend-kconfig diff --git a/redhat/dependencies/arts/trinity-arts-3.5.13.spec b/redhat/dependencies/arts/trinity-arts-3.5.13.spec index a8e9f40c9..f0be812f9 100755 --- a/redhat/dependencies/arts/trinity-arts-3.5.13.spec +++ b/redhat/dependencies/arts/trinity-arts-3.5.13.spec @@ -1,8 +1,8 @@ # Default version for this component %if "%{?version}" == "" -%define version 1.5.10 +%define version 3.5.13 %endif -%define release 0 +%define release 1 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -120,6 +120,9 @@ cd build %changelog -* Fri Sep 02 2011 Francois Andriot <francois.andriot@free.fr> - 1.5.10-0 +* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1 +- Initial release for RHEL 6, RHEL 5 and Fedora 15 + +* Fri Sep 02 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-0 - Import to GIT - Built with future TDE version (3.5.13 + cmake + QT3.3.8d) diff --git a/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.spec b/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.spec index 8e06021d6..9a2be3b1e 100644 --- a/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.spec +++ b/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.spec @@ -2,7 +2,7 @@ %if "%{?version}" == "" %define version 3.5.13 %endif -%define release 0 +%define release 1 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -78,6 +78,9 @@ cd build %{_libdir}/pkgconfig/*.pc %changelog -* Sun Sep 02 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13pre-0 +* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1 +- Initial release for RHEL 6, RHEL 5 and Fedora 15 + +* Sun Sep 02 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13.0 - Import to GIT - Built with future TDE version (3.5.13 + cmake + QT3.3.8d) diff --git a/redhat/dependencies/libcaldav/libcaldav.spec b/redhat/dependencies/libcaldav/libcaldav.spec index 86b0f4c8b..8b505238f 100644 --- a/redhat/dependencies/libcaldav/libcaldav.spec +++ b/redhat/dependencies/libcaldav/libcaldav.spec @@ -1,6 +1,6 @@ Name: libcaldav Version: 0.6.5 -Release: 2debian2%{?dist} +Release: 2debian2.1%{?dist} Vendor: Trinity Project URL: http://www.trinitydesktop.org/ @@ -17,6 +17,7 @@ Source0: libcaldav_0.6.5-2debian2.tar.gz %if 0%{?fedora} || 0%{?rhel} >= 6 BuildRequires: libcurl-devel %else +# Specific CURL version for TDE on RHEL 5 (and older) BuildRequires: trinity-libcurl-devel %endif @@ -67,5 +68,5 @@ autoreconf --force --install --symlink %Changelog -* Fri Oct 21 2011 Francois Andriot <francois.andriot@free.fr> - 0.6.5-2debian2 -- Initial build for RHEL 6.0 +* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.6.5-2debian2.1 +- Initial build for RHEL 6, RHEL 5, and Fedora 15 diff --git a/redhat/dependencies/libcarddav/libcarddav.spec b/redhat/dependencies/libcarddav/libcarddav.spec index ed1ce2a70..a2e8c7310 100644 --- a/redhat/dependencies/libcarddav/libcarddav.spec +++ b/redhat/dependencies/libcarddav/libcarddav.spec @@ -1,6 +1,6 @@ Name: libcarddav Version: 0.6.2 -Release: 2debian2%{?dist} +Release: 2debian2.1%{?dist} Vendor: Trinity Project URL: http://www.trinitydesktop.org/ @@ -66,5 +66,5 @@ autoreconf --force --install --symlink %Changelog -* Fri Oct 21 2011 Francois Andriot <francois.andriot@free.fr> - 0.6.5-2debian2 -- Initial build for RHEL 6.0 +* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.6.5-2debian2 .1 +- Initial build for RHEL 6, RHEL 5, and Fedora 15 diff --git a/redhat/dependencies/qt3/qt3.spec b/redhat/dependencies/qt3/qt3.spec index 07485596d..e57d598b5 100644 --- a/redhat/dependencies/qt3/qt3.spec +++ b/redhat/dependencies/qt3/qt3.spec @@ -14,16 +14,21 @@ %define _default_patch_fuzz 2 -Summary: The shared library for the Qt 3 GUI toolkit -Version: %{?version} -Release: 0%{?dist} Name: qt3 -Obsoletes: qt < 1:%{version}-%{release} -Provides: qt = 1:%{version}-%{release} +Version: %{?version} +Release: 1%{?dist} +Summary: The shared library for the Qt 3 GUI toolkit + License: QPL or GPLv2 or GPLv3 Group: System Environment/Libraries +URL: http://www.trinitydesktop.org/ +#Url: http://www.troll.no + +Obsoletes: qt < 1:%{version}-%{release} +Provides: qt = 1:%{version}-%{release} + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Url: http://www.troll.no + #Source0: ftp://ftp.troll.no/qt/source/qt-x11-free-3.3.8b.tar.gz Source0: %{name}-%{version}.tar.gz Source2: qt.sh @@ -695,1233 +700,7 @@ rm -rf %{buildroot} %changelog -* Fri Sep 02 2011 Francois Andriot <francois.andriot@free.fr> - 3.3.8d-0 +* Fri Sep 02 2011 Francois Andriot <francois.andriot@free.fr> - 3.3.8d-1 +- Initial build for RHEL 6, RHEL 5, and Fedora 15 - Switch to Trinity Version - -* Wed Jun 30 2010 Than Ngo <than@redhat.com> - 3.3.8b-29 -- Resolves: bz#605106, XML validity issue, fno-strict-aliasing - -* Thu Sep 10 2009 Than Ngo <than@redhat.com> - 3.3.8b-28 -- drop support fedora < 10 - -* Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.3.8b-27 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Fri May 15 2009 Rex Dieter <rdieter@fedoraproject.org> - 3.3.8b-26 -- arm patch - -* Thu Apr 16 2009 Rex Dieter <rdieter@fedoraproject.org> - 3.3.8b-25 -- move designer plugins to runtime (#487622) - -* Fri Apr 10 2009 Than Ngo <than@redhat.com> - 3.3.8b-24 -- unneeded executable permissions for profile.d scripts - -* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.3.8b-23 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Tue Feb 24 2009 Than Ngo <than@redhat.com> - 3.3.8b-22 -- fix build problem against new unixODBC - -* Wed Feb 04 2009 Rex Dieter <rdieter@fedoraproject.org> 3.3.8b-21 -- unowned %%qt_docdir (#483441) - -* Mon Feb 02 2009 Rex Dieter <rdieter@fedoraproject.org> 3.3.8b-20 -- unowned dirs (#483441) - -* Sat Jan 31 2009 Karsten Hopp <karsten@redhat.com> 3.3.8b-19 -- s390x is 64bit, s390 is 32bit. Fixed in /etc/profile.d/qt.* - -* Thu Jan 22 2009 Rex Dieter <rdieter@fedoraproject.org> 3.3.8b-18 -- respin (mysql) - -* Wed Oct 08 2008 Than Ngo <than@redhat.com> 3.3.8b-17 -- update qt-x11-immodule-unified-qt3 patch - -* Tue Sep 30 2008 Than Ngo <than@redhat.com> 3.3.8b-16 -- mv translations in main package (bz#448761) - -* Sat Sep 20 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> - 3.3.8b-15 -- set _default_patch_fuzz (fixes FTBFS) - -* Mon Jul 07 2008 Rex Dieter <rdieter@fedoraproject.org> - 3.3.8b-14 -- QTDIR isn't set in ppc64 buildroot (#454313) -- /etc/profile.d/qt.sh leaks variable ARCH (#454260) - -* Fri May 23 2008 Than Ngo <than@redhat.com> - 3.3.8b-13 -- fix rh#448027, qt3's PATH not set properly unless qt3-devel is installed - -* Wed Apr 02 2008 Than Ngo <than@redhat.com> - 3.3.8b-12 -- get rid of 0088-fix-xinput-clash.diff, it's fixed in - new xorg-x11-proto-7.3-11 - -* Mon Mar 17 2008 Than Ngo <than@redhat.com> 3.3.8b-11 -- fix obsolete/provides of version/release - -* Thu Mar 13 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> 3.3.8b-10 -- fix %{?epoch:%{epoch}:} idiom not to add a ':' after it - -* Wed Mar 12 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> 3.3.8b-9 -- rename to qt3 on Fedora >= 9 - -* Tue Mar 11 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> 3.3.8b-8 -- prepare for rename to qt3 on Fedora >= 9 (not enabled yet) -- add Provides and Obsoletes everywhere -- update summaries and descriptions -- remove dots at end of Summary tags -- fix non-UTF-8 characters - -* Tue Mar 11 2008 Than Ngo <than@redhat.com> 3.3.8b-7 -- 0088-fix-xinput-clash.diff, fix compile errors with Xmd.h - -* Fri Mar 07 2008 Than Ngo <than@redhat.com> 3.3.8b-6 -- move qt.[c]sh in main package (#221000) - -* Mon Feb 18 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> 3.3.8b-5 -- fix buildkey for GCC 4.3 (#433235) - -* Mon Feb 11 2008 Than Ngo <than@redhat.com> 3.3.8b-4 -- rebuild for GCC 4.3 - -* Thu Jan 24 2008 Than Ngo <than@redhat.com> 3.3.8b-3 -- add LICENSE.GPL2/GPL3 - -* Thu Jan 24 2008 Than Ngo <than@redhat.com> 3.3.8b-2 -- License: GPLv2 or GPLv3 -- merged in 3.3.8b -> drop following patches: - * qt-3.3.6-fontrendering-punjabi-209970.patch - * qt-3.3.6-fontrendering-or_IN-209098.patch - * qt-3.3.6-fontrendering-gu-228451.patch - * qt-font-default-subst.diff - * 0076-fix-qprocess.diff - * 0082-fix-qdatetime-fromstring.diff - * qt-x11-free-3.3.8-bz#243722-mysql.patch - * qt3-CVE-2007-3388.patch - * utf8-bug-qt3-CVE-2007-0242.diff - * qt-3.3.6-bz#292941-CVE-2007-4137.patch - -* Wed Jan 23 2008 Than Ngo <than@redhat.com> 3.3.8b-1 -- update to 3.3.8b, fix License - -* Mon Nov 26 2007 Than Ngo <than@redhat.com> 3.3.8-11 -- add Provides: qt3 = %%version-%%release - -* Wed Nov 7 2007 Stepan Kasal <skasal@redhat.com> - 3.3.8-10 -- rh#239216, fix a typo in qt-config description - -* Thu Oct 04 2007 Than Ngo <than@redhat.com> - 3.3.8-9 -- rh#309091, qt should provide %%{qtdir}/plugins/styles -- rh#276521, qt-copy patches 0079, 0080, 0082 and 0084 - -* Mon Sep 17 2007 Than Ngo <than@redhat.com> - 3.3.8-8 -- CVE-2007-4137 - -* Wed Aug 29 2007 Than Ngo <than@redhat.com> - 1:3.3.8-7.fc7.1 -- CVE-2007-0242 - -* Tue Aug 28 2007 Than Ngo <than@redhat.com> - 1:3.3.8-7 -- CVE-2007-3388 qt3 format string flaw -- backport to fix #bz243722, bz#244148, Applications using qt-mysql crash if database is - removed before QApplication is destroyed -- cleanup desktop files - -* Mon Apr 23 2007 Than Ngo <than@redhat.com> - 1:3.3.8-5.fc7 -- apply patch to fix fontrendering problem in gu_IN #228451,#228452 - -* Wed Apr 11 2007 Than Ngo <than@redhat.com> - 1:3.3.8-4.fc7 -- adjust qt-3.3.8-fontrendering-as_IN-209972.patch and - qt-3.3.8-fontrendering-#214570.patch for qt-3.3.8 - -* Mon Apr 02 2007 Than Ngo <than@redhat.com> - 1:3.3.8-3.fc7 -- apply patches to fix - Qt UTF-8 overlong sequence decoding vulnerability - QPopupMenu aware of Xinerama - a regression in QProgress::writeToStdin() - -* Tue Mar 27 2007 Than Ngo <than@redhat.com> 1:3.3.8-2.fc7 -- enable tablet support - -* Mon Mar 19 2007 Than Ngo <than@redhat.com> 1:3.3.8-1.fc7 -- update to 3.3.8 - -* Wed Dec 06 2006 Than Ngo <than@redhat.com> - 1:3.3.7-2.fc7 -- Resolves: bz#214371, bn_IN font rendering -- Resolves: bz#217657, ml_IN issue with cursor position -- Resolves: bz#217638, regression bug in qt -- Resolves: bz#209974, Vowel position set properly -- Resolves: bz#214570, Rendering is not fine for 'RA' 09B0 - -* Thu Nov 09 2006 Than Ngo <than@redhat.com> 1:3.3.7-1.fc6 -- update to 3.3.7 -- fix #209097, ml_IN font rendering -- fix #209970, pa font rendering -- fix #209098, or_IN font rendering -- fix #209972, as_IN font rendering -- fix #209975, bn_IN font rendering -- fix #211259, te_IN font rendering -- fix #211436, as_IN font rendering - thanks Sachin Tawniya, LingNing Zhang for the fixes -- move html files to devel -- add sqlite plugin -- fix #189012, qt settings should be readable for other - -* Thu Aug 31 2006 Than Ngo <than@redhat.com> 1:3.3.6-13 -- add missing desktop files - -* Mon Jul 17 2006 Than Ngo <than@redhat.com> 1:3.3.6-12 -- rebuild - -* Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 1:3.3.6-11.1 -- rebuild - -* Mon Jul 10 2006 Than Ngo <than@redhat.com> 1:3.3.6-11 -- apply upstream patches, fix arabic fonts issue, and - problems with missing minimum size when richtext - labels are used - -* Thu Jun 29 2006 Than Ngo <than@redhat.com> 1:3.3.6-10 -- apply patch from Lars, fixes Qt 3.3.6 for Arabic fonts - -* Wed Jun 28 2006 Than Ngo <than@redhat.com> 1:3.3.6-9 -- fix #183302, IM preedit issue in kbabel - -* Mon Jun 26 2006 Than Ngo <than@redhat.com> 1:3.3.6-8 -- rebuilt - -* Thu Jun 08 2006 Than Ngo <than@redhat.com> 1:3.3.6-7 -- fix utf8 issue in changelog -- fix #195410, don't strip binaries/libraries -- fix #156572, keyReleaseEvent issue - -* Mon Jun 05 2006 Than Ngo <than@redhat.com> 1:3.3.6-6 -- qt-devel requires on mesa-libGLU-devel mesa-libGU-devel - -* Tue May 16 2006 Than Ngo <than@redhat.com> 1:3.3.6-5 -- fix #191895, BR libXmu-devel -- disable warnings if debug is off - -* Mon May 15 2006 Than Ngo <than@redhat.com> 1:3.3.6-4 -- fix multilib issue - -* Tue May 09 2006 Than Ngo <than@redhat.com> 1:3.3.6-3 -- add subpackage qt-devel-docs #191099 - -* Thu Apr 13 2006 Than Ngo <than@redhat.com> 1:3.3.6-2 -- fix xorg prefix #188510 - -* Mon Mar 20 2006 Than Ngo <than@redhat.com> 1:3.3.6-1 -- update to 3.3.6 -- adapt qt-x11-immodule-unified-qt3.3.5-20060318 to qt-3.3.6 -- remove set of fixes for the immodule patch, included in qt-x11-immodule-unified-qt3.3.5-20060318 -- remove 0051-qtoolbar_77047.patch, qt-x11-free-3.3.4-assistant_de.patch, - qt-x11-free-3.3.5-warning.patch, included in new upstream - - -* Mon Feb 27 2006 Than Ngo <than@redhat.com> 1:3.3.5-13 -- add set of fixes for the immodule patch, thanks to Dirk Müller - -* Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 1:3.3.5-12.2 -- bump again for double-long bug on ppc(64) - -* Tue Feb 07 2006 Jesse Keating <jkeating@redhat.com> - 1:3.3.5-12.1 -- rebuilt for new gcc4.1 snapshot and glibc changes - -* Tue Jan 17 2006 Than Ngo <than@redhat.com> 1:3.3.5-12 -- add BuildRequires on mesa-libGL-devel - -* Wed Dec 21 2005 Than Ngo <than@redhat.com> 1:3.3.5-11 -- BuildRequires on libXt-devel/xorg-x11-proto-devel - -* Fri Dec 09 2005 Jesse Keating <jkeating@redhat.com> -- rebuilt - -* Sun Nov 13 2005 Than Ngo <than@redhat.com> 1:3.3.5-10 -- workaround for keyboard input action in KHotKeys - -* Tue Nov 08 2005 Than Ngo <than@redhat.com> 1:3.3.5-9 -- fix for modular X - -* Tue Nov 08 2005 Than Ngo <than@redhat.com> 1:3.3.5-8 -- get rid of xorg-x11-devel, fix for modular X - -* Tue Oct 25 2005 Than Ngo <than@redhat.com> 1:3.3.5-7 -- update qt-x11-immodule-unified-qt3.3.5-20051012-quiet.patch - -* Mon Oct 24 2005 Than Ngo <than@redhat.com> 1:3.3.5-6 -- update qt-x11-immodule-unified-qt3.3.5-20051018.diff -- remove unneeded qt-x11-immodule-unified-qt3.3.5-20051012-build.patch - -* Thu Oct 13 2005 Than Ngo <than@redhat.com> 1:3.3.5-5 -- update qt-x11-immodule-unified-qt3.3.5-20051012 -- disable some debug messages -- apply patch to fix build problem with the new immodule patch - -* Tue Sep 27 2005 Than Ngo <than@redhat.com> 1:3.3.5-4 -- apply patch to fix gcc warnings - -* Mon Sep 26 2005 Than Ngo <than@redhat.com> 1:3.3.5-3 -- export QTINC/QTLIB, thanks to Rex Dieter (#169132) - -* Tue Sep 20 2005 Than Ngo <than@redhat.com> 1:3.3.5-2 -- German translation of the Qt Assistent #161558 -- add uic workaround - -* Sun Sep 11 2005 Than Ngo <than@redhat.com> 1:3.3.5-1 -- update to 3.3.5 - -* Mon Aug 22 2005 Than Ngo <than@redhat.com> 1:3.3.4-22 -- apply upstream patch to fix kmail folder selector #166430 - -* Mon Aug 15 2005 Than Ngo <than@redhat.com> 1:3.3.4-21 -- fix gcc4 build problem - -* Wed Aug 10 2005 Than Ngo <than@redhat.com> 1:3.3.4-20 -- apply missing patches - -* Wed Aug 10 2005 Than Ngo <than@redhat.com> 1:3.3.4-19 -- apply patch to fix wrong K menu width, #165510 - -* Mon Aug 01 2005 Than Ngo <than@redhat.com> 1:3.3.4-18 -- add visibility patch - -* Wed Jul 20 2005 Than Ngo <than@redhat.com> 1:3.3.4-17 -- fix German translation of the Qt Assistent #161558 - -* Mon Jun 27 2005 Than Ngo <than@redhat.com> 1:3.3.4-16 -- apply patch to fix Rendering for Punjabii, thanks to Trolltech #156504 - -* Tue May 24 2005 Than Ngo <than@redhat.com> 1:3.3.4-15 -- add better fix for #156977, thanks to trolltech -- apply patch to fix keyReleaseEvent problem #156572 - -* Wed May 18 2005 Than Ngo <than@redhat.com> 1:3.3.4-14 -- apply patch to use ecvt, fcvt (thanks to Jakub) -- fix a bug in printing of postscript #156977 - -* Wed May 18 2005 Than Ngo <than@redhat.com> 1:3.3.4-13 -- rebuild - -* Thu Apr 14 2005 Than Ngo <than@redhat.com> 1:3.3.4-12 -- fix bad symlink #154086 - -* Wed Apr 13 2005 Than Ngo <than@redhat.com> 1:3.3.4-11 -- remove bad symlink #154086 -- built with PostgresSQL 8.0.2 - -* Wed Mar 23 2005 Than Ngo <than@redhat.com> 1:3.3.4-10 -- add GtkStyle patch from Peter Backlund #141125 - -* Fri Mar 04 2005 Than Ngo <than@redhat.com> 1:3.3.4-9 -- fix buildkey issue with gcc-4 - -* Fri Mar 04 2005 Than Ngo <than@redhat.com> 1:3.3.4-8 -- rebuilt against gcc-4.0.0-0.31 - -* Tue Mar 01 2005 Than Ngo <than@redhat.com> 1:3.3.4-7 -- fix build problem with gcc4 - -* Mon Feb 28 2005 Than Ngo <than@redhat.com> 1:3.3.4-6 -- rebuilt against gcc-4 - -* Tue Feb 22 2005 Than Ngo <than@redhat.com> 1:3.3.4-5 -- fix application crash when input methode not available (bug #140658) -- remove .moc/.obj -- add qt-copy patch to fix KDE #80072 - -* Fri Feb 11 2005 Than Ngo <than@redhat.com> 1:3.3.4-4 -- update qt-x11-immodule-unified patch - -* Thu Feb 10 2005 Than Ngo <than@redhat.com> 1:3.3.4-3 -- fix rpm file conflict - -* Wed Feb 02 2005 Than Ngo <than@redhat.com> 1:3.3.4-2 -- remove useless doc files #143949 -- fix build problem if installman is disable #146311 -- add missing html/examples/tutorial symlinks - -* Fri Jan 28 2005 Than Ngo <than@redhat.com> 1:3.3.4-1 -- update to 3.3.4 -- adapt many patches to qt-3.3.4 -- drop qt-x11-free-3.3.0-freetype, qt-x11-free-3.3.3-qmake, qt-x11-free-3.3.1-lib64 - qt-x11-free-3.3.3-qimage, which are included in new upstream - -* Tue Nov 30 2004 Than Ngo <than@redhat.com> 1:3.3.3-16 -- add sql macro - -* Mon Nov 29 2004 Than Ngo <than@redhat.com> 1:3.3.3-15 -- convert qdial.3qt to UTF-8 bug #140946 - -* Tue Nov 23 2004 Than Ngo <than@redhat.com> 1:3.3.3-14 -- add missing lupdate and lrelease #140230 - -* Fri Nov 19 2004 Than Ngo <than@redhat.com> 1:3.3.3-13 -- apply patch to fix qinputcontext - -* Thu Nov 11 2004 Than Ngo <than@redhat.com> 1:3.3.3-12 -- link against MySQL 3 -- fix rpm conflict - -* Wed Nov 10 2004 Than Ngo <than@redhat.com> 1:3.3.3-11 -- apply patch to fix fullscreen problem -- remove html documents duplicate #135696 - -* Tue Nov 02 2004 Than Ngo <than@redhat.com> 1:3.3.3-10 -- rebuilt - -* Tue Nov 02 2004 Than Ngo <than@redhat.com> 1:3.3.3-9 -- remove unused patch -- set XIMInputStyle=On The Spot -- require xorg-x11-devel instead XFree86-devel - -* Thu Oct 14 2004 Than Ngo <than@redhat.com> 1:3.3.3-8 -- don't compress examples/tutorial - -* Thu Oct 07 2004 Than Ngo <than@redhat.com> 1:3.3.3-7 -- fix build problem without qt immodule #134918 - -* Tue Sep 28 2004 Than Ngo <than@redhat.com> 1:3.3.3-6 -- fix font problem, bz #133578 - -* Tue Sep 14 2004 Than Ngo <than@redhat.com> 1:3.3.3-4 -- update new immodule patch -- fix multilib problem #132516 - -* Wed Aug 18 2004 Than Ngo <than@redhat.com> 1:3.3.3-3 -- add patch to fix dlopen issue (#126422) -- add image handling fix - -* Thu Aug 12 2004 Than Ngo <than@redhat.com> 1:3.3.3-2 -- fix qmake broken link (#129723) - -* Wed Aug 11 2004 Than Ngo <than@redhat.com> 1:3.3.3-1 -- update to 3.3.3 release - -* Thu Jul 01 2004 Than Ngo <than@redhat.com> 1:3.3.2-10 -- add immodule for Qt - -* Tue Jun 29 2004 Than Ngo <than@redhat.com> 1:3.3.2-9 -- add sub package config, allow multi lib installation (#126643) - -* Thu Jun 24 2004 Than Ngo <than@redhat.com> 1:3.3.2-8 -- add fontconfig fix for qfontdatabase, #123868 -- fix some buildrequires problem, #125289 -- fix dangling symlink, #125351 -- get rid of backup files - -* Tue Jun 15 2004 Elliot Lee <sopwith@redhat.com> 1:3.3.2-7 -- rebuilt - -* Tue May 25 2004 Than Ngo <than@redhat.com> 1:3.3.2-5 -- add missing qembed tool #124052, #124052 -- get rid of unused trigger -- add qt.conf in ld.so.conf.d -> don't change ld.so.conf #124080 - -* Wed May 12 2004 Than Ngo <than@redhat.com> 1:3.3.2-4 -- backport some qt patches, Symbol font works again - -* Mon May 10 2004 Than Ngo <than@redhat.com> 1:3.3.2-3 -- fixed annoying warning - -* Tue May 04 2004 Than Ngo <than@redhat.com> 1:3.3.2-2 -- fix broken symlink at qt document, bug #121652 - -* Thu Apr 29 2004 Than Ngo <than@redhat.com> 3.3.2-1 -- update to 3.3.2 - -* Thu Apr 22 2004 Than Ngo <than@redhat.com> 3.3.1-1 -- add cvs backport -- fix lib64 issue, #121052 -- fix CJK font display, bug #121017, #120542, thanks to Leon Ho -- compress tutorial/examples - -* Fri Mar 26 2004 Than Ngo <than@redhat.com> 3.3.1-0.8 -- fixed symlinks issue, #117572 - -* Thu Mar 25 2004 Than Ngo <than@redhat.com> 3.3.1-0.7 -- add Trolltech patch, fix dpi setting issue - -* Tue Mar 23 2004 Than Ngo <than@redhat.com> 3.3.1-0.6 -- add 0034-qclipboard_recursion_fix.patch from CVS, #118368 -- add better qt-x11-free-3.3.1-fontdatabase.patch - -* Sun Mar 07 2004 Than Ngo <than@redhat.com> 1:3.3.1-0.5 -- disable smpflags - -* Fri Mar 05 2004 Than Ngo <than@redhat.com> 1:3.3.1-0.4 -- fix font alias - -* Thu Mar 04 2004 Than Ngo <than@redhat.com> 1:3.3.1-0.3 -- add fontdatabase fix from Trolltech - -* Thu Mar 04 2004 Than Ngo <than@redhat.com> 1:3.3.1-0.2 -- fix wrong symlink #117451 - -* Tue Mar 02 2004 Elliot Lee <sopwith@redhat.com> -- rebuilt - -* Mon Mar 01 2004 Than Ngo <than@redhat.com> 3.3.1-0.1 -- update to 3.3.1 - -* Mon Feb 23 2004 Than Ngo <than@redhat.com> 3.3.0-0.4 -- add fix for building with freetype 2.1.7 or newer - -* Tue Feb 17 2004 Than Ngo <than@redhat.com> 3.3.0-0.3 -- enable IPv6 support -- use dlopen, instead of linking with OpenGL libraries directly -- don't install backup files - -* Thu Feb 05 2004 Than Ngo <than@redhat.com> 1:3.3.0-0.2 -- fix fontdatabase -- don't use strip in install script -- fix qt default setting - -* Wed Feb 04 2004 Than Ngo <than@redhat.com> 1:3.3.0-0.1 -- 3.3.0 - -* Fri Jan 30 2004 Than Ngo <than@redhat.com> 1:3.2.3-0.4 -- add mouse patch from CVS, bug #114647 - -* Tue Jan 20 2004 Than Ngo <than@redhat.com> 1:3.2.3-0.3 -- rebuild - -* Tue Dec 2 2003 Than Ngo <than@redhat.com> 1:3.2.3-0.2 -- Added missing prl files, (report from trolltech) -- Fixed description -- include requires XFree86-devel on qt-devel - -* Fri Nov 14 2003 Than Ngo <than@redhat.com> 1:3.2.3-0.1 -- 3.2.3 release - -* Thu Oct 30 2003 Than Ngo <than@redhat.com> 1:3.2.2-0.4 -- fix encoding problem - -* Sat Oct 18 2003 Than Ngo <than@redhat.com> 1:3.2.2-0.3 -- fix encoding problem - -* Fri Oct 17 2003 Than Ngo <than@redhat.com> 1:3.2.2-0.2 -- add font alias patch file, thanks to Leon Ho -- clean up monospace.patch from Leon Ho -- remove some unneeded patch files - -* Thu Oct 16 2003 Than Ngo <than@redhat.com> 1:3.2.2-0.1 -- 3.2.2 release -- remove a patch file, which is included in 3.2.2 - -* Tue Oct 14 2003 Than Ngo <than@redhat.com> 1:3.2.1-1.3 -- remove some unneeded patch files -- don't load XLFDs if XFT2 is used - -* Mon Sep 08 2003 Than Ngo <than@redhat.com> 1:3.2.1-1.2 -- fixed rpm file list - -* Tue Sep 02 2003 Than Ngo <than@redhat.com> 1:3.2.1-1.1 -- fix for the khtml form lineedit bug from CVS - -* Wed Aug 27 2003 Than Ngo <than@redhat.com> 1:3.2.1-1 -- 3.2.1 release - -* Wed Jul 23 2003 Than Ngo <than@redhat.com> 1:3.2.0-1 -- 3.2.0 release - -* Mon Jun 23 2003 Than Ngo <than@redhat.com> 3.2.0b2-0.1 -- 3.2.0b2 -- add missing templates for designer - -* Wed Jun 18 2003 Than Ngo <than@redhat.com> 3.2.0b1-0.2 -- clean up specfile - -* Wed Jun 18 2003 Than Ngo <than@redhat.com> 3.2.0b1-0.1 -- 3.2.0b1 - -* Tue Jun 17 2003 Than Ngo <than@redhat.com> 3.1.2-12 -- rebuilt - -* Tue Jun 17 2003 Than Ngo <than@redhat.com> 3.1.2-10 -- add missing translations - -* Wed Jun 11 2003 Elliot Lee <sopwith@redhat.com> -- rebuilt - -* Wed Jun 04 2003 Elliot Lee <sopwith@redhat.com> -- rebuilt - -* Mon May 19 2003 Than Ngo <than@redhat.com> 3.1.2-7 -- add some patches from KDE CVS qt-copy, thanks to Alexei Podtelezhnikov - -* Mon May 5 2003 Than Ngo <than@redhat.com> 3.1.2-5.1 -- set correct permission config scripts - -* Tue Apr 29 2003 Than Ngo <than@redhat.com> 3.1.2-4 -- fix typo bug in font loader - -* Wed Apr 9 2003 Than Ngo <than@redhat.com> 3.1.2-2 -- add xrandr extension - -* Mon Mar 3 2003 Than Ngo <than@redhat.com> 3.1.2-1 -- 3.1.2 release - -* Mon Feb 17 2003 Elliot Lee <sopwith@redhat.com> 3.1.1-7 -- ppc64 support - -* Wed Jan 29 2003 Than Ngo <than@redhat.com> 3.1.1-6 -- add missing Categories section in qt designer #82920 - -* Wed Jan 22 2003 Tim Powers <timp@redhat.com> -- rebuilt - -* Mon Dec 30 2002 Florian La Roche <Florian.LaRoche@redhat.de> -- Change qmlined.h to not include an attic header that is also not shipped - with Red Hat Linux. This also fixes building unixODBC, that includes this - header (apparently also without needing it). - -* Thu Dec 19 2002 Than Ngo <than@redhat.com> 3.1.1-3 -- add monospace patch file from Leon Ho (bug #79949) -- add small patch file from Sysoltsev Slawa (bug #79731) - -* Tue Dec 17 2002 Than Ngo <than@redhat.com> 3.1.1-2 -- don't require XFree86, it's not needed - -* Tue Dec 17 2002 Than Ngo <than@redhat.com> 3.1.1-1 -- update to 3.1.1 - -* Thu Nov 28 2002 Than Ngo <than@redhat.com> 3.1.0-1.3 -- don't write Date into created moc files - -* Mon Nov 18 2002 Than Ngo <than@redhat.com> 3.1.0-1.2 -- add missing libs -- remove workaround for ppc - -* Sun Nov 17 2002 Than Ngo <than@redhat.com> 3.1.0-1.1 -- adjust qfontdatabase_x11 for 3.1.0 -- fix lib64 issue -- add workaround to build on ppc - -* Wed Nov 13 2002 Than Ngo <than@redhat.com> 3.1.0-1 -- update to 3.1.0 -- adjust some patch files for 3.1.0 -- clean up specfile -- remove some Xft2 patch files, which are now in 3.1.0 -- add qwidget_x11.cpp.diff from Trolltech -- install qt in %%{_libdir}/qt-3.1 (bug #77706) -- don't use rpath -- enable large file support -- use system Xinerama -- remove unneeded cups patch file -- fix to build against new XFree86 - -* Tue Nov 5 2002 Than Ngo <than@redhat.com> 3.0.5-19 -- examples misconfigured (bug #76083) -- don't include pkg-config (bug #74621) -- fix build problem with new XFree86 - -* Tue Sep 17 2002 Than Ngo <than@redhat.com> 3.0.5-18 -- Fixed binaries symlinks - -* Mon Sep 9 2002 Than Ngo <than@redhat.com> 3.0.5-17hammer -- clean up spec file for 64bit machine - -* Thu Aug 29 2002 Than Ngo <than@redhat.com> 3.0.5-17 -- Fixed rpath issue (bug #69692, #69575) -- Removed dlopen patch -- Added monospace alias patch from Leon Ho (bug #72811) -- Added man pages - -* Sun Aug 25 2002 Than Ngo <than@redhat.com> 3.0.5-16 -- Added missing catagory in qt designer -- Added small gb18030 patch file from Leon Ho - -* Thu Aug 22 2002 Bernhard Rosenkraenzer <bero@redhat.com> 3.0.5-15 -- Prereq fileutils (#71500) - -* Tue Aug 20 2002 Bernhard Rosenkraenzer <bero@redhat.com> 3.0.5-14 -- Don't link to libstdc++, it isn't used -- Work around s390 compiler bug (fpic/fPIC coexistance) -- Do away with the "Feature Bluecurve already defined" warning message -- Remove qmake cache files from the package - -* Wed Aug 14 2002 Than Ngo <than@redhat.com> 3.0.5-13 -- Added fix to use VT100 graphic characters (bug #71364) -- Added fontdatabase fix from llch@redhat.com (bug #68353) - -* Mon Aug 12 2002 Bernhard Rosenkraenzer <bero@redhat.com> [not built] -- Fix default qtrc - -* Mon Aug 12 2002 Bernhard Rosenkraenzer <bero@redhat.com> 3.0.5-12 -- Fix CJK Printing (#71123) - -* Sun Aug 11 2002 Bernhard Rosenkraenzer <bero@redhat.com> 3.0.5-11 -- Move qtconfig from qt-devel to qt, it's generally useful -- Use -fno-use-cxa-atexit -- Some tweaks to allow building Qt/Embedded with the same spec file -- Apply the GB18030 patch even if xft2 isn't set - -* Fri Aug 9 2002 Than Ngo <than@redhat.com> 3.0.5-10 -- Added XIM patch from llch@redhat.com (bug #70411) - -* Sun Aug 4 2002 Than Ngo <than@redhat.com> 3.0.5-9 -- add a missing patch file (closelock/openlock) - -* Thu Aug 1 2002 Bernhard Rosenkraenzer <bero@redhat.com> 3.0.5-8 -- Define QT_INSTALL_PREFIX in qmake - -* Thu Aug 1 2002 Bernhard Rosenkraenzer <bero@redhat.com> 3.0.5-7 -- Find correct location of qmake mkspecs even if QTDIR isn't set - -* Thu Jul 25 2002 Than Ngo <than@redhat.com> 3.0.5-6 -- Check file descriptor before closelock -* Thu Jul 25 2002 Than Ngo <than@redhat.com> 3.0.5-5 -- Fixed a bug in openlock - -* Wed Jul 24 2002 Than Ngo <than@redhat.com> 3.0.5-4 -- Tiny tweaks to qt3 patch - -* Tue Jul 23 2002 Owen Taylor <otaylor@redhat.com> -- Tiny fix to qt3.diff to not add '0' as a test character (#68964) - -* Mon Jul 22 2002 Tim Powers <timp@redhat.com> 3.0.5-2 -- rebuild using gcc-3.2-0.1 - -* Mon Jul 22 2002 Than Ngo <than@redhat.com> 3.0.5-1 -- 3.0.5 -- Fixed dependencies issue - -* Thu Jul 18 2002 Than Ngo <than@redhat.com> 3.0.4-12 -- Added qt-clipfix from Harald Hoyer (bug #67648) - -* Tue Jul 16 2002 Than Ngo <than@redhat.com> 3.0.4-11 -- get rid of qt resource, it's now in redhat-artworks -- add some define to build for 7.3 - -* Thu Jul 11 2002 Than Ngo <than@redhat.com> 3.0.4-10 -- add missing Buildprequires desktop-file-utils -- add patches for GB18030 (llch@redhat.com) bug #68430 - -* Tue Jul 09 2002 Than Ngo <than@redhat.com> 3.0.4-9 -- add new desktop file for qt designer - -* Fri Jul 5 2002 Jakub Jelinek <jakub@redhat.com> 3.0.4-8 -- compile libXinerama.a with -fpic in Qt until XFree86 is fixed -- make %%xft2 work even if old Xft headers aren't installed - -* Fri Jun 21 2002 Tim Powers <timp@redhat.com> -- automated rebuild - -* Tue Jun 18 2002 Bernhard Rosenkraenzer <bero@redhat.com> 3.0.4-6 -- Re-enable Xft2 now that fontconfig is fixed -- Require a version of fontconfig that works -- Use -fPIC rather than -fpic on alpha - -* Tue Jun 18 2002 Bernhard Rosenkraenzer <bero@redhat.com> 3.0.4-5 -- Revert to Xft1 for now, Xft2 is too unstable -- Exclude alpha for now to work around binutils bugs - -* Tue Jun 11 2002 Bernhard Rosenkraenzer <bero@redhat.com> 3.0.4-4 -- Add (and fix up) fontconfig patch - -* Mon Jun 3 2002 Bernhard Rosenkraenzer <bero@redhat.com> 3.0.4-3 -- Remove the glweak patch, it isn't needed after dropping XFree86 3.x - -* Thu May 23 2002 Tim Powers <timp@redhat.com> -- automated rebuild - -* Sun May 5 2002 Bernhard Rosenkraenzer <bero@redhat.com> 3.0.4-1 -- 3.0.4 -- Make SQL plugins optional (buildtime) -- Register with pkgconfig - -* Thu May 02 2002 Than Ngo <than@redhat.com> 3.0.3-12 -- qtdir /usr/lib/qt3 -- build against gcc-3.1-0.26 -- add qt-3.0.3-glweak.patch - -* Wed Apr 17 2002 Bernhard Rosenkraenzer <bero@redhat.com> 3.0.3-11 -- qt3-gcc2.96 should be in qt, not qt-devel - -* Mon Apr 15 2002 Bernhard Rosenkraenzer <bero@redhat.com> 3.0.3-10 -- Tweaks to allow parallel installations of Qt 3.x (gcc 2.96) and Qt 3.x - (gcc 3.1) -- Fix up debug spewage at Qt designer startup - -* Wed Apr 10 2002 Bernhard Rosenkraenzer <bero@redhat.com> 3.0.3-9 -- Spec file fixes - -* Wed Apr 10 2002 Bernhard Rosenkraenzer <bero@redhat.com> 3.0.3-8 -- Get rid of non-threaded version, dlopen()'ing threaded code - (like plugins) from non-threaded code is dangerous -- Add some fixes from qt-copy, fixing the ksplash crash some people - have noticed on a first login -- Add translation fixes from CVS -- Patch example .pro files to build outside the Qt source tree (#63023) -- Fix various bugs - -* Thu Apr 04 2002 Leon Ho <llch@redhat.com> 3.0.3-7 -- fixes for CJK - qpsprinter -- fixes for CJK - gb18030 - -* Fri Mar 29 2002 Bernhard Rosenkraenzer <bero@redhat.com> 3.0.3-6 -- Make sure it builds with both gcc 2.96 and 3.1 - -* Wed Mar 28 2002 Leon Ho <llch@redhat.com> 3.0.3-5 -- fixes for CJK - qpsprinter - -* Wed Mar 27 2002 Bernhard Rosenkraenzer <bero@redhat.com> 3.0.3-4 -- Add CJK patches - -* Tue Mar 26 2002 Than Ngo <than@redhat.com> 3.0.3-3 -- fix loading kde styles - -* Tue Mar 19 2002 Bernhard Rosenkraenzer <bero@redhat.com> 3.0.3-1 -- Update to 3.0.3 final - -* Thu Mar 14 2002 Bernhard Rosenkraenzer <bero@redhat.com> 3.0.3-0.cvs20020314.1 -- Update to 3.0.3-pre, required for KDE3 -- force -fPIC usage -- Remove conflict with qt2 < 2.3.2-1, the new qt2 2.3.1 is fixed and qt 2.3.2 - is broken -- Ship the qmake config files (so qmake works for building any 3rd party stuff, - e.g. aethera) - -* Wed Mar 6 2002 Bernhard Rosenkraenzer <bero@redhat.com> 3.0.2-2 -- Add some fixes from KDE's qt-copy CVS -- Pluginize image formats - -* Mon Feb 25 2002 Bernhard Rosenkraenzer <bero@redhat.com> 3.0.2-1 -- 3.0.2 final - -* Tue Feb 19 2002 Bernhard Rosenkraenzer <bero@redhat.com> 3.0.2-0.cvs20020118.3 -- Add GB18030 codec patch, #60034 -- Force-build jpeg support, fixing #59775 and #59795 - -* Sat Jan 26 2002 Bernhard Rosenkraenzer <bero@redhat.com> 3.0.2-0.cvs20020118.2 -- Build with CUPS support - -* Fri Jan 18 2002 Bernhard Rosenkraenzer <bero@redhat.com> 3.0.2-0.cvs20020118.1 -- Fix up /usr/bin/moc links, they should point to qt3 - -* Mon Jan 14 2002 Bernhard Rosenkraenzer <bero@redhat.com> 3.0.2-0.cvs20020114.1 -- Build styles directly into the main library for now, there's too much broken - code out there depending on this ATM. - -* Wed Jan 9 2002 Bernhard Rosenkraenzer <bero@redhat.com> 3.0.2-0.cvs20020109.1 -- Stop excluding alpha, gcc has been fixed - -* Tue Jan 8 2002 Bernhard Rosenkraenzer <bero@redhat.com> 3.0.2-0.cvs20020108.1 -- Add fixes from CVS; this fixes the "Alt + F1, arrow up, arrow up doesn't work - in KDE" bug - -* Mon Dec 17 2001 Bernhard Rosenkraenzer <bero@redhat.com> 3.0.1-2 -- Fix up settings search path -- Add default qtrc allowing to use KDE 3.x Qt plugins -- Make sure QLibrary uses RTLD_GLOBAL when dlopen()ing libraries - -* Thu Dec 13 2001 Bernhard Rosenkraenzer <bero@redhat.com> 3.1.0-1 -- Work around gcc bug #57467 - -* Wed Dec 12 2001 Bernhard Rosenkraenzer <bero@redhat.com> -- 3.0.1 final - -* Mon Dec 10 2001 Bernhard Rosenkraenzer <bero@redhat.com> 3.0.1-0.cvs20011210.1 -- Update to current (needed by KDE 3.x) -- Rebuild with current libstdc++ -- Temporarily disable building on alpha -- Fix build with PostgreSQL 7.2 - -* Mon Nov 26 2001 Bernhard Rosenkraenzer <bero@redhat.com> 3.0.0-5 -- Fix up glweak - -* Mon Nov 5 2001 Bernhard Rosenkraenzer <bero@redhat.com> 3.0.0-4 -- Give designer, uic, moc, etc. their real names - the qt2 versions - have been renamed in qt2-2.3.2-1. - Conflict with qt2 < 2.3.2-1. - -* Thu Oct 25 2001 Bernhard Rosenkraenzer <bero@redhat.com> 3.0.0-3 -- Add symlink /usr/lib/qt-3.0.0 -> /usr/lib/qt3 and set QTDIR to the - symlink, allowing to update to 3.0.1 without breaking rpath'ed binaries - -* Tue Oct 16 2001 Bernhard Rosenkraenzer <bero@redhat.com> 3.0.0-1 -- 3.0.0 final -- fix some minor specfile bugs -- Modularize some more (image format plugins) -- Build codecs - -* Tue Sep 18 2001 Bernhard Rosenkraenzer <bero@redhat.com> 3.0.0-0.beta5.1 -- beta5 -- Share more code between qt-x11 and qt-embedded builds - -* Wed Aug 29 2001 Bernhard Rosenkraenzer <bero@redhat.com> 3.0.0-0.beta4.1 -- beta4 -- build the Motif style directly into Qt rather than as a plugin - Qt should - always have at least one style... -- replace the designer3 symlink with a shell script that sets QTDIR correctly - before launching designer -- Add desktop file for designer - -* Mon Aug 6 2001 Tim Powers <timp@redhat.com> 3.0.0-0.beta3.4 -- explicitly include qm2ts, qmake, qtconfig in the devel package file list to avoid dangling symlinks - -* Thu Aug 2 2001 Bernhard Rosenkraenzer <bero@redhat.com> 3.0.0-0.beta3.3 -- Try yet another workaround for buildsystem breakages - -* Tue Jul 31 2001 Bernhard Rosenkraenzer <bero@redhat.com> -- Add another ugly workaround for build system problems, this should finally - get rid of the dangling symlinks - -* Tue Jul 31 2001 Bernhard Rosenkraenzer <bero@redhat.com> 3.0.0-0.beta3.2 -- Rephrase parts of the spec file, hopefully pleasing the build system - -* Sun Jul 29 2001 Bernhard Rosenkraenzer <bero@redhat.com> 3.0.0-0.beta3.1 -- beta3 -- Fix dangling symlinks - -* Sun Jun 24 2001 Bernhard Rosenkraenzer <bero@redhat.com> 3.0.0-0.beta1.2 -- Fix up QSQL Postgres classes for Postgres 7.1.x -- Fix various bugs: - - QtMultilineEdit and QtTableView should actually compile - - Link libqsqlpsql with libpq - - Don't link the base library with libmysqlclient, linking the MySQL - module with it is sufficient -- Add missing const qualifier -- move the SQL drivers to separate packages to avoid dependencies -- build and install designer plugins - converting glade files to Qt is fun. ;) -- handle RPM_OPT_FLAGS - -* Tue May 22 2001 Bernhard Rosenkraenzer <bero@redhat.com> 3.0.0-0.beta1.1 -- 3.0 beta 1 - -* Wed May 16 2001 Bernhard Rosenkraenzer <bero@redhat.com> 3.0.0-0.cvs20010516.1 -- Update, remove conflicts with Qt 2.x - -* Mon May 14 2001 Bernhard Rosenkraenzer <bero@redhat.com> 3.0.0-0.cvs20010514.1 -- Initial build of 3.0 branch - -* Fri Apr 27 2001 Bernhard Rosenkraenzer <bero@redhat.com> 2.3.0-6 -- Fix crashes on ia64, Patch from Bill Nottingham <notting@redhat.com> -- Allow building qt-nox - -* Fri Apr 20 2001 Bernhard Rosenkraenzer <bero@redhat.com> 2.3.0-5 -- Make sure uic and designer use the libqui from the source tree, not - a previously installed one. - Linking uic-x11 against libqui-embedded is definitely not a feature. ;) -- The qclipboard fix is needed for qt-x11 only, don't apply it if we're - building qt-embedded - -* Sat Apr 14 2001 Bernhard Rosenkraenzer <bero@redhat.com> -- Handle LPRng specific constructs in printcap, Bug #35937 - -* Sun Mar 25 2001 Florian La Roche <Florian.LaRoche@redhat.de> -- add qfont patch from Trolltech - -* Tue Mar 13 2001 Harald Hoyer <harald@redhat.de> -- added patch for '@euro' language settings - -* Tue Mar 6 2001 Bernhard Rosenkraenzer <bero@redhat.com> -- 2.3.0 final -- BuildRequires XFree86-devel >= 4.0.2 (#30486) - -* Mon Feb 26 2001 Than Ngo <than@redhat.com> -- fix check_env function, so that qt does not crash if QT_XFT is not set -- fix symlinks - -* Mon Feb 26 2001 Bernhard Rosenkraenzer <bero@redhat.com> -- 2.3.0b1 -- Add a patch to qpsprinter that handles TrueType fonts even if they come from xfs - -* Tue Feb 13 2001 Preston Brown <pbrown@redhat.com> -- japanese input and clipboard fixes applied. Changes have been sent upstream by patch authors. - -* Fri Feb 9 2001 Bernhard Rosenkraenzer <bero@redhat.com> -- Rebuild with new Mesa to get rid of pthreads linkage -- Add Xft fix from KDE CVS - -* Wed Feb 7 2001 Bernhard Rosenkraenzer <bero@redhat.com> -- Add printing bugfix patch from Trolltech - -* Sat Feb 3 2001 Bernhard Rosenkraenzer <bero@redhat.com> -- 2.2.4 -- Qt Embedded: Add QVfb and VNC support - -* Tue Jan 16 2001 Bernhard Rosenkraenzer <bero@redhat.com> -- Don't segfault when running Qt/Embedded applications as root -- Improve the Qt/Embedded sparc patch so we don't need the specfile hacks - anymore -- Fix a bug in QPrintDialog (causing KDE Bug #18608) - -* Thu Jan 11 2001 Bernhard Rosenkraenzer <bero@redhat.com> -- bzip2 source to save space -- Qt/Embedded 2.2.3 -- Fix qte build on sparc - -* Wed Dec 20 2000 Bernhard Rosenkraenzer <bero@redhat.com> -- Run ldconfig in %%post and %%postun for qt-Xt - -* Sun Dec 17 2000 Bernhard Rosenkraenzer <bero@redhat.com> -- Build with the Xrender extension - (Patch from Keith Packard <keithp@keithp.com>) - -* Wed Dec 13 2000 Bernhard Rosenkraenzer <bero@redhat.com> -- 2.2.3 - -* Tue Dec 12 2000 Bernhard Rosenkraenzer <bero@redhat.com> -- Rebuild to fix permissions on doc dir -- Don't exclude ia64 anymore - -* Fri Nov 17 2000 Bernhard Rosenkraenzer <bero@redhat.com> -- Fix up uic (Patch from trolltech) - -* Wed Nov 15 2000 Bernhard Rosenkraenzer <bero@redhat.com> -- Build qt-embedded - changes to base: fix build, fix ISO C99 compliance, fix 64bit support - -* Mon Nov 13 2000 Bernhard Rosenkraenzer <bero@redhat.com> -- 2.2.2 - -* Tue Oct 24 2000 Than Ngo <than@redhat.com> -- call ldconfig for updating (Bug #19687) -- added patch from Trolltech, thanks to Rainer <rms@trolltech.com> - -* Wed Oct 18 2000 Bernhard Rosenkraenzer <bero@redhat.com> -- Add missing msg2qm, msgmerge, qconfig tools (Bug #18997), introduced - by broken Makefiles in base -- fix up %%install so it works both with old-style and new-style fileutils - (fileutils <= 4.0z don't know about -L) - -* Fri Oct 13 2000 Bernhard Rosenkraenzer <bero@redhat.com> -- Disable exception handling; this speeds up KDE 2.x and reduces its - memory footprint by 20 MB. - -* Tue Oct 10 2000 Bernhard Rosenkraenzer <bero@redhat.com> -- dereference symlinks in include - -* Sun Oct 8 2000 Bernhard Rosenkraenzer <bero@redhat.com> -- fix -devel -- update to the new version of 2.2.1 on trolltech.com; the initial tarball - contained broken docs - -* Thu Oct 5 2000 Bernhard Rosenkraenzer <bero@redhat.com> -- 2.2.1 - -* Mon Sep 25 2000 Bernhard Rosenkraenzer <bero@redhat.com> -- Add missing uic - -* Thu Sep 21 2000 Bernhard Rosenkraenzer <bero@redhat.com> -- Move Qt designer to a different source RPM to get rid of a - circular dependency (kdelibs2->qt, qt->kdelibs2) -- Enable MNG support -- Don't compile (just include) examples and tutorials -- move the static libraries to a separate package (qt-static). - They're HUGE, and most people won't ever need them. -- clean up spec file -- fix up dependencies (-devel requires base, -static requires devel, - Xt requires base) -- add BuildRequires line - -* Tue Sep 12 2000 Than Ngo <than@redhat.com> -- update release 2.2.0 -- changed copyright to GPL -- added missing static libraries -- made symbolic link for designer to load the help files correct -- made designer and designer-kde2 as sub packages -- added missing templates for designer -- remove jakub patch, since the release 2.2.0 already - contains this patch. -- fixed qt again to compile with gcc-2.96 -- use make -j for building - -* Wed Aug 23 2000 Bernhard Rosenkraenzer <bero@redhat.com> -- Work around compiler bugs (Patch from Jakub) -- Use relative symlinks (Bug #16750) - -* Mon Aug 21 2000 Bernhard Rosenkraenzer <bero@redhat.com> -- beta2 - -* Mon Aug 14 2000 Bernhard Rosenkraenzer <bero@redhat.com> -- new qt-copy from KDE2 CVS - -* Wed Aug 9 2000 Bernhard Rosenkraenzer <bero@redhat.com> -- official beta 1 - -* Thu Aug 3 2000 Than Ngo <than@redhat.de> -- rebuilt against the libpng-1.0.8 - -* Thu Jul 27 2000 Bernhard Rosenkraenzer <bero@redhat.com> -- rebuild (so we have it on all arches) - -* Tue Jul 25 2000 Bernhard Rosenkraenzer <bero@redhat.com> -- move man pages to a more reasonable place (this fixes Bug #14126) -- exclude ia64 for now (compiler problems!!!) - -* Mon Jul 24 2000 Harald Hoyer <harald@redhat.de> -- modified connect patch to fit qt 2.2.0 beta. - -* Thu Jul 20 2000 Bernhard Rosenkraenzer <bero@redhat.com> -- update to current qt-copy; this is now a qt 2.2.0 beta. - -* Mon Jul 17 2000 Bernhard Rosenkraenzer <bero@redhat.com> -- update to current qt-copy in kde CVS, required - -* Wed Jul 12 2000 Prospector <bugzilla@redhat.com> -- automatic rebuild - -* Sun Jul 11 2000 Harald Hoyer <harald@redhat.de> -- made patch smaller and binary compatible when recompiled with 6.2 -- modified connect and moc to cope with the new g++ class layout - -* Sun Jul 09 2000 Than Ngo <than@redhat.de> -- rebuilt qt with gcc-2.96-34 - -* Fri Jul 07 2000 Than Ngo <than@redhat.de> -- rebuilt qt with c++ 2.96 - -* Mon Jul 3 2000 Bernhard Rosenkraenzer <bero@redhat.com> -- Fix dependancies - -* Sun Jul 2 2000 Bernhard Rosenkraenzer <bero@redhat.com> -- Use egcs++ for now ** FIXME - -* Wed Jun 28 2000 Preston Brown <pbrown@redhat.com> -- fix up qt.sh - -* Sun Jun 25 2000 Bernhard Rosenkraenzer <bero@redhat.com> -- Build in jpeg and threading support -- Fix a bug in clipboard pasting code - -* Wed Jun 07 2000 Preston Brown <pbrown@redhat.com> -- fix qt.{sh,csh} -- use new rpm macro paths -- package man pages - -* Fri Jun 2 2000 Bill Nottingham <notting@redhat.com> -- build without optimization on ia64 - -* Mon May 29 2000 Bernhard Rosenkraenzer <bero@redhat.com> -- 2.1.1 - -* Thu May 18 2000 Florian La Roche <Florian.LaRoche@redhat.com> -- recompile with correct libstdc++ - -* Thu Apr 13 2000 Bernhard Rosenkraenzer <bero@redhat.com> -- 2.1.0 final - -* Wed Apr 5 2000 Bernhard Rosenkraenzer <bero@redhat.com> -- beta4 -- depend on libGL.so.1 rather than Mesa - XFree86 4.0 provides that - lib, too - -* Wed Mar 22 2000 Bernhard Rosenkraenzer <bero@redhat.com> -- beta3 - -* Tue Mar 7 2000 Bernhard Rosenkraenzer <bero@redhat.com> -- beta2 -- fix compilation of the NSPlugin add-on - -* Fri Mar 3 2000 Bill Nottingham <notting@redhat.com> -- fix %postun script - -* Fri Feb 18 2000 Bernhard Rosenkränzer <bero@redhat.com> -- beta1 -- get rid of qt-ImageIO, the functionality is now in the main Qt library -- remove qt-Network, the functionality is now in the main Qt library -- add changes-2.1.0 to %doc - -* Thu Feb 17 2000 Preston Brown <pbrown@redhat.com> -- no refcount check on postun script, we want it to happen even on upgrades - -* Thu Feb 10 2000 Bernhard Rosenkraenzer <bero@redhat.com> -- new snapshot, should fix QWhatsThisButton -- remove executable permissions from *.pro files - -* Mon Feb 07 2000 Preston Brown <pbrown@redhat.com> -- strip binaries in examples, tutorial - -* Mon Jan 31 2000 Bernhard Rosenkraenzer <bero@redhat.com> -- new snapshot - should fix the hotkey bug -- Fix up the Makefiles so it compiles - -* Tue Jan 18 2000 Bernhard Rosenkraenzer <bero@redhat.com> -- new snapshot - we need those QVariant fixes - -* Thu Jan 13 2000 Bernhard Rosenkraenzer <bero@redhat.com> -- switch from glxMesa to Mesa for the GL addon - -* Wed Jan 5 2000 Bernhard Rosenkränzer <bero@redhat.com> -- Fix up dependencies -- new snapshot - -* Mon Jan 3 2000 Ngo Than <than@redhat.de> -- new snapshot for Red Hat Linux 6.2 -- increase version number - -* Mon Dec 20 1999 Bernhard Rosenkraenzer <bero@redhat.com> -- new snapshot -- handle RPM_OPT_FLAGS - -* Mon Dec 13 1999 Bernhard Rosenkraenzer <bero@redhat.com> -- new snapshot -- -GL requires libGL.so.1 instead of Mesa (might as well be glxMesa - or some commercial OpenGL) -- -GL BuildPrereqs /usr/X11R6/include/GL/gl.h instead of Mesa-devel - (might as well be glxMesa or some commercial OpenGL) - -* Sun Dec 05 1999 Bernhard Rosenkraenzer <bero@redhat.com> -- update to current RSYNC version -- remove compilation patch - it finally works out of the box - -* Wed Oct 27 1999 Bernhard Rosenkraenzer <bero@redhat.com> -- update to current CVS snapshot -- build extensions -- add patch to fix QNetwork compilation - -* Sun Oct 24 1999 Bernhard Rosenkraenzer <bero@redhat.de> -- current CVS snapshot -- fix compilation with gcc 2.95.x -- use install -c rather than just install to make BSD install happy - -* Mon Oct 11 1999 Bernhard Rosenkraenzer <bero@redhat.de> -- 2.1.0 snapshot (for KDE2) -- Fix typo in spec - -* Thu Sep 23 1999 Preston Brown <pbrown@redhat.com> -- don't ship tutorial or example binaries - -* Tue Sep 21 1999 Preston Brown <pbrown@redhat.com> -- substitution in tutorial and examples so that dependencies are correct and - they can be successfully rebuilt. -- switched to completely using QTDIR. trying to coexist with links into - /usr/{include,lib} and still compile with qt 1.x is very hard for - configure scripts to cope with. - -* Thu Aug 19 1999 Preston Brown <pbrown@redhat.com> -- implemented QTDIR compatibility. - -* Tue Jul 20 1999 Preston Brown <pbrown@redhat.com> -- qt 2.0.1 packaged. - -* Wed Jul 14 1999 Preston Brown <pbrown@redhat.com> -- Qt 2.00 packaged. -- examples, html documentation, tutorial moved to /usr/doc - -* Sat Apr 17 1999 Preston Brown <pbrown@redhat.com> -- static library supplied in dev package. - -* Wed Apr 07 1999 Preston Brown <pbrown@redhat.com> -- turn on internal GIF reading support - -* Tue Apr 06 1999 Preston Brown <pbrown@redhat.com> -- strip binaries - -* Mon Mar 15 1999 Preston Brown <pbrown@redhat.com> -- upgrade to qt 1.44. - -* Wed Feb 24 1999 Preston Brown <pbrown@redhat.com> -- Injected new description and group. - -* Tue Jan 19 1999 Preston Brown <pbrown@redhat.com> -- moved includes to /usr/include/qt - -* Mon Jan 04 1999 Preston Brown <pbrown@redhat.com> -- made setup phase silent. - -* Fri Dec 04 1998 Preston Brown <pbrown@redhat.com> -- upgraded to qt 1.42, released today. - -* Tue Dec 01 1998 Preston Brown <pbrown@redhat.com> -- took Arnts RPM and made some minor changes for Red Hat. +- Spec file based on RHEL 6 'qt3-3.3.8b-29' diff --git a/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.spec b/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.spec index d1a56fa18..6f65fa7bf 100755 --- a/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.spec +++ b/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.spec @@ -2,7 +2,7 @@ %if "%{?version}" == "" %define version 3.5.13 %endif -%define release 0 +%define release 1 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -80,18 +80,14 @@ cd build %__mkdir_p %{?buildroot}%{_includedir} %__make install DESTDIR=%{?buildroot} -C build -# RHEL 5: add newline at end of include files +# RHEL 5: add newline at end of include files to avoid warnings %if 0%{?rhel} && 0%{?rhel} <= 5 for i in %{?buildroot}%{_includedir}/*.h; do echo "" >>${i} done %endif -# Fix 'tqt.pc': UIC executable is not correct -#sed -i %{?buildroot}%{_libdir}/pkgconfig/tqt.pc \ -# -e '/^uic_executable=.*/ s,^\(uic_executable=\).*,\1%{_bindir}/uic-tqt,' - -# Install 'cmake' modules for a specific package (for later use) +# 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} @@ -113,6 +109,9 @@ done %changelog +* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1 +- Initial release for RHEL 6, RHEL 5 and Fedora 15 + * Sun Aug 28 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-0 - Import to GIT - Built with future TDE version (3.5.13 + cmake + QT3.3.8d) diff --git a/redhat/genrpm.sh b/redhat/genrpm.sh index 1a57dd898..4fca9b93e 100755 --- a/redhat/genrpm.sh +++ b/redhat/genrpm.sh @@ -21,7 +21,7 @@ EOF exit 1 fi -select COMP in $( cut -f1 "components.txt" ) ; do +select COMP in $( cut -f1 "components.txt" | grep -v "^#" ) ; do # Gets package version from 'components.txt' file VERSION=$( awk '{ if ($1 == "'${COMP}'") { print $2; } }' components.txt ) diff --git a/redhat/gentarball.sh b/redhat/gentarball.sh index 9715cffd0..76d902fd5 100755 --- a/redhat/gentarball.sh +++ b/redhat/gentarball.sh @@ -15,7 +15,7 @@ EOF ##### CHOOSE A TDE COMPONENT ##### PS3="Enter number: " -select COMP in $( cut -f1 components.txt ) ; do +select COMP in $( cut -f1 components.txt | grep -v "^#" ) ; do ARCHIVEDIR="${PWD}/${COMP}" [ -d "${ARCHIVEDIR}" ] || mkdir -p "${ARCHIVEDIR}" @@ -67,6 +67,7 @@ select COMP in $( cut -f1 components.txt ) ; do ;; "qt3") echo "Extracting '${COMP}' from GIT ..." + ARCHIVENAME="qt3-3.3.8d.tar.gz" git clone http://scm.trinitydesktop.org/scm/git/tde; mv tde/main/dependencies/qt3 . ;; *) diff --git a/redhat/kde-i18n/trinity-kde-i18n-3.5.13.spec b/redhat/kde-i18n/trinity-kde-i18n-3.5.13.spec index 0fe1bfc89..3783612a7 100644 --- a/redhat/kde-i18n/trinity-kde-i18n-3.5.13.spec +++ b/redhat/kde-i18n/trinity-kde-i18n-3.5.13.spec @@ -2,7 +2,7 @@ %if "%{?version}" == "" %define version 3.5.13 %endif -%define release 0 +%define release 1 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -1224,26 +1224,11 @@ rm -rf %{buildroot} %endif %changelog -* Mon Sep 19 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-7 -- Add support for RHEL5 +* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1 +- Initial release for RHEL 6, RHEL 5 and Fedora 15 -* Sun Sep 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-6 -- Re-introduce all languages - -* Wed Aug 24 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-5 -- Re-introduce all languages - -* Mon Aug 22 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-4 -- Correct macro to install under "/opt", if desired - -* Thu Jul 21 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-3 -- Add 'Patch1': translation for 'Open Terminal Here...' background shortcut - -* Sun Dec 19 2010 Francois Andriot <francois.andriot@free.fr> - 3.5.12-2 -- Rebuilt - -* Sun Dec 19 2010 Francois Andriot <francois.andriot@free.fr> - 3.5.12-0 +* Sun Dec 19 2010 Francois Andriot <francois.andriot@free.fr> - 3.5.13-0 - Initial version (French language only) - Based on RHEL SPEC file 'kde-i18n' - Add 'patch0' to reflect modifications in 'kdesu' from 'kdebase' package - +- Import to GIT diff --git a/redhat/kdeaccessibility/trinity-kdeaccessibility-3.5.13.spec b/redhat/kdeaccessibility/trinity-kdeaccessibility-3.5.13.spec index e582df583..e996a7261 100644 --- a/redhat/kdeaccessibility/trinity-kdeaccessibility-3.5.13.spec +++ b/redhat/kdeaccessibility/trinity-kdeaccessibility-3.5.13.spec @@ -2,7 +2,7 @@ %if "%{?version}" == "" %define version 3.5.13 %endif -%define release 0 +%define release 1 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -184,7 +184,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %changelog +* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1 +- Initial release for RHEL 6, RHEL 5 and Fedora 15 + * Sun Sep 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-0 -- Initial build for RHEL 6 -- Spec file based on Fedora 8 "kdeaccessibility-3.5.10-1" - Import to GIT +- Spec file based on Fedora 8 "kdeaccessibility-3.5.10-1" diff --git a/redhat/kdeaddons/trinity-kdeaddons-3.5.13.spec b/redhat/kdeaddons/trinity-kdeaddons-3.5.13.spec index d5cb516b9..b5ed3eda0 100644 --- a/redhat/kdeaddons/trinity-kdeaddons-3.5.13.spec +++ b/redhat/kdeaddons/trinity-kdeaddons-3.5.13.spec @@ -2,7 +2,7 @@ %if "%{?version}" == "" %define version 3.5.13 %endif -%define release 0 +%define release 1 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -38,8 +38,6 @@ Source2: metabarrc Patch3: kdeaddons-3.5.3-sdl.patch -Patch100: svn.patch - BuildRequires: trinity-kdebase-devel BuildRequires: trinity-kdegames-devel BuildRequires: trinity-kdemultimedia-devel @@ -86,8 +84,6 @@ This package includes: %patch3 -p1 -b .sdl -%patch100 -p2 - # Ugly hack to modify TQT include directory inside autoconf files. # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! sed -i admin/acinclude.m4.in \ @@ -252,6 +248,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||: %changelog -* Sat Oct 29 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-3 -- Initial build for RHEL 6 +* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1 +- Initial release for RHEL 6, RHEL 5 and Fedora 15 + +* Sat Oct 29 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-0 +- Import to GIT diff --git a/redhat/kdeadmin/trinity-kdeadmin-3.5.13.spec b/redhat/kdeadmin/trinity-kdeadmin-3.5.13.spec index 3fa5b78a5..abc5006ca 100644 --- a/redhat/kdeadmin/trinity-kdeadmin-3.5.13.spec +++ b/redhat/kdeadmin/trinity-kdeadmin-3.5.13.spec @@ -2,7 +2,7 @@ %if "%{?version}" == "" %define version 3.5.13 %endif -%define release 0 +%define release 1 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -193,6 +193,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %changelog -* Fri Oct 29 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-0 -- Initial build for RHEL 6 +* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1 +- Initial release for RHEL 6, RHEL 5 and Fedora 15 + +* Fri Oct 28 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-0 +- Import to GIT diff --git a/redhat/kdeartwork/trinity-kdeartwork-3.5.13.spec b/redhat/kdeartwork/trinity-kdeartwork-3.5.13.spec index 1f48d1611..3603f7378 100644 --- a/redhat/kdeartwork/trinity-kdeartwork-3.5.13.spec +++ b/redhat/kdeartwork/trinity-kdeartwork-3.5.13.spec @@ -2,7 +2,7 @@ %if "%{?version}" == "" %define version 3.5.13 %endif -%define release 0 +%define release 1 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -42,7 +42,11 @@ Source1: webcollagerc BuildRequires: gettext BuildRequires: trinity-kdebase-devel BuildRequires: nas-devel esound-devel jack-audio-connection-kit-devel +%if 0%{?rhel} > 5 || 0%{?fedora} >= 15 BuildRequires: xscreensaver +%else +BuildRequires: gnome-screensaver +%endif %if "%{?with_libart}" == "1" BuildRequires: libart_lgpl-devel %endif @@ -176,5 +180,8 @@ done %changelog +* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1 +- Initial release for RHEL 6, RHEL 5 and Fedora 15 + * Sun Sep 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-0 - Import to GIT diff --git a/redhat/kdebase/trinity-kdebase-3.5.13.spec b/redhat/kdebase/trinity-kdebase-3.5.13.spec index 70285a44c..fa2c9bf38 100755 --- a/redhat/kdebase/trinity-kdebase-3.5.13.spec +++ b/redhat/kdebase/trinity-kdebase-3.5.13.spec @@ -2,7 +2,7 @@ %if "%{?version}" == "" %define version 3.5.13 %endif -%define release 0 +%define release 1 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -41,8 +41,6 @@ Source0: kdebase-%{version}.tar.gz # Wrapper script to prevent Plasma launch at Trinity Startup Source1: plasma-desktop -Patch100: svn.patch - # TDE for RHEL/Fedora specific patches # [kdebase/kdesu] Remove 'ignore' button on 'kdesu' dialog box Patch3: kdebase-3.5.13-kdesu-noignorebutton.patch @@ -162,8 +160,6 @@ Protocol handlers (KIOslaves) for personal information management, including: %patch5 -p1 %patch6 -p1 -%patch100 -p1 - %build unset QTDIR || : ; . /etc/profile.d/qt.sh @@ -223,7 +219,7 @@ mv -f %{?buildroot}%{_sysconfdir}/ksysguarddrc %{?buildroot}%{_sysconfdir}/ksysg # TDE 3.5.12: add script "plasma-desktop" to avoid conflict with KDE4 %if "%{?_prefix}" != "/usr" -%{__cp} -f "%{SOURCE1}" "%{?buildroot}%{_bindir}" +%__cp -f "%{SOURCE1}" "%{?buildroot}%{_bindir}" %endif %clean @@ -489,6 +485,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %{_datadir}/cmake/*.cmake %changelog -* Sat Sep 03 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12.99-0 +* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1 +- Initial release for RHEL 6, RHEL 5 and Fedora 15 + +* Sat Sep 03 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-0 - Import to GIT - Use TDE 3.5.13, cmake, QT3.3.3.8d diff --git a/redhat/kdebindings/trinity-kdebindings-3.5.13.spec b/redhat/kdebindings/trinity-kdebindings-3.5.13.spec index d395d44fb..7b1b74f69 100644 --- a/redhat/kdebindings/trinity-kdebindings-3.5.13.spec +++ b/redhat/kdebindings/trinity-kdebindings-3.5.13.spec @@ -2,7 +2,7 @@ %if "%{?version}" == "" %define version 3.5.13 %endif -%define release 0 +%define release 1 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -29,11 +29,10 @@ Vendor: Trinity Project Packager: Francois Andriot <francois.andriot@free.fr> URL: http://www.trinitydesktop.org/ -Source0: kdebindings-%{version}.tar.gz - Prefix: %{_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Source0: kdebindings-%{version}.tar.gz # RedHat Legacy patches (from Fedora) Patch1: kdebindings-3.5.6-libgcj.patch @@ -257,8 +256,8 @@ update-desktop-database >& /dev/null ||: # Excludes 'kjscmd' (conflicts with 'kdelibs' from RHEL6) %if "%{?_prefix}" == "/usr" %exclude %{_bindir}/kjscmd -%exclude %{_mandir}/man1/kjscmd* %endif +%exclude %{_mandir}/man1/kjscmd* %files dcopperl -f %{name}-dcopperl.list @@ -278,6 +277,9 @@ update-desktop-database >& /dev/null ||: %{ruby_arch}/*.la %changelog -* Sat Sep 03 2011 Francois Andriot <francois.andriot@free.fr - 3.5.12.99.20110903-0 +* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1 +- Initial release for RHEL 6, RHEL 5 and Fedora 15 + +* Sat Sep 03 2011 Francois Andriot <francois.andriot@free.fr - 3.5.13-0 - Import to GIT - Built with future TDE version (3.5.13 + cmake + QT3.3.8d) diff --git a/redhat/kdeedu/trinity-kdeedu-3.5.13.spec b/redhat/kdeedu/trinity-kdeedu-3.5.13.spec index 72f8e2c72..26730e4db 100644 --- a/redhat/kdeedu/trinity-kdeedu-3.5.13.spec +++ b/redhat/kdeedu/trinity-kdeedu-3.5.13.spec @@ -2,7 +2,7 @@ %if "%{?version}" == "" %define version 3.5.13 %endif -%define release 0 +%define release 1 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -34,8 +34,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: kdeedu-%{version}.tar.gz -Patch100: svn.patch - Provides: kdeedu3 = %{version}-%{release} Requires(post): /sbin/ldconfig @@ -98,8 +96,6 @@ Requires: %{name} = %{version}-%{release} %prep %setup -q -n kdeedu -%patch100 -p1 - # Ugly hack to modify TQT include directory inside autoconf files. # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! sed -i admin/acinclude.m4.in \ @@ -234,5 +230,8 @@ update-desktop-database >& /dev/null ||: %changelog +* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1 +- Initial release for RHEL 6, RHEL 5 and Fedora 15 + * Sat Sep 09 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-0 -- Initial build for RHEL 6 +- Import to GIT diff --git a/redhat/kdegames/trinity-kdegames-3.5.13.spec b/redhat/kdegames/trinity-kdegames-3.5.13.spec index 14d8d0f55..97e64fb35 100644 --- a/redhat/kdegames/trinity-kdegames-3.5.13.spec +++ b/redhat/kdegames/trinity-kdegames-3.5.13.spec @@ -2,7 +2,7 @@ %if "%{?version}" == "" %define version 3.5.13 %endif -%define release 0 +%define release 1 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -192,5 +192,8 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %changelog +* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1 +- Initial release for RHEL 6, RHEL 5 and Fedora 15 + * Sat Sep 09 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-0 -- Initial build for RHEL 6 +- Import to GIT diff --git a/redhat/kdegraphics/kdegraphics-3.5.13-disable_poppler.patch b/redhat/kdegraphics/kdegraphics-3.5.13-disable_poppler.patch new file mode 100644 index 000000000..502972e7b --- /dev/null +++ b/redhat/kdegraphics/kdegraphics-3.5.13-disable_poppler.patch @@ -0,0 +1,11 @@ +--- kdegraphics.ORI/kfile-plugins/dependencies/CMakeLists.txt 2011-07-31 08:24:04.000000000 +0200 ++++ kdegraphics/kfile-plugins/dependencies/CMakeLists.txt 2011-10-30 14:42:03.000000000 +0100 +@@ -9,4 +9,6 @@ + # + ################################################# + +-add_subdirectory( poppler-tqt ) +\ Pas de fin de ligne à la fin du fichier. ++if( WITH_PDF ) ++ add_subdirectory( poppler-tqt ) ++endif ( ) diff --git a/redhat/kdegraphics/kdegraphics-3.5.13-kpovmodeler_check_glu.patch b/redhat/kdegraphics/kdegraphics-3.5.13-kpovmodeler_check_glu.patch new file mode 100644 index 000000000..ba18d0b3d --- /dev/null +++ b/redhat/kdegraphics/kdegraphics-3.5.13-kpovmodeler_check_glu.patch @@ -0,0 +1,16 @@ +diff -Nuar kdegraphics.ORI/kpovmodeler/ConfigureChecks.cmake kdegraphics/kpovmodeler/ConfigureChecks.cmake +--- kdegraphics.ORI/kpovmodeler/ConfigureChecks.cmake 2011-05-11 22:40:19.000000000 +0200 ++++ kdegraphics/kpovmodeler/ConfigureChecks.cmake 2011-10-30 14:00:54.000000000 +0100 +@@ -12,7 +12,10 @@ + # glu + pkg_search_module( GLU glu ) + if( NOT GLU_FOUND ) +- tde_message_fatal( "glu is required, but was not found on your system" ) ++ check_include_file ( GL/glu.h HAVE_GLU ) ++ if( NOT HAVE_GLU ) ++ tde_message_fatal( "glu is required, but was not found on your system" ) ++ endif ( ) + endif( ) + + +kfile-plugins/dependencies/poppler-tqt/CMakeFiles/poppler-tqt-shared.dir/build.make diff --git a/redhat/kdegraphics/kdegraphics-3.5.13-ksnapshot_ldflags.patch b/redhat/kdegraphics/kdegraphics-3.5.13-ksnapshot_ldflags.patch new file mode 100644 index 000000000..c0e6e3da2 --- /dev/null +++ b/redhat/kdegraphics/kdegraphics-3.5.13-ksnapshot_ldflags.patch @@ -0,0 +1,11 @@ +diff -Nuar kdegraphics.ORI/ksnapshot/CMakeLists.txt kdegraphics/ksnapshot/CMakeLists.txt +--- kdegraphics.ORI/ksnapshot/CMakeLists.txt 2011-05-11 23:29:40.000000000 +0200 ++++ kdegraphics/ksnapshot/CMakeLists.txt 2011-10-31 15:45:47.107958154 +0100 +@@ -40,6 +40,6 @@ + SOURCES + ksnapshotiface.skel main.cpp ksnapshot.cpp regiongrabber.cpp + windowgrabber.cpp ksnapshotwidget.ui +- LINK kdeprint-shared ++ LINK kdeprint-shared Xext + DESTINATION ${BIN_INSTALL_DIR} + ) diff --git a/redhat/kdegraphics/kdegraphics-3.5.13-xpdf_disable_mkstemps.patch b/redhat/kdegraphics/kdegraphics-3.5.13-xpdf_disable_mkstemps.patch new file mode 100644 index 000000000..a531fb03d --- /dev/null +++ b/redhat/kdegraphics/kdegraphics-3.5.13-xpdf_disable_mkstemps.patch @@ -0,0 +1,11 @@ +--- kdegraphics.ORI/kpdf/xpdf/aconf.h 2011-04-27 19:32:57.000000000 +0200 ++++ kdegraphics/kpdf/xpdf/aconf.h 2011-10-30 14:54:24.000000000 +0100 +@@ -7,7 +7,7 @@ + #define HAVE_FREETYPE_FREETYPE_H HAVE_FREETYPE + #define OPI_SUPPORT 0 + #define TEXTOUT_WORD_LIST 0 +-#define HAVE_MKSTEMPS 1 //libkdefakes provides it ++#define HAVE_MKSTEMPS 0 + #define HAVE_SPLASH 1 + #define SPLASH_CMYK 1 + #define HAVE_XPDFCORE 0 diff --git a/redhat/kdegraphics/trinity-kdegraphics-3.5.13.spec b/redhat/kdegraphics/trinity-kdegraphics-3.5.13.spec index b988eddca..2133f4ddf 100644 --- a/redhat/kdegraphics/trinity-kdegraphics-3.5.13.spec +++ b/redhat/kdegraphics/trinity-kdegraphics-3.5.13.spec @@ -2,7 +2,7 @@ %if "%{?version}" == "" %define version 3.5.13 %endif -%define release 0 +%define release 1 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -12,10 +12,16 @@ # TDE 3.5.13 specific building variables BuildRequires: cmake >= 2.8 -%define tde_docdir %{_docdir} +%define tde_docdir %{_docdir}/kde %define tde_includedir %{_includedir}/kde %define tde_libdir %{_libdir}/trinity +# KDEGRAPHICS specific options +%if 0%{?rhel} && 0%{?rhel} <= 5 +%define build_kpovmodeler 0 +%else +%define build_kpovmodeler 1 +%endif Name: trinity-kdegraphics Version: %{?version} @@ -30,8 +36,21 @@ Vendor: Trinity Project Packager: Francois Andriot <francois.andriot@free.fr> URL: http://www.trinitydesktop.org/ +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + Source0: kdegraphics-%{version}.tar.gz +# TDE 3.5.13 +## RHEL / Fedora specific patches +### [kdegraphics/ksnapshot] Missing -lXext in LDFLAGS (required for Fedora 15) +Patch0: kdegraphics-3.5.13-ksnapshot_ldflags.patch +### [kdegraphics/kpovmodeler] CMAKE does not detect GL/glu.h (on RHEL5) +Patch1: kdegraphics-3.5.13-kpovmodeler_check_glu.patch +### [kdegraphics/kfile-plugins/dependencies/poppler-tqt] Compile 'poppler-tqt' only if HAVE_POPPLER_016 +Patch2: kdegraphics-3.5.13-disable_poppler.patch +### [kdegraphics/kpdf/xpdf] Disable 'mkstemps' support for RHEL5 +Patch3: kdegraphics-3.5.13-xpdf_disable_mkstemps.patch + BuildRequires: tqtinterface-devel BuildRequires: trinity-kdelibs-devel BuildRequires: trinity-kdebase-devel @@ -44,6 +63,8 @@ BuildRequires: automake libtool BuildRequires: gphoto2-devel BuildRequires: sane-backends-devel BuildRequires: libusb-devel +BuildRequires: t1lib-devel +BuildRequires: libdrm-devel # kgamma BuildRequires: libXxf86vm-devel @@ -53,7 +74,10 @@ BuildRequires: imlib-devel BuildRequires: OpenEXR-devel # kpdf BuildRequires: freetype-devel +BuildRequires: poppler-devel +%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 BuildRequires: poppler-qt-devel +%endif BuildRequires: libpaper-devel # ksvg BuildRequires: fontconfig-devel @@ -61,8 +85,11 @@ BuildRequires: fribidi-devel BuildRequires: lcms-devel BuildRequires: libart_lgpl-devel BuildRequires: libXmu-devel + # kpovmodeler +%if 0%{?build_kpovmodeler} BuildRequires: libGL-devel libGLU-devel libXi-devel +%endif Requires: tqtinterface Requires: trinity-arts @@ -108,7 +135,9 @@ Requires(postun): /sbin/ldconfig %{summary}, including: * kfax * kfaxview +%if 0%{?build_kpovmodeler} * kpovmodler +%endif %package libs Summary: %{name} runtime libraries @@ -123,49 +152,44 @@ Requires: %{name} = %{version}-%{release} %prep %setup -q -n kdegraphics - -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -sed -i admin/acinclude.m4.in \ - -e "s,/usr/include/tqt,%{_includedir}/tqt,g" - -%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 +%if 0%{?rhel} && 0%{?rhel} <= 5 +%patch3 -p1 +%endif %build unset QTDIR || : ; . /etc/profile.d/qt.sh export PATH="%{_bindir}:${PATH}" -export LDFLAGS="-L%{_libdir} -I%{_includedir}" - -%configure \ - --enable-new-ldflags \ - --disable-dependency-tracking \ - --disable-rpath \ - --disable-debug \ - --disable-warnings \ - --enable-final \ - --enable-closure \ - --includedir=%{_includedir}/kde \ - --with-extra-includes=%{_includedir}/tqt - -%if 0%{?fedora} >= 15 -# Ugly fix for kolourpaint - problem when linking libkdefx.so -sed -i kolourpaint/Makefile \ - -e 's,\($(kolourpaint_LINK) $(kolourpaint_OBJECTS) $(kolourpaint_LDADD) \)\($(LIBS)\),\1 -lkdefx \2,' - -# Another ugly fix for kpdf - problem when linking fontconfig -sed -i kpdf/Makefile \ - -e '/^LDFLAGS = .*/ s,$, -lfontconfig,' +export PKG_CONFIG_PATH="%{_libdir}/pkgconfig" +export CMAKE_INCLUDE_PATH="%{_includedir}:%{_includedir}/tqt" +export LD_LIBRARY_PATH="%{_libdir}" + +%__mkdir build +cd build +%cmake \ + -DWITH_T1LIB=ON \ + -DWITH_LIBPAPER=ON \ + -DWITH_TIFF=ON \ + -DWITH_OPENEXR=ON \ +%if 0%{?rhel} && 0%{?rhel} <= 5 + -DWITH_PDF=OFF \ +%else + -DWITH_PDF=ON \ +%endif + -DBUILD_ALL=ON \ +%if 0%{?build_kpovmodeler} == 0 + -DBUILD_KPOVMODELER=OFF \ %endif + .. %__make %{?_smp_mflags} %install export PATH="%{_bindir}:${PATH}" %__rm -rf %{buildroot} - -make install DESTDIR=%{buildroot} +%__make install DESTDIR=%{buildroot} -C build # locale's %find_lang %{name} || touch %{name}.lang @@ -201,7 +225,7 @@ rm -f %{buildroot}/libkpovmodeler.so %clean -rm -rf %{buildroot} +%__rm -rf %{buildroot} %post @@ -263,8 +287,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %{_datadir}/services/kfaxmultipage_tiff.desktop # kpovmodeler +%if 0%{?build_kpovmodeler} %doc rpmdocs/kpovmodeler/ -%doc %{_docdir}/HTML/en/kpovmodeler/ +%doc %{tde_docdir}/HTML/en/kpovmodeler/ %{_bindir}/kpovmodeler %{_libdir}/libkpovmodeler.so.* %{_libdir}/libkpovmodeler.la @@ -273,6 +298,7 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %{_datadir}/apps/kpovmodeler/ %{_datadir}/icons/crystalsvg/*/mimetypes/kpovmodeler_doc.* %{_datadir}/icons/hicolor/*/apps/kpovmodeler.* +%endif %files -f %{name}.lang %defattr(-,root,root,-) @@ -297,6 +323,7 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %exclude %{_datadir}/services/kfaxmultipage_tiff.desktop # kpovmodeler +%if 0%{?build_kpovmodeler} %exclude %{tde_docdir}/HTML/en/kpovmodeler/ %exclude %{_bindir}/kpovmodeler %exclude %{_libdir}/libkpovmodeler.* @@ -305,6 +332,7 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %exclude %{_datadir}/apps/kpovmodeler/ %exclude %{_datadir}/icons/crystalsvg/*/mimetypes/kpovmodeler_doc.* %exclude %{_datadir}/icons/hicolor/*/apps/kpovmodeler.* +%endif %{_bindir}/* %{_datadir}/applications/kde/*.desktop @@ -317,12 +345,15 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %{_datadir}/mimelnk/*/* %{_libdir}/libkdeinit_*.so %{tde_libdir}/* +%doc %lang(en) %{tde_docdir}/HTML/en/* %files libs %defattr(-,root,root,-) %exclude %{_libdir}/libkfaximage.la +%if 0%{?build_kpovmodeler} %exclude %{_libdir}/libkpovmodeler.la %exclude %{_libdir}/libkpovmodeler.so.* +%endif %{_libdir}/lib*.so.* %{_libdir}/lib*.la # Why ??? @@ -330,7 +361,15 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %files devel %defattr(-,root,root,-) -%{_includedir}/kde/* +%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 +%{tde_includedir}/* +%endif +%{_includedir}/dom/* +%{_includedir}/ksvg/* +%{_includedir}/kviewshell/* +%{_includedir}/libtext2path-0.1/* +%{_includedir}/kmultipageInterface.h +%{_datadir}/cmake/*.cmake %{_libdir}/lib*.so #exclude %{_libdir}/libkpovmodeler.so %exclude %{_libdir}/libkfaximage.so @@ -338,5 +377,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %exclude %{_libdir}/libdjvu.so %changelog +* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1 +- Initial release for RHEL 6, RHEL 5 and Fedora 15 +- RHEL 5 build has some features disabled (see patches) + * Sun Sep 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-0 - Import to GIT diff --git a/redhat/kdelibs/trinity-kdelibs-3.5.13.spec b/redhat/kdelibs/trinity-kdelibs-3.5.13.spec index 056229f1c..404a432c7 100755 --- a/redhat/kdelibs/trinity-kdelibs-3.5.13.spec +++ b/redhat/kdelibs/trinity-kdelibs-3.5.13.spec @@ -2,7 +2,7 @@ %if "%{?version}" == "" %define version 3.5.13 %endif -%define release 0 +%define release 1 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -281,6 +281,9 @@ EOF %changelog +* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1 +- Initial release for RHEL 6, RHEL 5 and Fedora 15 + * Wed Sep 02 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13pre.svn20110902-0.el6 - Import to GIT - Built with future TDE version (3.5.13 + cmake + QT3.3.8d) diff --git a/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec b/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec index 0eda9a831..8d19e5159 100644 --- a/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec +++ b/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec @@ -2,7 +2,7 @@ %if "%{?version}" == "" %define version 3.5.13 %endif -%define release 0 +%define release 1 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -394,6 +394,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %changelog +* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1 +- Initial release for RHEL 6, RHEL 5 and Fedora 15 + * Sat Sep 09 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-0 -- Initial build for RHEL 6 +- Import to GIT - Spec file based on Fedora 8 "kdemultimedia-6:3.5.10-2" diff --git a/redhat/kdenetwork/trinity-kdenetwork-3.5.13.spec b/redhat/kdenetwork/trinity-kdenetwork-3.5.13.spec index a991df2c8..d06c7b328 100644 --- a/redhat/kdenetwork/trinity-kdenetwork-3.5.13.spec +++ b/redhat/kdenetwork/trinity-kdenetwork-3.5.13.spec @@ -2,7 +2,7 @@ %if "%{?version}" == "" %define version 3.5.13 %endif -%define release 0 +%define release 1 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -60,8 +60,6 @@ Patch4: kdenetwork-3.2.3-resolv.patch # include more/proper ppp headers Patch6: kdenetwork-3.5.9-krfb_httpd.patch -Patch100: svn.patch - Requires: %{name}-libs = %{version}-%{release} BuildRequires: gettext @@ -181,8 +179,6 @@ Requires: %{name} = %{version}-%{release} %patch4 -p1 -b .resolv %patch6 -p1 -b .krfb_httpd -%patch100 -p1 - %build unset QTDIR || : ; . /etc/profile.d/qt.sh @@ -469,6 +465,9 @@ done %changelog +* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1 +- Initial release for RHEL 6, RHEL 5 and Fedora 15 + * Tue Oct 25 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-0 -- Initial version +- Import to GIT diff --git a/redhat/kdepim/trinity-kdepim-3.5.13.spec b/redhat/kdepim/trinity-kdepim-3.5.13.spec index 670eb0e92..e19bcf338 100644 --- a/redhat/kdepim/trinity-kdepim-3.5.13.spec +++ b/redhat/kdepim/trinity-kdepim-3.5.13.spec @@ -2,7 +2,7 @@ %if "%{?version}" == "" %define version 3.5.13 %endif -%define release 0 +%define release 1 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -144,5 +144,8 @@ export PATH="%{_bindir}:${PATH}" %{_datadir}/cmake/*.cmake %changelog +* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1 +- Initial release for RHEL 6, RHEL 5 and Fedora 15 + * Mon Sep 05 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-0 - Import to GIT diff --git a/redhat/kdesdk/trinity-kdesdk-3.5.13.spec b/redhat/kdesdk/trinity-kdesdk-3.5.13.spec index 2563ec93a..2caf50a01 100644 --- a/redhat/kdesdk/trinity-kdesdk-3.5.13.spec +++ b/redhat/kdesdk/trinity-kdesdk-3.5.13.spec @@ -2,7 +2,7 @@ %if "%{?version}" == "" %define version 3.5.13 %endif -%define release 0 +%define release 1 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -213,6 +213,8 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %changelog +* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1 +- Initial release for RHEL 6, RHEL 5 and Fedora 15 + * Mon Sep 05 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-0 - Import to GIT -- Built with future TDE version (3.5.13 + cmake + QT3.3.8d) diff --git a/redhat/kdetoys/trinity-kdetoys-3.5.13.spec b/redhat/kdetoys/trinity-kdetoys-3.5.13.spec index ef533a8db..f9ef1f207 100644 --- a/redhat/kdetoys/trinity-kdetoys-3.5.13.spec +++ b/redhat/kdetoys/trinity-kdetoys-3.5.13.spec @@ -2,7 +2,7 @@ %if "%{?version}" == "" %define version 3.5.13 %endif -%define release 0 +%define release 1 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -157,6 +157,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||: %changelog +* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1 +- Initial release for RHEL 6, RHEL 5 and Fedora 15 + * Fri Oct 28 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-0 -- Initial version for RHEL 6 and Fedora 15 +- Import to GIT diff --git a/redhat/kdeutils/trinity-kdeutils-3.5.13.spec b/redhat/kdeutils/trinity-kdeutils-3.5.13.spec index f58564dda..0e6777148 100755 --- a/redhat/kdeutils/trinity-kdeutils-3.5.13.spec +++ b/redhat/kdeutils/trinity-kdeutils-3.5.13.spec @@ -2,7 +2,7 @@ %if "%{?version}" == "" %define version 3.5.13 %endif -%define release 0 +%define release 1 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -339,6 +339,9 @@ done %changelog +* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1 +- Initial release for RHEL 6, RHEL 5 and Fedora 15 + * Mon Sep 05 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-0 - Import to GIT diff --git a/redhat/kdevelop/trinity-kdevelop-3.5.13.spec b/redhat/kdevelop/trinity-kdevelop-3.5.13.spec index a3101cdf7..969f6bab5 100644 --- a/redhat/kdevelop/trinity-kdevelop-3.5.13.spec +++ b/redhat/kdevelop/trinity-kdevelop-3.5.13.spec @@ -2,7 +2,7 @@ %if "%{?version}" == "" %define version 3.5.13 %endif -%define release 0 +%define release 1 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -229,6 +229,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %changelog +* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1 +- Initial release for RHEL 6, RHEL 5 and Fedora 15 + * Sat Oct 29 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-0 -- Initial build for RHEL 6 and Fedora 15 +- Import to GIT - Based on SPEC file from Fedora: kdevelop 9:3.5.3-1 diff --git a/redhat/kdewebdev/trinity-kdewebdev-3.5.13.spec b/redhat/kdewebdev/trinity-kdewebdev-3.5.13.spec index ea89ce3ae..53acedb23 100644 --- a/redhat/kdewebdev/trinity-kdewebdev-3.5.13.spec +++ b/redhat/kdewebdev/trinity-kdewebdev-3.5.13.spec @@ -2,7 +2,7 @@ %if "%{?version}" == "" %define version 3.5.13 %endif -%define release 0 +%define release 1 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -224,5 +224,8 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %changelog +* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1 +- Initial release for RHEL 6, RHEL 5 and Fedora 15 + * Mon Sep 19 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-0 -- Initial build for RHEL 6 / Fedora 15 +- Import to GIT |