Hello community,
here is the log from the commit of package kompozer for openSUSE:Factory
checked in at Mon Dec 7 16:18:46 CET 2009.
--------
--- GNOME/kompozer/kompozer.changes 2009-08-26 18:29:07.000000000 +0200
+++ /mounts/work_src_done/STABLE/kompozer/kompozer.changes 2009-12-04 10:42:23.000000000 +0100
@@ -1,0 +2,8 @@
+Fri Dec 4 07:55:26 CET 2009 - wr@rosenauer.org
+
+- Updated to the latest version 0.8b1
+- Rebased patches (startup.patch, x11-session.patch)
+- Use system provided NSS libraries
+ * need SUSE_ASNEEDED=0
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
kompozer-0.8a4-src.tar.bz2
New:
----
kompozer-0.8b1-src.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kompozer.spec ++++++
--- /var/tmp/diff_new_pack.vhtvQM/_old 2009-12-07 16:15:38.000000000 +0100
+++ /var/tmp/diff_new_pack.vhtvQM/_new 2009-12-07 16:15:38.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package kompozer (Version 0.7.99.0.4)
+# spec file for package kompozer (Version 0.7.99.1.1)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,16 +19,15 @@
Name: kompozer
-BuildRequires: fdupes gcc-c++ gtk2-devel krb5-devel libgnome-devel libidl-devel mozilla-nspr-devel orbit-devel startup-notification-devel tcsh unzip update-desktop-files zip
+BuildRequires: fdupes gcc-c++ gtk2-devel krb5-devel libgnome-devel libidl-devel mozilla-nss-devel orbit-devel startup-notification-devel tcsh unzip update-desktop-files zip
%define kompozer 1
-License: GPL v2 or later ; LGPL v2.1 or later ; MPL ..
-Version: 0.7.99.0.4
-Release: 2
+License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+
+Version: 0.7.99.1.1
+Release: 1
Summary: Web Authoring System
Url: http://www.kompozer.net/
Group: Productivity/Publishing/HTML/Editors
-#Source: %{name}-%{version}dfsg-src.tar.bz2
-Source: kompozer-0.8a4-src.tar.bz2
+Source: kompozer-0.8b1-src.tar.bz2
Source1: kompozer.desktop
Source2: kompozer.png
#
@@ -52,8 +51,8 @@
Patch3: gcc-undefined-ops.patch
Patch4: mozilla-gcc4.3-fixes.patch
Patch5: abuild.patch
-# NSPR bmo #270502
-Patch6: nspr-prdtoa.patch
+# NSPR bmo #270502 (always use system nspr anyway
+#Patch6: nspr-prdtoa.patch
Patch7: locale.patch
# lockdown infrastructure
#BPatch8: firefox-ui-lockdown.patch
@@ -111,34 +110,15 @@
* WYSIWYG editing of pages, making Web creation as easy as typing a
letter with your word processor.
-
* Integrated file management via FTP. Simply log in to your Web
site and navigate through your files, editing Web pages on the
fly, directly from your site.
-
* Reliable HTML code creation that works with today's most popular
browsers.
-
* Jump between WYSIWYG editing mode and HTML using tabs.
-
* Tabbed editing to make working on multiple pages a snap.
-
* Powerful support for frames, forms, tables, and templates.
-
-
-Authors:
---------
- Linspire, Inc.
- Mozilla Foundation
- Fabien Cazenave
- Rudy Kuntz
- Yves Mairesse
- Alain Lorieux
- Anke Lange
- Charles Cookes
- G�rard Talbot
-
%prep
%setup -q -n mozilla
cp composer/config/mozconfig.fedora composer/config/mozconfig.opensuse
@@ -152,7 +132,7 @@
%patch3
%patch4
%patch5 -p2
-%patch6
+#%patch6
%patch7
# lockdown stuff
#%patch8 -p1
@@ -168,7 +148,7 @@
#%patch19
%patch1020 -p1
%patch22
-%patch23
+%patch23 -p1
#%patch24
%patch25
#%patch27
@@ -185,6 +165,7 @@
%patch100
%build
+export SUSE_ASNEEDED=0
export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
%ifarch ppc64
@@ -192,6 +173,7 @@
%endif
cp composer/config/mozconfig.opensuse .mozconfig
echo "ac_add_options --with-system-nspr" >>.mozconfig
+echo "ac_add_options --with-system-nss" >>.mozconfig
echo "ac_add_options --enable-startup-notification" >>.mozconfig
echo "export CFLAGS=\"$CFLAGS\"" >>.mozconfig
echo "export CXXFLAGS=\"$CFLAGS\"" >>.mozconfig
@@ -232,7 +214,7 @@
%install
mkdir -p $RPM_BUILD_ROOT/usr/lib/kompozer
cp -rL ../obj-kompozer/dist/bin/* $RPM_BUILD_ROOT/usr/lib/kompozer
-cp -rL ../obj-kompozer/dist/bin/.autoreg $RPM_BUILD_ROOT/usr/lib/kompozer
+#cp -rL ../obj-kompozer/dist/bin/.autoreg $RPM_BUILD_ROOT/usr/lib/kompozer
mkdir -p $RPM_BUILD_ROOT/usr/bin
ln -s ../lib/kompozer/kompozer $RPM_BUILD_ROOT/usr/bin/kompozer
mkdir -p $RPM_BUILD_ROOT/usr/share/applications
@@ -240,9 +222,9 @@
mkdir -p $RPM_BUILD_ROOT/usr/share/pixmaps
cp %{S:2} $RPM_BUILD_ROOT/usr/share/pixmaps
%suse_update_desktop_file kompozer
-$RPM_BUILD_ROOT/usr/lib/kompozer/run-mozilla.sh $RPM_BUILD_ROOT/usr/lib/kompozer/regxpcom
-$RPM_BUILD_ROOT/usr/lib/kompozer/run-mozilla.sh $RPM_BUILD_ROOT/usr/lib/kompozer/kompozer-bin -register
-sed -i s:$RPM_BUILD_ROOT::g $RPM_BUILD_ROOT/usr/lib/kompozer/components/xpti.dat
+#$RPM_BUILD_ROOT/usr/lib/kompozer/run-mozilla.sh $RPM_BUILD_ROOT/usr/lib/kompozer/regxpcom
+#$RPM_BUILD_ROOT/usr/lib/kompozer/run-mozilla.sh $RPM_BUILD_ROOT/usr/lib/kompozer/kompozer-bin -register
+#sed -i s:$RPM_BUILD_ROOT::g $RPM_BUILD_ROOT/usr/lib/kompozer/components/xpti.dat
cat << EOF > %{my_provides}
cat > /dev/null
#! /bin/sh
++++++ startup.patch ++++++
++++ 1322 lines (skipped)
++++ between GNOME/kompozer/startup.patch
++++ and /mounts/work_src_done/STABLE/kompozer/startup.patch
++++++ x11-session.patch ++++++
--- /var/tmp/diff_new_pack.vhtvQM/_old 2009-12-07 16:15:38.000000000 +0100
+++ /var/tmp/diff_new_pack.vhtvQM/_new 2009-12-07 16:15:38.000000000 +0100
@@ -4,36 +4,6 @@
https://bugzilla.novell.com/show_bug.cgi?id=227047
https://bugzilla.mozilla.org/show_bug.cgi?id=93789
-diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in
-index e3dd8d9..4371882 100644
---- a/toolkit/xre/Makefile.in
-+++ b/toolkit/xre/Makefile.in
-@@ -137,21 +137,25 @@ ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_
- CPPSRCS += nsNativeAppSupportMac.cpp
- else
- ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
- CPPSRCS += nsNativeAppSupportOS2.cpp
- else
- ifeq ($(MOZ_WIDGET_TOOLKIT),beos)
- CPPSRCS += nsNativeAppSupportBeOS.cpp
- else
-+ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
-+CPPSRCS += nsNativeAppSupportUnix.cpp
-+else
- CPPSRCS += nsNativeAppSupportDefault.cpp
- endif
- endif
- endif
- endif
-+endif
-
- ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
- CMSRCS = MacLaunchHelper.m
- CPPSRCS += nsCommandLineServiceMac.cpp
- LOCAL_INCLUDES += -I$(topsrcdir)/xpfe/bootstrap/appleevents
- OS_CXXFLAGS += -fexceptions
- SHARED_LIBRARY_LIBS += $(DEPTH)/xpfe/bootstrap/appleevents/$(LIB_PREFIX)appleevents_s.$(LIB_SUFFIX)
- endif
diff --git a/toolkit/xre/nsNativeAppSupportUnix.cpp b/toolkit/xre/nsNativeAppSupportUnix.cpp
new file mode 100644
index 0000000..ad73f4c
@@ -234,3 +204,27 @@
+
+ return NS_OK;
+}
+--- mozilla.orig/toolkit/xre/Makefile.in 2009-05-02 18:43:31.000000000 +0200
++++ mozilla/toolkit/xre/Makefile.in 2009-12-04 07:17:59.000000000 +0100
+@@ -130,17 +130,21 @@ else
+ ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
+ CPPSRCS += nsNativeAppSupportOS2.cpp
+ else
+ ifeq ($(MOZ_WIDGET_TOOLKIT),beos)
+ CPPSRCS += nsNativeAppSupportBeOS.cpp
+ else
++ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
++CPPSRCS += nsNativeAppSupportUnix.cpp
++else
+ CPPSRCS += nsNativeAppSupportDefault.cpp
+ endif
+ endif
+ endif
+ endif
++endif
+
+ ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
+ CMSRCS = MacLaunchHelper.m
+ CPPSRCS += nsCommandLineServiceMac.cpp
+ LOCAL_INCLUDES += -I$(topsrcdir)/xpfe/bootstrap/appleevents
+ OS_CXXFLAGS += -fexceptions
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org
