diff options
author | DongHun Kwak <dh0128.kwak@samsung.com> | 2021-10-15 10:17:50 +0900 |
---|---|---|
committer | DongHun Kwak <dh0128.kwak@samsung.com> | 2021-10-15 10:27:21 +0900 |
commit | b365322c0925e152b087059ec9b975ba48941bc2 (patch) | |
tree | cc52dcb98ed7e26dca6edf65439fb7115815b4e9 | |
parent | 1f6dd37bbdf2efff1849e23249895ae4f15fde8f (diff) | |
download | dos2unix-sandbox/backup/dos2unix_7.4.2_20221227.tar.gz dos2unix-sandbox/backup/dos2unix_7.4.2_20221227.tar.bz2 dos2unix-sandbox/backup/dos2unix_7.4.2_20221227.zip |
Bump to dos2unix 7.4.2tizen_7.0_m2_releasesubmit/tizen_base/20211110.230941accepted/tizen/base/20221115.103650accepted/tizen/base/20211115.010613accepted/tizen/7.0/base/hotfix/20221116.055221accepted/tizen/7.0/base/20221116.025813tizen_7.0_base_hotfixtizen_7.0_basesandbox/dh0128.kwak/dos2unix-7.4.2-20211015sandbox/backup/dos2unix_7.4.2_20221227accepted/tizen_7.0_base_hotfixaccepted/tizen_7.0_base
Change-Id: I9b0050cba9c2918321719ecb117e1f646fc6ab14
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>
-rw-r--r-- | packaging/0001-Add-pie-option.patch | 33 | ||||
-rw-r--r-- | packaging/dos2unix.manifest | 5 | ||||
-rw-r--r-- | packaging/dos2unix.spec | 51 |
3 files changed, 89 insertions, 0 deletions
diff --git a/packaging/0001-Add-pie-option.patch b/packaging/0001-Add-pie-option.patch new file mode 100644 index 0000000..dcb4306 --- /dev/null +++ b/packaging/0001-Add-pie-option.patch @@ -0,0 +1,33 @@ +From 422004616c651c18b58e56d32993ddbb7db56c93 Mon Sep 17 00:00:00 2001 +From: Hyunjee Kim <hj0426.kim@samsung.com> +Date: Wed, 4 Dec 2019 13:45:53 +0900 +Subject: [PATCH] Add pie option + +Change-Id: Ic2b940da22944eed94d3a50cb983c4af09339e02 +Signed-off-by: Hyunjee Kim <hj0426.kim@samsung.com> + +diff --git a/Makefile b/Makefile +index 2892f11..7b84b9a 100644 +--- a/Makefile ++++ b/Makefile +@@ -322,7 +322,7 @@ endif + # PostScript and PDF generation from UTF-8 manuals is not working, + # or I don't know how to do it. + +-CFLAGS_USER = ++CFLAGS_USER = -fPIC + ifeq ($(DEBUG), 1) + CFLAGS ?= -O0 + else +@@ -357,7 +357,7 @@ ifdef LFS + EXTRA_CFLAGS += -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 + endif + +-LDFLAGS_USER = ++LDFLAGS_USER = -pie + LDFLAGS = $(RPM_LD_FLAGS) $(LDFLAGS_EXTRA) $(LDFLAGS_USER) + LIBS = $(LIBS_EXTRA) + +-- +2.17.1 + diff --git a/packaging/dos2unix.manifest b/packaging/dos2unix.manifest new file mode 100644 index 0000000..017d22d --- /dev/null +++ b/packaging/dos2unix.manifest @@ -0,0 +1,5 @@ +<manifest> + <request> + <domain name="_"/> + </request> +</manifest> diff --git a/packaging/dos2unix.spec b/packaging/dos2unix.spec new file mode 100644 index 0000000..be1b296 --- /dev/null +++ b/packaging/dos2unix.spec @@ -0,0 +1,51 @@ +Name: dos2unix +Version: 7.4.2 +Release: 0 +License: BSD-2-Clause +Summary: Text converters to and from DOS/MAC to UNIX +Url: http://waterlan.home.xs4all.nl/dos2unix.html +Group: Productivity/Text/Convertors +Source: http://waterlan.home.xs4all.nl/dos2unix/dos2unix-%{version}.tar.gz +Source1: 0001-Add-pie-option.patch +Source1001: dos2unix.manifest +BuildRequires: gettext-tools +Provides: unix2dos = %{version} +Obsoletes: unix2dos < %{version} +BuildRoot: %{_tmppath}/%{name}-%{version}-build + +%description +Dos2unix is used to convert plain text from DOS (CR/LF) format. Mac2unix +converts plain text from MAC (CR) format to UNIX format (LF). + +Unix2dos converts plain text files from UNIX +format to DOS format and unix2dos converts from UNIX to MAC format. + +%prep +%setup -q +cp %{SOURCE1001} . +%{__patch} -p1 < %{SOURCE1} +#find . -type f | xargs chmod -x + +%build +export RPM_OPT_FLAGS +make %{?_smp_mflags} CC="gcc" HTMLEXT="html" + + +%install +%make_install docdir=%{_defaultdocdir}/%{name} +%{find_lang} dos2unix --all-name --with-man + +%files -f dos2unix.lang +%manifest %{name}.manifest +%defattr(-,root,root,0755) +%license COPYING.txt +%doc /usr/share/doc/%{name}-%{version} +%{_bindir}/dos2unix +%{_bindir}/mac2unix +%{_bindir}/unix2mac +%{_bindir}/unix2dos +%doc %{_mandir}/*/dos2unix.1* +%doc %{_mandir}/*/mac2unix.1* +%doc %{_mandir}/*/unix2mac.1* +%doc %{_mandir}/*/unix2dos.1* +%doc %lang(nl) %dir %{_mandir}/nl |