rpms/fedora-security-guide-en-US/F-13 .cvsignore, 1.2, 1.3 fedora-security-guide-en-US.spec, 1.8, 1.9 import.log, 1.7, 1.8 sources, 1.8, 1.9
Eric Christensen
sparks at fedoraproject.org
Tue Apr 6 23:43:08 UTC 2010
Author: sparks
Update of /cvs/pkgs/rpms/fedora-security-guide-en-US/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv20745/F-13
Modified Files:
.cvsignore fedora-security-guide-en-US.spec import.log sources
Log Message:
Base version for F13.
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-security-guide-en-US/F-13/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore 14 Jul 2009 03:34:42 -0000 1.2
+++ .cvsignore 6 Apr 2010 23:43:07 -0000 1.3
@@ -1 +1 @@
-fedora-security-guide-en-US-1.0.tgz
+fedora-security-guide-en-US-13.0-3.tgz
Index: fedora-security-guide-en-US.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-security-guide-en-US/F-13/fedora-security-guide-en-US.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- fedora-security-guide-en-US.spec 26 Oct 2009 23:02:57 -0000 1.8
+++ fedora-security-guide-en-US.spec 6 Apr 2010 23:43:07 -0000 1.9
@@ -5,44 +5,53 @@
%if %{HTMLVIEW}
%define viewer htmlview
+%define vendor redhat-
+%define vendoropt --vendor="redhat"
%endif
-Name: fedora-security-guide-en-US
-Version: 1.0
-Release: 19%{?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}-root-%(%{__id_u} -n)
-BuildRequires: publican desktop-file-utils
-
-BuildRequires: publican-fedora
+Name: fedora-security-guide-en-US
+Version: 13.0
+Release: 3%{?dist}
+
+
+Summary: A Guide to Securing Fedora Linux
+
+Group: Documentation
+License: CC-BY-SA
+URL: http://docs.fedoraproject.org
+Source: http://sparks.fedorapeople.org/source/%{name}-%{version}-3.tgz
+BuildArch: noarch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: publican
+BuildRequires: desktop-file-utils
+BuildRequires: publican-fedora
%if %{HTMLVIEW}
-Requires: htmlview
+Requires: htmlview
%else
-Requires: xdg-utils
+Requires: xdg-utils
%endif
%description
-The Linux Security Guide is designed to assist users of Linux in
-learning the processes and practices of securing workstations and
-servers against local and remote intrusion, exploitation, and
-malicious activity. The Linux Security Guide details the planning
-and the tools involved in creating a secured computing environment
-for the data center, workplace, and home. With proper
-administrative knowledge, vigilance, and tools, systems running
-Linux can be both fully functional and secured from most common
-intrusion and exploit methods.
+
+The Fedora Security Guide is designed to
+assist users of Fedora in learning the processes and practices of
+securing workstations and servers against local and remote
+intrusion, exploitation, and malicious activity. Focused on Fedora
+Linux but detailing concepts and techniques valid for all Linux
+systems, The Fedora Security Guide details the planning and the
+tools involved in creating a secured computing environment for the
+data center, workplace, and home. With proper administrative
+knowledge, vigilance, and tools, systems running Linux can be both
+fully functional and secured from most common intrusion and exploit
+methods.
+
%prep
%setup -q
%build
-%{__make} html-desktop-en-US
+publican build --formats="html-desktop" --langs=en-US
%install
rm -rf $RPM_BUILD_ROOT
@@ -50,7 +59,7 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/appl
cat > %{name}.desktop <<'EOF'
[Desktop Entry]
-Name=fedora security-guide
+Name=Fedora 13: security-guide
Comment=A Guide to Securing Fedora Linux
Exec=%{viewer} %{_docdir}/%{name}-%{version}/index.html
Icon=%{_docdir}/%{name}-%{version}/images/icon.svg
@@ -60,7 +69,11 @@ Encoding=UTF-8
Terminal=false
EOF
-desktop-file-install --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{name}.desktop
+%if %{HTMLVIEW}
+desktop-file-install %{?vendoropt} --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{name}.desktop
+%else
+desktop-file-install --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{name}.desktop
+%endif
%clean
rm -rf $RPM_BUILD_ROOT
@@ -68,51 +81,70 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%doc tmp/en-US/html-desktop/*
+%if %{HTMLVIEW}
+%{_datadir}/applications/%{?vendor}%{name}.desktop
+%else
%{_datadir}/applications/%{name}.desktop
+%endif
%changelog
-* Mon Oct 26 2009 Eric Christensen sparks at fedoraproject.org 1.0-19
-- Updated license to CC-BY-SA.
-
+* Tue Apr 6 2010 Eric Christensen <sparks at fedoraproject.org> 13.0-3
+- Removed the PackageKit vulnerability text seen in Fedora 12.
-* Wed Aug 05 2009 Eric Christensen sparks at fedoraproject.org 1.0-18
-- Fixed issues related to Bug 515043.
+* Fri Nov 20 2009 Eric Christensen <sparks at fedoraproject.org> 13.0-2
+- Added the Revision History to the end of the document.
+- Added the Encryption Standards appendix.
+* Fri Nov 20 2009 Eric Christensen <sparks at fedoraproject.org> 13.0-1
+- Fedora 13 branch.
-* Mon Jul 27 2009 Eric Christensen sparks at fedoraproject.org 1.0-17
-- Repaired vendor information in SPEC.
+* Thu Nov 19 2009 Eric Christensen <sparks at fedoraproject.org> 1.0-23
+- Updated the section "Local users may install trusted packages" to the latest fix, again.
+* Thu Nov 19 2009 Eric Christensen <sparks at fedoraproject.org> 1.0-22
+- Updated the section "Local users may install trusted packages" to the latest fix.
-* 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
+* Wed Nov 18 2009 Eric Christensen <sparks at fedoraproject.org> 1.0-21
+- Added section "Local users may install trusted packages".
+* Sat Nov 14 2009 Eric Christensen <sparks at fedoraproject.org> 1.0-20
+- Added information from Wikipedia to the Encryption Standards appendix.
+- Added Adam Ligas to the author page for his role in developing the 7-Zip portions.
-* Tue Jul 14 2009 Eric Christensen sparks at fedoraproject.org 1.0-15
-- Added "desktop-file-utils" to BUILDREQUIRES on the spec
+* Mon Oct 26 2009 Eric Christensen <sparks at fedoraproject.org> 1.0-19
+- Updated license to CC-BY-SA.
+* Wed Aug 5 2009 Eric Chrisetnsen <sparks at fedoraproject.org> 1.0-18
+- Fixed issues related to Bug 515043.
-* 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
+* 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
-* Mon Mar 2 2009 Scott Radvan sradvan at redhat.com 1.0-13
-- Lots of minor fixes
+* 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
-* Wed Feb 11 2009 Scott Radvan sradvan at redhat.com 1.0-12
-- new screenshots from F11 replacing existing/older ones
+* Mon Mar 2 2009 Scott Radvan <sradvan at redhat.com> 1.0-13
+- Lots of minor fixes
+* Wed Feb 11 2009 Scott Radvan <sradvan at redhat.com> 1.0-12
+- new screenshots from F11 replacing existing/older ones
-* Tue Feb 03 2009 Scott Radvan sradvan at redhat.com 1.0-11
-- LUKS specifics to Fedora 9 modified to include later releases as well.
-- Fix 404s in reference section, mainly bad NSA links.
-- minor formatting changes.
+* Tue Feb 3 2009 Scott Radvan <sradvan at redhat.com> 1.0-11
+- LUKS specifics to Fedora 9 modified to include later releases as well.
+- Fix 404s in reference section, mainly bad NSA links.
+- minor formatting changes.
+* Tue Jan 27 2009 Eric Christensen <sparks at fedoraproject.org> 1.0-10
+- Fixed missing firewall setup screenshot.
-* Wed Jan 27 2009 Eric Christensen sparks at fedoraproject.org 1.0-10
-- Fixed missing firewall setup screenshot.
+* Tue Jan 27 2009 Eric Christensen <sparks at fedoraproject.org> 1.0-9
+- Repaired items found to be incorrect during validation. Many Red Hat references have been changed to Fedora references.
-* Wed Jan 27 2009 Eric Christensen sparks at fedoraproject.org 1.0-9
-- Repaired items found to be incorrect during validation. Many Red Hat references have been changed to Fedora references.
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-security-guide-en-US/F-13/import.log,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- import.log 26 Oct 2009 23:02:57 -0000 1.7
+++ import.log 6 Apr 2010 23:43:07 -0000 1.8
@@ -5,3 +5,4 @@ fedora-security-guide-en-US-1_0-16_fc11:
fedora-security-guide-en-US-1_0-17_fc11:HEAD:fedora-security-guide-en-US-1.0-17.fc11.src.rpm:1248747911
fedora-security-guide-en-US-1_0-18_fc11:HEAD:fedora-security-guide-en-US-1.0-18.fc11.src.rpm:1249506430
fedora-security-guide-en-US-1_0-19_fc11:HEAD:fedora-security-guide-en-US-1.0-19.fc11.src.rpm:1256598159
+fedora-security-guide-en-US-13_0-3_fc13:F-13:fedora-security-guide-en-US-13.0-3.fc13.src.rpm:1270597353
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-security-guide-en-US/F-13/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources 26 Oct 2009 23:02:57 -0000 1.8
+++ sources 6 Apr 2010 23:43:07 -0000 1.9
@@ -1 +1 @@
-231ccb3a7532dddf4f79f5397d22db6a fedora-security-guide-en-US-1.0.tgz
+e46d7f741e720645d568061816f6cb02 fedora-security-guide-en-US-13.0-3.tgz
More information about the scm-commits
mailing list