[jnr-netdb/f14/master] Initial import (#646637)

Mohammed Morsi mmorsi at fedoraproject.org
Thu Dec 2 22:21:35 UTC 2010


commit 6a110cbc9437905d15182fbf84770dc933c60790
Author: Mohammed Morsi <mmorsi at redhat.com>
Date:   Thu Dec 2 17:21:46 2010 -0500

    Initial import (#646637)

 .gitignore                           |    1 +
 fix_jnr_netdb_jar_dependencies.patch |  127 ++++++++++++++++++++++++++++++++++
 jnr-netdb.spec                       |   91 ++++++++++++++++++++++++
 sources                              |    1 +
 4 files changed, 220 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..2a7610d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/wmeissner-jnr-netdb-6e04bca.tar.gz
diff --git a/fix_jnr_netdb_jar_dependencies.patch b/fix_jnr_netdb_jar_dependencies.patch
new file mode 100644
index 0000000..cb7bb38
--- /dev/null
+++ b/fix_jnr_netdb_jar_dependencies.patch
@@ -0,0 +1,127 @@
+--- nbproject/build-impl.xml.orig	2010-10-25 13:08:12.000000000 -0400
++++ nbproject/build-impl.xml	2010-10-25 13:59:56.000000000 -0400
+@@ -98,7 +98,7 @@ is divided into following sections:
+             <and>
+                 <isset property="libs.CopyLibs.classpath"/>
+                 <not>
+-                    <istrue value="${mkdist.disabled}"/>
++                    <istrue value="true"/>
+                 </not>
+             </and>
+         </condition>
+@@ -413,8 +413,6 @@ is divided into following sections:
+         </propertyfile>
+         <antcall target="-maybe-call-dep">
+             <param name="call.built.properties" value="${built-jar.properties}"/>
+-            <param location="${project.jaffl}" name="call.subproject"/>
+-            <param location="${project.jaffl}/build.xml" name="call.script"/>
+             <param name="call.target" value="jar"/>
+             <param name="transfer.built-jar.properties" value="${built-jar.properties}"/>
+         </antcall>
+@@ -513,14 +511,6 @@ is divided into following sections:
+                 <globmapper from="*" to="lib/*"/>
+             </chainedmapper>
+         </pathconvert>
+-        <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
+-        <copylibs compress="${jar.compress}" jarfile="${dist.jar}" manifest="${manifest.file}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
+-            <fileset dir="${build.classes.dir}"/>
+-            <manifest>
+-                <attribute name="Main-Class" value="${main.class}"/>
+-                <attribute name="Class-Path" value="${jar.classpath}"/>
+-            </manifest>
+-        </copylibs>
+         <echo>To run this application from the command line without Ant, try:</echo>
+         <property location="${dist.jar}" name="dist.jar.resolved"/>
+         <echo>java -jar "${dist.jar.resolved}"</echo>
+@@ -538,13 +528,6 @@ is divided into following sections:
+                 <globmapper from="*" to="lib/*"/>
+             </chainedmapper>
+         </pathconvert>
+-        <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
+-        <copylibs compress="${jar.compress}" jarfile="${dist.jar}" manifest="${manifest.file}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
+-            <fileset dir="${build.classes.dir}"/>
+-            <manifest>
+-                <attribute name="Class-Path" value="${jar.classpath}"/>
+-            </manifest>
+-        </copylibs>
+     </target>
+     <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.mkdist" name="-do-jar-with-libraries-without-manifest" unless="manifest.available">
+         <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
+@@ -559,13 +542,6 @@ is divided into following sections:
+                 <globmapper from="*" to="lib/*"/>
+             </chainedmapper>
+         </pathconvert>
+-        <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
+-        <copylibs compress="${jar.compress}" jarfile="${dist.jar}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
+-            <fileset dir="${build.classes.dir}"/>
+-            <manifest>
+-                <attribute name="Class-Path" value="${jar.classpath}"/>
+-            </manifest>
+-        </copylibs>
+     </target>
+     <target name="-post-jar">
+         <!-- Empty placeholder for easier customization. -->
+@@ -810,8 +786,6 @@ is divided into following sections:
+         </propertyfile>
+         <antcall target="-maybe-call-dep">
+             <param name="call.built.properties" value="${built-clean.properties}"/>
+-            <param location="${project.jaffl}" name="call.subproject"/>
+-            <param location="${project.jaffl}/build.xml" name="call.script"/>
+             <param name="call.target" value="clean"/>
+             <param name="transfer.built-clean.properties" value="${built-clean.properties}"/>
+         </antcall>
+@@ -834,11 +808,5 @@ is divided into following sections:
+         </condition>
+     </target>
+     <target depends="-check-call-dep" if="should.call.dep" name="-maybe-call-dep">
+-        <ant antfile="${call.script}" inheritall="false" target="${call.target}">
+-            <propertyset>
+-                <propertyref prefix="transfer."/>
+-                <mapper from="transfer.*" to="*" type="glob"/>
+-            </propertyset>
+-        </ant>
+     </target>
+ </project>
+--- lib/nblibraries.properties.orig	2010-10-25 13:17:04.000000000 -0400
++++ lib/nblibraries.properties	2010-10-25 13:18:19.000000000 -0400
+@@ -1,11 +1,11 @@
+ libs.CopyLibs.classpath=\
+     ${base}/CopyLibs/org-netbeans-modules-java-j2seproject-copylibstask.jar
+ libs.junit.classpath=\
+-    ${base}/junit/junit-3.8.2.jar
++    ${base}/junit.jar
+ libs.junit.javadoc=\
+     ${base}/junit/junit-3.8.2-api.zip
+ libs.junit_4.classpath=\
+-    ${base}/junit_4/junit-4.5.jar
++    ${base}/junit4.jar
+ libs.junit_4.javadoc=\
+     ${base}/junit_4/junit-4.5-api.zip
+ libs.junit_4.src=\
+--- nbproject/project.properties.orig	2010-10-25 13:50:06.000000000 -0400
++++ nbproject/project.properties	2010-10-25 14:27:13.000000000 -0400
+@@ -22,11 +22,12 @@ dist.jar=${dist.dir}/jnr-netdb.jar
+ dist.javadoc.dir=${dist.dir}/javadoc
+ endorsed.classpath=
+ excludes=
+-file.reference.jffi-complete.jar=../jffi.git/dist/jffi-complete.jar
++file.reference.jffi-complete.jar=lib/jffi.jar
+ includes=**
+ jar.compress=false
+ javac.classpath=\
+-    ${reference.jaffl.jar}
++    ${reference.jaffl.jar}: \
++    ${reference.objectweb.asm.jar}
+ # Space-separated list of extra javac options
+ javac.compilerargs=-Xlint:unchecked
+ javac.deprecation=false
+@@ -50,7 +51,8 @@ javadoc.windowtitle=
+ meta.inf.dir=${src.dir}/META-INF
+ platform.active=default_platform
+ project.jaffl=../jaffl.git
+-reference.jaffl.jar=${project.jaffl}/dist/jaffl.jar
++reference.jaffl.jar=lib/jaffl.jar
++reference.objectweb.asm.jar=lib/objectweb-asmasm.jar
+ run.classpath=\
+     ${javac.classpath}:\
+     ${build.classes.dir}
diff --git a/jnr-netdb.spec b/jnr-netdb.spec
new file mode 100644
index 0000000..65ff067
--- /dev/null
+++ b/jnr-netdb.spec
@@ -0,0 +1,91 @@
+%global git_commit 6e04bca
+%global cluster    wmeissner
+
+Name:    jnr-netdb
+Version: 1.0.1
+Release: 3%{?dist}
+Summary: Network services database access for java
+
+Group:   System Environment/Libraries
+License: LGPLv3
+URL:      http://github.com/%{cluster}/%{name}
+Source0:  %{url}/tarball/%{version}/%{cluster}-%{name}-%{git_commit}.tar.gz
+Patch0:  fix_jnr_netdb_jar_dependencies.patch
+BuildArch: noarch
+
+BuildRequires: java-devel >= 1:1.6.0
+BuildRequires: jpackage-utils
+BuildRequires: ant
+BuildRequires: ant-nodeps
+BuildRequires: jaffl
+BuildRequires(check): ant-junit
+BuildRequires(check): junit4
+BuildRequires(check): jffi
+Requires: java >= 1:1.6.0
+Requires: jpackage-utils
+Requires: jaffl
+
+%description
+jnr-netdb is a java interface to getservbyname(3), getservbyport(3)
+
+%package        javadoc
+Summary:        Javadoc for %{name}
+Group:          Documentation
+Requires:       %{name} = %{version}-%{release}
+
+%description    javadoc
+Javadoc for %{name}.
+
+%prep
+%setup -q -n %{cluster}-%{name}-%{git_commit}
+%patch0
+
+find ./ -name '*.jar' -exec rm -f '{}' \; 
+find ./ -name '*.class' -exec rm -f '{}' \; 
+
+%build
+build-jar-repository -s -p lib junit junit4 jaffl objectweb-asm jffi
+
+ant jar javadoc
+
+%install
+rm -rf $RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT%{_javadir}
+cp -p dist/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+
+# javadoc
+install -p -d -m 755 %{buildroot}%{_javadocdir}/%{name}
+cp -a dist/javadoc/* %{buildroot}%{_javadocdir}/%{name}
+
+# pom
+%add_to_maven_depmap org.jruby.extras %{name} %{version} JPP %{name}
+mkdir -p $RPM_BUILD_ROOT%{_mavenpomdir}
+cp pom.xml  $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-jnr-netdb.pom
+
+%check
+ant test
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(-,root,root,-)
+%{_javadir}/*
+%doc COPYING
+%doc COPYING.LESSER
+%{_mavendepmapfragdir}/%{name}
+%{_mavenpomdir}/*
+
+%files javadoc
+%defattr(-,root,root,-)
+%{_javadocdir}/%{name}
+
+%changelog
+* Thu Dec 02 2010  <mmorsi at redhat.com> - 1.0.1-3
+- updates to conform to pkging guidelines
+
+* Mon Oct 25 2010  <mmorsi at redhat.com> - 1.0.1-2
+- include javadocs
+
+* Mon Oct 25 2010  <mmorsi at redhat.com> - 1.0.1-1
+- initial package
diff --git a/sources b/sources
index e69de29..8da5206 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+df569be1d131cee267443886ad1c6ca9  wmeissner-jnr-netdb-6e04bca.tar.gz


More information about the scm-commits mailing list