summaryrefslogtreecommitdiffstats
path: root/opensuse
diff options
context:
space:
mode:
Diffstat (limited to 'opensuse')
-rw-r--r--opensuse/arts/arts-1.5.10.tar.bz2bin0 -> 768744 bytes
-rw-r--r--opensuse/arts/arts.spec14
-rwxr-xr-xopensuse/gentarball38
-rw-r--r--opensuse/tde-filesystem/macros.tde30
-rw-r--r--opensuse/tdelibs/tdelibs.spec6
5 files changed, 56 insertions, 32 deletions
diff --git a/opensuse/arts/arts-1.5.10.tar.bz2 b/opensuse/arts/arts-1.5.10.tar.bz2
new file mode 100644
index 000000000..3c05e242b
--- /dev/null
+++ b/opensuse/arts/arts-1.5.10.tar.bz2
Binary files differ
diff --git a/opensuse/arts/arts.spec b/opensuse/arts/arts.spec
index 988b6207e..1e0bf03b4 100644
--- a/opensuse/arts/arts.spec
+++ b/opensuse/arts/arts.spec
@@ -25,7 +25,7 @@ License: GPLv2+
Group: Productivity/Multimedia/Sound/Players
Summary: Modular Software Synthesizer
PreReq: permissions
-Version: 3.5.12.99
+Version: 1.5.10
Release: 1
Source0: %{name}-%{version}.tar.bz2
Source1: artswrapper.7.gz
@@ -86,7 +86,7 @@ Authors:
Stefan Westerfeld <stefan@space.twc.de>
%prep
-%setup -q
+%setup -qn arts-%{version}
%patch2
%patch5
%patch7
@@ -94,7 +94,9 @@ Authors:
%patch9
%build
-CXXFLAGS="$CXXFLAGS $RPM_OPT_FLAGS -DNDEBUG" CFLAGS="$CXXFLAGS" %cmake_tde -d=build
+CXXFLAGS="$CXXFLAGS $RPM_OPT_FLAGS -DNDEBUG" CFLAGS="$CXXFLAGS" %cmake_tde -d build -- -DWITH_MAD=OFF -DCMAKE_SKIP_RPATH=OFF
+
+# shut off MAD support because that is only available in packman
#%ifarch %ix86
# I trust in arts runtime checking ...
@@ -105,10 +107,10 @@ CXXFLAGS="$CXXFLAGS $RPM_OPT_FLAGS -DNDEBUG" CFLAGS="$CXXFLAGS" %cmake_tde -d=bu
# broken automake ?
#make %{?jobs:-j%jobs}
-%make_tde -d=build
+%make_tde -d build
%install
-%makeinstall_tde -d=build
+%makeinstall_tde -d build
%ifarch x86_64
mkdir -p $RPM_BUILD_ROOT/%{_tde_libdir}
ln -sf ../lib64/mcop $RPM_BUILD_ROOT/%{_tde_libdir}/mcop
@@ -142,7 +144,7 @@ rm -rf $RPM_BUILD_ROOT
%{_tde_bindir}/artscat
%{_tde_bindir}/arts[dpsr]*
%verify(not mode) %{_tde_bindir}/artswrapper
-%dir /opt/kde3/%_lib
+%dir %{_tde_libdir}
%{_tde_libdir}/libarts*.so.*
%{_tde_libdir}/libkmedia2*.so.*
%{_tde_libdir}/libmcop.so.*
diff --git a/opensuse/gentarball b/opensuse/gentarball
index 20df73b6b..9ef2732f7 100755
--- a/opensuse/gentarball
+++ b/opensuse/gentarball
@@ -1,9 +1,11 @@
#!/bin/bash
-VERSION=$1
-if [ "$1" == "" ]; then
+# BEGIN VERSIONS
VERSION=3.5.12.99
-fi
+ARTS_VERSION=1.5.10
+DBUS_TQT_VERSION=0.62
+DBUS_1_TQT_VERSION=0.8.1
+# END VERSIONS
createTarball()
{
@@ -20,10 +22,19 @@ rm -rf $NAME
echo "done"
}
+grabMain()
+{
+svn export svn://anonsvn.kde.org/home/kde/branches/trinity/$NAME
+createTarball
+rm -rf $NAME
+echo "done"
+}
+
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 "Version defaults to $VERSION. If you want to change it,"
+echo "please pass it as a parameter to this script. There may"
+echo "be other versions used, see the \"versions\" file."
echo ""
echo "Let's start off by dependencies, main, or apps."
echo "Which one?"
@@ -44,13 +55,24 @@ if [ "$SELECTION" = "1" ]; then
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';
+ elif [ "$CHOICE" = "2" ]; then NAME='dbus-tqt' && VERSION=$DBUS_TQT_VERSION;
+ elif [ "$CHOICE" = "3" ]; then NAME='dbus-1-tqt' && VERSION=$DBUS_1_TQT_VERSION;
+ elif [ "$CHOICE" = "4" ]; then NAME='arts' && VERSION=$ARTS_VERSION;
else
echo "Invalid, bye." && exit 1
fi
grabDepends
+elif [ "$SELECTION" = "2" ]; then
+ clear
+ echo "Main: Select what you want us to generate."
+ echo "(1) tdelibs"
+ read CHOICE
+
+ if [ "$CHOICE" = "1" ]; then NAME='kdelibs';
+ else
+ echo "Invalid, bye." && exit 1
+ fi
+ grabMain
else
echo "Invalid, bye." && exit 1
fi
diff --git a/opensuse/tde-filesystem/macros.tde b/opensuse/tde-filesystem/macros.tde
index 807910c18..b488ea8e7 100644
--- a/opensuse/tde-filesystem/macros.tde
+++ b/opensuse/tde-filesystem/macros.tde
@@ -57,21 +57,21 @@
cd $dir \
bdir=.. } \
cmake -DCMAKE_SKIP_RPATH=ON \\\
- -DCMAKE_INSTALL_PREFIX=%{_tde_prefix} \\\
- -DCMAKE_INSTALL_LIBDIR:PATH=%{_tde_libdir} \\\
-      -DINCLUDE_INSTALL_DIR:PATH=%{_tde_includedir} \\\
- -DLIB_INSTALL_DIR:PATH=%{_tde_libdir} \\\
- -DLIBEXEC_INSTALL_DIR:PATH=%{_tde_libexecdir} \\\
- -DLIB_SUFFIX="$_tde_libsuffix" \\\
- -DSYSCONF_INSTALL_DIR:PATH=%{_sysconfdir} \\\
- -DCMAKE_BUILD_TYPE=%{_tde_build_type} \\\
- -DCMAKE_VERBOSE_MAKEFILE=ON \\\
-      -DQT_LIBRARY_DIRS=/usr/lib/qt3/%{_lib} \\\
-      -DQT_INCLUDE_DIRS=/usr/lib/qt3/include \\\
- -DPKGCONFIG_INSTALL_DIR=%{_libdir}/pkgconfig \\\
- -DMAN_INSTALL_DIR=%{_mandir} \\\
- -DINFO_INSTALL_DIR=%{_infodir} \\\
- $bdir %* \
+ -DCMAKE_INSTALL_PREFIX=%{_tde_prefix} \\\
+ -DCMAKE_INSTALL_LIBDIR:PATH=%{_tde_libdir} \\\
+ -DINCLUDE_INSTALL_DIR:PATH=%{_tde_includedir} \\\
+ -DLIB_INSTALL_DIR:PATH=%{_tde_libdir} \\\
+ -DLIBEXEC_INSTALL_DIR:PATH=%{_tde_libexecdir} \\\
+ -DLIB_SUFFIX="$_tde_libsuffix" \\\
+ -DSYSCONF_INSTALL_DIR:PATH=%{_sysconfdir} \\\
+ -DCMAKE_BUILD_TYPE=%{_tde_build_type} \\\
+ -DCMAKE_VERBOSE_MAKEFILE=ON \\\
+ -DQT_LIBRARY_DIRS=/usr/lib/qt3/%{_lib} \\\
+ -DQT_INCLUDE_DIRS=/usr/lib/qt3/include \\\
+ -DPKGCONFIG_INSTALL_DIR=%{_libdir}/pkgconfig \\\
+ -DMAN_INSTALL_DIR=%{_mandir} \\\
+ -DINFO_INSTALL_DIR=%{_infodir} \\\
+ $bdir %* \
if [ "$bdir" == ".." ]; then \
cd .. \
fi \
diff --git a/opensuse/tdelibs/tdelibs.spec b/opensuse/tdelibs/tdelibs.spec
index af9374c3c..2a51059ea 100644
--- a/opensuse/tdelibs/tdelibs.spec
+++ b/opensuse/tdelibs/tdelibs.spec
@@ -367,7 +367,7 @@ CXXFLAGS="$CXXFLAGS -fno-strict-aliasing"
export PATH=/usr/lib/mit/bin:$PATH
# fast-malloc is not needed anymore
-%cmake_tde -d=build \
+%cmake_tde -d build \
-DKDE_MALLOC_FULL=OFF \
-DKDE_MALLOC=OFF \
-DKDE_DISTRIBUTION="$DISTRI" \
@@ -377,7 +377,7 @@ CXXFLAGS="$CXXFLAGS -fno-strict-aliasing"
-DENABLE_DNOFIFY=ON \
%endif
-%make_tde -d=build
+%make_tde -d build
#
xmlcatbin=/usr/bin/xmlcatalog
@@ -413,7 +413,7 @@ sed '/<catalog/a\
%{FOR_ROOT_CAT}.tmp > %{FOR_ROOT_CAT}
%install
- %makeinstall -d=build
+ %makeinstall_tde -d build
mkdir -p $RPM_BUILD_ROOT/%{_tde_configkcfgdir}
install -D %SOURCE9 $RPM_BUILD_ROOT/%{_tde_icondir}/crystalsvg/16x16/filesystems/file_broken.png
mv $RPM_BUILD_ROOT/etc/xdg/menus/applications.menu \