Hello community,

here is the log from the commit of package gnu-jaf for openSUSE:Factory checked 
in at 2014-08-01 19:27:06
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gnu-jaf (Old)
 and      /work/SRC/openSUSE:Factory/.gnu-jaf.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "gnu-jaf"

Changes:
--------
--- /work/SRC/openSUSE:Factory/gnu-jaf/gnu-jaf.changes  2011-09-23 
02:01:12.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.gnu-jaf.new/gnu-jaf.changes     2014-08-01 
19:27:07.000000000 +0200
@@ -1,0 +2,6 @@
+Sun Jul 27 12:57:44 UTC 2014 - [email protected]
+
+- Add update-alternatives so we work correctly with geronimo-jaf
+  * better than conflicts...
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ gnu-jaf.spec ++++++
--- /var/tmp/diff_new_pack.MNBlyV/_old  2014-08-01 19:27:08.000000000 +0200
+++ /var/tmp/diff_new_pack.MNBlyV/_new  2014-08-01 19:27:08.000000000 +0200
@@ -1,7 +1,7 @@
 #
-# spec file for package gnu-jaf (Version 1.1.1)
+# spec file for package gnu-jaf
 #
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -15,25 +15,26 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
 
-
-Name:           gnu-jaf
-BuildRequires:  ant antlr classpath java-1_5_0-gcj-compat-devel unzip
 %define       official_name activation
-License:        GPL-2.0+
-Group:          Development/Libraries/Java
-AutoReqProv:    on
+Name:           gnu-jaf
 Version:        1.1.1
-Release:        1
+Release:        0
 Summary:        GNU implementation of the JavaBeans Activation Framework
+License:        GPL-2.0+
+Group:          Development/Libraries/Java
 Url:            http://java.sun.com/products/javabeans/glasgow/jaf.html
 Source:         %{official_name}-%{version}.tar.bz2
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildRequires:  ant
+BuildRequires:  antlr
+BuildRequires:  classpath
+BuildRequires:  java-1_5_0-gcj-compat-devel
+BuildRequires:  unzip
+Requires(post): update-alternatives
 Provides:       jaf = %{version}
 Obsoletes:      jaf <= 1.1
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
-Conflicts:      geronimo-jaf-1_0_2-api
 
 %description
 GNU JAF is a framework for declaring what beans operate on what MIME
@@ -49,37 +50,31 @@
 can then view, edit, print, or perform whatever other action is
 required on the underlying resource.
 
-
-
-Authors:
---------
-    Andrew Selkirk
-    Nic Ferrier
-
 %prep
 %setup -q -n %{official_name}-%{version}
-#<< prep
-#>> build
 
 %build
 CLASSPATH=$(build-classpath glibj):$CLASSPATH ant dist
-#<< build
-#>> install
 
 %install
-mkdir -p $RPM_BUILD_ROOT/%{_javadir}
-cp activation.jar $RPM_BUILD_ROOT/%{_javadir}
-ln -sf %{_javadir}/activation.jar $RPM_BUILD_ROOT/%{_javadir}/jaf.jar
-#<< install
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-#>> files
+mkdir -p %{buildroot}/%{_javadir}
+cp activation.jar %{buildroot}/%{_javadir}
+
+mkdir -p %{buildroot}%{_sysconfdir}/alternatives/
+ln -sf %{_sysconfdir}/alternatives/jaf.jar %{buildroot}%{_javadir}/jaf.jar
+
+%post
+%{_sbindir}/update-alternatives --install %{_javadir}/jaf.jar jaf 
%{_javadir}/activation.jar 111
+
+%preun
+if [ "$1" = "0" ]; then
+       %{_sbindir}/update-alternatives --remove jaf %{_javadir}/activation.jar
+fi
 
 %files
 %defattr(-,root,root)   
 %{_javadir}/*
-#<< 
-# vim: foldcolumn=4 foldmarker=>>,<< foldmethod=marker foldlevel=42
+%{_javadir}/jaf.jar
+%ghost %{_sysconfdir}/alternatives/jaf.jar
 
 %changelog

-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to