summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Xu <robxu9@gmail.com>2011-08-14 22:18:41 -0400
committerRobert Xu <robxu9@gmail.com>2011-08-14 22:18:41 -0400
commitfbc1d6223981533b363c7688d825ba56e26c0b40 (patch)
treee29437a5ce481a23c473c6e4d6a69f41dad1d0a2
parente8724f63ecf6c4b6ce612fd56ff81c27a028b70d (diff)
downloadtde-packaging-fbc1d6223981533b363c7688d825ba56e26c0b40.tar.gz
tde-packaging-fbc1d6223981533b363c7688d825ba56e26c0b40.zip
myriad of little fixes
-rwxr-xr-xopensuse/gentarball23
-rw-r--r--opensuse/libtqt4/libtqt4.spec21
2 files changed, 27 insertions, 17 deletions
diff --git a/opensuse/gentarball b/opensuse/gentarball
index 593539a5a..20df73b6b 100755
--- a/opensuse/gentarball
+++ b/opensuse/gentarball
@@ -5,18 +5,25 @@ if [ "$1" == "" ]; then
VERSION=3.5.12.99
fi
-grabDependsTarball()
+createTarball()
{
-svn export svn://anonsvn.kde.org/home/kde/branches/trinity/dependencies/$NAME
-mv -v $NAME $NAME-$VERSION
+cp -r $NAME $NAME-$VERSION
tar cjf $NAME-$VERSION.tar.bz2 $NAME-$VERSION
rm -rf $NAME-$VERSION
-echo "done"
}
+grabDepends()
+{
+svn export svn://anonsvn.kde.org/home/kde/branches/trinity/dependencies/$NAME
+createTarball
+rm -rf $NAME
+echo "done"
+}
-echo "This is for testing locally without services."
-echo "I need to know what tarball you want to generate from."
+echo "I need to know what you want to generate a tarball for."
+echo ""
+echo "Version is set to $VERSION. If you want to change it,"
+echo "please pass it as a parameter to this script."
echo ""
echo "Let's start off by dependencies, main, or apps."
echo "Which one?"
@@ -28,6 +35,8 @@ echo -e "> "
read SELECTION
if [ "$SELECTION" = "1" ]; then
+ clear
+ echo "Dependencies: Select what you want us to generate."
echo "(1) libtqt4"
echo "(2) dbus-1-tqt"
echo "(3) libdbus-1-tqt-0"
@@ -41,7 +50,7 @@ if [ "$SELECTION" = "1" ]; then
else
echo "Invalid, bye." && exit 1
fi
- grabDependsTarball
+ grabDepends
else
echo "Invalid, bye." && exit 1
fi
diff --git a/opensuse/libtqt4/libtqt4.spec b/opensuse/libtqt4/libtqt4.spec
index 54a9c6256..d567e5e2e 100644
--- a/opensuse/libtqt4/libtqt4.spec
+++ b/opensuse/libtqt4/libtqt4.spec
@@ -67,7 +67,7 @@ Authors:
%package devel
Summary: TQtinterface header files
Group: Graphical Desktop/TDE
-Requires: libtqt4
+Requires: libtqt4 = %{version}
%if %{with_qt3}
Requires: qt3-devel >= 3.3.8c
%endif
@@ -75,7 +75,7 @@ Requires: qt3-devel >= 3.3.8c
Requires: libqt4-devel >= 4.7.0
%endif
%description devel
-This package contains Trinity KDE specific window options and commands.
+This package contains Trinity specific window options and commands.
You need this package to compile Trinity modules. (TQT headers)
@@ -87,12 +87,11 @@ Authors:
    Serghei Amelian <serghei@thel.ro>
-%package tools
-Summary: TQtinterface library files
+%package -n tqtinterface
+Summary: Tools to help with TQt
Group: Graphical Desktop/TDE
-Requires: libtqt4
-%description tools
-This package contains Trinity KDE specific window options and commands.
+%description -n tqtinterface
+This package contains Trinity specific window options and commands.
It includes tools to help you modify and use TQtinterface.
Authors:
@@ -154,8 +153,8 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,755)
-%{_libdir}/libtqt.so*
-%{_libdir}/libtqassistantclient.so*
+%{_libdir}/libtqt.so.*
+%{_libdir}/libtqassistantclient.so.*
%files devel
%defattr(-,root,root,755)
@@ -163,8 +162,10 @@ rm -rf $RPM_BUILD_ROOT
%{_includedir}/Qt/q*.h
%{_includedir}/tq*.h
%{_libdir}/pkgconfig/tqt.pc
+%{_libdir}/libtqt.so
+%{_libdir}/libtqassistantclient.so
-%files tools
+%files -n tqtinterface
%defattr(-,root,root,755)
%{_bindir}/convert_qt_tqt1
%{_bindir}/convert_qt_tqt2