projects
/
shibboleth
/
cpp-sp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
d25477d
)
Macro-ize spec files for Solaris.
author
Scott Cantor
<cantor.2@osu.edu>
Sun, 16 Sep 2007 02:59:53 +0000
(
02:59
+0000)
committer
Scott Cantor
<cantor.2@osu.edu>
Sun, 16 Sep 2007 02:59:53 +0000
(
02:59
+0000)
shibboleth.spec.in
patch
|
blob
|
history
diff --git
a/shibboleth.spec.in
b/shibboleth.spec.in
index
b5d56fb
..
b4a1ac6
100644
(file)
--- a/
shibboleth.spec.in
+++ b/
shibboleth.spec.in
@@
-53,32
+53,32
@@
applications that use the shibboleth library.
%build
%configure %{?shib_options}
%build
%configure %{?shib_options}
-make
+%{__make}
%install
%install
-[ "$RPM_BUILD_ROOT" != "/" ] &&
rm
-rf $RPM_BUILD_ROOT
-
rm
-rf _docs
+[ "$RPM_BUILD_ROOT" != "/" ] &&
{__rm}
-rf $RPM_BUILD_ROOT
+
{__rm}
-rf _docs
-make install DESTDIR=$RPM_BUILD_ROOT
-make -C selinux install DESTDIR=$RPM_BUILD_ROOT
-mv $RPM_BUILD_ROOT/usr/doc/shibboleth _docs
+%{__make} install DESTDIR=$RPM_BUILD_ROOT
+{__mv} $RPM_BUILD_ROOT/usr/doc/shibboleth _docs
%if "%{_vendor}" == "suse"
%if "%{_vendor}" == "suse"
-
sed
-i "s/\/var\/log\/httpd/\/var\/log\/apache2/g" \
+
%{__sed}
-i "s/\/var\/log\/httpd/\/var\/log\/apache2/g" \
$RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/native.logger
%endif
find $RPM_BUILD_ROOT/%{_libexecdir} -type f -or -type l |
$RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/native.logger
%endif
find $RPM_BUILD_ROOT/%{_libexecdir} -type f -or -type l |
-
sed
-e "s|$RPM_BUILD_ROOT||" | sort > rpm.filelist
+
%{__sed}
-e "s|$RPM_BUILD_ROOT||" | sort > rpm.filelist
%check || :
%check || :
-
make
check
+
%{__make}
check
%clean
%clean
-[ "$RPM_BUILD_ROOT" != "/" ] &&
rm
-rf $RPM_BUILD_ROOT
+[ "$RPM_BUILD_ROOT" != "/" ] &&
{__rm}
-rf $RPM_BUILD_ROOT
-%post
-/sbin/ldconfig
+%ifnos solaris2.8 solaris2.9 solaris2.10
+%post -p /sbin/ldconfig
+%endif
# Plug the SP into Apache on a recognized system.
APACHE_CONFIG="no"
# Plug the SP into Apache on a recognized system.
APACHE_CONFIG="no"
@@
-102,11
+102,11
@@
if [ "$APACHE_CONFIG" != "no" ] ; then
if [ "$APACHE_CONFD" != "no" ] ; then
if [ ! -f $APACHE_CONFD/shib.conf ] ; then
%if "%{_vendor}" == "suse"
if [ "$APACHE_CONFD" != "no" ] ; then
if [ ! -f $APACHE_CONFD/shib.conf ] ; then
%if "%{_vendor}" == "suse"
-
sed
"s/\/usr\/doc\/%{name}/\/usr\/share\/doc\/packages\/%{name}/g" \
+
%{__sed}
"s/\/usr\/doc\/%{name}/\/usr\/share\/doc\/packages\/%{name}/g" \
%{_sysconfdir}/%{name}/$APACHE_CONFIG \
> $APACHE_CONFD/shib.conf
%else
%{_sysconfdir}/%{name}/$APACHE_CONFIG \
> $APACHE_CONFD/shib.conf
%else
-
sed
"s/\/usr\/doc\/%{name}/\/usr\/share\/doc\/%{name}-@-VERSION-@/g" \
+
%{__sed}
"s/\/usr\/doc\/%{name}/\/usr\/share\/doc\/%{name}-@-VERSION-@/g" \
%{_sysconfdir}/%{name}/$APACHE_CONFIG \
> $APACHE_CONFD/shib.conf
%endif
%{_sysconfdir}/%{name}/$APACHE_CONFIG \
> $APACHE_CONFD/shib.conf
%endif
@@
-118,28
+118,29
@@
fi
%if "%{_vendor}" == "redhat"
if [ -d %{_sysconfdir}/init.d ] ; then
if [ ! -f %{_sysconfdir}/init.d/shibd ] ; then
%if "%{_vendor}" == "redhat"
if [ -d %{_sysconfdir}/init.d ] ; then
if [ ! -f %{_sysconfdir}/init.d/shibd ] ; then
-
cp
-p %{_sysconfdir}/shibboleth/%{_vendor} %{_sysconfdir}/init.d/shibd
-
chmod
755 %{_sysconfdir}/init.d/shibd
+
{__cp}
-p %{_sysconfdir}/shibboleth/%{_vendor} %{_sysconfdir}/init.d/shibd
+
%{__chmod}
755 %{_sysconfdir}/init.d/shibd
chkconfig --add shibd
fi
fi
%endif
chkconfig --add shibd
fi
fi
%endif
-%postun
-/sbin/ldconfig
+%ifnos solaris2.8 solaris2.9 solaris2.10
+%postun -p /sbin/ldconfig
+%endif
# delete the Apache configuration if we're being removed
[ "$1" = 0 ] || exit 0
[ -f %{_sysconfdir}/httpd/conf.d/shib.conf ] && \
# delete the Apache configuration if we're being removed
[ "$1" = 0 ] || exit 0
[ -f %{_sysconfdir}/httpd/conf.d/shib.conf ] && \
-
rm
-f %{_sysconfdir}/httpd/conf.d/shib.conf
+
{__rm}
-f %{_sysconfdir}/httpd/conf.d/shib.conf
[ -f %{_sysconfdir}/apache2/conf.d/shib.conf ] && \
[ -f %{_sysconfdir}/apache2/conf.d/shib.conf ] && \
-
rm
-f %{_sysconfdir}/apache2/conf.d/shib.conf
+
{__rm}
-f %{_sysconfdir}/apache2/conf.d/shib.conf
# clear init.d state
%if "%{_vendor}" == "redhat"
chkconfig --del shibd
[ -f %{_sysconfdir}/init.d/shibd ] && \
# clear init.d state
%if "%{_vendor}" == "redhat"
chkconfig --del shibd
[ -f %{_sysconfdir}/init.d/shibd ] && \
-
rm
-f %{_sysconfdir}/init.d/shibd
+
{__rm}
-f %{_sysconfdir}/init.d/shibd
%endif
%files -f rpm.filelist
%endif
%files -f rpm.filelist