Author: glen Date: Tue Jan 17 04:30:59 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- killed pointless macros and profile.d, leftovers from chgw
---- Files affected:
SPECS:
courier.spec (1.126 -> 1.127)
---- Diffs:
================================================================
Index: SPECS/courier.spec
diff -u SPECS/courier.spec:1.126 SPECS/courier.spec:1.127
--- SPECS/courier.spec:1.126 Tue Jan 17 05:20:59 2006
+++ SPECS/courier.spec Tue Jan 17 05:30:54 2006
@@ -11,7 +11,7 @@
Summary(pl): Serwer poczty Courier
Name: courier
Version: 0.52.2
-Release: 0.2
+Release: 0.3
License: GPL
Group: Networking/Daemons
# !!! Don't change it !!!
@@ -68,8 +68,7 @@
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define _datadir %{_prefix}/share/courier
-%define _mandir /usr/share/man
-%define _libdir %{_prefix}/%{_lib}/courier
+%define _libdir %{_prefix}/%{_lib}/%{name}
%define _libexecdir %{_libdir}
%define _localstatedir /var/spool/courier
%define _sysconfdir /etc/courier
@@ -366,9 +365,9 @@
%{__make} install-perms
# Move webmail and webadmin to cgibindir
-mv -f $RPM_BUILD_ROOT%{_libexecdir}/courier/webmail/webmail \
+mv -f $RPM_BUILD_ROOT%{_libdir}/courier/webmail/webmail \
$RPM_BUILD_ROOT%{_cgibindir}/webmail
-mv -f $RPM_BUILD_ROOT%{_libexecdir}/courier/webmail/webadmin \
+mv -f $RPM_BUILD_ROOT%{_libdir}/courier/webmail/webadmin \
$RPM_BUILD_ROOT%{_cgibindir}/webadmin
# install a cron job to clean out webmail's cache
@@ -419,38 +418,6 @@
touch $RPM_BUILD_ROOT%{_sysconfdir}/calendarmode
install courier.sysvinit $RPM_BUILD_ROOT%{_initrddir}/courier
-#
-# Red Hat /etc/profile.d scripts
-#
-
-install -d $RPM_BUILD_ROOT/etc/profile.d
-# kill this shit: %{_bindir} is standard $PATH
-cat > $RPM_BUILD_ROOT/etc/profile.d/courier.sh <<'EOF'
-if echo "$PATH" | tr ':' '\012' | fgrep -qx %{_bindir}; then
- :
-else
- if test -w /etc; then
- PATH="%{_sbindir}:$PATH"
- fi
- PATH="%{_bindir}:$PATH"
- export PATH
-fi
-EOF
-
-cat >$RPM_BUILD_ROOT/etc/profile.d/courier.csh <<'EOF'
-
-echo "$PATH" | tr ':' '\012' | fgrep -qx %{_bindir}
-
-if ( $? ) then
- true
-else
- test -w /etc
- if ( $? ) then
- setenv PATH "%{_sbindir}:$PATH"
- endif
- setenv PATH "%{_bindir}:$PATH"
-endif
-EOF
# sendmail soft links
ln -sf %{_sbindir}/sendmail $RPM_BUILD_ROOT%{_prefix}/lib/sendmail
@@ -808,8 +775,6 @@
%attr(640,daemon,daemon) %config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/ldapaliasrc
%attr(700,daemon,daemon) %{_sbindir}/courierldapaliasd
%attr(644,root,root) %config(noreplace) %verify(not md5 mtime size)
/etc/pam.d/esmtp
-%attr(755,root,root) /etc/profile.d/courier.sh
-%attr(755,root,root) /etc/profile.d/courier.csh
%attr(754,root,root) /etc/rc.d/init.d/courier
%attr(755,daemon,daemon) %dir %{_sysconfdir}/shared
%attr(755,daemon,daemon) %dir %{_sysconfdir}/shared.tmp
@@ -956,6 +921,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.127 2006/01/17 04:30:54 glen
+- killed pointless macros and profile.d, leftovers from chgw
+
Revision 1.126 2006/01/17 04:20:59 glen
- convert to webapps
- corrected requires
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/courier.spec?r1=1.126&r2=1.127&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
