Hello community,
here is the log from the commit of package sblim-cim-client2 for
openSUSE:Factory checked in at 2015-06-24 20:56:16
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/sblim-cim-client2 (Old)
and /work/SRC/openSUSE:Factory/.sblim-cim-client2.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sblim-cim-client2"
Changes:
--------
--- /work/SRC/openSUSE:Factory/sblim-cim-client2/sblim-cim-client2.changes
2013-12-17 10:06:04.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.sblim-cim-client2.new/sblim-cim-client2.changes
2015-06-24 20:56:17.000000000 +0200
@@ -1,0 +2,13 @@
+Tue Jun 23 07:39:45 UTC 2015 - mvet...@suse.com
+
+- Remove self-made dos2unix and replace by standard one
+ Convert .java files too.
+
+-------------------------------------------------------------------
+Thu Jun 18 15:08:26 UTC 2015 - mvet...@suse.com
+
+- Clean up spec file
+- Remove java conditionals, when the java version is set correctly
+ there wont be an issue
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ sblim-cim-client2.spec ++++++
--- /var/tmp/diff_new_pack.bP7M62/_old 2015-06-24 20:56:18.000000000 +0200
+++ /var/tmp/diff_new_pack.bP7M62/_new 2015-06-24 20:56:18.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package sblim-cim-client2
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,50 +18,38 @@
%define project_folder %{name}-%{version}-src
%define archive_folder build
-# -----------------------------------------------------------------------------
-
Name: sblim-cim-client2
Version: 2.2.5
Release: 0
-Url: http://sblim.sourceforge.net/
Summary: Java CIM Client library
License: EPL-1.0
Group: Development/Libraries/Java
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
+Url: http://sblim.sourceforge.net/
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: ant >= 1.6
-%if 0%{?suse_version} > 1010
-BuildRequires: fdupes
-%endif
+BuildRequires: dos2unix
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%{?fedora} == 17
-BuildRequires: java-1.7.0-openjdk-devel
+Requires: jpackage-utils >= 1.5.32
+Obsoletes: sblim-cim-client <= 1.3.5
+Provides: sblim-cim-client
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+BuildArch: noarch
+%if 0%{?suse_version} > 1010
+BuildRequires: fdupes
%endif
-
-%else
-
+%if 0%{?suse_version}
+BuildRequires: jaxp_parser_impl
+BuildRequires: update-alternatives
+BuildRequires: xml-commons-apis
%if 0%{?suse_version} < 1100
BuildRequires: java-1_5_0-ibm-devel
BuildRequires: java-1_5_0-ibm-fonts
%endif
-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
-
%description
The purpose of this package is to provide a CIM Client Class Library
for Java applications. It complies to the DMTF standard CIM Operations
@@ -70,8 +58,6 @@
infos about the Java Community Process and JSR48 can be found at
http://www.jcp.org and http://www.jcp.org/en/jsr/detail?id=48.
-
-
%package javadoc
Summary: Javadoc for sblim-cim-client2
Group: Development/Libraries/Java
@@ -79,8 +65,6 @@
%description javadoc
Javadoc for sblim-cim-client2.
-
-
%package manual
Summary: Manual and sample code for sblim-cim-client2
Group: Development/Libraries/Java
@@ -88,24 +72,10 @@
%description manual
Manual and sample code for sblim-cim-client2.
-
-
%prep
%setup -q -n %{project_folder}
-dos2unixConversion() {
- fileName=$1
- %{__sed} -i 's/\r//g' "$fileName"
-}
-dosFiles2unix() {
- fileList=$1
- for fileName in $fileList; do
- dos2unixConversion $fileName
- done
-}
-dosFiles2unix 'COPYING NEWS README ChangeLog sblim-cim-client2.properties
sblim-slp-client2.properties'
-for i in smpl/org/sblim/*/{example,samples}/*.{java,xml}; do
- [ -f "$i" ] && dos2unixConversion "$i"
-done
+dos2unix COPYING NEWS README ChangeLog sblim-cim-client2.properties
sblim-slp-client2.properties
+find -type f \( -name "*.java" \) -exec dos2unix {} +
# -----------------------------------------------------------------------------
@@ -120,32 +90,32 @@
%install
# --- documentation ---
-dstDocDir=$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+dstDocDir=%{buildroot}%{_docdir}/%{name}-%{version}
install -d $dstDocDir
install --mode=644 ChangeLog COPYING README NEWS $dstDocDir
# --- samples (also into _docdir) ---
cp -pr smpl/org $dstDocDir
# --- config files ---
-confDir=$RPM_BUILD_ROOT%{_sysconfdir}/java
+confDir=%{buildroot}%{_sysconfdir}/java
install -d $confDir
install --mode=664 sblim-cim-client2.properties sblim-slp-client2.properties
$confDir
# --- jar ---
-install -d $RPM_BUILD_ROOT%{_javadir}
-install %{archive_folder}/lib/%{name}-%{version}.jar
$RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
+install -d %{buildroot}%{_javadir}
+install %{archive_folder}/lib/%{name}-%{version}.jar
%{buildroot}%{_javadir}/%{name}-%{version}.jar
(
- cd $RPM_BUILD_ROOT%{_javadir} &&
+ cd %{buildroot}%{_javadir} &&
ln -sf %{name}-%{version}.jar %{name}.jar;
)
# --- javadoc ---
-mkdir -p $RPM_BUILD_ROOT%{_javadocdir}
-(cd $RPM_BUILD_ROOT%{_javadocdir}; unzip %{S:1})
+mkdir -p %{buildroot}%{_javadocdir}
+(cd %{buildroot}%{_javadocdir}; unzip %{SOURCE1})
#fix EOL encoding
-find $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}-doc -type f -exec sed -i
's/\r//' {} \;
+find %{buildroot}%{_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}
+install -d %{buildroot}%{_javadocdir}/%{name}-%{version}
+cp -pr %{archive_folder}/doc/* %{buildroot}%{_javadocdir}/%{name}-%{version}
%if 0%{?suse_version} > 1010
-%fdupes $RPM_BUILD_ROOT
+%fdupes %{buildroot}
%endif
# -----------------------------------------------------------------------------
