|
@@ -373,6 +373,7 @@ Provides: OpenPKG
|
|
|
-e 's;(autoconf --version);false;' \
|
|
-e 's;(autoconf --version);false;' \
|
|
|
-e 's;(autoheader --version);false;' \
|
|
-e 's;(autoheader --version);false;' \
|
|
|
-e 's;(makeinfo --version);false;' \
|
|
-e 's;(makeinfo --version);false;' \
|
|
|
|
|
+ -e 's;/lib/rpm;/lib/openpkg;' \
|
|
|
<configure >configure.n && \
|
|
<configure >configure.n && \
|
|
|
mv configure.n configure
|
|
mv configure.n configure
|
|
|
sed -e 's;@INTLLIBS@;@INTLLIBS@ @LIBMISC@;' \
|
|
sed -e 's;@INTLLIBS@;@INTLLIBS@ @LIBMISC@;' \
|
|
@@ -441,7 +442,7 @@ Provides: OpenPKG
|
|
|
done
|
|
done
|
|
|
test -d $RPM_BUILD_ROOT%{l_prefix}/RPM || \
|
|
test -d $RPM_BUILD_ROOT%{l_prefix}/RPM || \
|
|
|
mkdir $RPM_BUILD_ROOT%{l_prefix}/RPM
|
|
mkdir $RPM_BUILD_ROOT%{l_prefix}/RPM
|
|
|
- for dir in DST SRC PKG DB TMP; do
|
|
|
|
|
|
|
+ for dir in SRC PKG DB TMP; do
|
|
|
test -d $RPM_BUILD_ROOT%{l_prefix}/RPM/$dir || \
|
|
test -d $RPM_BUILD_ROOT%{l_prefix}/RPM/$dir || \
|
|
|
mkdir $RPM_BUILD_ROOT%{l_prefix}/RPM/$dir
|
|
mkdir $RPM_BUILD_ROOT%{l_prefix}/RPM/$dir
|
|
|
done
|
|
done
|
|
@@ -453,7 +454,7 @@ Provides: OpenPKG
|
|
|
|
|
|
|
|
# strip RPM installation
|
|
# strip RPM installation
|
|
|
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* \
|
|
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* \
|
|
|
- $RPM_BUILD_ROOT%{l_prefix}/lib/rpm/* >/dev/null 2>&1 || true
|
|
|
|
|
|
|
+ $RPM_BUILD_ROOT%{l_prefix}/lib/openpkg/* >/dev/null 2>&1 || true
|
|
|
for dir in man/ja man/pl man/ru man/sk src; do
|
|
for dir in man/ja man/pl man/ru man/sk src; do
|
|
|
rm -rf $RPM_BUILD_ROOT%{l_prefix}/$dir
|
|
rm -rf $RPM_BUILD_ROOT%{l_prefix}/$dir
|
|
|
done
|
|
done
|
|
@@ -477,15 +478,15 @@ Provides: OpenPKG
|
|
|
rpmputtext rpmgettext brp-compress brp-redhat brp-sparc64-linux \
|
|
rpmputtext rpmgettext brp-compress brp-redhat brp-sparc64-linux \
|
|
|
brp-strip brp-strip-shared brp-strip-comment-note rpmrc \
|
|
brp-strip brp-strip-shared brp-strip-comment-note rpmrc \
|
|
|
config.guess config.sub; do
|
|
config.guess config.sub; do
|
|
|
- rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/rpm/$file
|
|
|
|
|
|
|
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/openpkg/$file
|
|
|
done
|
|
done
|
|
|
|
|
|
|
|
# replace symlinks with hardlinks
|
|
# replace symlinks with hardlinks
|
|
|
for entry in rpme:rpmi rpmt:rpmb rpmu:rpmi rpmv:rpmq; do
|
|
for entry in rpme:rpmi rpmt:rpmb rpmu:rpmi rpmv:rpmq; do
|
|
|
eval `echo $entry | sed -e 's/^\(.*\):\(.*\)$/dst=\1; src=\2/'`
|
|
eval `echo $entry | sed -e 's/^\(.*\):\(.*\)$/dst=\1; src=\2/'`
|
|
|
- rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/rpm/$dst
|
|
|
|
|
- ln $RPM_BUILD_ROOT%{l_prefix}/lib/rpm/$src \
|
|
|
|
|
- $RPM_BUILD_ROOT%{l_prefix}/lib/rpm/$dst
|
|
|
|
|
|
|
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/openpkg/$dst
|
|
|
|
|
+ ln $RPM_BUILD_ROOT%{l_prefix}/lib/openpkg/$src \
|
|
|
|
|
+ $RPM_BUILD_ROOT%{l_prefix}/lib/openpkg/$dst
|
|
|
done
|
|
done
|
|
|
|
|
|
|
|
# install additional RPM tools (rpmtool, lsync)
|
|
# install additional RPM tools (rpmtool, lsync)
|
|
@@ -509,39 +510,39 @@ Provides: OpenPKG
|
|
|
|
|
|
|
|
# install RPM extension
|
|
# install RPM extension
|
|
|
( cd curl-%{V_curl}
|
|
( cd curl-%{V_curl}
|
|
|
- cp src/curl $RPM_BUILD_ROOT%{l_prefix}/lib/rpm/curl
|
|
|
|
|
- strip $RPM_BUILD_ROOT%{l_prefix}/lib/rpm/curl
|
|
|
|
|
|
|
+ cp src/curl $RPM_BUILD_ROOT%{l_prefix}/lib/openpkg/curl
|
|
|
|
|
+ strip $RPM_BUILD_ROOT%{l_prefix}/lib/openpkg/curl
|
|
|
)
|
|
)
|
|
|
( cd bzip2-%{V_bzip2}
|
|
( cd bzip2-%{V_bzip2}
|
|
|
- cp bzip2 $RPM_BUILD_ROOT%{l_prefix}/lib/rpm/bzip2
|
|
|
|
|
- strip $RPM_BUILD_ROOT%{l_prefix}/lib/rpm/bzip2
|
|
|
|
|
|
|
+ cp bzip2 $RPM_BUILD_ROOT%{l_prefix}/lib/openpkg/bzip2
|
|
|
|
|
+ strip $RPM_BUILD_ROOT%{l_prefix}/lib/openpkg/bzip2
|
|
|
)
|
|
)
|
|
|
( cd gzip-%{V_gzip}
|
|
( cd gzip-%{V_gzip}
|
|
|
- cp gzip $RPM_BUILD_ROOT%{l_prefix}/lib/rpm/gzip
|
|
|
|
|
- strip $RPM_BUILD_ROOT%{l_prefix}/lib/rpm/gzip
|
|
|
|
|
|
|
+ cp gzip $RPM_BUILD_ROOT%{l_prefix}/lib/openpkg/gzip
|
|
|
|
|
+ strip $RPM_BUILD_ROOT%{l_prefix}/lib/openpkg/gzip
|
|
|
)
|
|
)
|
|
|
( cd patch-%{V_patch}
|
|
( cd patch-%{V_patch}
|
|
|
- cp patch $RPM_BUILD_ROOT%{l_prefix}/lib/rpm/patch
|
|
|
|
|
- strip $RPM_BUILD_ROOT%{l_prefix}/lib/rpm/patch
|
|
|
|
|
|
|
+ cp patch $RPM_BUILD_ROOT%{l_prefix}/lib/openpkg/patch
|
|
|
|
|
+ strip $RPM_BUILD_ROOT%{l_prefix}/lib/openpkg/patch
|
|
|
)
|
|
)
|
|
|
( cd tar-%{V_tar}
|
|
( cd tar-%{V_tar}
|
|
|
- cp src/tar $RPM_BUILD_ROOT%{l_prefix}/lib/rpm/tar
|
|
|
|
|
- strip $RPM_BUILD_ROOT%{l_prefix}/lib/rpm/tar
|
|
|
|
|
|
|
+ cp src/tar $RPM_BUILD_ROOT%{l_prefix}/lib/openpkg/tar
|
|
|
|
|
+ strip $RPM_BUILD_ROOT%{l_prefix}/lib/openpkg/tar
|
|
|
)
|
|
)
|
|
|
( cd bash-%{V_bash}
|
|
( cd bash-%{V_bash}
|
|
|
- cp bash $RPM_BUILD_ROOT%{l_prefix}/lib/rpm/bash
|
|
|
|
|
- strip $RPM_BUILD_ROOT%{l_prefix}/lib/rpm/bash
|
|
|
|
|
|
|
+ cp bash $RPM_BUILD_ROOT%{l_prefix}/lib/openpkg/bash
|
|
|
|
|
+ strip $RPM_BUILD_ROOT%{l_prefix}/lib/openpkg/bash
|
|
|
)
|
|
)
|
|
|
sed -e "s;@l_prefix@;%{l_prefix};g" \
|
|
sed -e "s;@l_prefix@;%{l_prefix};g" \
|
|
|
- <`SOURCE rpmx.sh` >$RPM_BUILD_ROOT%{l_prefix}/lib/rpm/rpmx.sh
|
|
|
|
|
- chmod a+x $RPM_BUILD_ROOT%{l_prefix}/lib/rpm/rpmx.sh
|
|
|
|
|
|
|
+ <`SOURCE rpmx.sh` >$RPM_BUILD_ROOT%{l_prefix}/lib/openpkg/rpmx.sh
|
|
|
|
|
+ chmod a+x $RPM_BUILD_ROOT%{l_prefix}/lib/openpkg/rpmx.sh
|
|
|
sed -e "s;@l_prefix@;%{l_prefix};g" \
|
|
sed -e "s;@l_prefix@;%{l_prefix};g" \
|
|
|
- <`SOURCE rpmx.pl` >$RPM_BUILD_ROOT%{l_prefix}/lib/rpm/rpmx.pl
|
|
|
|
|
- chmod a+x $RPM_BUILD_ROOT%{l_prefix}/lib/rpm/rpmx.pl
|
|
|
|
|
|
|
+ <`SOURCE rpmx.pl` >$RPM_BUILD_ROOT%{l_prefix}/lib/openpkg/rpmx.pl
|
|
|
|
|
+ chmod a+x $RPM_BUILD_ROOT%{l_prefix}/lib/openpkg/rpmx.pl
|
|
|
|
|
|
|
|
# install an own copy of shtool
|
|
# install an own copy of shtool
|
|
|
- cp $shtool $RPM_BUILD_ROOT%{l_prefix}/lib/rpm/shtool
|
|
|
|
|
- chmod a+x $RPM_BUILD_ROOT%{l_prefix}/lib/rpm/shtool
|
|
|
|
|
|
|
+ cp $shtool $RPM_BUILD_ROOT%{l_prefix}/lib/openpkg/shtool
|
|
|
|
|
+ chmod a+x $RPM_BUILD_ROOT%{l_prefix}/lib/openpkg/shtool
|
|
|
|
|
|
|
|
# install a few README files
|
|
# install a few README files
|
|
|
sed -e "s:@l_prefix@:%{l_prefix}:g" \
|
|
sed -e "s:@l_prefix@:%{l_prefix}:g" \
|
|
@@ -581,18 +582,18 @@ Provides: OpenPKG
|
|
|
# hard-code RPM tool for installation hierarchy
|
|
# hard-code RPM tool for installation hierarchy
|
|
|
# and adjust RPM configuration files
|
|
# and adjust RPM configuration files
|
|
|
mv $RPM_BUILD_ROOT%{l_prefix}/bin/rpm \
|
|
mv $RPM_BUILD_ROOT%{l_prefix}/bin/rpm \
|
|
|
- $RPM_BUILD_ROOT%{l_prefix}/lib/rpm/rpm
|
|
|
|
|
|
|
+ $RPM_BUILD_ROOT%{l_prefix}/lib/openpkg/rpm
|
|
|
( echo "#!/bin/sh";
|
|
( echo "#!/bin/sh";
|
|
|
- echo "exec %{l_prefix}/lib/rpm/rpm --rcfile %{l_prefix}/etc/rpm/rpmrc \${1+\"\$@\"}"
|
|
|
|
|
|
|
+ echo "exec %{l_prefix}/lib/openpkg/rpm --rcfile %{l_prefix}/etc/openpkg/rpmrc \${1+\"\$@\"}"
|
|
|
) >$RPM_BUILD_ROOT%{l_prefix}/bin/rpm
|
|
) >$RPM_BUILD_ROOT%{l_prefix}/bin/rpm
|
|
|
chmod 755 $RPM_BUILD_ROOT%{l_prefix}/bin/rpm
|
|
chmod 755 $RPM_BUILD_ROOT%{l_prefix}/bin/rpm
|
|
|
cat `SOURCE rpmpopt` \
|
|
cat `SOURCE rpmpopt` \
|
|
|
- >>$RPM_BUILD_ROOT%{l_prefix}/lib/rpm/rpmpopt-%{V_rpm}
|
|
|
|
|
- test -d $RPM_BUILD_ROOT%{l_prefix}/etc/rpm || \
|
|
|
|
|
- mkdir $RPM_BUILD_ROOT%{l_prefix}/etc/rpm
|
|
|
|
|
|
|
+ >>$RPM_BUILD_ROOT%{l_prefix}/lib/openpkg/rpmpopt-%{V_rpm}
|
|
|
|
|
+ test -d $RPM_BUILD_ROOT%{l_prefix}/etc/openpkg || \
|
|
|
|
|
+ mkdir $RPM_BUILD_ROOT%{l_prefix}/etc/openpkg
|
|
|
sed -e "s:@l_prefix@:%{l_prefix}:g" \
|
|
sed -e "s:@l_prefix@:%{l_prefix}:g" \
|
|
|
<`SOURCE rpmrc` \
|
|
<`SOURCE rpmrc` \
|
|
|
- >$RPM_BUILD_ROOT%{l_prefix}/etc/rpm/rpmrc
|
|
|
|
|
|
|
+ >$RPM_BUILD_ROOT%{l_prefix}/etc/openpkg/rpmrc
|
|
|
sed -e "s:@l_prefix@:%{l_prefix}:g" \
|
|
sed -e "s:@l_prefix@:%{l_prefix}:g" \
|
|
|
-e "s:@LOC@:$loc:g" \
|
|
-e "s:@LOC@:$loc:g" \
|
|
|
-e "s:@FSUSR@:$fsusr:g" \
|
|
-e "s:@FSUSR@:$fsusr:g" \
|
|
@@ -602,11 +603,11 @@ Provides: OpenPKG
|
|
|
-e "s:@NPGRP@:$npgrp:g" \
|
|
-e "s:@NPGRP@:$npgrp:g" \
|
|
|
-e "s:@NPGID@:$npgid:g" \
|
|
-e "s:@NPGID@:$npgid:g" \
|
|
|
<`SOURCE rpmmacros` \
|
|
<`SOURCE rpmmacros` \
|
|
|
- >$RPM_BUILD_ROOT%{l_prefix}/etc/rpm/rpmmacros
|
|
|
|
|
|
|
+ >$RPM_BUILD_ROOT%{l_prefix}/etc/openpkg/rpmmacros
|
|
|
cp `SOURCE pubring.gpg` \
|
|
cp `SOURCE pubring.gpg` \
|
|
|
- $RPM_BUILD_ROOT%{l_prefix}/etc/rpm/pubring.gpg
|
|
|
|
|
|
|
+ $RPM_BUILD_ROOT%{l_prefix}/etc/openpkg/pubring.gpg
|
|
|
cp `SOURCE rpmdev.mk` \
|
|
cp `SOURCE rpmdev.mk` \
|
|
|
- $RPM_BUILD_ROOT%{l_prefix}/etc/rpm/rpmdev.mk
|
|
|
|
|
|
|
+ $RPM_BUILD_ROOT%{l_prefix}/etc/openpkg/rpmdev.mk
|
|
|
|
|
|
|
|
%files
|
|
%files
|
|
|
%defattr(-,%{l_fsusr},%{l_fsgrp})
|
|
%defattr(-,%{l_fsusr},%{l_fsgrp})
|
|
@@ -614,7 +615,6 @@ Provides: OpenPKG
|
|
|
%{l_prefix}/.bashrc
|
|
%{l_prefix}/.bashrc
|
|
|
%{l_prefix}/.bash_login
|
|
%{l_prefix}/.bash_login
|
|
|
%dir %{l_prefix}/RPM
|
|
%dir %{l_prefix}/RPM
|
|
|
- %dir %{l_prefix}/RPM/DST
|
|
|
|
|
%dir %{l_prefix}/RPM/SRC
|
|
%dir %{l_prefix}/RPM/SRC
|
|
|
%dir %{l_prefix}/RPM/PKG
|
|
%dir %{l_prefix}/RPM/PKG
|
|
|
%dir %{l_prefix}/RPM/DB
|
|
%dir %{l_prefix}/RPM/DB
|
|
@@ -628,38 +628,38 @@ Provides: OpenPKG
|
|
|
%{l_prefix}/etc/rc.func
|
|
%{l_prefix}/etc/rc.func
|
|
|
%dir %{l_prefix}/etc/rc.d
|
|
%dir %{l_prefix}/etc/rc.d
|
|
|
%{l_prefix}/etc/rc.d/rc.openpkg
|
|
%{l_prefix}/etc/rc.d/rc.openpkg
|
|
|
- %dir %{l_prefix}/etc/rpm
|
|
|
|
|
- %config %{l_prefix}/etc/rpm/rpmmacros
|
|
|
|
|
- %config %{l_prefix}/etc/rpm/rpmrc
|
|
|
|
|
- %{l_prefix}/etc/rpm/pubring.gpg
|
|
|
|
|
- %{l_prefix}/etc/rpm/rpmdev.mk
|
|
|
|
|
|
|
+ %dir %{l_prefix}/etc/openpkg
|
|
|
|
|
+ %config %{l_prefix}/etc/openpkg/rpmmacros
|
|
|
|
|
+ %config %{l_prefix}/etc/openpkg/rpmrc
|
|
|
|
|
+ %{l_prefix}/etc/openpkg/pubring.gpg
|
|
|
|
|
+ %{l_prefix}/etc/openpkg/rpmdev.mk
|
|
|
%dir %{l_prefix}/include
|
|
%dir %{l_prefix}/include
|
|
|
%dir %{l_prefix}/info
|
|
%dir %{l_prefix}/info
|
|
|
%dir %{l_prefix}/lib
|
|
%dir %{l_prefix}/lib
|
|
|
- %dir %{l_prefix}/lib/rpm
|
|
|
|
|
- %{l_prefix}/lib/rpm/rpm
|
|
|
|
|
- %{l_prefix}/lib/rpm/rpmb
|
|
|
|
|
- %{l_prefix}/lib/rpm/rpmdb
|
|
|
|
|
- %{l_prefix}/lib/rpm/rpmi
|
|
|
|
|
- %{l_prefix}/lib/rpm/rpmk
|
|
|
|
|
- %{l_prefix}/lib/rpm/rpmq
|
|
|
|
|
- %{l_prefix}/lib/rpm/find-provides
|
|
|
|
|
- %{l_prefix}/lib/rpm/find-requires
|
|
|
|
|
- %{l_prefix}/lib/rpm/rpmpopt-%{V_rpm}
|
|
|
|
|
- %{l_prefix}/lib/rpm/macros
|
|
|
|
|
- %{l_prefix}/lib/rpm/rpmt
|
|
|
|
|
- %{l_prefix}/lib/rpm/rpme
|
|
|
|
|
- %{l_prefix}/lib/rpm/rpmu
|
|
|
|
|
- %{l_prefix}/lib/rpm/rpmv
|
|
|
|
|
- %{l_prefix}/lib/rpm/rpmx.sh
|
|
|
|
|
- %{l_prefix}/lib/rpm/rpmx.pl
|
|
|
|
|
- %{l_prefix}/lib/rpm/curl
|
|
|
|
|
- %{l_prefix}/lib/rpm/gzip
|
|
|
|
|
- %{l_prefix}/lib/rpm/bzip2
|
|
|
|
|
- %{l_prefix}/lib/rpm/shtool
|
|
|
|
|
- %{l_prefix}/lib/rpm/patch
|
|
|
|
|
- %{l_prefix}/lib/rpm/tar
|
|
|
|
|
- %{l_prefix}/lib/rpm/bash
|
|
|
|
|
|
|
+ %dir %{l_prefix}/lib/openpkg
|
|
|
|
|
+ %{l_prefix}/lib/openpkg/rpm
|
|
|
|
|
+ %{l_prefix}/lib/openpkg/rpmb
|
|
|
|
|
+ %{l_prefix}/lib/openpkg/rpmdb
|
|
|
|
|
+ %{l_prefix}/lib/openpkg/rpmi
|
|
|
|
|
+ %{l_prefix}/lib/openpkg/rpmk
|
|
|
|
|
+ %{l_prefix}/lib/openpkg/rpmq
|
|
|
|
|
+ %{l_prefix}/lib/openpkg/find-provides
|
|
|
|
|
+ %{l_prefix}/lib/openpkg/find-requires
|
|
|
|
|
+ %{l_prefix}/lib/openpkg/rpmpopt-%{V_rpm}
|
|
|
|
|
+ %{l_prefix}/lib/openpkg/macros
|
|
|
|
|
+ %{l_prefix}/lib/openpkg/rpmt
|
|
|
|
|
+ %{l_prefix}/lib/openpkg/rpme
|
|
|
|
|
+ %{l_prefix}/lib/openpkg/rpmu
|
|
|
|
|
+ %{l_prefix}/lib/openpkg/rpmv
|
|
|
|
|
+ %{l_prefix}/lib/openpkg/rpmx.sh
|
|
|
|
|
+ %{l_prefix}/lib/openpkg/rpmx.pl
|
|
|
|
|
+ %{l_prefix}/lib/openpkg/curl
|
|
|
|
|
+ %{l_prefix}/lib/openpkg/gzip
|
|
|
|
|
+ %{l_prefix}/lib/openpkg/bzip2
|
|
|
|
|
+ %{l_prefix}/lib/openpkg/shtool
|
|
|
|
|
+ %{l_prefix}/lib/openpkg/patch
|
|
|
|
|
+ %{l_prefix}/lib/openpkg/tar
|
|
|
|
|
+ %{l_prefix}/lib/openpkg/bash
|
|
|
%dir %{l_prefix}/libexec
|
|
%dir %{l_prefix}/libexec
|
|
|
%dir %{l_prefix}/man
|
|
%dir %{l_prefix}/man
|
|
|
%dir %{l_prefix}/man/man1
|
|
%dir %{l_prefix}/man/man1
|
|
@@ -773,7 +773,7 @@ Provides: OpenPKG
|
|
|
done
|
|
done
|
|
|
|
|
|
|
|
# add entry to passwd database
|
|
# add entry to passwd database
|
|
|
- shell="${prefix}/lib/rpm/bash"
|
|
|
|
|
|
|
+ shell="${prefix}/lib/openpkg/bash"
|
|
|
realname="${prefix} OpenPKG"
|
|
realname="${prefix} OpenPKG"
|
|
|
case "$plid" in
|
|
case "$plid" in
|
|
|
FreeBSD/* | NetBSD/* )
|
|
FreeBSD/* | NetBSD/* )
|
|
@@ -817,7 +817,7 @@ Provides: OpenPKG
|
|
|
fi
|
|
fi
|
|
|
|
|
|
|
|
# add entry to /etc/shells
|
|
# add entry to /etc/shells
|
|
|
- shell="${prefix}/lib/rpm/bash"
|
|
|
|
|
|
|
+ shell="${prefix}/lib/openpkg/bash"
|
|
|
exists=`cat /etc/shells 2>/dev/null | grep "^$shell"`
|
|
exists=`cat /etc/shells 2>/dev/null | grep "^$shell"`
|
|
|
if [ ".$exists" = . ]; then
|
|
if [ ".$exists" = . ]; then
|
|
|
if [ ".$thisuser" != ".root" ]; then
|
|
if [ ".$thisuser" != ".root" ]; then
|
|
@@ -1059,7 +1059,6 @@ Provides: OpenPKG
|
|
|
|
|
|
|
|
# remove files which are not RPM controlled
|
|
# remove files which are not RPM controlled
|
|
|
rm -rf %{l_prefix}/RPM/TMP/* >/dev/null 2>&1 || true
|
|
rm -rf %{l_prefix}/RPM/TMP/* >/dev/null 2>&1 || true
|
|
|
- rm -rf %{l_prefix}/RPM/DST/* >/dev/null 2>&1 || true
|
|
|
|
|
rm -rf %{l_prefix}/RPM/SRC/* >/dev/null 2>&1 || true
|
|
rm -rf %{l_prefix}/RPM/SRC/* >/dev/null 2>&1 || true
|
|
|
rm -rf %{l_prefix}/RPM/PKG/* >/dev/null 2>&1 || true
|
|
rm -rf %{l_prefix}/RPM/PKG/* >/dev/null 2>&1 || true
|
|
|
rm -rf %{l_prefix}/RPM/DB/* >/dev/null 2>&1 || true
|
|
rm -rf %{l_prefix}/RPM/DB/* >/dev/null 2>&1 || true
|
|
@@ -1130,7 +1129,7 @@ Provides: OpenPKG
|
|
|
fi
|
|
fi
|
|
|
|
|
|
|
|
# remove entry in /etc/shells
|
|
# remove entry in /etc/shells
|
|
|
- shell="${prefix}/lib/rpm/bash"
|
|
|
|
|
|
|
+ shell="${prefix}/lib/openpkg/bash"
|
|
|
exists=`cat /etc/shells 2>/dev/null | grep "^$shell"`
|
|
exists=`cat /etc/shells 2>/dev/null | grep "^$shell"`
|
|
|
if [ ".$exists" != . ]; then
|
|
if [ ".$exists" != . ]; then
|
|
|
if [ ".$thisuser" != ".root" ]; then
|
|
if [ ".$thisuser" != ".root" ]; then
|