Changeset 1629 for spec/trunk/SPECS/tinyxml2.spec

Timestamp:

May 5, 2019, 11:23:32 AM (6 years ago)

Author:

tellie

Message:

spec: tinyxml2: Release version 7.0.1-1.

File:

• spec/trunk/SPECS/tinyxml2.spec (modified) (4 diffs)

spec/trunk/SPECS/tinyxml2.spec

@@ -1 @@
-# tinyml2 parses files potentially coming from untrusted sources.
-%global         _hardened_build 1
-
-%global         githubparent    leethomason
-%global         commit          8c8293ba8969a46947606a93ff0cb5a083aab47a
-%global         shortcommit     %(c=%{commit}; echo ${c:0:7})
-%global         commitdate      20171211
-%global         gitversion      .%{commitdate}git%{shortcommit}
-
 Name:           tinyxml2
-Version:        6.2.0
+Version:        7.0.1
 Release:        1%{?dist}
 Summary:        Simple, small and efficient C++ XML parser
 
-Group:          Development/Libraries
 License:        zlib
-URL:            https://github.com/%{githubparent}/%{name}
-#Source0:        https://github.com/%{githubparent}/%{name}/archive/%{commit}/%{name}-%{version}-%{shortcommit}.tar.gz
-%scm_source github https://github.com/TeLLie/tinyxml2 master
-# EPEL has a too old CMake which is missing GNUInstallDirs (copied from Fedora 19 CMake)
-#Source1:        GNUInstallDirs.cmake
-#Patch0:         tinyxml2-epelbuild.patch
+URL:            https://github.com/leethomason/tinyxml2
+#Source0:        %{url}/archive/%{version}/%{name}-%{version}.tar.gz
+%scm_source git file://e:/gcc/tinyxml2 tinyxml2-master
 
-BuildRequires:  cmake
+BuildRequires:  cmake >= 2.6
+BuildRequires:  gcc
+#BuildRequires:  gcc-c++
 
 %description
@@ -39 +28 @@
 %package devel
 Summary:        Development files for %{name}
-Group:          Development/Libraries
-Requires:       %{name}%{?_isa} = %{version}-%{release}
+Requires:       %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description devel
@@ -47 +35 @@
 
 %prep
-#%setup -q -n %{name}-%{commit}
+#%autosetup
 %scm_setup
 chmod -c -x *.cpp *.h
-
-# temporary fix for https://github.com/leethomason/tinyxml2/pull/653
-sed -i -e 's,lib/,${CMAKE_INSTALL_LIBDIR}/,g' CMakeLists.txt
-
-#%if 0%{?rhel} == 5 || 0%{?rhel} == 6
-#%patch0 -p1 -b .epel
-#cp -p %{SOURCE1} .
-#%endif
 
 %build
 mkdir objdir
 cd objdir
-%cmake .. -DBUILD_STATIC_LIBS=OFF
+%cmake .. 
 make %{?_smp_mflags}
+
 
 # Library tests were disabled in 3.0.0
@@ -81 +62 @@
 cd objdir
 make install DESTDIR=%{buildroot}
+cp D:/rpmbuild/Build/tinyxml2-7.0.1/objdir/*.dll %{buildroot}%{_libdir}
+rm %{buildroot}%{_bindir}/tinyxml7.dll
 
 #%ldconfig_scriptlets
 
 %files
+%defattr(-,root,root,-)
 %doc readme.md
-#%{_libdir}/lib%{name}.so.%{version}
-#%{_libdir}/lib%{name}.so.6
-%{_libdir}/%{name}*.a
-#%{_libdir}/tinyxml6.dll
+%{_libdir}/tinyxml7.dll
 
 %files devel
+%defattr(-,root,root,-)
 %{_includedir}/%{name}.h
-#%{_libdir}/lib%{name}.dll
-%{_bindir}/tinyxml6.dll
+%{_libdir}/tinyxml2_dll.a
 %{_libdir}/pkgconfig/%{name}.pc
-%{_libdir}/cmake/%{name}/tinyxml2Config.cmake
-%{_libdir}/cmake/%{name}/tinyxml2Targets-noconfig.cmake
-%{_libdir}/cmake/%{name}/tinyxml2Targets.cmake
-
+%{_libdir}/cmake/%{name}/
 
 %changelog
+* Sat May 04 2019 Elbert Pol <elbert.pol@gmail.com> - 7.0.1-1
+- Updated to latest source
+- Fix wrong dll place
+
 * Fri May 11 2018  Elbert Pol <elbert.pol@gmail.com> - 6.2.0-1
 -  initial rpm for OS2