rpms/jzlib/devel .cvsignore, 1.2, 1.3 jzlib.spec, 1.7, 1.8 sources, 1.2, 1.3
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Sat Jul 22 19:14:40 UTC 2006
- Previous message (by thread): rpms/setroubleshoot/devel .cvsignore, 1.8, 1.9 setroubleshoot.spec, 1.12, 1.13 sources, 1.10, 1.11
- Next message (by thread): rpms/kernel/devel patch-2.6.18-rc2-git1.bz2.sign, NONE, 1.1 .cvsignore, 1.491, 1.492 kernel-2.6.spec, 1.2435, 1.2436 sources, 1.448, 1.449 upstream, 1.399, 1.400 linux-2.6-e1000-crc.patch, 1.1, NONE linux-2.6-net-ipw2200-monitor.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: vivekl
Update of /cvs/dist/rpms/jzlib/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8708
Modified Files:
.cvsignore jzlib.spec sources
Log Message:
- Merge with latest version from JPP.
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/jzlib/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 10 Mar 2005 14:50:31 -0000 1.2
+++ .cvsignore 22 Jul 2006 19:14:37 -0000 1.3
@@ -1 +1 @@
-jzlib-1.0.5.tar.gz
+jzlib-1.0.7.tar.gz
Index: jzlib.spec
===================================================================
RCS file: /cvs/dist/rpms/jzlib/devel/jzlib.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- jzlib.spec 22 Jul 2006 08:44:22 -0000 1.7
+++ jzlib.spec 22 Jul 2006 19:14:37 -0000 1.8
@@ -1,20 +1,63 @@
+# Copyright (c) 2000-2005, JPackage Project
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the
+# distribution.
+# 3. Neither the name of the JPackage Project nor the names of its
+# contributors may be used to endorse or promote products derived
+# from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+%define _with_gcj_support 1
+
+%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
+
%define section free
Name: jzlib
-Version: 1.0.5
-Release: 2jpp_4fc
+Version: 1.0.7
+Release: 3jpp_1fc
Epoch: 0
Summary: JZlib re-implementation of zlib in pure Java
Group: Development/Libraries/Java
License: BSD-style
URL: http://www.jcraft.com/jzlib/
-Source0: http://www.jcraft.com/jzlib/jzlib-1.0.5.tar.gz
+Source0: http://www.jcraft.com/jzlib/jzlib-1.0.7.tar.gz
Source1: %{name}_build.xml
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+%if ! %{gcj_support}
BuildArch: noarch
-BuildRequires: jpackage-utils >= 0:1.5.31, ant >= 0:1.5.4
+%endif
+BuildRequires: jpackage-utils >= 0:1.6
+BuildRequires: ant >= 0:1.6
+
+%if %{gcj_support}
+BuildRequires: java-gcj-compat-devel
+Requires(post): java-gcj-compat
+Requires(postun): java-gcj-compat
+%endif
%description
The zlib is designed to be a free, general-purpose, legally unencumbered
@@ -26,7 +69,6 @@
%package javadoc
Summary: Javadoc for %{name}
Group: Development/Documentation
-Prereq: coreutils
%description javadoc
%{summary}.
@@ -34,7 +76,6 @@
%package demo
Summary: Examples for %{name}
Group: Development/Libraries/Java
-Prereq: coreutils
%description demo
%{summary}.
@@ -67,6 +108,10 @@
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_datadir}/%{name} # ghost symlink
+%if %{gcj_support}
+%{_bindir}/aot-compile-rpm
+%endif
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -80,11 +125,31 @@
ln -s %{name}-%{version} %{_datadir}/%{name}
+%post
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+ %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%postun
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+ %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
%files
%defattr(0644,root,root,0755)
%{_javadir}/*.jar
%doc LICENSE.txt
+%if %{gcj_support}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/jzlib-1.0.7.jar.*
+%endif
+
%files javadoc
%defattr(0644,root,root,0755)
%doc %{_javadocdir}/%{name}-%{version}
@@ -96,6 +161,9 @@
%ghost %doc %{_datadir}/%{name}
%changelog
+* Sat Jul 22 2006 Vivek Lakshmanan <vivekl at redhat.com> - 0:1.0.7-3jpp_1fc
+- Merge with latest version from JPP.
+
* Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:1.0.5-2jpp_4fc
- Rebuilt
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/jzlib/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 10 Mar 2005 14:50:31 -0000 1.2
+++ sources 22 Jul 2006 19:14:37 -0000 1.3
@@ -1 +1 @@
-8880066f474d94b6a629502e32ffafb8 jzlib-1.0.5.tar.gz
+3c52a0afb970e8a1fb2d34f30d330a83 jzlib-1.0.7.tar.gz
- Previous message (by thread): rpms/setroubleshoot/devel .cvsignore, 1.8, 1.9 setroubleshoot.spec, 1.12, 1.13 sources, 1.10, 1.11
- Next message (by thread): rpms/kernel/devel patch-2.6.18-rc2-git1.bz2.sign, NONE, 1.1 .cvsignore, 1.491, 1.492 kernel-2.6.spec, 1.2435, 1.2436 sources, 1.448, 1.449 upstream, 1.399, 1.400 linux-2.6-e1000-crc.patch, 1.1, NONE linux-2.6-net-ipw2200-monitor.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list