[packages/jed] - updated URLs, updated to 0.99.19 - updated makefile,ac_am patches - added gtkjed

qboosh qboosh at pld-linux.org
Sun Jun 26 17:34:40 CEST 2016 

commit 5b38b780f52ef4b35f668a50553bdf6304fc13cf
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Jun 26 17:34:43 2016 +0200

    - updated URLs, updated to 0.99.19
    - updated makefile,ac_am patches
    - added gtkjed

 jed-ac_am.patch    | 12 ----------
 jed-makefile.patch | 29 ++++-------------------
 jed.spec           | 69 ++++++++++++++++++++++++++++++++++++++----------------
 3 files changed, 54 insertions(+), 56 deletions(-)
---
diff --git a/jed.spec b/jed.spec
index fecf393..b9c1628 100644
--- a/jed.spec
+++ b/jed.spec
@@ -1,4 +1,8 @@
-%define		tar_ver	0.99-18
+#
+# Conditional build:
+%bcond_without	gtk	# GTK+ (2.x) version of jed
+#
+%define		tar_ver	0.99-19
 Summary:	A small fast editor
 Summary(de.UTF-8):	Ein kleiner, schneller Editor
 Summary(es.UTF-8):	Un pequeño y rápido editor
@@ -9,12 +13,12 @@ Summary(ru.UTF-8):	Быстрый небольшой текстовый реда
 Summary(tr.UTF-8):	Küçük, hızlı bir metin düzenleyici
 Summary(uk.UTF-8):	Швидкий компактний текстовий редактор на базі бібліотеки slang
 Name:		jed
-Version:	0.99.18
-Release:	6
+Version:	0.99.19
+Release:	1
 License:	GPL v2+
 Group:		Applications/Editors
-Source0:	ftp://space.mit.edu/pub/davis/jed/v0.99/%{name}-%{tar_ver}.tar.bz2
-# Source0-md5:	5378c8e7805854018d9ec5c3cfadf637
+Source0:	http://www.jedsoft.org/releases/jed/%{name}-%{tar_ver}.tar.bz2
+# Source0-md5:	c9b2f58a3defc6f61faa1ce7d6d629ea
 Source1:	x%{name}.desktop
 Source2:	%{name}.conf
 Source3:	%{name}.1.pl
@@ -25,13 +29,16 @@ Patch1:		%{name}-XFree86_keys.patch
 Patch2:		%{name}-home_etc.patch
 Patch3:		%{name}-info.patch
 Patch4:		%{name}-ac_am.patch
-BuildRequires:	autoconf
+URL:		http://www.jedsoft.org/jed/
+BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
 BuildRequires:	gpm-devel
+%{?with_gtk:BuildRequires:	gtk+2-devel >= 2:2.8.0}
+BuildRequires:	pkgconfig >= 1:0.14.0
 BuildRequires:	slang-devel >= 2.0.0
 BuildRequires:	texinfo
 BuildRequires:	xorg-lib-libX11-devel
-BuildRequires:	xorg-lib-libXt-devel
+BuildRequires:	xorg-lib-libXft-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -92,6 +99,19 @@ бібліотеці SLang. Він має спеціальні режими ре
 інших мов. Jed може емулювати Emacs, Wordstar та інші редактори і може
 бути настроєний на рівні макросів, кольорів, прив'язки клавіш і т.п.
 
+%package gtk
+Summary:	GTK+ version of Jed editor
+Summary(pl.UTF-8):	Wersja GTK+ edytora Jed
+Group:		X11/Applications/Editors
+Requires:	%{name} = %{version}-%{release}
+Requires:	gtk+2 >= 2:2.8.0
+
+%description gtk
+GTK+ version of Jed editor.
+
+%description gtk -l pl.UTF-8
+Wersja GTK+ edytora Jed.
+
 %package xjed
 Summary:	Jed editor - X version
 Summary(de.UTF-8):	Jed-Editor - X-Version
@@ -191,16 +211,18 @@ Рекурсивна утиліта grep, що вміє підсвічувати
 %patch4 -p1
 
 %build
-install /usr/share/automake/config.* autoconf
-mv -f autoconf/configure.ac .
-mv -f autoconf/aclocal.m4 acinclude.m4
-CFLAGS="-DMEMCPY=SLmemcpy -DMEMSET=SLmemset -DMEMCHR=SLmemchr %{rpmcflags}"
-%{__aclocal}
+cp -f /usr/share/automake/config.* autoconf
+cd autoconf
 %{__autoconf}
-%configure
+%{__mv} configure ..
+cd ..
+CFLAGS="-DMEMCPY=SLmemcpy -DMEMSET=SLmemset -DMEMCHR=SLmemchr %{rpmcflags}"
+%configure \
+	%{?with_gtk:--with-gtk}
 
 %{__make} all
 %{__make} xjed
+%{?with_gtk:%{__make} -C src gtkjed}
 %{__make} rgrep
 
 %install
@@ -212,8 +234,9 @@ install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}} \
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+%{?with_gtk:install src/objs/gtkjed $RPM_BUILD_ROOT%{_bindir}}
 install src/objs/rgrep $RPM_BUILD_ROOT%{_bindir}
-install info/jed.* $RPM_BUILD_ROOT%{_infodir}
+cp -p info/jed.info info/jed.?in $RPM_BUILD_ROOT%{_infodir}
 
 install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
 install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/jed.conf
@@ -224,27 +247,33 @@ install %{SOURCE5} $RPM_BUILD_ROOT%{_pixmapsdir}
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post	-p	/sbin/postshell
+%post	-p /sbin/postshell
 -/usr/sbin/fix-info-dir -c %{_infodir}
 
-%postun	-p	/sbin/postshell
+%postun	-p /sbin/postshell
 -/usr/sbin/fix-info-dir -c %{_infodir}
 
 %files
 %defattr(644,root,root,755)
-%doc README changes.txt doc/txt/*.txt
+%doc COPYRIGHT README changes.txt doc/txt/*.txt
 %attr(755,root,root) %{_bindir}/jed
+%attr(755,root,root) %{_bindir}/jed-script
 %{_datadir}/jed
 %{_mandir}/man1/jed.1*
 %lang(pl) %{_mandir}/pl/man1/jed.1*
-%{_infodir}/*.info*
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*
+%{_infodir}/jed.info*
+%{_infodir}/jed.[0-9]in*
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/jed.conf
+
+%files gtk
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/gtkjed
 
 %files xjed
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/xjed
 %{_desktopdir}/xjed.desktop
-%{_pixmapsdir}/*.png
+%{_pixmapsdir}/xjed.png
 
 %files -n rgrep
 %defattr(644,root,root,755)
diff --git a/jed-ac_am.patch b/jed-ac_am.patch
index e708f43..5e1bb94 100644
--- a/jed-ac_am.patch
+++ b/jed-ac_am.patch
@@ -38,15 +38,3 @@ diff -urN jed-B0.99-17.111.org/autoconf/aclocal.m4 jed-B0.99-17.111/autoconf/acl
    fi
  done
  
---- jed-0.99-18.orig/autoconf/configure.ac	2006-02-13 18:51:58.000000000 +0100
-+++ jed-0.99-18/autoconf/configure.ac	2008-11-16 04:20:52.000000000 +0100
-@@ -4,6 +4,9 @@
- dnl   You can obtain this file from <ftp://space.mit.edu/pub/davis/acsite.m4>.
- dnl
- AC_INIT(src/ledit.c)
-+
-+AC_PROG_CC
-+
- JD_INIT
- 
- AC_CONFIG_AUX_DIR(autoconf)
diff --git a/jed-makefile.patch b/jed-makefile.patch
index f85b6ce..35b3ac1 100644
--- a/jed-makefile.patch
+++ b/jed-makefile.patch
@@ -1,30 +1,11 @@
-diff -urN jed-B0.99-17.111.org/src/Makefile.in jed-B0.99-17.111/src/Makefile.in
---- jed-B0.99-17.111.org/src/Makefile.in	2005-07-25 06:37:23.000000000 +0200
-+++ jed-B0.99-17.111/src/Makefile.in	2005-09-16 09:53:34.576743488 +0200
-@@ -14,9 +14,10 @@
- exec_prefix = @exec_prefix@
+--- jed-0.99-19/src/Makefile.in.orig	2016-06-26 14:08:11.521834233 +0200
++++ jed-0.99-19/src/Makefile.in	2016-06-26 14:17:35.022114822 +0200
+@@ -15,7 +15,7 @@
+ datarootdir = @datarootdir@
  #JED_ROOT = $(HOME)/src/jed# <--- make sure # is at end of file!!
  #JED_ROOT = $(prefix)/jed# <--- make sure # is at end of file!!
 -JED_ROOT = @JED_ROOT@# <--- make sure # is at end of file!!
 +JED_ROOT = @datadir@/jed# <--- make sure # is at end of file!!
  BIN_DIR = @bindir@
  MAN_DIR = @mandir@/man1
-+INFO_DIR = @infodir@
- INSTALL		= @INSTALL@
- INSTALL_DATA	= @INSTALL_DATA@
- MKINSDIR = ../autoconf/mkinsdir.sh
-@@ -51,10 +52,10 @@
- #---------------------------------------------------------------------------
- # 1. Linux GPM Mouse support
- #    Uncomment next FOUR lines for GPM mouse support
--#MOUSEFLAGS = -DUSE_GPM_MOUSE
--#MOUSELIB = -lgpm
--#GPMMOUSEO = gpmmouse.o
--#OBJGPMMOUSEO = $(OBJDIR)/$(GPMMOUSEO)
-+MOUSEFLAGS = -DUSE_GPM_MOUSE
-+MOUSELIB = -lgpm
-+GPMMOUSEO = gpmmouse.o
-+OBJGPMMOUSEO = $(OBJDIR)/$(GPMMOUSEO)
- 
-  
- # 2. XFree86 XRENDERFONT (Anti-aliased font) support for XJED
+ INFO_DIR = @infodir@
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/jed.git/commitdiff/5b38b780f52ef4b35f668a50553bdf6304fc13cf

More information about the pld-cvs-commit mailing list