updated patches; filelists package

diff --git a/anaconda.spec b/anaconda.spec
index 9e98a9b2384e7fed202c8de7b7455dcb5f582158..e1f670fa2853b54d632b799c169d4e9d480a3153 100644 (file)
--- a/anaconda.spec
+++ b/anaconda.spec
@@ -52,32 +52,31 @@ Patch0:             interfaces-dir.patch
 Patch1:                libexec.patch
 Patch2:                yum-comps.patch
 Patch3:                product-defaults.patch
-Patch4:                yum-packages.patch
 URL:           http://fedoraproject.org/wiki/Anaconda
 BuildRequires: NetworkManager-devel >= %{nmver}
 BuildRequires: audit-libs-devel
 BuildRequires: dbus-devel >= %{dbusver}
 BuildRequires: gettext >= %{gettextver}
 BuildRequires: glade-devel
-BuildRequires: glib2-doc
+#BuildRequires:        glib2-doc
 BuildRequires: gobject-introspection-devel
 BuildRequires: gtk+3-devel
 BuildRequires: gtk-doc
-BuildRequires: gtk3-devel-docs
+#BuildRequires:        gtk3-devel-docs
 BuildRequires: intltool >= %{intltoolver}
 BuildRequires: libarchive-devel >= %{libarchivever}
-BuildRequires: libgnomekbd-devel
-BuildRequires: libtimezonemap-devel >= %{libtimezonemapver}
-BuildRequires: libxklavier-devel >= %{libxklavierver}
+#BuildRequires:        libgnomekbd-devel
+#BuildRequires:        libtimezonemap-devel >= %{libtimezonemapver}
+#BuildRequires:        libxklavier-devel >= %{libxklavierver}
 BuildRequires: pango-devel
 BuildRequires: python-dbus
 BuildRequires: python-devel
 BuildRequires: python-nose
 BuildRequires: python-pygobject3
-BuildRequires: python-pykickstart >= %{pykickstartver}
+#BuildRequires:        python-pykickstart >= %{pykickstartver}
 BuildRequires: python-urlgrabber >= %{pythonurlgrabberver}
 BuildRequires: rpm-devel >= %{rpmver}
-BuildRequires: systemd
+#BuildRequires:        systemd
 BuildRequires: yum >= %{yumver}
 %if %{with live}
 BuildRequires: desktop-file-utils
@@ -137,8 +136,8 @@ Requires:   yum-utils >= %{yumutilsver}
 # required because of the rescue mode and VNC question
 Requires:      anaconda-tui = %{version}-%{release}
 %if %{with live}
-Requires:      usermode
 Requires:      desktop-file-utils
+Requires:      usermode
 %endif
 %ifarch %{ix86} %{x8664}
 Requires:      fcoe-utils >= %{fcoeutilsver}
@@ -230,13 +229,12 @@ anaconda runtime on NFS/HTTP/FTP servers or local disks.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
 
 # / on %{_prefix} kicks in
 %{__sed} -i -e '1 s,#!/usr/bin/bash,#!/bin/sh,' scripts/run-anaconda
 
 # TODO: driver_disk not compiling (needs rpm5 porting) disable.
-#%{__sed} -i -e '/SUBDIRS/ s/dd//' utils/Makefile.am
+%{__sed} -i -e '/SUBDIRS/ s/dd//' utils/Makefile.am
 
 %build
 %{__aclocal} -I m4
@@ -259,13 +257,14 @@ rm -rf $RPM_BUILD_ROOT
 
 find $RPM_BUILD_ROOT -type f -name "*.la" | xargs %{__rm} -v
 
+%{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/tzmapdata
+
 %if %{with live}
 desktop-file-install ---dir=$RPM_BUILD_ROOT%{_desktopdir} $RPM_BUILD_ROOT%{_desktopdir}/liveinst.desktop
 %endif
 
 # unsupported locales
 %{__rm} -r $RPM_BUILD_ROOT%{_localedir}/bal
-%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/eu_ES
 %{__rm} -r $RPM_BUILD_ROOT%{_localedir}/ilo
 
 %find_lang %{name}
@@ -294,50 +293,61 @@ update-desktop-database
 %defattr(644,root,root,755)
 %doc COPYING
 %{systemdunitdir}/*
-%{_prefix}%{systemdunitdir}-generators/*
+%{systemdunitdir}-generators/*
+%attr(755,root,root) %{_bindir}/anaconda-cleanup
+%attr(755,root,root) %{_bindir}/analog
 %attr(755,root,root) %{_bindir}/instperf
 %attr(755,root,root) %{_sbindir}/anaconda
 %attr(755,root,root) %{_sbindir}/handle-sshpw
-%{_datadir}/anaconda
-%exclude %{_datadir}/anaconda/tzmapdata
-%{_prefix}/libexec/anaconda
-%{_libdir}/python*/site-packages/pyanaconda/*
-%exclude %{_libdir}/python*/site-packages/pyanaconda/rescue.py*
-%exclude %{_libdir}/python*/site-packages/pyanaconda/text.py*
-%exclude %{_libdir}/python*/site-packages/pyanaconda/ui/gui/*
-%exclude %{_libdir}/python*/site-packages/pyanaconda/ui/tui/*
-%attr(755,root,root) %{_bindir}/analog
-%attr(755,root,root) %{_bindir}/anaconda-cleanup
+
+%{_datadir}/%{name}
+
+%dir %{_libdir}/%{name}
+%attr(755,root,root) %{_libdir}/%{name}/anaconda-yum
+%attr(755,root,root) %{_libdir}/%{name}/auditd
+%attr(755,root,root) %{_libdir}/%{name}/run-anaconda
+%attr(755,root,root) %{_libdir}/%{name}/upd-updates
+%attr(755,root,root) %{_libdir}/%{name}/zram-stats
+%attr(755,root,root) %{_libdir}/%{name}/zramswapoff
+%attr(755,root,root) %{_libdir}/%{name}/zramswapon
+
+%{py_sitedir}/pyanaconda
+%exclude %{py_sitedir}/pyanaconda/rescue.py*
+%exclude %{py_sitedir}/pyanaconda/text.py*
+%exclude %{py_sitedir}/pyanaconda/ui/gui
+%exclude %{py_sitedir}/pyanaconda/ui/tui
+
 %if %{with live}
+%config(noreplace) %verify(not md5 mtime size) /etc/pam.d/liveinst
+%config(noreplace) %verify(not md5 mtime size) /etc/security/console.apps/liveinst
 %attr(755,root,root) %{_bindir}/liveinst
 %attr(755,root,root) %{_sbindir}/liveinst
-%config(noreplace) /etc/pam.d/*
-%config(noreplace) /etc/security/console.apps/*
-%{_sysconfdir}/X11/xinit/xinitrc.d/*
-%{_desktopdir}/*.desktop
+%attr(755,root,root) /etc/X11/xinit/xinitrc.d/zz-liveinst.sh
+%{_desktopdir}/liveinst.desktop
 %{_iconsdir}/hicolor/*/apps/liveinst.png
 %endif
 
 %files gui
 %defattr(644,root,root,755)
-%{_libdir}/python*/site-packages/pyanaconda/ui/gui/*
+%{py_sitedir}/pyanaconda/ui/gui
 
 %files tui
 %defattr(644,root,root,755)
-%{_libdir}/python*/site-packages/pyanaconda/rescue.py
-%{_libdir}/python*/site-packages/pyanaconda/text.py
-%{_libdir}/python*/site-packages/pyanaconda/ui/tui/*
+%{py_sitedir}/pyanaconda/rescue.py[co]
+%{py_sitedir}/pyanaconda/text.py[co]
+%{py_sitedir}/pyanaconda/ui/tui
 
 %files widgets
 %defattr(644,root,root,755)
-%{_libdir}/libAnacondaWidgets.so.*
-%{_libdir}/girepository*/AnacondaWidgets*typelib
-%{_libdir}/python*/site-packages/gi/overrides/*
+%attr(755,root,root) %{_libdir}/libAnacondaWidgets.so.*.*.*
+%ghost %{_libdir}/libAnacondaWidgets.so.2
+%{_libdir}/girepository-1.0/AnacondaWidgets-3.0.typelib
+%{py_sitedir}/gi/overrides/AnacondaWidgets.py[co]
 
 %files widgets-devel
 %defattr(644,root,root,755)
 %{_libdir}/libAnacondaWidgets.so
-%{_includedir}/*
+%{_includedir}/AnacondaWidgets
 %{_datadir}/glade/catalogs/AnacondaWidgets.xml
 %{_datadir}/gtk-doc
 
@@ -345,4 +355,4 @@ update-desktop-database
 %defattr(644,root,root,755)
 %dir %{_prefix}/lib/dracut/modules.d/80%{name}
 %{_prefix}/lib/dracut/modules.d/80%{name}/*
-%{_prefix}/libexec/anaconda/dd_*
+#%{_prefix}/libexec/anaconda/dd_*

diff --git a/yum-comps.patch b/yum-comps.patch
index 6dffdc3479100604971a88f1ebd66a73ae03efcb..fe08f155b070572ce438e6bc4cad2600972bd97e 100644 (file)
--- a/yum-comps.patch
+++ b/yum-comps.patch
@@ -1,11 +1,11 @@
---- site-packages/pyanaconda/packaging/yumpayload.py~  2013-05-17 14:48:12.000000000 +0300
-+++ site-packages/pyanaconda/packaging/yumpayload.py   2013-05-18 00:48:37.922288918 +0300
-@@ -1296,7 +1296,7 @@
+--- anaconda-22.4/pyanaconda/packaging/yumpayload.py~  2014-09-18 12:44:59.000000000 +0300
++++ anaconda-22.4/pyanaconda/packaging/yumpayload.py   2014-09-18 12:45:35.407822873 +0300
+@@ -1221,7 +1221,7 @@
+         if self.data.packages.nocore:
+             log.info("skipping core group due to %%packages --nocore; system may not be complete")
+         else:
+-            self._selectYumGroup("core")
++            self._selectYumGroup("base")
  
-             This follows the same ordering/pattern as kickstart.py.
-         """
--        self._selectYumGroup("core")
-+        self._selectYumGroup("base")
+         env = None
  
-         if self.data.packages.default and self.environments:
-             self.selectEnvironment(self.environments[0])

diff --git a/yum-packages.patch b/yum-packages.patch
deleted file mode 100644 (file)
index 0d721df..0000000
--- a/yum-packages.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- anaconda-19.28/pyanaconda/install.py~      2013-05-16 17:09:01.000000000 +0300
-+++ anaconda-19.28/pyanaconda/install.py       2013-05-18 17:22:47.836322869 +0300
-@@ -150,7 +150,7 @@
-     # anaconda requires storage packages in order to make sure the target
-     # system is bootable and configurable, and some other packages in order
-     # to finish setting up the system.
--    packages = storage.packages + ["authconfig", "firewalld"] + ksdata.realm.packages
-+    packages = storage.packages + ksdata.realm.packages
-     payload.preInstall(packages=packages, groups=payload.languageGroups())
-     payload.install()
-