Compare commits
No commits in common. "02ed8cfa3bfcfbc3619106d14bfe44d76d7c1966" and "4936f40b2a1799fe1d90433afaf6c64e0ffa5d87" have entirely different histories.
02ed8cfa3b
...
4936f40b2a
@ -1,26 +0,0 @@
|
|||||||
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;
|
|
||||||
@ -1,6 +0,0 @@
|
|||||||
<constraints>
|
|
||||||
<linux><version>
|
|
||||||
<min>4.0</min>
|
|
||||||
</version></linux>
|
|
||||||
</constraints>
|
|
||||||
|
|
||||||
31
esc.spec
31
esc.spec
@ -1,6 +1,6 @@
|
|||||||
Name: esc
|
Name: esc
|
||||||
Version: 1.1.2
|
Version: 1.1.2
|
||||||
Release: 6
|
Release: 3
|
||||||
Summary: esc embeds files into go programs and provides http
|
Summary: esc embeds files into go programs and provides http
|
||||||
License: GPL+
|
License: GPL+
|
||||||
URL: https://github.com/mjibson/esc
|
URL: https://github.com/mjibson/esc
|
||||||
@ -8,12 +8,10 @@ Source0: http://pki.fedoraproject.org/pki/sources/%{name}/%{name}-%{version}.tar
|
|||||||
Source1: esc
|
Source1: esc
|
||||||
Source2: esc.desktop
|
Source2: esc.desktop
|
||||||
Source3: esc.png
|
Source3: esc.png
|
||||||
Patch0: Fix-compilation-failure-caused-by-gcc12.patch
|
|
||||||
|
|
||||||
BuildRequires: glib2-devel atk-devel pkgconfig nspr-devel nss-devel nss-static
|
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: 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: opensc gobject-introspection-devel gtk3-devel gjs-devel GConf2-devel
|
||||||
BuildRequires: chrpath
|
|
||||||
|
|
||||||
Requires: pcsc-lite nss nspr dbus opensc gjs gobject-introspection gtk3 glib2
|
Requires: pcsc-lite nss nspr dbus opensc gjs gobject-introspection gtk3 glib2
|
||||||
|
|
||||||
@ -57,17 +55,7 @@ ln -s %{_datadir}/icons/hicolor/48x48/apps/esc.png usr/share/pixmaps/esc.png
|
|||||||
popd
|
popd
|
||||||
|
|
||||||
install -m 0755 %{SOURCE2} %{buildroot}/%{_datadir}/applications
|
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
|
%files
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
@ -81,24 +69,11 @@ echo "/usr/local/lib" > %{buildroot}/etc/ld.so.conf.d/%{name}-%{_arch}.conf
|
|||||||
%{_datadir}/pixmaps/esc.png
|
%{_datadir}/pixmaps/esc.png
|
||||||
%{_datadir}/applications/esc.desktop
|
%{_datadir}/applications/esc.desktop
|
||||||
%{_datadir}/icons/hicolor/48x48/apps/esc.png
|
%{_datadir}/icons/hicolor/48x48/apps/esc.png
|
||||||
%config(noreplace) /etc/ld.so.conf.d/*
|
|
||||||
|
|
||||||
%files help
|
%files help
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
|
%{_mandir}/*
|
||||||
|
|
||||||
%changelog
|
%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
|
* Thu Nov 21 2019 openEuler Buildteam <buildteam@openeuler.org> - 1.1.2-3
|
||||||
- Package init
|
- Package init
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user