rpms/revisor/devel .cvsignore, 1.17, 1.18 revisor.spec, 1.31, 1.32 sources, 1.34, 1.35
Jeroen van Meeuwen (kanarip)
fedora-extras-commits at redhat.com
Sat Apr 5 17:33:31 UTC 2008
Author: kanarip
Update of /cvs/pkgs/rpms/revisor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30166/devel
Modified Files:
.cvsignore revisor.spec sources
Log Message:
revisor-2.1.0-1rc6
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/revisor/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore 3 Jan 2008 15:16:46 -0000 1.17
+++ .cvsignore 5 Apr 2008 17:32:45 -0000 1.18
@@ -1 +1 @@
-revisor-2.0.5.tar.gz
+revisor-2.1.0.tar.gz
Index: revisor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/revisor/devel/revisor.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- revisor.spec 3 Jan 2008 15:16:46 -0000 1.31
+++ revisor.spec 5 Apr 2008 17:32:45 -0000 1.32
@@ -1,94 +1,205 @@
%{!?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
-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
+%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
+
+%define day %(date +%a)
+%define month %(date +%b)
+%define day_of_month %(date +%d)
+%define year %(date +%Y)
+
+Summary: Fedora "Spin" Graphical User Interface
+Name: revisor
+Version: 2.1.0
+Release: 1rc6%{?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
+BuildArch: noarch
+Requires: revisor-gui = %{version}-%{release}
+
+%description
+Revisor provides a set of graphical tools for building customized, updated
+Fedora "Spins". This tool has been built around two other projects. First
+is pungi, which builds the installation media. The other is livecd-tools,
+which builds the live image.
+
+##
+## Revisor CLI
+##
+%package cli
+Summary: Revisor CLI components
+Group: Applications/System
+BuildRequires: intltool, gettext, python, desktop-file-utils
+
+Requires: revisor-comps = %{version}-%{release}
# 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: livecd-tools, anaconda-runtime, squashfs-tools, busybox-anaconda
+Requires: livecd-tools, 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
-Conflicts: centos-release < 5
+Requires: libxml2-python
+Requires: notify-python
+Requires: usermode
+Requires: pam
+Requires: python(abi) = 2.5
+Conflicts: fedora-release < 7
+# Can't conflict with this one!
+#Conflicts: centos-release < 5
# Can't conflict with this one!
-#Conflicts: redhat-release < 5
-BuildArch: noarch
-#ExcludeArch: ppc ppc64
-BuildRequires: intltool, gettext, python, desktop-file-utils
+#Conflicts: redhat-release < 5
+# Or:
+#Conflicts: redhat-release = 4, redhat-release = 3
-%description
+%description cli
Revisor provides a set of graphical tools for building customized, updated
Fedora "Spins". This tool has been built around two other projects. First
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
-Requires: revisor = %{version}-%{release}
+Requires: revisor-cli = %{version}-%{release}
%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
ExcludeArch: ppc ppc64
-Requires: cobbler, koan, revisor = %{version}-%{release}
+Requires: cobbler, koan, revisor-cli = %{version}-%{release}
%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
-Requires: deltarpm, revisor = %{version}-%{release}
+Requires: deltarpm, revisor-cli = %{version}-%{release}
%description delta
Revisor Integration with deltarpm for generating delta ISO images.
+%endif
-%package virt
-Summary: Revisor Virtualization Media Features
+##
+## Revisor GUI
+##
+%package gui
+Summary: Revisor GUI
Group: Applications/System
-Requires: python-virtinst, revisor = %{version}-%{release}
+Requires: revisor-cli = %{version}-%{release}, pygtk2 >= 2.9.2, pygtk2-libglade, gnome-python2-gconf
+Requires: system-config-kickstart
-%description virt
-Revisor Virtualization Media Features for provisioning virtual guests
+%description gui
+This is the Revisor GUI package
+##
+## Revisor Jigdo integration
+##
+%if %{pkg_jigdo}
%package jigdo
Summary: Revisor Integration with Jigdo
Group: Applications/System
-Requires: jigdo, revisor = %{version}-%{release}
+Requires: jigdo, revisor-cli = %{version}-%{release}
%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-cli = %{version}-%{release}, revisor-gui = %{version}-%{release}
%description rebrand
Utilities for Revisor to support rebranding Fedora
+%endif
+
+##
+## Revisor Server plugin
+##
+%if %{pkg_server}
+%package server
+Summary: Revisor Server
+Group: Applications/System
+Requires: revisor-cli = %{version}-%{release}
+
+%description server
+Utilities for Revisor to support rebranding Fedora
+%endif
+
+##
+## Fedora Unity Configuration and Scripts for Revisor
+##
+%if %{pkg_unity}
+%package unity
+Summary: Fedora Unity Configuration and Scripts for Revisor
+Group: Applications/System
+Requires: revisor-cli
+
+%description unity
+The configuration files and scripts Fedora Unity uses with
+Revisor to create Re-Spins and do testing.
+%endif
+
+##
+## Revisor virtualization plugin
+##
+%if %{pkg_virt}
+%package virt
+Summary: Revisor Virtualization Media Features
+Group: Applications/System
+Requires: python-virtinst, revisor-cli = %{version}-%{release}
+
+%description virt
+Revisor Virtualization Media Features for provisioning virtual guests
+%endif
+
+##
+## Revisor WUI
+##
+%if %{pkg_wui}
+%package wui
+Summary: Revisor WUI
+Group: Applications/System
+Requires: revisor-cli = %{version}-%{release}
+
+%description wui
+This is the Revisor Web User Interface package
+%endif
%prep
%setup -q
@@ -100,22 +211,64 @@
%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_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
+%endif
+
+%if ! %{pkg_server}
+ rm -rf %{buildroot}/%{python_sitelib}/revisor/modserver
+%endif
+
+%if ! %{pkg_unity}
+ rm -rf %{buildroot}/%{_sysconfdir}/revisor-unity/
+%endif
+
+%if ! %{pkg_virt}
+ rm -rf %{buildroot}/%{python_sitelib}/revisor/modvirt
+%endif
+
+%if ! %{pkg_wui}
+ rm -rf %{buildroot}/%{python_sitelib}/revisor/modwui
+%endif
+
desktop-file-install --vendor="fedora" \
--delete-original \
--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
+
+%files cli
%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
@@ -128,72 +281,126 @@
%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/*
+%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
+%files gui
%defattr(-,root,root,-)
-%dir %{python_sitelib}/revisor/modvirt
-%{python_sitelib}/revisor/modvirt/*.py
-%{python_sitelib}/revisor/modvirt/*.pyc
-%{python_sitelib}/revisor/modvirt/*.pyo
+%dir %{python_sitelib}/revisor/modgui
+%{python_sitelib}/revisor/modgui/*.py
+%{python_sitelib}/revisor/modgui/*.pyc
+%{python_sitelib}/revisor/modgui/*.pyo
+%dir %{_datadir}/revisor/ui
+%dir %{_datadir}/revisor/pixmaps
+%{_datadir}/revisor/ui/*
+%{_datadir}/revisor/pixmaps/*
+%{_datadir}/pixmaps/*
+%{_datadir}/applications/*.desktop
+%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
+
+%if %{pkg_server}
+%files server
+%defattr(-,root,root,-)
+%dir %{python_sitelib}/revisor/modserver
+%{python_sitelib}/revisor/modserver/*.py
+%{python_sitelib}/revisor/modserver/*.pyc
+%{python_sitelib}/revisor/modserver/*.pyo
+%endif
+
+%if %{pkg_unity}
+%files unity
+%defattr(-,root,root,-)
+%dir %{_sysconfdir}/revisor-unity
+%dir %{_sysconfdir}/revisor-unity/conf.d
+%config(noreplace) %{_sysconfdir}/revisor-unity/revisor.conf
+%config(noreplace) %{_sysconfdir}/revisor-unity/conf.d/*
+%endif
+
+%if %{pkg_virt}
+%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
+%endif
+
+%if %{pkg_wui}
+%files wui
+%defattr(-,root,root,-)
+%dir %{python_sitelib}/revisor/modwui
+%{python_sitelib}/revisor/modwui/*.py
+%{python_sitelib}/revisor/modwui/*.pyc
+%{python_sitelib}/revisor/modwui/*.pyo
+%endif
%changelog
-* Thu Jan 03 2008 Jeroen van Meeuwen <kanarip a fedoraunity.org> 2.0.5-15
+* %day %month %day_of_month %year Jeroen van Meeuwen <kanarip a fedoraunity.org> 2.1.0-1rc6
+- Latest rebuild
+
+* Wed Jan 30 2008 Jeroen van Meeuwen <kanarip a fedoraunity.org> 2.1.0-1rc5
+- Add Rescue Image capabilities
+- Add modserver into package
+- Remove conflicts
+- Updates
- Let's not build revisor-cobbler on ppc/ppc64
-* Fri Nov 23 2007 Jeroen van Meeuwen <kanarip a fedoraunity.org> 2.0.5-14
+* Thu Dec 20 2007 Jeroen van Meeuwen <kanarip a fedoraunity.org> 2.1.0-1rc2
+- Updates to many components related to plugins and kickstart
+
+* Wed Nov 07 2007 Jeroen van Meeuwen <kanarip a fedoraunity.org> 2.1.0-1rc1
- import piruterrors
- Minor fixes related to respinning Fedora for release
- 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
+- Applied patch from Alexander Todorov to get_comps() failing when comps not tidy
+- Move GUI to it's own package
+- API changes!
+- Point at Everything, not Fedora (from 2.0.5-13)
+- Add in ignore_list for pkglist_required() (from 2.0.5-13)
+- Catch a Bob Jensen Corner Case (from 2.0.5-13)
+- Minor bugfixes in packaging (from 2.0.5-13)
+- Other minor fixes (from 2.0.5-13)
* 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.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sources 3 Jan 2008 15:16:46 -0000 1.34
+++ sources 5 Apr 2008 17:32:45 -0000 1.35
@@ -1 +1 @@
-ffbe85e7f0a2ed38905c325836cb07a9 revisor-2.0.5.tar.gz
+7454b1446686b45d96bdbafce14f5e08 revisor-2.1.0.tar.gz
More information about the fedora-extras-commits
mailing list