From 86fd1700038a5553d84e5ea6c67a2e39d3fbe2c7ce693a599a7f5e9468d3f1ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= <ismail@i10z.com>
Date: Fri, 4 Sep 2015 15:14:39 +0000
Subject: [PATCH] Accepting request 329123 from
 home:scarabeus_iv:branches:devel:libraries:c_c++

- Version bump to 1.6:
  * See manual.html for in-depth changelog
- Use %cmake macros properly

OBS-URL: https://build.opensuse.org/request/show/329123
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/pugixml?expand=0&rev=3
---
 pugixml-1.5.tar.gz |  3 ---
 pugixml-1.6.tar.gz |  3 +++
 pugixml.changes    |  7 +++++++
 pugixml.spec       | 44 +++++++++++++++++++-------------------------
 4 files changed, 29 insertions(+), 28 deletions(-)
 delete mode 100644 pugixml-1.5.tar.gz
 create mode 100644 pugixml-1.6.tar.gz

diff --git a/pugixml-1.5.tar.gz b/pugixml-1.5.tar.gz
deleted file mode 100644
index 8a10d2b..0000000
--- a/pugixml-1.5.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d70b98002968d9431e4166e6a76486a6d346eb9a76d1a0e7be58e786d3dee670
-size 374783
diff --git a/pugixml-1.6.tar.gz b/pugixml-1.6.tar.gz
new file mode 100644
index 0000000..a101551
--- /dev/null
+++ b/pugixml-1.6.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:473705c496d45ee6a74f73622b175dfb5dde0de372c4dc61a5acb964516cd9de
+size 346616
diff --git a/pugixml.changes b/pugixml.changes
index ceb253c..5aeaa11 100644
--- a/pugixml.changes
+++ b/pugixml.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Sep  4 13:09:48 UTC 2015 - tchvatal@suse.com
+
+- Version bump to 1.6:
+  * See manual.html for in-depth changelog
+- Use %cmake macros properly
+
 -------------------------------------------------------------------
 Thu Mar  5 06:44:51 UTC 2015 - davejplater@gmail.com
 
diff --git a/pugixml.spec b/pugixml.spec
index 6a0f8f7..5875bd6 100644
--- a/pugixml.spec
+++ b/pugixml.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package pugixml
 #
-# Copyright (c) 2015 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
@@ -16,10 +16,9 @@
 #
 
 
-%define so_ver 1
-
+%define _libname libpugixml1
 Name:           pugixml
-Version:        1.5
+Version:        1.6
 Release:        0
 Summary:        Light-weight C++ XML Processing Library
 License:        MIT
@@ -46,17 +45,17 @@ The library is extremely portable and easy to integrate and use.
 %package devel
 Summary:        Development Files for pugixml
 Group:          Development/Libraries/C and C++
-Requires:       libpugixml%{so_ver} = %{version}
+Requires:       %{_libname} = %{version}
 
 %description devel
 This package provides development libraries and headers needed to build
 software using pugixml.
 
-%package -n libpugixml%{so_ver}
+%package -n %{_libname}
 Summary:        Light-weight C++ XML Processing Library
 Group:          System/Libraries
 
-%description -n libpugixml%{so_ver}
+%description -n %{_libname}
 pugixml is a light-weight C++ XML processing library. It features:
 
 - DOM-like interface with rich traversal/modification capabilities
@@ -72,32 +71,27 @@ The library is extremely portable and easy to integrate and use.
 %setup -q
 
 %build
-export CFLAGS="%{optflags}"
-export CXXFLAGS="%{optflags}"
-mkdir build
-cd build
-cmake \
-    -DCMAKE_INSTALL_PREFIX=%{_prefix} \
-    -DCMAKE_INSTALL_LIBDIR=%{_libdir} \
-    -DBUILD_SHARED_LIBS=ON \
-    ../scripts
-make %{?_smp_mflags} VERBOSE=1
-cd ..
-%install
-make DESTDIR=%{buildroot} install -C build
-rm -rf %{buildroot}%{_libdir}/cmake
-%post -n libpugixml%{so_ver} -p /sbin/ldconfig
+cd scripts
+%cmake
+make %{?_smp_mflags}
 
-%postun -n libpugixml%{so_ver} -p /sbin/ldconfig
+%install
+cd scripts
+%cmake_install
+
+%post -n %{_libname} -p /sbin/ldconfig
+
+%postun -n %{_libname} -p /sbin/ldconfig
 
 %files devel
 %defattr(-,root,root,-)
 %doc readme.txt docs/*
 %{_includedir}/*.hpp
+%{_libdir}/cmake/*
 %{_libdir}/*.so
 
-%files -n libpugixml%{so_ver}
+%files -n %{_libname}
 %defattr(-,root,root,-)
-%{_libdir}/libpugixml.so.%{so_ver}*
+%{_libdir}/libpugixml.so.*
 
 %changelog