commit c8b51fec098a93a21543261b995a931e3360a51e Author: Paweł Gołaszewski <bl...@pld-linux.org> Date: Fri Mar 22 16:08:16 2013 +0100
- rel.2 - initial centos6 support There is still problem - instalation pam.x86_64 0:1.1.1-13.el6 fails Anyway - similar problem exists with centos5 target (centos4 not checked). util-vserver-centos6.patch | 119 +++++++++++++++++++++++++++++++++++++++++++++ util-vserver.spec | 4 +- 2 files changed, 122 insertions(+), 1 deletion(-) --- diff --git a/util-vserver.spec b/util-vserver.spec index 80f2c46..f77e42c 100644 --- a/util-vserver.spec +++ b/util-vserver.spec @@ -19,7 +19,7 @@ %define reqdb_ver 5.2 %define reqdb_pkg db%{reqdb_ver} %define snap pre3038 -%define rel 1 +%define rel 2 Summary: Linux virtual server utilities Summary(pl.UTF-8): Narzędzia dla linuksowych serwerów wirtualnych Name: util-vserver @@ -78,6 +78,7 @@ Patch25: stat.patch Patch26: %{name}-am.patch Patch27: %{name}-rpm5.patch Patch28: diet-ccache.patch +Patch29: %{name}-centos6.patch URL: http://savannah.nongnu.org/projects/util-vserver/ BuildRequires: autoconf BuildRequires: automake >= 1.9 @@ -445,6 +446,7 @@ Szablony do tworzenia VServerów dla dystrybucji Titanium Linux. %patch26 -p1 %patch27 -p1 %patch28 -p1 +%patch29 -p1 cp -p %{SOURCE9} package-management.txt diff --git a/util-vserver-centos6.patch b/util-vserver-centos6.patch new file mode 100644 index 0000000..4f0faef --- /dev/null +++ b/util-vserver-centos6.patch @@ -0,0 +1,119 @@ +diff -urN util-vserver-0.30.216-pre3038/distrib/centos6/pkgs/01 util-vserver-0.30.216-centos6/distrib/centos6/pkgs/01 +--- util-vserver-0.30.216-pre3038/distrib/centos6/pkgs/01 1970-01-01 01:00:00.000000000 +0100 ++++ util-vserver-0.30.216-centos6/distrib/centos6/pkgs/01 2013-03-22 16:00:37.018549783 +0100 +@@ -0,0 +1 @@ ++glibc +diff -urN util-vserver-0.30.216-pre3038/distrib/centos6/pkgs/02 util-vserver-0.30.216-centos6/distrib/centos6/pkgs/02 +--- util-vserver-0.30.216-pre3038/distrib/centos6/pkgs/02 1970-01-01 01:00:00.000000000 +0100 ++++ util-vserver-0.30.216-centos6/distrib/centos6/pkgs/02 2013-03-22 16:00:37.018549783 +0100 +@@ -0,0 +1,3 @@ ++--reinstall ++ ++filesystem +diff -urN util-vserver-0.30.216-pre3038/distrib/centos6/pkgs/03 util-vserver-0.30.216-centos6/distrib/centos6/pkgs/03 +--- util-vserver-0.30.216-pre3038/distrib/centos6/pkgs/03 1970-01-01 01:00:00.000000000 +0100 ++++ util-vserver-0.30.216-centos6/distrib/centos6/pkgs/03 2013-03-22 16:00:37.018549783 +0100 +@@ -0,0 +1,2 @@ ++coreutils ++setup +diff -urN util-vserver-0.30.216-pre3038/distrib/centos6/yum/yum.conf util-vserver-0.30.216-centos6/distrib/centos6/yum/yum.conf +--- util-vserver-0.30.216-pre3038/distrib/centos6/yum/yum.conf 1970-01-01 01:00:00.000000000 +0100 ++++ util-vserver-0.30.216-centos6/distrib/centos6/yum/yum.conf 2013-03-22 16:00:37.018549783 +0100 +@@ -0,0 +1,11 @@ ++[main] ++cachedir=@YUMCACHEDIR@ ++reposdir=@YUMETCDIR@/yum.repos.d ++debuglevel=1 ++logfile=@YUMLOGDIR@/log ++lockfile=@YUMLOCKDIR@/yum.pid ++pkgpolicy=newest ++distroverpkg=centos-release ++installonlypkgs= ++exactarch=0 ++persistdir=@YUMLIBDIR@ +diff -urN util-vserver-0.30.216-pre3038/distrib/centos6/yum.repos.d/CentOS-Base.repo util-vserver-0.30.216-centos6/distrib/centos6/yum.repos.d/CentOS-Base.repo +--- util-vserver-0.30.216-pre3038/distrib/centos6/yum.repos.d/CentOS-Base.repo 1970-01-01 01:00:00.000000000 +0100 ++++ util-vserver-0.30.216-centos6/distrib/centos6/yum.repos.d/CentOS-Base.repo 2013-03-22 16:02:54.351538808 +0100 +@@ -0,0 +1,61 @@ ++# CentOS-Base.repo ++# ++# This file uses a new mirrorlist system developed by Lance Davis for CentOS. ++# The mirror system uses the connecting IP address of the client and the ++# update status of each mirror to pick mirrors that are updated to and ++# geographically close to the client. You should use this for CentOS updates ++# unless you are manually picking other mirrors. ++# ++# If the mirrorlist= does not work for you, as a fall back you can try the ++# remarked out baseurl= line instead. ++# ++# ++ ++[base] ++name=CentOS-6 - Base ++mirrorlist=http://mirrorlist.centos.org/?release=6&arch=$basearch&repo=os ++#baseurl=http://mirror.centos.org/centos/6/os/$basearch/ ++gpgcheck=1 ++gpgkey=http://mirror.centos.org/centos/RPM-GPG-KEY-CentOS-6 ++ ++#released updates ++[updates] ++name=CentOS-6 - Updates ++mirrorlist=http://mirrorlist.centos.org/?release=6&arch=$basearch&repo=updates ++#baseurl=http://mirror.centos.org/centos/6/updates/$basearch/ ++gpgcheck=1 ++gpgkey=http://mirror.centos.org/centos/RPM-GPG-KEY-CentOS-6 ++ ++#packages used/produced in the build but not released ++#[addons] ++#name=CentOS-6 - Addons ++#mirrorlist=http://mirrorlist.centos.org/?release=6&arch=$basearch&repo=addons ++##baseurl=http://mirror.centos.org/centos/6/addons/$basearch/ ++#gpgcheck=1 ++#gpgkey=http://mirror.centos.org/centos/RPM-GPG-KEY-CentOS-6 ++ ++#additional packages that may be useful ++[extras] ++name=CentOS-6 - Extras ++mirrorlist=http://mirrorlist.centos.org/?release=6&arch=$basearch&repo=extras ++#baseurl=http://mirror.centos.org/centos/6/extras/$basearch/ ++gpgcheck=1 ++gpgkey=http://mirror.centos.org/centos/RPM-GPG-KEY-CentOS-6 ++ ++#additional packages that extend functionality of existing packages ++[centosplus] ++name=CentOS-6 - Plus ++mirrorlist=http://mirrorlist.centos.org/?release=6&arch=$basearch&repo=centosplus ++#baseurl=http://mirror.centos.org/centos/6/centosplus/$basearch/ ++gpgcheck=1 ++enabled=0 ++gpgkey=http://mirror.centos.org/centos/RPM-GPG-KEY-CentOS-6 ++ ++#contrib - packages by Centos Users ++[contrib] ++name=CentOS-6 - Contrib ++mirrorlist=http://mirrorlist.centos.org/?release=6&arch=$basearch&repo=contrib ++#baseurl=http://mirror.centos.org/centos/6/contrib/$basearch/ ++gpgcheck=1 ++enabled=0 ++gpgkey=http://mirror.centos.org/centos/RPM-GPG-KEY-CentOS-6 +diff -urN util-vserver-0.30.216-pre3038/distrib/Makefile.am util-vserver-0.30.216-centos6/distrib/Makefile.am +--- util-vserver-0.30.216-pre3038/distrib/Makefile.am 2013-03-22 16:00:01.130230943 +0100 ++++ util-vserver-0.30.216-centos6/distrib/Makefile.am 2013-03-22 15:59:32.985601735 +0100 +@@ -92,6 +92,8 @@ + centos4/yum/yum.conf $(wildcard $(srcdir)/centos4/yum.repos.d/*.repo) \ + centos5/pkgs/01 centos5/pkgs/02 centos5/pkgs/03 \ + centos5/yum/yum.conf $(wildcard $(srcdir)/centos5/yum.repos.d/*.repo) \ ++ centos6/pkgs/01 centos6/pkgs/02 centos6/pkgs/03 \ ++ centos6/yum/yum.conf $(wildcard $(srcdir)/centos6/yum.repos.d/*.repo) \ + sl6/pkgs/01 sl6/pkgs/02 sl6/pkgs/03 \ + sl6/yum/yum.conf $(wildcard $(srcdir)/sl6/yum.repos.d/*.repo) \ + suse91/apt/rpmpriorities suse91/pkgs/01 suse91/pkgs/02 \ +@@ -123,7 +125,7 @@ + $(nobase_confdistrib_DATA) \ + $(defaults_DATA) + +-redhat_style = rh9 fc1 fc2 fc3 fc4 fc5 fc6 f7 f8 f9 f10 f11 f12 f13 f14 centos4 centos5 sl6 ++redhat_style = rh9 fc1 fc2 fc3 fc4 fc5 fc6 f7 f8 f9 f10 f11 f12 f13 f14 centos4 centos5 centos6 sl6 + sid_style = etch lenny squeeze wheezy sid + + install-exec-hook: install-notify-xtra ================================================================ ---- gitweb: http://git.pld-linux.org/gitweb.cgi/packages/util-vserver.git/commitdiff/c8b51fec098a93a21543261b995a931e3360a51e _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit