[pegdown] update to 1.4.1
by gil
commit 50805e9ee55ce3a8d9d7566a2555bebd69e67732
Author: gil <puntogil(a)libero.it>
Date: Tue Nov 26 18:24:32 2013 +0100
update to 1.4.1
pegdown.spec | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/pegdown.spec b/pegdown.spec
index ec2a77f..4bd32bc 100644
--- a/pegdown.spec
+++ b/pegdown.spec
@@ -55,7 +55,7 @@ rm -r src/test/scala/*
%changelog
* Tue Nov 26 2013 gil cattaneo <puntogil(a)libero.it> 1.4.1-1
-- update to 1.4.1
+- update to 1.4.1 rhbz#1034825
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.1.0-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
10 years, 5 months
[pegdown] update to 1.4.1
by gil
commit 30dd53f588fb177b8aa6d9f9b8a4177dceb47051
Author: gil <puntogil(a)libero.it>
Date: Tue Nov 26 18:21:00 2013 +0100
update to 1.4.1
pegdown.spec | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/pegdown.spec b/pegdown.spec
index 2ecded6..ec2a77f 100644
--- a/pegdown.spec
+++ b/pegdown.spec
@@ -13,7 +13,7 @@ BuildRequires: mvn(org.parboiled:parboiled-java)
# test deps
BuildRequires: mvn(net.sf.jtidy:jtidy)
%if 0
-BuildRequires: mvn(mvn(org.specs2:specs2_2.9.3)
+BuildRequires: mvn(org.specs2:specs2_2.9.3)
%endif
BuildRequires: maven-local
10 years, 5 months
[pegdown] update to 1.4.1
by gil
commit 29f6dcf86d4077849dd14b15518b25ecf1dbe533
Author: gil <puntogil(a)libero.it>
Date: Tue Nov 26 18:10:54 2013 +0100
update to 1.4.1
.gitignore | 1 +
pegdown-1.4.1.pom | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
pegdown.spec | 28 ++++++++++++++++------------
sources | 2 +-
4 files changed, 70 insertions(+), 13 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7ec4f79..8634347 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/pegdown-1.1.0-src-git.tar.xz
/1.1.0.tar.gz
+/1.4.1.tar.gz
diff --git a/pegdown-1.4.1.pom b/pegdown-1.4.1.pom
new file mode 100644
index 0000000..b83aeb6
--- /dev/null
+++ b/pegdown-1.4.1.pom
@@ -0,0 +1,52 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.pegdown</groupId>
+ <artifactId>pegdown</artifactId>
+ <packaging>jar</packaging>
+ <description>A Java 1.5+ library providing a clean and lightweight markdown processor</description>
+ <url>http://pegdown.org</url>
+ <version>1.4.1</version>
+ <licenses>
+ <license>
+ <name>Apache 2</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ <name>pegdown</name>
+ <inceptionYear>2009</inceptionYear>
+ <organization>
+ <name>org.pegdown</name>
+ <url>http://pegdown.org</url>
+ </organization>
+ <scm>
+ <url>git@github.com:sirthias/pegdown.git</url>
+ <connection>scm:git:git@github.com:sirthias/pegdown.git</connection>
+ </scm>
+ <developers>
+ <developer>
+ <id>sirthias</id>
+ <name>Mathias Doenitz</name>
+ </developer>
+ </developers>
+ <dependencies>
+ <dependency>
+ <groupId>org.parboiled</groupId>
+ <artifactId>parboiled-java</artifactId>
+ <version>1.1.5</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.jtidy</groupId>
+ <artifactId>jtidy</artifactId>
+ <version>r938</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.specs2</groupId>
+ <artifactId>specs2_2.9.3</artifactId>
+ <version>1.12.4.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
diff --git a/pegdown.spec b/pegdown.spec
index 6a25031..2ecded6 100644
--- a/pegdown.spec
+++ b/pegdown.spec
@@ -1,20 +1,21 @@
Name: pegdown
-Version: 1.1.0
-Release: 6%{?dist}
+Version: 1.4.1
+Release: 1%{?dist}
Summary: Java library for Markdown processing
License: ASL 2.0
URL: http://pegdown.org
Source0: https://github.com/sirthias/pegdown/archive/%{version}.tar.gz
+# Newer release use sbt builder
+Source1: http://repo1.maven.org/maven2/org/pegdown/pegdown/%{version}/pegdown-%{ve...
BuildRequires: java-devel
-
-BuildRequires: parboiled
+BuildRequires: mvn(org.parboiled:parboiled-java)
# test deps
-BuildRequires: jtidy
-BuildRequires: testng
-
+BuildRequires: mvn(net.sf.jtidy:jtidy)
+%if 0
+BuildRequires: mvn(mvn(org.specs2:specs2_2.9.3)
+%endif
BuildRequires: maven-local
-BuildRequires: maven-surefire-provider-testng
BuildArch: noarch
@@ -33,10 +34,10 @@ This package contains javadoc for %{name}.
find . -name "*.class" -delete
find . -name "*.jar" -delete
-# these test fail
-rm src/test/java/org/pegdown/CustomParserTest.java
-rm src/test/java/org/pegdown/Markdown103Test.java
-rm src/test/java/org/pegdown/PegDownTest.java
+cp -p %{SOURCE1} pom.xml
+
+rm -r src/test/scala/*
+%pom_remove_dep org.specs2:specs2_2.9.3
%build
@@ -53,6 +54,9 @@ rm src/test/java/org/pegdown/PegDownTest.java
%doc LICENSE NOTICE
%changelog
+* Tue Nov 26 2013 gil cattaneo <puntogil(a)libero.it> 1.4.1-1
+- update to 1.4.1
+
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.1.0-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
diff --git a/sources b/sources
index 33e6818..8579adf 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a0b49f850f4ca055554f0331c88fd5cb 1.1.0.tar.gz
+a1f155cc52224e90627c9764b16d4165 1.4.1.tar.gz
10 years, 5 months
[parboiled] update to 1.1.6
by gil
commit 6fe087b97de72ca741bc8126c41473baa0b798c9
Author: gil <puntogil(a)libero.it>
Date: Tue Nov 26 17:49:28 2013 +0100
update to 1.1.6
.gitignore | 1 +
parboiled-core-1.0.2.pom | 35 ----------
parboiled-core-1.1.6.pom | 47 ++++++++++++++
parboiled-java-1.0.2.pom | 67 -------------------
parboiled-java-1.1.6.pom | 72 +++++++++++++++++++++
parboiled-1.0.2-pom.xml => parboiled-pom.xml | 2 +-
parboiled.spec | 89 +++++++++++++++++++++-----
sources | 2 +-
8 files changed, 194 insertions(+), 121 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d9ccb36..1b7010f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/parboiled-1.0.2-src-git.tar.xz
/1.0.2.tar.gz
+/1.1.6.tar.gz
diff --git a/parboiled-core-1.1.6.pom b/parboiled-core-1.1.6.pom
new file mode 100644
index 0000000..249f790
--- /dev/null
+++ b/parboiled-core-1.1.6.pom
@@ -0,0 +1,47 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.parboiled</groupId>
+ <artifactId>parboiled-core</artifactId>
+ <packaging>bundle</packaging>
+ <description>Elegant parsing in Java and Scala - lightweight, easy-to-use, powerful</description>
+ <url>http://parboiled.org</url>
+ <version>1.1.6</version>
+ <licenses>
+ <license>
+ <name>Apache 2</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ <name>parboiled-core</name>
+ <inceptionYear>2009</inceptionYear>
+ <organization>
+ <name>org.parboiled</name>
+ <url>http://parboiled.org</url>
+ </organization>
+ <scm>
+ <url>git@github.com:sirthias/parboiled.git</url>
+ <connection>scm:git:git@github.com:sirthias/parboiled.git</connection>
+ </scm>
+ <developers>
+ <developer>
+ <id>sirthias</id>
+ <name>Mathias Doenitz</name>
+ </developer>
+ </developers>
+ <dependencies>
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <version>5.14.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.scalatest</groupId>
+ <artifactId>scalatest_2.9.3</artifactId>
+ <version>1.9.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
diff --git a/parboiled-java-1.1.6.pom b/parboiled-java-1.1.6.pom
new file mode 100644
index 0000000..83f89da
--- /dev/null
+++ b/parboiled-java-1.1.6.pom
@@ -0,0 +1,72 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.parboiled</groupId>
+ <artifactId>parboiled-java</artifactId>
+ <packaging>bundle</packaging>
+ <description>Elegant parsing in Java and Scala - lightweight, easy-to-use, powerful</description>
+ <url>http://parboiled.org</url>
+ <version>1.1.6</version>
+ <licenses>
+ <license>
+ <name>Apache 2</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ <name>parboiled-java</name>
+ <inceptionYear>2009</inceptionYear>
+ <organization>
+ <name>org.parboiled</name>
+ <url>http://parboiled.org</url>
+ </organization>
+ <scm>
+ <url>git@github.com:sirthias/parboiled.git</url>
+ <connection>scm:git:git@github.com:sirthias/parboiled.git</connection>
+ </scm>
+ <developers>
+ <developer>
+ <id>sirthias</id>
+ <name>Mathias Doenitz</name>
+ </developer>
+ </developers>
+ <dependencies>
+ <dependency>
+ <groupId>org.parboiled</groupId>
+ <artifactId>parboiled-core</artifactId>
+ <version>1.1.6</version>
+ </dependency>
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <version>5.14.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.scalatest</groupId>
+ <artifactId>scalatest_2.9.3</artifactId>
+ <version>1.9.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm</artifactId>
+ <version>4.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-tree</artifactId>
+ <version>4.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-analysis</artifactId>
+ <version>4.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-util</artifactId>
+ <version>4.1</version>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
diff --git a/parboiled-1.0.2-pom.xml b/parboiled-pom.xml
similarity index 97%
rename from parboiled-1.0.2-pom.xml
rename to parboiled-pom.xml
index 39e896e..4ea8a69 100644
--- a/parboiled-1.0.2-pom.xml
+++ b/parboiled-pom.xml
@@ -11,7 +11,7 @@
<groupId>org.parboiled</groupId>
<artifactId>parboiled-project</artifactId>
<packaging>pom</packaging>
- <version>1.0.2</version>
+ <version>@VERSION@</version>
<modules>
<!-- These are not all the modules, only those that we can currently build: -->
diff --git a/parboiled.spec b/parboiled.spec
index 48d8730..6cafd33 100644
--- a/parboiled.spec
+++ b/parboiled.spec
@@ -1,38 +1,31 @@
Name: parboiled
-Version: 1.0.2
-Release: 6%{?dist}
+Version: 1.1.6
+Release: 1%{?dist}
Summary: Java/Scala library providing parsing of input text based on PEGs
License: ASL 2.0
URL: http://parboiled.org/
Source0: https://github.com/sirthias/parboiled/archive/%{version}.tar.gz
# for build see https://github.com/sirthias/parboiled/wiki/Building-parboiled
-Source1: http://repo1.maven.org/maven2/org/%{name}/%{name}-core/%{version}/%{name}...
-Source2: http://repo1.maven.org/maven2/org/%{name}/%{name}-java/%{version}/%{name}...
+Source1: http://repo1.maven.org/maven2/org/parboiled/%{name}-core/%{version}/%{nam...
+Source2: http://repo1.maven.org/maven2/org/parboiled/%{name}-java/%{version}/%{nam...
# customized aggregator pom
-Source3: %{name}-%{version}-pom.xml
+Source3: %{name}-pom.xml
BuildRequires: java-devel
-BuildRequires: mvn(asm:asm)
-BuildRequires: mvn(asm:asm-analysis)
-BuildRequires: mvn(asm:asm-tree)
-BuildRequires: mvn(asm:asm-util)
+BuildRequires: mvn(org.ow2.asm:asm)
+BuildRequires: mvn(org.ow2.asm:asm-analysis)
+BuildRequires: mvn(org.ow2.asm:asm-tree)
+BuildRequires: mvn(org.ow2.asm:asm-util)
%if 0
-# TODO
BuildRequires: mvn(org.scala-lang:scala-library)
# test deps
-BuildRequires: mvn(org.scalatest:scalatest_2.10)
+BuildRequires: mvn(org.scalatest:scalatest_2.9.3)
BuildRequires: mvn(org.testng:testng)
-
-# use https://github.com/davidB/scala-maven-plugin
-BuildRequires: scala-maven-plugin
-BuildRequires: maven-surefire-provider-testng
%endif
BuildRequires: maven-local
-
-
BuildArch: noarch
%description
@@ -57,8 +50,67 @@ find . -name "*.jar" -delete
cp -p %{SOURCE1} %{name}-core/pom.xml
cp -p %{SOURCE2} %{name}-java/pom.xml
+
+for m in core java; do
+%pom_xpath_inject "pom:project" "
+<build>
+ <plugins>
+
+ </plugins>
+</build>" %{name}-${m}
+
+%pom_add_plugin org.apache.maven.plugins:maven-jar-plugin %{name}-${m} "
+<configuration>
+ <archive>
+ <manifestFile>\${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+ </archive>
+</configuration>"
+done
+
+%pom_add_plugin org.apache.felix:maven-bundle-plugin %{name}-core "
+<extensions>true</extensions>
+<configuration>
+ <instructions>
+ <Bundle-SymbolicName>org.parboiled.core</Bundle-SymbolicName>
+ <Bundle-Name>org.parboiled.core</Bundle-Name>
+ <Bundle-Version>\${project.version}</Bundle-Version>
+ <Private-Package>org.parboiled.core.*</Private-Package>
+ </instructions>
+</configuration>
+<executions>
+ <execution>
+ <id>bundle-manifest</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>manifest</goal>
+ </goals>
+ </execution>
+</executions>"
+
+%pom_add_plugin org.apache.felix:maven-bundle-plugin %{name}-java "
+<extensions>true</extensions>
+<configuration>
+ <instructions>
+ <Bundle-SymbolicName>org.parboiled.java</Bundle-SymbolicName>
+ <Bundle-Name>org.parboiled.java</Bundle-Name>
+ <Bundle-Version>\${project.version}</Bundle-Version>
+ <Fragment-Host>org.parboiled.core</Fragment-Host>
+ <Private-Package>org.parboiled.java.*</Private-Package>
+ </instructions>
+</configuration>
+<executions>
+ <execution>
+ <id>bundle-manifest</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>manifest</goal>
+ </goals>
+ </execution>
+</executions>"
+
#cp -p %%{SOURCE?} %%{name}-scala/pom.xml
cp -p %{SOURCE3} pom.xml
+sed -i "s|@VERSION@|%{version}|" pom.xml
%mvn_file :%{name}-core %{name}/core
%mvn_file :%{name}-java %{name}/java
@@ -79,6 +131,9 @@ cp -p %{SOURCE3} pom.xml
%doc LICENSE
%changelog
+* Tue Nov 26 2013 gil cattaneo <puntogil(a)libero.it> 1.1.6-1
+- update to 1.1.6 rhbz#1034875
+
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.0.2-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
diff --git a/sources b/sources
index b1b4071..1e9b667 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f6f250aa70e4a891eb96f549eb08db6d 1.0.2.tar.gz
+70585bd417ea7ffaf39c9902554f4743 1.1.6.tar.gz
10 years, 5 months
[javapackages] [doc] Add short javadoc section
by Michal Srb
commit 674b69bf48d62616259f86adff8b4d5a8225ea46
Author: Michal Srb <msrb(a)redhat.com>
Date: Tue Nov 26 15:36:57 2013 +0100
[doc] Add short javadoc section
doc/fedora_java_specifics.txt | 1 +
doc/javadoc_packages.txt | 24 +++++++++++++++++++++---
2 files changed, 22 insertions(+), 3 deletions(-)
---
diff --git a/doc/fedora_java_specifics.txt b/doc/fedora_java_specifics.txt
index d4eba69..89a5e5a 100644
--- a/doc/fedora_java_specifics.txt
+++ b/doc/fedora_java_specifics.txt
@@ -2,6 +2,7 @@ This section contains information about default Java implementation in
Fedora, switching between different Java runtime environments and about
few useful tools which can be used during packaging/development.
+[[openjdk]]
=== Java implementation in Fedora
Fedora ships with reference implementation of Java Standard Edition 7
called http://openjdk.java.net/OpenJDK[OpenJDK]. OpenJDK provides Java
diff --git a/doc/javadoc_packages.txt b/doc/javadoc_packages.txt
index 47c229e..8b57027 100644
--- a/doc/javadoc_packages.txt
+++ b/doc/javadoc_packages.txt
@@ -1,4 +1,22 @@
-TODO
+Javadoc subpackages in Fedora provide automatically generated API
+documentation for Java libraries and applications. <<openjdk,Java
+Development Kit>> comes with tool called `javadoc`. This tool can be
+used for generating the documentation from specially formated comments
+in Java source files. Output of this tool, together with license files,
+usually represents only content of javadoc subpackages. Note `javadoc`
+invocation is typically handled by build system and package maintainer
+doesn't need to deal with it directly.
-Describe javadocs, purpose of javadoc RPM packages. Mention reasons for not
-having "Requires: {name}" in javadocs.
+Javadoc subpackage shouldn't depend on its base package and vice versa.
+The rationale behind this rule is that documentation can usually be used
+independently from application/library and therefore base package
+doesn't need to be always installed. Users are given an option to
+install application and documentation separately.
+
+
+[TIP]
+======
+You can learn more about `javadoc` from
+http://www.oracle.com/technetwork/java/javase/documentation/index-137868.html[official
+documentation].
+======
10 years, 5 months