rpms/revisor/devel .cvsignore, 1.16, 1.17 revisor.spec, 1.30, 1.31 sources, 1.33, 1.34

Thu Jan 3 15:17:22 UTC 2008

Author: kanarip

Update of /cvs/pkgs/rpms/revisor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12744/devel

Modified Files:
	.cvsignore revisor.spec sources 
Log Message:
Rebuild to excludearch ppc and ppc64 on revisor-cobbler


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/revisor/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17

--- .cvsignore	20 Dec 2007 14:16:48 -0000	1.16
+++ .cvsignore	3 Jan 2008 15:16:46 -0000	1.17
@@ -1 +1 @@
-revisor-2.1.0.tar.gz
+revisor-2.0.5.tar.gz


Index: revisor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/revisor/devel/revisor.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- revisor.spec	20 Dec 2007 14:16:48 -0000	1.30
+++ revisor.spec	3 Jan 2008 15:16:46 -0000	1.31
@@ -2,37 +2,36 @@
 
 Summary: Fedora "Spin" Graphical User Interface
 Name: revisor
-Version: 2.1.0
-Release: 1rc2%{?dist}
+Version: 2.0.5
+Release: 15%{?dist}
 License: GPLv2
 Group: Applications/System
 URL: https://hosted.fedoraproject.org/projects/revisor
 Source0: http://files.revisor.fedoraunity.org/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: revisor-comps = %{version}-%{release}
+# GUI Requirements
+Requires: pygtk2 >= 2.9.2, pygtk2-libglade, gnome-python2-gconf
 # Package Management Requirements
 Requires: yum >= 3, comps-extras, createrepo
 # Translation
 Requires: rhpl
 # Kickstart
-Requires: pykickstart
+Requires: system-config-kickstart, pykickstart
 # Compose tools
 Requires: livecd-tools, anaconda-runtime, squashfs-tools, busybox-anaconda
 # Other
-Requires: libxml2-python
 Requires: notify-python
 Requires: usermode
 Requires: pam
-Requires: python(abi) = 2.5
+Requires: python >= 2.4
 # At least these requirements are invalid for EPEL
 Conflicts: fedora-release < 7
 Conflicts: centos-release < 5
 # Can't conflict with this one!
 #Conflicts: redhat-release < 5
-# Or:
-#Conflicts: redhat-release = 4, redhat-release = 3
 BuildArch: noarch
-ExcludeArch: ppc ppc64
+#ExcludeArch: ppc ppc64
 BuildRequires: intltool, gettext, python, desktop-file-utils
 
 %description
@@ -49,18 +48,10 @@
 %description comps
 A number of comps files, as up-to-date as possible
 
-%package gui
-Summary:    Revisor GUI
-Group:      Applications/System
-Requires:   revisor = %{version}-%{release}, pygtk2 >= 2.9.2, pygtk2-libglade, gnome-python2-gconf
-Requires:   system-config-kickstart
-
-%description gui
-This is the Revisor GUI package
-
 %package cobbler
 Summary:    Revisor Cobbler Integration
 Group:      Applications/System
+ExcludeArch: ppc ppc64
 Requires:   cobbler, koan, revisor = %{version}-%{release}
 
 %description cobbler
@@ -94,7 +85,7 @@
 %package rebrand
 Summary:    Revisor Rebranding Fedora Utilies
 Group:      Applications/System
-Requires:   revisor = %{version}-%{release}, revisor-gui = %{version}-%{release}, rpmdevtools, rpm-build
+Requires:   revisor = %{version}-%{release}, rpmdevtools, rpm-build
 
 %description rebrand
 Utilities for Revisor to support rebranding Fedora
@@ -114,14 +105,17 @@
   --dir=%{buildroot}%{_datadir}/applications        \
   %{buildroot}/%{_datadir}/applications/revisor.desktop
 
+# Remove files not going out for release
+#rm -rf $RPM_BUILD_ROOT%{python_sitelib}/revisor/modjigdo
+#rm -rf $RPM_BUILD_ROOT%{python_sitelib}/revisor/modrebrand
+#rm -rf $RPM_BUILD_ROOT%{python_sitelib}/revisor/modvirt
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
 %doc README NEWS AUTHORS COPYING
-%doc %{_mandir}/man5/*
-%doc %{_mandir}/man8/*
 %dir %{python_sitelib}/revisor
 %{python_sitelib}/revisor/*.py
 %{python_sitelib}/revisor/*.pyc
@@ -134,7 +128,14 @@
 %config(noreplace) %{_sysconfdir}/revisor/conf.d/*
 %config(noreplace) %{_sysconfdir}/pam.d/*
 %config(noreplace) %{_sysconfdir}/security/console.apps/*
+%{_datadir}/applications/*.desktop
 %{_datadir}/locale/*/LC_MESSAGES/revisor.mo
+%dir %{_datadir}/revisor
+%dir %{_datadir}/revisor/ui
+%dir %{_datadir}/revisor/pixmaps
+%{_datadir}/revisor/ui/*
+%{_datadir}/revisor/pixmaps/*
+%{_datadir}/pixmaps/*
 
 %files comps
 %dir %{_datadir}/revisor/comps/
@@ -148,20 +149,6 @@
 %{python_sitelib}/revisor/modcobbler/*.pyc
 %{python_sitelib}/revisor/modcobbler/*.pyo
 
-%files gui
-%defattr(-,root,root,-)
-%dir %{python_sitelib}/revisor/modgui
-%{python_sitelib}/revisor/modgui/*.py
-%{python_sitelib}/revisor/modgui/*.pyc
-%{python_sitelib}/revisor/modgui/*.pyo
-%dir %{_datadir}/revisor
-%dir %{_datadir}/revisor/ui
-%dir %{_datadir}/revisor/pixmaps
-%{_datadir}/revisor/ui/*
-%{_datadir}/revisor/pixmaps/*
-%{_datadir}/pixmaps/*
-%{_datadir}/applications/*.desktop
-
 %files delta
 %defattr(-,root,root,-)
 %dir %{python_sitelib}/revisor/moddelta
@@ -189,16 +176,24 @@
 %{python_sitelib}/revisor/modrebrand/*.py
 %{python_sitelib}/revisor/modrebrand/*.pyc
 %{python_sitelib}/revisor/modrebrand/*.pyo
+%dir %{_datadir}/revisor/rebrand-template
+%{_datadir}/revisor/rebrand-template/*
 
 %changelog
-* Thu Dec 20 2007 Jeroen van Meeuwen <kanarip a fedoraunity.org> 2.1.0-1rc2
-- Updates to many components related to plugins and kickstart
+* Thu Jan 03 2008 Jeroen van Meeuwen <kanarip a fedoraunity.org> 2.0.5-15
+- Let's not build revisor-cobbler on ppc/ppc64
 
-* Wed Nov 07 2007 Jeroen van Meeuwen <kanarip a fedoraunity.org> 2.1.0-1rc1
-- Applied patch from Alexander Todorov to get_comps() failing when comps not tidy
+* Fri Nov 23 2007 Jeroen van Meeuwen <kanarip a fedoraunity.org> 2.0.5-14
+- import piruterrors
+- Minor fixes related to respinning Fedora for release
 - Applied patch from Alexander Todorov for filtering comps
-- Move GUI to it's own package
-- API changes!
+
+* Tue Nov 19 2007 Jeroen van Meeuwen <kanarip a fedoraunity.org> 2.0.5-13
+- Point at Everything, not Fedora
+- Add in ignore_list for pkglist_required()
+- Catch a Bob Jensen Corner Case
+- Minor bugfixes in packaging
+- Other minor fixes
 
 * Sat Oct 20 2007 Jonathan Steffan <jon a fedoraunity.org> 2.0.5-5
 - Update spec for release


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/revisor/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources	20 Dec 2007 14:16:48 -0000	1.33
+++ sources	3 Jan 2008 15:16:46 -0000	1.34
@@ -1 +1 @@
-164ac1cf6f8597fe6392e36ba4f9e943  revisor-2.1.0.tar.gz
+ffbe85e7f0a2ed38905c325836cb07a9  revisor-2.0.5.tar.gz


