Hello community,

here is the log from the commit of package wv2 for openSUSE:Factory checked in 
at 2015-03-05 15:43:42
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/wv2 (Old)
 and      /work/SRC/openSUSE:Factory/.wv2.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "wv2"

Changes:
--------
--- /work/SRC/openSUSE:Factory/wv2/wv2.changes  2012-02-15 22:26:35.000000000 
+0100
+++ /work/SRC/openSUSE:Factory/.wv2.new/wv2.changes     2015-03-05 
18:17:33.000000000 +0100
@@ -1,0 +2,7 @@
+Wed Mar  4 19:30:04 UTC 2015 - mplus...@suse.com
+
+- Cleanup spec file with spec-cleaner
+- User url for source
+- Add gpg signature
+
+-------------------------------------------------------------------

New:
----
  wv2-0.4.2.tar.bz2.asc
  wv2.keyring

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ wv2.spec ++++++
--- /var/tmp/diff_new_pack.ImxH03/_old  2015-03-05 18:17:34.000000000 +0100
+++ /var/tmp/diff_new_pack.ImxH03/_new  2015-03-05 18:17:34.000000000 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package wv2
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -23,7 +23,9 @@
 License:        LGPL-2.1+
 Group:          Productivity/Publishing/Word
 Url:            http://sourceforge.net/projects/wvware
-Source:         %{name}-%{version}.tar.bz2
+Source0:        
http://sourceforge.net/projects/wvware/files/%{name}-%{version}.tar.bz2
+Source1:        
http://sourceforge.net/projects/wvware/files/%{name}-%{version}.tar.bz2.asc
+Source2:        %{name}.keyring
 Patch0:         glib_include.patch
 BuildRequires:  cmake
 BuildRequires:  gcc-c++
@@ -46,9 +48,9 @@
 Summary:        Library for Importing  Microsoft Word(tm) Documents - 
development files
 Group:          Development/Libraries/C and C++
 Requires:       bzip2
+Requires:       lib%{name}-4 = %{version}
 Requires:       libgsf-devel
 Requires:       libstdc++-devel
-Requires:       lib%{name}-4 = %{version}
 
 %description devel
 The wv2 library is used to import Microsoft Word documents in koffice
@@ -60,23 +62,24 @@
 
 %build
 export CXXFLAGS="%optflags -fvisibility-inlines-hidden"
-cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \
-%if "%{_lib}" == "lib64"
--DLIB_SUFFIX=64 \
-%endif
-.
-# THAT DOT BELONGS TO THE CMAKE CALL
+# build fails with %%cmake macro
+cmake \
+       -DCMAKE_INSTALL_PREFIX=%{_prefix} \
+       %if "%{_lib}" == "lib64"
+       -DLIB_SUFFIX=64 \
+       %endif
+
 make VERBOSE=1 %{?_smp_mflags}
 
 %install
-%makeinstall
-  find %{buildroot}%{_libdir} -type f -name '*.la' -delete -print
-  mkdir -p %{buildroot}%_defaultdocdir/wv2/
+%make_install
+find %{buildroot} -type f -name "*.la" -delete -print
+  mkdir -p %{buildroot}%{_defaultdocdir}/wv2/
   cp -a doc AUTHORS README TODO COPYING.LIB \
-        %{buildroot}%_defaultdocdir/wv2/
-  rm -rf %{buildroot}%_defaultdocdir/wv2/doc/escher/CVS
-  rm -rf %{buildroot}%_defaultdocdir/wv2/doc/CVS
-  rm -rf %{buildroot}%_defaultdocdir/wv2/doc/.cvsignore
+        %{buildroot}%{_defaultdocdir}/wv2/
+  rm -rf %{buildroot}%{_defaultdocdir}/wv2/doc/escher/CVS
+  rm -rf %{buildroot}%{_defaultdocdir}/wv2/doc/CVS
+  rm -rf %{buildroot}%{_defaultdocdir}/wv2/doc/.cvsignore
 
 %post -n libwv2-4 -p /sbin/ldconfig
 
@@ -84,16 +87,16 @@
 
 %files -n libwv2-4
 %defattr(-, root, root)
-%dir %_defaultdocdir/wv2
-%doc %_defaultdocdir/wv2/AUTHORS
-%doc %_defaultdocdir/wv2/COPYING.LIB
+%dir %{_defaultdocdir}/wv2
+%doc %{_defaultdocdir}/wv2/AUTHORS
+%doc %{_defaultdocdir}/wv2/COPYING.LIB
 /%{_libdir}/libwv2.so.*
 
 %files devel
 %defattr(-, root, root)
-%doc %_defaultdocdir/wv2/doc
-%doc %_defaultdocdir/wv2/README
-%doc %_defaultdocdir/wv2/TODO
+%doc %{_defaultdocdir}/wv2/doc
+%doc %{_defaultdocdir}/wv2/README
+%doc %{_defaultdocdir}/wv2/TODO
 %{_bindir}/wv2-config
 %{_includedir}/wv2
 %{_libdir}/libwv2.so

++++++ glib_include.patch ++++++
--- /var/tmp/diff_new_pack.ImxH03/_old  2015-03-05 18:17:34.000000000 +0100
+++ /var/tmp/diff_new_pack.ImxH03/_new  2015-03-05 18:17:34.000000000 +0100
@@ -1,6 +1,7 @@
-diff -rupN wv2-0.4.2.orig/src/olestream.h wv2-0.4.2/src/olestream.h
---- wv2-0.4.2.orig/src/olestream.h     2009-10-31 19:22:43.000000000 +0100
-+++ wv2-0.4.2/src/olestream.h  2012-01-09 14:51:45.297024876 +0100
+Index: wv2-0.4.2/src/olestream.h
+===================================================================
+--- wv2-0.4.2.orig/src/olestream.h
++++ wv2-0.4.2/src/olestream.h
 @@ -23,7 +23,7 @@
  #include "global.h"  // U8,... typedefs
  #include <stack>

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to