[portecle] - Update to 1.7.

Ville Skyttä scop at fedoraproject.org
Sun Jan 23 16:16:01 UTC 2011


commit b0cd218579080aca872255ada079507fe06607d6
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Sun Jan 23 18:15:40 2011 +0200

    - Update to 1.7.

 .gitignore    |    2 +-
 portecle.spec |   13 +++++++++----
 sources       |    2 +-
 3 files changed, 11 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 43e737e..9ae8ca1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/portecle-1.6-src.zip
+/portecle-1.7-src.zip
diff --git a/portecle.spec b/portecle.spec
index e5265c5..4580f94 100644
--- a/portecle.spec
+++ b/portecle.spec
@@ -1,7 +1,7 @@
 %global docdir  %{_docdir}/%{name}-%{version}/doc
 
 Name:           portecle
-Version:        1.6
+Version:        1.7
 Release:        1%{?dist}
 Summary:        Multipurpose keystore and certificate tool
 
@@ -32,12 +32,13 @@ certificate revocation lists and more.
 
 %prep
 %setup -q -n %{name}-%{version}-src
-ln -sf %{_javadir}/bcprov.jar lib/
+rm lib/*.jar
 cp -p src/main/net/sf/portecle/images/splash.png doc/images/
 
 
 %build
-%ant -Djar.classpath= -Dhelpbaseurl=file://%{docdir}/ jar
+%ant -Djar.classpath= -Dhelpbaseurl=file://%{docdir}/ \
+    -Dbcprov.jar=$(build-classpath bcprov) jar
 
 
 %install
@@ -48,6 +49,7 @@ install -Dpm 644 build/portecle.jar $RPM_BUILD_ROOT%{_javadir}/portecle.jar
 install -Dpm 644 src/icons/portecle.png \
     $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/portecle.png
 desktop-file-install --vendor=fedora --mode=644 \
+    --add-mime-type=application/x-pkcs7-certificates \
     --dir=$RPM_BUILD_ROOT%{_datadir}/applications src/etc/portecle.desktop
 
 # Enable experimental features in non-EL builds by default
@@ -82,11 +84,14 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %doc README.txt LICENSE.txt NEWS.txt doc/
 %{_bindir}/portecle
 %{_javadir}/portecle.jar
-%{_datadir}/applications/*-portecle.desktop
+%{_datadir}/applications/*portecle.desktop
 %{_datadir}/icons/hicolor/32x32/apps/portecle.png
 
 
 %changelog
+* Sun Jan 23 2011 Ville Skyttä <ville.skytta at iki.fi> - 1.7-1
+- Update to 1.7.
+
 * Sat Jan 15 2011 Ville Skyttä <ville.skytta at iki.fi> - 1.6-1
 - Update to 1.6.
 
diff --git a/sources b/sources
index 5e36cdf..7eaaad2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ff4a09461ef7045cdeeae2fd7fbfc8bb  portecle-1.6-src.zip
+09e0a2d4af9e2a4deeb1343af9a9cae5  portecle-1.7-src.zip


More information about the scm-commits mailing list