[packages/userspace-rcu] - revert last commit
hawk
hawk at pld-linux.org
Fri Feb 10 18:09:47 CET 2023
commit 27f1398e7241f2f092c30dffd0d39e7489c6905a
Author: Marcin Krol <hawk at tld-linux.org>
Date: Fri Feb 10 18:09:21 2023 +0100
- revert last commit
no_examples.patch | 8 --------
userspace-rcu.spec | 11 +++++------
2 files changed, 5 insertions(+), 14 deletions(-)
---
diff --git a/userspace-rcu.spec b/userspace-rcu.spec
index fd2ccd0..5612de0 100644
--- a/userspace-rcu.spec
+++ b/userspace-rcu.spec
@@ -7,7 +7,6 @@ License: LGPL v2.1+ (library), GPL v2 (tests)
Group: Libraries
Source0: https://lttng.org/files/urcu/%{name}-%{version}.tar.bz2
# Source0-md5: eecffc78f89938424b328298d76d856f
-Patch0: no_examples.patch
URL: http://liburcu.org/
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -62,16 +61,12 @@ Statyczne biblioteki Userspace RCU.
%prep
%setup -q
-%patch -p1
%build
-%{__aclocal}
-%{__autoconf} -I m4
-%{__automake}
%configure \
--disable-silent-rules
-%{make}
+%{__make}
%install
rm -rf $RPM_BUILD_ROOT
@@ -84,6 +79,9 @@ rm -rf $RPM_BUILD_ROOT
# packaged as %doc
%{__rm} $RPM_BUILD_ROOT%{_docdir}/userspace-rcu/{{rcu,cds,uatomic}-api.md,LICENSE,README.md,solaris-build.md}
+install -d $RPM_BUILD_ROOT%{_examplesdir}
+%{__mv} $RPM_BUILD_ROOT%{_docdir}/userspace-rcu/examples $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -138,6 +136,7 @@ rm -rf $RPM_BUILD_ROOT
%{_pkgconfigdir}/liburcu-memb.pc
%{_pkgconfigdir}/liburcu-qsbr.pc
%{_pkgconfigdir}/liburcu-signal.pc
+%{_examplesdir}/%{name}-%{version}
%files static
%defattr(644,root,root,755)
diff --git a/no_examples.patch b/no_examples.patch
deleted file mode 100644
index 20b5ed1..0000000
--- a/no_examples.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- userspace-rcu-0.13.1/doc/Makefile.am 2023-02-10 18:00:32.314848761 +0100
-+++ userspace-rcu-0.13.1/doc/Makefile.am 2023-02-10 18:00:35.760848972 +0100
-@@ -1,4 +1,4 @@
--SUBDIRS = examples
-+#SUBDIRS = examples
-
- dist_doc_DATA = rcu-api.md \
- cds-api.md \
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/userspace-rcu.git/commitdiff/27f1398e7241f2f092c30dffd0d39e7489c6905a
More information about the pld-cvs-commit
mailing list