commit hylafax

28 May 2006

Hello community,

here is the log from the commit of package hylafax
checked in at Mon May 29 01:08:54 CEST 2006.

--------

--- hylafax/hylafax.changes	2006-03-13 18:21:16.000000000 +0100
+++ hylafax/hylafax.changes	2006-05-27 00:33:47.000000000 +0200
@@ -1,0 +2,7 @@
+Fri May 26 23:31:31 CEST 2006 - schwab@suse.de
+
+- Don't build as root.
+- Use RPM_OPT_FLAGS.
+- Don't strip binaries.
+
+-------------------------------------------------------------------

New:
----
  hylafax-4.2.5-warning.diff

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ hylafax.spec ++++++
--- /var/tmp/diff_new_pack.HNjqlG/_old	2006-05-29 01:08:34.000000000 +0200
+++ /var/tmp/diff_new_pack.HNjqlG/_new	2006-05-29 01:08:34.000000000 +0200
@@ -8,6 +8,7 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+# norootforbuild
 
 Name:           hylafax
 BuildRequires:  capi4linux gcc-c++ ghostscript-library i4l-isdnlog libpng-devel libtiff-devel metamail mm postfix
@@ -18,7 +19,7 @@
 Conflicts:      sendfax
 Autoreqprov:    on
 Version:        4.2.5
-Release:        6
+Release:        14
 Source:         %{name}-%{version}.tar.bz2
 Source1:        latex-cover-1.04.tar.bz2
 Source2:        %{name}-SuSE.tar.bz2
@@ -30,6 +31,7 @@
 Patch4:         %{name}-%{version}-fax_user.dif
 Patch5:         %{name}-%{version}-asciifix.dif
 Patch6:         %{name}-%{version}-log.diff
+Patch7:         %{name}-%{version}-warning.diff
 Patch10:        capi4hylafax-suse.diff
 Patch11:        capi4hylafax-secfix.diff
 URL:            http://www.hylafax.org
@@ -85,7 +87,7 @@
     AVM  <cvs-capi4hylafax@avm.de>
 
 %prep
-%setup -q -n %{name}-%{version} -a 1 -a 2
+%setup -q -n %{name}-%{version} -a 1 -a 2 -b 3
 %patch -p1
 %patch1 -p1
 %patch2 -p1
@@ -93,22 +95,23 @@
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
-#%patch7 -p0
+%patch7
 #%patch8 -p0
 #-b .valist
 # need to be executable 
 chmod 755 SuSE/usr/lib/fax/a2pswrap
-%setup -q -n capi4hylafax-01.03.00 -T -D -b 3
+cd ../capi4hylafax-01.03.00
 %patch10 -p1
 %patch11 -p1
-%setup -T -D -n %{name}-%{version}
 find ../ -name .cvsignore -exec rm {} \;
 
 %build
 %{?suse_update_config:%{suse_update_config -f}}
-LIBTIFF="-ltiff" ./configure ${RPM_ARCH}-suse-linux < /dev/null
+./configure --with-OPTIMIZER="$RPM_OPT_FLAGS" --with-STRIP=: \
+            ${RPM_ARCH}-suse-linux < /dev/null
 make
 cd ../capi4hylafax-01.03.00
+CFLAGS=$RPM_OPT_FLAGS CXXFLAGS=$RPM_OPT_FLAGS \
 ./configure 	--prefix=/usr \
 		--with-hylafax-spooldir=/var/spool/fax \
 		--with-hylafax-srcdir=/usr/src/packages/BUILD/%{name}-%{version}
@@ -116,8 +119,6 @@
 make 
 
 %install
-/usr/sbin/useradd -r -o -g uucp -u 33 -s /bin/bash -c "Facsimile agent" -d /var/spool/fax fax 2> /dev/null || :
-/usr/sbin/usermod -g uucp -G dialout fax 2> /dev/null || :
 install -d ${RPM_BUILD_ROOT}/var/spool/fax
 install -d ${RPM_BUILD_ROOT}/usr/lib
 install -d ${RPM_BUILD_ROOT}/usr/%_lib
@@ -134,7 +135,7 @@
 	     LIBDIR=${RPM_BUILD_ROOT}/usr/%_lib
 install -m755 etc/hylafax ${RPM_BUILD_ROOT}/etc/init.d
 ln -sf ../../etc/init.d/hylafax ${RPM_BUILD_ROOT}/usr/sbin/rchylafax
-cp -a SuSE/* ${RPM_BUILD_ROOT}
+cp -af SuSE/* ${RPM_BUILD_ROOT}
 rm -f ${RPM_BUILD_ROOT}/README.SuSE
 install -m755 faxsend ${RPM_BUILD_ROOT}/var/spool/fax/bin/
 # capi4hylafax
@@ -155,7 +156,6 @@
 	config.faxCAPI \
 	${RPM_BUILD_ROOT}%{_defaultdocdir}/capi4hylafax
 mv ${RPM_BUILD_ROOT}/usr/lib/fax/faxcover_example_sgi.ps ${RPM_BUILD_ROOT}%{_defaultdocdir}/hylafax
-chown -R fax:uucp ${RPM_BUILD_ROOT}/var/spool/fax
 
 %pre
 /usr/sbin/useradd -r -o -g uucp -u 33 -s /bin/bash -c "Facsimile agent" -d /var/spool/fax fax 2> /dev/null || :
@@ -213,6 +213,7 @@
 done
 
 %files
+%defattr(-, root, root)
 %doc COPYRIGHT README SuSE/README.SuSE TODO VERSION latex-cover-1.04 html
 %config /etc/init.d/hylafax
 %dir /usr/lib/fax
@@ -314,6 +315,7 @@
 /usr/sbin/tsitest
 /usr/sbin/typetest
 /usr/sbin/xferfaxstats
+%defattr(-,fax,uucp)
 %dir /var/spool/fax
 %dir /var/spool/fax/archive
 %dir /var/spool/fax/bin
@@ -345,6 +347,7 @@
 /var/spool/fax/FIFO
 
 %files -n hylafax-client
+%defattr(-, root, root)
 /usr/bin/faxalter
 /usr/bin/faxcover
 /usr/bin/faxmail
@@ -375,6 +378,7 @@
 %doc %{_mandir}/man1/textfmt.1.gz
 
 %files -n capi4hylafax
+%defattr(-, root, root)
 %doc %{_defaultdocdir}/capi4hylafax
 /usr/bin/c2faxrecv
 /usr/bin/c2faxsend
@@ -383,6 +387,10 @@
 /etc/config.faxCAPI.sample
 
 %changelog -n hylafax
+* Fri May 26 2006 - schwab@suse.de
+- Don't build as root.
+- Use RPM_OPT_FLAGS.
+- Don't strip binaries.
 * Mon Mar 13 2006 - kkeil@suse.de
 - move log/debug files to none world writeable directory (#156975)
 - fix faxaddmodem.capi script to produce a valid configfile

++++++ hylafax-4.2.5-warning.diff ++++++
--- faxd/MemoryDecoder.c++
+++ faxd/MemoryDecoder.c++
@@ -521,4 +521,5 @@
 	return (NULL);
 #endif /* HAVE_JBIG */
     }
+    return NULL;
 }
--- regex/engine.c
+++ regex/engine.c
@@ -679,6 +679,7 @@
 	/* "can't happen" */
 	assert(nope);
 	/* NOTREACHED */
+	return 0;
 }
 
 /*
++++++ hylafax-4.2.5.dif ++++++
++++     707 lines (skipped)
++++ between hylafax/hylafax-4.2.5.dif
++++ and hylafax/hylafax-4.2.5.dif


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

    

root＠suse.de

tags

participants (1)