Mailinglist Archive: opensuse-commit (1187 mails)

[root@xxxxxxx (h_root)]

Hello community,

here is the log from the commit of package conglomerate
checked in at Sun Apr 2 12:38:08 CEST 2006.

--------
--- GNOME/conglomerate/conglomerate.changes	2006-01-25 21:31:20.000000000 +0100
+++ conglomerate/conglomerate.changes	2006-03-31 22:57:24.000000000 +0200
@@ -1,0 +2,6 @@
+Fri Mar 31 22:56:44 CEST 2006 - danw@xxxxxxx
+
+- Fix a bug in one of its XML support files that causes a warning
+  at startup. #155949
+
+-------------------------------------------------------------------

New:
----
  conglomerate-readme-xds.patch

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

Other differences:
------------------
++++++ conglomerate.spec ++++++
--- /var/tmp/diff_new_pack.sAaMhg/_old	2006-04-02 12:37:41.000000000 +0200
+++ /var/tmp/diff_new_pack.sAaMhg/_new	2006-04-02 12:37:41.000000000 +0200
@@ -1,11 +1,11 @@
 #
 # spec file for package conglomerate (Version 0.9.1)
 #
-# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
-# Please submit bugfixes or comments via http://www.suse.de/feedback/
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
 # norootforbuild
@@ -16,13 +16,14 @@
 %define sysconfdir /etc%{prefix}
 Summary:      XML Editor for GNOME
 Version:      0.9.1
-Release:      1
+Release:        11
 Group:        Productivity/Publishing/XML
 AutoReqProv:  on
 License:      GPL
 URL:          http://www.conglomerate.org/
 Source0:      %{name}-%{version}.tar.bz2
 Patch:        conglomerate-desktop.patch
+Patch2:         conglomerate-readme-xds.patch
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 PreReq:       filesystem gconf2 /usr/bin/touch shared-mime-info
 
@@ -44,6 +45,7 @@
 %prep
 %setup -q
 %patch -p 1
+%patch2
 
 %build
 # - Add enchant and enchant-devel to neededforbuild.
@@ -114,6 +116,9 @@
 /usr/share/mime/packages/*.xml
 
 %changelog -n conglomerate
+* Fri Mar 31 2006 - danw@xxxxxxx
+- Fix a bug in one of its XML support files that causes a warning
+  at startup. #155949
 * Wed Jan 25 2006 - mls@xxxxxxx
 - converted neededforbuild to BuildRequires
 * Thu Aug 04 2005 - sbrabec@xxxxxxx

++++++ conglomerate-readme-xds.patch ++++++
--- dispspecs/readme.xds.in
+++ dispspecs/readme.xds.in
@@ -2,7 +2,7 @@
 <dispspec>
 	<metadata>
 		<_name>Experimental "readme" format</_name>
-		<_description xml:lang="en">This is a document type associated with the "readme" file distributed with the initial prototype of Conglomerate.</_description>
+		<_description>This is a document type associated with the "readme" file distributed with the initial prototype of Conglomerate.</_description>
 	</metadata>
 	<document-models>
 	</document-models>

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



Remember to have fun...