rpms/revisor/devel .cvsignore, 1.29, 1.30 import.log, 1.13, 1.14 revisor.spec, 1.55, 1.56 sources, 1.55, 1.56
Jeroen van Meeuwen
kanarip at fedoraproject.org
Mon Jan 4 13:47:01 UTC 2010
Author: kanarip
Update of /cvs/pkgs/rpms/revisor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15127/devel
Modified Files:
.cvsignore import.log revisor.spec sources
Log Message:
2.1.11-1
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/revisor/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- .cvsignore 23 Nov 2009 00:23:15 -0000 1.29
+++ .cvsignore 4 Jan 2010 13:47:00 -0000 1.30
@@ -1 +1 @@
-revisor-2.1.10.tar.gz
+revisor-2.1.11.tar.gz
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/revisor/devel/import.log,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- import.log 23 Nov 2009 11:30:40 -0000 1.13
+++ import.log 4 Jan 2010 13:47:00 -0000 1.14
@@ -11,3 +11,4 @@ revisor-2_1_8-1_fc11:HEAD:revisor-2.1.8-
revisor-2_1_9-1_fc13:HEAD:revisor-2.1.9-1.fc13.src.rpm:1258934592
revisor-2_1_10-1_fc13:HEAD:revisor-2.1.10-1.fc13.src.rpm:1258935777
revisor-2_1_10-3_fc13:HEAD:revisor-2.1.10-3.fc13.src.rpm:1258975817
+revisor-2_1_11-1_fc12:HEAD:revisor-2.1.11-1.fc12.src.rpm:1262612710
Index: revisor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/revisor/devel/revisor.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- revisor.spec 23 Nov 2009 11:30:40 -0000 1.55
+++ revisor.spec 4 Jan 2010 13:47:00 -0000 1.56
@@ -12,13 +12,14 @@
%define pkg_reuseinstaller 1
%define pkg_server 0
%define pkg_unity 1
+%define pkg_unity_scripts 1
%define pkg_virt 0
%define pkg_wui 0
Summary: Fedora "Spin" Graphical User Interface
Name: revisor
-Version: 2.1.10
-Release: 3%{?dist}
+Version: 2.1.11
+Release: 1%{?dist}
License: GPLv2
Group: Applications/System
URL: http://fedorahosted.org/revisor
@@ -63,61 +64,69 @@ Conflicts: fedora-release < 7
#Conflicts: redhat-release < 5
# Or:
#Conflicts: redhat-release = 4, redhat-release = 3
+Requires: fedora-kickstarts
+Requires: custom-kickstarts
%if ! %{pkg_comps}
-Obsoletes: revisor-comps < %{version}-%{release}
-Provides: revisor-comps = %{version}-%{release}
+Obsoletes: revisor-comps < %{version}-%{release}
+Provides: revisor-comps = %{version}-%{release}
%endif
%if ! %{pkg_cobbler}
-Obsoletes: revisor-cobbler < %{version}-%{release}
-Provides: revisor-cobbler = %{version}-%{release}
+Obsoletes: revisor-cobbler < %{version}-%{release}
+Provides: revisor-cobbler = %{version}-%{release}
%endif
%if ! %{pkg_composer}
-Obsoletes: revisor-composer < %{version}-%{release}
-Provides: revisor-composer = %{version}-%{release}
+Obsoletes: revisor-composer < %{version}-%{release}
+Provides: revisor-composer = %{version}-%{release}
%endif
%if ! %{pkg_delta}
-Obsoletes: revisor-delta < %{version}-%{release}
-Provides: revisor-delta = %{version}-%{release}
+Obsoletes: revisor-delta < %{version}-%{release}
+Provides: revisor-delta = %{version}-%{release}
%endif
%if ! %{pkg_hub}
-Obsoletes: revisor-hub < %{version}-%{release}
-Provides: revisor-hub = %{version}-%{release}
+Obsoletes: revisor-hub < %{version}-%{release}
+Provides: revisor-hub = %{version}-%{release}
%endif
%if ! %{pkg_isolinux}
-Obsoletes: revisor-isolinux < %{version}-%{release}
-Provides: revisor-isolinux = %{version}-%{release}
+Obsoletes: revisor-isolinux < %{version}-%{release}
+Provides: revisor-isolinux = %{version}-%{release}
%endif
%if ! %{pkg_jigdo}
-Obsoletes: revisor-jigdo < %{version}-%{release}
-Provides: revisor-jigdo = %{version}-%{release}
+Obsoletes: revisor-jigdo < %{version}-%{release}
+Provides: revisor-jigdo = %{version}-%{release}
%endif
%if ! %{pkg_mock}
-Obsoletes: revisor-mock < %{version}-%{release}
-Provides: revisor-mock = %{version}-%{release}
+Obsoletes: revisor-mock < %{version}-%{release}
+Provides: revisor-mock = %{version}-%{release}
%endif
%if ! %{pkg_rebrand}
-Obsoletes: revisor-rebrand < %{version}-%{release}
-Provides: revisor-rebrand = %{version}-%{release}
+Obsoletes: revisor-rebrand < %{version}-%{release}
+Provides: revisor-rebrand = %{version}-%{release}
%endif
%if ! %{pkg_reuseinstaller}
-Obsoletes: revisor-reuseinstaller < %{version}-%{release}
-Provides: revisor-reuseinstaller = %{version}-%{release}
+Obsoletes: revisor-reuseinstaller < %{version}-%{release}
+Provides: revisor-reuseinstaller = %{version}-%{release}
%endif
%if ! %{pkg_server}
-Obsoletes: revisor-server < %{version}-%{release}
-Provides: revisor-server = %{version}-%{release}
+Obsoletes: revisor-server < %{version}-%{release}
+Provides: revisor-server = %{version}-%{release}
%endif
%if ! %{pkg_unity}
-Obsoletes: revisor-unity < %{version}-%{release}
-Provides: revisor-unity = %{version}-%{release}
+Obsoletes: revisor-unity < %{version}-%{release}
+Provides: revisor-unity = %{version}-%{release}
+%else
+Requires: revisor-unity = %{version}-%{release}
+%endif
+%if ! %{pkg_unity_scripts}
+Obsoletes: revisor-unity-scripts < %{version}-%{release}
+Provides: revisor-unity-scripts = %{version}-%{release}
%endif
%if ! %{pkg_virt}
-Obsoletes: revisor-virt < %{version}-%{release}
-Provides: revisor-virt = %{version}-%{release}
+Obsoletes: revisor-virt < %{version}-%{release}
+Provides: revisor-virt = %{version}-%{release}
%endif
%if ! %{pkg_wui}
-Obsoletes: revisor-wui < %{version}-%{release}
-Provides: revisor-wui = %{version}-%{release}
+Obsoletes: revisor-wui < %{version}-%{release}
+Provides: revisor-wui = %{version}-%{release}
%endif
%description cli
@@ -298,6 +307,20 @@ Revisor to create Re-Spins and do testin
%endif
##
+## Fedora Unity Configuration and Scripts for Revisor
+##
+%if %{pkg_unity_scripts}
+%package unity-scripts
+Summary: Fedora Unity Configuration and Scripts for Revisor
+Group: Applications/System
+Requires: revisor-cli
+
+%description unity-scripts
+The configuration files and scripts Fedora Unity uses with
+Revisor to create Re-Spins and do testing.
+%endif
+
+##
## Revisor virtualization plugin
##
%if %{pkg_virt}
@@ -384,6 +407,10 @@ make install DESTDIR=$RPM_BUILD_ROOT
rm -rf %{buildroot}/%{_datadir}/revisor/unity/
%endif
+%if ! %{pkg_unity_scripts}
+ rm -rf %{buildroot}/%{_datadir}/revisor/unity/scripts/
+%endif
+
%if ! %{pkg_virt}
rm -rf %{buildroot}/%{python_sitelib}/revisor/modvirt
%endif
@@ -545,7 +572,14 @@ 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/
+%dir %{_datadir}/revisor/unity/
+%{_datadir}/revisor/unity/*.*
+%endif
+
+%if %{pkg_unity_scripts}
+%files unity-scripts
+%defattr(-,root,root,-)
+%{_datadir}/revisor/unity/scripts/
%endif
%if %{pkg_virt}
@@ -567,8 +601,10 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
-* Mon Nov 23 2009 Jeroen van Meeuwen <kanarip a fedoraunity.org> 2.1.10-3
-- Update to F-12
+* Mon Jan 04 2010 Jeroen van Meeuwen <kanarip a fedoraunity.org> 2.1.11-1
+- Fix os not being imported (#541443)
+
+* Tue Nov 24 2009 Jeroen van Meeuwen <kanarip a fedoraunity.org> 2.1.8-2
- 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/devel/sources,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- sources 23 Nov 2009 11:30:40 -0000 1.55
+++ sources 4 Jan 2010 13:47:01 -0000 1.56
@@ -1 +1 @@
-682a00d95f2e1783c4245262acf70618 revisor-2.1.10.tar.gz
+6dd81fd135ac58e6d430d7cc868e65c1 revisor-2.1.11.tar.gz
More information about the fedora-extras-commits
mailing list