rpms/revisor/F-11 .cvsignore, 1.25, 1.26 import.log, 1.8, 1.9 revisor.spec, 1.50, 1.51 sources, 1.50, 1.51

Jeroen van Meeuwen kanarip at fedoraproject.org
Sun Jul 26 10:53:04 UTC 2009


Author: kanarip

Update of /cvs/pkgs/rpms/revisor/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv418/F-11

Modified Files:
	.cvsignore import.log revisor.spec sources 
Log Message:
2.1.7-1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/revisor/F-11/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- .cvsignore	19 Jun 2009 14:57:49 -0000	1.25
+++ .cvsignore	26 Jul 2009 10:53:03 -0000	1.26
@@ -1 +1 @@
-revisor-2.1.6.tar.gz
+revisor-2.1.7.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/revisor/F-11/import.log,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- import.log	19 Jun 2009 14:57:49 -0000	1.8
+++ import.log	26 Jul 2009 10:53:03 -0000	1.9
@@ -6,3 +6,4 @@ revisor-2_1_2-2_fc9:HEAD:revisor-2.1.2-2
 revisor-2_1_3-1_fc10:HEAD:revisor-2.1.3-1.fc10.src.rpm:1228176091
 revisor-2_1_4-1_fc11:HEAD:revisor-2.1.4-1.fc11.src.rpm:1238987564
 revisor-2_1_6-1_fc11:F-11:revisor-2.1.6-1.fc11.src.rpm:1245423448
+revisor-2_1_7-1_fc11:F-11:revisor-2.1.7-1.fc11.src.rpm:1248605440


Index: revisor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/revisor/F-11/revisor.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- revisor.spec	19 Jun 2009 14:57:49 -0000	1.50
+++ revisor.spec	26 Jul 2009 10:53:03 -0000	1.51
@@ -17,7 +17,7 @@
 
 Summary:        Fedora "Spin" Graphical User Interface
 Name:           revisor
-Version:        2.1.6
+Version:        2.1.7
 Release:        1%{?dist}
 License:        GPLv2
 Group:          Applications/System
@@ -59,6 +59,13 @@ Requires:       usermode
 Requires:       pam
 Requires:       python(abi) >= 2.4
 Conflicts:      fedora-release < 7
+
+# Some conditional requirements
+#%ifarch x86_64
+#Requires:       glibc.i586
+#Requires:       glib.i586
+#%endif
+
 # Can't conflict with this one!
 #Conflicts:      centos-release < 5
 # Can't conflict with this one!
@@ -133,9 +140,10 @@ which builds the live image.
 ##
 %if %{pkg_comps}
 %package comps
-Summary:    Revisor Comps Files
-Group:      Applications/System
-Requires:   revisor-cli = %{version}-%{release}
+Summary:        Revisor Comps Files
+Group:          Applications/System
+BuildArch:      noarch
+Requires:       revisor-cli = %{version}-%{release}
 
 %description comps
 A number of comps files, as up-to-date as possible
@@ -146,10 +154,11 @@ A number of comps files, as up-to-date a
 ##
 %if %{pkg_cobbler}
 %package cobbler
-Summary:    Revisor Cobbler Integration
-Group:      Applications/System
-ExcludeArch: ppc ppc64
-Requires:   cobbler, koan, revisor-cli = %{version}-%{release}
+Summary:        Revisor Cobbler Integration
+Group:          Applications/System
+BuildArch:      noarch
+ExcludeArch:    ppc ppc64
+Requires:       cobbler, koan, revisor-cli = %{version}-%{release}
 
 %description cobbler
 Revisor Integration with Cobbler for having Revisor do DHCP, PXE,
@@ -161,9 +170,10 @@ Xen and KVM stuff.
 ##
 %if %{pkg_composer}
 %package composer
-Summary:    Revisor Composer, for use with the Hub
-Group:      Applications/System
-Requires:   revisor-cli = %{version}-%{release}
+Summary:        Revisor Composer, for use with the Hub
+Group:          Applications/System
+BuildArch:      noarch
+Requires:       revisor-cli = %{version}-%{release}
 
 %description composer
 Revisor build farms need Composers. This is it.
@@ -174,9 +184,10 @@ Revisor build farms need Composers. This
 ##
 %if %{pkg_delta}
 %package delta
-Summary:    Revisor Deltarpm Integration
-Group:      Applications/System
-Requires:   deltarpm, revisor-cli = %{version}-%{release}
+Summary:        Revisor Deltarpm Integration
+Group:          Applications/System
+BuildArch:      noarch
+Requires:       deltarpm, revisor-cli = %{version}-%{release}
 
 %description delta
 Revisor Integration with deltarpm for generating delta ISO images.
@@ -186,9 +197,10 @@ Revisor Integration with deltarpm for ge
 ## Revisor GUI
 ##
 %package gui
-Summary:    Revisor GUI
-Group:      Applications/System
-Requires:   revisor-cli = %{version}-%{release}, pygtk2 >= 2.9.2, pygtk2-libglade, gnome-python2-gconf
+Summary:        Revisor GUI
+Group:          Applications/System
+BuildArch:      noarch
+Requires:       revisor-cli = %{version}-%{release}, pygtk2 >= 2.9.2, pygtk2-libglade, gnome-python2-gconf
 Requires:   system-config-kickstart
 
 %description gui
@@ -199,9 +211,10 @@ This is the Revisor GUI package
 ##
 %if %{pkg_hub}
 %package hub
-Summary:    Revisor Hub for build farms
-Group:      Applications/System
-Requires:   revisor-cli = %{version}-%{release}
+Summary:        Revisor Hub for build farms
+Group:          Applications/System
+BuildArch:      noarch
+Requires:       revisor-cli = %{version}-%{release}
 
 %description hub
 Revisor build farms need a Hub. This is it.
@@ -212,9 +225,10 @@ Revisor build farms need a Hub. This is 
 ##
 %if %{pkg_isolinux}
 %package isolinux
-Summary:    Revisor plugin for supplying a custom isolinux.cfg
-Group:      Applications/System
-Requires:   revisor-cli = %{version}-%{release}
+Summary:        Revisor plugin for supplying a custom isolinux.cfg
+Group:          Applications/System
+BuildArch:      noarch
+Requires:       revisor-cli = %{version}-%{release}
 
 %description isolinux
 Supply a custom isolinux.cfg to Revisor to incorporate in the installation media
@@ -225,9 +239,10 @@ Supply a custom isolinux.cfg to Revisor 
 ##
 %if %{pkg_jigdo}
 %package jigdo
-Summary:    Revisor Integration with Jigdo
-Group:      Applications/System
-Requires:   jigdo, revisor-cli = %{version}-%{release}
+Summary:        Revisor Integration with Jigdo
+Group:          Applications/System
+BuildArch:      noarch
+Requires:       jigdo, revisor-cli = %{version}-%{release}
 
 %description jigdo
 Pre-Alpha of Revisor Integration with Jigdo for distributing your compose
@@ -238,9 +253,10 @@ Pre-Alpha of Revisor Integration with Ji
 ##
 %if %{pkg_mock}
 %package mock
-Summary:    Revisor Integration with Mock
-Group:      Applications/System
-Requires:   mock, revisor-cli = %{version}-%{release}
+Summary:        Revisor Integration with Mock
+Group:          Applications/System
+BuildArch:      noarch
+Requires:       mock, revisor-cli = %{version}-%{release}
 
 %description mock
 Revisor Integration with Mock for building the installer images
@@ -251,9 +267,10 @@ Revisor Integration with Mock for buildi
 ##
 %if %{pkg_rebrand}
 %package rebrand
-Summary:    Revisor Rebranding Fedora Utilies
-Group:      Applications/System
-Requires:   revisor-cli = %{version}-%{release}, revisor-gui = %{version}-%{release}
+Summary:        Revisor Rebranding Fedora Utilies
+Group:          Applications/System
+BuildArch:      noarch
+Requires:       revisor-cli = %{version}-%{release}, revisor-gui = %{version}-%{release}
 
 %description rebrand
 Utilities for Revisor to support rebranding Fedora
@@ -264,9 +281,10 @@ Utilities for Revisor to support rebrand
 ##
 %if %{pkg_reuseinstaller}
 %package reuseinstaller
-Summary:    Revisor Plugin to enable Reusing existing installer images
-Group:      Applications/System
-Requires:   revisor-cli = %{version}-%{release}
+Summary:        Revisor Plugin to enable Reusing existing installer images
+Group:          Applications/System
+BuildArch:      noarch
+Requires:       revisor-cli = %{version}-%{release}
 
 %description reuseinstaller
 Revisor Plugin to enable Reusing existing installer images
@@ -277,9 +295,10 @@ Revisor Plugin to enable Reusing existin
 ##
 %if %{pkg_server}
 %package server
-Summary:    Revisor Server
-Group:      Applications/System
-Requires:   revisor-cli = %{version}-%{release}
+Summary:        Revisor Server
+Group:          Applications/System
+BuildArch:      noarch
+Requires:       revisor-cli = %{version}-%{release}
 
 %description server
 Utilities for Revisor to support rebranding Fedora
@@ -290,9 +309,10 @@ Utilities for Revisor to support rebrand
 ##
 %if %{pkg_unity}
 %package unity
-Summary:    Fedora Unity Configuration and Scripts for Revisor
-Group:      Applications/System
-Requires:   revisor-cli
+Summary:        Fedora Unity Configuration and Scripts for Revisor
+Group:          Applications/System
+BuildArch:      noarch
+Requires:       revisor-cli
 
 %description unity
 The configuration files and scripts Fedora Unity uses with
@@ -304,9 +324,10 @@ Revisor to create Re-Spins and do testin
 ##
 %if %{pkg_virt}
 %package virt
-Summary:    Revisor Virtualization Media Features
-Group:      Applications/System
-Requires:   python-virtinst, revisor-cli = %{version}-%{release}
+Summary:        Revisor Virtualization Media Features
+Group:          Applications/System
+BuildArch:      noarch
+Requires:       python-virtinst, revisor-cli = %{version}-%{release}
 
 %description virt
 Revisor Virtualization Media Features for provisioning virtual guests
@@ -317,9 +338,10 @@ Revisor Virtualization Media Features fo
 ##
 %if %{pkg_wui}
 %package wui
-Summary:    Revisor WUI
-Group:      Applications/System
-Requires:   revisor-cli = %{version}-%{release}
+Summary:        Revisor WUI
+Group:          Applications/System
+BuildArch:      noarch
+Requires:       revisor-cli = %{version}-%{release}
 
 %description wui
 This is the Revisor Web User Interface package
@@ -383,6 +405,7 @@ make install DESTDIR=$RPM_BUILD_ROOT
 
 %if ! %{pkg_unity}
     rm -rf %{buildroot}/%{_sysconfdir}/revisor-unity/
+    rm -rf %{buildroot}/%{_datadir}/revisor/unity/
 %endif
 
 %if ! %{pkg_virt}
@@ -546,6 +569,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_sysconfdir}/revisor-unity/conf.d
 %config(noreplace) %{_sysconfdir}/revisor-unity/*.conf
 %config(noreplace) %{_sysconfdir}/revisor-unity/conf.d/*
+%{_datadir}/revisor/unity/
 %endif
 
 %if %{pkg_virt}
@@ -567,7 +591,7 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
-* Fri Jun 19 2009 Jeroen van Meeuwen <kanarip a fedoraunity.org> 2.1.6-1
+* Sun Jul 26 2009 Jeroen van Meeuwen <kanarip a fedoraunity.org> 2.1.7-1
 - Fix configuration file issues
 - Better estimation for the size of a tree that is to become an iso
 - Huge improvements to package ordering


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/revisor/F-11/sources,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- sources	19 Jun 2009 14:57:49 -0000	1.50
+++ sources	26 Jul 2009 10:53:03 -0000	1.51
@@ -1 +1 @@
-b55f7d03f287c7e8697d4766d84c2f39  revisor-2.1.6.tar.gz
+90f0c51d23c5b52a272f87536d3c039d  revisor-2.1.7.tar.gz




More information about the fedora-extras-commits mailing list