SPECS (DEVEL): postfix.spec - conf_msg, dynamicmaps and ident patc...

[shadzik]

Author: shadzik                      Date: Tue Jul 11 18:45:15 2006 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- conf_msg, dynamicmaps and ident patch fixes
- still NFY; it stopped build due to unresolved symbol var_scache_service;
  dunno what to do with this

---- Files affected:
SPECS:
   postfix.spec (1.254.4.1 -> 1.254.4.2) 

---- Diffs:

================================================================
Index: SPECS/postfix.spec
diff -u SPECS/postfix.spec:1.254.4.1 SPECS/postfix.spec:1.254.4.2
--- SPECS/postfix.spec:1.254.4.1	Tue Jul 11 17:05:54 2006
+++ SPECS/postfix.spec	Tue Jul 11 20:45:09 2006
@@ -39,16 +39,15 @@
 ##Source7:	http://web.onda.com.br/nadal/postfix/VDA/%{name}-%{version}-vda.patch.gz
 ## Source7-md5:	8237cd654eb116d35785b11de6e5ca9c
 Patch0:		%{name}-config.patch
-#Patch1:		%{name}-conf_msg.patch
-#Patch2:		%{name}-dynamicmaps.patch
+Patch1:		%{name}-conf_msg.patch
+Patch2:		%{name}-dynamicmaps.patch
 Patch3:		%{name}-master.cf_cyrus.patch
 # from http://akson.sgh.waw.pl/~chopin/unix/postfix-2.1.5-header_if_reject.diff
 Patch4:		%{name}-header_if_reject.patch
 #Patch5:	%{name}-pl.patch
-#Patch6:		%{name}-setsid.patch
-#Patch7:		%{name}-size-check-before-proxy.patch
-#Patch8:		%{name}-log-proxy-rejects.patch
-#Patch9:		%{name}-ident.patch
+#Patch6:		%{name}-size-check-before-proxy.patch
+#Patch7:		%{name}-log-proxy-rejects.patch
+Patch8:		%{name}-ident.patch
 URL:		http://www.postfix.org/
 BuildRequires:	awk
 %{?with_sasl:BuildRequires:	cyrus-sasl-devel}
@@ -215,15 +214,14 @@
 %setup -q -n %{name}-%{version}-%{_rc}
 #%{?with_vda:zcat %{SOURCE7} | patch -p1 -s}
 %patch0 -p1
-#%patch1 -p1 --obsolete/update ?
-#%patch2 -p1 --obsolete/update ?
+%patch1 -p0
+%patch2 -p1
 %patch3 -p1
 %{?with_hir:%patch4 -p0}
 #%{?with_polish:%patch5 -p1}
-#%patch6 -p1 --obsolete
-#%patch7 -p1 --obsolete
-#%patch8 -p1 --obsolete/update ?
-#%patch9 -p1 --obsolete/update ?
+#%patch6 -p1
+#%patch7 -p1 --obsolete/update ?
+%patch8 -p1
 
 %build
 %{__make} -f Makefile.init makefiles
@@ -257,7 +255,7 @@
 	install lib/lib${f}.a $RPM_BUILD_ROOT%{_libdir}/libpostfix-${f}.so.1
 	ln -sf lib${f}.so.1 $RPM_BUILD_ROOT%{_libdir}/libpostfix-${f}.so
 done
-#install lib/dict*.so $RPM_BUILD_ROOT%{_libdir}/postfix
+install lib/dict*.so $RPM_BUILD_ROOT%{_libdir}/postfix
 install include/*.h $RPM_BUILD_ROOT%{_includedir}/postfix
 
 (cd man; tar cf - .) | (cd $RPM_BUILD_ROOT%{_mandir}; tar xf -)
@@ -388,27 +386,27 @@
 %attr(755,root,root) %{_libdir}/libpostfix-*.so
 %{_includedir}/postfix
 
-#%if %{with ldap}
-#%files dict-ldap
-#%defattr(644,root,root,755)
-#%attr(755,root,root) %{_libdir}/postfix/dict_ldap.so
-#%endif
-
-#%if %{with mysql}
-#%files dict-mysql
-#%defattr(644,root,root,755)
-#%attr(755,root,root) %{_libdir}/postfix/dict_mysql.so
-#%endif
-
-#%files dict-pcre
-#%defattr(644,root,root,755)
-#%attr(755,root,root) %{_libdir}/postfix/dict_pcre.so
-
-#%if %{with pgsql}
-#%files dict-pgsql
-#%defattr(644,root,root,755)
-#%attr(755,root,root) %{_libdir}/postfix/dict_pgsql.so
-#%endif
+%if %{with ldap}
+%files dict-ldap
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/postfix/dict_ldap.so
+%endif
+
+%if %{with mysql}
+%files dict-mysql
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/postfix/dict_mysql.so
+%endif
+
+%files dict-pcre
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/postfix/dict_pcre.so
+
+%if %{with pgsql}
+%files dict-pgsql
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/postfix/dict_pgsql.so
+%endif
 
 %define	date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -416,6 +414,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.254.4.2  2006/07/11 18:45:09  shadzik
+- conf_msg, dynamicmaps and ident patch fixes
+- still NFY; it stopped build due to unresolved symbol var_scache_service;
+  dunno what to do with this
+
 Revision 1.254.4.1  2006/07/11 15:05:54  shadzik
 - up to 2.3-RC9
 - NFY - need to update some patches; wtf happend to all those dict* files ?
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/postfix.spec?r1=1.254.4.1&r2=1.254.4.2&f=u