rpms/revisor/EL-5 .cvsignore, 1.15, 1.16 revisor.spec, 1.25, 1.26 sources, 1.28, 1.29

[Jeroen van Meeuwen (kanarip)]

Author: kanarip

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

Modified Files:
	.cvsignore revisor.spec sources 
Log Message:
Bugfixes, no more mayflower included since livecd-tools is in EPEL now too



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/revisor/EL-5/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	9 Nov 2007 17:34:04 -0000	1.15
+++ .cvsignore	7 Feb 2008 12:47:57 -0000	1.16
@@ -1 +1 @@
-revisor-2.0.5.tar.gz
+revisor-2.0.5.1.tar.gz


Index: revisor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/revisor/EL-5/revisor.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- revisor.spec	3 Jan 2008 23:07:58 -0000	1.25
+++ revisor.spec	7 Feb 2008 12:47:57 -0000	1.26
@@ -2,8 +2,8 @@
 
 Summary: Fedora "Spin" Graphical User Interface
 Name: revisor
-Version: 2.0.5
-Release: 15%{?dist}
+Version: 2.0.5.1
+Release: 2%{?dist}
 License: GPLv2
 Group: Applications/System
 URL: https://hosted.fedoraproject.org/projects/revisor
@@ -19,7 +19,10 @@
 # Kickstart
 Requires: system-config-kickstart, pykickstart
 # Compose tools
-Requires: anaconda-runtime, squashfs-tools, busybox-anaconda
+Requires: anaconda-runtime
+Requires: squashfs-tools
+Requires: busybox-anaconda
+Requires: livecd-tools
 # Other
 Requires: notify-python
 Requires: usermode
@@ -27,7 +30,8 @@
 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: centos-release < 5
 # Can't conflict with this one!
 #Conflicts: redhat-release < 5
 BuildArch: noarch
@@ -89,13 +93,13 @@
 %description rebrand
 Utilities for Revisor to support rebranding Fedora
 
-%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.
+#%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.
 
 %prep
 %setup -q
@@ -181,11 +185,16 @@
 %dir %{_datadir}/revisor/rebrand-template
 %{_datadir}/revisor/rebrand-template/*
 
-%files -n mayflower
-%defattr(-,root,root,-)
-%{_sbindir}/*
+#%files -n mayflower
+#%defattr(-,root,root,-)
+#%{_sbindir}/*
 
 %changelog
+* Thu Feb 07 2008 Jeroen van Meeuwen <kanarip a fedoraunity.org> 2.0.5.1-2
+- Add packages the way anaconda does it (@core and @base depending on ksdata.addBase)
+- Do not package mayflower anymore as livecd-tools is in EPEL now
+- 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
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/revisor/EL-5/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	3 Jan 2008 23:07:58 -0000	1.28
+++ sources	7 Feb 2008 12:47:57 -0000	1.29
@@ -1 +1 @@
-b86bc386df9079d37562be22c08242d8  revisor-2.0.5.tar.gz
+8d137a8d223c22eff520d578f57152a1  revisor-2.0.5.1.tar.gz