variety of little fixes (and major libtqt4 build testing)

10 files changed, 119 insertions, 63 deletions

diff --git a/opensuse/.gitignore b/opensuse/.gitignore
index b25c15b81..b04137703 100644
--- a/opensuse/.gitignore
+++ b/opensuse/.gitignore
@@ -1 +1,2 @@
 *~
+_build*
diff --git a/opensuse/README.FIRST b/opensuse/README.FIRST
index b1a6ef5bc..ed4050303 100644
--- a/opensuse/README.FIRST
+++ b/opensuse/README.FIRST
@@ -1,6 +1,13 @@
 Here contains the specfiles for Trinity.
 They are updated here, and built at build.opensuse.org.
 
+For local building, use the following command:
+osc -A https://api.opensuse.org/ build --local-package --alternative-project openSUSE:Factory standard i586
+
+OR
+
+osc -A https://api.opensuse.org/ build --local-package --alternative-project KDE:KDE3 openSUSE_Factory i586
+
 copyright (c) 2011 the Trinity Project
 
 All modifications and additions to the file contributed by third parties
diff --git a/opensuse/arts/arts.spec b/opensuse/arts/arts.spec
index 8e7fb26cd..988b6207e 100644
--- a/opensuse/arts/arts.spec
+++ b/opensuse/arts/arts.spec
@@ -19,9 +19,8 @@
 
 
 Name:           arts
-BuildRequires:  alsa-devel audiofile-devel glib2-devel jack-devel libdrm-devel libjpeg-devel libvorbis-devel libtqt4-devel readline-devel update-desktop-files
+BuildRequires:  alsa-devel audiofile-devel cmake glib2-devel jack-devel libdrm-devel libjpeg-devel libvorbis-devel libtqt4-devel readline-devel update-desktop-files tde-filesystem
 BuildRequires:	tde-filesystem
-Requires:	tde-filesystem
 License:        GPLv2+
 Group:          Productivity/Multimedia/Sound/Players
 Summary:        Modular Software Synthesizer
@@ -56,7 +55,7 @@ Summary:        Include Files and Libraries mandatory for Development.
 Group:          Development/Libraries/Other
 Provides:       tdelibs:/opt/tde/include/artsc/artsc.h
 Requires:       libtqt4-devel arts = %version glib2-devel jack-devel libogg-devel libvorbis-devel audiofile-devel libstdc++-devel
-Requires:       alsa-devel
+Requires:       alsa-devel tde-filesystem
 
 %description devel
 A modular software synthesizer that generates realtime audio streams,
diff --git a/opensuse/dbus-1-tqt/dbus-1-tqt.spec b/opensuse/dbus-1-tqt/dbus-1-tqt.spec
index 912e3ac2c..1ab86c544 100644
--- a/opensuse/dbus-1-tqt/dbus-1-tqt.spec
+++ b/opensuse/dbus-1-tqt/dbus-1-tqt.spec
@@ -19,7 +19,7 @@
 
 
 Name:           dbus-1-tqt
-BuildRequires:  dbus-1 dbus-1-devel libtqt4-devel unsermake
+BuildRequires:  dbus-1 dbus-1-devel libtqt4-devel cmake
 URL:            http://dbus.freedesktop.org/
 License:        GPLv2+
 Group:          Development/Libraries/TDE
diff --git a/opensuse/gentarball b/opensuse/gentarball
new file mode 100755
index 000000000..593539a5a
--- /dev/null
+++ b/opensuse/gentarball
@@ -0,0 +1,48 @@
+#!/bin/bash
+
+VERSION=$1
+if [ "$1" == "" ]; then
+VERSION=3.5.12.99
+fi
+
+grabDependsTarball()
+{
+svn export svn://anonsvn.kde.org/home/kde/branches/trinity/dependencies/$NAME
+mv -v $NAME $NAME-$VERSION
+tar cjf $NAME-$VERSION.tar.bz2 $NAME-$VERSION
+rm -rf $NAME-$VERSION
+echo "done"
+}
+
+
+echo "This is for testing locally without services."
+echo "I need to know what tarball you want to generate from."
+echo ""
+echo "Let's start off by dependencies, main, or apps."
+echo "Which one?"
+echo ""
+echo "(1) dependencies"
+echo "(2) main"
+echo "(3) applications"
+echo -e "> "
+read SELECTION
+
+if [ "$SELECTION" = "1" ]; then
+	echo "(1) libtqt4"
+	echo "(2) dbus-1-tqt"
+	echo "(3) libdbus-1-tqt-0"
+	echo "(4) arts"
+	read CHOICE
+	
+	if [ "$CHOICE" = "1" ]; then NAME='tqtinterface';
+	elif [ "$CHOICE" = "2" ]; then NAME='dbus-tqt';
+	elif [ "$CHOICE" = "3" ]; then NAME='dbus-1-tqt';
+	elif [ "$CHOICE" = "4" ]; then NAME='arts';
+	else
+	echo "Invalid, bye." && exit 1
+	fi
+	grabDependsTarball
+else
+	echo "Invalid, bye." && exit 1
+fi
+
diff --git a/opensuse/libdbus-1-tqt-0/libdbus-1-tqt-0.spec b/opensuse/libdbus-1-tqt-0/libdbus-1-tqt-0.spec
index 244080a40..06368c32d 100644
--- a/opensuse/libdbus-1-tqt-0/libdbus-1-tqt-0.spec
+++ b/opensuse/libdbus-1-tqt-0/libdbus-1-tqt-0.spec
@@ -21,7 +21,7 @@
 Name:           libdbus-1-tqt-0
 Url:            http://www.freedesktop.org/wiki/Software/DBusBindings
 %define appname libdbus-1-tqt
-BuildRequires:  dbus-1-devel libtqt4-devel
+BuildRequires:  dbus-1-devel libtqt4-devel cmake
 License:        GPL v2 or later
 Group:          Development/Libraries/C and C++
 AutoReqProv:    on
diff --git a/opensuse/libtqt4/libtqt4.spec b/opensuse/libtqt4/libtqt4.spec
index f01d2621c..54a9c6256 100644
--- a/opensuse/libtqt4/libtqt4.spec
+++ b/opensuse/libtqt4/libtqt4.spec
@@ -16,21 +16,21 @@
 #
  
 # norootforbuild
- 
-Name:           libtqt4
-License:        GPLv2+
-Group:          Graphical Desktop/TDE
-Summary:        Interface and abstraction library for Qt and Trinity
-Version:        3.5.12.99
-Release:        1%{dist}
-Source0:        %{name}-%{version}.tar.bz2
-URL:        	http://www.trinitydesktop.org/
- 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+
+Name:		libtqt4
+License:	GPLv2+
+Group:		Graphical Desktop/TDE
+Summary:	Interface and abstraction library for Qt and Trinity
+Version:	3.5.12.99
+Release:	1
+Source0:	tqtinterface-%{version}.tar.bz2
+URL:		http://www.trinitydesktop.org/
+
+BuildRoot:	%{_tmppath}/%{name}-%{version}-build
 
 %define with_qt3 1
 %define with_qt4 0
- 
+
 %if %{with_qt3}
 BuildRequires: qt3-devel >= 3.3.8c
 Requires: qt3 >= 3.3.8c
@@ -45,25 +45,25 @@ BuildRequires: cmake
 BuildRequires: pkgconfig
 BuildRequires: libtool
 BuildRequires: gcc-c++
- 
+
 %description
 This package includes libraries that abstract the underlying Qt system
 from the actual Trinity code, allowing easy, complete upgrades to new
 versions of Qt.
- 
+
 It also contains various functions that have been removed from newer
 versions of Qt, but are completely portable and isolated from other
 APIs such as Xorg. This allows the Trinity project to efficiently
 perform certain operations that are infeasible or unneccessarily
 difficult when using pure Qt4 or above.
- 
+
 Authors:
 --------
     Timothy Pearson <[email protected]>
     Robert Xu <[email protected]>
     Tim Williams <[email protected]>
     Serghei Amelian <[email protected]>
- 
+
 %package devel
 Summary: TQtinterface header files
 Group: Graphical Desktop/TDE
@@ -77,16 +77,16 @@ Requires: libqt4-devel >= 4.7.0
 %description devel
 This package contains Trinity KDE specific window options and commands.
 You need this package to compile Trinity modules. (TQT headers)
- 
- 
+
+
 Authors:
 --------
     Timothy Pearson <[email protected]>
     Robert Xu <[email protected]>
     Tim Williams <[email protected]>
     Serghei Amelian <[email protected]>
- 
- 
+
+
 %package tools
 Summary: TQtinterface library files
 Group: Graphical Desktop/TDE
@@ -94,21 +94,17 @@ Requires: libtqt4
 %description tools
 This package contains Trinity KDE specific window options and commands.
 It includes tools to help you modify and use TQtinterface.
- 
+
 Authors:
 --------
     Timothy Pearson <[email protected]>
     Robert Xu <[email protected]>
     Tim Williams <[email protected]>
     Serghei Amelian <[email protected]>
- 
- 
+
+
 %prep
-%if %{with_qt3}
-%setup -qn tqtinterface-qt3-%{version}
-%else
-%setup -qn tqtinterface-qt4-%{version}
-%endif
+%setup -qn tqtinterface-%{version}
 
 %build
 CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ;
@@ -117,53 +113,56 @@ FFLAGS="${FFLAGS:-%optflags}" ; export FFLAGS ;
 mkdir build
 cd build
 cmake \
-        -DCMAKE_VERBOSE_MAKEFILE=ON \
-        -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \
-        -DCMAKE_INSTALL_LIBDIR:PATH=%{_libdir} \
-        -DINCLUDE_INSTALL_DIR:PATH=%{_includedir} \
-        -DLIB_INSTALL_DIR:PATH=%{_libdir} \
-        -DSYSCONF_INSTALL_DIR:PATH=%{_sysconfdir} \
-        -DSHARE_INSTALL_PREFIX:PATH=%{_datadir} \
+	-DCMAKE_VERBOSE_MAKEFILE=ON \
+	-DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \
+	-DCMAKE_INSTALL_LIBDIR:PATH=%{_libdir} \
+	-DINCLUDE_INSTALL_DIR:PATH=%{_includedir} \
+	-DLIB_INSTALL_DIR:PATH=%{_libdir} \
+	-DSYSCONF_INSTALL_DIR:PATH=%{_sysconfdir} \
+	-DSHARE_INSTALL_PREFIX:PATH=%{_datadir} \
 %if "%{?_lib}" == "lib64"
-        -DLIB_SUFFIX=64 \
+	-DLIB_SUFFIX=64 \
 %endif
-        -DBUILD_SHARED_LIBS:BOOL=ON \
+	-DBUILD_SHARED_LIBS:BOOL=ON \
 %if %{with_qt3}
-     -DWITH_QT3=ON \
+	-DQT_VERSION=3 \
 %endif
 %if %{with_qt4}
-     -DWITH_QT4=ON \
+	-DQT_VERSION=4 \
 %endif
-     -DQT_LIBRARY_DIRS=/usr/lib/qt3/%{_lib} \
-     -DQT_INCLUDE_DIRS=/usr/lib/qt3/include \
-     -DPKGCONFIG_INSTALL_DIR=%{_libdir}/pkgconfig \
-     ../
- 
+	-DQT_LIBRARY_DIRS=/usr/lib/qt3/%{_lib} \
+	-DQT_INCLUDE_DIRS=/usr/lib/qt3/include \
+	-DPKGCONFIG_INSTALL_DIR=%{_libdir}/pkgconfig \
+	../
+
 make %{?_smp_mflags} VERBOSE=1
- 
+
 %install
- 
+cd build
 make DESTDIR=%{buildroot} install
- 
+rm -rf %{buildroot}/%{_libdir}/*.la
+
+# What is this? Leftovers?!
+rm -rf %{buildroot}/%{_libdir}/debug
+
 %clean
 rm -rf $RPM_BUILD_ROOT
- 
+
 %post -p /sbin/ldconfig
- 
+
 %postun -p /sbin/ldconfig
- 
+
 %files
 %defattr(-,root,root,755)
-%{_libdir}/libtqt.so
-%{_libdir}/libtqt.so.4
-%{_libdir}/libtqt.so.4.2.0
- 
+%{_libdir}/libtqt.so*
+%{_libdir}/libtqassistantclient.so*
+
 %files devel
 %defattr(-,root,root,755)
 %dir %{_includedir}/Qt
 %{_includedir}/Qt/q*.h
 %{_includedir}/tq*.h
-%{_libdir}/pkgconfig/TQt.pc
+%{_libdir}/pkgconfig/tqt.pc
 
 %files tools
 %defattr(-,root,root,755)
@@ -178,6 +177,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/tmoc
 %{_bindir}/tqt-replace
 %{_bindir}/tqt-replace-stream
- 
-%changelog
+%{_bindir}/uic-tqt
 
+%changelog
diff --git a/opensuse/libtqt4/tqtinterface-3.5.12.99.tar.bz2 b/opensuse/libtqt4/tqtinterface-3.5.12.99.tar.bz2
new file mode 100644
index 000000000..d74475745
--- /dev/null
+++ b/opensuse/libtqt4/tqtinterface-3.5.12.99.tar.bz2
diff --git a/opensuse/tde-filesystem/tde-filesystem.spec b/opensuse/tde-filesystem/tde-filesystem.spec
index 24ac3450b..78aad7dbf 100644
--- a/opensuse/tde-filesystem/tde-filesystem.spec
+++ b/opensuse/tde-filesystem/tde-filesystem.spec
@@ -28,6 +28,8 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Summary:        Trinity Directory Layout
 Source0:        macros.tde
 Source1:        COPYING
+# Spare Dependency that we want tde-filesystem to pull in.
+Requires:	cmake
 
 %description
 This package installs the Trinity directory structure.
diff --git a/opensuse/tdelibs/tdelibs.spec b/opensuse/tdelibs/tdelibs.spec
index f5adb19ae..af9374c3c 100644
--- a/opensuse/tdelibs/tdelibs.spec
+++ b/opensuse/tdelibs/tdelibs.spec
@@ -25,7 +25,7 @@ BuildRequires:  libxslt-devel openldap2-devel pcre-devel libtqt4-devel sgml-skel
 BuildRequires:  db-devel libacl-devel libattr-devel unsermake update-desktop-files utempter
 BuildRequires:  unzip
 BuildRequires:  avahi-compat-mDNSResponder-devel fdupes libbz2-devel libjasper-devel
-BuildRequires:  libdrm-devel tde-filesystem
+BuildRequires:  libdrm-devel tde-filesystem cmake
 URL:            http://www.trinitydesktop.org
 License:        BSD3c(or similar) ; GPLv2+ ; LGPLv2.1+
 Group:          System/GUI/TDE