rpms/libreadline-java/devel libreadline-java.spec,1.4,1.5
Thomas Fitzsimmons (fitzsim)
fedora-extras-commits at redhat.com
Mon Mar 26 21:49:30 UTC 2007
Author: fitzsim
Update of /cvs/extras/rpms/libreadline-java/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1235
Modified Files:
libreadline-java.spec
Log Message:
* Mon Mar 26 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 0.8.0-16
- Install jar file and JNI library under libdir.
- Group BuildRequires and Requires.
- Eliminate devel subpackage.
- Remove ldconfig requirements.
- Reformat.
Index: libreadline-java.spec
===================================================================
RCS file: /cvs/extras/rpms/libreadline-java/devel/libreadline-java.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libreadline-java.spec 23 Mar 2007 23:54:49 -0000 1.4
+++ libreadline-java.spec 26 Mar 2007 21:48:57 -0000 1.5
@@ -1,55 +1,47 @@
-%define name libreadline-java
-%define version 0.8.0
%define editline_ver 2.9
-%define release 15%{?dist}
%define src_dirs org test
%define gcj_support 1
-Name: %{name}
-Version: %{version}
-Release: %{release}
-Summary: Java wrapper for the EditLine library
-License: LGPL
-Source0: http://download.sourceforge.net/java-readline/%{name}-%{version}-src.tar.gz
-Url: http://java-readline.sf.net/
-Requires: libedit >= %{editline_ver}
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
-%if %{gcj_support}
-BuildRequires: gcc-java >= 4.1.1
-BuildRequires: java-gcj-compat-devel >= 1.0.31
-Requires(post): java-gcj-compat >= 1.0.31
-Requires(postun): java-gcj-compat >= 1.0.31
+Name: libreadline-java
+Version: 0.8.0
+Release: 16%{?dist}
+Summary: Java wrapper for the EditLine library
+Group: Development/Libraries
+
+License: LGPL
+URL: http://java-readline.sf.net/
+Source0: http://download.sf.net/java-readline/%{name}-%{version}-src.tar.gz
+
+Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires: jpackage-utils >= 1.5
+BuildRequires: libedit-devel >= %{editline_ver}
+BuildRequires: %{_libdir}/libtermcap.so
+%if %{gcj_support}
+BuildRequires: gcc-java >= 4.1.1
+BuildRequires: java-gcj-compat-devel >= 1.0.31
%else
-BuildRequires: java-devel >= 1.4.2
-Requires: java >= 1.4.2
+BuildRequires: java-devel >= 1.4.2
+%endif
+
+Requires: libedit >= %{editline_ver}
+%if %{gcj_support}
+Requires(post): java-gcj-compat >= 1.0.31
+Requires(postun): java-gcj-compat >= 1.0.31
+%else
+Requires: java >= 1.4.2
%endif
-BuildRequires: jpackage-utils >= 0:1.5
-BuildRequires: libedit-devel >= %{editline_ver}
-BuildRequires: %{_libdir}/libtermcap.so
-Group: Development/Libraries
-Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-AutoReqProv: no
%description
-Java-Readline is a port of EditLine for Java. Or, to be more
-precise, it is a JNI-wrapper to Readline. It is distributed under
-the LGPL.
+libreadline-java provides Java bindings for libedit though a JNI
+wrapper.
%package javadoc
-Summary: Javadoc for %{name}
-Group: Development/Libraries
+Summary: Javadoc for %{name}
+Group: Development/Libraries
%description javadoc
-Javadoc for %{name}.
-
-%package devel
-Summary: Development files for %{name}
-Group: Development/Libraries
-Requires: %{name} = %{version}
-
-%description devel
-This package contains development files for %{name}.
+API documentation for %{name}.
%prep
%setup -q
@@ -57,31 +49,30 @@
%build
export JAVA_HOME=%{java_home}
export PATH=$JAVA_HOME/bin:$JAVA_HOME/jre/bin:$PATH
-%__make T_LIBS=JavaEditline #JavaReadline
-%__make apidoc
+make T_LIBS=JavaEditline
+make apidoc
-# Fix debuginfo package
+# fix debuginfo package
rm -f %{src_dirs}
-for dir in %{src_dirs}; do
-ln -s src/$dir
+for dir in %{src_dirs}
+do
+ ln -s src/$dir
done
%install
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
-# jar
-%__mkdir_p %{buildroot}%{_javadir}
-%__install -m 644 %{name}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
-(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do \
-ln -sf ${jar} ${jar/-%{version}/}; done)
-# lib
-%__mkdir_p %{buildroot}%{_libdir}
-%__install -m 755 libJavaEditline.so %{buildroot}%{_libdir}/libJavaEditline.so.%{version}
-(cd %{buildroot}%{_libdir} && ln -sf libJavaEditline.so.%{version} libJavaEditline.so)
+# install jar file and JNI library under %{_libdir}/%{name}
+# FIXME: fix jpackage-utils to handle multilib correctly
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}
+install -m 644 %{name}.jar \
+ $RPM_BUILD_ROOT%{_libdir}/%{name}/%{name}-%{version}.jar
+ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_libdir}/%{name}/%{name}.jar
+install -m 755 libJavaEditline.so $RPM_BUILD_ROOT%{_libdir}/%{name}
# javadoc
-%__mkdir_p %{buildroot}%{_javadocdir}/%{name}-%{version}
-%__cp -a api/* %{buildroot}%{_javadocdir}/%{name}-%{version}
+mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+cp -a api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
# natively compile
%if %{gcj_support}
@@ -89,22 +80,18 @@
%endif
%clean
-%__rm -rf %{buildroot}
-
-%post
-/sbin/ldconfig
+rm -rf $RPM_BUILD_ROOT
%if %{gcj_support}
+%post
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
fi
%endif
-%postun
-/sbin/ldconfig
-
%if %{gcj_support}
+%postun
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
@@ -114,8 +101,7 @@
%files
%defattr(0644,root,root,0755)
%doc ChangeLog NEWS README README.1st VERSION COPYING.LIB
-%{_libdir}/libJavaEditline.so.*
-%{_javadir}/*.jar
+%{_libdir}/%{name}
%if %{gcj_support}
%attr(-,root,root) %{_libdir}/gcj/%{name}
%endif
@@ -124,11 +110,14 @@
%defattr(0644,root,root,0755)
%{_javadocdir}/%{name}-%{version}
-%files devel
-%defattr(0644,root,root,0755)
-%{_libdir}/libJavaEditline.so
-
%changelog
+* Mon Mar 26 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 0.8.0-16
+- Install jar file and JNI library under libdir.
+- Group BuildRequires and Requires.
+- Eliminate devel subpackage.
+- Remove ldconfig requirements.
+- Reformat.
+
* Fri Mar 23 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 0.8.0-15
- Fix libJavaEditline.so symlink typo.
More information about the fedora-extras-commits
mailing list