commit 11a387e7f21436f6b60213ad9d4cf30cc51dd3c6 Author: Nathanael D. Noblet <nathanael@xxxxxxx> Date: Wed Mar 2 15:42:39 2011 -0700 patch to build on F15+ dspam-3.9.0-configure.patch | 194 +++++++++++++++++++++++++++++++++++++++++++ dspam.spec | 12 ++- 2 files changed, 202 insertions(+), 4 deletions(-) --- diff --git a/dspam-3.9.0-configure.patch b/dspam-3.9.0-configure.patch new file mode 100644 index 0000000..a507299 --- /dev/null +++ b/dspam-3.9.0-configure.patch @@ -0,0 +1,194 @@ +--- configure.ac 2010-01-11 14:22:14.000000000 -0700 ++++ configure.ac.new 2011-03-02 15:06:48.546753031 -0700 +@@ -72,7 +72,7 @@ + Enable support for DSPAM to run in --daemon mode + )]) + AC_MSG_CHECKING([whether to enable daemon mode]) +-case x"$enable_daemon" in ++case "x$enable_daemon" in + xyes) # daemon output enabled explicity + ;; + xno) # daemon output disabled explicity +@@ -212,7 +212,7 @@ + ) + + # dspam binary ownership +-case x"$host" in ++case "x$host" in + *-freebsd*) default_dspam_mode=4510;; + *) default_dspam_mode=2510;; + esac +@@ -275,7 +275,7 @@ + AC_ARG_ENABLE(trusted_user_security, + [AS_HELP_STRING(--disable-trusted-user-security,Disable trusted user security (enabled by default))]) + AC_MSG_CHECKING([whether to enable trusted user security]) +-case x"$enable_trusted_user_security" in ++case "x$enable_trusted_user_security" in + xyes) # trusted user security enabled explicity + ;; + xno) # trusted user security disabled explicity +@@ -305,7 +305,7 @@ + Enable Clam/AV support for DSPAM. + )]) + AC_MSG_CHECKING([whether to enable clamav]) +-case x"$enable_clamav" in ++case "x$enable_clamav" in + xyes) # clamav output enabled explicity + ;; + xno) # clamav output disabled explicity +@@ -334,7 +334,7 @@ + Don't enable this unless something needs testing! + )]) + AC_MSG_CHECKING([whether to enable debug output]) +-case x"$enable_debug" in ++case "x$enable_debug" in + xyes) # debug output enabled explicity + ;; + xno) # debug output disabled explicity +@@ -362,7 +362,7 @@ + Enable (or disable) syslog support + )]) + AC_MSG_CHECKING([whether to enable syslog output]) +-case x"$enable_syslog" in ++case "x$enable_syslog" in + xyes) # enabled explicity + ;; + xno) # disabled explicity +@@ -390,7 +390,7 @@ + Activates debugging output for Bayesian Noise Reduction + )]) + AC_MSG_CHECKING([whether to enable debug output for BNR]) +-case x"$enable_bnr_debug" in ++case "x$enable_bnr_debug" in + xyes) # enabled explicity + ;; + xno) # disabled explicity +@@ -419,7 +419,7 @@ + Enable home directory filesystem storage. + )]) + AC_MSG_CHECKING([whether to enable home directory support]) +-case x"$enable_homedir" in ++case "x$enable_homedir" in + xyes) # homedir enabled explicity + ;; + xno) # homedir disabled explicity +@@ -448,7 +448,7 @@ + libraries v4.1+. + )]) + AC_MSG_CHECKING([whether to enable MySQL client initialization]) +-case x"$enable_mysql4_initialization" in ++case "x$enable_mysql4_initialization" in + xyes) # enabled explicity + enable_mysql4_initialization=yes + ;; +@@ -480,7 +480,7 @@ + Enable if storage driver supports preferences extension + )]) + AC_MSG_CHECKING([whether to enable preferences-extension]) +-case x"$enable_preferences_extension" in ++case "x$enable_preferences_extension" in + xyes) # enabled explicity + ;; + xno) # disabled explicity +@@ -511,7 +511,7 @@ + Never enable this for production builds! + )]) + AC_MSG_CHECKING([whether to enable verbose debug output]) +-case x"$enable_verbose_debug" in ++case "x$enable_verbose_debug" in + xyes) # debug output enabled explicity + ;; + xno) # debug output disabled explicity +@@ -542,7 +542,7 @@ + system. + )]) + AC_MSG_CHECKING([whether to enable long usernames]) +-case x"$enable_long_usernames" in ++case "x$enable_long_usernames" in + xyes) # debug output enabled explicity + ;; + xno) # debug output disabled explicity +@@ -568,7 +568,7 @@ + AC_ARG_ENABLE(large-scale, + [AS_HELP_STRING(--enable-large-scale,Manage file structure for a large scale implementation)]) + AC_MSG_CHECKING([whether to enable large scale implementation]) +-case x"$enable_large_scale" in ++case "x$enable_large_scale" in + xyes) # large-scale enabled explicitly + ;; + xno) # large-scale disabled explicitly +@@ -594,7 +594,7 @@ + AC_ARG_ENABLE(domain-scale, + [AS_HELP_STRING(--enable-domain-scale,Manage file structure to support a domain implementation)]) + AC_MSG_CHECKING([whether to enable domain structure implementation]) +-case x"$enable_domain_scale" in ++case "x$enable_domain_scale" in + xyes) # domain-scale enabled explicitly + ;; + xno) # domain-scale disabled explicitly +--- m4/external_lookup.m4 2009-12-14 18:10:46.000000000 -0700 ++++ m4/external_lookup.m4.new 2011-03-02 15:30:54.025869365 -0700 +@@ -14,7 +14,7 @@ + Enable external lookup support + )]) + AC_MSG_CHECKING([whether to enable external lookup support]) +- case x"$enable_external_lookup" in ++ case "x$enable_external_lookup" in + xyes) # external lookup enabled explicity + ;; + xno) # external lookup disabled explicity +--- m4/gcc_build_options.m4 2009-01-22 08:42:36.000000000 -0700 ++++ m4/gcc_build_options.m4.new 2011-03-02 15:31:01.599944082 -0700 +@@ -58,7 +58,7 @@ + Has effect for GCC compilers only. + )]) + AC_MSG_CHECKING([whether to enable profiling output]) +-case x"$enable_profiling" in ++case "x$enable_profiling" in + xyes) # profiling output enabled explicity + ;; + xno) # profiling output disabled explicity +--- m4/mysql_drv.m4 2009-04-19 01:12:54.000000000 -0600 ++++ m4/mysql_drv.m4.new 2011-03-02 15:31:12.379050425 -0700 +@@ -33,7 +33,7 @@ + [AS_HELP_STRING([--enable-virtual-users], + [Cause mysql_drv to generate virtual uids for each user])]) + AC_MSG_CHECKING([whether to enable virtual users]) +-case x"$enable_virtual_users" in ++case "x$enable_virtual_users" in + xyes) # enabled explicity + ;; + xno) # disabled explicity +--- m4/ncore.m4 2010-01-11 14:21:58.000000000 -0700 ++++ m4/ncore.m4.new 2011-03-02 15:31:28.121205720 -0700 +@@ -14,7 +14,7 @@ + Enable NodalCore(tm) C-Series Hardware Extensions + )]) + AC_MSG_CHECKING([whether to enable NodalCore(tm) C-Series Hardware Extensions]) +- case x"$enable_nodalcore" in ++ case "x$enable_nodalcore" in + xyes) # nodalcore output enabled explicity + ;; + xno) # nodalcore output disabled explicity +--- m4/pgsql_drv.m4 2009-04-19 01:12:54.000000000 -0600 ++++ m4/pgsql_drv.m4.new 2011-03-02 15:32:02.123541172 -0700 +@@ -34,7 +34,7 @@ + [AS_HELP_STRING([--enable-virtual-users], + [Cause pgsql_drv to generate virtual uids for each user])]) + AC_MSG_CHECKING([whether to enable virtual users]) +-case x"$enable_virtual_users" in ++case "x$enable_virtual_users" in + xyes) # enabled explicity + ;; + xno) # disabled explicity +--- m4/split_configuration.m4 2010-01-11 14:21:58.000000000 -0700 ++++ m4/split_configuration.m4.new 2011-03-02 15:32:07.788597065 -0700 +@@ -13,7 +13,7 @@ + Enable split configuration file support + )]) + AC_MSG_CHECKING([whether to enable split configuration file support]) +- case x"$enable_split_configuration" in ++ case "x$enable_split_configuration" in + xyes) # split configuration file enabled explicity + ;; + xno) # split configuration file disabled explicity diff --git a/dspam.spec b/dspam.spec index cd74689..7defd46 100644 --- a/dspam.spec +++ b/dspam.spec @@ -25,6 +25,7 @@ Source99: dspam-filter-requires.sh Patch0: dspam-3.9.0-file-name.patch Patch1: dspam-3.9.0-docs.patch Patch2: dspam-3.9.0-dspamsock.patch +Patch3: dspam-3.9.0-configure.patch URL: http://www.nuclearelephant.com/ # kept to be able to build EPEL versions Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) @@ -137,9 +138,10 @@ Web-based interface for DSPAM's powerful Anti-Spam engine. %patch0 -p1 %patch1 -p0 %patch2 -p0 +%patch3 %build -#sh ./autogen.sh +sh ./autogen.sh %configure \ --enable-long-usernames \ @@ -162,8 +164,7 @@ Web-based interface for DSPAM's powerful Anti-Spam engine. --with-dspam-home-group='%{mail_group}' \ --with-dspam-mode='%{dspam_mode}' \ --with-logdir='%{dspam_logdir}' \ - --sysconfdir='%{dspam_confdir}' \ - --disable-nodalcore + --sysconfdir='%{dspam_confdir}' %{__make} OPTIMIZE="%{optflags} -fPIC -DPIC" @@ -372,7 +373,10 @@ service httpd condrestart %config(noreplace) %{_sysconfdir}/httpd/conf.d/dspam-web.conf %changelog -* Tue Mar 1 2011 Nathanael Noblet <nathanael@xxxxxxx> - 3.9.0.-15 +* Wed Mar 2 2011 Nathanael Noblet <nathanael@xxxxxxx> - 3.9.0-16 +- Added configure patch to build on F15+ + +* Tue Mar 1 2011 Nathanael Noblet <nathanael@xxxxxxx> - 3.9.0-15 - Applied Matej Cepl's patch to move the web dir to /var/www/dspam - Removed autogen call to see if configure nodalcore option passes -- Fedora Extras Perl SIG http://www.fedoraproject.org/wiki/Extras/SIGs/Perl perl-devel mailing list perl-devel@xxxxxxxxxxxxxxxxxxxxxxx https://admin.fedoraproject.org/mailman/listinfo/perl-devel