rpms/revisor/EL-5 revisor.spec,1.28,1.29 sources,1.31,1.32

Fri May 9 14:41:51 UTC 2008

Author: kanarip

Update of /cvs/pkgs/rpms/revisor/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13205/EL-5

Modified Files:
	revisor.spec sources 
Log Message:
2.0.5.1-6


Index: revisor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/revisor/EL-5/revisor.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29

--- revisor.spec	8 Feb 2008 11:40:45 -0000	1.28
+++ revisor.spec	9 May 2008 14:41:14 -0000	1.29
@@ -1,42 +1,65 @@
 %{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
-Summary: Fedora "Spin" Graphical User Interface
-Name: revisor
-Version: 2.0.5.1
-Release: 4%{?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}, mayflower = %{version}-%{release}
-# GUI Requirements
-Requires: pygtk2 >= 2.9.2, pygtk2-libglade, gnome-python2-gconf
+%define pkg_cobbler 1
+%define pkg_comps 1
+%define pkg_delta 0
+%define pkg_jigdo 0
+%define pkg_rebrand 0
+%define pkg_server 0
+%define pkg_unity 1
+%define pkg_virt 0
+%define pkg_wui 0
+
+Summary:        Customize "Spin" Graphical User Interface
+Name:           revisor
+Version:        2.0.5.1
+Release:        6%{?dist}
+License:        GPLv2
+Group:          Applications/System
+URL:            https://fedorahosted.org/revisor
+Source0:        http://fedorahosted.org/releases/r/e/%{name}-%{version}.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
+BuildArch:      noarch
+BuildRequires:  intltool, gettext, python, desktop-file-utils
 # Package Management Requirements
-Requires: yum >= 3, comps-extras, createrepo
+Requires:       yum >= 3, comps-extras, createrepo
 # Translation
-Requires: rhpl
+Requires:       rhpl
 # Kickstart
-Requires: system-config-kickstart, pykickstart
+Requires:       pykickstart
 # Compose tools
-Requires: anaconda-runtime
-Requires: squashfs-tools
-Requires: busybox-anaconda
-# Do not require this as it isn't in EPEL (yet)
-#Requires: livecd-tools
+Requires:       anaconda-runtime, squashfs-tools, busybox-anaconda
 # Other
-Requires: notify-python
-Requires: usermode
-Requires: pam
-Requires: python >= 2.4
-# At least these requirements are invalid for EPEL
-Conflicts: fedora-release < 7
+Requires:       libxml2-python
+Requires:       notify-python
+Requires:       usermode
+Requires:       pam
+Requires:       python(abi) >= 2.4
+Conflicts:      fedora-release < 7
 # Can't conflict with this one!
-#Conflicts: centos-release < 5
+#Conflicts:      centos-release < 5
 # Can't conflict with this one!
-#Conflicts: redhat-release < 5
-BuildArch: noarch
-BuildRequires: intltool, gettext, python, desktop-file-utils
+#Conflicts:      redhat-release < 5
+# Or:
+#Conflicts:      redhat-release = 4, redhat-release = 3
+%if ! %{pkg_comps}
+Obsoletes:       revisor-comps
+%endif
+%if ! %{pkg_cobbler}
+Obsoletes:       revisor-cobbler
+%endif
+%if ! %{pkg_delta}
+Obsoletes:       revisor-delta
+%endif
+%if ! %{pkg_jigdo}
+Obsoletes:       revisor-jigdo
+%endif
+%if ! %{pkg_rebrand}
+Obsoletes:       revisor-rebrand
+%endif
+%if ! %{pkg_virt}
+Obsoletes:       revisor-virt
+%endif
 
 %description
 Revisor provides a set of graphical tools for building customized, updated
@@ -44,6 +67,10 @@
 is pungi, which builds the installation media. The other is livecd-tools,
 which builds the live image.
 
+##
+## Revisor Comps
+##
+%if %{pkg_comps}
 %package comps
 Summary:    Revisor Comps Files
 Group:      Applications/System
@@ -51,7 +78,12 @@
 
 %description comps
 A number of comps files, as up-to-date as possible
+%endif
 
+##
+## Revisor cobbler plugin
+##
+%if %{pkg_cobbler}
 %package cobbler
 Summary:    Revisor Cobbler Integration
 Group:      Applications/System
@@ -61,7 +93,12 @@
 %description cobbler
 Revisor Integration with Cobbler for having Revisor do DHCP, PXE,
 Xen and KVM stuff.
+%endif
 
+##
+## Revisor DeltaRPM/DeltaISO plugin
+##
+%if %{pkg_delta}
 %package delta
 Summary:    Revisor Deltarpm Integration
 Group:      Applications/System
@@ -69,15 +106,12 @@
 
 %description delta
 Revisor Integration with deltarpm for generating delta ISO images.
+%endif
 
-%package virt
-Summary:    Revisor Virtualization Media Features
-Group:      Applications/System
-Requires:   python-virtinst, revisor = %{version}-%{release}
-
-%description virt
-Revisor Virtualization Media Features for provisioning virtual guests
-
+##
+## Revisor Jigdo integration
+##
+%if %{pkg_jigdo}
 %package jigdo
 Summary:    Revisor Integration with Jigdo
 Group:      Applications/System
@@ -85,22 +119,33 @@
 
 %description jigdo
 Pre-Alpha of Revisor Integration with Jigdo for distributing your compose
+%endif
 
+##
+## Revisor Rebranding plugin
+##
+%if %{pkg_rebrand}
 %package rebrand
 Summary:    Revisor Rebranding Fedora Utilies
 Group:      Applications/System
-Requires:   revisor = %{version}-%{release}, rpmdevtools, rpm-build
+Requires:   revisor = %{version}-%{release}
 
 %description rebrand
 Utilities for Revisor to support rebranding Fedora
+%endif
 
-%package -n mayflower
-Summary:	Revisor Clone of Mayflower from livecd-tools
-Group:		Applications/System
-
-%description -n mayflower
-Mayflower script to build initrd with for live media. Originally from livecd-tools which is not
-available in this branch.
+##
+## Revisor virtualization plugin
+##
+%if %{pkg_virt}
+%package virt
+Summary:    Revisor Virtualization Media Features
+Group:      Applications/System
+Requires:   python-virtinst, revisor = %{version}-%{release}
+
+%description virt
+Revisor Virtualization Media Features for provisioning virtual guests
+%endif
 
 %prep
 %setup -q
@@ -112,6 +157,33 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
+
+%if ! %{pkg_comps}
+    rm -rf %{buildroot}/%{_datadir}/revisor/comps
+    rm -rf %{buildroot}/%{_datadir}/revisor/comps-cleanup.xsl
+%endif
+
+%if ! %{pkg_cobbler}
+    rm -rf %{buildroot}/%{python_sitelib}/revisor/modcobbler
+%endif
+
+%if ! %{pkg_delta}
+    rm -rf %{buildroot}/%{python_sitelib}/revisor/moddelta
+%endif
+
+%if ! %{pkg_jigdo}
+    rm -rf %{buildroot}/%{python_sitelib}/revisor/modjigdo
+%endif
+
+%if ! %{pkg_rebrand}
+    rm -rf %{buildroot}/%{python_sitelib}/revisor/modrebrand
+    rm -rf %{buildroot}/%{_datadir}/revisor/rebrand-template
+%endif
+
+%if ! %{pkg_virt}
+    rm -rf %{buildroot}/%{python_sitelib}/revisor/modvirt
+%endif
+
 desktop-file-install --vendor="fedora"              \
   --delete-original                                 \
   --dir=%{buildroot}%{_datadir}/applications        \
@@ -123,20 +195,23 @@
 %files
 %defattr(-,root,root,-)
 %doc README NEWS AUTHORS COPYING
+#%doc %{_mandir}/man5/*
+#%doc %{_mandir}/man8/*
+%dir %{_datadir}/revisor
 %dir %{python_sitelib}/revisor
 %{python_sitelib}/revisor/*.py
 %{python_sitelib}/revisor/*.pyc
 %{python_sitelib}/revisor/*.pyo
 %{_bindir}/*
-%{_sbindir}/revisor
+%{_sbindir}/*
 %dir %{_sysconfdir}/revisor
 %dir %{_sysconfdir}/revisor/conf.d
 %config(noreplace) %{_sysconfdir}/revisor/revisor.conf
 %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
+%{_datadir}/applications/*.desktop
 %dir %{_datadir}/revisor
 %dir %{_datadir}/revisor/ui
 %dir %{_datadir}/revisor/pixmaps
@@ -144,74 +219,69 @@
 %{_datadir}/revisor/pixmaps/*
 %{_datadir}/pixmaps/*
 
+
+%if %{pkg_comps}
 %files comps
 %dir %{_datadir}/revisor/comps/
 %{_datadir}/revisor/comps/*
 %{_datadir}/revisor/comps-cleanup.xsl
+%endif
 
+%if %{pkg_cobbler}
 %files cobbler
 %defattr(-,root,root,-)
 %dir %{python_sitelib}/revisor/modcobbler
 %{python_sitelib}/revisor/modcobbler/*.py
 %{python_sitelib}/revisor/modcobbler/*.pyc
 %{python_sitelib}/revisor/modcobbler/*.pyo
+%endif
 
+%if %{pkg_delta}
 %files delta
 %defattr(-,root,root,-)
 %dir %{python_sitelib}/revisor/moddelta
 %{python_sitelib}/revisor/moddelta/*.py
 %{python_sitelib}/revisor/moddelta/*.pyc
 %{python_sitelib}/revisor/moddelta/*.pyo
+%endif
 
-%files virt
-%defattr(-,root,root,-)
-%dir %{python_sitelib}/revisor/modvirt
-%{python_sitelib}/revisor/modvirt/*.py
-%{python_sitelib}/revisor/modvirt/*.pyc
-%{python_sitelib}/revisor/modvirt/*.pyo
-
+%if %{pkg_jigdo}
 %files jigdo
 %defattr(-,root,root,-)
 %dir %{python_sitelib}/revisor/modjigdo
 %{python_sitelib}/revisor/modjigdo/*.py
 %{python_sitelib}/revisor/modjigdo/*.pyc
 %{python_sitelib}/revisor/modjigdo/*.pyo
+%endif
 
+%if %{pkg_rebrand}
 %files rebrand
 %defattr(-,root,root,-)
 %dir %{python_sitelib}/revisor/modrebrand
 %{python_sitelib}/revisor/modrebrand/*.py
 %{python_sitelib}/revisor/modrebrand/*.pyc
 %{python_sitelib}/revisor/modrebrand/*.pyo
-%dir %{_datadir}/revisor/rebrand-template
-%{_datadir}/revisor/rebrand-template/*
+%endif
 
-%files -n mayflower
+%if %{pkg_virt}
+%files virt
 %defattr(-,root,root,-)
-%{_sbindir}/mayflower
+%dir %{python_sitelib}/revisor/modvirt
+%{python_sitelib}/revisor/modvirt/*.py
+%{python_sitelib}/revisor/modvirt/*.pyc
+%{python_sitelib}/revisor/modvirt/*.pyo
+%endif
 
 %changelog
+* Fri Apr 25 2008 S.A. Hartsuiker <baard a fedoraproject.org> 2.0.5.1-6
+- Fixed not being able to create a working livecd on CentOs-5
+- Fixed not being able to read network from kickstart on CentOs-5
+- Changed our mayflower clone to use os.img in the squashfs.img
+
 * Fri Feb 08 2008 Jeroen van Meeuwen <kanarip a fedoraunity.org> 2.0.5.1-4
 - Add packages the way anaconda does it (@core and @base depending on ksdata.addBase)
 - Fix a traceback and lose the conflict with centos-release < 5
 
-* Fri Jan 04 2008 Jeroen van Meeuwen <kanarip a fedoraunity.org> 2.0.5-15
-- Split off mayflower into it's own package
-
-* Fri Dec 28 2007 Jonathan Steffan <jon a fedoraunity.org> 2.0.5-14
-- Pulled in mayflower
-- Removed livecd-creator requires
-
-* Fri Nov 23 2007 Jeroen van Meeuwen <kanarip a fedoraunity.org> 2.0.5-13git20071123
-- Applied patch from Alexander Todorov for filtering comps
-
-* 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
 
@@ -313,7 +383,7 @@
 - New files added
 
 * Mon Apr 30 2007 Jonathan Steffan <jon a fedoraunity.org> 2.0.1-4
-- Fixed symlink to consolehelper relative path instead of aboslute
+- Fixed symlink to consolehelper relative path instead of absolute
   path in Makefile, rather then specfile
 - Added missing s-c-kickstart dep
 - Fixed shipped config files to be more targeted for end users


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/revisor/EL-5/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources	8 Feb 2008 11:40:45 -0000	1.31
+++ sources	9 May 2008 14:41:14 -0000	1.32
@@ -1 +1 @@
-646d8cf0c2e6de422f7f24867a9eea59  revisor-2.0.5.1.tar.gz
+e4a40a52c6e951446ebbb9a29fd6be2b  revisor-2.0.5.1.tar.gz


