rpms/mgetty/devel .cvsignore, 1.8, 1.9 mgetty-1.1.26-issue.patch, 1.2, 1.3 mgetty-1.1.26-policy.patch, 1.1, 1.2 mgetty.spec, 1.45, 1.46 mgetty1.1.31-Jul24.tar.gz.asc, 1.1, NONE
Jindrich Novy (jnovy)
fedora-extras-commits at redhat.com
Mon Feb 18 15:23:57 UTC 2008
Author: jnovy
Update of /cvs/extras/rpms/mgetty/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19197
Modified Files:
.cvsignore mgetty-1.1.26-issue.patch
mgetty-1.1.26-policy.patch mgetty.spec
Removed Files:
mgetty1.1.31-Jul24.tar.gz.asc
Log Message:
* Mon Feb 18 2008 Jindrich Novy <jnovy at redhat.com> - 1.1.33-15
- fix BuildRoot, License tag
- fix policy and issue patches
- remove useless rpm macros
- rpmlint fixes
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mgetty/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore 25 Apr 2005 18:54:17 -0000 1.8
+++ .cvsignore 18 Feb 2008 15:23:21 -0000 1.9
@@ -1,3 +1,2 @@
-mgetty1.1.31-Jul24.tar.gz
mgetty1.1.33-Apr10.tar.gz
mgetty1.1.33-Apr10.tar.gz.asc
mgetty-1.1.26-issue.patch:
Index: mgetty-1.1.26-issue.patch
===================================================================
RCS file: /cvs/extras/rpms/mgetty/devel/mgetty-1.1.26-issue.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mgetty-1.1.26-issue.patch 9 Sep 2004 08:28:44 -0000 1.2
+++ mgetty-1.1.26-issue.patch 18 Feb 2008 15:23:21 -0000 1.3
@@ -120,8 +120,8 @@
sprintf( &p[i], "%d/%d/%d", tm->tm_mon+1,
tm->tm_mday, tm->tm_year + 1900 );
else
---- mgetty-1.1.26/policy.h-dist Tue Jul 24 18:09:27 2001
-+++ mgetty-1.1.26/policy.h-dist Tue Jul 24 18:09:27 2001
+--- mgetty-1.1.26/policy.h Tue Jul 24 18:09:27 2001
++++ mgetty-1.1.26/policy.h Tue Jul 24 18:09:27 2001
@@ -221,6 +221,14 @@
*/
#define NOLOGIN_FILE "/etc/nologin.%s"
mgetty-1.1.26-policy.patch:
Index: mgetty-1.1.26-policy.patch
===================================================================
RCS file: /cvs/extras/rpms/mgetty/devel/mgetty-1.1.26-policy.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mgetty-1.1.26-policy.patch 9 Sep 2004 08:28:19 -0000 1.1
+++ mgetty-1.1.26-policy.patch 18 Feb 2008 15:23:21 -0000 1.2
@@ -13,8 +13,8 @@
/*
* Filename of the logfile for vm.
---- mgetty-1.1.26/policy.h-dist.policy Thu Nov 2 15:26:59 2000
-+++ mgetty-1.1.26/policy.h-dist Mon Apr 16 10:50:12 2001
+--- mgetty-1.1.26/policy.h.policy Thu Nov 2 15:26:59 2000
++++ mgetty-1.1.26/policy.h Mon Apr 16 10:50:12 2001
@@ -67,7 +67,7 @@
* ZyXELs use S40.2=1.
* If the path doesn't start with "/", it's relative to CONFDIR.
Index: mgetty.spec
===================================================================
RCS file: /cvs/extras/rpms/mgetty/devel/mgetty.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- mgetty.spec 17 Feb 2008 09:58:04 -0000 1.45
+++ mgetty.spec 18 Feb 2008 15:23:21 -0000 1.46
@@ -1,11 +1,7 @@
-%define _sysconfdir /etc
-%define using_netpbm 1
-%define have_mkdtemp 1
-
-Summary: A getty replacement for use with data and fax modems.
+Summary: A getty replacement for use with data and fax modems
Name: mgetty
Version: 1.1.33
-Release: 14%{?dist}
+Release: 15%{?dist}
Source: ftp://alpha.greenie.net/pub/mgetty/source/1.1/mgetty%{version}-Apr10.tar.gz
Source1: ftp://alpha.greenie.net/pub/mgetty/source/1.1/mgetty%{version}-Apr10.tar.gz.asc
Source2: logrotate.mgetty
@@ -14,7 +10,7 @@
Source5: logrotate.vm
Patch0: mgetty-1.1.29-config.patch
Patch1: mgetty-1.1.26-policy.patch
-Patch2: mgetty-1.1.25-faxprint.patch
+#Patch2: mgetty-1.1.25-faxprint.patch
Patch3: mgetty-1.1.21-giftopnm.patch
Patch4: mgetty-1.1.25-voiceconfig.patch
Patch5: mgetty-1.1.26-issue.patch
@@ -22,7 +18,7 @@
Patch7: mgetty-1.1.29-helper.patch
Patch8: mgetty-1.1.30-mktemp.patch
Patch9: mgetty-1.1.30-unioninit.patch
-Patch10: mgetty-1.1.30-path.patch
+#Patch10: mgetty-1.1.30-path.patch
Patch11: mgetty-1.1.31-helper2.patch
Patch12: mgetty-1.1.31-no-acroread.patch
Patch13: mgetty-1.1.31-W-format.patch
@@ -34,25 +30,22 @@
Patch19: mgetty-1.1.33-167830_tty_access.patch
Patch20: mgetty-1.1.33-167830.patch
-License: GPL
+License: GPLv2+
Group: Applications/Communications
-Requires(post,preun): /sbin/install-info
+Requires(post): /sbin/install-info
+Requires(preun): /sbin/install-info
BuildRequires: libX11-devel, libXext-devel, texinfo-tex, texlive-dvips
-Buildroot: %{_tmppath}/%{name}-root
+Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: mktemp
Requires: /usr/sbin/sendmail
-URL: http://mgetty.greenie.net
+URL: http://mgetty.greenie.net/
%package sendfax
Summary: Provides support for sending faxes over a modem.
Requires: mgetty = %{version}
Group: Applications/Communications
Requires: mktemp
-%if %{using_netpbm}
Requires: netpbm-progs
-%else
-Requires: libgr-progs
-%endif
Requires(pre): /usr/sbin/useradd
%package voice
@@ -104,12 +97,11 @@
%prep
%setup -q
+mv policy.h-dist policy.h
%patch0 -p1 -b .config
%patch1 -p1 -b .policy
#%patch2 -p1 -b .faxprint
-%if %{using_netpbm}
%patch3 -p1 -b .giftopnm
-%endif
%patch4 -p1 -b .voiceconfig
%patch5 -p1 -b .issue
%patch6 -p1 -b .issue-doc
@@ -119,7 +111,6 @@
%patch11 -p1 -b .helper2
%patch12 -p1 -b .no-acroread
%patch13 -p1 -b .-W-format
-cp policy.h-dist policy.h
%patch14 -p1 -b .sendmail_path
%patch15 -p1 -b .lfs
%patch16 -p1 -b .162174_tcflush
@@ -129,26 +120,13 @@
%patch20 -p1 -b .167830
%build
-PATH=$PATH:/usr/X11R6/bin
-export PATH
-
%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}
make %{makeflags}
make -C voice %{makeflags}
make -C tools %{makeflags}
-%if %{have_mkdtemp}
-MKDTEMP_FLAGS=
-%else
-MKDTEMP_FLAGS=-DNEED_MKDTEMP
-%endif
-
pushd frontends/X11/viewfax
-#xmkmf
-#make depend
-
-make CDEBUGFLAGS="$RPM_OPT_FLAGS $MKDTEMP_FLAGS" \
- CONFDIR=%{_sysconfdir}/mgetty+sendfax
+make CDEBUGFLAGS="$RPM_OPT_FLAGS" CONFDIR=%{_sysconfdir}/mgetty+sendfax
popd
%install
@@ -157,13 +135,12 @@
mkdir -p $RPM_BUILD_ROOT{%{_bindir},%{_infodir},%{_libdir}/mgetty+sendfax}
mkdir -p $RPM_BUILD_ROOT{%{_mandir},%{_sbindir},/sbin,/var/spool}
-%define instflags CFLAGS="$RPM_OPT_FLAGS -Wall -DAUTO_PPP" prefix=$RPM_BUILD_ROOT%{_prefix} spool=$RPM_BUILD_ROOT%{_var}/spool BINDIR=$RPM_BUILD_ROOT%{_bindir} SBINDIR=$RPM_BUILD_ROOT%{_sbindir} LIBDIR=$RPM_BUILD_ROOT%{_libdir}/mgetty+sendfax HELPDIR=$RPM_BUILD_ROOT%{_libdir}/mgetty+sendfax CONFDIR=$RPM_BUILD_ROOT%{_sysconfdir}/mgetty+sendfax MANDIR=$RPM_BUILD_ROOT%{_mandir} MAN1DIR=$RPM_BUILD_ROOT%{_mandir}/man1 MAN4DIR=$RPM_BUILD_ROOT%{_mandir}/man4 MAN5DIR=$RPM_BUILD_R!
OOT%{_mandir}/man5 MAN8DIR=$RPM_BUILD_ROOT%{_mandir}/man8 INFODIR=$RPM_BUILD_ROOT%{_infodir} ECHO='echo -e' INSTALL=%{__install}
+%define instflags CFLAGS="$RPM_OPT_FLAGS -Wall -DAUTO_PPP" prefix=$RPM_BUILD_ROOT%{_prefix} spool=$RPM_BUILD_ROOT%{_var}/spool BINDIR=$RPM_BUILD_ROOT%{_bindir} SBINDIR=$RPM_BUILD_ROOT%{_sbindir} LIBDIR=$RPM_BUILD_ROOT%{_libdir}/mgetty+sendfax HELPDIR=$RPM_BUILD_ROOT%{_libdir}/mgetty+sendfax CONFDIR=$RPM_BUILD_ROOT%{_sysconfdir}/mgetty+sendfax MANDIR=$RPM_BUILD_ROOT%{_mandir} MAN1DIR=$RPM_BUILD_ROOT%{_mandir}/man1 MAN4DIR=$RPM_BUILD_ROOT%{_mandir}/man4 MAN5DIR=$RPM_BUILD_ROOT%{_mandir}/man5 MAN8DIR=$RPM_BUILD_ROOT%{_mandir}/man8 INFODIR=$RPM_BUILD_ROOT%{_infodir} ECHO='echo -e' INSTALL=%{__install}
+
make install %instflags
install -m700 callback/callback $RPM_BUILD_ROOT%{_sbindir}
install -m4711 callback/ct $RPM_BUILD_ROOT%{_bindir}
-gzip -9n $RPM_BUILD_ROOT%{_infodir}/*
-
mv $RPM_BUILD_ROOT%{_sbindir}/mgetty $RPM_BUILD_ROOT/sbin
# this conflicts with efax
@@ -182,14 +159,13 @@
find samples -type f -exec chmod 644 {} \;
make -C frontends/X11/viewfax install %instflags MANDIR=$RPM_BUILD_ROOT%{_mandir}/man1
-#make -C frontends/X11/viewfax install.man %instflags MANDIR=$RPM_BUILD_ROOT%{_mandir}/man1
# install logrotate control files
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d
-install -m 0644 $RPM_SOURCE_DIR/logrotate.mgetty $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/mgetty
-install -m 0644 $RPM_SOURCE_DIR/logrotate.sendfax $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/sendfax
-install -m 0644 $RPM_SOURCE_DIR/logrotate.vgetty $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/vgetty
-install -m 0644 $RPM_SOURCE_DIR/logrotate.vm $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/vm
+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
# remove file droppings from $RPM_BUILD_ROOT
rm -f $RPM_BUILD_ROOT%{_bindir}/cutbl
@@ -343,6 +319,12 @@
%{_mandir}/man1/viewfax.1*
%changelog
+* Mon Feb 18 2008 Jindrich Novy <jnovy at redhat.com> - 1.1.33-15
+- fix BuildRoot, License tag
+- fix policy and issue patches
+- remove useless rpm macros
+- rpmlint fixes
+
* Sat Feb 17 2008 Jindrich Novy <jnovy at redhat.com> - 1.1.33-14
- fix broken BuildRequires (#433177)
--- mgetty1.1.31-Jul24.tar.gz.asc DELETED ---
More information about the fedora-extras-commits
mailing list