rpms/revisor/F-9 revisor.spec,1.35,1.36 sources,1.38,1.39

[Jeroen van Meeuwen (kanarip)]

Author: kanarip

Update of /cvs/pkgs/rpms/revisor/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27045/F-9

Modified Files:
	revisor.spec sources 
Log Message:
2.1.0-2


Index: revisor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/revisor/F-9/revisor.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- revisor.spec	5 Apr 2008 20:12:19 -0000	1.35
+++ revisor.spec	1 May 2008 18:51:05 -0000	1.36
@@ -10,15 +10,10 @@
 %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:        1rc7%{?dist}
+Release:        2%{?dist}
 License:        GPLv2
 Group:          Applications/System
 URL:            https://hosted.fedoraproject.org/projects/revisor
@@ -49,13 +44,13 @@
 # Kickstart
 Requires:       pykickstart
 # Compose tools
-Requires:       livecd-tools, anaconda-runtime, squashfs-tools, busybox-anaconda
+Requires:       livecd-tools >= 015, anaconda-runtime, squashfs-tools, busybox-anaconda
 # Other
 Requires:       libxml2-python
 Requires:       notify-python
 Requires:       usermode
 Requires:       pam
-Requires:       python(abi) = 2.5
+Requires:       python(abi) >= 2.4
 Conflicts:      fedora-release < 7
 # Can't conflict with this one!
 #Conflicts:      centos-release < 5
@@ -63,6 +58,33 @@
 #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_server}
+Obsoletes:       revisor-server
+%endif
+%if ! %{pkg_unity}
+Obsoletes:       revisor-unity
+%endif
+%if ! %{pkg_virt}
+Obsoletes:       revisor-virt
+%endif
+%if ! %{pkg_wui}
+Obsoletes:       revisor-wui
+%endif
 
 %description cli
 Revisor provides a set of graphical tools for building customized, updated
@@ -376,8 +398,10 @@
 %endif
 
 %changelog
-* %day %month %day_of_month %year Jeroen van Meeuwen <kanarip a fedoraunity.org> 2.1.0-1rc7
+* Thu May 01 2008 Jeroen van Meeuwen <kanarip a fedoraunity.org> 2.1.0-2
 - Latest rebuild
+- Bugfixes in live media creation
+- F-9 Release
 
 * Wed Jan 30 2008 Jeroen van Meeuwen <kanarip a fedoraunity.org> 2.1.0-1rc5
 - Add Rescue Image capabilities
@@ -503,7 +527,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/F-9/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- sources	5 Apr 2008 20:12:19 -0000	1.38
+++ sources	1 May 2008 18:51:05 -0000	1.39
@@ -1 +1 @@
-f282d4c1b5d09bbde4efc67b4b6e43c0  revisor-2.1.0.tar.gz
+d455bf279cd7669d7251e9d2c153562f  revisor-2.1.0.tar.gz