- fixed usage of macros

- added/removed neccesary/obsolete patches
- FHS 2.0 compliance where needed
- gzipping docs where needed

Changed files:
    emirror.spec -> 1.10

diff --git a/emirror.spec b/emirror.spec
index f89b788904c4ee8ffe6bd271dca6212757ffa328..9135c7432de392cf19b1ae93f2aa9d22e377af50 100644 (file)
--- a/emirror.spec
+++ b/emirror.spec
@@ -1,16 +1,16 @@
-Summary:     FTP mirroring program.
-Summary(pl): Program do mirrorowania FTP.
-Name:        emirror
-Version:     2.1
-Release:     1pre9
-Copyright:   GPL
-Source:      ftp://ftp.uni-klu.ac.at/pub/projects/emirror/%{name}-%{version}-pre9.tar.bz2
-Patch:      emirror.cfg.diff
-Group:       Networking/Utilities
-Group(pl):   Sieciowe/Narzêdzia
+Summary:       FTP mirroring program.
+Summary(pl):   Program do mirrorowania FTP.
+Name:          emirror
+Version:       2.1
+Release:       1pre9
+Copyright:     GPL
+Source:                ftp://ftp.uni-klu.ac.at/pub/projects/emirror/%{name}-%{version}-pre9.tar.bz2
+Patch:         emirror-cfg.patch
+Group:         Networking/Utilities
+Group(pl):     Sieciowe/Narzêdzia
 BuildRoot:     /tmp/%{name}-%{version}-root
-Requires:    python
-BuildArch:   noarch
+Requires:      python
+BuildArch:     noarch
 
 %description
 FTP mirroring program.
@@ -28,18 +28,32 @@ Program do mirrorowania FTP.
 %install
 rm -rf $RPM_BUILD_ROOT
 make install \
-       prefix=$RPM_BUILD_ROOT/usr \
+       prefix=$RPM_BUILD_ROOT%{_prefix} \
        bindir=$RPM_BUILD_ROOT%{_bindir} \
+       mandir=$RPM_BUILD_ROOT%{_mandir}/man1 \
        libdir=$RPM_BUILD_ROOT%{_libdir}/emirror \
        etcdir=$RPM_BUILD_ROOT/etc/emirror \
-       docdir=$RPM_BUILD_ROOT/usr/doc/emirror
+       docdir=$RPM_BUILD_ROOT%{_docdir}/emirror
+
+(\
+cd $RPM_BUILD_ROOT%{_bindir}; \
+mv -f mirror mirror.bak; \
+sed 's#@OUTPUTDIRECTORY@#/home/httpd/htdocs/mirrors#' mirror.bak > mirror; \
+mv -f updateindex updateindex.bak; \
+sed 's#@OUTPUTDIRECTORY@#/home/httpd/htdocs/mirrors#' updateindex.bak > updateindex;\
+rm -f *.bak
+)
+
+install general.cfg $RPM_BUILD_ROOT/etc/emirror
+
+gzip -9nf doc/* Readme $RPM_BUILD_ROOT%{_mandir}/man1/*
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc documentation/* html README scripts/mirror
-%attr(755,root,root) %{_bindir}/emconvert
-%attr(755,root,root) %{_bindir}/emirror
+%doc doc/* Readme.gz
+%attr(755,root,root) %{_bindir}/*
 %{_libdir}/emirror
+%{_mandir}/man1/*