- no java here (fix typo)

[packages/anaconda.git] / anaconda.spec

diff --git a/anaconda.spec b/anaconda.spec
index 28b32718e9abfa1a67844caf8c217d3427f12ea2..0cdab51b23e91a0a0ef88009864e78cd2bbd4fd2 100644 (file)
--- a/anaconda.spec
+++ b/anaconda.spec
@@ -14,7 +14,7 @@ Summary:      Graphical system installer
 Summary(pl):   Graficzny instalator systemu
 Name:          anaconda
 Version:       11.0.5
-Release:       0.15
+Release:       0.35
 License:       GPL
 Group:         Applications/System
 Source0:       %{name}-%{version}.tar.bz2
@@ -28,6 +28,11 @@ 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
 URL:           http://fedora.redhat.com/projects/anaconda-installer/
 BuildRequires: X11-devel
 BuildRequires: beecrypt-devel
@@ -54,7 +59,7 @@ BuildRequires:        pirut
 BuildRequires: popt-static
 BuildRequires: pump-devel >= 0.8.24-1
 BuildRequires: pump-static >= 0.8.24-1
-BuildRequires: python-booty
+BuildRequires: python-booty >= 0.71
 BuildRequires: python-devel
 BuildRequires: python-kickstart
 BuildRequires: python-libxml2
@@ -69,12 +74,18 @@ BuildRequires:      slang-static
 BuildRequires: yum
 BuildRequires: zlib-devel
 BuildRequires: zlib-static
-Requires:      anaconda-help
 Requires:      device-mapper >= 1.01.05
+Requires:      dosfstools
+Requires:      e2fsprogs
+Requires:      glibc-localedb-all
+Requires:      hfsutils
+Requires:      jfsutils
 Requires:      kudzu > 1.2.0
-Requires:      parted >= 1.6.3-7
+Requires:      lvm2
+Requires:      mdadm
 Requires:      pirut
-Requires:      python-booty
+Requires:      python-booty >= 0.71
+Requires:      python-devel-tools
 Requires:      python-kickstart
 Requires:      python-libxml2
 Requires:      python-parted
@@ -83,7 +94,9 @@ Requires:     python-rhpxl >= 0.18
 Requires:      python-rpm >= 4.2-0.61
 Requires:      python-snack
 Requires:      python-urlgrabber
+Requires:      reiserfsprogs
 #Requires:     system-logos
+Requires:      xfsprogs
 Requires:      yum >= 2.5.1-3
 %ifnarch s390 s390x
 Requires:      python-pyblock >= 0.7-1
@@ -140,6 +153,11 @@ systemach.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
 
 rm -f po/no.po
 mv -f po/{eu_ES,eu}.po
@@ -154,9 +172,15 @@ if [ "$(locale -a | grep -c en_US.utf8)" = 0 ]; then
        exit 1
 fi
 
-%{__make} depend
+%{__make} depend \
+       CC="%{__cc}"
+
 %{__make} \
-       RPM_OPT_FLAGS="%{rpmcflags}"
+       CC="%{__cc}" \
+       REALCC="%{__cc}" \
+       OPTFLAGS="%{rpmcflags}"
+
+./py-compile isys/isys.py
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -164,6 +188,8 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$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
@@ -177,15 +203,23 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc docs/command-line.txt
-%doc docs/install-methods.txt
-%doc docs/kickstart-docs.txt
-%doc docs/mediacheck.txt
-%doc docs/anaconda-release-notes.txt
+%doc docs/*
 %attr(755,root,root) %{_bindir}/mini-wm
 %attr(755,root,root) %{_sbindir}/anaconda
 %{_datadir}/anaconda
-%{_libdir}/anaconda
+%dir %{_libdir}/anaconda
+%{_libdir}/anaconda/*.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
 
 %files runtime
 %defattr(644,root,root,755)
@@ -203,7 +237,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/anaconda-runtime/fixmtime.py
 %attr(755,root,root) %{_libdir}/anaconda-runtime/getkeymaps
 %attr(755,root,root) %{_libdir}/anaconda-runtime/implantisomd5
-%{_libdir}/anaconda-runtime/keymaps-override-i386
+%{_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
 %attr(755,root,root) %{_libdir}/anaconda-runtime/loader/init
@@ -230,7 +264,7 @@ rm -rf $RPM_BUILD_ROOT
 %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-i386.gz
+%{_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