rpms/firstaidkit/F-13 .cvsignore, 1.11, 1.12 firstaidkit.spec, 1.33, 1.34 sources, 1.15, 1.16
Martin Sivák
msivak at fedoraproject.org
Tue Mar 2 13:48:16 UTC 2010
Author: msivak
Update of /cvs/pkgs/rpms/firstaidkit/F-13
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24539
Modified Files:
.cvsignore firstaidkit.spec sources
Log Message:
new version
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/firstaidkit/F-13/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore 29 Sep 2009 10:49:17 -0000 1.11
+++ .cvsignore 2 Mar 2010 13:48:14 -0000 1.12
@@ -1 +1 @@
-firstaidkit-0.2.7.tar.bz2
+firstaidkit-0.2.10.tar.gz
Index: firstaidkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/firstaidkit/F-13/firstaidkit.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- firstaidkit.spec 29 Sep 2009 10:49:17 -0000 1.33
+++ firstaidkit.spec 2 Mar 2010 13:48:15 -0000 1.34
@@ -3,31 +3,41 @@
%define _unpackaged_files_terminate_build 0
Name: firstaidkit
-Version: 0.2.7
+Version: 0.2.10
Release: 1%{?dist}
Summary: System Rescue Tool
Group: Applications/System
License: GPLv2+
-URL: http://fedorahosted.org/firstaidkit
-Source0: %{name}-%{version}.tar.bz2
+Url: http://git.fedorahosted.org/git/?p=firstaidkit.git;a=snapshot;h=%{name}-%{version}-%{release};sf=tgz
+Source0: %{name}-%{version}.tar.gz
Source3: %{name}.desktop
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: desktop-file-utils
BuildRequires: python-devel
BuildRequires: python-setuptools-devel
-BuildArch: noarch
-Requires: newt
+Requires: newt
+Requires: %{name}-engine
%description
A tool that automates simple and common system recovery tasks.
+%package engine
+Group: Applications/System
+Summary: Core engine for firstaidkit
+Requires: %{name} = %{version}-%{release}
+BuildArch: noarch
+
+%description engine
+Base engine files needed for the firstaidkit to work
+
%package devel
Group: Applications/System
Summary: Devel package for firstaidkit
Requires: %{name} = %{version}-%{release}
+BuildArch: noarch
%description devel
Provides the examples and requires firstaidkit without plugins.
@@ -59,6 +69,7 @@ Group: Applications/System
Summary: FirstAidKit GUI
Requires: %{name} = %{version}-%{release}
Requires: pygtk2, pygtk2-libglade, zenity
+BuildArch: noarch
%description gui
This package contains the Gtk based FirstAidKit GUI
@@ -68,6 +79,7 @@ This package contains the Gtk based Firs
Group: Applications/System
Summary: FirstAidKit plugin to manipulate passwd system
Requires: %{name} = %{version}-%{release}
+BuildArch: noarch
%description plugin-passwd
This FirstAidKit plugin automates the recovery of the root system
@@ -78,12 +90,14 @@ password.
Group: Applications/System
Summary: FirstAidKit plugin to recover xserver configuration files
Requires: %{name} = %{version}-%{release}
+BuildArch: noarch
%description plugin-xserver
This FirstAidKit plugin automates the recovery of the xserver
configuration file xorg.conf.
+%ifnarch s390 s390x ppc64 ppc sparc
%package plugin-grub
Group: Applications/System
Summary: FirstAidKit plugin to diagnose or repair the GRUB instalation
@@ -91,10 +105,10 @@ Requires: %{name} = %{version}-%{r
Requires: dbus-python
Requires: grub
Requires: pyparted
-ExcludeArch: ppc ppc64 s390 s390x sparc
%description plugin-grub
This FirstAidKit plugin automates the recovery from the GRUB bootloader problems.
+%endif
%package plugin-mdadm-conf
@@ -102,6 +116,7 @@ Group: Applications/System
Summary: Firstaidkit plugin to diagnose software raid configuration file
Requires: %{name} = %{version}-%{release}
Requires: mdadm
+BuildArch: noarch
%description plugin-mdadm-conf
This plugin will assess the validity and existence of the mdadm.conf file.
@@ -112,6 +127,7 @@ Group: Applications/System
Summary: Firstaidkit plugin to recover key encryption keys
Requires: %{name} = %{version}-%{release}
Requires: python-volume_key, python-nss
+BuildArch: noarch
%description plugin-key-recovery
This plugin helps recover encryption keys using a previously created escrow
@@ -122,6 +138,7 @@ packet.
#Summary: FirstAidKit plugin to diagnose or repair the RPM packaging system
#Requires: %{name} = %{version}-%{release}
#Requires: rpm, rpm-python
+#BuildArch: noarch
#
#%description plugin-rpm
#This FirstAidKit plugin automates the tasks related to RPM problems.
@@ -158,94 +175,148 @@ packet.
%{__install} -p doc/firstaidkit-plugin.1 doc/firstaidkit.1 $RPM_BUILD_ROOT%{_mandir}/man1
%{__install} -p COPYING $RPM_BUILD_ROOT%{_datadir}/doc/%name-%version/COPYING
-#examples
-%{__install} -d $RPM_BUILD_ROOT%{_libdir}/firstaidkit/plugins/examples
-%{__mv} -f plugins/plugin_examples $RPM_BUILD_ROOT%{_libdir}/firstaidkit/plugins/examples
-
#configuration
%{__install} -d $RPM_BUILD_ROOT%{_sysconfdir}/firstaidkit
%{__install} -p etc/firstaidkit/firstaidkit.conf $RPM_BUILD_ROOT%{_sysconfdir}/firstaidkit
%{__install} -p etc/firstaidkit/about $RPM_BUILD_ROOT%{_sysconfdir}/firstaidkit
#gui
-%{__install} -d $RPM_BUILD_ROOT%{_libdir}/firstaidkit/frontend
-%{__install} -p frontend/*.py $RPM_BUILD_ROOT%{_libdir}/firstaidkit/frontend/
-%{__install} -p frontend/*.glade $RPM_BUILD_ROOT%{_libdir}/firstaidkit/frontend/
-%{__install} -p frontend/*.gladep $RPM_BUILD_ROOT%{_libdir}/firstaidkit/frontend/
+%{__install} -d $RPM_BUILD_ROOT/usr/share/firstaidkit/frontend
+%{__install} -p frontend/*.py $RPM_BUILD_ROOT/usr/share/firstaidkit/frontend/
+%{__install} -p frontend/*.glade $RPM_BUILD_ROOT/usr/share/firstaidkit/frontend/
+%{__install} -p frontend/*.gladep $RPM_BUILD_ROOT/usr/share/firstaidkit/frontend/
desktop-file-install --vendor="fedora" --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE3}
-#plugins
-%{__cp} -f plugins/passwd.py $RPM_BUILD_ROOT%{_libdir}/firstaidkit/plugins/
-%{__cp} -f plugins/xserver.py $RPM_BUILD_ROOT%{_libdir}/firstaidkit/plugins/
+#examples
+%{__install} -d $RPM_BUILD_ROOT/usr/share/firstaidkit/plugins/examples
+%{__mv} -f plugins/plugin_examples $RPM_BUILD_ROOT/usr/share/firstaidkit/plugins/examples
+
+#plugins arch independent and dependent
+%{__install} -d $RPM_BUILD_ROOT/usr/share/firstaidkit/plugins
+%{__install} -d $RPM_BUILD_ROOT%{libdir}/firstaidkit/plugins
+
+%{__cp} -f plugins/passwd.py $RPM_BUILD_ROOT/usr/share/firstaidkit/plugins/
+%{__cp} -f plugins/xserver.py $RPM_BUILD_ROOT/usr/share/firstaidkit/plugins/
%{__install} -d $RPM_BUILD_ROOT%{_libdir}/firstaidkit/plugins/grub
%{__cp} -f plugins/grub/*.py $RPM_BUILD_ROOT%{_libdir}/firstaidkit/plugins/grub
-%{__cp} -f plugins/mdadm_conf.py $RPM_BUILD_ROOT%{_libdir}/firstaidkit/plugins/
-%{__cp} -f plugins/key_recovery.py $RPM_BUILD_ROOT%{_libdir}/firstaidkit/plugins/
+%{__cp} -f plugins/mdadm_conf.py $RPM_BUILD_ROOT/usr/share/firstaidkit/plugins/
+%{__cp} -f plugins/key_recovery.py $RPM_BUILD_ROOT/usr/share/firstaidkit/plugins/
+
#%{__install} -d $RPM_BUILD_ROOT%{_libdir}/firstaidkit/plugins/undelparts
#%{__cp} -f plugins/undelparts/{*.py,_undelpart.so} $RPM_BUILD_ROOT%{_libdir}/firstaidkit/plugins/undelparts/
-#%{__install} -d $RPM_BUILD_ROOT%{_libdir}/firstaidkit/plugins/rpm
-#%{__cp} -f plugins/rpm/*.py $RPM_BUILD_ROOT%{_libdir}/firstaidkit/plugins/rpm/
-#%{__install} -d $RPM_BUILD_ROOT%{_libdir}/firstaidkit/plugins/rpm_lowlevel
-#%{__cp} -f plugins/rpm_lowlevel/*.py $RPM_BUILD_ROOT%{_libdir}/firstaidkit/plugins/rpm_lowlevel/
+#%{__install} -d $RPM_BUILD_ROOT/usr/share/firstaidkit/plugins/rpm
+#%{__cp} -f plugins/rpm/*.py $RPM_BUILD_ROOT/usr/share/firstaidkit/plugins/rpm/
+#%{__install} -d $RPM_BUILD_ROOT/usr/share/firstaidkit/plugins/rpm_lowlevel
+#%{__cp} -f plugins/rpm_lowlevel/*.py $RPM_BUILD_ROOT/usr/share/firstaidkit/plugins/rpm_lowlevel/
%clean
%{__rm} -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
+%dir %{_libdir}/firstaidkit
+%dir %{_libdir}/firstaidkit/plugins
+%dir /usr/share/firstaidkit
+%dir /usr/share/firstaidkit/plugins
+
+%files engine
+%defattr(-,root,root,-)
+%config %{_sysconfdir}/firstaidkit/about
# For noarch packages: sitelib
%{python_sitelib}/pyfirstaidkit
%{python_sitelib}/%{name}-%{version}-py?.?.egg-info
%{_bindir}/firstaidkit
%{_bindir}/firstaidkit-qs
-%dir %{_bindir}/firstaidkit
%{_bindir}/firstaidkitrevert
%config(noreplace) %{_sysconfdir}/firstaidkit/firstaidkit.conf
-%config(noreplace) %{_sysconfdir}/firstaidkit/about
%attr(0644,root,root) %{_mandir}/man1/firstaidkit.1.gz
%attr(0644,root,root) %{_datadir}/doc/%name-%version/COPYING
-%dir %{_libdir}/firstaidkit
-%dir %{_libdir}/firstaidkit/plugins
%dir %{_datadir}/doc/%name-%version
%files gui
-%{_libdir}/firstaidkit/frontend/*.py*
-%{_libdir}/firstaidkit/frontend/*.glade
-%{_libdir}/firstaidkit/frontend/*.gladep
+%defattr(-,root,root,-)
+/usr/share/firstaidkit/frontend/*.py*
+/usr/share/firstaidkit/frontend/*.glade
+/usr/share/firstaidkit/frontend/*.gladep
%{_datadir}/applications/*.desktop
-%dir %{_libdir}/firstaidkit/frontend
+%dir /usr/share/firstaidkit/frontend
%files devel
-%{_libdir}/firstaidkit/plugins/examples
+%defattr(-,root,root,-)
+/usr/share/firstaidkit/plugins/examples
%attr(0644,root,root) %{_mandir}/man1/firstaidkit-plugin.1.gz
%files plugin-all
+%defattr(-,root,root,-)
%files plugin-passwd
-%{_libdir}/firstaidkit/plugins/passwd.py*
+%defattr(-,root,root,-)
+/usr/share/firstaidkit/plugins/passwd.py*
%files plugin-xserver
-%{_libdir}/firstaidkit/plugins/xserver.py*
+%defattr(-,root,root,-)
+/usr/share/firstaidkit/plugins/xserver.py*
+%ifnarch s390 s390x ppc64 ppc sparc
%files plugin-grub
+%defattr(-,root,root,-)
%{_libdir}/firstaidkit/plugins/grub/*
-%dir %{_libdir}/firstaidkit/plugins/grub/*
+%dir %{_libdir}/firstaidkit/plugins/grub
+%endif
%files plugin-mdadm-conf
-%{_libdir}/firstaidkit/plugins/mdadm_conf.py*
+%defattr(-,root,root,-)
+/usr/share/firstaidkit/plugins/mdadm_conf.py*
%files plugin-key-recovery
-%{_libdir}/firstaidkit/plugins/key_recovery.py*
+%defattr(-,root,root,-)
+/usr/share/firstaidkit/plugins/key_recovery.py*
#%files plugin-undelete-partitions
+#%defattr(-,root,root,-)
#%{_libdir}/firstaidkit/plugins/undelparts/*.py*
#%{_libdir}/firstaidkit/plugins/undelparts/*.so
#
#%files plugin-rpm
-#%{_libdir}/firstaidkit/plugins/rpm_lowlevel/*
+#%defattr(-,root,root,-)
+#/usr/share/firstaidkit/plugins/rpm_lowlevel/*
#
%changelog
+* Tue Mar 02 2010 Martin Sivak <msivak at redhat.com> - 0.2.10-1
+- Change placement of architecture independent files
+ Related: rhbz#510346
+
+* Mon Mar 01 2010 Martin Sivak <msivak at redhat.com> - 0.2.9-1
+- Make most of the subpackages arch independent as they
+ contain only python code
+ Related: rhbz#557202
+
+* Thu Jan 21 2010 Martin Sivak <msivak at redhat.com> - 0.2.8-6
+- use ifnarch for ackages section too
+ Related: rhbz#557202
+
+* Thu Jan 21 2010 Martin Sivak <msivak at redhat.com> - 0.2.8-5
+- ExcludeArch is global directive, use ifnarch instead
+ Related: rhbz#557202
+
+* Thu Jan 21 2010 Martin Sivak <msivak at redhat.com> - 0.2.8-4
+- Error in .spec release line
+ Related: rhbz#557202
+
+* Thu Jan 21 2010 Martin Sivak <msivak at redhat.com> - 0.2.8-3
+- wrong Source0 in spec file
+ Related: rhbz#557202
+
+* Thu Jan 21 2010 Martin Sivak <msivak at redhat.com> - 0.2.8-2
+- we need new version name, because it is not possible to retag
+ Related: rhbz#557202
+
+* Thu Jan 21 2010 Martin Sivak <msivak at redhat.com> - 0.2.8-1
+- Set different Url in spec file
+- Make package arch specific
+ Resolves: rhbz#557202
+
* Tue Sep 29 2009 Martin Sivak <msivak at redhat.com> - 0.2.7-1
- Make the dialog in whiptail bigger, so it looks nicer
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/firstaidkit/F-13/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources 29 Sep 2009 10:49:17 -0000 1.15
+++ sources 2 Mar 2010 13:48:15 -0000 1.16
@@ -1 +1 @@
-d05b19153976711dd9d141d6c12c8975 firstaidkit-0.2.7.tar.bz2
+2467c8411ce0a212349e04ed23d60353 firstaidkit-0.2.10.tar.gz
More information about the scm-commits
mailing list