qmailqdmin.spec

[Arkadiusz Chomicki]

witam

przesylam moja propzycje zmian do qmailadmin
zmiany jakie nanioslem
- upgrade do wersji 1.0.6
- poprawnienie %build, %install, %files

Pozdrawiam
ChomAr
-- 
+-=========================| Arkadiusz Chomicki |=====================-+
  84-120 Władysławowo         GG#: 420515
  woj. pomorskie              e-mail:chomar(at)wla(dot)pl
  Registered User: 82605      http://www.chomar.wla.pl
  http://counter.li.org/cgi-bin/runscript/display-person.cgi?user=82605
+-====================================================================-+
-------------- następna część ---------
diff -urN qmailadmin-1.0.6.orig/template.c qmailadmin-1.0.6/template.c
--- qmailadmin-1.0.6.orig/template.c	2002-08-07 00:05:28.000000000 +0200
+++ qmailadmin-1.0.6/template.c	2004-01-12 05:37:15.865442824 +0100
@@ -115,7 +115,7 @@
           /* show version number */
           case 'V':
             printf("<a href=http://www.inter7.com/qmailadmin>%s</a> %s<BR>", 
-              QA_PACKAGE, QA_VERSION);
+              PACKAGE, VERSION);
             printf("<a href=http://www.inter7.com/vpopmail>%s</a> %s<BR>", 
               PACKAGE, VERSION);
             break;
-------------- następna część ---------
--- qmailadmin.spec.orig	2003-05-28 15:01:31.000000000 +0200
+++ qmailadmin.spec	2004-01-13 18:23:48.573862232 +0100
@@ -1,16 +1,18 @@
 # $Revision: 1.6 $, $Date: 2003/05/28 13:01:31 $
 %define vuser vpopmail
 %define vgroup vchkpw
-%define vhome /home/%{vuser}
+%define vhome /var/lib/%{vuser}
+%define _htmldir /home/services/httpd
 
 Summary:	CGI admin interface to vpopmail
 Summary(pl):	Interfejs CGI do administrowania vpopmailem
 Name:		qmailadmin
-Version:	1.0.1
-Release:	1
+Version:	1.0.6
+Release:	2
 License:	GPL
 Group:		Networking/Mail
 Source0:	%{name}-%{version}.tar.gz
+Patch0:		%{name}-template_c.patch
 # Source0-md5:	87ddbcb911738b528f5f840315396d6f
 #Source1:	README.hooks.bz2
 #Source2:	%{name}.png
@@ -46,13 +48,19 @@
 
 %prep
 %setup -q
+%patch -p1
 
 %build
+%{__aclocal}
 %{__autoconf}
+%{__automake}
+CFLAGS="%{rpmcflags} -I%{_includedir}/vpopmail"; export CFLAGS
+LIBS="/usr/lib/libvpopmail.a -lmysqlclient"; export LIBS
+
 %configure \
---enable-cgibindir=/home/httpd/cgi-bin \
+--enable-cgibindir=%{_httpddir}/cgi-bin \
 --with-htmllibdir=%{_datadir}/%{name} \
---enable-htmldir=/images/%{name} \
+--enable-htmldir=/home/services/httpd \
 --enable-cgipath=/cgi-bin/%{name}.cgi \
 --enable-autoresponder-bin=%{_bindir}/autorespond \
 --enable-vpopuser=%{vuser} \
@@ -69,31 +77,29 @@
 --enable-maxaliasesperpage=25 \
 --enable-ezmlmidx=y \
 --enable-defaultquota=-1 \
---enable-no-cache=y
-
+--enable-no-cache=y 
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_datadir}/%{name}/html,%{_libdir}/%{name}/scripts} \
-	$RPM_BUILD_ROOT/home/httpd/{cgi-bin,html/images/%{name}} \
-	$RPM_BUILD_ROOT{%{_menudir},%{_pixmapsdir}/hicolor/16x16/apps}
+install -d $RPM_BUILD_ROOT/%{_htmldir}/html \
+	$RPM_BUILD_ROOT/%{_htmldir}/cgi-bin \
+	$RPM_BUILD_ROOT/%{_htmldir}/images/%{name} \
+	$RPM_BUILD_ROOT/%{_datadir}/%{name}/html \
+	$RPM_BUILD_ROOT/%{_menudir} \
+	$RPM_BUILD_ROOT%{_libdir}/%{name}/scripts
 
-install %{name} $RPM_BUILD_ROOT/home/httpd/cgi-bin/%{name}.cgi
+install %{name} $RPM_BUILD_ROOT/%{_htmldir}/cgi-bin/%{name}.cgi
 
 # install the templates and the language files.
-install html/* $RPM_BUILD_ROOT%{_datadir}/%{name}/html
+install html/* $RPM_BUILD_ROOT/%{_datadir}/%{name}/html
 
 # install the images.
-#install images/*.png %{buildroot}/var/www/html/images/%{name}/
-
-# install the hooks documentation.
-#bzcat %{SOURCE1} > README.hooks
-
-#install %{SOURCE2} %{buildroot}%{_iconsdir}/hicolor/16x16/apps/
+install images/* $RPM_BUILD_ROOT/%{_htmldir}/images/%{name}
+cp $RPM_BUILD_ROOT/%{_datadir}/%{name}/html/en $RPM_BUILD_ROOT/%{_datadir}/%{name}/html/en-us
 
 # install script to call the web interface from the menu.
-cat <<EOF > $RPM_BUILD_ROOT%{_libdir}/%{name}/scripts/%{name}
+cat <<EOF > $RPM_BUILD_ROOT/%{_libdir}/%{name}/scripts/%{name}
 #!/bin/sh
 url='http://localhost/cgi-bin/%{name}.cgi'
 if ! [ -z "\$BROWSER" ] && ( which \$BROWSER ); then
@@ -114,27 +120,26 @@
 EOF
 
 # install menu entry.
-cat <<EOF > $RPM_BUILD_ROOT%{_menudir}/%{name}
-?package(%{name}): needs=X11 \
-section=Configuration/Networking \
-title="%{name} tool" \
-longtitle="Web-based administration tool for qmail+vpopmail, works with every browser. Set the $BROWSER environment variable to choose your preferred browser." \
-command="%{_libdir}/%{name}/scripts/%{name} 1>/dev/null 2>/dev/null" \
-icon="%{_pixmapsdir}/hicolor/16x16/apps/%{name}.png"
-EOF
+#cat <<EOF > $RPM_BUILD_ROOT/%{_menudir}/%{name}
+#?package(%{name}): needs=X11 \
+#section=Configuration/Networking \
+#title="%{name} tool" \
+#longtitle="Web-based administration tool for qmail+vpopmail, works with every browser. Set the $BROWSER environment variable to choose your preferred browser." \
+#command="%{_libdir}/%{name}/scripts/%{name} 1>/dev/null 2>/dev/null" \
+#icon="%{_pixmapsdir}/hicolor/16x16/apps/%{name}.png"
+#EOF
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog FAQ INSTALL NEWS README* themes/README.default
-%attr(6755,%{vuser},%{vgroup}) /home/httpd/cgi-bin/%{name}.cgi
+%doc AUTHORS ChangeLog FAQ INSTALL NEWS README* 
+%attr(6755,%{vuser},%{vgroup}) /%{_htmldir}/cgi-bin/%{name}.cgi
 %config(noreplace) %{_datadir}/%{name}/html/*
-%config(noreplace) /home/httpd/html/images/%{name}/*
-%{_libdir}/menu/%{name}
-%attr(755,root,root) %{_libdir}/%{name}/scripts/%{name}
-%{_iconsdir}/hicolor/16x16/apps/%{name}.png
+%config(noreplace) /%{_htmldir}/images/%{name}/*
+#/%{_menudir}/%{name}
+%attr(0755,root,root) %{_libdir}/%{name}/scripts/%{name}
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog