!17 Modify version in changelog and Sync code

From: @starlet-dx 
Reviewed-by: @wk333 
Signed-off-by: @wk333
This commit is contained in:
openeuler-ci-bot 2024-05-27 10:01:49 +00:00 committed by Gitee
commit 2bf73118d0
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 50 additions and 4 deletions

View File

@ -0,0 +1,41 @@
From d94c298552f7e9eb9ee063903ed8e14c9e42e132 Mon Sep 17 00:00:00 2001
From: wang--ge <wang__ge@126.com>
Date: Tue, 6 Jun 2023 14:12:44 +0800
Subject: [PATCH] add pie compile option
---
Makefile | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/Makefile b/Makefile
index 80c8fe5..d16c755 100644
--- a/Makefile
+++ b/Makefile
@@ -3,19 +3,19 @@ INSTALLDEST=/usr/local/bin/sysget
CCP=g++
prog: main.o packagemanager.o utils.o translation.o
- $(CCP) $(FLAGS) -o sysget main.o packagemanager.o utils.o translation.o
+ $(CCP) $(FLAGS) -pie -o sysget main.o packagemanager.o utils.o translation.o
main.o: src/main.cpp src/main.hpp
- $(CCP) $(FLAGS) -c src/main.cpp src/main.hpp
+ $(CCP) $(FLAGS) -fPIE -c src/main.cpp src/main.hpp
packagemanager.o: src/packagemanager.hpp src/packagemanager.cpp
- $(CCP) $(FLAGS) -c src/packagemanager.hpp src/packagemanager.cpp
+ $(CCP) $(FLAGS) -fPIE -c src/packagemanager.hpp src/packagemanager.cpp
utils.o: src/utils.hpp src/utils.cpp
- $(CCP) $(FLAGS) -c src/utils.hpp src/utils.cpp
+ $(CCP) $(FLAGS) -fPIE -c src/utils.hpp src/utils.cpp
translation.o: src/translation.hpp src/translation.cpp
- $(CCP) $(FLAGS) -c src/translation.hpp src/translation.cpp
+ $(CCP) $(FLAGS) -fPIE -c src/translation.hpp src/translation.cpp
install:
cp sysget $(INSTALLDEST)
--
2.33.0

View File

@ -1,11 +1,12 @@
Name: sysget
Version: 2.3
Release: 4
Release: 5
Summary: One package manager to rule them all
License: GPLv3
URL: http://sysget.emilengler.com
Source0: https://github.com/emilengler/sysget/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
Patch1: sysget-should-generate-debuginfo.patch
Patch2: 0001-add-pie-compile-option.patch
BuildRequires: gcc autoconf automake make gcc-c++
@ -17,6 +18,7 @@ The syntax is mostly same with apt so it should be easy to use.
%prep
%setup -q -n %{name}-%{version}/
%patch1 -p1
%patch2 -p1
%build
%make_build
@ -49,13 +51,16 @@ install -m0644 contrib/sysget.bash-completion %{buildroot}/%{_sysconfdir}/bash_c
%changelog
* Thu 09 Sep 2021 sunguoshuai <sunguoshuai@huawei.com> - 2.3.2-4
* Tue Jun 06 2023 Ge Wang <wang__ge@126.com> - 2.3-5
- Add pie compile option
* Thu Sep 09 2021 sunguoshuai <sunguoshuai@huawei.com> - 2.3-4
- sysget should generate debuginfo
* Mon May 31 2021 huanghaitao <huanghaitao8@huawei.com> - 2.3.2-3
* Mon May 31 2021 huanghaitao <huanghaitao8@huawei.com> - 2.3-3
- Completing build dependencies to fix gcc-c++ compiler missing error
* Thu Sep 24 2020 ShiYuan Hu<421699196@qq.com> - 2.3.2
* Thu Sep 24 2020 ShiYuan Hu<421699196@qq.com> - 2.3-2
- refresh source0 url
* Sun Mar 29 2020 Wei Xiong <myeuler@163.com>