From bab411e6a1f1671871f3ddf90aa4db40010e2bcf Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Wed, 27 May 2009 15:10:09 +0000 Subject: [PATCH] mkspec.sh: Support FILTER_DEVEL, add Provides - Add Provides: $NAME = $VERSION - Weed out some old comments - Making use of FILTER_DEVEL environment variable --- make/mkspec.sh | 27 ++++----------------------- 1 file changed, 4 insertions(+), 23 deletions(-) diff --git a/make/mkspec.sh b/make/mkspec.sh index 9a2885f8..0371f8a9 100644 --- a/make/mkspec.sh +++ b/make/mkspec.sh @@ -8,8 +8,6 @@ echo "Group: System Environment/Libraries" echo "Vendor: Jannet IT Services, Berlin" echo "URL: http://www.jannet.de" echo "BuildRoot: /var/tmp/%{name}-buildroot" -#echo "%define post /sbin/ldconfig" -#echo "%define __spec_install_post /sbin/ldconfig" echo "" echo "%description" echo "This is a library providing easy-to-use interfaces for:" @@ -29,6 +27,7 @@ echo "" echo "%package -n $NAME-run" echo "Summary: The runtime library package." echo "Group: System Environment/Libraries" +echo "Provides: $NAME = $VERSION" echo "%description -n $NAME-run" echo "runtime library package of the ytools library" echo "" @@ -39,35 +38,24 @@ if [ -n "$REQUIRES_DEVEL" ]; then echo "Requires: $REQUIRES_DEVEL"; fi echo "%description -n $NAME-devel" echo "development library package of the ytools library" echo "" +#echo "%debug_package" echo "%prep" -#echo "echo hallo" echo "%setup -q -n $NAME-$V" -#echo "%setup -c" -#echo 'echo prep; pwd' echo "" echo "%build" echo 'pwd' -#echo 'make clean libclean' echo 'make config' echo 'make' echo "" echo "%install" -#echo 'mkdir -p $RPM_BUILD_ROOT/' -#echo 'mkdir -p $RPM_BUILD_ROOT/opt/ytools/lib' -#echo 'mkdir -p $RPM_BUILD_ROOT/usr/share/doc/packages/ytools' -#echo 'pwd' echo "export ENV_PREFIX=\$RPM_BUILD_ROOT/" echo "export INSTALL_LOG=$INSTALL_LOG" echo "rm -rf `dirname $INSTALL_LOG`" echo "mkdir -p `dirname $INSTALL_LOG`" echo "> $INSTALL_LOG" echo "make install" -echo "cat $INSTALL_LOG | sed \"s% \$RPM_BUILD_ROOT% %\" | grep -ve '/include/.*.h$\|devel\|make\|lib.*\.a$\|lib.*\.so$' > $INSTALL_LOG-run" -echo "cat $INSTALL_LOG | sed \"s% \$RPM_BUILD_ROOT% %\" | grep -e '/include/.*.h$\|devel\|make\|lib.*\.a$\|lib.*\.so$' > $INSTALL_LOG-devel" -#echo "install -m 755 $TOPDIR/lib/*.so \$RPM_BUILD_ROOT/opt/ytools/lib" -#echo "install -m 644 $TOPDIR/doc/ytools/dist/* \$RPM_BUILD_ROOT/usr/share/doc/packages/ytools" -#echo "install -m 644 $TOPDIR/COPYING \$RPM_BUILD_ROOT/usr/share/doc/packages/ytools" -#echo "echo $VERSION.$RELEASE > \$RPM_BUILD_ROOT/usr/share/doc/packages/ytools/VERSION" +echo "cat $INSTALL_LOG | sed \"s% \$RPM_BUILD_ROOT% %\" | grep -ve '"$FILTER_DEVEL"' > $INSTALL_LOG-run" +echo "cat $INSTALL_LOG | sed \"s% \$RPM_BUILD_ROOT% %\" | grep -e '"$FILTER_DEVEL"' > $INSTALL_LOG-devel" echo "" echo "%post -n $NAME-run" if [ "$TARGET" != mingw ]; then @@ -76,15 +64,8 @@ if [ "$TARGET" != mingw ]; then fi echo "" echo "%clean" -#echo 'rm -rf $RPM_BUILD_ROOT' echo "%files -n $NAME-run -f $INSTALL_LOG-run" echo "%files -n $NAME-devel -f $INSTALL_LOG-devel" echo '%defattr (-, root, root)' -#echo "%dir /opt/ytools/lib" -#echo "/opt/ytools/lib" -#find /opt/ytools/lib -type f -#echo "%dir /usr/share/doc/packages/ytools" -#echo "/usr/share/doc/packages/ytools" -#find /usr/share/doc/packages/ytools -type f echo ""