Changeset 1768

Timestamp:

May 16, 2021, 3:35:31 PM (4 years ago)

Author:

tellie

Message:

sqlitebrowser: Add spec file

Location:

spec/trunk/SPECS

Files:

• fluidsynth.spec (modified) (2 diffs)
• libsndfile.spec (modified) (12 diffs)
• luckybackup.spec (modified) (1 diff)
• sqlitebrowser.spec (added)
• yaz.spec (modified) (1 diff)

spec/trunk/SPECS/fluidsynth.spec

@@ -1 +1 @@
 Summary:      Real-time software synthesizer
 Name:         fluidsynth
-Version:      2.1.6
+Version:      2.2.0
 Release:      1%{?dist}
 URL:          http://www.fluidsynth.org/
@@ -75 +75 @@
 
 %build
+export CFLAGS="-idirafter /@unixroot/usr/include/os2tk45"
 export LDFLAGS="-Zhigh-mem -Zomf -Zargs-wild -Zargs-resp" 
 export LIBS="-lcx"

spec/trunk/SPECS/libsndfile.spec

@@ -2 +2 @@
 Name:           libsndfile
 Version:        1.0.31
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        LGPLv2+ and GPLv2+ and BSD
-URL:            http://www.mega-nerd.com/libsndfile/
-%if !0%{?os2_version}
-Source0:        http://www.mega-nerd.com/libsndfile/files/libsndfile-%{version}.tar.gz
+URL:            http://libsndfile.github.io/libsndfile/
+%if !0%{?os2_version}
+Source0:        https://github.com/libsndfile/libsndfile/releases/download/%{version}/libsndfile-%{version}.tar.bz2
 %else
 %scm_source github http://github.com/TeLLie/%{name}-os2 %{version}-os2
 %endif
+
+%if !0%{?os2_version}
+Patch0:         libsndfile-1.0.25-system-gsm.patch
 Patch1:         libsndfile-1.0.25-zerodivfix.patch
-%if !0%{?os2_version}
-Patch0:         libsndfile-1.0.25-system-gsm.patch
-Patch2: revert.patch
-Patch3: libsndfile-1.0.28-flacbufovfl.patch
-Patch4: libsndfile-1.0.29-cve2017_6892.patch
-# from upstream, for <= 1.0.28, rhbz#1483140
-Patch5: libsndfile-1.0.28-cve2017_12562.patch
-libsndfile-1.0.29-cve2017_6892.patch
 %endif
 
@@ -24 +19 @@
 BuildRequires:  gcc-c++
 BuildRequires:  alsa-lib-devel
-BuildRequires:  gsm-devel
-%else
-BuildRequires:  gcc
+%endif
 BuildRequires:  flac-devel
 BuildRequires:  gcc
@@ -33 +26 @@
 BuildRequires:  pkgconfig
 BuildRequires:  sqlite-devel
+%if !0%{?os2_version}
+BuildRequires:  gsm-devel
+%endif
 BuildRequires:  libtool
-BuildRequires: make
+BuildRequires:  make
+%if !0%{?os2_version}
+BuildRequires:  python3
 %endif
 
@@ -66 +64 @@
 This package contains command line utilities for libsndfile.
 
+%debug
 
 %prep
@@ -73 +72 @@
 %scm_setup
 %endif
+%if !0%{?os2_version}
+%patch0 -p1 -b .system-gsm
+rm -r src/GSM610
+# TODO: check if this patch is still needed
 %patch1 -p1 -b .zerodivfix
-%if !0%{?os2_version}
-%patch0 -p1 -b .systemgsm
-%patch2 -p1 -b .revert
-%patch3 -p1 -b .flacbufovfl
-%patch4 -p1 -b .cve2017_6892
-%patch5 -p1 -b .cve2017_12562
-%endif
-#rm -r src/GSM610
+%endif
 
 %build
-mkdir builder
-cd builder
+%if !0%{?os2_version}
+autoreconf -I M4 -fiv # for system-gsm patch
+%endif
+
+%if !0%{?os2_version}
+%configure \
+        --disable-dependency-tracking \
+        --enable-sqlite \
+        --enable-alsa \
+        --enable-largefile \
+        --disable-static
+%else
+mkdir build
+cd build
 export LDFLAGS="-Zhigh-mem -Zomf -Zargs-wild -Zargs-resp" 
 export LIBS="-lcx"
@@ -95 +103 @@
       -DBUILD_TESTING=ON \
        ..
+# Get rid of rpath
+%if !0%{?os2_version}
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+%endif
+
 make %{?_smp_mflags}
-
+%endif
 
 %install
-%if !0%{?os2_version}
 make install DESTDIR=$RPM_BUILD_ROOT
-%else
-make install INSTALL_ROOT=%{buildroot} DESTDIR=$RPM_BUILD_ROOT -C builder
-%endif
 rm -rf __docs
 mkdir __docs
@@ -109 +119 @@
 rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}
 find %{buildroot} -type f -name "*.la" -delete
+
+
 # fix multilib issues
+%if !0%{?os2_version}
 mv %{buildroot}%{_includedir}/sndfile.h \
    %{buildroot}%{_includedir}/sndfile-%{__isa_bits}.h
@@ -122 +135 @@
 #else
 # error "unexpected value for __WORDSIZE macro"
-#endif
 EOF
+%endif
 
 %if !0%{?os2_version}
@@ -132 +145 @@
 
 %check
-%if !0%{?os2_version}
 LD_LIBRARY_PATH=$PWD/src/.libs make check
-%endif
 
 %if !0%{?os2_version}
@@ -161 +172 @@
 %{_bindir}/sndfile-metadata-set
 %{_bindir}/sndfile-play
-%{_bindir}/sndfile-regtest
 %{_bindir}/sndfile-salvage
 %else
-%{_bindir}/sndfile-*.exe
+%{_bindir}/*.exe
+%endif
 %{_mandir}/man1/sndfile-cmp.1*
 %{_mandir}/man1/sndfile-concat.1*
@@ -175 +186 @@
 %{_mandir}/man1/sndfile-play.1*
 %{_mandir}/man1/sndfile-salvage.1*
-%endif
 
 %files devel
@@ -186 +196 @@
 %else
 %{_libdir}/*.a
+%endif
 %{_libdir}/pkgconfig/sndfile.pc
-%dir %{_libdir}/cmake/SndFile
-%{_libdir}/cmake/SndFile/SndFileTargets-release.cmake
-%{_libdir}/cmake/SndFile/SndFileTargets.cmake
-%{_libdir}/cmake/SndFile/SndFileConfig.cmake
-%{_libdir}/cmake/SndFile/SndFileConfigVersion.cmake
-%endif
+
 
 %changelog
+* Sun Jan 31 2021 Elbert Pol <elbert.pol@gmail.com> - 1.0.21-2
+- Update the spec more to Fedora style
+
 * Tue Jan 26 2021 Elbert Pol <elbert.pol@gmail.com> - 1.0.31-1
 - First rpm version for OS2

spec/trunk/SPECS/luckybackup.spec

@@ -82 +82 @@
 %{_bindir}/%{name}
 %{_datadir}/applications/%{name}*
-%{_datadir}/applications/%{name}*
 %{_datadir}/%{name}
 %{_datadir}/menu

spec/trunk/SPECS/yaz.spec

@@ -105 +105 @@
 %prep
 %scm_setup
+
+%build
 buildconf.sh
-
-%build
 export LDFLAGS="-Zhigh-mem -Zomf -Zargs-wild -Zargs-resp"
 export LIBS="-lcx"