Hello community,
here is the log from the commit of package kdewebdev3 for openSUSE:Factory checked in at 2012-01-26 14:05:38
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kdewebdev3 (Old)
and /work/SRC/openSUSE:Factory/.kdewebdev3.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdewebdev3", Maintainer is "kde-maintainers@suse.de"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kdewebdev3/kdewebdev3.changes 2011-09-23 02:06:33.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.kdewebdev3.new/kdewebdev3.changes 2012-01-26 14:05:39.000000000 +0100
@@ -1,0 +2,5 @@
+Thu Jan 26 05:37:52 UTC 2012 - anixx@opensuse.org
+
+- resolve file conflicts
+
+-------------------------------------------------------------------
Old:
----
only-quanta.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdewebdev3.spec ++++++
--- /var/tmp/diff_new_pack.EIUBB5/_old 2012-01-26 14:05:40.000000000 +0100
+++ /var/tmp/diff_new_pack.EIUBB5/_new 2012-01-26 14:05:40.000000000 +0100
@@ -13,9 +13,6 @@
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
-#
-
-# norootforbuild
Name: kdewebdev3
BuildRequires: kdesdk3-devel
@@ -24,7 +21,7 @@
BuildRequires: unsermake
%endif
BuildRequires: fdupes libgcrypt-devel
-License: GPL v2 or later
+License: GPL-2.0+
Group: Productivity/Publishing/HTML/Tools
Summary: KDE Web Development Suite
Version: 3.5.10
@@ -51,16 +48,9 @@
* KImageMapEditor--an HTML image map editor
* KXsldbg--XSLT debugger
* KFileReplace--batch search and replace tool
-Authors:
---------
- Yacovlev Alexander
- Dmitry Poplavsky
- Eric Laffoon
- Andras Mantia
-
%package -n kde3-quanta
-License: GPL v2 or later
+License: GPL-2.0+
Summary: KDE Web Development Suite
Group: Productivity/Publishing/HTML/Editors
Provides: kdewebdev3:/opt/kde3/bin/quanta
@@ -75,17 +65,8 @@
The package contains Quanta, an html editor (native source and WYSIWIG),
with lots of features like an php debugger.
-
-
-Authors:
---------
- Yacovlev Alexander
- Dmitry Poplavsky
- Eric Laffoon
- Andras Mantia
-
%package -n kde3-kommander
-License: GPL v2 or later
+License: GPL-2.0+
Summary: Editor to build dialogs and application
Group: System/GUI/KDE
Requires: kde3-kommander-runtime
@@ -97,17 +78,8 @@
Kommander is a creator of full main window applications without the
need to use any programming language.
-
-
-Authors:
---------
- Marc Britton
- Eric Laffoon
- Michal Rudolf
- Andras Mantia
-
%package -n kde3-kommander-runtime
-License: GPL v2 or later
+License: GPL-2.0+
Summary: Runtime to execute Kommander based applications
Group: System/GUI/KDE
Provides: kommander-runtime = 3.5.10
@@ -116,15 +88,6 @@
%description -n kde3-kommander-runtime
Runtime parts to execute Kommander based applications and dialogs.
-
-
-Authors:
---------
- Marc Britton
- Eric Laffoon
- Michal Rudolf
- Andras Mantia
-
%prep
%setup -q -n kdewebdev-%version -b 1 -b 2 -b 3 -b 4
%patch0
@@ -185,7 +148,15 @@
/opt/kde3/bin/kxsldbg
/opt/kde3/bin/xsldbg
%exclude /opt/kde3/%_lib/kde3/quanta*
-/opt/kde3/%_lib/kde3/*
+#/opt/kde3/%_lib/kde3/*
+/opt/kde3/%_lib/kde3/libkfilereplacepart.la
+/opt/kde3/%_lib/kde3/libkfilereplacepart.so
+/opt/kde3/%_lib/kde3/libkimagemapeditor.la
+/opt/kde3/%_lib/kde3/libkimagemapeditor.so
+/opt/kde3/%_lib/kde3/libklinkstatuspart.la
+/opt/kde3/%_lib/kde3/libklinkstatuspart.so
+/opt/kde3/%_lib/kde3/libkxsldbgpart.la
+/opt/kde3/%_lib/kde3/libkxsldbgpart.so
/opt/kde3/share/applications/kde/kfilereplace.desktop
/opt/kde3/share/applications/kde/kimagemapeditor.desktop
/opt/kde3/share/applications/kde/klinkstatus.desktop
@@ -199,6 +170,7 @@
/opt/kde3/share/apps/kxsldbg
/opt/kde3/share/config.kcfg/klinkstatus.kcfg
%exclude /opt/kde3/share/services/quanta*.desktop
+%exclude /opt/kde3/share/services/kommander*.desktop
/opt/kde3/share/services/*.desktop
/opt/kde3/share/icons/hicolor/*/apps/kfilereplace.*
/opt/kde3/share/icons/hicolor/*/apps/kimagemapeditor.*
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org