rpms/firstaidkit/devel .cvsignore, 1.12, 1.13 firstaidkit.spec, 1.34, 1.35 sources, 1.16, 1.17

Tue Mar 2 12:41:12 UTC 2010

Author: msivak

Update of /cvs/pkgs/rpms/firstaidkit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15466

Modified Files:
	.cvsignore firstaidkit.spec sources 
Log Message:
new version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/firstaidkit/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13

--- .cvsignore	2 Mar 2010 11:43:04 -0000	1.12
+++ .cvsignore	2 Mar 2010 12:41:12 -0000	1.13
@@ -1 +1 @@
-firstaidkit-0.2.9.tar.gz
+firstaidkit-0.2.10.tar.gz


Index: firstaidkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/firstaidkit/devel/firstaidkit.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- firstaidkit.spec	2 Mar 2010 11:43:04 -0000	1.34
+++ firstaidkit.spec	2 Mar 2010 12:41:12 -0000	1.35
@@ -3,7 +3,7 @@
 %define _unpackaged_files_terminate_build 0
 
 Name:           firstaidkit
-Version:        0.2.9
+Version:        0.2.10
 Release:        1%{?dist}
 Summary:        System Rescue Tool
 
@@ -17,9 +17,8 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildRequires:  desktop-file-utils
 BuildRequires:  python-devel
 BuildRequires:  python-setuptools-devel
-Requires:	newt
+Requires:       newt
 Requires:       %{name}-engine
-Requires:       %{name}-plugin-all
 
 %description
 A tool that automates simple and common system recovery tasks.
@@ -182,33 +181,33 @@ packet.
 %{__install} -p etc/firstaidkit/about $RPM_BUILD_ROOT%{_sysconfdir}/firstaidkit
 
 #gui
-%{__install} -d $RPM_BUILD_ROOT/usr/lib/firstaidkit/frontend
-%{__install} -p frontend/*.py  $RPM_BUILD_ROOT/usr/lib/firstaidkit/frontend/
-%{__install} -p frontend/*.glade  $RPM_BUILD_ROOT/usr/lib/firstaidkit/frontend/
-%{__install} -p frontend/*.gladep  $RPM_BUILD_ROOT/usr/lib/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}
 
 #examples
-%{__install} -d $RPM_BUILD_ROOT/usr/lib/firstaidkit/plugins/examples
-%{__mv} -f plugins/plugin_examples $RPM_BUILD_ROOT/usr/lib/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/lib/firstaidkit/plugins
+%{__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/lib/firstaidkit/plugins/
-%{__cp} -f plugins/xserver.py $RPM_BUILD_ROOT/usr/lib/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/usr/lib/firstaidkit/plugins/
-%{__cp} -f plugins/key_recovery.py $RPM_BUILD_ROOT/usr/lib/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/usr/lib/firstaidkit/plugins/rpm
-#%{__cp} -f plugins/rpm/*.py $RPM_BUILD_ROOT/usr/lib/firstaidkit/plugins/rpm/
-#%{__install} -d $RPM_BUILD_ROOT/usr/lib/firstaidkit/plugins/rpm_lowlevel
-#%{__cp} -f plugins/rpm_lowlevel/*.py $RPM_BUILD_ROOT/usr/lib/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
@@ -217,10 +216,11 @@ desktop-file-install --vendor="fedora" -
 %defattr(-,root,root,-)
 %dir %{_libdir}/firstaidkit
 %dir %{_libdir}/firstaidkit/plugins
-%dir /usr/lib/firstaidkit
-%dir /usr/lib/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
@@ -234,45 +234,59 @@ desktop-file-install --vendor="fedora" -
 %dir %{_datadir}/doc/%name-%version
 
 %files gui
-/usr/lib/firstaidkit/frontend/*.py*
-/usr/lib/firstaidkit/frontend/*.glade
-/usr/lib/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 /usr/lib/firstaidkit/frontend
+%dir /usr/share/firstaidkit/frontend
 
 %files devel
-/usr/lib/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
-/usr/lib/firstaidkit/plugins/passwd.py*
+%defattr(-,root,root,-)
+/usr/share/firstaidkit/plugins/passwd.py*
 
 %files plugin-xserver
-/usr/lib/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
 %endif
 
 %files plugin-mdadm-conf
-/usr/lib/firstaidkit/plugins/mdadm_conf.py*
+%defattr(-,root,root,-)
+/usr/share/firstaidkit/plugins/mdadm_conf.py*
 
 %files plugin-key-recovery
-/usr/lib/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
-#/usr/lib/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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/firstaidkit/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	2 Mar 2010 11:43:04 -0000	1.16
+++ sources	2 Mar 2010 12:41:12 -0000	1.17
@@ -1 +1 @@
-336482665013efbd44e7156a09e2ae69  firstaidkit-0.2.9.tar.gz
+2467c8411ce0a212349e04ed23d60353  firstaidkit-0.2.10.tar.gz

