rpms/jmol/F-9 jmol.patch, NONE, 1.1 import.log, 1.1, 1.2 jmol.desktop, 1.1, 1.2 jmol.spec, 1.1, 1.2
Jussi Lehtola
jussilehtola at fedoraproject.org
Fri Oct 24 13:53:51 UTC 2008
- Previous message (by thread): rpms/jmol/F-10 jmol.patch, NONE, 1.1 import.log, 1.1, 1.2 jmol.desktop, 1.1, 1.2 jmol.spec, 1.1, 1.2
- Next message (by thread): rpms/jmol/devel jmol.patch, NONE, 1.1 import.log, 1.2, 1.3 jmol.desktop, 1.1, 1.2 jmol.spec, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: jussilehtola
Update of /cvs/pkgs/rpms/jmol/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25150/F-9
Modified Files:
import.log jmol.desktop jmol.spec
Added Files:
jmol.patch
Log Message:
- Fixes to get mock build working.
jmol.patch:
--- NEW FILE jmol.patch ---
diff -up Jmol/build.xml.orig Jmol/build.xml
--- Jmol/build.xml.orig 2008-09-22 15:45:40.000000000 +0300
+++ Jmol/build.xml 2008-10-24 12:03:24.000000000 +0300
@@ -378,10 +378,10 @@ support for assertions (which were intro
<fileset dir="${appjars.dir}" includes="**/*"/>
<fileset dir="src/org/jmol/translation/Jmol" includes="Messages*.class"/>
</jar>
- <signjar jar="${jmol.build.dir}/JmolUnsigned.jar"
+ <!--<signjar jar="${jmol.build.dir}/JmolUnsigned.jar"
signedjar="${jmol.build.dir}/Jmol.jar"
keystore="selfSignedCertificate/selfSignedCertificate.store"
- storepass="selfSignedCertificate" alias="selfSignedCertificate" />
+ storepass="selfSignedCertificate" alias="selfSignedCertificate" /> -->
<!-- to verify that a .jar file is signed: jarsigner -verify foo.jar -->
<copy todir="${jmol.build.dir}">
<fileset dir=".">
@@ -390,7 +390,7 @@ support for assertions (which were intro
<include name="jmol.sh" />
</fileset>
</copy>
- <delete file="${jmol.build.dir}/JmolUnsigned.jar"/>
+ <!--<delete file="${jmol.build.dir}/JmolUnsigned.jar"/>-->
<jar destfile="${jmol.build.dir}/JvxlUnsigned.jar"
manifest="manifest/jvxl.txt">
@@ -410,11 +410,11 @@ support for assertions (which were intro
<fileset dir="${appjars.dir}" includes="**/*"/>
</jar>
- <signjar jar="${jmol.build.dir}/JvxlUnsigned.jar"
+ <!-- <signjar jar="${jmol.build.dir}/JvxlUnsigned.jar"
signedjar="${jmol.build.dir}/Jvxl.jar"
keystore="selfSignedCertificate/selfSignedCertificate.store"
storepass="selfSignedCertificate" alias="selfSignedCertificate" />
- <delete file="${jmol.build.dir}/JvxlUnsigned.jar"/>
+ <delete file="${jmol.build.dir}/JvxlUnsigned.jar"/> -->
</target>
@@ -644,7 +644,7 @@ support for assertions (which were intro
</fileset>
<fileset dir="${appletjars.dir}" includes="**/*"/>
</jar>
- <signjar jar="${jmol.applet.build.dir}/JmolAppletSigned.jar.temp"
+ <!-- <signjar jar="${jmol.applet.build.dir}/JmolAppletSigned.jar.temp"
signedjar="${jmol.applet.build.dir}/JmolAppletSigned.jar"
keystore="selfSignedCertificate/selfSignedCertificate.store"
storepass="selfSignedCertificate" alias="selfSignedCertificate" />
@@ -716,7 +716,7 @@ support for assertions (which were intro
<signjar jar="${jmol.applet.build.dir}/JmolApplet0_i18n.jar"
signedjar="${jmol.applet.build.dir}/JmolAppletSigned0_i18n.jar"
keystore="selfSignedCertificate/selfSignedCertificate.store"
- storepass="selfSignedCertificate" alias="selfSignedCertificate" />
+ storepass="selfSignedCertificate" alias="selfSignedCertificate" /> -->
<!-- vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv -->
<!-- this one must be treated specially because of jar indexing
@@ -760,9 +760,9 @@ support for assertions (which were intro
<pathelement path="${jmol.applet.build.dir}/JmolAppletSigned0_i18n.jar" />
</indexjars>
</jar>
- <signjar jar="${jmol.applet.build.dir}/JmolAppletSigned0.jar"
+ <!-- <signjar jar="${jmol.applet.build.dir}/JmolAppletSigned0.jar"
keystore="selfSignedCertificate/selfSignedCertificate.store"
- storepass="selfSignedCertificate" alias="selfSignedCertificate" />
+ storepass="selfSignedCertificate" alias="selfSignedCertificate" /> -->
<!-- ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -->
</target>
@@ -964,14 +964,14 @@ support for assertions (which were intro
5230 and 6988.
-->
<target name="internal-dist-jws-sign" id="internal-dist-jws-sign">
- <signjar alias="${keystore.alias}"
+ <!-- <signjar alias="${keystore.alias}"
storepass="${keystore.password}"
keystore="${keystore.name}" >
<fileset dir="../jmol-jws-${version}">
<include name="**/*.jar" />
<exclude name="**/.AppleDouble/**" />
</fileset>
- </signjar>
+ </signjar> -->
</target>
<target name="clean" id="clean">
@@ -987,6 +987,7 @@ support for assertions (which were intro
<include name="Jmol.jar" />
<include name="JmolApplet*.jar" />
<include name="${jmol.build.dir}/Jmol.jar" />
+ <include name="${jmol.build.dir}/JmolUnsigned.jar" />
<include name="${jmol.applet.build.dir}/JmolApplet*.jar" />
</fileset>
</delete>
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/jmol/F-9/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log 23 Oct 2008 20:58:21 -0000 1.1
+++ import.log 24 Oct 2008 13:53:20 -0000 1.2
@@ -1 +1,2 @@
jmol-11_6-3_10137svn_fc9:F-9:jmol-11.6-3.10137svn.fc9.src.rpm:1224795449
+jmol-11_6-5_10137svn_fc9:F-9:jmol-11.6-5.10137svn.fc9.src.rpm:1224856362
Index: jmol.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/jmol/F-9/jmol.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jmol.desktop 23 Oct 2008 20:58:21 -0000 1.1
+++ jmol.desktop 24 Oct 2008 13:53:20 -0000 1.2
@@ -1,11 +1,10 @@
[Desktop Entry]
Encoding=UTF-8
Name=Jmol
-GenericName=Jmol: an open-source Java viewer for chemical structures in 3D
-Comment=Jmol is a free, open source molecule viewer for students, educators, and researchers in chemistry and biochemistry.
+GenericName=An open-source Java viewer for chemical structures in 3D
+Comment=A free, open source molecule viewer for students, educators, and researchers in chemistry and biochemistry.
Exec=jmol
Icon=jmol
Terminal=false
Type=Application
-Categories=Education;
-
+Categories=Education;Science;
Index: jmol.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jmol/F-9/jmol.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jmol.spec 23 Oct 2008 20:58:21 -0000 1.1
+++ jmol.spec 24 Oct 2008 13:53:20 -0000 1.2
@@ -2,7 +2,7 @@
Name: jmol
Version: 11.6
-Release: 3.%{svnrel}svn%{?dist}
+Release: 5.%{svnrel}svn%{?dist}
Summary: An open-source Java viewer for chemical structures in 3D
Group: Applications/Engineering
License: LGPLv2+
@@ -15,11 +15,14 @@
Source1: jmol.desktop
# Image available at "http://wiki.jmol.org:81/index.php/Image:Jmol_icon_128.png"
Source2: Jmol_icon_128.png
-#Source2: "http://wiki.jmol.org:81/index.php/Image:Jmol_icon_128.png"
+# Patch disabling jar signing
+Patch0: jmol.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: ant
BuildRequires: desktop-file-utils
+BuildRequires: gettext-devel
BuildRequires: jpackage-utils
Requires: java >= 1:1.6.0
@@ -52,6 +55,7 @@
%prep
%setup -q -n Jmol
+%patch0 -p1
find -name '*.jar' -o -name '*.class' -exec rm -f '{}' \;
%build
@@ -62,7 +66,7 @@
install -D -p -m 755 jmol %{buildroot}%{_bindir}/%{name}
-install -D -p -m 444 build/Jmol.jar %{buildroot}%{_datadir}/%{name}/Jmol.jar
+install -D -p -m 444 build/JmolUnsigned.jar %{buildroot}%{_datadir}/%{name}/Jmol.jar
install -D -p -m 444 build/JmolApplet.jar %{buildroot}%{_datadir}/%{name}/JmolApplet.jar
install -D -p -m 444 %{SOURCE2} %{buildroot}%{_datadir}/pixmaps/%{name}.png
@@ -74,7 +78,7 @@
# Install desktop file
desktop-file-install --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
- %{SOURCE1}
+ --vendor=fedora %{SOURCE1}
# Javadoc files
mkdir -p %{buildroot}%{_javadocdir}/%{name}
@@ -89,7 +93,7 @@
%{_bindir}/%{name}
%{_datadir}/%{name}
%{_datadir}/pixmaps/%{name}.png
-%{_datadir}/applications/%{name}.desktop
+%{_datadir}/applications/fedora-%{name}.desktop
%files javadoc
%defattr(-,root,root,-)
@@ -100,6 +104,12 @@
%doc build/doc/*
%changelog
+* Fri Oct 24 2008 Jussi Lehtola - 11.6-5.10137svn
+- Disable JAR signing.
+
+* Fri Oct 24 2008 Jussi Lehtola - 11.6-4.10137svn
+- Add gettext-devel to BR and fix desktop-file-install.
+
* Thu Oct 23 2008 Jussi Lehtola - 11.6-3.10137svn
- Update to svn revision 10137.
- Previous message (by thread): rpms/jmol/F-10 jmol.patch, NONE, 1.1 import.log, 1.1, 1.2 jmol.desktop, 1.1, 1.2 jmol.spec, 1.1, 1.2
- Next message (by thread): rpms/jmol/devel jmol.patch, NONE, 1.1 import.log, 1.2, 1.3 jmol.desktop, 1.1, 1.2 jmol.spec, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list