rpms/mailman/devel mailman.spec,1.81,1.82

Daniel Novotny dnovotny at fedoraproject.org
Tue Jul 7 11:02:54 UTC 2009 

Author: dnovotny

Update of /cvs/extras/rpms/mailman/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9411

Modified Files:
	mailman.spec 
Log Message:

changes for merge review



Index: mailman.spec
===================================================================
RCS file: /cvs/extras/rpms/mailman/devel/mailman.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -p -r1.81 -r1.82
--- mailman.spec	2 Apr 2009 13:34:03 -0000	1.81
+++ mailman.spec	7 Jul 2009 11:02:53 -0000	1.82
@@ -1,11 +1,11 @@
 Summary: Mailing list manager with built in Web access
 Name: mailman
 Version: 2.1.12
-Release: 4%{?dist}
+Release: 5%{?dist}
 Epoch: 3
 Group: Applications/Internet
-#Source0: ftp://ftp.gnu.org/pub/gnu/mailman/mailman-%{version}.tgz
-Source0: http://prdownloads.sourceforge.net/mailman/mailman-%{version}.tgz
+Source0: ftp://ftp.gnu.org/pub/gnu/mailman/mailman-%{version}.tgz
+#Source0: http://prdownloads.sourceforge.net/mailman/mailman-%{version}.tgz
 Source1: mm_cfg.py
 Source3: httpd-mailman.conf
 Source4: mailman.logrotate
@@ -43,7 +43,7 @@ BuildRequires: python-devel >= 2.2, auto
 %define contentdir /var/www
 
 # Installation directories
-%define mmdir /usr/lib/%{name}
+%define mmdir %{_libdir}/%{name}
 %define varmmdir /var/lib/%{name}
 %define docdir /usr/share/doc/%{name}-%{version}
 %define configdir /etc/%{name}
@@ -129,20 +129,21 @@ rm -f configure
 aclocal
 autoconf
 ./configure \
-	--prefix=%{mmdir} \
-	--with-var-prefix=%{varmmdir} \
-	--with-config-dir=%{configdir} \
-	--with-lock-dir=%{lockdir} \
-	--with-log-dir=%{logdir} \
-	--with-pid-dir=%{piddir} \
-	--with-queue-dir=%{queuedir} \
-	--with-python=%{__python} \
-	--with-mail-gid=%{mailgroup} \
-	--with-cgi-id=%{cgiuser} \
-	--with-cgi-gid=%{cgigroup} \
-	--with-mailhost=localhost.localdomain \
-	--with-urlhost=localhost.localdomain \
-	--without-permcheck
+        --libdir=%{_libdir} \
+        --prefix=%{mmdir} \
+        --with-var-prefix=%{varmmdir} \
+        --with-config-dir=%{configdir} \
+        --with-lock-dir=%{lockdir} \
+        --with-log-dir=%{logdir} \
+        --with-pid-dir=%{piddir} \
+        --with-queue-dir=%{queuedir} \
+        --with-python=%{__python} \
+        --with-mail-gid=%{mailgroup} \
+        --with-cgi-id=%{cgiuser} \
+        --with-cgi-gid=%{cgigroup} \
+        --with-mailhost=localhost.localdomain \
+        --with-urlhost=localhost.localdomain \
+        --without-permcheck
 
 function SubstituteParameters()
 {
@@ -168,7 +169,7 @@ SubstituteParameters "%{SOURCE3}" "httpd
 SubstituteParameters "%{SOURCE4}" "mailman.logrotate"
 
 make
-	
+
 %install
 rm -fr $RPM_BUILD_ROOT
 # Normal install.
@@ -338,10 +339,10 @@ exit 0
 %files
 %defattr(-,root,%{mmgroup})
 %dir %{mmdir}
-%{mmdir}/Mailman
+#%%{mmdir}/Mailman
 %{mmdir}/bin
 %{mmdir}/cgi-bin
-%{mmdir}/cron
+#%%{mmdir}/cron
 %{mmdir}/icons
 %{mmdir}/mail
 %{mmdir}/messages
@@ -350,14 +351,127 @@ exit 0
 %config(noreplace) %{mmdir}/templates
 %{mmdir}/tests
 %{varmmdir}
+#cron dir minus one file which is listed later
+%{mmdir}/cron/bumpdigests
+%{mmdir}/cron/checkdbs
+%{mmdir}/cron/cull_bad_shunt
+%{mmdir}/cron/disabled
+%{mmdir}/cron/gate_news
+%{mmdir}/cron/mailpasswds
+%{mmdir}/cron/nightly_gzip
+%{mmdir}/cron/paths.py
+%{mmdir}/cron/paths.pyc
+%{mmdir}/cron/paths.pyo
+%{mmdir}/cron/senddigests
+#Mailman dir minus one file which is listed later
+%{mmdir}/Mailman/Archiver
+%{mmdir}/Mailman/Autoresponder.py
+%{mmdir}/Mailman/Autoresponder.pyc
+%{mmdir}/Mailman/Autoresponder.pyo
+%{mmdir}/Mailman/Bouncer.py
+%{mmdir}/Mailman/Bouncer.pyc
+%{mmdir}/Mailman/Bouncer.pyo
+%{mmdir}/Mailman/Bouncers
+%{mmdir}/Mailman/Cgi
+%{mmdir}/Mailman/Commands
+%{mmdir}/Mailman/Defaults.py
+%{mmdir}/Mailman/Defaults.pyc
+%{mmdir}/Mailman/Defaults.pyo
+%{mmdir}/Mailman/Deliverer.py
+%{mmdir}/Mailman/Deliverer.pyc
+%{mmdir}/Mailman/Deliverer.pyo
+%{mmdir}/Mailman/Digester.py
+%{mmdir}/Mailman/Digester.pyc
+%{mmdir}/Mailman/Digester.pyo
+%{mmdir}/Mailman/Errors.py
+%{mmdir}/Mailman/Errors.pyc
+%{mmdir}/Mailman/Errors.pyo
+%{mmdir}/Mailman/GatewayManager.py
+%{mmdir}/Mailman/GatewayManager.pyc
+%{mmdir}/Mailman/GatewayManager.pyo
+%{mmdir}/Mailman/Generator.py
+%{mmdir}/Mailman/Generator.pyc
+%{mmdir}/Mailman/Generator.pyo
+%{mmdir}/Mailman/Gui
+%{mmdir}/Mailman/Handlers
+%{mmdir}/Mailman/htmlformat.py
+%{mmdir}/Mailman/htmlformat.pyc
+%{mmdir}/Mailman/htmlformat.pyo
+%{mmdir}/Mailman/HTMLFormatter.py
+%{mmdir}/Mailman/HTMLFormatter.pyc
+%{mmdir}/Mailman/HTMLFormatter.pyo
+%{mmdir}/Mailman/i18n.py
+%{mmdir}/Mailman/i18n.pyc
+%{mmdir}/Mailman/i18n.pyo
+%{mmdir}/Mailman/__init__.py
+%{mmdir}/Mailman/__init__.pyc
+%{mmdir}/Mailman/__init__.pyo
+%{mmdir}/Mailman/ListAdmin.py
+%{mmdir}/Mailman/ListAdmin.pyc
+%{mmdir}/Mailman/ListAdmin.pyo
+%{mmdir}/Mailman/LockFile.py
+%{mmdir}/Mailman/LockFile.pyc
+%{mmdir}/Mailman/LockFile.pyo
+%{mmdir}/Mailman/Logging
+%{mmdir}/Mailman/Mailbox.py
+%{mmdir}/Mailman/Mailbox.pyc
+%{mmdir}/Mailman/Mailbox.pyo
+%{mmdir}/Mailman/MailList.py
+%{mmdir}/Mailman/MailList.pyc
+%{mmdir}/Mailman/MailList.pyo
+%{mmdir}/Mailman/MemberAdaptor.py
+%{mmdir}/Mailman/MemberAdaptor.pyc
+%{mmdir}/Mailman/MemberAdaptor.pyo
+%{mmdir}/Mailman/Message.py
+%{mmdir}/Mailman/Message.pyc
+%{mmdir}/Mailman/Message.pyo
+%{mmdir}/Mailman/mm_cfg.pyc
+%{mmdir}/Mailman/mm_cfg.py.dist
+%{mmdir}/Mailman/mm_cfg.pyo
+%{mmdir}/Mailman/MTA
+%{mmdir}/Mailman/OldStyleMemberships.py
+%{mmdir}/Mailman/OldStyleMemberships.pyc
+%{mmdir}/Mailman/OldStyleMemberships.pyo
+%{mmdir}/Mailman/Pending.py
+%{mmdir}/Mailman/Pending.pyc
+%{mmdir}/Mailman/Pending.pyo
+%{mmdir}/Mailman/Post.py
+%{mmdir}/Mailman/Post.pyc
+%{mmdir}/Mailman/Post.pyo
+%{mmdir}/Mailman/Queue
+%{mmdir}/Mailman/SafeDict.py
+%{mmdir}/Mailman/SafeDict.pyc
+%{mmdir}/Mailman/SafeDict.pyo
+%{mmdir}/Mailman/SecurityManager.py
+%{mmdir}/Mailman/SecurityManager.pyc
+%{mmdir}/Mailman/SecurityManager.pyo
+%{mmdir}/Mailman/Site.py
+%{mmdir}/Mailman/Site.pyc
+%{mmdir}/Mailman/Site.pyo
+%{mmdir}/Mailman/TopicMgr.py
+%{mmdir}/Mailman/TopicMgr.pyc
+%{mmdir}/Mailman/TopicMgr.pyo
+%{mmdir}/Mailman/UserDesc.py
+%{mmdir}/Mailman/UserDesc.pyc
+%{mmdir}/Mailman/UserDesc.pyo
+%{mmdir}/Mailman/Utils.py
+%{mmdir}/Mailman/Utils.pyc
+%{mmdir}/Mailman/Utils.pyo
+%{mmdir}/Mailman/Version.py
+%{mmdir}/Mailman/Version.pyc
+%{mmdir}/Mailman/Version.pyo
+%{mmdir}/Mailman/versions.py
+%{mmdir}/Mailman/versions.pyc
+%{mmdir}/Mailman/versions.pyo
 %doc %{docdir}
 %attr(0755,root,root) %{contentdir}/icons
 %attr(0644, root, %{mmgroup}) %config(noreplace) %verify(not md5 size mtime) %{mmdir}/Mailman/mm_cfg.py
 %config(noreplace) %{httpdconfdir}/%{httpdconffile}
 /etc/logrotate.d/%{name}
 /etc/smrsh/%{mail_wrapper}
-%attr(2775,root,%{mmgroup}) %{configdir}
+%dir %attr(2775,root,%{mmgroup}) %{configdir}
 %attr(0644, root, %{mmgroup}) %config(noreplace) %verify(not md5 size mtime) %{configdir}/sitelist.cfg
+%{configdir}/mm_cfg.py
 %attr(2775,root,%{mmgroup}) %{lockdir}
 %attr(2775,root,%{mmgroup}) %{logdir}
 %attr(2775,root,%{mmgroup}) %{queuedir}
@@ -368,6 +482,15 @@ exit 0
 %attr(0755,root,root) %{_bindir}/mailman-update-cfg
 
 %changelog
+* Tue Jul 07 2009 Daniel Novotny <dnovotny at redhat.com> 3:2.1.12-5
+- hardcoded library path removed
+- mixed use of spaces and tabs fixed
+- added --libdir to configure
+- fixed URL to tarball
+- permissions of source files changed to 0644
+- got rid of "file listed twice" warnings: listing the files explicitly
+- all this were cleanups for merge review (#226117)  
+
 * Thu Apr 02 2009 Daniel Novotny <dnovotny at redhat.com> 3:2.1.12-4
 - fix bz#481446 (Recompile of mailman's config causes SElinux denials)

More information about the fedora-extras-commits mailing list