X-Git-Url: http://git.pld-linux.org/?p=packages%2Fanaconda.git;a=blobdiff_plain;f=anaconda.spec;h=9e45956f1ad493a8847cd8dd76321083b3e060f0;hp=7c150256eaedfe7e2dcb41d151039099cf762a0a;hb=f09d136c01de88417cbdc5d38cb4eeda6b118164;hpb=dff1e76636c2145c0d76e7d990ad3d51a28101f4 diff --git a/anaconda.spec b/anaconda.spec index 7c15025..9e45956 100644 --- a/anaconda.spec +++ b/anaconda.spec @@ -1,5 +1,30 @@ # TODO -# - split anaconda-gui and anaconda-tui +# - repodata is searched from PLD and PLD/RPMS paths, so go figure +# - code poldek backend (python-poldek pkg exists!) +# - 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" +# - pldize 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 nor even path +# - lvm2-initrd should be installed +# - 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 +# - definition of anaconda pixmaps: http://www.raimokoski.com/lineox/Distro-definition-dir.txt # %if 0 # FC to PLD deps replace rules, extracted from cvs logs @@ -14,14 +39,14 @@ :%s#squashfs-tools#squashfs# %endif Summary: Graphical system installer -Summary(pl): Graficzny instalator systemu +Summary(pl.UTF-8): Graficzny instalator systemu Name: anaconda -Version: 11.0.5 -Release: 0.68 +Version: 11.4.0.8 +Release: 0.1 License: GPL Group: Applications/System Source0: %{name}-%{version}.tar.bz2 -# Source0-md5: f814e7d0011dd44c3c3cf12b6ddb5b40 +# Source0-md5: fc38608dae09406ba89c85ed83bd5f43 Source1: %{name}-mk-images Source2: %{name}-upd-instroot Source3: %{name}-mk-images.i386 @@ -30,7 +55,6 @@ 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 @@ -41,52 +65,38 @@ Patch8: %{name}-kernel.patch Patch9: %{name}-optflags.patch Patch10: %{name}-network.patch Patch11: %{name}-branding.patch -Patch12: %{name}-x11.patch Patch13: %{name}-installclasses.patch -URL: http://fedora.redhat.com/projects/anaconda-installer/ -BuildRequires: X11-devel -BuildRequires: beecrypt-devel +Patch14: %{name}-release_notes_viewer_gui.patch +Patch15: %{name}-hosttree.patch +Patch16: %{name}-popt.patch +URL: http://fedoraproject.org/wiki/Anaconda BuildRequires: bzip2-devel -BuildRequires: device-mapper-devel >= 1.01.05 BuildRequires: device-mapper-static >= 1.01.05 BuildRequires: e2fsprogs-devel -BuildRequires: elfutils-devel BuildRequires: gettext-devel >= 0.11 -BuildRequires: glibc-localedb-all +BuildRequires: glib2-static BuildRequires: glibc-static BuildRequires: gtk+2-devel -BuildRequires: intltool >= 0.31.2-3 -BuildRequires: kudzu-devel >= 1.2.0 -BuildRequires: libselinux-devel >= 1.6 -BuildRequires: libselinux-static -BuildRequires: libsepol-devel +BuildRequires: isomd5sum-devel +BuildRequires: kudzu-devel >= 1.2.68 +BuildRequires: libdhcp-devel +BuildRequires: libdhcp-static +BuildRequires: libdhcp4client-static +BuildRequires: libdhcp6client-static +BuildRequires: libnl-static +BuildRequires: libselinux-static >= 1.6 BuildRequires: libsepol-static -BuildRequires: newt-devel BuildRequires: newt-static -BuildRequires: pango-devel -BuildRequires: pciutils-devel -BuildRequires: pirut BuildRequires: popt-static -BuildRequires: pump-devel >= 0.8.24-1 -BuildRequires: pump-static >= 0.8.24-1 -BuildRequires: python-booty >= 0.71 BuildRequires: python-devel -BuildRequires: python-kickstart -BuildRequires: python-libxml2 BuildRequires: python-rhpl -BuildRequires: python-rpm >= 4.2-0.61 -BuildRequires: python-urlgrabber -BuildRequires: rpm-devel +BuildRequires: python-rpm BuildRequires: rpm-pythonprov BuildRequires: rpmbuild(macros) >= 1.234 BuildRequires: sed >= 4.0 BuildRequires: slang-static -BuildRequires: yum -BuildRequires: zlib-devel BuildRequires: zlib-static -Requires: X11-OpenGL-core -Requires: X11-Xserver -Requires: X11-fonts +Requires: /etc/pld-release Requires: device-mapper >= 1.01.05 Requires: dosfstools Requires: e2fsprogs @@ -94,46 +104,61 @@ Requires: glibc-localedb-all Requires: grubby Requires: hfsutils Requires: jfsutils -Requires: kudzu > 1.2.0 +Requires: kudzu >= 1.2.34.3-1.1 Requires: lvm2 Requires: mdadm -Requires: pirut -Requires: python-booty >= 0.71-0.2 +Requires: python-bdevid +Requires: python-booty >= 0.71-0.6 +Requires: python-dbus Requires: python-devel-tools -Requires: python-kickstart +Requires: python-kickstart >= 1.23 Requires: python-libxml2 Requires: python-parted -Requires: python-rhpl >= 0.176-1.1 -Requires: python-rhpxl >= 0.18-0.6 +Requires: python-rhpl >= 0.176-1.2 Requires: python-rpm >= 4.2-0.61 +Requires: python-selinux Requires: python-snack Requires: python-urlgrabber >= 2.9.8 Requires: reiserfsprogs -Requires: system-config-keyboard -#Requires: system-logos -Requires: vnc-utils Requires: xfsprogs Requires: yum >= 2.5.1-3 %ifnarch s390 s390x Requires: python-pyblock >= 0.7-1 %endif -%ifnarch s390 s390x ppc64 -Requires: python-rhpxl -%endif BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description 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 +Summary: Anaconda GTK+2 GUI +Group: Applications/System +Requires: %{name} = %{version}-%{release} +Requires: X11-OpenGL-core +Requires: X11-Xserver +Requires: X11-fonts +Requires: pirut +Requires: python-gnome-canvas +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} @@ -156,36 +181,49 @@ 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 -AutoReqProv: false +Summary(pl.UTF-8): Kod źródłowy Anacondy Group: Applications/System +AutoReqProv: false Requires: %{name} = %{version}-%{release} %description debug +Anaconda sourcecode for debugging purposes. + +%description debug -l pl.UTF-8 +Kod źródłowy Anacondy do celów diagnostycznych. %prep %setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 +# looks obsolete +#%patch0 -p1 +#%patch2 -p1 %patch3 -p1 -%patch4 -p1 +# obsolete, all parts merged +#%patch4 -p1 %patch5 -p1 %patch6 -p1 %patch7 -p1 %patch8 -p1 -%patch9 -p1 -%patch10 -p1 +# fixme +#%patch9 -p1 +# obsolete, already merged +# %patch10 -p1 %patch11 -p1 -%patch12 -p1 -%patch13 -p1 +#? +#%patch13 -p1 +#? +#%patch14 -p1 +# does it make any harm? +#%patch15 -p1 +%patch16 -p1 rm -f po/no.po mv -f po/{eu_ES,eu}.po @@ -201,15 +239,19 @@ sed -i -e 's/$(PYTHON) scripts/python scripts/' Makefile %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!" + : "en_US.utf8 locale not available. build will fail!" + : "Install glibc-localedb-all or compile it!" exit 1 fi -%{__make} depend \ +%{__make} depend -j1 \ + PYTHON="%{__python}" \ + PYTHONINCLUDE="%{py_incdir}" \ CC="%{__cc}" -%{__make} \ +%{__make} -j1 \ + PYTHON="%{__python}" \ + PYTHONINCLUDE="%{py_incdir}" \ CC="%{__cc}" \ REALCC="%{__cc}" \ OPTFLAGS="%{rpmcflags}" @@ -230,7 +272,22 @@ 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 +%endif +%ifarch ppc +cp -a loader2/keymaps-ppc $RPM_BUILD_ROOT%{_sysconfdir}/keymaps.gz +%endif +%ifarch %{x8664} +cp -a loader2/keymaps-x86_64 $RPM_BUILD_ROOT%{_sysconfdir}/keymaps.gz +%endif + %find_lang %{name} + +# hack so py_postclean would preserve it +#install $RPM_BUILD_ROOT%{_libdir}/anaconda/iw/release_notes{.py,} + %{!?debug:%py_postclean %{_libdir}/anaconda} %clean @@ -239,22 +296,34 @@ rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(644,root,root,755) %doc docs/* -%attr(755,root,root) %{_bindir}/mini-wm +%{_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 -%{_datadir}/anaconda +%attr(755,root,root) %{_sbindir}/gptsync +%attr(755,root,root) %{_sbindir}/liveinst +%attr(755,root,root) %{_sbindir}/showpart %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/iw -%{_libdir}/anaconda/iw/*.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/*-stub -%attr(755,root,root) %{_libdir}/anaconda/*.so +%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/xutils.so +%{_desktopdir}/liveinst.desktop +%{_libdir}/anaconda/xsetup.py[co] +%dir %{_libdir}/anaconda/iw +%{_libdir}/anaconda/iw/*.py[co] +%{_datadir}/anaconda %if %{!?debug:0}%{?debug:1} %files debug @@ -267,8 +336,9 @@ rm -rf $RPM_BUILD_ROOT %files runtime %defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/anaconda/*-stub %dir %{_libdir}/anaconda-runtime -%dir %attr(755,root,root) %{_libdir}/anaconda-runtime/boot +%dir %{_libdir}/anaconda-runtime/boot %attr(755,root,root) %{_libdir}/anaconda-runtime/boot/syslinux.cfg %{_libdir}/anaconda-runtime/boot/boot.msg %{_libdir}/anaconda-runtime/boot/general.msg @@ -276,36 +346,35 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/anaconda-runtime/boot/param.msg %{_libdir}/anaconda-runtime/boot/rescue.msg %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/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 %attr(755,root,root) %{_libdir}/anaconda-runtime/loader +%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.alpha %attr(755,root,root) %{_libdir}/anaconda-runtime/mk-images.i386 %attr(755,root,root) %{_libdir}/anaconda-runtime/mk-images.ia64 %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-images.x86 %attr(755,root,root) %{_libdir}/anaconda-runtime/mk-rescueimage.i386 +%attr(755,root,root) %{_libdir}/anaconda-runtime/mk-rescueimage.ia64 %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/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 @@ -313,4 +382,5 @@ rm -rf $RPM_BUILD_ROOT %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/upd-updates %attr(755,root,root) %{_libdir}/anaconda-runtime/yumcache