Hello community, here is the log from the commit of package jisp2 for openSUSE:Factory checked in at 2014-07-21 21:40:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/jisp2 (Old) and /work/SRC/openSUSE:Factory/.jisp2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "jisp2" Changes: -------- --- /work/SRC/openSUSE:Factory/jisp2/jisp2.changes 2013-09-11 13:38:31.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.jisp2.new/jisp2.changes 2014-07-21 22:34:48.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Jul 21 10:49:06 UTC 2014 - [email protected] + +- Cleanup and fix update-alternatives code. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jisp2.spec ++++++ --- /var/tmp/diff_new_pack.W6iG3G/_old 2014-07-21 22:34:49.000000000 +0200 +++ /var/tmp/diff_new_pack.W6iG3G/_new 2014-07-21 22:34:49.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package jisp2 # -# Copyright (c) 2013 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 @@ -16,8 +16,6 @@ # -%define section free - Name: jisp2 Version: 2.5.1 Release: 0 @@ -28,23 +26,21 @@ Source0: jisp-2.5.1-source.tar.bz2 Patch0: jisp2-2.5.1-java5-enum.patch Patch1: jisp2-2.5.1-javac-flags.patch -Requires(post): %{_sbindir}/update-alternatives -Requires(preun): %{_sbindir}/update-alternatives # jisp-3.0.0 won't work with jakarta-turbine-jcs BuildRequires: java-devel BuildRequires: javapackages-tools BuildRequires: make Requires: javapackages-tools +Requires(post): update-alternatives +Requires(pre): update-alternatives Provides: hibernate_in_process_cache -BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch %description Jisp uses B-Tree and hash indexes for keyed access to variable-length serialized objects stored in files. - - %package demo Summary: The Java Indexed Serialization Package Group: Development/Libraries/Java @@ -53,8 +49,6 @@ Jisp uses B-Tree and hash indexes for keyed access to variable-length serialized objects stored in files. - - %package javadoc Summary: The Java Indexed Serialization Package Group: Development/Libraries/Java @@ -63,51 +57,46 @@ Jisp uses B-Tree and hash indexes for keyed access to variable-length serialized objects stored in files. - - %prep %setup -q -n jisp-%{version} %patch0 -p1 -%{__perl} -pi -e 's/\r$//g' svfl.txt +sed -i -e 's/\r$//g' svfl.txt %patch1 -b .java-cflags %build export CLASSPATH= -%{__make} JAVAC_FLAGS=" -target 1.5 -source 1.5" -%{__make} jars -%{__make} docs +make JAVAC_FLAGS=" -target 1.5 -source 1.5" %{?_smp_mflags} +make jars %{?_smp_mflags} +make docs %{?_smp_mflags} %install # jars -mkdir -p $RPM_BUILD_ROOT%{_javadir} +mkdir -p %{buildroot}%{_javadir} cp -p jisp.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar -(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done) + %{buildroot}%{_javadir}/%{name}-%{version}.jar +(cd %{buildroot}%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done) # javadoc -mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -cp -pr docs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} +mkdir -p %{buildroot}%{_javadocdir}/%{name}-%{version} +cp -pr docs/* %{buildroot}%{_javadocdir}/%{name}-%{version} +ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name} # demo -mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}/lib -cp jisp-demo.jar $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}/lib -cp *.java $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version} -cp *.txt $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version} +mkdir -p %{buildroot}%{_datadir}/%{name}-%{version}/lib +cp jisp-demo.jar %{buildroot}%{_datadir}/%{name}-%{version}/lib +cp *.java %{buildroot}%{_datadir}/%{name}-%{version} +cp *.txt %{buildroot}%{_datadir}/%{name}-%{version} # hibernate_in_process_cache ghost symlink -ln -s %{_sysconfdir}/alternatives \ - $RPM_BUILD_ROOT%{_javadir}/hibernate_in_process_cache.jar - -%clean -rm -rf $RPM_BUILD_ROOT +mkdir -p %{buildroot}%{_sysconfdir}/alternatives/ +ln -s %{_javadir}/%{name}.jar %{buildroot}%{_sysconfdir}/alternatives/hibernate_in_process_cache.jar +ln -s %{_sysconfdir}/alternatives/hibernate_in_process_cache.jar %{buildroot}%{_javadir}/hibernate_in_process_cache.jar %post %{_sbindir}/update-alternatives --install %{_javadir}/hibernate_in_process_cache.jar \ hibernate_in_process_cache %{_javadir}/%{name}.jar 30 %preun -{ - [ $1 -eq 0 ] || exit 0 +if [ "$1" = "0" ]; then %{_sbindir}/update-alternatives --remove hibernate_in_process_cache %{_javadir}/%{name}.jar -} >/dev/null 2>&1 || : +fi %files %defattr(0644,root,root,0755) @@ -115,6 +104,7 @@ %{_javadir}/%{name}-%{version}.jar %{_javadir}/%{name}.jar %{_javadir}/hibernate_in_process_cache.jar +%ghost %{_sysconfdir}/alternatives/hibernate_in_process_cache.jar %files demo %defattr(0644,root,root,0755) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
