Project import/unshield - Diff 8b374cd479...6f1202be13
| ... | ... | --- a/.abf.yml |
| ... | ... | +++ b/.abf.yml |
| ... | ... | @@ -1,4 +1,5 @@ |
| 1 | 1 |
removed_sources:
|
| 2 | 2 |
unshield-1.0.tar.gz: b9e09a23d7172dc43c914b764470aec182e4f468
|
| 3 |
sources:
|
|
| 4 | 3 |
unshield-1.3.tar.gz: 7b1437d6adffdf4cb4352e602c6dfb27cef22830
|
| 4 |
sources:
|
|
| 5 |
unshield-1.4.2.tar.gz: 02935c888b04507f0a14036773539a4f8c20a152
|
| ... | ... | --- a/0001-Fix-build-process-in-build-jails.patch |
| ... | ... | +++ /dev/null |
| ... | ... | @@ -1,59 +0,0 @@ |
| 0 |
From 07ce8d82f0f60b9048265410fa8063298ab520c4 Mon Sep 17 00:00:00 2001
|
|
| 1 |
From: Dan Church <amphetamachine@gmail.com>
|
|
| 2 |
Date: Thu, 2 Jul 2015 12:02:06 -0500
|
|
| 3 |
Subject: [PATCH] Fix build process in build jails
|
|
| 4 |
|
|
| 5 |
Fixes #22
|
|
| 6 |
---
|
|
| 7 |
CMakeLists.txt | 3 ++-
|
|
| 8 |
lib/internal.h | 2 +-
|
|
| 9 |
src/unshield.c | 2 +-
|
|
| 10 |
3 files changed, 4 insertions(+), 3 deletions(-)
|
|
| 11 |
|
|
| 12 |
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
| 13 |
index c7a748b..8cc0001 100644
|
|
| 14 |
--- a/CMakeLists.txt
|
|
| 15 |
+++ b/CMakeLists.txt
|
|
| 16 |
@@ -58,6 +58,7 @@ message(STATUS "BUILD_STATIC: ${BUILD_STATIC}")
|
|
| 17 |
add_definitions(-DHAVE_CONFIG_H)
|
|
| 18 |
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lib/unshield_config.h.in ${CMAKE_CURRENT_BINARY_DIR}/lib/unshield_config.h)
|
|
| 19 |
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libunshield.pc.in ${CMAKE_CURRENT_BINARY_DIR}/libunshield.pc @ONLY)
|
|
| 20 |
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
|
|
| 21 |
|
|
| 22 |
# To force position independent code for static libs on Linux x64
|
|
| 23 |
if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64")
|
|
| 24 |
@@ -68,4 +69,4 @@ add_subdirectory(lib)
|
|
| 25 |
add_subdirectory(src)
|
|
| 26 |
|
|
| 27 |
install(FILES man/unshield.1 DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/man/man1)
|
|
| 28 |
-install(FILES libunshield.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
|
|
| 29 |
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libunshield.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
|
|
| 30 |
diff --git a/lib/internal.h b/lib/internal.h
|
|
| 31 |
index 0ea88be..1f5718a 100644
|
|
| 32 |
--- a/lib/internal.h
|
|
| 33 |
+++ b/lib/internal.h
|
|
| 34 |
@@ -3,7 +3,7 @@
|
|
| 35 |
#define __internal_h__
|
|
| 36 |
|
|
| 37 |
#include "libunshield.h"
|
|
| 38 |
-#include "unshield_config.h"
|
|
| 39 |
+#include "lib/unshield_config.h"
|
|
| 40 |
|
|
| 41 |
#if HAVE_STDINT_H
|
|
| 42 |
#include <stdint.h>
|
|
| 43 |
diff --git a/src/unshield.c b/src/unshield.c
|
|
| 44 |
index 296abf6..158195f 100644
|
|
| 45 |
--- a/src/unshield.c
|
|
| 46 |
+++ b/src/unshield.c
|
|
| 47 |
@@ -13,7 +13,7 @@
|
|
| 48 |
#include <unistd.h>
|
|
| 49 |
#include "../lib/libunshield.h"
|
|
| 50 |
#ifdef HAVE_CONFIG_H
|
|
| 51 |
-#include "../lib/unshield_config.h"
|
|
| 52 |
+#include "lib/unshield_config.h"
|
|
| 53 |
#endif
|
|
| 54 |
#if HAVE_FNMATCH
|
|
| 55 |
#include <fnmatch.h>
|
|
| ... | ... | --- |
| 56 |
2.6.4
|
|
| 57 |
|
| ... | ... | --- a/libconvert_utf_static.patch |
| ... | ... | +++ b/libconvert_utf_static.patch |
| ... | ... | @@ -6,7 +6,6 @@ index eb60fe3..4b956e9 100644 |
| 6 | 6 |
"ConvertUTF.c"
|
| 7 | 7 |
)
|
| 8 | 8 |
|
| 9 |
-add_library(convert_utf ${LIBCONVERT_UTF_HEADES} ${LIBCONVERT_UTF_SOURCES})
|
|
| 10 |
\ No newline at end of file
|
|
| 9 |
-add_library(convert_utf STATIC ${LIBCONVERT_UTF_HEADES} ${LIBCONVERT_UTF_SOURCES})
|
|
| 11 | 10 |
+add_library(convert_utf STATIC ${LIBCONVERT_UTF_HEADES} ${LIBCONVERT_UTF_SOURCES})
|
| 12 | 11 |
+set_property(TARGET convert_utf PROPERTY POSITION_INDEPENDENT_CODE ON)
|
| ... | ... | --- a/unshield.spec |
| ... | ... | +++ b/unshield.spec |
| ... | ... | @@ -1,17 +1,17 @@ |
| 1 |
%define major 1.3
|
|
| 1 |
%define major 0
|
|
| 2 | 2 |
%define libname %mklibname %{name} %{major}
|
| 3 | 3 |
%define devname %mklibname %{name} -d
|
| 4 | 4 |
|
| 5 | 5 |
Summary: A program to extract InstallShield cabinet files
|
| 6 | 6 |
Name: unshield
|
| 7 |
Version: 1.3
|
|
| 8 |
Release: 3
|
|
| 7 |
Version: 1.4.2
|
|
| 8 |
Release: 1
|
|
| 9 | 9 |
License: MIT
|
| 10 | 10 |
Group: Networking/Other
|
| 11 | 11 |
Url: http://synce.sourceforge.net/
|
| 12 | 12 |
Source0: http://downloads.sourceforge.net/synce/%{name}-%{version}.tar.gz
|
| 13 | 13 |
# From upstream:
|
| 14 |
Patch0001: 0001-Fix-build-process-in-build-jails.patch
|
|
| 14 |
#Patch0001: 0001-Fix-build-process-in-build-jails.patch
|
|
| 15 | 15 |
# From openSUSE:
|
| 16 | 16 |
Patch0100: libconvert_utf_static.patch
|
| 17 | 17 |
BuildRequires: libtool
|