add info about srpm in koji

remove srpm
update srpm from koji
2013-09-23 16:19:30 -06:00 · 2013-09-23 16:14:25 -06:00 · 2013-09-22 19:03:16 -06:00 · 2013-09-22 18:25:27 -06:00 · 2013-09-22 18:12:16 -06:00 · 2013-09-22 17:46:32 -06:00
8 changed files with 83 additions and 57 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1 @@
-/asciidoctor-0.1.3.gem
+/asciidoctor-0.1.4.gem
--- a/README.adoc
+++ b/README.adoc
@ -1,9 +1,10 @@
 = rubygem-asciidoctor: Asciidoctor RPM package spec
 Dan Allen
 :idprefix:
+:idseparator: -
 :gem_title: Asciidoctor
 :gem_name: asciidoctor
-:gem_version: 0.1.3
+:gem_version: 0.1.4
 :gem_gem: {gem_name}-{gem_version}.gem
 :gem_url: https://github.com/asciidoctor/asciidoctor
 :rpm_name: rubygem-{gem_name}
@ -11,9 +12,9 @@ Dan Allen
 :rpm_repo: git://github.com/asciidoctor/rubygem-asciidoctor-rpm.git

 This repository is the official host of the build materials to create the Fedora RPM package for the https://github.com/asciidoctor/asciidoctor[Asciidoctor] RubyGem.
-The package is named +rubygem-asciidoctor+.
+The RPM package is named +rubygem-asciidoctor+.

-While this RPM spec was developed specifically for Fedora 17 and above, it may be useful for other RPM-based systems.
+While this RPM spec was developed specifically for Fedora 18 and above, it may be useful for other RPM-based systems.

 == Build the Asciidoctor RPM

@ -51,7 +52,7 @@ You'll also need to create all the required folders:

 Next, grab the Asciidoctor gem (the sources) and put it into the +$HOME/rpmbuild/SOURCES+ directory:

- wget -O $HOME/rpmbuild/SOURCES/asciidoctor-0.1.3.gem http://rubygems.org/gems/asciidoctor-0.1.3.gem
+ wget -O $HOME/rpmbuild/SOURCES/asciidoctor-0.1.4.gem http://rubygems.org/gems/asciidoctor-0.1.4.gem

 Finally, copy the +.patch+ files from this repository to the same directory:

@ -67,12 +68,19 @@ With everything in place, building the RPM is easy!

 If all goes well, both the binary and source RPMs will emerge in the +$HOME/rpmbuild/RPMS/noarch+ and +$HOME/rpmbuild/SRPMS+ directories, respectively.

+Alternatively, you can build directly from the SRPM.
+
+ wget -P srpms http://kojipkgs.fedoraproject.org/packages/rubygem-asciidoctor/0.1.4/1.fc19/src/rubygem-asciidoctor-0.1.4-1.fc19.src.rpm
+ rpmbuild --rebuild srpms/rubygem-asciidoctor-0.1.4-1.fc19.src.rpm
+
+The SPRMs are stored with the builds in the http://koji.fedoraproject.org/koji/packageinfo?packageID=15660[koji build system].
+
 === Installing the RPM

 There's nothing special about installing this RPM.
 I recommend using +yum+ because it will install any dependencies that the package requires (though you should already have them if you built the RPM).

- yum localinstall $HOME/rpmbuild/RPMS/noarch/rubygem-asciidoctor-0.1.3.rpm
+ yum localinstall $HOME/rpmbuild/RPMS/noarch/rubygem-asciidoctor-0.1.4.rpm

 Now, it's time to start using Asciidoctor!

@ -98,7 +106,7 @@ First, let's test using Asciidoctor as a Ruby library.

  require 'asciidoctor'
  content = "= My First Document\n\nRender me some **HTML**!"
-  puts Asciidoctor.render(content, :header_footer => true, :compact => true)
+  puts Asciidoctor.render content, :header_footer => true

 . Save the file.
 . In a terminal, navigate to the directory where you saved +asciidoctor-test.rb+ and type the following command to execute the file with Ruby:
@ -109,30 +117,32 @@ You should see this output in your terminal.

 <!DOCTYPE html>
 <html lang="en">
-   <head>
-     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-     <meta name="generator" content="Asciidoctor 0.1.3">
-     <title>My First Document</title>
-   </head>
-   <body class="article">
-     <div id="header">
-       <h1>My First Document</h1>
-     </div>
-     <div id="content">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+ <meta name="generator" content="Asciidoctor 0.1.4">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+ <title>My First Document</title>
+ <link rel="stylesheet" href="./asciidoctor.css">
+ </head>
+ <body class="article">
+ <div id="header">
+ <h1>My First Document</h1>
+ </div>
+ <div id="content">
 <div id="preamble">
-   <div class="sectionbody">
+ <div class="sectionbody">
 <div class="paragraph">
-   <p>Render me some <strong>HTML</strong>!</p>
+ <p>Render me some <strong>HTML</strong>!</p>
 </div>
-   </div>
 </div>
-     </div>
-     <div id="footer">
-       <div id="footer-text">
-         Last updated 2013-03-12 10:43:15 MDT
-       </div>
-     </div>
-   </body>
+ </div>
+ </div>
+ <div id="footer">
+ <div id="footer-text">
+ Last updated 2013-09-22 17:35:41 MDT
+ </div>
+ </div>
+ </body>
 </html>

 . You can render the output as HTML using:
--- a/asciidoctor-disable-use-of-pending.patch
+++ b/asciidoctor-disable-use-of-pending.patch
@ -1,16 +0,0 @@
-# disables use of pending statement in the test suite The required gem,
-# pending, is not packaged in Fedora and since the statement is merely a task
-# note, it's safe to disable it's usage for the purpose of packaging.
-diff --git a/test/test_helper.rb b/test/test_helper.rb
-index 3b27218..964ff59 100644
--- a/test/test_helper.rb
-+++ b/test/test_helper.rb
-@@ -5,7 +5,7 @@ require 'test/unit'
- require "#{File.expand_path(File.dirname(__FILE__))}/../lib/asciidoctor.rb"
-
- require 'nokogiri'
-require 'pending'
-+#require 'pending'
- 
- ENV['SUPPRESS_DEBUG'] ||= 'true'
- 
--- a/asciidoctor-remove-include-uri-test.patch
+++ b/asciidoctor-remove-include-uri-test.patch
@ -0,0 +1,22 @@
+diff --git a/test/reader_test.rb b/test/reader_test.rb
+index abc708a..5750437 100644
+--- a/test/reader_test.rb
+++ b/test/reader_test.rb
+@@ -499,17 +499,6 @@ include::fixtures/no-such-file.ad[]
+         end
+       end
+   
+-      test 'include macro can retrieve data from uri' do
+-        input = <<-EOS
+-....
+-include::https://raw.github.com/asciidoctor/asciidoctor/master/LICENSE[]
+-....
+-        EOS
+-  
+-        output = render_embedded_string input, :safe => :safe, :attributes => {'allow-uri-read' => ''}
+-        assert_match(/MIT/, output)
+-      end
+-  
+       test 'inaccessible uri referenced by include macro does not crash processor' do
+         input = <<-EOS
+ ....
--- a/rubygem-asciidoctor.spec
+++ b/rubygem-asciidoctor.spec
@ -1,18 +1,17 @@
 %global gem_name asciidoctor
 %global mandir %{_mandir}/man1

-Summary: AsciiDoc implementation in Ruby
+Summary: A fast, open source AsciiDoc implementation in Ruby
 Name: rubygem-%{gem_name}
-Version: 0.1.3
+Version: 0.1.4
 Release: 1%{?dist}
 Group: Development/Languages
 License: MIT
 URL: http://github.com/asciidoctor/asciidoctor
 Source0: http://rubygems.org/gems/%{gem_name}-%{version}.gem
-# Patch0: disables use of pending statement in the test suite The required gem,
-# pending, is not packaged in Fedora and since the statement is merely a task
-# note, it's safe to disable it's usage for the purpose of packaging.
-Patch0: asciidoctor-disable-use-of-pending.patch
+# Patch0: disable the test for including content from a URI
+# since it does not work when the network is unavailable
+Patch0: asciidoctor-remove-include-uri-test.patch 
 %if 0%{?rhel} > 6 || 0%{?fedora} > 18
 Requires: ruby(release)
 BuildRequires: ruby(release)
@ -27,14 +26,18 @@ BuildRequires: rubygem(coderay)
 BuildRequires: rubygem(erubis)
 BuildRequires: rubygem(minitest)
 BuildRequires: rubygem(nokogiri)
+BuildRequires: rubygem(tilt)
+BuildRequires: rubygem(haml)
+BuildRequires: rubygem(slim)
 BuildArch: noarch
 Provides: rubygem(%{gem_name}) = %{version}

 %description
-An open source text processor and publishing toolchain written in Ruby for
-converting AsciiDoc markup into HTML 5, DocBook 4.5 and custom formats. Export
-to custom formats is performed by running the nodes of the parsed tree through
-a collection of Tilt-supported templates.
+A fast, open source text processor and publishing toolchain, written in Ruby,
+for transforming AsciiDoc markup into HTML 5, DocBook 4.5, DocBook 5.0 and
+custom output formats. The transformation from AsciiDoc to custom output
+formats is performed by running the nodes in the parsed document tree through a
+collection of templates written in a template language supported by Tilt.

 %package doc
 Summary: Documentation for %{name}
@ -85,6 +88,7 @@ cp -pa .%{gem_instdir}/compat/* \
 %exclude %{gem_instdir}/compat
 %exclude %{gem_instdir}/man
 %exclude %{gem_instdir}/test
+%{gem_instdir}/CHANGELOG.adoc
 %{gem_instdir}/LICENSE
 %{gem_instdir}/README.*
 %{_bindir}/*
@ -98,6 +102,8 @@ cp -pa .%{gem_instdir}/compat/* \
 %doc %{gem_docdir}

 %changelog
+* Sun Sep 22 2013 Dan Allen <dan.j.allen@gmail.com> - 0.1.4-1
+- Update to Asciidoctor 0.1.4
 * Sat Jun 08 2013 Dan Allen <dan.j.allen@gmail.com> - 0.1.3-1
 - Update to Asciidoctor 0.1.3
 * Fri Mar 01 2013 Dan Allen <dan.j.allen@gmail.com> - 0.1.1-1
--- a/2
+++ b/2
@ -1 +1 @@
-e5a9d0015ea477589d5da1765df0d834  asciidoctor-0.1.1.gem
+1ec84e6ad442791f1ef9300026927ba1  asciidoctor-0.1.4.gem
--- a/srpms/rubygem-asciidoctor-0.1.1-1.fc18.src.rpm
+++ b/srpms/rubygem-asciidoctor-0.1.1-1.fc18.src.rpm
--- a/10
+++ b/10
@ -6,10 +6,14 @@ require 'asciidoctor'

 source = <<EOS
 = Asciidoctor
-Author Name
+Author Name <author@example.com>

 http://asciidoctor.org[Asciidoctor] is an _open source_ implementation of
-http://asciidoc.org[AsciiDoc] in [red]*Ruby*.
+http://asciidoc.org[AsciiDoc] in [.red]*Ruby*.
+
+== Sample section
+
+Sample section content
 EOS

-puts Asciidoctor.render(source, :backend => :html5, :header_footer => true, :compact => true, :safe => :safe, :attributes => 'linkcss!')
+puts Asciidoctor.render(source, :backend => :html5, :header_footer => true, :safe => :safe, :attributes => 'idprefix= idseparator=-')
Author	SHA1	Message	Date
Dan Allen	54b6e70524	add info about srpm in koji	2013-09-23 16:19:30 -06:00
Dan Allen	32449a1507	remove srpm	2013-09-23 16:14:25 -06:00
Dan Allen	b6d297e8cc	update srpm from koji	2013-09-22 19:03:16 -06:00
Dan Allen	18f11b9e0c	remove test for including content from a URI	2013-09-22 18:25:27 -06:00
Dan Allen	42c3a702ac	change include uri test to use non-https URI	2013-09-22 18:12:16 -06:00
Dan Allen	562b474f2e	resolves #4 upgrade package to Asciidoctor 0.1.4	2013-09-22 17:46:32 -06:00
Dan Allen	1e293e1787	remove old gem	2013-06-08 23:21:29 -06:00
Dan Allen	41e84c105c	update srpm to 0.1.3	2013-06-09 00:21:44 +02:00
Dan Allen	26ed0e4e9a	add Asciidoctor 0.1.3 gem signature	2013-06-08 16:11:53 -06:00
Dan Allen	365b5fdfd2	Merge branch 'master' into f18	2013-06-08 16:09:10 -06:00
Dan Allen	946e4df0e6	Merge branch 'master' into f18	2013-06-08 16:04:33 -06:00
Dan Allen	df9ea0badc	Merge branch 'master' into f18	2013-03-11 14:38:13 -06:00
Dan Allen	a45856d227	Merge branch 'f18' from fedpkg	2013-03-11 13:53:03 -06:00