[Freeswitch-svn] [commit] r7506 - freeswitch/trunk

[Freeswitch SVN]

Author: cypromis
Date: Sun Feb  3 19:56:37 2008
New Revision: 7506

Modified:
   freeswitch/trunk/freeswitch.spec

Log:
more cmmand moakroisation in specfile

Modified: freeswitch/trunk/freeswitch.spec
==============================================================================
--- freeswitch/trunk/freeswitch.spec	(original)
+++ freeswitch/trunk/freeswitch.spec	Sun Feb  3 19:56:37 2008
@@ -171,8 +171,6 @@
 %setup -q
 
 %build
-#export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -DLDAP_DEPRECATED -fPIC -DPIC"
-#export CFLAGS="$RPM_OPT_FLAGS -fPIC -DPIC"
 %if 0%{?suse_version} > 1000 && 0%{?suse_version} < 1030
 export CFLAGS="$CFLAGS -fstack-protector"
 %endif
@@ -229,32 +227,32 @@
 make
 
 %install
-make DESTDIR=$RPM_BUILD_ROOT install
+%{__make} DESTDIR=$RPM_BUILD_ROOT install
 
 # Create a log dir
-mkdir -p $RPM_BUILD_ROOT%{prefix}/log
+%{__mkdir} -p $RPM_BUILD_ROOT%{prefix}/log
 
 %ifos linux
 #Install the library path config so the system can find the modules
-mkdir -p $RPM_BUILD_ROOT/etc/ld.so.conf.d
-cp build/freeswitch.ld.so.conf $RPM_BUILD_ROOT/etc/ld.so.conf.d/
+%{__mkdir} -p $RPM_BUILD_ROOT/etc/ld.so.conf.d
+%{__cp} build/freeswitch.ld.so.conf $RPM_BUILD_ROOT/etc/ld.so.conf.d/
 # Install init files
 # On SuSE:
 %if 0%{?suse_version} > 100
-install -D -m 744 build/freeswitch.init.suse $RPM_BUILD_ROOT/etc/init.d/freeswitch
+%{__install} -D -m 744 build/freeswitch.init.suse $RPM_BUILD_ROOT/etc/init.d/freeswitch
 %else
 # On RedHat like
-install -D -m 744 build/freeswitch.init.redhat $RPM_BUILD_ROOT/etc/init.d/freeswitch
+%{__install} -D -m 744 build/freeswitch.init.redhat $RPM_BUILD_ROOT/etc/init.d/freeswitch
 %endif
 # On SuSE make /usr/sbin/rcfreeswitch a link to /etc/init.d/freeswitch
 %if 0%{?suse_version} > 100
-mkdir -p $RPM_BUILD_ROOT/usr/sbin
-ln -sf /etc/init.d/freeswitch $RPM_BUILD_ROOT/usr/sbin/rcfreeswitch
+%{__mkdir} -p $RPM_BUILD_ROOT/usr/sbin
+%{__ln} -sf /etc/init.d/freeswitch $RPM_BUILD_ROOT/usr/sbin/rcfreeswitch
 %endif
 # Add the sysconfiguration file
-install -D -m 744 build/freeswitch.sysconfig $RPM_BUILD_ROOT/etc/sysconfig/freeswitch
+%{__install} -D -m 744 build/freeswitch.sysconfig $RPM_BUILD_ROOT/etc/sysconfig/freeswitch
 # Add monit file
-install -D -m 644 build/freeswitch.monitrc $RPM_BUILD_ROOT/etc/monit.d/freeswitch.monitrc
+%{__install} -D -m 644 build/freeswitch.monitrc $RPM_BUILD_ROOT/etc/monit.d/freeswitch.monitrc
 %endif
 
 
@@ -265,16 +263,16 @@
 %post
 %{?run_ldconfig:%run_ldconfig}
 # Make FHS2.0 happy
-mkdir -p /etc/opt
-ln -sf %{prefix}/conf /etc%{prefix}
+%{__mkdir} -p /etc/opt
+%{__ln} -sf %{prefix}/conf /etc%{prefix}
 
 %postun
 %{?run_ldconfig:%run_ldconfig}
-rm -rf %{prefix}
+%{__rm} -rf %{prefix}
 userdel freeswitch
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,freeswitch,daemon)
@@ -484,6 +482,10 @@
 %{prefix}/mod/mod_say_fr.so*
 
 %changelog
+* Sun Fri 03 2008 - michal.bielicki at voiceworks.pl
+- abstraction of prefix
+- more wrong stuff deleted
+- abstraction of mkdir, mv, rm, install etc into macros
 * Fri Jan 18 2008 - michal.bielicki at voiceworks.pl
 - fixes, fixes and more fixes in preparation for rc1
 * Thu Dec 5 2007 - michal.bielicki at voiceworks.pl