Mailinglist Archive: opensuse-commit (1318 mails)

[root@xxxxxxx (h_root)]

Hello community,

here is the log from the commit of package smart
checked in at Tue Aug 29 16:35:20 CEST 2006.

--------
--- smart/smart.changes	2006-08-16 18:56:34.000000000 +0200
+++ smart/smart.changes	2006-08-29 10:07:54.000000000 +0200
@@ -1,0 +2,9 @@
+Tue Aug 29 10:07:26 CEST 2006 - cthiel@xxxxxxx
+
+- added smart-yast-r739.patch
+  * smart/backends/rpm/yast2.py
+    - handle "+Ins" tag (skip it for now)
+    - simple interpretation of rich text format (<p>/<li>)
+    - wrap lines on column 76
+
+-------------------------------------------------------------------

New:
----
  smart-yast-r739.patch

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

Other differences:
------------------
++++++ smart.spec ++++++
--- /var/tmp/diff_new_pack.06kSPq/_old	2006-08-29 16:34:05.000000000 +0200
+++ /var/tmp/diff_new_pack.06kSPq/_new	2006-08-29 16:34:05.000000000 +0200
@@ -14,7 +14,7 @@
 BuildRequires:  kdelibs3-devel python-devel rpm-devel rpm-python update-desktop-files
 Summary:        Smart Package Manager
 Version:        0.42
-Release:        6
+Release:        8
 Source:         %{name}-%{version}.tar.bz2
 Source1:        distro.py
 Source2:        %{name}.desktop
@@ -26,6 +26,7 @@
 Patch4:         %{name}-ksmarttray.patch
 Patch5:         %{name}-%{version}-pycurl.patch
 Patch6:         %{name}-%{version}-pycurl-TIMECONDITION.patch
+Patch7:         %{name}-yast-r739.patch
 URL:            http://smartpm.org
 Group:          System/Packages
 License:        GPL
@@ -89,6 +90,7 @@
 %patch4
 %patch5
 %patch6
+%patch7
 %if %{suse_version} < 1010
 echo '    sysconf.set("no-rpm-readHeaderFromFD", 3)' >> %{SOURCE1}
 %endif
@@ -173,6 +175,12 @@
 /opt/kde3/share/apps/konqueror
 
 %changelog -n smart
+* Tue Aug 29 2006 - cthiel@xxxxxxx
+- added smart-yast-r739.patch
+  * smart/backends/rpm/yast2.py
+- handle "+Ins" tag (skip it for now)
+- simple interpretation of rich text format (<p>/<li>)
+- wrap lines on column 76
 * Wed Aug 16 2006 - cthiel@xxxxxxx
 - reduce BuildRequires
 - disable smart-channel-mirrors.patch, as it seems to break smart's cache



++++++ smart-yast-r739.patch ++++++
Index: smart/backends/rpm/yast2.py
===================================================================
--- smart/backends/rpm/yast2.py	(revision 738)
+++ smart/backends/rpm/yast2.py	(revision 739)
@@ -26,6 +26,8 @@
 import posixpath
 import locale
 import os
+from re import sub
+from textwrap import wrap
 
 class YaST2PackageInfo(PackageInfo):
     def __init__(self, package, loader, info):
@@ -112,17 +114,27 @@
         return ''.join([c for c in s if chk(c)])
 
     def readPkgSummDesc(self, entryname):
-        summary = description = ""
+        summary = description = reading_ins = ""
         if self._pkgdescfile and self._pkgoffsets.has_key(entryname):
             self._descfile.seek((self._pkgoffsets[entryname] + 1))
             summary = self._descfile.readline()[5:-1]
             description = ""
             while 1:
                 line = self._descfile.readline()
+                if line.startswith("-Ins"):
+                    reading_ins = False
+                    continue
+                if line.startswith("+Ins:") or reading_ins == True:
+                    reading_ins = True
+                    continue
                 if line.startswith("+Des:") or line.startswith("<!--"): continue
                 if not line or line[:-1] == "-Des:": break
-                description += self.stripTags(line[:-1])
-        return summary, description
+                for wline in wrap(line, 76):
+                    description = description + "\n" + wline
+        description = sub('<li>', '* ', description)
+        description = self.stripTags(description)
+        # Wrapping the text added an extra lf as the first char
+        return summary, description[1:]
 
 
     def parseEntry(self):


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



Remember to have fun...

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