rpms/Canna/FC-6 Canna.spec,1.6,1.7

Akira Tagoh (tagoh) fedora-extras-commits at redhat.com
Tue Feb 13 09:43:10 UTC 2007


Author: tagoh

Update of /cvs/extras/rpms/Canna/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13107

Modified Files:
	Canna.spec 
Log Message:
* Tue Feb 13 2007 Akira TAGOH <tagoh at redhat.com> - 3.7p3-17
- cleanups spec file.
- Build with RPM_OPT_FLAGS (#227378)


Index: Canna.spec
===================================================================
RCS file: /cvs/extras/rpms/Canna/FC-6/Canna.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Canna.spec	11 Nov 2006 17:00:25 -0000	1.6
+++ Canna.spec	13 Feb 2007 09:42:38 -0000	1.7
@@ -39,8 +39,11 @@
 Patch42: Canna-3.7p3-redecl.patch
 Patch43: Canna-3.7p3-fix-gcc4-warning.patch
 
-BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot
-Prereq: /sbin/chkconfig, /etc/services, /bin/grep, /bin/cp
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires(pre): /bin/grep %{_sbindir}/userdel %{_sbindir}/useradd /etc/passwd
+Requires(post): /bin/grep /etc/services /sbin/chkconfig /bin/chown
+Requires(preun): /sbin/service /sbin/chkconfig
+Requires(postun): /sbin/service
 BuildRequires: cpp gawk
 BuildRequires: imake >= 1.0.1-3
 Obsoletes: tamago
@@ -144,16 +147,14 @@
 xmkmf
 make sglobal.h
 popd
+find . -name Makefile | xargs sed -i -e 's/^\(\s*CDEBUGFLAGS\s*=.*\)/\1 $(RPM_OPT_FLAGS)/'
 %ifarch ia64
-sed 's/-O2//' Makefile > Makefile.tmp
-mv Makefile.tmp Makefile
+sed -i -e 's/-O2//' Makefile
 %endif
 # ugly hack to avoid X.Org: no such file or directory issue
-TMP_MAKEFILE=`mktemp /tmp/Canna-build-makefile.XXXXXX`
-sed -e 's/$(VENDOR_DEFINES)//' Makefile > $TMP_MAKEFILE && cp $TMP_MAKEFILE Makefile
-rm $TMP_MAKEFILE
+sed -i -e 's/$(VENDOR_DEFINES)//' Makefile
 make canna
-gcc -o ./misc/cannaping %{SOURCE22} -I./include -L./lib/canna -lcanna
+gcc $RPM_OPT_FLAGS -o ./misc/cannaping %{SOURCE22} -I./include -L./lib/canna -lcanna
 cd ..
 
 cd cannadic-%{cannadicver}
@@ -185,7 +186,7 @@
 cd ..
 
 %install
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
 
 cd %{cannadir}
 make libCannaDir=%{_libdir} DESTDIR=$RPM_BUILD_ROOT install
@@ -244,7 +245,7 @@
 %{__mkdir_p} $RPM_BUILD_ROOT%{_localstatedir}/run/.iroha_unix
 
 %clean
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -fr $RPM_BUILD_ROOT
+rm -fr $RPM_BUILD_ROOT
 
 
 %pre
@@ -325,6 +326,10 @@
 %{_libdir}/libcanna16.so.*
 
 %changelog
+* Tue Feb 13 2007 Akira TAGOH <tagoh at redhat.com> - 3.7p3-17
+- cleanups spec file.
+- Build with RPM_OPT_FLAGS (#227378)
+
 * Mon Sep 11 2006 Akira TAGOH <tagoh at redhat.com> - 3.7p3-16
 - rebuilt
 




More information about the fedora-extras-commits mailing list