RPM Packaging: TDE 3.5.13.2 updates for openSUSE 13.1

pull/3/head
François Andriot 11 years ago
parent e9e7fa5432
commit b4b8ef98b6

@ -66,7 +66,8 @@ has the user-friendly menu options of a normal TDE application.
%build %build
unset QTDIR; . /etc/profile.d/qt3.sh unset QTDIR QTINC QTLIB
. /etc/profile.d/qt3.sh
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
@ -78,10 +79,10 @@ if [ -d "/usr/X11R6" ]; then
export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
fi fi
%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} if ! rpm -E %%cmake|grep -q "cd build"; then
%__mkdir_p build %__mkdir_p build
cd build cd build
%endif fi
%cmake \ %cmake \
-DCMAKE_BUILD_TYPE="RelWithDebInfo" \ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \

@ -358,7 +358,8 @@ use any of xmms' visualisation plugins with Amarok.
%endif %endif
%build %build
unset QTDIR; . /etc/profile.d/qt3.sh unset QTDIR QTINC QTLIB
. /etc/profile.d/qt3.sh
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"

@ -73,14 +73,15 @@ a way to configure it from within KControl.
%build %build
unset QTDIR || : ; . /etc/profile.d/qt3.sh unset QTDIR QTINC QTLIB
. /etc/profile.d/qt3.sh
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} if ! rpm -E %%cmake|grep -q "cd build"; then
%__mkdir_p build %__mkdir_p build
cd build cd build
%endif fi
%cmake \ %cmake \
-DCMAKE_BUILD_TYPE="RelWithDebInfo" \ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \

@ -75,7 +75,8 @@ Homepage: http://www.kbfx.org
-e "s|/usr/include/tqt|%{tde_includedir}/tqt|" -e "s|/usr/include/tqt|%{tde_includedir}/tqt|"
%build %build
unset QTDIR || : ; . /etc/profile.d/qt3.sh unset QTDIR QTINC QTLIB
. /etc/profile.d/qt3.sh
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
@ -85,10 +86,10 @@ if [ -d "/usr/X11R6" ]; then
export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
fi fi
%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} if ! rpm -E %%cmake|grep -q "cd build"; then
%__mkdir_p build %__mkdir_p build
cd build cd build
%endif fi
%cmake \ %cmake \
-DCMAKE_BUILD_TYPE="RelWithDebInfo" \ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
@ -103,6 +104,7 @@ cd build
-DDATA_INSTALL_DIR=%{tde_datadir}/apps \ -DDATA_INSTALL_DIR=%{tde_datadir}/apps \
-DMIME_INSTALL_DIR=%{tde_datadir}/mimelnk \ -DMIME_INSTALL_DIR=%{tde_datadir}/mimelnk \
-DXDG_APPS_INSTALL_DIR=%{tde_tdeappdir} \ -DXDG_APPS_INSTALL_DIR=%{tde_tdeappdir} \
-DSHARE_INSTALL_PREFIX="%{tde_datadir}"\
-DDOC_INSTALL_DIR=%{tde_tdedocdir} \ -DDOC_INSTALL_DIR=%{tde_tdedocdir} \
-DLIB_INSTALL_DIR=%{tde_libdir} \ -DLIB_INSTALL_DIR=%{tde_libdir} \
\ \

@ -73,11 +73,10 @@ unset QTDIR; . /etc/profile.d/qt3.sh
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} if ! rpm -E %%cmake|grep -q "cd build"; then
%__mkdir_p build %__mkdir_p build
cd build cd build
%endif fi
%cmake \ %cmake \
-DCMAKE_BUILD_TYPE="RelWithDebInfo" \ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \

@ -109,10 +109,10 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
%__mkdir_p cmake %__mkdir_p cmake
%__ln_s %{tde_datadir}/cmake cmake/modules %__ln_s %{tde_datadir}/cmake cmake/modules
%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} if ! rpm -E %%cmake|grep -q "cd build"; then
%__mkdir_p build %__mkdir_p build
cd build cd build
%endif fi
%cmake \ %cmake \
-DCMAKE_BUILD_TYPE="RelWithDebInfo" \ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \

@ -96,10 +96,10 @@ unset QTDIR || : ; . /etc/profile.d/qt3.sh
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} if ! rpm -E %%cmake|grep -q "cd build"; then
%__mkdir_p build %__mkdir_p build
cd build cd build
%endif fi
%cmake \ %cmake \
-DCMAKE_BUILD_TYPE="RelWithDebInfo" \ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \

@ -130,10 +130,10 @@ export PATH="%{tde_bindir}:${PATH}"
export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_tdeincludedir}" export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_tdeincludedir}"
%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} if ! rpm -E %%cmake|grep -q "cd build"; then
%__mkdir_p build %__mkdir_p build
cd build cd build
%endif fi
%cmake \ %cmake \
-DCMAKE_BUILD_TYPE="RelWithDebInfo" \ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \

@ -88,10 +88,10 @@ fi
%__rm -f "po/tr.po" %__rm -f "po/tr.po"
%endif %endif
%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} if ! rpm -E %%cmake|grep -q "cd build"; then
%__mkdir_p build %__mkdir_p build
cd build cd build
%endif fi
%cmake \ %cmake \
-DCMAKE_BUILD_TYPE="RelWithDebInfo" \ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \

@ -80,10 +80,10 @@ if [ -d /usr/X11R6 ]; then
export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
fi fi
%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} if ! rpm -E %%cmake|grep -q "cd build"; then
%__mkdir_p build %__mkdir_p build
cd build cd build
%endif fi
%cmake \ %cmake \
-DCMAKE_BUILD_TYPE="RelWithDebInfo" \ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \

@ -122,10 +122,10 @@ unset QTDIR; . /etc/profile.d/qt3.sh
export PATH="%{tde_bindir}:${QTDIR}/bin:${PATH}" export PATH="%{tde_bindir}:${QTDIR}/bin:${PATH}"
export CMAKE_INCLUDE_PATH="%{tde_tdeincludedir}" export CMAKE_INCLUDE_PATH="%{tde_tdeincludedir}"
%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} if ! rpm -E %%cmake|grep -q "cd build"; then
%__mkdir_p build %__mkdir_p build
cd build cd build
%endif fi
%cmake \ %cmake \
-DCMAKE_BUILD_TYPE="RelWithDebInfo" \ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \

@ -80,10 +80,10 @@ if [ -d "/usr/X11R6" ]; then
export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
fi fi
%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} if ! rpm -E %%cmake|grep -q "cd build"; then
%__mkdir_p build %__mkdir_p build
cd build cd build
%endif fi
%cmake \ %cmake \
-DCMAKE_BUILD_TYPE="RelWithDebInfo" \ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \

@ -54,8 +54,8 @@ BuildRequires: desktop-file-utils
BuildRequires: gettext BuildRequires: gettext
# Python stuff # Python stuff
BuildRequires: trinity-python-trinity-devel
BuildRequires: python-qt3-devel BuildRequires: python-qt3-devel
BuildRequires: trinity-python-trinity-devel
Requires: trinity-libpythonize0 = %{version}-%{release} Requires: trinity-libpythonize0 = %{version}-%{release}
@ -175,7 +175,8 @@ fi
%build %build
unset QTDIR QTINC QTLIB; . /etc/profile.d/qt3.sh unset QTDIR QTINC QTLIB
. /etc/profile.d/qt3.sh
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
export PYTHONPATH=%{python_sitearch}/trinity-sip:%{python_sitearch}/python-qt3 export PYTHONPATH=%{python_sitearch}/trinity-sip:%{python_sitearch}/python-qt3
@ -183,7 +184,8 @@ export PYTHONPATH=%{python_sitearch}/trinity-sip:%{python_sitearch}/python-qt3
./setup.py build_libpythonize ./setup.py build_libpythonize
%install %install
unset QTDIR QTINC QTLIB; . /etc/profile.d/qt3.sh unset QTDIR QTINC QTLIB
. /etc/profile.d/qt3.sh
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
export PYTHONPATH=%{python_sitearch}/trinity-sip:%{python_sitearch}/python-qt3 export PYTHONPATH=%{python_sitearch}/trinity-sip:%{python_sitearch}/python-qt3

@ -7,7 +7,7 @@ tdm_start_proc() {
} }
tdm_vars() { tdm_vars() {
if [ -x /opt/trinity/bin/kdm ]; then if [ -x /opt/trinity/bin/kdm ]; then
TDM_BIN=/opt/trinity/bin/kdm TDM_BIN=/opt/trinity/bin/kdm
export KDEROOTHOME=/root/.tdm export KDEROOTHOME=/root/.tdm
else else

Loading…
Cancel
Save