X-Git-Url: http://git.pld-linux.org/?p=packages%2Fanaconda.git;a=blobdiff_plain;f=anaconda.spec;h=c76d5fa524714426b0ec21bda515cc42e7a79738;hp=6cefcebea812e70a005503ba34b5dd9d81932a74;hb=35e859268c6f9274fb2a99809a44a3e21870989a;hpb=209972dddbb4b5777ad1a47ae6d59d01252636ea diff --git a/anaconda.spec b/anaconda.spec index 6cefceb..c76d5fa 100644 --- a/anaconda.spec +++ b/anaconda.spec @@ -1,114 +1,76 @@ # TODO -# - kill /mnt/runtime symlink hacks (leave the host alone!) -# - 01:20:59 ERROR : lokkit run failed: /usr/sbin/lokkit can not be run -# - lrwxrwxrwx 1 root root 11 Aug 31 04:21 menu.lst -> ./grub.conf (DEAD LINK) -# -rw-r--r-- 1 root root 551 Aug 31 04:21 menu.lst.rpmsave -# - can't find font latcyrheb -# LANG="en_US.UTF-8" -# SYSFONT="latarcyrheb-sun16" -# - sysconfig/timezone -# - yuminstaller downloads all packages twice -# 1156976072.958 317 192.168.2.3 TCP_MISS/200 209182 GET http://distrib/pld/dists/ac/PLD/i686/PLD/RPMS/sed-4.1.5-2.i686.rpm - DIRECT/x.x.x.x application/x-rpm -# 1156976073.808 701 192.168.2.3 TCP_HIT/200 209188 GET http://distrib/pld/dists/ac/PLD/i686/PLD/RPMS/sed-4.1.5-2.i686.rpm - NONE/- application/x-rpm -# - network config files are not pld-style -# - lvm2-initrd should be installed -# - /etc/fstab +# - code poldek backend (python-poldek pkg exists!) +# - pldize /etc/fstab # - /etc/modprobe.conf for geninitrd -# - gui installer packages selector: -#Traceback (most recent call last): -# File "/home/glen/tmp/anaconda-11.0.5-root-glen//usr/lib/anaconda/gui.py", line 954, in nextClicked -# File "/home/glen/tmp/anaconda-11.0.5-root-glen//usr/lib/anaconda/gui.py", line 1313, in setScreen -# File "/home/glen/tmp/anaconda-11.0.5-root-glen//usr/lib/anaconda/iw/package_gui.py", line 29, in getScreen -# File "/usr/share/python2.4/site-packages/pirut/GroupSelector.py", line 410, in doRefresh -# File "/usr/share/python2.4/site-packages/pirut/GroupSelector.py", line 407, in populateCategories -#TypeError: iter should be a GtkTreeIter # -%if 0 -# FC to PLD deps replace rules, extracted from cvs logs -:%s#libxml2-python#python-libxml2# -:%s#pyparted#python-parted# -:%s#booty#python-booty# -:%s#rhpl#python-rhpl# -:%s#rhpxl#python-rhpxl# -:%s#rpm-python#python-rpm# -:%s#gtk2-devel#gtk+2-devel# -:%s#pykickstart#python-kickstart# -:%s#squashfs-tools#squashfs# -%endif +%define rel 200808301625 Summary: Graphical system installer -Summary(pl): Graficzny instalator systemu +Summary(pl.UTF-8): Graficzny instalator systemu Name: anaconda -Version: 11.0.5 -Release: 0.94 +Version: 11.4.1.%{rel} +Release: 1 License: GPL Group: Applications/System -Source0: %{name}-%{version}.tar.bz2 -# Source0-md5: f814e7d0011dd44c3c3cf12b6ddb5b40 -Source1: %{name}-mk-images -Source2: %{name}-upd-instroot -Source3: %{name}-mk-images.i386 -Source4: %{name}-scrubtree -Source5: %{name}-installclass-pld.py -Source6: %{name}-splash.png -# Source6-md5: 6b38a868585adfd3a96a4ad16973c1f8 -Patch0: %{name}-pld.patch -Patch1: %{name}-BUS_XEN.patch -Patch2: %{name}-vserver-proc.patch -Patch3: %{name}-pkgorder.patch -Patch4: %{name}-errorhandling.patch -Patch5: %{name}-libdir.patch -Patch6: %{name}-pld-release.patch -Patch7: %{name}-timezone.patch -Patch8: %{name}-kernel.patch -Patch9: %{name}-optflags.patch -Patch10: %{name}-network.patch -Patch11: %{name}-branding.patch -Patch12: %{name}-x11.patch -Patch13: %{name}-installclasses.patch -Patch14: %{name}-release_notes_viewer_gui.patch -Patch15: %{name}-hosttree.patch -URL: http://fedora.redhat.com/projects/anaconda-installer/ -BuildRequires: bzip2-devel -BuildRequires: device-mapper-static >= 1.01.05 +# http://team.pld-linux.org/~patrys/anaconda.git - origin/pld-branch +Source0: %{name}-%{rel}.tar.bz2 +# Source0-md5: 895a8a16a56f83f37605978e1eebc874 +URL: http://fedoraproject.org/wiki/Anaconda +BuildRequires: audit-libs-devel +# will kill it in the future +BuildRequires: curl +BuildRequires: device-mapper-devel >= 1.01.05 BuildRequires: e2fsprogs-devel BuildRequires: gettext-devel >= 0.11 -BuildRequires: glibc-static +BuildRequires: glib2-devel BuildRequires: gtk+2-devel -BuildRequires: kudzu-devel >= 1.2.0 -BuildRequires: libselinux-static >= 1.6 -BuildRequires: libsepol-static -BuildRequires: newt-static -BuildRequires: popt-static -BuildRequires: pump-static >= 0.8.24-1 +BuildRequires: isomd5sum-devel +BuildRequires: libdhcp-devel +BuildRequires: libdhcp4client-devel +BuildRequires: libdhcp6client-devel +BuildRequires: libnl-devel +BuildRequires: libselinux-devel >= 1.6 +BuildRequires: libsepol-devel +BuildRequires: newt-devel +BuildRequires: popt-devel BuildRequires: python-devel +BuildRequires: python-kickstart >= 1.42 BuildRequires: python-rhpl BuildRequires: python-rpm BuildRequires: rpm-pythonprov BuildRequires: rpmbuild(macros) >= 1.234 BuildRequires: sed >= 4.0 -BuildRequires: slang-static -BuildRequires: zlib-static +BuildRequires: slang-devel +BuildRequires: zlib-devel Requires: /etc/pld-release +Requires: bdevid Requires: device-mapper >= 1.01.05 Requires: dosfstools Requires: e2fsprogs -Requires: glibc-localedb-all Requires: grubby +Requires: hal Requires: hfsutils Requires: jfsutils -Requires: kudzu >= 1.2.34.3-1.1 Requires: lvm2 Requires: mdadm -Requires: python-booty >= 0.71-0.6 +Requires: python-bdevid >= 6.0.24 +Requires: python-booty >= 0.93 +Requires: python-cracklib +Requires: python-dbus Requires: python-devel-tools -Requires: python-kickstart +Requires: python-iniparse +Requires: python-kickstart >= 1.42 +Requires: python-libuser Requires: python-libxml2 -Requires: python-parted -Requires: python-rhpl >= 0.176-1.2 +Requires: python-parted >= 1.8.9 +Requires: python-rhpl >= 0.216 Requires: python-rpm >= 4.2-0.61 +Requires: python-selinux Requires: python-snack Requires: python-urlgrabber >= 2.9.8 Requires: reiserfsprogs +Requires: system-config-date >= 1.9.17 +Requires: tzdata +Requires: util-linux Requires: xfsprogs Requires: yum >= 2.5.1-3 %ifnarch s390 s390x @@ -120,9 +82,9 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) The anaconda package contains the program which can be used to install system. These files are of little use on an already installed system. -%description -l pl -Pakiet anaconda zawiera program, którego mo¿na u¿yæ do zainstalowania -systemu. Pliki te maj± niewiele zastosowañ na ju¿ zainstalowanym +%description -l pl.UTF-8 +Pakiet anaconda zawiera program, którego można użyć do zainstalowania +systemu. Pliki te mają niewiele zastosowań na już zainstalowanym systemie. %package gui @@ -132,22 +94,17 @@ Requires: %{name} = %{version}-%{release} Requires: X11-OpenGL-core Requires: X11-Xserver Requires: X11-fonts -Requires: pirut Requires: python-gnome-canvas +Requires: python-pygtk-glade Requires: system-config-date Requires: system-config-keyboard -#Requires: system-logos -Requires: vnc-utils -%ifnarch s390 s390x ppc64 -Requires: python-rhpxl >= 0.18-0.9 -%endif %description gui Anaconda GUI portion. %package runtime Summary: Graphical system installer portions needed only for fresh installs -Summary(pl): Elementy graficznego instalatora systemu potrzebne tylko przy nowych instalacjach +Summary(pl.UTF-8): Elementy graficznego instalatora systemu potrzebne tylko przy nowych instalacjach Group: Applications/System AutoReqProv: false Requires: %{name} = %{version}-%{release} @@ -170,15 +127,15 @@ which are needed for installing new systems. These files are used to build media sets, but are not meant for use on already installed systems. -%description runtime -l pl +%description runtime -l pl.UTF-8 Pakiet anaconda-runtime zawiera elementy instalatora potrzebne tylko -do instalowania nowych systemów. Pliki te s³u¿± do tworzenia zestawu -no¶ników, nie s± przewidziane do u¿ywania na ju¿ zainstalowanych +do instalowania nowych systemów. Pliki te służą do tworzenia zestawu +nośników, nie są przewidziane do używania na już zainstalowanych systemach. %package debug Summary: Sourcecode for Anaconda -Summary(pl): Kod ¼ród³owy Anacondy +Summary(pl.UTF-8): Kod źródłowy Anacondy Group: Applications/System AutoReqProv: false Requires: %{name} = %{version}-%{release} @@ -186,51 +143,21 @@ Requires: %{name} = %{version}-%{release} %description debug Anaconda sourcecode for debugging purposes. -%description debug -l pl -Kod ¼ród³owy Anacondy do celów diagnostycznych. +%description debug -l pl.UTF-8 +Kod źródłowy Anacondy do celów diagnostycznych. %prep -%setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 -%patch10 -p1 -%patch11 -p1 -%patch12 -p1 -%patch13 -p1 -%patch14 -p1 -%patch15 -p1 - -rm -f po/no.po -mv -f po/{eu_ES,eu}.po - -# we don't want this being visible, neither want we to kill it (the -# other's aren't valid anyway (outdated probably). -mv installclasses/fedora.py{,.orig} -# we want this install class ;) -cp %{SOURCE5} installclasses/pld.py - -sed -i -e 's/$(PYTHON) scripts/python scripts/' Makefile +%setup -q -n %{name}-%{rel} %build -# locale check -if [ "$(locale -a | grep -c en_US.utf8)" = 0 ]; then - echo >&2 "en_US.utf8 locale not available. build will fail!" - echo >&2 "Install glibc-localedb-all or compile it!" - exit 1 -fi - %{__make} depend -j1 \ + PYTHON="%{__python}" \ + PYTHONINCLUDE="%{py_incdir}" \ CC="%{__cc}" %{__make} -j1 \ + PYTHON="%{__python}" \ + PYTHONINCLUDE="%{py_incdir}" \ CC="%{__cc}" \ REALCC="%{__cc}" \ OPTFLAGS="%{rpmcflags}" @@ -245,12 +172,6 @@ rm -rf $RPM_BUILD_ROOT install isys/isys.py[co] $RPM_BUILD_ROOT%{_libdir}/anaconda -cp %{SOURCE1} $RPM_BUILD_ROOT%{_libdir}/anaconda-runtime/mk-images -cp %{SOURCE2} $RPM_BUILD_ROOT%{_libdir}/anaconda-runtime/upd-instroot -cp %{SOURCE3} $RPM_BUILD_ROOT%{_libdir}/anaconda-runtime/mk-images.i386 -cp %{SOURCE4} $RPM_BUILD_ROOT%{_libdir}/anaconda-runtime/scrubtree -cp %{SOURCE6} $RPM_BUILD_ROOT%{_datadir}/anaconda/splash.png - # for ./isys/lang.c:isysLoadKeymap() %ifarch %{ix86} cp -a loader2/keymaps-i386 $RPM_BUILD_ROOT%{_sysconfdir}/keymaps.gz @@ -264,9 +185,6 @@ cp -a loader2/keymaps-x86_64 $RPM_BUILD_ROOT%{_sysconfdir}/keymaps.gz %find_lang %{name} -# hack so py_postclean would preserve it -install $RPM_BUILD_ROOT%{_libdir}/anaconda/iw/release_notes_viewer_gui{.py,} - %{!?debug:%py_postclean %{_libdir}/anaconda} %clean @@ -276,26 +194,30 @@ rm -rf $RPM_BUILD_ROOT %defattr(644,root,root,755) %doc docs/* %{_sysconfdir}/keymaps.gz +/etc/security/console.apps/liveinst +%config(noreplace) %verify(not md5 mtime size) /etc/pam.d/liveinst +%attr(755,root,root) %{_bindir}/liveinst %attr(755,root,root) %{_sbindir}/anaconda +%attr(755,root,root) %{_sbindir}/liveinst +%ifnarch ppc +%attr(755,root,root) %{_sbindir}/gptsync +%attr(755,root,root) %{_sbindir}/showpart +%endif %dir %{_libdir}/anaconda %{_libdir}/anaconda/*.py[co] -%exclude %{_libdir}/anaconda/xsetup.py[co] %dir %{_libdir}/anaconda/installclasses %{_libdir}/anaconda/installclasses/*.py[co] %dir %{_libdir}/anaconda/textw %{_libdir}/anaconda/textw/*.py[co] %{_libdir}/anaconda/lang-names %{_libdir}/anaconda/lang-table -%{_libdir}/anaconda/lang-table-kon %attr(755,root,root) %{_libdir}/anaconda/_isys.so %files gui %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/mini-wm -%attr(755,root,root) %{_libdir}/anaconda/iw/release_notes_viewer_gui -%attr(755,root,root) %{_libdir}/anaconda/xmouse.so %attr(755,root,root) %{_libdir}/anaconda/xutils.so -%{_libdir}/anaconda/xsetup.py[co] +%{_desktopdir}/liveinst.desktop %dir %{_libdir}/anaconda/iw %{_libdir}/anaconda/iw/*.py[co] %{_datadir}/anaconda @@ -314,48 +236,47 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %{_libdir}/anaconda/*-stub %dir %{_libdir}/anaconda-runtime %dir %{_libdir}/anaconda-runtime/boot -%attr(755,root,root) %{_libdir}/anaconda-runtime/boot/syslinux.cfg +%ifnarch ppc %{_libdir}/anaconda-runtime/boot/boot.msg %{_libdir}/anaconda-runtime/boot/general.msg +%{_libdir}/anaconda-runtime/boot/grub.conf %{_libdir}/anaconda-runtime/boot/options.msg %{_libdir}/anaconda-runtime/boot/param.msg %{_libdir}/anaconda-runtime/boot/rescue.msg +%{_libdir}/anaconda-runtime/boot/syslinux.cfg +%else +%{_libdir}/anaconda-runtime/boot/bootinfo.txt +%{_libdir}/anaconda-runtime/boot/magic +%{_libdir}/anaconda-runtime/boot/mapping +%{_libdir}/anaconda-runtime/boot/ofboot.b +%{_libdir}/anaconda-runtime/boot/yaboot.conf.3264 +%{_libdir}/anaconda-runtime/boot/yaboot.conf.in +%endif %attr(755,root,root) %{_libdir}/anaconda-runtime/buildinstall -%attr(755,root,root) %{_libdir}/anaconda-runtime/checkisomd5 -%attr(755,root,root) %{_libdir}/anaconda-runtime/filtermoddeps -%attr(755,root,root) %{_libdir}/anaconda-runtime/fixmtime.py +%attr(755,root,root) %{_libdir}/anaconda-runtime/buildinstall.functions +%attr(755,root,root) %{_libdir}/anaconda-runtime/genmodinfo %attr(755,root,root) %{_libdir}/anaconda-runtime/getkeymaps -%attr(755,root,root) %{_libdir}/anaconda-runtime/implantisomd5 %{_libdir}/anaconda-runtime/keymaps-override-* -%attr(755,root,root) %{_libdir}/anaconda-runtime/libunicode-lite.so.1 %dir %{_libdir}/anaconda-runtime/loader %attr(755,root,root) %{_libdir}/anaconda-runtime/loader/init %attr(755,root,root) %{_libdir}/anaconda-runtime/loader/loader %{_libdir}/anaconda-runtime/loader/loader.tr -%{_libdir}/anaconda-runtime/loader/module-info %{_libdir}/anaconda-runtime/loader/unicode-linedraw-chars.txt %attr(755,root,root) %{_libdir}/anaconda-runtime/makestamp.py +%attr(755,root,root) %{_libdir}/anaconda-runtime/maketreeinfo.py %attr(755,root,root) %{_libdir}/anaconda-runtime/mapshdr %attr(755,root,root) %{_libdir}/anaconda-runtime/mk-images -%attr(755,root,root) %{_libdir}/anaconda-runtime/mk-images.i386 +%attr(755,root,root) %{_libdir}/anaconda-runtime/mk-images.alpha %attr(755,root,root) %{_libdir}/anaconda-runtime/mk-images.ia64 +%attr(755,root,root) %{_libdir}/anaconda-runtime/mk-images.efi %attr(755,root,root) %{_libdir}/anaconda-runtime/mk-images.ppc %attr(755,root,root) %{_libdir}/anaconda-runtime/mk-images.s390 -%attr(755,root,root) %{_libdir}/anaconda-runtime/mk-images.x86_64 -%attr(755,root,root) %{_libdir}/anaconda-runtime/mk-rescueimage.i386 -%attr(755,root,root) %{_libdir}/anaconda-runtime/mk-rescueimage.ppc -%attr(755,root,root) %{_libdir}/anaconda-runtime/mk-rescueimage.x86_64 -%attr(755,root,root) %{_libdir}/anaconda-runtime/moddeps +%attr(755,root,root) %{_libdir}/anaconda-runtime/mk-images.x86 %attr(755,root,root) %{_libdir}/anaconda-runtime/modlist -%attr(755,root,root) %{_libdir}/anaconda-runtime/pkgorder -%attr(755,root,root) %{_libdir}/anaconda-runtime/pyisomd5sum.so %attr(755,root,root) %{_libdir}/anaconda-runtime/pyrc.py -%attr(755,root,root) %{_libdir}/anaconda-runtime/pythondeps %attr(755,root,root) %{_libdir}/anaconda-runtime/readmap %attr(755,root,root) %{_libdir}/anaconda-runtime/scrubtree %{_libdir}/anaconda-runtime/screenfont-*.gz -%attr(755,root,root) %{_libdir}/anaconda-runtime/splittree.py -%attr(755,root,root) %{_libdir}/anaconda-runtime/trimmodalias %attr(755,root,root) %{_libdir}/anaconda-runtime/trimpciids %attr(755,root,root) %{_libdir}/anaconda-runtime/upd-instroot -%attr(755,root,root) %{_libdir}/anaconda-runtime/yumcache +%attr(755,root,root) %{_libdir}/anaconda-runtime/upd-updates