From d92516305ce5489d119de6fa2c317ae761d2b57e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Fri, 17 Aug 2001 13:31:49 +0000 Subject: [PATCH] - updated to 2.1.19 Changed files: emirror-pld.patch -> 1.2 emirror.spec -> 1.24 --- emirror-pld.patch | 168 +++++++++++++++++++++++----------------------- emirror.spec | 11 +-- 2 files changed, 86 insertions(+), 93 deletions(-) diff --git a/emirror-pld.patch b/emirror-pld.patch index 133ea15..8df334f 100644 --- a/emirror-pld.patch +++ b/emirror-pld.patch @@ -1,24 +1,89 @@ -diff -urN emirror-2.1.17/bin/mirror.in emirror-2.1.17.pld/bin/mirror.in ---- emirror-2.1.17/bin/mirror.in Tue Aug 15 14:21:40 2000 -+++ emirror-2.1.17.pld/bin/mirror.in Sat Sep 9 19:46:17 2000 +diff -urN emirror-2.1.19/Makefile.in emirror-2.1.19.new/Makefile.in +--- emirror-2.1.19/Makefile.in Sun Jan 21 20:10:27 2001 ++++ emirror-2.1.19.new/Makefile.in Thu Aug 16 21:21:05 2001 +@@ -1,18 +1,19 @@ + + prefix=@prefix@ + sysconfdir=@sysconfdir@ +-bindir=$(prefix)/bin ++bindir=$(DESTDIR)$(prefix)/bin + INSTALL=@INSTALL@ + PYTHON=@PYTHON@ +-libdir=$(prefix)/lib/emirror +-etcdir=$(sysconfdir)/emirror +-mandir=$(prefix)/man/man1 ++libdir=$(DESTDIR)$(prefix)/lib/emirror ++etcdir=$(DESTDIR)$(sysconfdir)/emirror ++mandir=$(DESTDIR)$(prefix)/share/man/man1 ++htmldir=$(DESTDIR)@HTMLDIR@ + + all: + @echo There\'s no need to compile anything - use \"make install\" + + install : +- @echo Installing files in $(prefix) ... ++ @echo Installing files in $(DESTDIR)$(prefix) ... + @$(INSTALL) -d $(bindir) + @$(INSTALL) emirror $(bindir) + @$(INSTALL) emirrortest $(bindir) +@@ -29,7 +30,8 @@ + @$(INSTALL) -b -m 644 etc/*.cfg $(etcdir) + @$(INSTALL) -b -m 644 etc/email-addresses $(etcdir) + @$(INSTALL) -m 644 etc/*.template $(etcdir) +- @$(INSTALL) -m 644 etc/*.gif $(etcdir) ++ @$(INSTALL) -m 644 etc/*.gif $(htmldir) ++ @$(INSTALL) -m 644 etc/*.inc $(htmldir) + @$(INSTALL) -d $(etcdir)/active + @$(INSTALL) -d $(etcdir)/unused + @$(INSTALL) -m 644 etc/unused/*.cfg $(etcdir)/unused +diff -urN emirror-2.1.19/bin/mirror.in emirror-2.1.19.new/bin/mirror.in +--- emirror-2.1.19/bin/mirror.in Sun Dec 3 10:59:25 2000 ++++ emirror-2.1.19.new/bin/mirror.in Thu Aug 16 21:17:22 2001 @@ -17,4 +17,4 @@ # Start the mirror program and update the index page --emirror -v -c @sysconfdir@/emirror/general.cfg -d @sysconfdir@/emirror/active/ -n @OUTPUTDIRECTORY@ +-emirror -v -c @sysconfdir@/emirror/general.cfg -d @sysconfdir@/emirror/active/ -n @HTMLDIR@ +emirror -- -v -c @sysconfdir@/emirror/general.cfg -d @sysconfdir@/emirror/active/ -diff -urN emirror-2.1.17/bin/updateindex.in emirror-2.1.17.pld/bin/updateindex.in ---- emirror-2.1.17/bin/updateindex.in Tue Aug 15 14:21:20 2000 -+++ emirror-2.1.17.pld/bin/updateindex.in Sat Sep 9 19:46:34 2000 +diff -urN emirror-2.1.19/bin/updateindex.in emirror-2.1.19.new/bin/updateindex.in +--- emirror-2.1.19/bin/updateindex.in Sun Dec 3 11:34:33 2000 ++++ emirror-2.1.19.new/bin/updateindex.in Thu Aug 16 21:17:33 2001 @@ -10,4 +10,4 @@ # Start the mirror program and update the index page --emirror -v -c @sysconfdir@/emirror/general.cfg -n @OUTPUTDIRECTORY@ +-emirror -v -c @sysconfdir@/emirror/general.cfg -n @HTMLDIR@ +emirror -- -v -c @sysconfdir@/emirror/general.cfg -diff -urN emirror-2.1.17/etc/general.cfg.in emirror-2.1.17.pld/etc/general.cfg.in ---- emirror-2.1.17/etc/general.cfg.in Sun Aug 20 17:28:41 2000 -+++ emirror-2.1.17.pld/etc/general.cfg.in Sat Sep 9 19:45:00 2000 +diff -urN emirror-2.1.19/etc/eclipt-index-php.template emirror-2.1.19.new/etc/eclipt-index-php.template +--- emirror-2.1.19/etc/eclipt-index-php.template Sun Apr 15 10:09:01 2001 ++++ emirror-2.1.19.new/etc/eclipt-index-php.template Thu Aug 16 21:21:34 2001 +@@ -1,4 +1,4 @@ +- ++ + + + +diff -urN emirror-2.1.19/etc/eclipt-logfile-php.template emirror-2.1.19.new/etc/eclipt-logfile-php.template +--- emirror-2.1.19/etc/eclipt-logfile-php.template Sun Apr 15 10:10:19 2001 ++++ emirror-2.1.19.new/etc/eclipt-logfile-php.template Thu Aug 16 21:21:18 2001 +@@ -1,4 +1,4 @@ +- ++ + + + +diff -urN emirror-2.1.19/etc/eclipt-summary-php.template emirror-2.1.19.new/etc/eclipt-summary-php.template +--- emirror-2.1.19/etc/eclipt-summary-php.template Sun Apr 15 10:10:48 2001 ++++ emirror-2.1.19.new/etc/eclipt-summary-php.template Thu Aug 16 21:21:47 2001 +@@ -1,4 +1,4 @@ +- ++ + + + +diff -urN emirror-2.1.19/etc/general.cfg.in emirror-2.1.19.new/etc/general.cfg.in +--- emirror-2.1.19/etc/general.cfg.in Fri Apr 13 09:21:43 2001 ++++ emirror-2.1.19.new/etc/general.cfg.in Thu Aug 16 21:18:59 2001 @@ -1,18 +1,21 @@ [general] +Download-url: ftp://localhost/pub/mirrors @@ -35,7 +100,7 @@ diff -urN emirror-2.1.17/etc/general.cfg.in emirror-2.1.17.pld/etc/general.cfg.i +Follow-Symlinks: Yes Username: anonymous -Password: anonymous@localhost --Error-MailCmd: mail -s "EMirror Error Report" Martin.Preishuber@eclipt.uni-klu.ac.at +-Error-MailCmd: mail -s "EMirror Error Report" Martin.Preishuber@eclipt.at +Password: emirror@localhost +Error-MailCmd: mail -s "EMirror Error Report" ftp@localhost Mail-Users: @SYSCONFDIR@/emirror/email-addresses @@ -43,13 +108,13 @@ diff -urN emirror-2.1.17/etc/general.cfg.in emirror-2.1.17.pld/etc/general.cfg.i Log-Template: @SYSCONFDIR@/emirror/logfile.template Index-Template: @SYSCONFDIR@/emirror/index.template Index-Directory: @HTMLDIR@ --Summary-Template: @SYSCONFDIR/emirror/summary.template +-Summary-Template: @SYSCONFDIR@/emirror/summary.template \ No newline at end of file +Summary-Template: @SYSCONFDIR@/emirror/summary.template -diff -urN emirror-2.1.17/man/emirror.1 emirror-2.1.17.pld/man/emirror.1 ---- emirror-2.1.17/man/emirror.1 Sun Aug 20 17:31:36 2000 -+++ emirror-2.1.17.pld/man/emirror.1 Sat Sep 9 19:40:24 2000 -@@ -117,7 +117,7 @@ +diff -urN emirror-2.1.19/man/emirror.1 emirror-2.1.19.new/man/emirror.1 +--- emirror-2.1.19/man/emirror.1 Fri Apr 13 10:28:46 2001 ++++ emirror-2.1.19.new/man/emirror.1 Thu Aug 16 21:19:55 2001 +@@ -120,7 +120,7 @@ .IP "--mail-users" Specifies a file, which contains a list of valid email-addresses of users, who want to get information about updates @@ -58,7 +123,7 @@ diff -urN emirror-2.1.17/man/emirror.1 emirror-2.1.17.pld/man/emirror.1 .IP "--info-mailcmd" Command to send mail to users when one spcific mirror has been updated (e.g. mail -s "EMirror - Package updated: %s" user1@host1 user2@host2) -@@ -461,11 +461,11 @@ +@@ -480,11 +480,11 @@ .IR EMIRRORCFGPATH .SH FILES @@ -75,70 +140,3 @@ diff -urN emirror-2.1.17/man/emirror.1 emirror-2.1.17.pld/man/emirror.1 .SH UNRESTRICTIONS .PP ---- emirror-2.1.17/Makefile.in~ Tue Aug 15 13:59:15 2000 -+++ emirror-2.1.17/Makefile.in Sat Sep 9 19:51:04 2000 -@@ -5,38 +5,38 @@ - PYTHON=@PYTHON@ - libdir=$(prefix)/lib/emirror --etcdir=$(sysconfdir)/emirror --mandir=$(prefix)/man/man1 -+etcdir=@sysconfdir@/emirror -+mandir=@mandir@/man1 - - all: - @echo There\'s no need to compile anything - use \"make install\" - - install : -- @echo Installing files in $(prefix) ... -- @$(INSTALL) -d $(bindir) -- @$(INSTALL) emirror $(bindir) -- @$(INSTALL) emirrortest $(bindir) -- @$(INSTALL) -d $(libdir) -- @$(INSTALL) -m 644 main.py $(libdir) -- @$(INSTALL) -m 644 constants.py $(libdir) -- @$(INSTALL) -m 644 error.py $(libdir) -- @$(INSTALL) -m 644 tools.py $(libdir) -- @$(INSTALL) -m 644 ftplibbeta.py $(libdir) -- @echo Copying example configuration files to $(etcdir) ... -- @$(INSTALL) -d $(etcdir) -- @$(INSTALL) -m 644 etc/*.cfg $(etcdir) -- @$(INSTALL) -m 644 etc/email-addresses $(etcdir) -- @$(INSTALL) -m 644 etc/*.template $(etcdir) -- @$(INSTALL) -m 644 etc/*.gif $(etcdir) -- @$(INSTALL) -d $(etcdir)/active -- @$(INSTALL) -d $(etcdir)/unused -- @$(INSTALL) -m 644 etc/unused/*.cfg $(etcdir)/unused -- @$(INSTALL) -m 755 bin/mirror $(bindir) -- @$(INSTALL) -m 755 bin/updateindex $(bindir) -+ @echo Installing files in $(DESTDIR)$(prefix) ... -+ @$(INSTALL) -d $(DESTDIR)$(bindir) -+ @$(INSTALL) emirror $(DESTDIR)$(bindir) -+ @$(INSTALL) emirrortest $(DESTDIR)$(bindir) -+ @$(INSTALL) -d $(DESTDIR)$(libdir) -+ @$(INSTALL) -m 644 main.py $(DESTDIR)$(libdir) -+ @$(INSTALL) -m 644 constants.py $(DESTDIR)$(libdir) -+ @$(INSTALL) -m 644 error.py $(DESTDIR)$(libdir) -+ @$(INSTALL) -m 644 tools.py $(DESTDIR)$(libdir) -+ @$(INSTALL) -m 644 ftplibbeta.py $(DESTDIR)$(libdir) -+ @echo Copying example configuration files to $(DESTDIR)$(etcdir) ... -+ @$(INSTALL) -d $(DESTDIR)$(etcdir) -+ @$(INSTALL) -m 644 etc/*.cfg $(DESTDIR)$(etcdir) -+ @$(INSTALL) -m 644 etc/email-addresses $(DESTDIR)$(etcdir) -+ @$(INSTALL) -m 644 etc/*.template $(DESTDIR)$(etcdir) -+ @$(INSTALL) -m 644 etc/*.gif $(DESTDIR)$(etcdir) -+ @$(INSTALL) -d $(DESTDIR)$(etcdir)/active -+ @$(INSTALL) -d $(DESTDIR)$(etcdir)/unused -+ @$(INSTALL) -m 644 etc/unused/*.cfg $(DESTDIR)$(etcdir)/unused -+ @$(INSTALL) -m 755 bin/mirror $(DESTDIR)$(bindir) -+ @$(INSTALL) -m 755 bin/updateindex $(DESTDIR)$(bindir) - @echo Installing manpage -- @$(INSTALL) -d $(mandir) -- @$(INSTALL) -m 644 man/emirror.1 $(mandir) -+ @$(INSTALL) -d $(DESTDIR)$(mandir) -+ @$(INSTALL) -m 644 man/emirror.1 $(DESTDIR)$(mandir) - @echo Compiling python modules ... -- @(PYTHONPATH=$(libdir); export PYTHONPATH; $(bindir)/emirror > /dev/null 2>&1) -+ @(PYTHONPATH=$(DESTDIR)$(libdir); export PYTHONPATH; $(DESTDIR)$(bindir)/emirror > /dev/null 2>&1) - @echo Don\'t forget to set some environment variables: - @echo - @echo PATH should contain $(bindir) diff --git a/emirror.spec b/emirror.spec index 951ac77..cf937b1 100644 --- a/emirror.spec +++ b/emirror.spec @@ -1,16 +1,14 @@ Summary: FTP mirroring program Summary(pl): Program do mirrorowania FTP Name: emirror -Version: 2.1.17 -Release: 4 +Version: 2.1.19 +Release: 1 License: GPL Group: Networking/Utilities Group(de): Netzwerkwesen/Werkzeuge Group(pl): Sieciowe/Narzêdzia Source0: ftp://eclipt.uni-klu.ac.at/pub/projects/emirror/%{name}-%{version}.tar.gz Patch0: %{name}-pld.patch -Patch1: %{name}-php.patch -Patch2: %{name}-python2.0.patch BuildRequires: python-devel Requires: python >= 2.0 BuildArch: noarch @@ -25,12 +23,9 @@ Program do mirrorowania FTP. %prep %setup -q %patch0 -p1 -%patch1 -p1 -%patch2 -p1 %build -autoconf -%configure \ +%configure2_13 \ --with-htmldir=/home/httpd/html/mirrors %install -- 2.43.0