Changeset 1807 for spec/trunk/SPECS


Ignore:
Timestamp:
Apr 10, 2022, 8:26:25 PM (4 years ago)
Author:
tellie
Message:

spec: libsndfile: Release version 1.1.0-1.

Location:
spec/trunk/SPECS
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • spec/trunk/SPECS/cmake/macros.cmake

    r1800 r1807  
    22# Macros for cmake
    33#
     4%_cmake_lib_suffix64 -DLIB_SUFFIX=64
    45%_cmake_shared_libs -DBUILD_SHARED_LIBS:BOOL=ON
    56%_cmake_skip_rpath -DCMAKE_SKIP_RPATH:BOOL=ON
    67%_cmake_version @@CMAKE_VERSION@@
    7 %__cmake /@unixroot/usr/bin/cmake
     8%__cmake /usr/bin/cmake
     9%__ctest /usr/bin/ctest
     10%__cmake_builddir %{!?__cmake_in_source_build:%{_vpath_builddir}}%{?__cmake_in_source_build:.}
    811
    912# - Set default compile flags
    … …  
    1114# and default to -O3 -DNDEBUG.  Strip the -O3 so we can override with *FLAGS
    1215# - Turn on verbose makefiles so we can see and verify compile flags
     16# - Turn off stripping by default so RPM can do it separately
    1317# - Set default install prefixes and library install directories
    1418# - Turn on shared libraries by default
    1519%cmake \
     20%if 0%{?set_build_flags:1} \
     21  %set_build_flags \
     22%else \
    1623  CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \
    1724  CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
    … …  
    1926  FCFLAGS="${FCFLAGS:-%optflags%{?_fmoddir: -I%_fmoddir}}" ; export FCFLAGS ; \
    2027  %{?__global_ldflags:LDFLAGS="${LDFLAGS:-%__global_ldflags}" ; export LDFLAGS ;} \
     28%endif \
    2129  %__cmake \\\
     30        %{!?__cmake_in_source_build:-S "%{_vpath_srcdir}"} \\\
     31        %{!?__cmake_in_source_build:-B "%{__cmake_builddir}"} \\\
    2232        -DCMAKE_C_FLAGS_RELEASE:STRING="-DNDEBUG" \\\
    2333        -DCMAKE_CXX_FLAGS_RELEASE:STRING="-DNDEBUG" \\\
    2434        -DCMAKE_Fortran_FLAGS_RELEASE:STRING="-DNDEBUG" \\\
    2535        -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \\\
     36        -DCMAKE_INSTALL_DO_STRIP:BOOL=OFF \\\
    2637        -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \\\
    2738        -DINCLUDE_INSTALL_DIR:PATH=%{_includedir} \\\
    … …  
    2940        -DSYSCONF_INSTALL_DIR:PATH=%{_sysconfdir} \\\
    3041        -DSHARE_INSTALL_PREFIX:PATH=%{_datadir} \\\
    31         %{?_cmake_shared_libs}
     42%if "%{?_lib}" == "lib64" \
     43        %{?_cmake_lib_suffix64} \\\
     44%endif \
     45        %{?_cmake_shared_libs}
     46
     47%cmake_build \
     48  %__cmake --build "%{__cmake_builddir}" %{?_smp_mflags} --verbose
     49
     50%cmake_install \
     51  DESTDIR="%{buildroot}" %__cmake --install "%{__cmake_builddir}"
     52
     53%ctest(:-:) \
     54  cd "%{__cmake_builddir}" \
     55  %__ctest --output-on-failure --force-new-ctest-process %{?_smp_mflags} %{**} \
     56  cd -
     57
    3258
    3359%cmake@@CMAKE_MAJOR_VERSION@@ %cmake
     60%cmake@@CMAKE_MAJOR_VERSION@@_build %cmake_build
     61%cmake@@CMAKE_MAJOR_VERSION@@_install %cmake_install
     62%ctest@@CMAKE_MAJOR_VERSION@@(:-:) %ctest %{**}

  • spec/trunk/SPECS/jsoncpp.spec

    r1732 r1807  
    1313
    1414Name:           jsoncpp
    15 Version:        1.9.4
     15Version:        1.9.5
    1616Release:        1%{?dist}
    1717Summary:        JSON library implemented in C++
    … …  
    2828BuildRequires:  gcc
    2929BuildRequires:  gcc-c++
    30 %if !0%{?os2_version}
    3130BuildRequires:  python3-devel
    32 %endif
    3331
    3432%description
    … …  
    8482
    8583%cmake                                         \
    86   -DBUILD_STATIC_LIBS:BOOL=OFF                 \
    87   -DBUILD_OBJECT_LIBS:BOOL=OFF                 \
     84  -DBUILD_SHARED=true                          \
    8885  -DJSONCPP_WITH_CMAKE_PACKAGE:BOOL=ON         \
    8986  -DJSONCPP_WITH_EXAMPLE:BOOL=OFF              \
    … …  
    9390  -DJSONCPP_WITH_TESTS:BOOL=ON                 \
    9491  -DJSONCPP_WITH_WARNING_AS_ERROR:BOOL=OFF     \
     92  -DPYTHON_EXECUTABLE:STRING="%{__python3}"    \
    9593   ..
    9694
    9795%if !0%{?os2_version}
    98   -DPYTHON_EXECUTABLE:STRING="%{__python3}"
    9996%cmake_build
    10097%else

  • spec/trunk/SPECS/libsndfile.spec

    r1768 r1807  
    11Summary:        Library for reading and writing sound files
    22Name:           libsndfile
    3 Version:        1.0.31
    4 Release:        2%{?dist}
     3Version:        1.1.0
     4Release:        1%{?dist}
    55License:        LGPLv2+ and GPLv2+ and BSD
    66URL:            http://libsndfile.github.io/libsndfile/
    … …  
    88Source0:        https://github.com/libsndfile/libsndfile/releases/download/%{version}/libsndfile-%{version}.tar.bz2
    99%else
    10 %scm_source github http://github.com/TeLLie/%{name}-os2 %{version}-os2
    11 %endif
    12 
     10%scm_source github https://github.com/TeLLie/libsndfile-os2 %{version}-os2
     11%endif
    1312%if !0%{?os2_version}
    1413Patch0:         libsndfile-1.0.25-system-gsm.patch
    1514Patch1:         libsndfile-1.0.25-zerodivfix.patch
    16 %endif
    17 
    18 %if !0%{?os2_version}
     15# from upstream, fix #1984320=CVE-2021-3246, for <= 1.0.31
     16Patch2:         libsndfile-1.0.31-deb669ee.patch
     17# from upstream, fix #2027692, for <= 1.0.31
     18Patch3:         libsndfile-1.0.31-ced91d7b.patch
     19%endif
    1920BuildRequires:  gcc-c++
     21%if !0%{?os2_version}
    2022BuildRequires:  alsa-lib-devel
    2123%endif
    … …  
    3133BuildRequires:  libtool
    3234BuildRequires:  make
    33 %if !0%{?os2_version}
    3435BuildRequires:  python3
    35 %endif
     36BuildRequires:  opus-devel
     37
    3638
    3739%description
    … …  
    6466This package contains command line utilities for libsndfile.
    6567
    66 %debug
    6768
    6869%prep
    6970%if !0%{?os2_version}
    7071%setup -q
    71 %else
    72 %scm_setup
    73 %endif
    74 %if !0%{?os2_version}
    7572%patch0 -p1 -b .system-gsm
    7673rm -r src/GSM610
     74%else
     75%scm_setup
     76%endif
    7777# TODO: check if this patch is still needed
     78%if !0%{?os2_version}
    7879%patch1 -p1 -b .zerodivfix
     80%patch2 -p1 -b .deb669ee
     81%patch3 -p1 -b .ced91d7b
    7982%endif
    8083
    … …  
    8285%if !0%{?os2_version}
    8386autoreconf -I M4 -fiv # for system-gsm patch
    84 %endif
    85 
    86 %if !0%{?os2_version}
    8787%configure \
    8888        --disable-dependency-tracking \
    … …  
    101101      -DCMAKE_BUILD_TYPE=Release \
    102102      -Wno-dev \
    103       -DBUILD_TESTING=ON \
    104103       ..
     104%endif
    105105# Get rid of rpath
    106106%if !0%{?os2_version}
    … …  
    109109%endif
    110110
     111%if !0%{?os2_version}
     112%make_build
     113%else
    111114make %{?_smp_mflags}
    112115%endif
    113116
    114117%install
    115 make install DESTDIR=$RPM_BUILD_ROOT
     118%make_install -C build
    116119rm -rf __docs
    117120mkdir __docs
    … …  
    120123find %{buildroot} -type f -name "*.la" -delete
    121124
    122 
    123125# fix multilib issues
    124 %if !0%{?os2_version}
    125126mv %{buildroot}%{_includedir}/sndfile.h \
    126127   %{buildroot}%{_includedir}/sndfile-%{__isa_bits}.h
    … …  
    135136#else
    136137# error "unexpected value for __WORDSIZE macro"
     138#endif
    137139EOF
    138 %endif
    139 
    140 %if !0%{?os2_version}
    141 %if 0%{?rhel} != 0
     140
     141%if 0%{?rhel} != 0 || !0%{?os2_version}
    142142rm -f %{buildroot}%{_bindir}/sndfile-jackplay
    143143%endif
    144 %endif
     144
    145145
    146146%check
    147 LD_LIBRARY_PATH=$PWD/src/.libs make check
     147%if 0%{?os2_version}
     148LD_LIBRARY_PATH=$PWD/build
     149%endif
     150cd build
     151make -k test
     152
    148153
    149154%if !0%{?os2_version}
    … …  
    174179%{_bindir}/sndfile-salvage
    175180%else
    176 %{_bindir}/*.exe
     181%{_bindir}/sndfile-cmp.exe
     182%{_bindir}/sndfile-concat.exe
     183%{_bindir}/sndfile-convert.exe
     184%{_bindir}/sndfile-deinterleave.exe
     185%{_bindir}/sndfile-info.exe
     186%{_bindir}/sndfile-interleave.exe
     187%{_bindir}/sndfile-metadata-get.exe
     188%{_bindir}/sndfile-metadata-set.exe
     189%{_bindir}/sndfile-play.exe
     190%{_bindir}/sndfile-salvage.exe
    177191%endif
    178192%{_mandir}/man1/sndfile-cmp.1*
    … …  
    197211%{_libdir}/*.a
    198212%endif
     213%dir %{_libdir}/cmake/SndFile
     214%{_libdir}/cmake/SndFile/SndFileTargets-release.cmake
     215%{_libdir}/cmake/SndFile/SndFileConfig.cmake
     216%{_libdir}/cmake/SndFile/SndFileConfigVersion.cmake
     217%{_libdir}/cmake/SndFile/SndFileTargets.cmake
    199218%{_libdir}/pkgconfig/sndfile.pc
    200219
    201220
    202221%changelog
     222* Sun Apr 10 2022 Elbert Pol <elbert.pol@gmail.com> - 1.0.1-1
     223- Updated to latest version
     224
    203225* Sun Jan 31 2021 Elbert Pol <elbert.pol@gmail.com> - 1.0.21-2
    204226- Update the spec more to Fedora style
Note: See TracChangeset for help on using the changeset viewer.