Author: glen Date: Sat Jan 14 10:41:01 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- set dist dir to pld-ac
---- Files affected:
SOURCES:
util-vserver-pld.patch (1.5 -> 1.6) , util-vserver-build-poldek.patch (1.17
-> 1.18)
---- Diffs:
================================================================
Index: SOURCES/util-vserver-pld.patch
diff -u SOURCES/util-vserver-pld.patch:1.5 SOURCES/util-vserver-pld.patch:1.6
--- SOURCES/util-vserver-pld.patch:1.5 Tue Nov 22 20:09:51 2005
+++ SOURCES/util-vserver-pld.patch Sat Jan 14 11:40:56 2006
@@ -7,7 +7,7 @@
suse91/apt/rpmpriorities suse91/pkgs/01
suse91/pkgs/02 \
- suse91/rpm/macros
+ suse91/rpm/macros \
-+ pld2.0/pkgs/01 pld2.0/rpm/macros
pld2.0/rpmlist.d/00.lst
++ pld-ac/pkgs/01 pld-ac/rpm/macros
pld-ac/rpmlist.d/00.lst
nobase_confdistrib_DATA = rh9/apt/sources.list \
fc1/apt/sources.list \
@@ -15,28 +15,28 @@
ln -sf ../redhat/initpost
$(DESTDIR)$(distribdir)/$$i/ && \
ln -sf ../redhat/initpre
$(DESTDIR)$(distribdir)/$$i/; \
done
-+ ln -sf pld2.0 $(DESTDIR)$(distribdir)/pld1.99
++ ln -sf pld-ac $(DESTDIR)$(distribdir)/pld1.99
$(mkinstalldirs) $(DESTDIR)$(confdir) \
$(DESTDIR)$(confdistribdir)/.common/pubkeys \
$(DESTDIR)$(confdefaultsdir) \
-diff -urN util-vserver-0.30.207/distrib/pld2.0/pkgs/01
util-vserver-0.30.207-pld/distrib/pld2.0/pkgs/01
---- util-vserver-0.30.207/distrib/pld2.0/pkgs/01 1970-01-01
01:00:00.000000000 +0100
-+++ util-vserver-0.30.207-pld/distrib/pld2.0/pkgs/01 2005-05-16
19:09:20.000000000 +0200
+diff -urN util-vserver-0.30.207/distrib/pld-ac/pkgs/01
util-vserver-0.30.207-pld/distrib/pld-ac/pkgs/01
+--- util-vserver-0.30.207/distrib/pld-ac/pkgs/01 1970-01-01
01:00:00.000000000 +0100
++++ util-vserver-0.30.207-pld/distrib/pld-ac/pkgs/01 2005-05-16
19:09:20.000000000 +0200
@@ -0,0 +1,3 @@
+basesystem
+glibc
+issue
-diff -urN util-vserver-0.30.207/distrib/pld2.0/rpm/macros
util-vserver-0.30.207-pld/distrib/pld2.0/rpm/macros
---- util-vserver-0.30.207/distrib/pld2.0/rpm/macros 1970-01-01
01:00:00.000000000 +0100
-+++ util-vserver-0.30.207-pld/distrib/pld2.0/rpm/macros 2005-05-17
15:23:04.279026888 +0200
+diff -urN util-vserver-0.30.207/distrib/pld-ac/rpm/macros
util-vserver-0.30.207-pld/distrib/pld-ac/rpm/macros
+--- util-vserver-0.30.207/distrib/pld-ac/rpm/macros 1970-01-01
01:00:00.000000000 +0100
++++ util-vserver-0.30.207-pld/distrib/pld-ac/rpm/macros 2005-05-17
15:23:04.279026888 +0200
@@ -0,0 +1,4 @@
+# Because of https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=52725
+# you have to use at least one language beside 'C'
+%_install_langs C:en:pl
+%_netsharedpath /dev
-diff -urN util-vserver-0.30.207/distrib/pld2.0/rpmlist.d/00.lst
util-vserver-0.30.207-pld/distrib/pld2.0/rpmlist.d/00.lst
---- util-vserver-0.30.207/distrib/pld2.0/rpmlist.d/00.lst 1970-01-01
01:00:00.000000000 +0100
-+++ util-vserver-0.30.207-pld/distrib/pld2.0/rpmlist.d/00.lst 2005-05-17
15:15:56.643037440 +0200
+diff -urN util-vserver-0.30.207/distrib/pld-ac/rpmlist.d/00.lst
util-vserver-0.30.207-pld/distrib/pld-ac/rpmlist.d/00.lst
+--- util-vserver-0.30.207/distrib/pld-ac/rpmlist.d/00.lst 1970-01-01
01:00:00.000000000 +0100
++++ util-vserver-0.30.207-pld/distrib/pld-ac/rpmlist.d/00.lst 2005-05-17
15:15:56.643037440 +0200
@@ -0,0 +1,8 @@
+basesystem-*.rpm
+dev-*.rpm
================================================================
Index: SOURCES/util-vserver-build-poldek.patch
diff -u SOURCES/util-vserver-build-poldek.patch:1.17
SOURCES/util-vserver-build-poldek.patch:1.18
--- SOURCES/util-vserver-build-poldek.patch:1.17 Wed Nov 23 15:42:49 2005
+++ SOURCES/util-vserver-build-poldek.patch Sat Jan 14 11:40:56 2006
@@ -7,25 +7,25 @@
fc4/apt/sources.list \
- suse91/apt/sources.list
+ suse91/apt/sources.list \
-+ pld2.0/poldek/poldek.conf
++ pld-ac/poldek/poldek.conf
AM_INSTALLCHECK_STD_OPTIONS_EXEMPT \
= $(nobase_distrib_SCRIPTS)
@@ -69,6 +70,11 @@
ln -sf ../redhat/initpre
$(DESTDIR)$(distribdir)/$$i/; \
done
- ln -sf pld2.0 $(DESTDIR)$(distribdir)/pld1.99
-+ ln -sf pld2.0 $(DESTDIR)$(confdistribdir)/pld1.99
+ ln -sf pld-ac $(DESTDIR)$(distribdir)/pld1.99
++ ln -sf pld-ac $(DESTDIR)$(confdistribdir)/pld1.99
+ POLDEKARCH=$(shell rpm -E '%{_target_cpu}'
2>/dev/null); \
+ if [ -z "$$POLDEKARCH" ] ; then POLDEKARCH=$(shell
uname -m) ; fi ; \
-+ sed "s|%ARCH%|$$POLDEKARCH|g"
$(DESTDIR)$(confdistribdir)/pld2.0/poldek/poldek.conf >
$(DESTDIR)$(confdistribdir)/pld2.0/poldek/poldek.conf.tmp ; \
-+ mv
$(DESTDIR)$(confdistribdir)/pld2.0/poldek/poldek.conf.tmp
$(DESTDIR)$(confdistribdir)/pld2.0/poldek/poldek.conf
++ sed "s|%ARCH%|$$POLDEKARCH|g"
$(DESTDIR)$(confdistribdir)/pld-ac/poldek/poldek.conf >
$(DESTDIR)$(confdistribdir)/pld-ac/poldek/poldek.conf.tmp ; \
++ mv
$(DESTDIR)$(confdistribdir)/pld-ac/poldek/poldek.conf.tmp
$(DESTDIR)$(confdistribdir)/pld-ac/poldek/poldek.conf
$(mkinstalldirs) $(DESTDIR)$(confdir) \
$(DESTDIR)$(confdistribdir)/.common/pubkeys \
$(DESTDIR)$(confdefaultsdir) \
-diff -urN -x '*~' util-vserver-0.30.207/distrib/pld2.0/poldek/poldek.conf
util-vserver-0.30.207-poldek/distrib/pld2.0/poldek/poldek.conf
---- util-vserver-0.30.207/distrib/pld2.0/poldek/poldek.conf 1970-01-01
01:00:00.000000000 +0100
-+++ util-vserver-0.30.207-poldek/distrib/pld2.0/poldek/poldek.conf
2005-05-17 15:21:01.922627888 +0200
+diff -urN -x '*~' util-vserver-0.30.207/distrib/pld-ac/poldek/poldek.conf
util-vserver-0.30.207-poldek/distrib/pld-ac/poldek/poldek.conf
+--- util-vserver-0.30.207/distrib/pld-ac/poldek/poldek.conf 1970-01-01
01:00:00.000000000 +0100
++++ util-vserver-0.30.207-poldek/distrib/pld-ac/poldek/poldek.conf
2005-05-17 15:21:01.922627888 +0200
@@ -0,0 +1,100 @@
+# $Id$
+
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/util-vserver-pld.patch?r1=1.5&r2=1.6&f=u
http://cvs.pld-linux.org/SOURCES/util-vserver-build-poldek.patch?r1=1.17&r2=1.18&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
