rpms/portecle/devel .cvsignore, 1.2, 1.3 portecle.spec, 1.3, 1.4 sources, 1.2, 1.3

[Ville Skyttä]

Author: scop

Update of /cvs/pkgs/rpms/portecle/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10195

Modified Files:
	.cvsignore portecle.spec sources 
Log Message:
* Mon Feb 23 2009 Ville Skyttä <ville.skytta at iki.fi> - 1.4-1
- Update to 1.4.
- Ship docs unbundled from jar (#425834).



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/portecle/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	16 Jan 2008 20:10:21 -0000	1.2
+++ .cvsignore	23 Feb 2009 20:37:17 -0000	1.3
@@ -1 +1 @@
-portecle-1.3-src.zip
+portecle-1.4-src.zip


Index: portecle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/portecle/devel/portecle.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- portecle.spec	20 Feb 2009 18:21:17 -0000	1.3
+++ portecle.spec	23 Feb 2009 20:37:17 -0000	1.4
@@ -1,6 +1,8 @@
+%global docdir  %{_docdir}/%{name}-%{version}/doc
+
 Name:           portecle
-Version:        1.3
-Release:        4%{?dist}
+Version:        1.4
+Release:        1%{?dist}
 Summary:        Multipurpose keystore and certificate tool
 
 Group:          Applications/System
@@ -13,11 +15,10 @@
 BuildRequires:  ant
 BuildRequires:  bouncycastle >= 1.38
 BuildRequires:  desktop-file-utils
+BuildRequires:  jpackage-utils >= 1.7.4
 Requires:       bouncycastle >= 1.38
 Requires:       jpackage-utils
 Requires:       hicolor-icon-theme
-# Technically, any java version >= 1.4 would do, but gcj (1.5) won't;
-# requiring >= 1.6 is an attempt at expressing that.
 BuildRequires:  java-devel >= 1.6.0
 Requires:       jre >= 1.6.0
 
@@ -29,11 +30,13 @@
 
 %prep
 %setup -q -n %{name}-%{version}-src
-ln -s %{_javadir}/bcprov.jar lib/
+ln -sf %{_javadir}/bcprov.jar lib/
+rm doc/.htaccess
+cp -p src/main/net/sf/portecle/images/splash.png doc/images/
 
 
 %build
-%ant -Djar.classpath= jar
+%ant -Djar.classpath= -Dhelpbaseurl=file://%{docdir}/ jar
 
 
 %install
@@ -46,9 +49,7 @@
 desktop-file-install --vendor=fedora --mode=644 \
     --dir=$RPM_BUILD_ROOT%{_datadir}/applications src/etc/portecle.desktop
 
-%jpackage_script net.sf.portecle.FPortecle "" "" bcprov:portecle portecle portecle
-
-chmod +x $RPM_BUILD_ROOT%{_bindir}/portecle
+%jpackage_script net.sf.portecle.FPortecle "-splash:%{docdir}/images/splash.png" "" bcprov:portecle portecle portecle
 
 
 %clean
@@ -72,7 +73,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc README.txt LICENSE.txt NEWS.txt
+%doc README.txt LICENSE.txt NEWS.txt doc/
 %{_bindir}/portecle
 %{_javadir}/portecle.jar
 %{_datadir}/applications/*-portecle.desktop
@@ -80,6 +81,10 @@
 
 
 %changelog
+* Mon Feb 23 2009 Ville Skyttä <ville.skytta at iki.fi> - 1.4-1
+- Update to 1.4.
+- Ship docs unbundled from jar (#425834).
+
 * Fri Feb 20 2009 Ville Skyttä <ville.skytta at iki.fi> - 1.3-4
 - Improve icon cache and desktop database refresh scriptlets.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/portecle/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	16 Jan 2008 20:10:21 -0000	1.2
+++ sources	23 Feb 2009 20:37:17 -0000	1.3
@@ -1 +1 @@
-cc32721356f60caa12517dbc82538af8  portecle-1.3-src.zip
+be4991444af94d84e82397e1733f8176  portecle-1.4-src.zip