rpms/fedora-security-guide-en-US/devel fedora-security-guide-en-US.spec, 1.4, 1.5 import.log, 1.3, 1.4 sources, 1.4, 1.5

[Eric Christensen]

Author: sparks

Update of /cvs/pkgs/rpms/fedora-security-guide-en-US/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7746/devel

Modified Files:
	fedora-security-guide-en-US.spec import.log sources 
Log Message:
Hopefully repaired the Vendor fields that Koji didn't like.



Index: fedora-security-guide-en-US.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-security-guide-en-US/devel/fedora-security-guide-en-US.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- fedora-security-guide-en-US.spec	24 Jul 2009 22:38:20 -0000	1.4
+++ fedora-security-guide-en-US.spec	28 Jul 2009 02:21:36 -0000	1.5
@@ -5,8 +5,6 @@
 
 %if %{HTMLVIEW}
 %define viewer htmlview
-%define vendor redhat-
-%define vendoropt --vendor="redhat"
 %endif
 
 Name:	fedora-security-guide-en-US
@@ -18,9 +16,8 @@ License:	Open Publication
 URL:		http://docs.fedoraproject.org
 Source:		%{name}-%{version}.tgz
 BuildArch:	noarch
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	publican
-BuildRequires:	desktop-file-utils
+BuildRoot:	%{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
+BuildRequires:	publican desktop-file-utils
 
 BuildRequires:	publican-fedora
 
@@ -53,7 +50,7 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/appl
 
 cat > %{name}.desktop <<'EOF'
 [Desktop Entry]
-Name=fedora 11: security-guide
+Name=fedora security-guide
 Comment=A Guide to Securing Fedora Linux
 Exec=%{viewer} %{_docdir}/%{name}-%{version}/index.html
 Icon=%{_docdir}/%{name}-%{version}/images/icon.svg
@@ -63,7 +60,7 @@ Encoding=UTF-8
 Terminal=false
 EOF
 
-desktop-file-install  %{?vendoropt} --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{name}.desktop
+desktop-file-install  --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{name}.desktop
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -71,12 +68,13 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc tmp/en-US/html-desktop/*
-%{_datadir}/applications/%{?vendor}%{name}.desktop
+%{_datadir}/applications/%{name}.desktop
 
 %changelog
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-16
+* Fri Jul 24 2009  Fedora Release Engineering rel-eng at lists.fedoraproject.org 1.0-16
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
+
 * Tue Jul 14 2009 Eric Christensen sparks at fedoraproject.org 1.0-15
 - Added "desktop-file-utils" to BUILDREQUIRES on the spec
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-security-guide-en-US/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	15 Jul 2009 00:01:23 -0000	1.3
+++ import.log	28 Jul 2009 02:21:36 -0000	1.4
@@ -1,3 +1,4 @@
 fedora-security-guide-en-US-1_0-14_fc11:HEAD:fedora-security-guide-en-US-1.0-14.fc11.src.rpm:1247542430
 fedora-security-guide-en-US-1_0-14_fc11:HEAD:fedora-security-guide-en-US-1.0-14.fc11.src.rpm:1247615483
 fedora-security-guide-en-US-1_0-15_fc11:HEAD:fedora-security-guide-en-US-1.0-15.fc11.src.rpm:1247616043
+fedora-security-guide-en-US-1_0-16_fc11:HEAD:fedora-security-guide-en-US-1.0-16.fc11.src.rpm:1248747665


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-security-guide-en-US/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	15 Jul 2009 00:01:23 -0000	1.4
+++ sources	28 Jul 2009 02:21:36 -0000	1.5
@@ -1 +1 @@
-40b9c81f394472c4df52091a16ae8193  fedora-security-guide-en-US-1.0.tgz
+7488b14be717d8b0acb279d040701b64  fedora-security-guide-en-US-1.0.tgz