Mailinglist Archive: opensuse-commit (1500 mails)

[root@xxxxxxx (h_root)]

Hello community,

here is the log from the commit of package kdissert
checked in at Sun Nov 5 13:49:10 CET 2006.

--------
--- KDE/kdissert/kdissert.changes	2006-05-24 18:56:44.000000000 +0200
+++ /mounts/work_src_done/STABLE/kdissert/kdissert.changes	2006-11-05 11:16:48.000000000 +0100
@@ -1,0 +2,5 @@
+Sun Nov  5 11:16:36 CET 2006 - stbinner@xxxxxxx
+
+- update to 1.0.6: bugfixes and new build system
+
+-------------------------------------------------------------------

Old:
----
  fix-bksys-libsuffix.diff
  kdissert-1.0.5.tar.bz2

New:
----
  kdissert-1.0.6c.tar.bz2

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

Other differences:
------------------
++++++ kdissert.spec ++++++
--- /var/tmp/diff_new_pack.EA33z9/_old	2006-11-05 13:48:58.000000000 +0100
+++ /var/tmp/diff_new_pack.EA33z9/_new	2006-11-05 13:48:58.000000000 +0100
@@ -1,5 +1,5 @@
 #
-# spec file for package kdissert (Version 1.0.5)
+# spec file for package kdissert (Version 1.0.6c)
 #
 # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -11,20 +11,19 @@
 # norootforbuild
 
 Name:           kdissert
-BuildRequires:  kdelibs3-devel python-xml scons
+BuildRequires:  kdelibs3-devel
 %if %suse_version < 1010
-BuildRequires:  kdelibs3-doc
+BuildRequires:  kdelibs3-doc python
 %endif
 Url:            http://freehackers.org/~tnagy/kdissert/
-License:        GPL
+License:        GNU General Public License (GPL) - all versions
 Group:          Productivity/Office/Other
 Autoreqprov:    on
-Version:        1.0.5
-Release:        18
+Version:        1.0.6c
+Release:        1
 Summary:        Mindmapping Tool
 Source:         kdissert-%version.tar.bz2
 #Patch0:       kdissert-%version.diff
-Patch1:         fix-bksys-libsuffix.diff
 Patch2:         install-only-one-desktop-file.diff
 Requires:       kdelibs3 >= %( echo `rpm -q --queryformat '%{VERSION}' kdelibs3`)
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -45,29 +44,25 @@
 %prep
 %setup -q
 #%patch0
-%patch1
 %patch2
-. /etc/opt/kde3/common_options
-
-%build
-QTDIR_bak=$QTDIR
-. /etc/opt/kde3/common_options
-export QTDIR=$QTDIR_bak
 %ifarch x86_64 ppc64 s390x
-scons libsuffix=64
+./waf configure --libsuffix=64
 %else
-scons
+./waf configure
 %endif
 
+%build
+./waf
+
 %install
-. /etc/opt/kde3/common_options
-scons DESTDIR=%{buildroot} install
+./waf --destdir=%{buildroot} install
 %suse_update_desktop_file %name Office ProjectManagement
 %find_lang kdissert
 
 %files
 %defattr(-,root,root)
 /opt/kde3/bin/kdissert
+/opt/kde3/%_lib/kde3/libkdissdocbook.*
 /opt/kde3/%_lib/kde3/libkdissOOOdoc.*
 /opt/kde3/%_lib/kde3/libkdissOOOimpress.*
 /opt/kde3/%_lib/kde3/libkdissapplet.*
@@ -106,6 +101,8 @@
 /opt/kde3/share/services/kdissertpart.desktop
 
 %changelog -n kdissert
+* Sun Nov 05 2006 - stbinner@xxxxxxx
+- update to 1.0.6: bugfixes and new build system
 * Wed May 24 2006 - adrian@xxxxxxx
 - fix build for < 10.1
 * Sun Feb 19 2006 - dmueller@xxxxxxx

++++++ install-only-one-desktop-file.diff ++++++
--- /var/tmp/diff_new_pack.EA33z9/_old	2006-11-05 13:48:58.000000000 +0100
+++ /var/tmp/diff_new_pack.EA33z9/_new	2006-11-05 13:48:58.000000000 +0100
@@ -1,12 +1,10 @@
---- config.bks	2005/10/25 17:05:03	1.1
-+++ config.bks	2005/10/25 17:05:19
-@@ -110,9 +110,6 @@
- <install type="KDESERV" subdir="">
-     <file name="src/appdata/kdissertpart.desktop"/>
- </install>
--<install type="KDEMENU" subdir="Utilities/">
--    <file name="src/appdata/kdissert.desktop"/>
--</install>
- <install type="KDEMIME" subdir="application/">
-     <file name="src/appdata/x-kdissert.desktop"/>
- </install>
+--- src/appdata/wscript_build	2006/11/05 10:33:37	1.1
++++ src/appdata/wscript_build	2006/11/05 10:34:00
+@@ -4,7 +4,6 @@
+ 
+ install_files('KDE_XDG',  '',             'kdissert.desktop')
+ install_files('KDE_SERV', '',             'kdissertpart.desktop')
+-install_files('KDE_MENU', 'Utilities',    'kdissert.desktop')
+ install_files('KDE_MIME', 'application',  'x-kdissert.desktop')
+ install_files('KDE_DATA', 'kdissert',     'kdissertui.rc tips')
+ install_files('KDE_DATA', 'kdissertpart', 'kdissertpart.rc')


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



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx