SVN: license-installer/license-installer.sh

2012-10-26 Thread draenog 
Author: draenog
Date: Fri Oct 26 12:21:09 2012
New Revision: 12600

Modified:
   license-installer/license-installer.sh
Log:
- option -nc doesn't exist in git version of builder script


Modified: license-installer/license-installer.sh
==
--- license-installer/license-installer.sh  (original)
+++ license-installer/license-installer.sh  Fri Oct 26 12:21:09 2012
@@ -34,7 +34,7 @@
if [ '@USE_DISTFILES@' = 'no' ]; then
nd=-nd
fi
-   /usr/bin/builder --define _topdir $TOPDIR --define _binary_payload 
w1.gzdio $nd -nm -nc -ncs --with license_agreement --target @TARGET_CPU@ 
@BASE_NAME@.spec
+   /usr/bin/builder --define _topdir $TOPDIR --define _binary_payload 
w1.gzdio $nd -nm -ncs --with license_agreement --target @TARGET_CPU@ 
@BASE_NAME@.spec
if [ $? -ne 0 ]; then
exit 2
fi
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

SVN: license-installer/license-installer.sh

2010-04-04 Thread pawelz 
Author: pawelz
Date: Sun Apr  4 18:32:08 2010
New Revision: 11298

Modified:
   license-installer/license-installer.sh
Log:
- fixed for new builder/macros


Modified: license-installer/license-installer.sh
==
--- license-installer/license-installer.sh  (original)
+++ license-installer/license-installer.sh  Sun Apr  4 18:32:08 2010
@@ -1,10 +1,11 @@
 #!/bin/sh
 if [ $1 = --with -a $2 = license_agreement ]; then
tmp=$(mktemp -d)
-   SRPMDIR=`rpm --define _topdir $tmp --eval %{_srcrpmdir}`
-   BUILDDIR=`rpm --define _topdir $tmp --eval %{_builddir}`
-   RPMDIR=`rpm --define _topdir $tmp --eval %{_rpmdir}`
-   PACKAGEDIR=$tmp/packages/@BASE_NAME@
+   TOPDIR=$tmp/packages
+   SRPMDIR=`rpm --define _topdir $TOPDIR --eval %{_srcrpmdir}`
+   BUILDDIR=`rpm --define _topdir $TOPDIR --eval %{_builddir}`
+   RPMDIR=`rpm --define _topdir $TOPDIR --eval %{_rpmdir}`
+   PACKAGEDIR=$TOPDIR/@BASE_NAME@
mkdir -p $SRPMDIR $RPMDIR $BUILDDIR $PACKAGEDIR
 
if echo $3 | grep '\.src\.rpm$' /dev/null; then
@@ -33,7 +34,7 @@
if [ '@USE_DISTFILES@' = 'no' ]; then
nd=-nd
fi
-   /usr/bin/builder --define _topdir $tmp --define _binary_payload 
w1.gzdio $nd -nm -nc -ncs --with license_agreement --target @TARGET_CPU@ 
@base_n...@.spec
+   /usr/bin/builder --define _topdir $TOPDIR --define _binary_payload 
w1.gzdio $nd -nm -nc -ncs --with license_agreement --target @TARGET_CPU@ 
@base_n...@.spec
if [ $? -ne 0 ]; then
exit 2
fi
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

SVN: license-installer/license-installer.sh

2009-12-28 Thread glen 
Author: glen
Date: Mon Dec 28 10:47:04 2009
New Revision: 11070

Removed:
   license-installer/license-installer.sh
Log:
- remove, will use cvs import

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

SVN: license-installer/license-installer.sh

2009-12-26 Thread pawelz 
Author: pawelz
Date: Sat Dec 26 12:10:30 2009
New Revision: 11051

Added:
   license-installer/license-installer.sh   (contents, props changed)
Log:
- This file is used in many packages. There is no common SOURCES in new CVS
layout so we have been maintaining many copies of this file since CVS layout
migration. I believe, it is easier to maintain it in subversion and store it
in distfiles.


Added: license-installer/license-installer.sh
==
--- (empty file)
+++ license-installer/license-installer.sh  Sat Dec 26 12:10:30 2009
@@ -0,0 +1,56 @@
+#!/bin/sh
+if [ $1 = --with -a $2 = license_agreement ]; then
+   tmp=$(mktemp -d)
+   SRPMDIR=`rpm --define _topdir $tmp --eval %{_srcrpmdir}`
+   BUILDDIR=`rpm --define _topdir $tmp --eval %{_builddir}`
+   RPMDIR=`rpm --define _topdir $tmp --eval %{_rpmdir}`
+   PACKAGEDIR=$tmp/packages/@BASE_NAME@
+   mkdir -p $SRPMDIR $RPMDIR $BUILDDIR $PACKAGEDIR
+
+   if echo $3 | grep '\.src\.rpm$' /dev/null; then
+   (
+   if echo $3 | grep '://' /dev/null; then
+   cd $SRPMDIR
+   wget --passive-ftp -t0 $3
+   else
+   cp -f $3 $SRPMDIR
+   fi
+   rpm2cpio `basename $3` | ( cd $PACKAGEDIR; cpio -i 
@base_n...@.spec )
+   if [ '@COPYSOURCES@' != '@'COPYSOURCES'@' ]; then
+   rpm2cpio `basename $3` | ( cd $PACKAGEDIR; cpio -i 
@COPYSOURCES@ )
+   fi
+   )
+   else
+   cp -i $3 $PACKAGEDIR || exit 1
+   if [ '@COPYSOURCES@' != '@'COPYSOURCES'@' ]; then
+   for i in @COPYSOURCES@; do
+   cp -i @DATADIR@/$i $PACKAGEDIR/$i || exit 1
+   done
+   fi
+   fi
+   ( cd $PACKAGEDIR
+   nd=
+   if [ '@USE_DISTFILES@' = 'no' ]; then
+   nd=-nd
+   fi
+   /usr/bin/builder --define _topdir $tmp --define _binary_payload 
w1.gzdio $nd -nm -nc -ncs --with license_agreement --target @TARGET_CPU@ 
@base_n...@.spec
+   if [ $? -ne 0 ]; then
+   exit 2
+   fi
+   RPMNAMES=$RPMDIR/@base_n...@-@vers...@-@rele...@wla.@target_...@.rpm
+   rpm -Uhv $RPMNAMES || echo -e Install manually the file(s):\n   
$RPMNAMES )
+else
+   if [ @LICENSE@ != '@'LICENSE'@' ]; then
+   cat @LICENSE@
+   echo 
+If you accept the above license rebuild the package using:
+
+   else
+   echo 
+License issues made us not to include inherent files into
+this package by default. If you want to create full working
+package please build it with the following command:
+
+   fi
+   echo $0 --with license_agreement @SPECFILE@
+fi
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit