[yydebug] Mavenize yydebug (#1019877)

Stanislav Ochotnicky sochotni at fedoraproject.org
Wed Oct 16 14:42:32 UTC 2013


commit bf38ce65a0beffd234adc421a6e9d6f7d7571131
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date:   Wed Oct 16 16:39:34 2013 +0200

    Mavenize yydebug (#1019877)
    
    - Cleanup unneeded parts, update to latest guidelines

 add-javadocs-to-makefile.patch |   18 --------------
 clean-up-broken-makefile.patch |   36 ----------------------------
 jay-yydebug-1.0.pom            |   40 ++++++++++++++++++++++++++++++++
 yydebug.spec                   |   50 +++++++++++++--------------------------
 4 files changed, 57 insertions(+), 87 deletions(-)
---
diff --git a/jay-yydebug-1.0.pom b/jay-yydebug-1.0.pom
new file mode 100644
index 0000000..78a94bd
--- /dev/null
+++ b/jay-yydebug-1.0.pom
@@ -0,0 +1,40 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>org.jruby</groupId>
+  <artifactId>jay-yydebug</artifactId>
+  <version>1.0</version>
+  <packaging>jar</packaging>
+
+  <name>jay-yydebug</name>
+  <url>https://github.com/jruby/jay</url>
+
+  <parent>
+    <groupId>org.sonatype.oss</groupId>
+    <artifactId>oss-parent</artifactId>
+    <version>7</version>
+  </parent>
+
+  <scm>
+    <connection>scm:git:https://github.com/jruby/jay-yydebug.git</connection>
+    <developerConnection>scm:git:git at github.com:jruby/jay-yydebug</developerConnection>
+    <url>https://github.com/jruby/jay-yydebug</url>
+  </scm>
+  
+  <build>
+    <sourceDirectory>${basedir}</sourceDirectory>
+  </build>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.1</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/yydebug.spec b/yydebug.spec
index 3275147..e32525d 100644
--- a/yydebug.spec
+++ b/yydebug.spec
@@ -1,21 +1,17 @@
 Name:     yydebug
 Version:  1.1.0
-Release:  10%{?dist}
+Release:  11%{?dist}
 Summary:  Supports tracing and animation for a Java-based parser generated by jay
-Group:    Development/Debuggers
 License:  BSD
 URL:      http://www.cs.rit.edu/~ats/projects/lp/doc/jay/yydebug/package-summary.html
 Source0:  http://www.cs.rit.edu/~ats/projects/lp/doc/jay/yydebug/doc-files/src.jar
+Source1:  http://repo1.maven.org/maven2/org/jruby/jay-yydebug/1.0/jay-yydebug-1.0.pom
 Patch0:   clean-up-broken-makefile.patch
 
 # https://bugzilla.redhat.com/show_bug.cgi?id=561452
 Patch1:   add-javadocs-to-makefile.patch
 
-BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-BuildRequires: java-devel
-BuildRequires:  jpackage-utils
-Requires: java
-Requires:  jpackage-utils
+BuildRequires: maven-local
 
 BuildArch:      noarch
 
@@ -29,49 +25,37 @@ provides an animation of the parsing process
 
 %package javadoc
 Summary:        Javadocs for %{name}
-Group:          Documentation
-Requires:       %{name} = %{version}-%{release}
-Requires:       jpackage-utils
 
 %description javadoc
 This package contains the API documentation for %{name}.
 
 %prep
-%setup -q -n jay/yydebug
-%patch0
-%patch1
+%setup -q -n jay-yydebug -c %{name}-%{version}
 
 find ./ -name '*.jar' -exec rm -f '{}' \; 
 find ./ -name '*.class' -exec rm -f '{}' \; 
 
-%build
-make %{?_smp_mflags}
-
-%install
-rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_javadir}
+cp %{SOURCE1} pom.xml
 
-cp yydebug.jar $RPM_BUILD_ROOT%{_javadir}/yydebug-%{version}.jar
-ln -s %{_javadir}/yydebug-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/yydebug.jar
+%mvn_file : %{name}
 
-mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -rp javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+%build
+%mvn_build
 
-%clean
-rm -rf $RPM_BUILD_ROOT
+%install
+%mvn_install
 
-%files
-%defattr(-,root,root,-)
-%{_javadir}/yydebug-%{version}.jar
-%{_javadir}/yydebug.jar
-%doc package.html
+%files -f .mfiles
+%doc jay/yydebug/package.html
 
-%files javadoc
-%defattr(-,root,root,-)
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
 
 
 %changelog
+* Wed Oct 16 2013 Stanislav Ochotnicky <sochotnicky at redhat.com> - 1.1.0-11
+- Mavenize yydebug (#1019877)
+- Cleanup unneeded parts, update to latest guidelines
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.0-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 


More information about the scm-commits mailing list