[mgetty] Fixed generation of .debug files

Fri Aug 12 07:33:07 UTC 2011

commit d25f685f7fca7f76753d74c833d76afd3c4e4c13
Author: Michal Sekletar <msekleta at redhat.com>
Date:   Fri Aug 12 09:30:21 2011 +0200

    Fixed generation of .debug files

 mgetty-1.1.36-makefiles.patch |   60 +++++++++++++++++++++++++++++++++++++++++
 mgetty.spec                   |   18 +++++++++---
 2 files changed, 73 insertions(+), 5 deletions(-)
---

diff --git a/mgetty-1.1.36-makefiles.patch b/mgetty-1.1.36-makefiles.patch
new file mode 100644
index 0000000..8e60ab9
--- /dev/null
+++ b/mgetty-1.1.36-makefiles.patch
@@ -0,0 +1,60 @@
+diff -up mgetty-1.1.36/callback/Makefile.orig mgetty-1.1.36/callback/Makefile
+--- mgetty-1.1.36/callback/Makefile.orig	2011-08-11 14:57:31.398821500 +0200
++++ mgetty-1.1.36/callback/Makefile	2011-08-11 14:57:31.402821452 +0200
+@@ -37,7 +37,7 @@ clean:
+ # install programs
+ #
+ install: all
+-	$(INSTALL) -s -m 700 -o root callback $(SBINDIR)
+-	$(INSTALL) -s -m 4711 -o root ct $(BINDIR)
++	$(INSTALL) -m 700 -o root callback $(SBINDIR)
++	$(INSTALL) -m 4711 -o root ct $(BINDIR)
+ 
+ # source modules
+diff -up mgetty-1.1.36/frontends/X11/viewfax/Makefile.orig mgetty-1.1.36/frontends/X11/viewfax/Makefile
+--- mgetty-1.1.36/frontends/X11/viewfax/Makefile.orig	2011-08-11 14:57:31.406821406 +0200
++++ mgetty-1.1.36/frontends/X11/viewfax/Makefile	2011-08-11 14:57:31.410821358 +0200
+@@ -61,7 +61,7 @@ viewfax:	$(OBJS)
+ g3hack:		g3hack.c
+ 
+ install: viewfax
+-	$(INSTALL) -s -m 755 viewfax $(BINDIR)
++	$(INSTALL) -m 755 viewfax $(BINDIR)
+ 	$(INSTALL) -m 644 viewfax.man $(MANDIR)/viewfax.1
+ 	$(INSTALL) -m 644 viewfax.tif $(LIBDIR)
+ 
+diff -up mgetty-1.1.36/g3/Makefile.orig mgetty-1.1.36/g3/Makefile
+--- mgetty-1.1.36/g3/Makefile.orig	2011-08-11 14:57:31.414821310 +0200
++++ mgetty-1.1.36/g3/Makefile	2011-08-11 14:57:31.415821298 +0200
+@@ -37,7 +37,7 @@ install: all
+ # install programs
+ #
+ 	for f in $(G3_PROGRAMS) ; do \
+-		$(INSTALL) -s -m 755 $$f $(BINDIR) ; \
++		$(INSTALL) -m 755 $$f $(BINDIR) ; \
+ 	done
+ #
+ # make symlink for "g3topbm" (so third-party fax viewers won't fail)
+diff -up mgetty-1.1.36/Makefile.orig mgetty-1.1.36/Makefile
+--- mgetty-1.1.36/Makefile.orig	2011-08-11 14:57:31.388821620 +0200
++++ mgetty-1.1.36/Makefile	2011-08-11 14:57:31.393821560 +0200
+@@ -587,8 +587,8 @@ install.bin: mgetty sendfax newslock \
+ 	-test -d $(SBINDIR) || ( ./mkidirs $(SBINDIR) ; chmod 755 $(SBINDIR) )
+ 	-mv -f $(SBINDIR)/mgetty $(SBINDIR)/mgetty.old
+ 	-mv -f $(SBINDIR)/sendfax $(SBINDIR)/sendfax.old
+-	$(INSTALL) -s -m 700 mgetty $(SBINDIR)
+-	$(INSTALL) -s -m 755 sendfax $(SBINDIR)
++	$(INSTALL) -m 700 mgetty $(SBINDIR)
++	$(INSTALL) -m 755 sendfax $(SBINDIR)
+ #
+ # data files + directories
+ #
+@@ -650,7 +650,7 @@ install.bin: mgetty sendfax newslock \
+ 	if [ ! -z "$(INSTALL_MECHO)" ] ; then \
+ 	    cd compat ; \
+ 	    $(CC) $(CFLAGS) -o mg.echo mg.echo.c && \
+-	    $(INSTALL) -s -m 755 mg.echo $(BINDIR) ; \
++	    $(INSTALL) -m 755 mg.echo $(BINDIR) ; \
+ 	fi
+ 
+ #
diff --git a/mgetty.spec b/mgetty.spec
index 33b3df5..5b0961a 100644
--- a/mgetty.spec
+++ b/mgetty.spec
@@ -4,7 +4,7 @@
 Summary: A getty replacement for use with data and fax modems
 Name: mgetty
 Version: 1.1.36
-Release: 11%{?dist}
+Release: 12%{?dist}
 Source: ftp://mgetty.greenie.net/pub/mgetty/source/1.1/mgetty%{version}-%{date}.tar.gz
 Source1: ftp://mgetty.greenie.net/pub/mgetty/source/1.1/mgetty%{version}-%{date}.tar.gz.asc
 Source2: logrotate.mgetty
@@ -35,8 +35,10 @@ Patch22: mgetty-1.1.33-time_range.patch
 Patch23: mgetty-1.1.36-handle_spaces.patch
 # updates info about starting vgetty tgrough systemd
 Patch24: mgetty-1.1.36-man.patch
-
 Patch25: mgetty-1.1.36-sd.patch
+# patch updates makefiles, it removes hardcoded -s parameter of /usr/bin/install
+# thus .debug files for all binaries will be generated properly
+Patch26: mgetty-1.1.36-makefiles.patch
 
 License: GPLv2+
 Group: Applications/Communications
@@ -128,6 +130,7 @@ mv policy.h-dist policy.h
 %patch23 -p1 -b .handle_spaces
 %patch24 -p1 -b .man
 %patch25 -p1 -b .sd
+%patch26 -p1 -b .makefile
 
 %build
 %define makeflags CFLAGS="$RPM_OPT_FLAGS -Wall -DAUTO_PPP -D_FILE_OFFSET_BITS=64" prefix=%{_prefix} spool=%{_var}/spool BINDIR=%{_bindir} SBINDIR=%{_sbindir} LIBDIR=%{_libdir}/mgetty+sendfax HELPDIR=%{_libdir}/mgetty+sendfax CONFDIR=%{_sysconfdir}/mgetty+sendfax MANDIR=%{_mandir} MAN1DIR=%{_mandir}/man1 MAN4DIR=%{_mandir}/man4 MAN5DIR=%{_mandir}/man5 MAN8DIR=%{_mandir}/man8 INFODIR=%{_infodir} ECHO='"echo -e"' INSTALL=%{__install}
@@ -177,13 +180,13 @@ make -C frontends/X11/viewfax install %instflags MANDIR=$RPM_BUILD_ROOT%{_mandir
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d
 
 # install unit file template for vgetty
-mkdir -p $RPM_BUILD_ROOT/lib/systemd/system/
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/systemd/system/
 
 install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/mgetty
 install -m 0644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/sendfax
 install -m 0644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/vgetty
 install -m 0644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/vm
-install -m 0644 %{SOURCE6} $RPM_BUILD_ROOT/lib/systemd/system/
+install -m 0644 %{SOURCE6} $RPM_BUILD_ROOT%{_libdir}/systemd/system/
 
 # remove file droppings from $RPM_BUILD_ROOT
 rm -f $RPM_BUILD_ROOT%{_bindir}/cutbl
@@ -282,7 +285,7 @@ exit 0
 %dir %{_var}/spool/voice
 %dir %{_var}/spool/voice/incoming
 %dir %{_var}/spool/voice/messages
-/lib/systemd/system/vgetty at .service
+%{_libdir}/systemd/system/vgetty at .service
 /sbin/vgetty
 %{_bindir}/vm
 %{_bindir}/pvfamp
@@ -351,6 +354,11 @@ exit 0
 %{_mandir}/man1/viewfax.1*
 
 %changelog
+* Thu Aug 11 2011 Michal Sekletar <msekleta at redhat.com> - 1.1.36-12
+- Resolves common problem in Fedora and RHEL #729003
+- Patch removes hardcoded -s parameter of /usr/bin/install, thus .debug files
+  are generated properly
+
 * Fri Aug 05 2011 Jiri Skala <jskala at redhat.com> - 1.1.36-11
 - fixes #721208 - How to get vgetty to run under systemd
 
