[packages/manedit] - new URLs, updated to 1.2.1 - updated opt patch - added man patch (fixes manpage generation)

[qboosh]

commit 0f4cd5a6d96246e7dde007389e04612f33da5b37
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Feb 2 12:01:54 2014 +0100

    - new URLs, updated to 1.2.1
    - updated opt patch
    - added man patch (fixes manpage generation)

 manedit-man.patch | 15 +++++++++++++++
 manedit-opt.patch | 20 +++++++++-----------
 manedit.spec      | 27 +++++++++++++++++----------
 3 files changed, 41 insertions(+), 21 deletions(-)
---
diff --git a/manedit.spec b/manedit.spec
index 5ee990a..579665b 100644
--- a/manedit.spec
+++ b/manedit.spec
@@ -1,12 +1,12 @@
 Summary:	UNIX manual page integrated development environment
 Summary(pl.UTF-8):	Zintegrowane środowisko uniksowe do tworzenia stron podręcznika
 Name:		manedit
-Version:	0.5.12
+Version:	1.2.1
 Release:	1
 License:	GPL v2
 Group:		X11/Applications/Editors
-Source0:	ftp://wolfpack.twu.net/users/wolfpack/%{name}-%{version}.tar.bz2
-# Source0-md5:	8a2ed884ece57c301ce1fc8b421b9ee8
+Source0:	http://wolfsinger.com/~wolfpack/packages/%{name}-%{version}.tar.bz2
+# Source0-md5:	a7ee1835e32ed3c9279412af7caf13ef
 Source1:	%{name}.desktop
 Source2:	%{name}.png
 Patch0:		%{name}-bzip2.patch
@@ -14,7 +14,8 @@ Patch1:		%{name}-opt.patch
 Patch2:		%{name}-glibc.patch
 Patch3:		%{name}-dont_strip.patch
 Patch4:		%{name}-man_path.patch
-URL:		http://wolfpack.twu.net/ManEdit/
+Patch5:		%{name}-man.patch
+URL:		http://freecode.com/projects/manedit
 BuildRequires:	bzip2-devel
 BuildRequires:	gtk+-devel
 BuildRequires:	perl-base
@@ -25,7 +26,7 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 ManEdit is a UNIX Manual Page Integrated Development Environment.
 It has full UNIX manual page editing capabilities using an XML
 interface with instant preview. ManEdit uses the GTK+ widget set
-and requires the X Window Systems.
+and requires the X Window System.
 
 %description -l pl.UTF-8
 ManEdit jest zintegrowanym środowiskiem uniksowym do tworzenia
@@ -40,6 +41,7 @@ GTK+ i działa w środowisku X Window.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %{__perl} -pi -e 's@/lib/$@/%{_lib}/@' manedit/platforms.ini
 
@@ -59,7 +61,8 @@ rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_pixmapsdir},%{_desktopdir}}
 
 %{__make} install \
-	PREFIX=$RPM_BUILD_ROOT%{_prefix}
+	PREFIX=$RPM_BUILD_ROOT%{_prefix} \
+	ICONS_DIR=$RPM_BUILD_ROOT%{_pixmapsdir}
 
 install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
 install %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir}
@@ -70,8 +73,12 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS README
-%attr(755,root,root) %{_bindir}/man*
+%attr(755,root,root) %{_bindir}/manedit
+%attr(755,root,root) %{_bindir}/manview
+%attr(755,root,root) %{_bindir}/manwrap
 %{_datadir}/manedit
-%{_mandir}/man1/*.1*
-%{_desktopdir}/*.desktop
-%{_pixmapsdir}/*
+%{_mandir}/man1/manedit.1*
+%{_desktopdir}/manedit.desktop
+%{_pixmapsdir}/manedit.png
+%{_pixmapsdir}/manedit.xpm
+%{_pixmapsdir}/manview.xpm
diff --git a/manedit-man.patch b/manedit-man.patch
new file mode 100644
index 0000000..0b38757
--- /dev/null
+++ b/manedit-man.patch
@@ -0,0 +1,15 @@
+--- manedit-1.2.1/manedit/makefile_append.ini.orig	2014-02-02 11:24:59.062711006 +0100
++++ manedit-1.2.1/manedit/makefile_append.ini	2014-02-02 11:49:36.995982312 +0100
+@@ -55,9 +55,9 @@
+ 
+ manpage:
+ 	@echo "Generating manual page $(BIN).1.bz2"
+-	@-$(SED) 's|%%PREFIX%%|$(PREFIX)|g ; \
+-                  s|%%LOCALBASE%%|${LOCALBASE}|g ; \
+-                  s|%%X11BASE%%|${X11BASE}|g' $(BIN).1 > $(BIN).1.out
++	@-$(SED) -e 's|%%PREFIX%%|$(PREFIX)|g' \
++                 -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
++                 -e 's|%%X11BASE%%|${X11BASE}|g' $(BIN).1 > $(BIN).1.out
+ 	@-$(BZIP2) $(BIN).1.out --stdout > $(BIN).1.bz2
+ 
+ modules: $(OBJ_C) $(OBJ_CPP)
diff --git a/manedit-opt.patch b/manedit-opt.patch
index 10af266..fe07744 100644
--- a/manedit-opt.patch
+++ b/manedit-opt.patch
@@ -1,26 +1,24 @@
---- manedit-0.5.6/manedit/platforms.ini.orig	Sat Mar 30 19:21:19 2002
-+++ manedit-0.5.6/manedit/platforms.ini	Sat Mar 30 19:33:49 2002
-@@ -23,8 +23,7 @@
+--- manedit-1.2.1/manedit/platforms.ini.orig	2014-02-02 11:09:59.282748762 +0100
++++ manedit-1.2.1/manedit/platforms.ini	2014-02-02 11:17:32.332729754 +0100
+@@ -23,7 +23,7 @@
  Platform = UNIX
          Description = For most any UNIX system
          PREFIX = /usr/
--        CFLAGS = -Wall -O6 -funroll-loops -fomit-frame-pointer -ffast-math \
---D__USE_BSD
-+        CFLAGS = -Wall $(OPTFLAGS) -funroll-loops -ffast-math -D__USE_BSD
+-        CFLAGS = -Wall -O2 -DNEED_STRCASESTR
++        CFLAGS = -Wall $(OPTFLAGS) -DNEED_STRCASESTR
          LIBS = -lm
          LIB_DIR =
  	CC = cc
-@@ -95,8 +94,7 @@
+@@ -94,7 +94,7 @@
  Platform = Linux
  	Description = For most any Linux system
  	PREFIX = /usr/
--	CFLAGS = -Wall -O6 -funroll-loops -fomit-frame-pointer -ffast-math \
---finline-functions -D__USE_BSD
-+	CFLAGS = -Wall $(OPTFLAGS) -funroll-loops -ffast-math -finline-functions -D__USE_BSD
+-	CFLAGS = -Wall -O2 -DNEED_STRCASESTR
++	CFLAGS = -Wall $(OPTFLAGS)
  	LIBS = -lm
  	LIB_DIR =
          CC = cc
-@@ -122,38 +120,6 @@
+@@ -120,38 +120,6 @@
                  Description = Just adds -g to the CFLAGS for debugging
                  MustExist = No
                  FeatureCFLAGS = -g
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/manedit.git/commitdiff/0f4cd5a6d96246e7dde007389e04612f33da5b37