rpms/milter-regex/devel milter-regex-1.6-gcc.patch, NONE, 1.1 milter-regex.spec, 1.2, 1.3

[Paul Howarth (pghmcfc)]

Author: pghmcfc

Update of /cvs/extras/rpms/milter-regex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31666

Modified Files:
	milter-regex.spec 
Added Files:
	milter-regex-1.6-gcc.patch 
Log Message:
add patch for compile errors on Fedora 7
use sed rather than perl for quick scripted edits


milter-regex-1.6-gcc.patch:

--- NEW FILE milter-regex-1.6-gcc.patch ---
--- milter-regex/parse.y	2004-10-29 15:48:42.000000000 +0100
+++ milter-regex/parse.y	2007-04-18 09:56:34.000000000 +0100
@@ -44,7 +44,7 @@
 #include "eval.h"
 
 int			 yyerror(char *, ...);
-static int		 yyparse(void);
+extern int		 yyparse(void);
 static int		 define_macro(const char *, struct expr *);
 static struct expr	*find_macro(const char *);
 
@@ -473,9 +473,6 @@
 		*r = rs;
 		return (0);
 	}
-#ifdef __linux__
-	(void)&yyrcsid; /* warning about yyrcsid declared but unused */
-#endif
 }
 
 static int


Index: milter-regex.spec
===================================================================
RCS file: /cvs/extras/rpms/milter-regex/devel/milter-regex.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- milter-regex.spec	29 Aug 2006 12:03:06 -0000	1.2
+++ milter-regex.spec	18 Apr 2007 09:15:18 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           milter-regex
 Version:        1.6
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Sendmail milter plugin for regular expression filtering
 Group:          System Environment/Daemons
 License:        BSD
@@ -8,6 +8,7 @@
 Source0:        http://www.benzedrine.cx/milter-regex-%{version}.tar.gz
 Source1:        milter-regex-initscript
 Source2:        milter-regex-options
+Patch0:         milter-regex-1.6-gcc.patch
 Buildroot:      %{_tmppath}/%{name}-%{release}-root-%(%{__id_u} -n)
 Buildrequires:  sendmail-devel >= 8.13, byacc, groff
 Requires:       sendmail
@@ -23,8 +24,9 @@
 
 %prep
 %setup -q -n %{name}
-%{__perl} -pi -e 's+/etc/milter-regex\.conf+%{_sysconfdir}/mail/milter-regex.conf+' milter-regex.[8c]
-%{__perl} -pi -e 's+_milter-regex+mregex+' milter-regex.[8c]
+%patch0 -p1 -b .gcc
+%{__sed} -i -e 's+/etc/milter-regex\.conf+%{_sysconfdir}/mail/milter-regex.conf+' milter-regex.[8c]
+%{__sed} -i -e 's+_milter-regex+mregex+' milter-regex.[8c]
 /usr/bin/head -n +31 milter-regex.c > LICENSE
 
 %build
@@ -33,9 +35,9 @@
 %install
 %{__rm} -rf   %{buildroot}
 %{__mkdir} -p %{buildroot}%{_sbindir} \
-	      %{buildroot}%{_sysconfdir}/{rc.d/init.d,mail,sysconfig} \
-	      %{buildroot}%{_mandir}/man8 \
-	      %{buildroot}%{_localstatedir}/spool/milter-regex
+              %{buildroot}%{_sysconfdir}/{rc.d/init.d,mail,sysconfig} \
+              %{buildroot}%{_mandir}/man8 \
+              %{buildroot}%{_localstatedir}/spool/milter-regex
 %{__cp} -p milter-regex   %{buildroot}%{_sbindir}
 %{__cp} -p milter-regex.8 %{buildroot}%{_mandir}/man8
 %{__install} -p -m 755 %{SOURCE1} %{buildroot}%{_sysconfdir}/rc.d/init.d/milter-regex
@@ -59,8 +61,8 @@
 
 %preun
 if [ $1 -eq 0 ] ; then
-	/sbin/service milter-regex stop &> /dev/null || :
-	/sbin/chkconfig --del milter-regex || :
+        /sbin/service milter-regex stop &> /dev/null || :
+        /sbin/chkconfig --del milter-regex || :
 fi
 
 %postun
@@ -70,17 +72,21 @@
 %{__rm} -rf %{buildroot}
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc LICENSE
 %{_sbindir}/milter-regex
 %{_sysconfdir}/rc.d/init.d/milter-regex
 %config(noreplace) %{_sysconfdir}/sysconfig/milter-regex
 %config(noreplace) %{_sysconfdir}/mail/milter-regex.conf
-%dir %attr(755,mregex,mregex) %{_localstatedir}/spool/milter-regex
+%dir %attr(755,mregex,mregex) %{_localstatedir}/spool/milter-regex/
 %ghost %{_localstatedir}/spool/milter-regex/sock
 %{_mandir}/man8/milter-regex.8*
 
 %changelog
+* Wed Apr 18 2007 Paul Howarth <paul at city-fan.org> - 1.6-7
+- add patch for compile errors on Fedora 7
+- use sed rather than perl for quick scripted edits
+
 * Tue Aug 29 2006 Paul Howarth <paul at city-fan.org> - 1.6-6
 - rebuild for dynamic linking speedups (FE6)