Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'update_to_118' into 'master'
[popt] Update to 1.18 version. Fixes JB#51488

See merge request mer-core/popt!3
  • Loading branch information
xfade committed Oct 9, 2020
2 parents 05f711f + ca648f0 commit a51e913
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 80 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
@@ -0,0 +1,3 @@
[submodule "popt"]
path = popt
url = https://git.sailfishos.org/mirror/popt.git
26 changes: 0 additions & 26 deletions 001-popt-fix-build-automake-1.12.patch

This file was deleted.

31 changes: 0 additions & 31 deletions 002-popt-1.16-pkgconfig.patch

This file was deleted.

1 change: 1 addition & 0 deletions popt
Submodule popt added at 7e6478
Binary file removed popt-1.16.tar.gz
Binary file not shown.
File renamed without changes.
38 changes: 15 additions & 23 deletions popt.spec → rpm/popt.spec
@@ -1,18 +1,15 @@
Name: popt


Summary: C library for parsing command line parameters
Version: 1.16
Release: 2
Group: System/Libraries
Version: 1.18
Release: 1
License: MIT
URL: http://www.rpm5.org/
Source0: http://www.rpm5.org/files/%{name}/%{name}-%{version}.tar.gz
Patch0: 001-popt-fix-build-automake-1.12.patch
Patch1: 002-popt-1.16-pkgconfig.patch
URL: https://github.com/rpm-software-management/popt/
Source0: %{name}-%{version}.tar.bz2
BuildRequires: autoconf
BuildRequires: libtool
BuildRequires: gettext
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig
BuildRequires: gettext

%description
Popt is a C library for parsing command line parameters. Popt was
Expand All @@ -27,7 +24,6 @@ shell-like rules.

%package devel
Summary: Development files for the popt library
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}

%description devel
Expand All @@ -36,41 +32,37 @@ for developing programs which use the popt C library. It contains the
API documentation of the popt library, too.



%prep
%autosetup -p1
%autosetup -p1 -n %{name}-%{version}/%{name}

%build
%reconfigure --disable-static --disable-nls

autoreconf -fiv
%configure --disable-static \
--disable-nls

make %{?jobs:-j%jobs}

%make_build

%install
rm -rf %{buildroot}
%make_install

# Multiple popt configurations are possible
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/popt.d

%check
make check

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc COPYING
%license COPYING
%{_sysconfdir}/popt.d
%{_libdir}/libpopt.so.*

%files devel
%defattr(-,root,root,-)
%doc README
%{_libdir}/libpopt.so
%{_libdir}/pkgconfig/popt.pc
%{_libdir}/pkgconfig/%{name}.pc
%{_includedir}/popt.h
%doc %{_mandir}/man3/popt.3*
%{_mandir}/man3/popt.3*

0 comments on commit a51e913

Please sign in to comment.