rpms/fedora-security-guide-en-US/F-10 fedora-security-guide-en-US.spec, 1.1, 1.2 import.log, 1.1, 1.2 sources, 1.2, 1.3

[Eric Christensen]

Author: sparks

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

Modified Files:
	fedora-security-guide-en-US.spec import.log sources 
Log Message:
Fixed "vendor" in SPEC.



Index: fedora-security-guide-en-US.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-security-guide-en-US/F-10/fedora-security-guide-en-US.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- fedora-security-guide-en-US.spec	14 Jul 2009 03:17:00 -0000	1.1
+++ fedora-security-guide-en-US.spec	28 Jul 2009 03:00:59 -0000	1.2
@@ -5,21 +5,19 @@
 
 %if %{HTMLVIEW}
 %define viewer htmlview
-%define vendor redhat-
-%define vendoropt --vendor="redhat"
 %endif
 
 Name:	fedora-security-guide-en-US
 Version:	1.0
-Release:	14%{?dist}
+Release:	17%{?dist}
 Summary:	A Guide to Securing Fedora Linux
 Group:		Documentation
 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
+BuildRoot:	%{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
+BuildRequires:	publican desktop-file-utils
 
 BuildRequires:	publican-fedora
 
@@ -52,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
@@ -62,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
@@ -70,9 +68,21 @@ 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
+* Mon Jul 27 2009 Eric Christensen sparks at fedoraproject.org 1.0-17
+- Repaired vendor information in SPEC.
+
+
+* 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
+
+
 * Tue Mar 10 2009 Scott Radvan sradvan at redhat.com 1.0-14
 - Remove more rhel specifics, major review and remove draft, ready for push
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-security-guide-en-US/F-10/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	14 Jul 2009 03:17:00 -0000	1.1
+++ import.log	28 Jul 2009 03:00:59 -0000	1.2
@@ -1 +1,2 @@
 fedora-security-guide-en-US-1_0-14_fc11:F-10:fedora-security-guide-en-US-1.0-14.fc11.src.rpm:1247541394
+fedora-security-guide-en-US-1_0-17_fc11:F-10:fedora-security-guide-en-US-1.0-17.fc11.src.rpm:1248750029


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-security-guide-en-US/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	14 Jul 2009 03:17:00 -0000	1.2
+++ sources	28 Jul 2009 03:00:59 -0000	1.3
@@ -1 +1 @@
-87e62acffd88e0b0d5f5ee0dda5d9be6  fedora-security-guide-en-US-1.0.tgz
+22065b4df0ca71af7601d8939c876c23  fedora-security-guide-en-US-1.0.tgz