rpms/jna
5
0
Fork 0
Code Issues Pull Requests Releases Activity

reenable test and clean up contrib files

Browse Source
This commit is contained in:
Levente Farkas 2010-08-07 18:20:04 +02:00
parent 11aa5f4879
commit 360d860f89
1 changed files with 34 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
jna.spec
View File

@ -1,6 +1,6 @@
Name: jna Name: jna
Version: 3.2.7 Version: 3.2.7
Release: 4%{?dist} Release: 5%{?dist}
Summary: Pure Java access to native libraries Summary: Pure Java access to native libraries
Group: Development/Libraries Group: Development/Libraries
@ -21,24 +21,23 @@ Patch1: jna-3.2.5-loadlibrary.patch
# and using a complex API like X11 through JNA just increases the potential # and using a complex API like X11 through JNA just increases the potential
# for problems. # for problems.
Patch2: jna-3.2.4-tests-headless.patch Patch2: jna-3.2.4-tests-headless.patch
Patch3: jna-3.2.7-javadoc.patch Patch3: jna-3.2.7-javadoc.patch
# Build using GCJ javadoc # Build using GCJ javadoc
Patch4: jna-3.2.7-gcj-javadoc.patch Patch4: jna-3.2.7-gcj-javadoc.patch
# junit cames from rpm # junit cames from rpm
Patch5: jna-3.2.5-junit.patch Patch5: jna-3.2.5-junit.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# We manually require libffi because find-requires doesn't work # We manually require libffi because find-requires doesn't work
# inside jars. # inside jars.
Requires: java >= 1:1.6.0 jpackage-utils libffi Requires: java >= 1:1.6.0, jpackage-utils, libffi
Requires(post): jpackage-utils Requires(post): jpackage-utils
Requires(postun): jpackage-utils Requires(postun): jpackage-utils
BuildRequires: java-devel >= 1:1.6.0 ant jpackage-utils ant-nodeps junit4 BuildRequires: java-devel >= 1:1.6.0, jpackage-utils, libffi-devel
BuildRequires: libX11-devel libXt-devel libffi-devel BuildRequires: ant, ant-junit, ant-nodeps, ant-trax, junit
BuildRequires: libX11-devel, libXt-devel
# for ExcludeArch see bug: 468831 # for ExcludeArch see bug: 468831
%if 0%{?rhel} < 6 && 0%{?fedora} < 10
ExcludeArch: ppc ppc64 ExcludeArch: ppc ppc64
%endif
%description %description
@ -64,7 +63,7 @@ This package contains the javadocs for %{name}.
Summary: Contrib for %{name} Summary: Contrib for %{name}
Group: Documentation Group: Documentation
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
Obsoletes: %{name}-examples Obsoletes: %{name}-examples
%description contrib %description contrib
@ -76,10 +75,17 @@ This package contains the contributed examples for %{name}.
sed -e 's|@JNIPATH@|%{_libdir}/%{name}|' %{PATCH1} | patch -p1 sed -e 's|@JNIPATH@|%{_libdir}/%{name}|' %{PATCH1} | patch -p1
%patch2 -p1 -b .tests-headless %patch2 -p1 -b .tests-headless
%patch3 -p1 -b .javadoc %patch3 -p1 -b .javadoc
# temporary hach for patch3 on epel5
chmod -Rf a+rX,u+w,g-w,o-w .
%patch4 -p0 -b .gcj-javadoc %patch4 -p0 -b .gcj-javadoc
%patch5 -p1 -b .junit %patch5 -p1 -b .junit
cp %{SOURCE1} ./ cp %{SOURCE1} ./
# UnloadTest fail during build since we modify class loading
rm test/com/sun/jna/JNAUnloadTest.java
# current bug: https://jna.dev.java.net/issues/show_bug.cgi?id=155
rm test/com/sun/jna/DirectTest.java
# all java binaries must be removed from the sources # all java binaries must be removed from the sources
#find . -name '*.jar' -delete #find . -name '*.jar' -delete
rm lib/junit.jar rm lib/junit.jar
@ -96,9 +102,9 @@ chmod 0644 LICENSE.txt
%build %build
# We pass -Ddynlink.native which comes from our patch because # We pass -Ddynlink.native which comes from our patch because
# upstream doesn't want to default to dynamic linking. # upstream doesn't want to default to dynamic linking.
ant -Dcflags_extra.native="%{optflags}" -Ddynlink.native=true -Dnomixedjar.native=true jar javadoc ant -Dcflags_extra.native="%{optflags}" -Ddynlink.native=true -Dnomixedjar.native=true jar contrib-jars javadoc
# remove compiled contribs # remove compiled contribs
find contrib -name build -delete || : find contrib -name build -exec rm -rf {} \; || :
sed -i "s/VERSION/%{version}/" %{name}-pom.xml sed -i "s/VERSION/%{version}/" %{name}-pom.xml
%install %install
@ -107,26 +113,31 @@ rm -rf %{buildroot}
# jars # jars
install -D -m 644 build*/%{name}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar install -D -m 644 build*/%{name}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
(cd %{buildroot}%{_javadir}/; for jar in `ls *-%{version}.jar`; do ln -s $jar `echo $jar | sed -e 's/-%{version}//'`; done) (cd %{buildroot}%{_javadir}/; for jar in `ls *-%{version}.jar`; do ln -s $jar `echo $jar | sed -e 's/-%{version}//'`; done)
install -d -m 755 %{buildroot}%{_javadir}/%{name}
find contrib -name '*.jar' -exec cp {} %{buildroot}%{_javadir}/%{name}/ \;
# NOTE: JNA has highly custom code to look for native jars in this # NOTE: JNA has highly custom code to look for native jars in this
# directory. Since this roughly matches the jpackage guidelines, # directory. Since this roughly matches the jpackage guidelines,
# we'll leave it unchanged. # we'll leave it unchanged.
install -d -m 755 %{buildroot}%{_libdir}/%{name} install -d -m 755 %{buildroot}%{_libdir}/%{name}
install -m 755 build*/native/libjnidispatch*.so %{buildroot}%{_libdir}/%{name}/ install -m 755 build*/native/libjnidispatch*.so %{buildroot}%{_libdir}/%{name}/
%if 0%{?fedora} >= 9 || 0%{?rhel} > 5
# install maven pom file # install maven pom file
install -Dm 644 %{name}-pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}.pom install -Dm 644 %{name}-pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}.pom
# ... and maven depmap # ... and maven depmap
%add_to_maven_depmap net.java.dev.jna %{name} %{version} JPP %{name} %add_to_maven_depmap net.java.dev.jna %{name} %{version} JPP %{name}
%endif
# javadocs # javadocs
install -p -d -m 755 %{buildroot}%{_javadocdir}/%{name}-%{version} install -p -d -m 755 %{buildroot}%{_javadocdir}/%{name}-%{version}
cp -a doc/javadoc/* %{buildroot}%{_javadocdir}/%{name}-%{version} cp -a doc/javadoc/* %{buildroot}%{_javadocdir}/%{name}-%{version}
%if 0%{?rhel} >= 6 || 0%{?fedora} >= 9 #if 0%{?rhel} >= 6 || 0%{?fedora} >= 9
%if 0%{?fedora} >= 9
%check %check
#ant -Dcflags_extra.native="%{optflags}" -Ddynlink.native=true -Dnomixedjar.native=true test ant -Dcflags_extra.native="%{optflags}" -Ddynlink.native=true -Dnomixedjar.native=true test
%endif %endif
@ -134,22 +145,26 @@ cp -a doc/javadoc/* %{buildroot}%{_javadocdir}/%{name}-%{version}
rm -rf %{buildroot} rm -rf %{buildroot}
%if 0%{?fedora} >= 9 || 0%{?rhel} > 5
%post %post
%update_maven_depmap %update_maven_depmap
%postun %postun
%update_maven_depmap %update_maven_depmap
%endif
%files %files
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc LICENSE.txt %doc LICENSE.txt release-notes.html
%{_libdir}/%{name} %{_libdir}/%{name}
%{_javadir}/%{name}.jar %{_javadir}/%{name}.jar
%{_javadir}/%{name}-%{version}.jar %{_javadir}/%{name}-%{version}.jar
%if 0%{?fedora} >= 9 || 0%{?rhel} > 5
%{_mavenpomdir}/*.pom %{_mavenpomdir}/*.pom
%{_mavendepmapfragdir}/%{name} %{_mavendepmapfragdir}/%{name}
%endif
%files javadoc %files javadoc
@ -159,10 +174,13 @@ rm -rf %{buildroot}
%files contrib %files contrib
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc contrib %{_javadir}/%{name}
%changelog %changelog
* Sun Aug 1 2010 Levente Farkas <lfarkas@lfarkas.org> - 3.2.7-5
- reenable test and clean up contrib files
* Tue Jul 27 2010 Levente Farkas <lfarkas@lfarkas.org> - 3.2.7-4 * Tue Jul 27 2010 Levente Farkas <lfarkas@lfarkas.org> - 3.2.7-4
- add Obsoletes for jna-examples - add Obsoletes for jna-examples