On 10/22/13 9:30 AM, Jan Lieskovsky wrote:
Based
on:https://lists.fedorahosted.org/pipermail/scap-security-guide/2013-October/004355.html
add the .gitignore file for the Fedora/output directory (not to need
explicitly to create $(OUT) in the Makefile). Thanks, Shawn!
Besides that merge previous changelog entries into 0.1-3 release,
so I could push the content into Fedora {18, 19, 20} Git repositories
already.
Changes:
* Fedora/Makefile - remove the explicit creation of $(OUT) directory,
* introduce Fedora/output/.gitignore,
* Fedora/scap-security-guide.spec - merge previous changelog entries
under 0.1-3 release
Testing:
* Passed basic sanity && regression testing. Proposal pushed to master
branch (to be able to push it into corresponding Fedora Git SCM
branches).
Thank you && Regards, Jan.
--
Jan iankko Lieskovsky / Red Hat Security Technologies Team
0001-Fedora-Add-.gitignore-for-Fedora-output-directory.-M.patch
From c27ca9cca723eb7e305ce458771436cb8d0d9a8f Mon Sep 17 00:00:00 2001
From: Jan Lieskovsky<[email protected]>
Date: Tue, 22 Oct 2013 15:21:49 +0200
Subject: [PATCH] [Fedora] Add .gitignore for Fedora output directory. Make
0.1-3 release
Signed-off-by: Jan Lieskovsky<[email protected]>
---
Fedora/Makefile | 1 -
Fedora/output/.gitignore | 5 +++++
Fedora/scap-security-guide.spec | 11 +++--------
3 files changed, 8 insertions(+), 9 deletions(-)
create mode 100644 Fedora/output/.gitignore
diff --git a/Fedora/Makefile b/Fedora/Makefile
index 48e5db8..1bdb6fe 100644
--- a/Fedora/Makefile
+++ b/Fedora/Makefile
@@ -13,7 +13,6 @@ FEDORA_GUIDE_XML = fedora_guide.xml
all: shorthand2xccdf guide content dist
set-fedora-release:
- mkdir -p $(OUT)
# obtain full Fedora release name and CPE from the system
$(TRANS)/genguidexslt.py $(OUT)/$(FEDORA_GUIDE_XSLT)
# update Fedora/input/guide.xml based on retrieved values
diff --git a/Fedora/output/.gitignore b/Fedora/output/.gitignore
new file mode 100644
index 0000000..8fe51b5
--- /dev/null
+++ b/Fedora/output/.gitignore
@@ -0,0 +1,5 @@
+# files not to track in git
+*.ini
+*.html
+*.xml
+*.xslt
diff --git a/Fedora/scap-security-guide.spec b/Fedora/scap-security-guide.spec
index 071c47f..dc21c7d 100644
--- a/Fedora/scap-security-guide.spec
+++ b/Fedora/scap-security-guide.spec
@@ -5,7 +5,7 @@
# file one level up - in the main scap-security-guide directory (instead of
# this one).
-%global fedorassgrelease 3.rc4
+%global fedorassgrelease 3
Name: scap-security-guide
Version: 0.1
@@ -53,14 +53,11 @@ cp -a Fedora/input/auxiliary/scap-security-guide.8
%{buildroot}%{_mandir}/en/man
%doc Fedora/LICENSE Fedora/output/ssg-fedora-guide.html
%changelog
-* Mon Oct 21 2013 Jan iankko Lieskovsky<[email protected]> 0.1-3.rc4
+* Tue Oct 22 2013 Jan iankko Lieskovsky<[email protected]> 0.1-3
+- Add .gitignore for Fedora output directory
- Set up Fedora release name and CPE based on build system properties
-
-* Thu Oct 17 2013 Jan iankko Lieskovsky<[email protected]> 0.1-3.rc3
- Use correct file paths in scap-security-guide(8) manual page
(RH BZ#1018905, c#10)
-
-* Wed Oct 16 2013 Jan iankko Lieskovsky<[email protected]> 0.1-3.rc2
- Apply further changes motivated by scap-security-guide Fedora RPM review
request (RH BZ#1018905, c#8):
* update package description,
@@ -69,8 +66,6 @@ cp -a Fedora/input/auxiliary/scap-security-guide.8
%{buildroot}%{_mandir}/en/man
* move HTML form of the guide under the doc directory (together
with that drop fedora/content subdir and place the content
directly under fedora/ subdir).
-
-* Tue Oct 15 2013 Jan iankko Lieskovsky<[email protected]> 0.1-3.rc1
- Fixes for scap-security-guide Fedora RPM review request (RH BZ#1018905):
* drop Fedora release from package provided files' final path (c#5),
* drop BuildRoot, selected Requires:, clean section, drop chcon for
-- 1.8.3.1
ack
_______________________________________________
scap-security-guide mailing list
[email protected]
https://lists.fedorahosted.org/mailman/listinfo/scap-security-guide
