Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging

24 files changed, 28 insertions, 36 deletions

diff --git a/redhat/dependencies/arts/arts-14.0.0.spec b/redhat/dependencies/arts/arts-14.0.0.spec
index 8a2c5c242..5c81da101 100644
--- a/redhat/dependencies/arts/arts-14.0.0.spec
+++ b/redhat/dependencies/arts/arts-14.0.0.spec
@@ -98,7 +98,7 @@ Obsoletes:	arts
 %endif
 
 %description
-arts (analog real-time synthesizer) is the sound system of KDE 3.
+arts (analog real-time synthesizer) is the sound system of TDE.
 
 The principle of arts is to create/process sound using small modules which do
 certain tasks. These may be create a waveform (oscillators), play samples,
@@ -235,5 +235,5 @@ cd build
 
 
 %changelog
-* Thu Feb 16 2012 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
-- Initial build for TDE R14, using 'tqt3' instead of 'qt3'
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
+- Initial release for TDE R14.0.0
diff --git a/redhat/dependencies/arts/arts-3.5.13.1.spec b/redhat/dependencies/arts/arts-3.5.13.1.spec
index 03a922e4e..4b5f276a4 100644
--- a/redhat/dependencies/arts/arts-3.5.13.1.spec
+++ b/redhat/dependencies/arts/arts-3.5.13.1.spec
@@ -179,4 +179,4 @@ cd build
 
 %changelog
 * Tue Sep 11 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13.1-1
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
diff --git a/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec b/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec
index 17acc05e1..32a0f3102 100644
--- a/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec
+++ b/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec
@@ -146,4 +146,4 @@ unset QTDIR
 
 %changelog
 * Thu Feb 16 2012 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
-- Initial build for TDE R14, using 'tqt3' instead of 'qt3'
+- Initial release for TDE R14, using 'tqt3' instead of 'qt3'
diff --git a/redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.1.spec b/redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.1.spec
index e7b01f89b..81652edf4 100644
--- a/redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.1.spec
+++ b/redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.1.spec
@@ -153,4 +153,4 @@ export CXXFLAGS="${CXXFLAGS} ${LDFLAGS}"
 
 %changelog
 * Tue Sep 11 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13.1-1
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
diff --git a/redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.spec b/redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.spec
index 18e0f0401..41772b84d 100644
--- a/redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.spec
+++ b/redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.spec
@@ -151,4 +151,4 @@ export CXXFLAGS="${CXXFLAGS} ${LDFLAGS}"
 
 %changelog
 * Mon Jul 30 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1
-- Initial build for TDE 3.5.13
+- Initial release for TDE 3.5.13
diff --git a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec
index ef6247ec4..7657a1bdc 100644
--- a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec
+++ b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec
@@ -119,5 +119,5 @@ cd build
 
 %changelog
 * Thu Feb 16 2012 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
-- Initial build for TDE R14, using 'tqt3' instead of 'qt3'
+- Initial release for TDE R14, using 'tqt3' instead of 'qt3'
 
diff --git a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.1.spec b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.1.spec
index 2223132d7..cf0f70911 100644
--- a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.1.spec
+++ b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.1.spec
@@ -112,4 +112,4 @@ cd build
 
 %changelog
 * Tue Sep 11 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13.1-1
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
diff --git a/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec b/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec
index 0ddd1f933..217e25493 100644
--- a/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec
+++ b/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec
@@ -127,4 +127,4 @@ cd build
 
 %changelog
 * Thu Feb 16 2012 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
-- Initial build for TDE 14.0.0
+- Initial release for TDE 14.0.0
diff --git a/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.1.spec b/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.1.spec
index 95f28d6af..f9953eb5a 100644
--- a/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.1.spec
+++ b/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.1.spec
@@ -122,4 +122,4 @@ cd build
 
 %changelog
 * Tue Sep 11 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13.1-1
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
diff --git a/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec b/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec
index c224832e9..a31156cc2 100644
--- a/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec
+++ b/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec
@@ -177,4 +177,4 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
 
 %changelog
 * Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2.3.22-1
-- Initial build for TDE 14.0.0
+- Initial release for TDE 14.0.0
diff --git a/redhat/dependencies/libcaldav/libcaldav.spec b/redhat/dependencies/libcaldav/libcaldav.spec
index 0d6745c90..f792bb98d 100644
--- a/redhat/dependencies/libcaldav/libcaldav.spec
+++ b/redhat/dependencies/libcaldav/libcaldav.spec
@@ -136,4 +136,4 @@ autoreconf --force --install --symlink
 - Add missing BuildRequires
 
 * 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
+- Initial release for RHEL 6, RHEL 5, and Fedora 15
diff --git a/redhat/dependencies/libcarddav/libcarddav.spec b/redhat/dependencies/libcarddav/libcarddav.spec
index 8c4f62ff7..3bb4deca1 100644
--- a/redhat/dependencies/libcarddav/libcarddav.spec
+++ b/redhat/dependencies/libcarddav/libcarddav.spec
@@ -129,4 +129,4 @@ autoreconf --force --install --symlink
 - Build on MGA2
 
 * 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
+- Initial release for RHEL 6, RHEL 5, and Fedora 15
diff --git a/redhat/dependencies/python-tqt/python-tqt-14.0.0.spec b/redhat/dependencies/python-tqt/python-tqt-14.0.0.spec
index d84be561c..1e33edf24 100644
--- a/redhat/dependencies/python-tqt/python-tqt-14.0.0.spec
+++ b/redhat/dependencies/python-tqt/python-tqt-14.0.0.spec
@@ -168,5 +168,5 @@ echo yes | python ../configure.py \
 
 %changelog
 * Thu Feb 16 2012 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
-- Initial build for TDE R14, using 'tqt3' instead of 'qt3'
+- Initial release for TDE R14, using 'tqt3' instead of 'qt3'
 
diff --git a/redhat/dependencies/qt3/qt3-3.3.8.d.spec b/redhat/dependencies/qt3/qt3-3.3.8.d.spec
index fb3f71ace..9d61f454d 100644
--- a/redhat/dependencies/qt3/qt3-3.3.8.d.spec
+++ b/redhat/dependencies/qt3/qt3-3.3.8.d.spec
@@ -697,6 +697,6 @@ rm -rf %{buildroot}
 - Add missing BuildRequires
 
 * Fri Sep 02 2011 Francois Andriot <francois.andriot@free.fr> - 3.3.8.d-1
-- Initial build for RHEL 6, RHEL 5, and Fedora 15
+- Initial release for RHEL 6, RHEL 5, and Fedora 15
 - Switch to Trinity Version
 - Spec file based on RHEL 6 'qt3-3.3.8b-29'
diff --git a/redhat/dependencies/qt3/qt3-3.5.13.1.spec b/redhat/dependencies/qt3/qt3-3.5.13.1.spec
index 93e69b5ee..9fa6ee8ac 100644
--- a/redhat/dependencies/qt3/qt3-3.5.13.1.spec
+++ b/redhat/dependencies/qt3/qt3-3.5.13.1.spec
@@ -670,7 +670,7 @@ rm -rf %{buildroot}
 
 %changelog
 * Sat Sep 29 2012 Francois Andriot <francois.andriot@free.fr> - 3.3.8.d-9
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
 
 * Sat Apr 28 2012 Francois Andriot <francois.andriot@free.fr> - 3.3.8.d-8
 - Fix Provides and Obsoletes, again and again ...
@@ -694,6 +694,6 @@ rm -rf %{buildroot}
 - Add missing BuildRequires
 
 * Fri Sep 02 2011 Francois Andriot <francois.andriot@free.fr> - 3.3.8.d-1
-- Initial build for RHEL 6, RHEL 5, and Fedora 15
+- Initial release for RHEL 6, RHEL 5, and Fedora 15
 - Switch to Trinity Version
 - Spec file based on RHEL 6 'qt3-3.3.8b-29'
diff --git a/redhat/dependencies/qt3/qt3-3.5.13.2.spec b/redhat/dependencies/qt3/qt3-3.5.13.2.spec
index 1e29d2984..0c4d25c81 100644
--- a/redhat/dependencies/qt3/qt3-3.5.13.2.spec
+++ b/redhat/dependencies/qt3/qt3-3.5.13.2.spec
@@ -629,7 +629,7 @@ rm -rf %{buildroot}
 - Initial release for TDE 3.5.13.2
 
 * Sat Sep 29 2012 Francois Andriot <francois.andriot@free.fr> - 3.3.8.d-9
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
 
 * Sat Apr 28 2012 Francois Andriot <francois.andriot@free.fr> - 3.3.8.d-8
 - Fix Provides and Obsoletes, again and again ...
@@ -653,6 +653,6 @@ rm -rf %{buildroot}
 - Add missing BuildRequires
 
 * Fri Sep 02 2011 Francois Andriot <francois.andriot@free.fr> - 3.3.8.d-1
-- Initial build for RHEL 6, RHEL 5, and Fedora 15
+- Initial release for RHEL 6, RHEL 5, and Fedora 15
 - Switch to Trinity Version
 - Spec file based on RHEL 6 'qt3-3.3.8b-29'
diff --git a/redhat/dependencies/sip4-tqt/sip4-tqt.spec b/redhat/dependencies/sip4-tqt/sip4-tqt.spec
index 2de637176..adc9f2641 100644
--- a/redhat/dependencies/sip4-tqt/sip4-tqt.spec
+++ b/redhat/dependencies/sip4-tqt/sip4-tqt.spec
@@ -133,4 +133,4 @@ python ../configure.py \
 
 %changelog
 * Thu Feb 16 2012 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
-- Initial build for TDE R14, using 'tqt3' instead of 'qt3'
+- Initial release for TDE R14, using 'tqt3' instead of 'qt3'
diff --git a/redhat/dependencies/tqca-tls/tqca-tls-14.0.0.spec b/redhat/dependencies/tqca-tls/tqca-tls-14.0.0.spec
index 83531ed01..1112dfbbb 100644
--- a/redhat/dependencies/tqca-tls/tqca-tls-14.0.0.spec
+++ b/redhat/dependencies/tqca-tls/tqca-tls-14.0.0.spec
@@ -81,4 +81,4 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
 
 %changelog
 * Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 1.0-3
-- Initial build for TDE 14.0.0
+- Initial release for TDE 14.0.0
diff --git a/redhat/dependencies/tqca-tls/tqca-tls-3.5.13.2.spec b/redhat/dependencies/tqca-tls/tqca-tls-3.5.13.2.spec
index 003eb95e5..9b07e7087 100644
--- a/redhat/dependencies/tqca-tls/tqca-tls-3.5.13.2.spec
+++ b/redhat/dependencies/tqca-tls/tqca-tls-3.5.13.2.spec
@@ -103,4 +103,4 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
 - Renames TQCA to QCA in source code
 
 * Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 1.0-1
-- Initial build for TDE 3.5.13.2
+- Initial release for TDE 3.5.13.2
diff --git a/redhat/dependencies/tqca/tqca-14.0.0.spec b/redhat/dependencies/tqca/tqca-14.0.0.spec
index e2b23a10b..7d46981ae 100644
--- a/redhat/dependencies/tqca/tqca-14.0.0.spec
+++ b/redhat/dependencies/tqca/tqca-14.0.0.spec
@@ -120,4 +120,4 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
 
 %changelog
 * Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 1.0-3
-- Initial build for TDE 14.0.0
+- Initial release for TDE 14.0.0
diff --git a/redhat/dependencies/tqca/tqca-3.5.13.2.spec b/redhat/dependencies/tqca/tqca-3.5.13.2.spec
index eefe8a16e..423c9104d 100644
--- a/redhat/dependencies/tqca/tqca-3.5.13.2.spec
+++ b/redhat/dependencies/tqca/tqca-3.5.13.2.spec
@@ -128,4 +128,4 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
 - Renames TQCA to QCA in source code
 
 * Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 1.0-1
-- Initial build for TDE 3.5.13.2
+- Initial release for TDE 3.5.13.2
diff --git a/redhat/dependencies/tqscintilla/tqscintilla-14.0.0.spec b/redhat/dependencies/tqscintilla/tqscintilla-14.0.0.spec
index 7bad7ffb1..021d612f3 100644
--- a/redhat/dependencies/tqscintilla/tqscintilla-14.0.0.spec
+++ b/redhat/dependencies/tqscintilla/tqscintilla-14.0.0.spec
@@ -175,4 +175,4 @@ done
 
 %changelog
 * Tue Jul 02 2013 Francois Andriot <francois.andriot@free.fr> - 1.7.1-1
-- Initial build for TDE 14.0.0
+- Initial release for TDE 14.0.0
diff --git a/redhat/dependencies/tqt3/tqt3-14.0.0.spec b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
index 33b5ecfc5..2b178e846 100644
--- a/redhat/dependencies/tqt3/tqt3-14.0.0.spec
+++ b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
@@ -7,14 +7,6 @@
 %define tde_includedir %{tde_prefix}/include
 %define tde_libdir %{tde_prefix}/%{_lib}
 
-# The following QT4 packages should NOT be installed to
-# allow QT3 compilation (please uninstall them prior to compile)
-#  qt
-#  qt-sqlite
-#  qt-mysql
-#  qt-x11
-#  qt-devel
-# ...maybe others !!!!
 
 Name:		trinity-tqt3
 Version:	3.5.0
@@ -585,4 +577,4 @@ export PATH=${QTDIR}/stripbin:${QTDIR}/bin:$PATH
 
 %changelog
 * Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.0-1
-- Initial build for TDE R14.0.0
+- Initial release for TDE R14.0.0
diff --git a/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec b/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec
index e9ddaadcb..5f26d41ca 100755
--- a/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec
+++ b/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec
@@ -171,4 +171,4 @@ done
 
 %changelog
 * Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
-- Initial build for TDE 14.0.0
+- Initial release for TDE 14.0.0