rpms/revisor/EL-5 .cvsignore, 1.14, 1.15 revisor.spec, 1.22, 1.23 sources, 1.25, 1.26

[Jonathan Steffan (jsteffan)]

Author: jsteffan

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

Modified Files:
	.cvsignore revisor.spec sources 
Log Message:
Update to 2.0.5 in response to #280041



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/revisor/EL-5/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	25 Aug 2007 20:47:34 -0000	1.14
+++ .cvsignore	9 Nov 2007 17:34:04 -0000	1.15
@@ -1 +1 @@
-revisor-2.0.4.3.tar.gz
+revisor-2.0.5.tar.gz


Index: revisor.spec
===================================================================
RCS file: /cvs/extras/rpms/revisor/EL-5/revisor.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- revisor.spec	5 Sep 2007 13:50:17 -0000	1.22
+++ revisor.spec	9 Nov 2007 17:34:04 -0000	1.23
@@ -2,8 +2,8 @@
 
 Summary: Fedora "Spin" Graphical User Interface
 Name: revisor
-Version: 2.0.4.3
-Release: 1rc6%{?dist}
+Version: 2.0.5
+Release: 5%{?dist}
 License: GPLv2
 Group: Applications/System
 URL: https://hosted.fedoraproject.org/projects/revisor
@@ -24,9 +24,12 @@
 Requires: notify-python
 Requires: usermode
 Requires: pam
-# At least these requirements are invalid for EPEL
 Requires: python >= 2.4
-Requires: fedora-release >= 7
+# 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
 BuildArch: noarch
 ExcludeArch: ppc ppc64
 BuildRequires: intltool, gettext, python, desktop-file-utils
@@ -62,29 +65,29 @@
 %description delta
 Revisor Integration with deltarpm for generating delta ISO images.
 
-%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
+#%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
+
+#%package jigdo
+#Summary:    Revisor Integration with Jigdo
+#Group:      Applications/System
+#Requires:   jigdo, revisor = %{version}-%{release}
+
+#%description jigdo
+#Pre-Alpha of Revisor Integration with Jigdo for distributing your compose
+
+#%package rebrand
+#Summary:    Revisor Rebranding Fedora Utilies
+#Group:      Applications/System
+#Requires:   revisor = %{version}-%{release}, rpmdevtools, rpm-build
 
-%package jigdo
-Summary:    Revisor Integration with Jigdo
-Group:      Applications/System
-Requires:   jigdo, revisor = %{version}-%{release}
-
-%description jigdo
-Pre-Alpha of Revisor Integration with Jigdo for distributing your compose
-
-%package rebrand
-Summary:    Revisor Rebranding Fedora Utilies
-Group:      Applications/System
-Requires:   revisor = %{version}-%{release}, rpmdevtools, rpm-build
-
-%description rebrand
-Utilities for Revisor to support rebranding Fedora
+#%description rebrand
+#Utilities for Revisor to support rebranding Fedora
 
 %prep
 %setup -q
@@ -101,6 +104,11 @@
   --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
 
@@ -130,7 +138,7 @@
 
 %files comps
 %dir %{_datadir}/revisor/comps/
-%{_datadir}/revisor/comps/*
+%{_datadir}/revisor/*
 
 %files cobbler
 %defattr(-,root,root,-)
@@ -146,31 +154,39 @@
 %{python_sitelib}/revisor/moddelta/*.pyc
 %{python_sitelib}/revisor/moddelta/*.pyo
 
-%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
+#%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
+
+#%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
+
+#%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/*
 
-%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
+%changelog
+* Sat Oct 20 2007 Jonathan Steffan <jon a fedoraunity.org> 2.0.5-5
+- Update spec for release
 
-%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/*
+* Tue Oct 02 2007 Jeroen van Meeuwen <kanarip a fedoraunity.org> 2.0.5-3
+- Bugfixes to x86_64 packageSack creation
+- Bugfixes
 
-%changelog
-* Wed Sep 05 2007 Jeroen van Meeuwen <kanarip a fedoraunity.org> 2.0.4.3-1rc6
+* Fri Sep 07 2007 Jeroen van Meeuwen <kanarip a fedoraunity.org> 2.0.4.3-7
+- Bugfixes
 - Removed pungi dependency
 - Added kickstart interfacing for pykickstart API differences
 - Enable Revisor to run in CLI mode on Enterprise Linux 5


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/revisor/EL-5/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	5 Sep 2007 13:50:17 -0000	1.25
+++ sources	9 Nov 2007 17:34:04 -0000	1.26
@@ -1 +1 @@
-cb4f43011360e3fc6ba12d85d6755f47  revisor-2.0.4.3.tar.gz
+3c860b2068651d6f2a4c669c708e7423  revisor-2.0.5.tar.gz