From 1c2c33d72996ccd2867ea664a13a1df2729ab050 Mon Sep 17 00:00:00 2001 From: Mario Ceresa Date: Thu, 3 Feb 2011 11:54:11 +0100 Subject: [PATCH] Updated to new version --- .gitignore | 1 + CharLS.spec | 17 +++++++++++------ sources | 1 + 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 8f57b64..1679be9 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ CharLS-1.0_beta.zip +/CharLS-source-1.0.zip diff --git a/CharLS.spec b/CharLS.spec index 244f4bf..683dd1e 100644 --- a/CharLS.spec +++ b/CharLS.spec @@ -1,6 +1,6 @@ Name: CharLS Version: 1.0 -Release: 0.1.b%{?dist} +Release: 1%{?dist} Summary: An optimized implementation of the JPEG-LS standard Group: Development/Libraries License: BSD @@ -8,9 +8,10 @@ URL: http://charls.codeplex.com/ # CharLS uses an interactive download link that asks you to accept the # (BSD-like) license before obtaining the source code. # You can find the download link at http://charls.codeplex.com/ -Source0: CharLS-1.0_beta.zip +Source0: CharLS-source-1.0.zip Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Patch0: libcharls_cmake_install.patch +Patch0: charls_add_cmake_install_target.patch +Patch1: charls_add_sharedlib_soname.patch BuildRequires: cmake >= 2.6.0 BuildRequires: dos2unix @@ -33,12 +34,13 @@ result in vastly different performance characteristics. rm CharLS.vcproj rm CharLS.sln -%patch0 - dos2unix *.h dos2unix *.c* dos2unix *.txt +%patch0 -p1 +%patch1 -p1 + %build %cmake -DBUILD_SHARED_LIBS:BOOL=ON\ @@ -89,8 +91,11 @@ CharLS Library Header Files and Link Libraries %{_libdir}/*.so %changelog +* Thu Feb 3 2011 Mario Ceresa mrceresa@gmail.com CharLS 1.0-1 +- Update to new version + * Wed Feb 17 2010 Mario Ceresa mrceresa@gmail.com CharLS 1.0-0.1.b -- - Changed name schema to comply with pre-release packages + * Wed Feb 17 2010 Mario Ceresa mrceresa@gmail.com CharLS 1.0b-1 - Initial RPM Release diff --git a/sources b/sources index e2e2934..49f9f2e 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ b364b6b56f474327ad186d8e6b8f740d CharLS-1.0_beta.zip +4694f02fbe2c4e1897ff2188d6e3cefc CharLS-source-1.0.zip