rpms/jakarta-commons-digester/devel jakarta-commons-digester.spec, 1.16, 1.17
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed May 25 15:55:55 UTC 2005
Author: gbenson
Update of /cvs/dist/rpms/jakarta-commons-digester/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7018
Modified Files:
jakarta-commons-digester.spec
Log Message:
Rearrange how BC-compiled stuff is built and installed
Index: jakarta-commons-digester.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-digester/devel/jakarta-commons-digester.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- jakarta-commons-digester.spec 23 May 2005 13:23:58 -0000 1.16
+++ jakarta-commons-digester.spec 25 May 2005 15:55:52 -0000 1.17
@@ -58,10 +58,15 @@
rm ../LICENSE
+gcj-dbtool -n dist/%{name}-%{version}.db 512
aot-compile \
dist/%{short_name}.jar \
- lib%{name}-%{version}.jar.so \
+ dist/lib%{name}-%{version}.jar.so \
"$RPM_OPT_FLAGS -fPIC"
+gcj-dbtool -f \
+ dist/%{name}-%{version}.db \
+ dist/%{short_name}.jar \
+ %{_libdir}/lib%{name}-%{version}.jar.so
%install
rm -rf $RPM_BUILD_ROOT
@@ -78,17 +83,14 @@
cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
# solibs
-install -d -m 755 $RPM_BUILD_ROOT%{_libdir}
-install -m 755 lib%{name}-%{version}.jar.so $RPM_BUILD_ROOT%{_libdir}
+mkdir -p $RPM_BUILD_ROOT%{_libdir}
+cp -p dist/lib%{name}-%{version}.jar.so $RPM_BUILD_ROOT%{_libdir}
ln -sf lib%{name}-%{version}.jar.so $RPM_BUILD_ROOT%{_libdir}/lib%{name}.jar.so
# gcjdb
gcjdbdir=`gcj-dbtool -p %{_libdir}`.d
mkdir -p $RPM_BUILD_ROOT$gcjdbdir
-gcj-dbtool -n $RPM_BUILD_ROOT$gcjdbdir/%{name}-%{version}.db 80000
-gcj-dbtool -f $RPM_BUILD_ROOT$gcjdbdir/%{name}-%{version}.db \
- $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar \
- %{_libdir}/lib%{name}-%{version}.jar.so
+cp -p dist/%{name}-%{version}.db $RPM_BUILD_ROOT$gcjdbdir
%clean
rm -rf $RPM_BUILD_ROOT
@@ -130,6 +132,9 @@
%{_javadocdir}/%{name}-%{version}
%changelog
+* Wed May 25 2005 Gary Benson <gbenson at redhat.com>
+- Rearrange how BC-compiled stuff is built and installed.
+
* Mon May 23 2005 Gary Benson <gbenson at redhat.com> - 0:1.6-2jpp_4fc
- Add alpha to the list of build architectures (#157522).
- Use absolute paths for rebuild-gcj-db.
More information about the fedora-cvs-commits
mailing list