Hello community, here is the log from the commit of package sblim-cim-client2 for openSUSE:Factory checked in at 2012-08-16 14:09:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sblim-cim-client2 (Old) and /work/SRC/openSUSE:Factory/.sblim-cim-client2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sblim-cim-client2", Maintainer is "vdziewie...@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/sblim-cim-client2/sblim-cim-client2.changes 2012-03-27 08:59:07.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.sblim-cim-client2.new/sblim-cim-client2.changes 2012-08-16 14:09:12.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Aug 8 12:08:15 UTC 2012 - kkae...@suse.com + +- Fix CentOS, RHEL and Fedora builds +- License is EPL-1.0 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sblim-cim-client2.spec ++++++ --- /var/tmp/diff_new_pack.FDBEnP/_old 2012-08-16 14:09:15.000000000 +0200 +++ /var/tmp/diff_new_pack.FDBEnP/_new 2012-08-16 14:09:15.000000000 +0200 @@ -22,29 +22,40 @@ Name: sblim-cim-client2 Version: 2.1.12 -Release: 1 -License: EPL-1.0 +Release: 0 Url: http://sblim.sourceforge.net/ -Group: Development/Libraries/Java Summary: Java CIM Client library +License: EPL-1.0 +Group: Development/Libraries/Java BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: http://downloads.sourceforge.net/project/sblim/%{name}/%{version}/%{name}-%{version}-src.zip Source1: http://downloads.sourceforge.net/project/sblim/%{name}/%{version}/%{name}-%{version}-doc.zip BuildArch: noarch -BuildRequires: java-devel unzip -BuildRequires: jpackage-utils >= 1.5.32 BuildRequires: ant >= 1.6 -%if %{defined fedora} +BuildRequires: fdupes +BuildRequires: java-devel +BuildRequires: jpackage-utils >= 1.5.32 +BuildRequires: unzip + +%if 0%{?suse_version} == 0 +%if 0%{?fedora} == 16 || (0%{?centos_version}>=500 && 0%{?centos_version}<700) || (0%{?rhel_version}>=500 && 0%{?rhel_version}<700) BuildRequires: java-1.6.0-openjdk-devel %endif -%if 0%{?suse_version} > 0 +%if 0%{?fedora} == 17 +BuildRequires: java-1.7.0-openjdk-devel +%endif + +%else + %if 0%{?suse_version} < 1100 BuildRequires: java-1_5_0-ibm-devel +BuildRequires: java-1_5_0-ibm-fonts %endif -BuildRequires: update-alternatives BuildRequires: jaxp_parser_impl +BuildRequires: update-alternatives BuildRequires: xml-commons-apis %endif + Requires: jpackage-utils >= 1.5.32 Obsoletes: sblim-cim-client <= 1.3.5 Provides: sblim-cim-client @@ -60,7 +71,6 @@ %package javadoc -License: Other uncritical OpenSource License Summary: Javadoc for sblim-cim-client2 Group: Development/Libraries/Java @@ -70,7 +80,6 @@ %package manual -License: Other uncritical OpenSource License Summary: Manual and sample code for sblim-cim-client2 Group: Development/Libraries/Java @@ -95,8 +104,6 @@ for i in smpl/org/sblim/*/{example,samples}/*.{java,xml}; do [ -f "$i" ] && dos2unixConversion "$i" done -mkdir -p $RPM_BUILD_ROOT%{_javadocdir} -(cd $RPM_BUILD_ROOT%{_javadocdir}; unzip %{S:1}) # ----------------------------------------------------------------------------- @@ -128,8 +135,14 @@ ln -sf %{name}-%{version}.jar %{name}.jar; ) # --- javadoc --- +mkdir -p $RPM_BUILD_ROOT%{_javadocdir} +(cd $RPM_BUILD_ROOT%{_javadocdir}; unzip %{S:1}) +#fix EOL encoding +find $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}-doc -type f -exec sed -i 's/\r//' {} \; + install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} cp -pr %{archive_folder}/doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} +%fdupes $RPM_BUILD_ROOT # ----------------------------------------------------------------------------- %files @@ -137,20 +150,20 @@ %config %{_sysconfdir}/java/sblim-cim-client2.properties %config %{_sysconfdir}/java/sblim-slp-client2.properties %dir %{_docdir}/%{name}-%{version} -%doc %{_docdir}/%{name}-%{version}/COPYING -%doc %{_docdir}/%{name}-%{version}/README -%doc %{_docdir}/%{name}-%{version}/ChangeLog -%doc %{_docdir}/%{name}-%{version}/NEWS %{_javadir}/%{name}.jar %{_javadir}/%{name}-%{version}.jar %files javadoc %defattr(0644,root,root,0755) -%{_javadocdir}/%{name}-%{version} +%docdir %{_javadocdir}/%{name}-%{version}-doc +%docdir %{_javadocdir}/%{name}-%{version} +%doc %{_javadocdir}/%{name}-%{version}-doc +%doc %{_javadocdir}/%{name}-%{version} %files manual %defattr(0644,root,root,0755) -%doc %{_docdir}/%{name}-%{version}/org +%docdir %{_docdir}/%{name}-%{version} +%doc %{_docdir}/%{name}-%{version} # ----------------------------------------------------------------------------- %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
