Re: [Sawfish] [ANNOUNCE] Sawfish 1.11.91 "The Promised Land"

[Allan Duncan <amd2345@xxxxxxxxxxxxxxx>]

On 31/07/16 22:41, Christopher Roy Bratusek wrote:
> Thanks, I added the patch upstream.

Um, could you reverse that patch - it was against a derived file, 
configure.ac is the real source.

Here is its replacement, plus *.spec.in file for all three components.

diff -Naur sawfish_1.11.91-orig/configure.ac sawfish_1.11.91/configure.ac
--- sawfish_1.11.91-orig/configure.ac	2016-07-31 04:51:47.000000000 +1000
+++ sawfish_1.11.91/configure.ac	2016-08-01 18:53:47.458028563 +1000
@@ -127,8 +127,8 @@
 
 PKG_CHECK_MODULES(XTest, xtst >= 1.0
 		  ,X_EXTRA_LIBS="${X_EXTRA_LIBS} -lXtst"
-		  AC_DEFINE(HAVE_X11_EXTENSIONS_XTST_H, 1, [Have Xtest])
-		  ,AC_MSG_ERROR([cannot locate Xtest]))
+		  AC_DEFINE(HAVE_X11_EXTENSIONS_XTST_H, 1, [Have Xtest (libXtst)])
+		  ,AC_MSG_ERROR([cannot locate Xtest (libXtst)]))
 
 X_SERVER="X.Org X11R7"
 

diff -Naur sawfish_1.11.91-orig/data/sawfish.spec.in sawfish_1.11.91/data/sawfish.spec.in
--- sawfish_1.11.91-orig/data/sawfish.spec.in	2016-07-31 04:49:08.000000000 +1000
+++ sawfish_1.11.91/data/sawfish.spec.in	2016-08-01 18:54:38.026447091 +1000
@@ -1,14 +1,14 @@
 Summary: An extensible window manager for the X Window System
 Name: sawfish
 Version: @version@
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+ and Artistic 2.0
 # GPLv2+ is for Sawfish
 # Artistic 2.0 is for sounds
 Group: User Interface/Desktops
-Source0: http://download.tuxfamily.org/%{name}/%{name}-%{version}.tar.bz2
+Source0: http://download.tuxfamily.org/%{name}/%{name}_%{version}.tar.bz2
 URL: http://sawfish.wikia.com/
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot: %{_tmppath}/%{name}_%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gmp-devel
 BuildRequires: gtk2-devel
 BuildRequires: libXft-devel
@@ -21,6 +21,7 @@
 BuildRequires: desktop-file-utils
 BuildRequires: librep-devel >= @REP_MIN_VER@
 BuildRequires: rep-gtk-devel >= @REP_GTK_MIN_VER@
+BuildRequires: gdk-pixbuf2-xlib-devel
 Requires: control-center-filesystem
 Requires: hicolor-icon-theme
 Requires: kde-filesystem
@@ -46,10 +47,10 @@
 Include files for Sawfish development.
 
 %prep
-%setup -q
+%setup -q -n %{name}_%{version}
 
 %build
-/bin/sh autogen.sh --nocfg
+autogen.sh --nocfg
 /usr/bin/makeinfo --no-validate --no-headers man/news.texi >NEWS
 %configure
 make %{?_smp_mflags}
@@ -65,9 +66,14 @@
 sed -i -e '/^\#!/,/^!\#/d' %{buildroot}%{_datadir}/sawfish/lisp/sawfish/cfg/main.jl
 
 desktop-file-validate %{buildroot}%{_datadir}/applications/sawfish.desktop
+desktop-file-validate %{buildroot}%{_datadir}/applications/sawfish-config.desktop
 desktop-file-validate %{buildroot}%{_datadir}/gnome/wm-properties/sawfish-wm.desktop
 desktop-file-validate %{buildroot}%{_kde4_appsdir}/ksmserver/windowmanagers/sawfish.desktop
 desktop-file-validate %{buildroot}%{_datadir}/xsessions/sawfish.desktop
+desktop-file-validate %{buildroot}%{_datadir}/xsessions/sawfish-kde4.desktop
+desktop-file-validate %{buildroot}%{_datadir}/xsessions/sawfish-lumina.desktop
+desktop-file-validate %{buildroot}%{_datadir}/xsessions/sawfish-mate.desktop
+desktop-file-validate %{buildroot}%{_datadir}/xsessions/sawfish-xfce.desktop
 
 %post
 /sbin/install-info %{_infodir}/sawfish.info.gz %{_infodir}/dir
@@ -86,9 +92,16 @@
 %{_libdir}/sawfish
 %{_datadir}/sawfish
 %{_datadir}/applications/sawfish.desktop
+%{_datadir}/applications/sawfish-config.desktop
 %{_datadir}/gnome/wm-properties/sawfish-wm.desktop
 %{_kde4_appsdir}/ksmserver/windowmanagers/sawfish.desktop
+%{_datadir}/ksmserver/windowmanagers/sawfish.desktop
 %{_datadir}/xsessions/sawfish.desktop
+%{_datadir}/xsessions/sawfish-kde4.desktop
+%{_datadir}/xsessions/sawfish-kde5.desktop
+%{_datadir}/xsessions/sawfish-lumina.desktop
+%{_datadir}/xsessions/sawfish-mate.desktop
+%{_datadir}/xsessions/sawfish-xfce.desktop
 %{_datadir}/icons/hicolor/32x32/apps/sawfish-config.png
 %{_mandir}/man1/sawfish*.gz
 %{_infodir}/sawfish*
@@ -102,6 +115,10 @@
 # This is sawfish GUI configurator, not devel config script.
 
 %changelog
+* Mon Aug  1 2016 Allan Duncan <sawfish@xxxxxxxxxxxxxxxxxxx> - 1.11.91-2
+- spec.in altered so tar file name uses '_' instead of older '-'
+- Other alterations to this file shamelessly adapted from Fedora 24 sawfish.spec
+
 * Tue Apr 22 2014 Allan Duncan
 - Shamelessly copied sawfish.spec from Fedora's distro and made a sawfish.spec.in
 - Altered to run autorun.sh and makeinfo for NEWS for the git version

diff -Naur librep_0.92.6.orig/librep.spec.in librep_0.92.6/librep.spec.in
--- librep_0.92.6.orig/librep.spec.in	2016-05-26 19:56:46.000000000 +1000
+++ librep_0.92.6/librep.spec.in	2016-08-01 10:23:03.029219067 +1000
@@ -1,12 +1,13 @@
 Name: librep
 Version: @version@
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: A lightweight Lisp environment
 License: GPLv2+
 Group: Development/Languages
-Source0: http://download.tuxfamily.org/%{name}/%{name}-%{version}.tar.bz2
 URL: http://sawfish.wikia.com/
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source0: http://download.tuxfamily.org/%{name}/%{name}_%{version}.tar.bz2
+
+BuildRoot: %{_tmppath}/%{name}-%{version}_%{release}-root-%(%{__id_u} -n)
 BuildRequires: gmp-devel
 BuildRequires: gdbm-devel
 BuildRequires: readline-devel
@@ -14,6 +15,9 @@
 BuildRequires: texinfo
 BuildRequires: chrpath
 BuildRequires: emacs
+Requires:      emacs-filesystem >= %{_emacs_version}
+Obsoletes:     emacs-librep
+Obsoletes:     emacs-librep-el
 
 %description
 This is a lightweight Lisp environment for UNIX. It contains a Lisp
@@ -33,28 +37,11 @@
 %description devel
 Link libraries and C header files for librep development.
 
-%package -n emacs-%{name}
-Group: System Environment/Libraries
-Summary: Emacs bindings for the librep main application
-Requires: emacs(bin) >= %{_emacs_version}
-
-%description -n emacs-%{name}
-This package contains the Emacs related byte compiled files so that
-librep nicely interacts and integrates into Emacs.
-
-%package -n emacs-%{name}-el
-Group: System Environment/Libraries
-Summary: Emacs bindings for the librep main application
-Requires: emacs-%{name} = %{version}-%{release}
-
-%description -n emacs-%{name}-el
-This package contains the Emacs related source files so that librep
-nicely interacts and integrates into Emacs.
-
 %prep
-%setup -q
+%setup -q -n %{name}_%{version}
 
 %build
+autogen.sh --nocfg
 %configure --with-readline --enable-shared --disable-static
 make %{?_smp_mflags}
 %{_emacs_bytecompile} rep-debugger.el
@@ -91,6 +78,8 @@
 %{_datadir}/man/man1/rep-remote.1.gz
 %{_datadir}/man/man1/rep.1.gz
 %{_infodir}/librep.info.gz
+%{_emacs_sitelispdir}/rep-debugger.el
+%{_emacs_sitelispdir}/rep-debugger.elc
 %exclude %{_libdir}/rep/install-aliases
 %exclude %{_libdir}/rep/libtool
 %exclude %{_libdir}/rep/rules.mk
@@ -107,13 +96,12 @@
 %{_datadir}/man/man1/rep-xgettext.1.gz
 %{_datadir}/man/man1/repdoc.1.gz
 
-%files -n emacs-%{name}
-%{_emacs_sitelispdir}/rep-debugger.elc
-
-%files -n emacs-%{name}-el
-%{_emacs_sitelispdir}/rep-debugger.el
-
 %changelog
+* Mon Aug  1 2016 Allan Duncan <sawfish@xxxxxxxxxxxxxxxxxxx> - 0.92.6-2
+- Merged librep.spec from Fedora 0.92.5-2 SRPM to include emacs files to main package
+- Altered tar file name to use '_' instead of older '-'
+- Included "autogen.sh" as prelim to "configure" for %prep
+
 * Mon Aug 22 2011 Kim B. Heino <b@xxxxxxxx> - 0.92.1-1
 - Update to 0.92.1
 

diff -Naur rep-gtk_0.90.8.3-orig/rep-gtk.spec.in rep-gtk_0.90.8.3/rep-gtk.spec.in
--- rep-gtk_0.90.8.3-orig/rep-gtk.spec.in	2016-05-27 05:36:27.000000000 +1000
+++ rep-gtk_0.90.8.3/rep-gtk.spec.in	2016-08-01 12:37:43.209871819 +1000
@@ -1,12 +1,12 @@
 Name: rep-gtk
 Version: @version@
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: GTK+ binding for librep Lisp environment
 License: GPLv2+
 Group: Development/Languages
-Source0: http://download.tuxfamily.org/librep/%{name}/%{name}-%{version}.tar.bz2
+Source0: http://download.tuxfamily.org/librep/%{name}/%{name}_%{version}.tar.bz2
 URL: http://sawfish.wikia.com/
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot: %{_tmppath}/%{name}_%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gtk2-devel
 BuildRequires: librep-devel >= @REP_MIN_VER@
 Requires: librep >= @REP_MIN_VER@
@@ -25,9 +25,10 @@
 Link libraries and C header files for librep development.
 
 %prep
-%setup -q
+%setup -q -n %{name}_%{version}
 
 %build
+autogen.sh --nocfg
 %configure
 make %{?_smp_mflags}
 
@@ -48,6 +49,10 @@
 %{_libdir}/pkgconfig/rep-gtk.pc
 
 %changelog
+* Mon Aug  1 2016 Allan Duncan <sawfish@xxxxxxxxxxxxxxxxxxx> - 0.90.8.3-2
+- Altered tar file name to use '_' instead of older '-'
+- Included "autogen.sh" as prelim to "configure" for %prep
+
 * Mon Aug 22 2011 Kim B. Heino <b@xxxxxxxx> - 0.90.7-1
 - Update to 0.90.7