diff --git a/.gitignore b/.gitignore index 966624f..a992306 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ physfs-1.0.2.tar.gz /physfs-2.0.2.tar.gz /physfs-2.0.3.tar.bz2 +/physfs-3.0.0.tar.bz2 diff --git a/physfs-1.0.2-fix-soname-version.patch b/physfs-1.0.2-fix-soname-version.patch deleted file mode 100644 index 88235b4..0000000 --- a/physfs-1.0.2-fix-soname-version.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up physfs-1.0.2/configure.BAD physfs-1.0.2/configure ---- physfs-1.0.2/configure.BAD 2009-08-20 11:08:45.099180071 -0400 -+++ physfs-1.0.2/configure 2009-08-20 11:08:48.295180874 -0400 -@@ -1975,8 +1975,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - MAJOR_VERSION=1 - MINOR_VERSION=0 - MICRO_VERSION=2 --INTERFACE_AGE=2 --BINARY_AGE=2 -+INTERFACE_AGE=1 -+BINARY_AGE=1 - VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION - - diff --git a/physfs-2.0.2-system-lzma-sdk.patch b/physfs-2.0.2-system-lzma-sdk.patch deleted file mode 100644 index 65a57de..0000000 --- a/physfs-2.0.2-system-lzma-sdk.patch +++ /dev/null @@ -1,77 +0,0 @@ -diff -up physfs-2.0.2/archivers/lzma.c.system-lzmasdk physfs-2.0.2/archivers/lzma.c ---- physfs-2.0.2/archivers/lzma.c.system-lzmasdk 2011-10-17 15:20:32.452804224 -0400 -+++ physfs-2.0.2/archivers/lzma.c 2011-10-17 15:20:43.228664029 -0400 -@@ -18,9 +18,9 @@ - #define __PHYSICSFS_INTERNAL__ - #include "physfs_internal.h" - --#include "lzma/C/7zCrc.h" --#include "lzma/C/Archive/7z/7zIn.h" --#include "lzma/C/Archive/7z/7zExtract.h" -+#include "C/7zCrc.h" -+#include "C/Archive/7z/7zIn.h" -+#include "C/Archive/7z/7zExtract.h" - - - /* 7z internal from 7zIn.c */ -diff -up physfs-2.0.2/CMakeLists.txt.system-lzmasdk physfs-2.0.2/CMakeLists.txt ---- physfs-2.0.2/CMakeLists.txt.system-lzmasdk 2011-02-18 16:17:31.000000000 -0500 -+++ physfs-2.0.2/CMakeLists.txt 2011-10-17 15:21:33.081016247 -0400 -@@ -11,6 +11,8 @@ SET(PHYSFS_VERSION 2.0.2) - # Increment this if/when we break backwards compatibility. - SET(PHYSFS_SOVERSION 1) - -+SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/") -+ - # I hate that they define "WIN32" ... we're about to move to Win64...I hope! - IF(WIN32 AND NOT WINDOWS) - SET(WINDOWS TRUE) -@@ -216,7 +218,21 @@ OPTION(PHYSFS_ARCHIVE_7Z "Enable 7zip su - IF(PHYSFS_ARCHIVE_7Z) - ADD_DEFINITIONS(-DPHYSFS_SUPPORTS_7Z=1) - # !!! FIXME: rename to 7z.c? -- SET(PHYSFS_SRCS ${PHYSFS_SRCS} ${LZMA_SRCS}) -+ FIND_PACKAGE(LZMASDK) -+ -+ IF(LZMASDK_FOUND) -+ OPTION(PHYSFS_INTERNAL_LZMASDK "Link own lzma-sdk instead of system library" FALSE) -+ ELSE(HAVE_SYSTEM_LZMASDK) -+ SET(PHYSFS_INTERNAL_LZMASDK TRUE) -+ ENDIF(LZMASDK_FOUND) -+ -+ IF(PHYSFS_INTERNAL_LZMASDK) -+ SET(PHYSFS_SRCS ${PHYSFS_SRCS} ${LZMA_SRCS}) -+ INCLUDE_DIRECTORIES(lzma) -+ ELSE(PHYSFS_INTERNAL_LZMASDK) -+ SET(OPTIONAL_LIBRARY_LIBS ${OPTIONAL_LIBRARY_LIBS} ${LZMASDK_LIBRARY}) -+ INCLUDE_DIRECTORIES(${LZMASDK_INCLUDE_DIR}) -+ ENDIF(PHYSFS_INTERNAL_LZMASDK) - ENDIF(PHYSFS_ARCHIVE_7Z) - - OPTION(PHYSFS_ARCHIVE_GRP "Enable Build Engine GRP support" TRUE) -diff -up physfs-2.0.2/cmake/Modules/FindLZMASDK.cmake.system-lzmasdk physfs-2.0.2/cmake/Modules/FindLZMASDK.cmake ---- physfs-2.0.2/cmake/Modules/FindLZMASDK.cmake.system-lzmasdk 2011-10-17 15:19:46.350404763 -0400 -+++ physfs-2.0.2/cmake/Modules/FindLZMASDK.cmake 2011-10-17 15:19:46.349404776 -0400 -@@ -0,0 +1,22 @@ -+# - Find lzma-sdk -+# Find the native LZMASDK includes and library. -+# Once done this will define -+# -+# LZMASDK_INCLUDE_DIRS - where to find C/Archive/7z/7zExtract.h, etc. -+# LZMASDK_LIBRARIES - List of libraries when using lzmasdk. -+# LZMASDK_FOUND - True if lzmasdk found. -+ -+find_path(LZMASDK_INCLUDE_DIR NAMES C/Archive/7z/7zExtract.h PATH_SUFFIXES lzma457) -+find_library(LZMASDK_LIBRARY NAMES lzmasdk457) -+ -+set(LZMASDK_LIBRARIES ${LZMASDK_LIBRARY} ) -+set(LZMASDK_INCLUDE_DIRS ${LZMASDK_INCLUDE_DIR} ) -+ -+include(FindPackageHandleStandardArgs) -+# handle the QUIETLY and REQUIRED arguments and set LZMASDK_FOUND to TRUE -+# if all listed variables are TRUE -+find_package_handle_standard_args(LZMASDK DEFAULT_MSG -+ LZMASDK_LIBRARY LZMASDK_INCLUDE_DIR) -+ -+mark_as_advanced(LZMASDK_INCLUDE_DIR LZMASDK_LIBRARY ) -+ diff --git a/physfs-2.0.2-unused.patch b/physfs-2.0.2-unused.patch deleted file mode 100644 index 8841a06..0000000 --- a/physfs-2.0.2-unused.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -up physfs-2.0.2/archivers/wad.c.unused physfs-2.0.2/archivers/wad.c ---- physfs-2.0.2/archivers/wad.c.unused 2011-10-17 14:28:53.904209913 -0400 -+++ physfs-2.0.2/archivers/wad.c 2011-10-17 14:29:18.139905650 -0400 -@@ -245,9 +245,9 @@ static int wad_load_entries(const char * - PHYSFS_uint32 fileCount; - PHYSFS_uint32 directoryOffset; - WADentry *entry; -- char lastDirectory[9]; -+ /* char lastDirectory[9]; */ - -- lastDirectory[8] = 0; /* Make sure lastDirectory stays null-terminated. */ -+ /* lastDirectory[8] = 0; */ /* Make sure lastDirectory stays null-terminated. */ - - BAIL_IF_MACRO(!wad_open(name, forWriting, &fh, &fileCount,&directoryOffset), NULL, 0); - info->entryCount = fileCount; diff --git a/physfs-2.0.3-zlibfix.patch b/physfs-2.0.3-zlibfix.patch deleted file mode 100644 index af2b38f..0000000 --- a/physfs-2.0.3-zlibfix.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -up physfs-2.0.3/archivers/zip.c.zlibfix physfs-2.0.3/archivers/zip.c ---- physfs-2.0.3/archivers/zip.c.zlibfix 2017-02-13 11:27:37.271840684 -0500 -+++ physfs-2.0.3/archivers/zip.c 2017-02-13 11:28:30.853501297 -0500 -@@ -327,7 +327,8 @@ static int ZIP_seek(fvoid *opaque, PHYSF - return(0); - - inflateEnd(&finfo->stream); -- memcpy(&finfo->stream, &str, sizeof (z_stream)); -+ inflateCopy(&finfo->stream, &str); -+ inflateEnd(&str); - finfo->uncompressed_position = finfo->compressed_position = 0; - } /* if */ - diff --git a/physfs.spec b/physfs.spec index 281b84f..f0c74e7 100644 --- a/physfs.spec +++ b/physfs.spec @@ -1,17 +1,15 @@ Name: physfs -Version: 2.0.3 -Release: 11%{?dist} +Version: 3.0.0 +Release: 1%{?dist} License: zlib Group: System Environment/Libraries Summary: Library to provide abstract access to various archives URL: http://www.icculus.org/physfs/ Source0: http://www.icculus.org/physfs/downloads/physfs-%{version}.tar.bz2 -Patch1: physfs-2.0.2-system-lzma-sdk.patch -Patch2: physfs-2.0.3-zlibfix.patch -BuildRequires: doxygen, zlib-devel, readline-devel, libtool, cmake +BuildRequires: doxygen, readline-devel, libtool, cmake # Only needed to build a test program. # BuildRequires: wxGTK-devel -BuildRequires: lzma-sdk457-devel +Provides: bundled(lzma-sdk457) %description PhysicsFS is a library to provide abstract access to various archives. It is @@ -41,9 +39,6 @@ packages with physfs functionality. %prep %setup -q -%patch1 -p1 -b .system-lzmasdk -%patch2 -p1 -b .zlibfix -rm -rf lzma %build %cmake . @@ -82,7 +77,7 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/*.a %postun -p /sbin/ldconfig %files -%doc CHANGELOG.txt CREDITS.txt LICENSE.txt TODO.txt +%doc docs/CHANGELOG.txt docs/CREDITS.txt LICENSE.txt docs/TODO.txt %{_libdir}/*.so.* %files devel @@ -90,9 +85,13 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/*.a %{_bindir}/test_physfs %{_includedir}/physfs.h %{_libdir}/*.so +%{_libdir}/pkgconfig/physfs.pc %{_mandir}/man3/* %changelog +* Thu Sep 28 2017 Tom Callaway - 3.0.0-1 +- update to 3.0.0 + * Thu Aug 03 2017 Fedora Release Engineering - 2.0.3-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild diff --git a/sources b/sources index f366c28..379b498 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c2c727a8a8deb623b521b52d0080f613 physfs-2.0.3.tar.bz2 +SHA512 (physfs-3.0.0.tar.bz2) = 4293dc72a5b2e41fbd02c4426da7bfc1e94a013d8a332b3124798a91ef27b4a57adef303f23d5e03150855de69cf22fc8bb29e6395725a18e3a12f6c74b4111f