Hello community, here is the log from the commit of package aaa_base for openSUSE:Factory checked in at Mon Mar 21 10:38:47 CET 2011. -------- --- aaa_base/aaa_base.changes 2011-03-15 15:42:28.000000000 +0100 +++ /mounts/work_src_done/STABLE/aaa_base/aaa_base.changes 2011-03-17 17:22:10.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Mar 17 16:21:06 UTC 2011 - lnussel@suse.de + +- add scripts to make tarball + +------------------------------------------------------------------- @@ -4,0 +10,5 @@ + +------------------------------------------------------------------- +Wed Mar 9 15:49:56 UTC 2011 - lnussel@suse.de + +- sources are maintained in git now. Adopt package accordingly. calling whatdependson for head-i586 Old: ---- aaa_base.post aaa_base.pre arch_special.tar.bz2 get_kernel_version.c get_version_number.sh sysconfig_parts.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aaa_base.spec ++++++ --- /var/tmp/diff_new_pack.ymtEBx/_old 2011-03-21 10:33:48.000000000 +0100 +++ /var/tmp/diff_new_pack.ymtEBx/_new 2011-03-21 10:33:48.000000000 +0100 @@ -21,9 +21,10 @@ Name: aaa_base Version: 11.5 -Release: 2 +Release: 3 License: GPLv2+ Group: System/Fhs +Url: http://gitorious.org/opensuse/aaa_base Provides: bin bootutls etc skeleng skelger Provides: aaa_skel = %{version}-%{release} Obsoletes: aaa_skel < %{version} @@ -33,13 +34,9 @@ AutoReqProv: on Summary: SUSE Linux Base Package BuildRoot: %{_tmppath}/%{name}-%{version}-build +# run make package in checkout out git repo to recreate Source: aaa_base.tar.bz2 -Source5: arch_special.tar.bz2 -Source7: sysconfig_parts.tar.bz2 -Source8: get_kernel_version.c -Source20: aaa_base-rpmlintrc -Source21: aaa_base.pre -Source22: aaa_base.post +Source99: aaa_base-rpmlintrc %description This package installs several important configuration files. Central @@ -58,50 +55,30 @@ and convenience hacks). %prep -%setup -n aaa_base -b 5 -b 7 - -cd .. -mkdir -p scripts -cp -v %{SOURCE21} scripts -cp -v %{SOURCE22} scripts - -cd $RPM_SOURCE_DIR +%setup -n aaa_base %build -gcc -Wl,-z,relro,-z,now $RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64 $RPM_SOURCE_DIR/get_kernel_version.c -o $RPM_SOURCE_DIR/get_kernel_version +make CFLAGS="$RPM_OPT_FLAGS" +if test -d patches/$RPM_ARCH; then + pushd files + for file in ../patches/$RPM_ARCH/*; do + patch -p0 --input=$file + done + find -name "*.orig" | xargs -r rm + popd +fi %install -install -d -m 700 root +# +make DESTDIR=$RPM_BUILD_ROOT install +# # make sure it does not creep in again -test -d ../aaa_base/root/.gnupg && exit 1 -cp -a ../aaa_base/* $RPM_BUILD_ROOT +test -d $RPM_BUILD_ROOT/root/.gnupg && exit 1 +# # for the release %if !%{with aaa_base_malloc_debug} rm $RPM_BUILD_ROOT/etc/profile.d/malloc-debug.* %endif -cp $RPM_SOURCE_DIR/get_kernel_version $RPM_BUILD_ROOT/sbin -mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates -for i in $RPM_BUILD_DIR/sysconfig_parts/sysconfig.* ; do - cp $i $RPM_BUILD_ROOT/var/adm/fillup-templates/ -done -# -## do arch specific patches BEGIN -# -pushd $RPM_BUILD_ROOT -test -d $RPM_BUILD_DIR/arch_special/$RPM_ARCH && \ - { - for file in $RPM_BUILD_DIR/arch_special/$RPM_ARCH/* ; do - patch -p0 --input=$file - done - } -# -# delete .orig files -# -find $RPM_BUILD_ROOT -name "*.orig" | xargs -r rm -popd -# -## do arch specific patches END -# # # mark these as ghost for i in passwd group shadow gshadow ; do @@ -111,9 +88,9 @@ # loop module auto loading bnc#661715 mkdir -p $RPM_BUILD_ROOT/lib/udev/devices -%pre -f ../scripts/aaa_base.pre +%pre -f aaa_base.pre -%post -f ../scripts/aaa_base.post +%post -f aaa_base.post %postun %insserv_cleanup ++++++ aaa_base.tar.bz2 ++++++ ++++ 26675 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org