Compare commits
10 Commits
4936f40b2a
...
02ed8cfa3b
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
02ed8cfa3b | ||
|
|
fa104b4910 | ||
|
|
68125c4f1d | ||
|
|
f23f21015d | ||
|
|
51628bf7fc | ||
|
|
926873eaa5 | ||
|
|
b170605d56 | ||
|
|
3966c1a3aa | ||
|
|
1cd7120fd3 | ||
|
|
7f886da2b6 |
26
Fix-compilation-failure-caused-by-gcc12.patch
Normal file
26
Fix-compilation-failure-caused-by-gcc12.patch
Normal file
@ -0,0 +1,26 @@
|
||||
diff --git a/src/lib/coolkey/CoolKey_Message.cpp b/src/lib/coolkey/CoolKey_Message.cpp
|
||||
index 87ee309..7b80f70 100644
|
||||
--- a/src/lib/coolkey/CoolKey_Message.cpp
|
||||
+++ b/src/lib/coolkey/CoolKey_Message.cpp
|
||||
@@ -213,7 +213,7 @@ void eCKMessage::setBinValue(string &aKey,unsigned char*aValue,int *aSize)
|
||||
if(!aKey.length())
|
||||
return;
|
||||
|
||||
- if(aSize <=0 || !aValue)
|
||||
+ if(aSize ==0 || !aValue)
|
||||
return;
|
||||
|
||||
string data = "";
|
||||
diff --git a/src/lib/nss-http-client/request.cpp b/src/lib/nss-http-client/request.cpp
|
||||
index cabd94f..5428350 100644
|
||||
--- a/src/lib/nss-http-client/request.cpp
|
||||
+++ b/src/lib/nss-http-client/request.cpp
|
||||
@@ -192,7 +192,7 @@ PRBool PSHttpRequest::setBody(int size, const char* body) {
|
||||
}
|
||||
|
||||
_bodyLength = size;
|
||||
- sprintf(_body,body);
|
||||
+ sprintf(_body,"%s",body);
|
||||
//_body = (char *)body;
|
||||
|
||||
return PR_TRUE;
|
||||
6
_constraints
Normal file
6
_constraints
Normal file
@ -0,0 +1,6 @@
|
||||
<constraints>
|
||||
<linux><version>
|
||||
<min>4.0</min>
|
||||
</version></linux>
|
||||
</constraints>
|
||||
|
||||
31
esc.spec
31
esc.spec
@ -1,6 +1,6 @@
|
||||
Name: esc
|
||||
Version: 1.1.2
|
||||
Release: 3
|
||||
Release: 6
|
||||
Summary: esc embeds files into go programs and provides http
|
||||
License: GPL+
|
||||
URL: https://github.com/mjibson/esc
|
||||
@ -8,10 +8,12 @@ Source0: http://pki.fedoraproject.org/pki/sources/%{name}/%{name}-%{version}.tar
|
||||
Source1: esc
|
||||
Source2: esc.desktop
|
||||
Source3: esc.png
|
||||
Patch0: Fix-compilation-failure-caused-by-gcc12.patch
|
||||
|
||||
BuildRequires: glib2-devel atk-devel pkgconfig nspr-devel nss-devel nss-static
|
||||
BuildRequires: pcsc-lite-devel desktop-file-utils dbus-glib-devel glib2-devel gcc-c++
|
||||
BuildRequires: opensc gobject-introspection-devel gtk3-devel gjs-devel GConf2-devel
|
||||
BuildRequires: chrpath
|
||||
|
||||
Requires: pcsc-lite nss nspr dbus opensc gjs gobject-introspection gtk3 glib2
|
||||
|
||||
@ -55,7 +57,17 @@ ln -s %{_datadir}/icons/hicolor/48x48/apps/esc.png usr/share/pixmaps/esc.png
|
||||
popd
|
||||
|
||||
install -m 0755 %{SOURCE2} %{buildroot}/%{_datadir}/applications
|
||||
cp -a %{_mandir} %{buildroot}%{_mandir}
|
||||
|
||||
chrpath -d %{buildroot}%{_libdir}/%{name}-%{version}/lib/libcoolkeymgr-1.0.so.0.0.0
|
||||
|
||||
mkdir -p %{buildroot}/etc/ld.so.conf.d
|
||||
echo "/usr/local/lib" > %{buildroot}/etc/ld.so.conf.d/%{name}-%{_arch}.conf
|
||||
|
||||
%post
|
||||
/sbin/ldconfig
|
||||
|
||||
%postun
|
||||
/sbin/ldconfig
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
@ -69,11 +81,24 @@ cp -a %{_mandir} %{buildroot}%{_mandir}
|
||||
%{_datadir}/pixmaps/esc.png
|
||||
%{_datadir}/applications/esc.desktop
|
||||
%{_datadir}/icons/hicolor/48x48/apps/esc.png
|
||||
%config(noreplace) /etc/ld.so.conf.d/*
|
||||
|
||||
%files help
|
||||
%defattr(-,root,root)
|
||||
%{_mandir}/*
|
||||
|
||||
%changelog
|
||||
* Thu Jul 13 2023 liyanan <thistleslyn@163.com> - 1.1.2-6
|
||||
- fix build error
|
||||
|
||||
* Sat Jul 30 2022 yaoxin <yaoxin30@h-partners.com> - 1.1.2-5
|
||||
- Remove rpath
|
||||
- Add chrpath in BuildRequire
|
||||
|
||||
* Sat Mar 21 2020 openEuler Buildteam <buildteam@openeuler.org> - 1.1.2-4
|
||||
- Type: bugfix
|
||||
- ID: NA
|
||||
- SUG: NA
|
||||
- DESC: delete files in help package
|
||||
|
||||
* Thu Nov 21 2019 openEuler Buildteam <buildteam@openeuler.org> - 1.1.2-3
|
||||
- Package init
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user