Hello community,
here is the log from the commit of package hydrogen for openSUSE:12.1 checked
in at 2011-10-26 20:16:41
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:12.1/hydrogen (Old)
and /work/SRC/openSUSE:12.1/.hydrogen.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hydrogen", Maintainer is "ti...@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:12.1/hydrogen/hydrogen.changes 2011-10-24
12:52:09.000000000 +0200
+++ /work/SRC/openSUSE:12.1/.hydrogen.new/hydrogen.changes 2011-10-28
15:38:41.000000000 +0200
@@ -1,0 +2,18 @@
+Tue Oct 25 14:29:14 UTC 2011 - co...@suse.com
+
+- fix another link into %buildroot
+
+-------------------------------------------------------------------
+Fri Oct 14 14:23:05 UTC 2011 - davejpla...@gmail.com
+
+- Changed build to release due to the default debug build being
+ sluggish.
+
+-------------------------------------------------------------------
+Tue Oct 11 14:37:43 UTC 2011 - davejpla...@gmail.com
+
+- Gave libhydrogen-core.so a SONAME and fixed the <= 11.4 build
+ which needed Qt webkit to have QtXmlPatterns with
+ BuildRequires: pkgconfig(QtXmlPatterns)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ hydrogen.spec ++++++
--- /var/tmp/diff_new_pack.NrqiyJ/_old 2011-10-28 15:38:42.000000000 +0200
+++ /var/tmp/diff_new_pack.NrqiyJ/_new 2011-10-28 15:38:42.000000000 +0200
@@ -25,9 +25,33 @@
%define librubberband 0
Name: hydrogen
-BuildRequires: alsa-devel doxygen flac-devel libjack-devel liblrdf-devel
libqt4-devel libsndfile-devel
+BuildRequires: alsa-devel doxygen flac-devel libjack-devel liblrdf-devel
libqt4-devel libsndfile-devel util-linux
BuildRequires: ladspa ladspa-devel lash-devel libarchive-devel
libraptor-devel portaudio-devel zlib-devel
BuildRequires: cmake fdupes gcc-c++ help2man hicolor-icon-theme pkg-config
rsync subversion update-desktop-files
+BuildRequires: pkgconfig(Qt3Support)
+BuildRequires: pkgconfig(QtCLucene)
+BuildRequires: pkgconfig(QtCore)
+BuildRequires: pkgconfig(QtDBus)
+BuildRequires: pkgconfig(QtDeclarative)
+BuildRequires: pkgconfig(QtDesigner)
+BuildRequires: pkgconfig(QtDesignerComponents)
+BuildRequires: pkgconfig(QtGui)
+BuildRequires: pkgconfig(QtHelp)
+BuildRequires: pkgconfig(QtMultimedia)
+BuildRequires: pkgconfig(QtNetwork)
+BuildRequires: pkgconfig(QtOpenGL)
+BuildRequires: pkgconfig(QtScript)
+BuildRequires: pkgconfig(QtScriptTools)
+BuildRequires: pkgconfig(QtSql)
+BuildRequires: pkgconfig(QtSvg)
+BuildRequires: pkgconfig(QtTest)
+BuildRequires: pkgconfig(QtUiTools)
+BuildRequires: pkgconfig(QtXml)
+BuildRequires: pkgconfig(QtXmlPatterns)
+
+#%%if 0%%{?suse_version} <= 1140
+#BuildRequires: libqt4-devel-doc-data
+#%%endif
#pkgconfig(ladspa-1.13)
%if 0%{?librubberband} == 1
BuildRequires: librubberband-devel
@@ -105,10 +129,11 @@
%build
mkdir -p Build && pushd Build
-cmake ../ -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \
+cmake -L ../ -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \
-DCMAKE_LIBRARY_ARCHITECTURE:STRING=%{_arch} \
-DCMAKE_CXX_FLAGS:STRING="%{optflags} -ggdb" \
-DCMAKE_C_FLAGS:STRING="%{optflags} -ggdb" \
+ -DCMAKE_BUILD_TYPE:STRING=Release \
-DCMAKE_VERBOSE_MAKEFILE:BOOL=on \
-DWANT_SHARED:BOOL=on \
-DWANT_LIBARCHIVE:BOOL=on \
@@ -119,7 +144,7 @@
-DCMAKE_CURRENT_LIBRARY_DIR:PATH="%{_lib}" \
-Dcoreversion:STRING=%{soversion} \
-Dsoage:STRING=%{soage} \
- -Dsorevision:STRING=%{sorevision}
+ -Dsorevision:STRING=%{sorevision} \
# For some reason cmake won't produce a correct soname with only the version
so this is a hack to fix it.
pushd src/core/CMakeFiles/hydrogen-core.dir && \
@@ -133,17 +158,18 @@
make %{?_smp_mflags}
-# LD_LIBRARY_PATH=%%{_libdir}/mpi/gcc/openmpi/%%{_lib} LD_RUN_PATH=%%{_libdir}
+# LD_LIBRARY_PATH=%%{_libdir}/mpi/gcc/openmpi/%%{_lib}
+# LD_RUN_PATH=%%{_libdir}
popd
%install
-export QTDIR=%{_libdir}/qt4/
+#export QTDIR=%%{_libdir}/qt4/
pushd Build
%makeinstall VERBOSE_MAKEFILE=1
-
-cd %{buildroot}%{_libdir} && ln -s
%{buildroot}%{_libdir}/libhydrogen-core.so.0.0.0 libhydrogen-core.so.0
+# libhydrogen-core's internal SONAME = libhydrogen-core.so.0 so we provide a
link.
+cd %{buildroot}%{_libdir} && ln -s libhydrogen-core.so.0.0.0
libhydrogen-core.so.0
popd
# Install the man pages created by help2man
@@ -151,7 +177,7 @@
install -pm 0644 %{S:1} %{S:2} %{buildroot}%{_mandir}/man1/
# temporary link i18n files from usr/share/hydrogen/data/i18n to
_datadir/locale for find_lang to find.
-ln -s %{buildroot}%{_datadir}/hydrogen/data/i18n %{buildroot}%{_datadir}/locale
+ln -s %{_datadir}/hydrogen/data/i18n %{buildroot}%{_datadir}/locale
%find_lang %{name} %{name}.lang --without-kde --with-qt --all-name --without-mo
rm -rf %{buildroot}%{_datadir}/locale
cat %{name}.lang
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
