- don't specify default %attr's

[packages/anaconda.git] / anaconda.spec

diff --git a/anaconda.spec b/anaconda.spec
index 4089dbd3fdcefe74336e612be9ff1b077bead800..d85d65a249acb7be1fa3f14fad448b0b30747d6d 100644 (file)
--- a/anaconda.spec
+++ b/anaconda.spec
@@ -1,5 +1,4 @@
 # TODO
-# - split anaconda-gui and anaconda-tui
 # - kill /mnt/runtime symlink hacks (leave the host alone!)
 #
 %if 0
@@ -18,7 +17,7 @@ Summary:      Graphical system installer
 Summary(pl):   Graficzny instalator systemu
 Name:          anaconda
 Version:       11.0.5
-Release:       0.74
+Release:       0.87
 License:       GPL
 Group:         Applications/System
 Source0:       %{name}-%{version}.tar.bz2
@@ -45,51 +44,29 @@ 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: X11-devel
-BuildRequires: beecrypt-devel
 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: 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: 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:      /etc/pld-release
-Requires:      X11-OpenGL-core
-Requires:      X11-Xserver
-Requires:      X11-fonts
 Requires:      device-mapper >= 1.01.05
 Requires:      dosfstools
 Requires:      e2fsprogs
@@ -97,33 +74,24 @@ 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.6
 Requires:      python-devel-tools
-Requires:      python-gnome-canvas
 Requires:      python-kickstart
 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-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
@@ -135,6 +103,26 @@ Pakiet anaconda zawiera program, kt
 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
@@ -196,6 +184,7 @@ Kod 
 %patch12 -p1
 %patch13 -p1
 %patch14 -p1
+%patch15 -p1
 
 rm -f po/no.po
 mv -f po/{eu_ES,eu}.po
@@ -216,10 +205,10 @@ if [ "$(locale -a | grep -c en_US.utf8)" = 0 ]; then
        exit 1
 fi
 
-%{__make} depend \
+%{__make} depend -j1 \
        CC="%{__cc}"
 
-%{__make} \
+%{__make} -j1 \
        CC="%{__cc}" \
        REALCC="%{__cc}" \
        OPTFLAGS="%{rpmcflags}"
@@ -253,23 +242,29 @@ rm -rf $RPM_BUILD_ROOT
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc docs/*
-%attr(755,root,root) %{_bindir}/mini-wm
 %attr(755,root,root) %{_sbindir}/anaconda
-%{_datadir}/anaconda
 %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]
-%attr(755,root,root) %{_libdir}/anaconda/iw/release_notes_viewer_gui
 %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/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]
+%dir %{_libdir}/anaconda/iw
+%{_libdir}/anaconda/iw/*.py[co]
+%{_datadir}/anaconda
 
 %if %{!?debug:0}%{?debug:1}
 %files debug
@@ -282,8 +277,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
@@ -298,7 +294,7 @@ rm -rf $RPM_BUILD_ROOT
 %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