commit manedit

1 Aug 2006

Hello community,

here is the log from the commit of package manedit
checked in at Tue Aug 1 17:20:52 CEST 2006.

--------

--- manedit/manedit.changes	2006-01-25 21:38:11.000000000 +0100
+++ manedit/manedit.changes	2006-08-01 14:53:43.000000000 +0200
@@ -1,0 +2,6 @@
+Tue Aug  1 14:49:40 CEST 2006 - rengelhard@suse.de
+
+- update to 0.6.1
+- fix manpage paths for FHS and X11R7
+
+-------------------------------------------------------------------

Old:
----
  manedit-0.5.12-gcc4.diff
  manedit-0.5.12.tar.bz2

New:
----
  manedit-0.6.1-manpage-paths.diff
  manedit-0.6.1.tar.bz2

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

Other differences:
------------------
++++++ manedit.spec ++++++
--- /var/tmp/diff_new_pack.p1uL6N/_old	2006-08-01 17:20:43.000000000 +0200
+++ /var/tmp/diff_new_pack.p1uL6N/_new	2006-08-01 17:20:43.000000000 +0200
@@ -1,11 +1,11 @@
 #
-# spec file for package manedit (Version 0.5.12)
+# spec file for package manedit (Version 0.6.1)
 #
 # 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://bugs.opensuse.org
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
 # norootforbuild
@@ -15,8 +15,8 @@
 License:      GPL
 Group:        Development/Tools/Doc Generators
 Autoreqprov:  on
-Version:      0.5.12
-Release:      6
+Version:        0.6.1
+Release:        1
 Summary:      Manual Page Editor and Viewer
 Requires:     man, groff
 URL:          http://wolfpack.twu.net/ManEdit/
@@ -26,26 +26,27 @@
 Patch1:       %{name}-0.5.11-opt-gnome.diff
 Patch2:       %{name}-0.5.11-prototypes.diff
 Patch3:       %{name}-0.5.11-libbz-so.diff
-Patch4:       %{name}-%{version}-gcc4.diff
-Patch5:       %{name}-%{version}-strip.diff
+#Patch4:       %{name}-0.5.12-gcc4.diff
+Patch5:         %{name}-0.5.12-strip.diff
+Patch6:         %{name}-%{version}-manpage-paths.diff
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 #BuildArchitectures: noarch
 #ExclusiveArch: %ix86
 
 %description
-ManEdit is a UNIX manual page editor and viewer, it is designed
-specifically for the editing of the UNIX manual page format using an
+ManEdit is a UNIX manual page editor and viewer. It is designed
+specifically for editing the UNIX manual page format using an
 integrated XML interface.
 
 ManEdit features:
 
 * XML Interface and Multiple Sectional Editing
 
-* Instant preview feature and stand-alone viewer/browser
+* Instant preview feature and stand-alone viewer or browser
 
-* Drag and Drop system and templates for easy mass production
+* Drag and drop system and templates for easy mass production
 
-* Multiple editors/viewers and multiple files loaded per editor for
+* Multiple editors and viewers and multiple files loaded per editor for
 convenient mass editing
 
 
@@ -60,11 +61,14 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
+#%patch4 -p1
 %patch5
+%patch6 -p1
 # fix platforms.ini; we need lib64 there for 64-bit-archs
 perl -pi -e 's/\/usr\/lib/\/usr\/%_lib/g' manedit/platforms.ini
 perl -pi -e 's/\/opt\/gnome\/lib/\/opt\/gnome\/%_lib/g' manedit/platforms.ini
+grep -v tzname manedit/string.cpp > tmp
+mv tmp manedit/string.cpp
 
 %build
 cd pconf && make
@@ -100,6 +104,9 @@
 /usr/share/applications/%{name}.desktop
 
 %changelog -n manedit
+* Tue Aug 01 2006 - rengelhard@suse.de
+- update to 0.6.1
+- fix manpage paths for FHS and X11R7
 * Wed Jan 25 2006 - mls@suse.de
 - converted neededforbuild to BuildRequires
 * Sat Jan 21 2006 - schwab@suse.de

++++++ manedit-0.6.1-manpage-paths.diff ++++++
--- manedit-0.6.1~/manedit/pref.c	2006-05-20 12:42:14.000000000 -0500
+++ manedit-0.6.1/manedit/pref.c	2006-05-20 12:43:30.000000000 -0500
@@ -1705,7 +1705,7 @@
 	     * first index of the text array (that's text[0]).
 	     */
 
-#if defined(__FreeBSD__)
+#if defined(__FreeBSD__) || defined (__linux__)
 	    text[0] = "/usr/share/man";
 #else
 	    text[0] = "/usr/man";
@@ -1720,14 +1720,6 @@
 #endif
 	    text[1] = "Local";
 	    gtk_clist_append(GTK_CLIST(w), text);
-
-#if defined(__FreeBSD__)
-	    text[0] = X11BASE"/man";
-#else
-	    text[0] = "/usr/X11R6/man";
-#endif
-	    text[1] = "X Window Systems";
-	    gtk_clist_append(GTK_CLIST(w), text);
 	}
 	PrefParmRecord(pref, MEDIT_PREF_PARM_LOCATIONS_MAN_DIRS, w);
 
diff -urNad manedit-0.6.1~/manedit/prefcb.c manedit-0.6.1/manedit/prefcb.c
--- manedit-0.6.1~/manedit/prefcb.c	2006-05-20 12:42:14.000000000 -0500
+++ manedit-0.6.1/manedit/prefcb.c	2006-05-20 12:43:12.000000000 -0500
@@ -675,7 +675,7 @@
 	 */
 	PDialogAddPromptWithBrowse(
 	    NULL, "Path:",
-#if defined(__FreeBSD__)
+#if defined(__FreeBSD__) || defined (__linux__)
 	    "/usr/share/man",
 #else
 	    "/usr/man",
++++++ manedit-0.5.12.tar.bz2 -> manedit-0.6.1.tar.bz2 ++++++
++++   13011 lines of diff (skipped)



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



Remember to have fun...

    

root＠suse.de

tags

participants (1)