Hello community,
here is the log from the commit of package soprano
checked in at Tue Oct 14 19:22:13 CEST 2008.
--------
--- soprano/soprano-backend-sesame.changes 2008-10-13 22:21:44.000000000 +0200
+++ /mounts/work_src_done/STABLE/soprano/soprano-backend-sesame.changes 2008-10-14 11:43:12.000000000 +0200
@@ -1,0 +2,5 @@
+Tue Oct 14 11:42:57 CEST 2008 - dmueller@suse.de
+
+- correct spec file splitting again, was ordered incorrect
+
+-------------------------------------------------------------------
soprano.changes: same change
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ soprano-backend-sesame.spec ++++++
--- /var/tmp/diff_new_pack.xc9930/_old 2008-10-14 19:21:34.000000000 +0200
+++ /var/tmp/diff_new_pack.xc9930/_new 2008-10-14 19:21:34.000000000 +0200
@@ -24,18 +24,20 @@
Group: Development/Libraries/C and C++
Summary: C++/Qt based interface library for RDF - Sesame backend
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Provides: soprano_backend = %version
-Provides: backend-sesame2 = %version
-Requires: libsoprano4 = %version
Requires: %(rpm -qf $(readlink /etc/alternatives/java) --qf "%{NAME}")
-# COMMON-BEGIN
-# COMMON-BEGIN
+# COMMON1-BEGIN
+# COMMON1-BEGIN
BuildRequires: cmake kde4-filesystem libqt4-devel libraptor-devel libredland-devel
BuildRequires: clucene-core-devel doxygen raptor
Version: 2.1.1
-Release: 8
+Release: 9
Source: soprano-%{version}.tar.bz2
Patch0: jni-include-fix.diff
+# COMMON1-END
+# COMMON1-END
+Provides: soprano_backend = %version
+Provides: backend-sesame2 = %version
+Requires: libsoprano4 = %version
%description
This package provides a Sesame based backend for Soprano.
@@ -48,10 +50,12 @@
Sebastian Trueg
%prep
+# COMMON2-BEGIN
+# COMMON2-BEGIN
%setup -q -n soprano-%version
%patch0
-# COMMON-END
-# COMMON-END
+# COMMON2-END
+# COMMON2-END
%build
export JAVA_HOME=%{_jvmdir}/java
@@ -77,6 +81,8 @@
%changelog
* Tue Oct 14 2008 dmueller@suse.de
+- correct spec file splitting again, was ordered incorrect
+* Tue Oct 14 2008 dmueller@suse.de
- fix include handling for jni includes to fix ppc build
* Mon Sep 29 2008 dmueller@suse.de
- split sesame backend into seperate spec file to reduce build
++++++ soprano.spec ++++++
--- /var/tmp/diff_new_pack.xc9930/_old 2008-10-14 19:21:34.000000000 +0200
+++ /var/tmp/diff_new_pack.xc9930/_new 2008-10-14 19:21:34.000000000 +0200
@@ -25,17 +25,18 @@
License: GPL v2 or later; LGPL v2.1 or later
Group: Development/Libraries/C and C++
Summary: C++/Qt based interface library for RDF
-Requires: libsoprano4 = %{version}
-Recommends: soprano_backend = %version
-Suggests: soprano-backend-redland
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-# COMMON-BEGIN
+# COMMON1-BEGIN
BuildRequires: cmake kde4-filesystem libqt4-devel libraptor-devel libredland-devel
BuildRequires: clucene-core-devel doxygen raptor
Version: 2.1.1
-Release: 8
+Release: 9
Source: soprano-%{version}.tar.bz2
Patch0: jni-include-fix.diff
+# COMMON1-END
+Requires: libsoprano4 = %{version}
+Recommends: soprano_backend = %version
+Suggests: soprano-backend-redland
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
Soprano is an open and pluggable RDF resource framework which is build
@@ -52,9 +53,10 @@
Sebastian Trueg
%prep
+# COMMON2-BEGIN
%setup -q -n soprano-%version
%patch0
-# COMMON-END
+# COMMON2-END
%package -n libsoprano-devel
License: LGPL v2.1 or later
@@ -184,6 +186,8 @@
%changelog
* Tue Oct 14 2008 dmueller@suse.de
+- correct spec file splitting again, was ordered incorrect
+* Tue Oct 14 2008 dmueller@suse.de
- fix include handling for jni includes to fix ppc build
* Mon Sep 29 2008 dmueller@suse.de
- split sesame backend into seperate spec file to reduce build
++++++ pre_checkin.sh ++++++
--- soprano/pre_checkin.sh 2008-09-29 10:22:32.000000000 +0200
+++ /mounts/work_src_done/STABLE/soprano/pre_checkin.sh 2008-10-14 11:41:51.000000000 +0200
@@ -4,7 +4,11 @@
ln -f soprano.changes soprano-backend-sesame.changes
for spec in soprano-backend-sesame.spec; do
-{ sed -n -e '1,/COMMON-BEGIN/p' $spec.in
- sed -n -e '/COMMON-BEGIN/,/COMMON-END/p' soprano.spec
- sed -n -e '/COMMON-END/,$p' $spec.in; } > $spec.tmp && mv $spec.tmp $spec
+ cp -f $spec.in $spec
+ for n in $(seq 1 10); do
+ grep -q "COMMON$n-BEGIN" soprano.spec || continue
+ { sed -n -e "1,/COMMON$n-BEGIN/p" $spec
+ sed -n -e "/COMMON$n-BEGIN/,/COMMON$n-END/p" soprano.spec
+ sed -n -e "/COMMON$n-END/,\$p" $spec.in; } > $spec.tmp && mv $spec.tmp $spec
+ done
done
++++++ soprano-backend-sesame.spec.in ++++++
--- soprano/soprano-backend-sesame.spec.in 2008-10-13 15:50:04.000000000 +0200
+++ /mounts/work_src_done/STABLE/soprano/soprano-backend-sesame.spec.in 2008-10-14 11:42:23.000000000 +0200
@@ -24,12 +24,20 @@
Group: Development/Libraries/C and C++
Summary: C++/Qt based interface library for RDF
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+Requires: %(rpm -qf $(readlink /etc/alternatives/java) --qf "%{NAME}")
+# COMMON1-BEGIN
+# COMMON1-END
Provides: soprano_backend = %version
Provides: backend-sesame2 = %version
Requires: libsoprano4 = %version
-Requires: %(rpm -qf $(readlink /etc/alternatives/java) --qf "%{NAME}")
-# COMMON-BEGIN
-# COMMON-END
+
+%description
+
+bla
+
+%prep
+# COMMON2-BEGIN
+# COMMON2-END
%build
export JAVA_HOME=%{_jvmdir}/java
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org