This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
laforge gerrit-no-reply at lists.osmocom.orglaforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/18313 ) Change subject: contrib: integrate RPM spec ...................................................................... contrib: integrate RPM spec Remove OpenSUSE bug report link, set version to @VERSION@, make it build with CentOS 8 etc. Disable lms, usrp1 for CentOS 8. Related: OS#4550 Change-Id: Ie27fcc4f9033f0049507d9dcc295541ac0744c73 --- M .gitignore M configure.ac R contrib/osmo-trx.spec.in 3 files changed, 32 insertions(+), 9 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/.gitignore b/.gitignore index f163fb6..128f803 100644 --- a/.gitignore +++ b/.gitignore @@ -63,3 +63,6 @@ doc/manuals/osmomsc-usermanual.xml doc/manuals/common doc/manuals/build + +contrib/osmo-trx.spec +!contrib/osmo-trx.spec.in diff --git a/configure.ac b/configure.ac index d0cfe44..07d4bf4 100644 --- a/configure.ac +++ b/configure.ac @@ -336,4 +336,5 @@ ]) AC_OUTPUT( - doc/manuals/Makefile) + doc/manuals/Makefile + contrib/osmo-trx.spec) diff --git a/contrib/osmo-trx.spec b/contrib/osmo-trx.spec.in similarity index 92% rename from contrib/osmo-trx.spec rename to contrib/osmo-trx.spec.in index 2e5989d..535e375 100644 --- a/contrib/osmo-trx.spec +++ b/contrib/osmo-trx.spec.in @@ -12,33 +12,34 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ -# - - Name: osmo-trx -Version: 1.2.0.33 +Version: @VERSION@ Release: 0 Summary: SDR transceiver that implements Layer 1 of a GSM BTS License: AGPL-3.0-or-later Group: Productivity/Telephony/Servers -URL: https://osmocom.org/projects/osmotrx/wiki/OsmoTRX +URL: https://osmocom.org/projects/osmotrx Source: %{name}-%{version}.tar.xz -Source99: osmo-trx-rpmlintrc BuildRequires: autoconf BuildRequires: automake BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: libtool BuildRequires: pkgconfig >= 0.20 +%if 0%{?suse_version} +BuildRequires: systemd-rpm-macros +%endif +%if ! 0%{?centos_ver} BuildRequires: pkgconfig(LimeSuite) +BuildRequires: pkgconfig(usrp) >= 3.3 +%endif BuildRequires: pkgconfig(fftw3f) +BuildRequires: pkgconfig(libosmocoding) >= 1.3.0 BuildRequires: pkgconfig(libosmocore) >= 0.12.0 BuildRequires: pkgconfig(libosmoctrl) >= 0.12.0 BuildRequires: pkgconfig(libosmovty) >= 0.12.0 BuildRequires: pkgconfig(libusb-1.0) BuildRequires: pkgconfig(uhd) -BuildRequires: pkgconfig(usrp) >= 3.3 %{?systemd_requires} %if 0%{?suse_version} > 1325 BuildRequires: libboost_program_options-devel @@ -85,6 +86,7 @@ between different telecommunication associations for developing new generations of mobile phone networks. (post-2G/GSM) +%if ! 0%{?centos_ver} %package usrp1 Summary: SDR transceiver that implements Layer 1 of a GSM BTS (USRP1) Group: Productivity/Telephony/Servers @@ -124,6 +126,7 @@ 3GPP is the "3rd Generation Partnership Project" which is the collaboration between different telecommunication associations for developing new generations of mobile phone networks. (post-2G/GSM) +%endif %prep %setup -q @@ -131,12 +134,22 @@ %build echo "%{version}" >.tarball-version autoreconf -fi + +%if 0%{?centos_ver} +%configure \ + --docdir=%{_docdir}/%{name} \ + --with-systemdsystemunitdir=%{_unitdir} \ + --without-lms \ + --with-uhd \ + --without-usrp1 +%else %configure \ --docdir=%{_docdir}/%{name} \ --with-systemdsystemunitdir=%{_unitdir} \ --with-lms \ --with-uhd \ --with-usrp1 +%endif make %{?_smp_mflags} V=1 @@ -147,6 +160,7 @@ %make_install %fdupes -s %{buildroot}/%{_datadir} +%if 0%{?suse_version} %pre lms %service_add_pre osmo-trx-lms.service %post lms %service_add_post osmo-trx-lms.service %preun lms %service_del_preun osmo-trx-lms.service @@ -159,17 +173,20 @@ %post usrp1 %service_add_post osmo-trx-usrp1.service %preun usrp1 %service_del_preun osmo-trx-usrp1.service %postun usrp1 %service_del_postun osmo-trx-usrp1.service +%endif %files %license COPYING %doc README.md %doc %{_docdir}/%{name}/examples +%if ! 0%{?centos_ver} %files lms %{_bindir}/osmo-trx-lms %dir %{_sysconfdir}/osmocom %config %{_sysconfdir}/osmocom/osmo-trx-lms.cfg %{_unitdir}/osmo-trx-lms.service +%endif %files uhd %{_bindir}/osmo-trx-uhd @@ -177,6 +194,7 @@ %config %{_sysconfdir}/osmocom/osmo-trx-uhd.cfg %{_unitdir}/osmo-trx-uhd.service +%if ! 0%{?centos_ver} %files usrp1 %{_bindir}/osmo-trx-usrp1 %dir %{_datadir}/usrp @@ -185,5 +203,6 @@ %{_datadir}/usrp/rev2/std_inband.rbf %{_datadir}/usrp/rev4/std_inband.rbf %{_unitdir}/osmo-trx-usrp1.service +%endif %changelog -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/18313 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ie27fcc4f9033f0049507d9dcc295541ac0744c73 Gerrit-Change-Number: 18313 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith at sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge at osmocom.org> Gerrit-Reviewer: osmith <osmith at sysmocom.de> Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200520/43aab5c6/attachment.htm>