From ee5245d9ca05cd171e72bb7e33364b69ffcb48bc Mon Sep 17 00:00:00 2001 From: Daniel Steiner Date: Mon, 30 Dec 2019 10:58:04 +0100 Subject: [PATCH 01/56] Updated to latest version --- fedora/SPECS/polemarch.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/fedora/SPECS/polemarch.spec b/fedora/SPECS/polemarch.spec index c7fdd86..a5d4f92 100644 --- a/fedora/SPECS/polemarch.spec +++ b/fedora/SPECS/polemarch.spec @@ -15,7 +15,7 @@ %define namebase polemarch %define user polemarch %define datad poledata -%define version 1.5.1 +%define version 1.6.1 %define release 1 %define __prelink_undo_cmd %{nil} %define _binaries_in_noarch_packages_terminate_build 0 @@ -114,6 +114,12 @@ sudo -u %{user} /opt/%{name}/bin/%{shortname}ctl migrate [ "%{_builddir}" != "/" ] && [ -d "%{_builddir}" ] && rm -rf %{_builddir}/* %changelog +* Mon Dec 30 2019 Daniel Steiner +- Update to 1.6.1 version. + +* Sun Dec 15 2019 Daniel Steiner +- Update to 1.6.0 version. + * Fri Dec 6 2019 Daniel Steiner - Update to 1.5.1 version. From 74ac5fcb870138c83c5d1146f096f34e25235951 Mon Sep 17 00:00:00 2001 From: Daniel Steiner Date: Mon, 30 Dec 2019 11:05:17 +0100 Subject: [PATCH 02/56] Updated to latest version --- fedora/SPECS/makemkv.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fedora/SPECS/makemkv.spec b/fedora/SPECS/makemkv.spec index 0c2319b..13d1a6f 100644 --- a/fedora/SPECS/makemkv.spec +++ b/fedora/SPECS/makemkv.spec @@ -6,7 +6,7 @@ # wget http://www.makemkv.com/download/makemkv-oss-$v.tar.gz -O makemkv-oss-$v.tar.gz Name: makemkv -Version: 1.14.5 +Version: 1.14.7 Release: 0%{?dist} BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: One click DVD and Blu-ray converter @@ -86,6 +86,9 @@ popd %{_datarootdir}/MakeMKV/* %changelog +* Mon Dec 30 2019 Daniel Steiner +- Update to 1.14.7. + * Sat Sep 14 2019 Daniel Steiner - Update to 1.14.5. From e4c8931066e689268ea47e13218df0278d155e35 Mon Sep 17 00:00:00 2001 From: Daniel Steiner Date: Mon, 6 Jan 2020 16:44:27 +0100 Subject: [PATCH 03/56] OSM packages --- fedora/SPECS/gdal.spec | 149 +++++++++++++++++++++++++++++++++++++++++ fedora/SPECS/proj.spec | 145 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 294 insertions(+) create mode 100644 fedora/SPECS/gdal.spec create mode 100644 fedora/SPECS/proj.spec diff --git a/fedora/SPECS/gdal.spec b/fedora/SPECS/gdal.spec new file mode 100644 index 0000000..4bb621c --- /dev/null +++ b/fedora/SPECS/gdal.spec @@ -0,0 +1,149 @@ +%define build_refman 1 +%define bashcompletiondir %{_sysconfdir}/bash_completion.d + +Name: gdal +Version: 3.0.2 +Release: 1%{?dist} +#define debug_package #{nil} +License: MIT +Group: Applications/System +Summary: GIS file format library +URL: http://www.gdal.org +Source0: %name-%{version}.tar.gz + + +#BuildRequires: armadillo-devel +BuildRequires: freexl-devel +BuildRequires: bash-completion +BuildRequires: libzstd-devel +#BuildRequires: cfitsio-devel +BuildRequires: libjpeg-devel +BuildRequires: libpng-devel +BuildRequires: libtiff-devel +BuildRequires: pcre-devel +BuildRequires: perl-devel +BuildRequires: perl-generators +BuildRequires: openjpeg2-devel +BuildRequires: openjpeg-devel +BuildRequires: perl(ExtUtils::MakeMaker) +BuildRequires: %{_bindir}/pkg-config +BuildRequires: libpq-devel +BuildRequires: proj-devel >= 6.0.2 +%if %{with python2} +BuildRequires: python2-devel +BuildRequires: python2-numpy +%endif +%if %{with python3} +BuildRequires: python3-devel +BuildRequires: python3-numpy +%endif +BuildRequires: sqlite-devel +BuildRequires: swig +%if %{build_refman} +BuildRequires: texlive-latex +BuildRequires: texlive-collection-fontsrecommended +%if 0%{?fedora} +BuildRequires: texlive-collection-langcyrillic +BuildRequires: texlive-collection-langportuguese +%endif +%endif + +%global DONT_REMOVE_RPATH 1 +# don't check for rpath: +%global __arch_install_post /usr/lib/rpm/check-buildroot + +%description +Geospatial Data Abstraction Library (GDAL/OGR) is a cross platform +C++ translator library for raster and vector geospatial data formats. +As a library, it presents a single abstract data model to the calling +application for all supported formats. It also comes with a variety of +useful commandline utilities for data translation and processing. + +It provides the primary data access engine for many applications. +GDAL/OGR is the most widely used geospatial data access library. + + +%package devel +Summary: Development files for the GDAL file format library + +Requires: %{name}-libs = %{version}-%{release} + +%description devel +This package contains development files for GDAL. + + +%package libs +Summary: GDAL file format library + +%description libs +This package contains the GDAL file format library. + + simple service for looking up your IP address. This is the code that powers https://echoip.daniel-steiner.org. + +%prep +%setup -q -n %{name}-%{version} + +%build +%configure \ + --bindir=%{_bindir} \ + --sbindir=%{_sbindir} \ + --includedir=%{_includedir}/%{name} \ + --datadir=%{_datadir}/%{name} +make + +%install +export DONT_REMOVE_RPATH=1 +%make_install +# move bashcompletion file to proper directory: +mv %{buildroot}%{_prefix}/etc %{buildroot}/ + +%clean +[ "%{buildroot}" != "/" ] && [ -d "%{buildroot}" ] && rm -rf %{buildroot} +[ "%{_builddir}" != "/" ] && [ -d "%{_builddir}" ] && rm -rf %{_builddir}/* + +%files +%defattr(-,root,root,-) +%doc MIGRATION_GUIDE.TXT PROVENANCE.TXT +%config %{bashcompletiondir}/* +%{_bindir}/gdallocationinfo +%{_bindir}/gdal_contour +%{_bindir}/gdal_rasterize +%{_bindir}/gdal_translate +%{_bindir}/gdaladdo +%{_bindir}/gdalinfo +%{_bindir}/gdaldem +%{_bindir}/gdalbuildvrt +%{_bindir}/gdaltindex +%{_bindir}/gdalwarp +%{_bindir}/gdal_grid +%{_bindir}/gdalenhance +%{_bindir}/gdalmanage +%{_bindir}/gdalserver +%{_bindir}/gdalsrsinfo +%{_bindir}/gdaltransform +%{_bindir}/nearblack +%{_bindir}/ogr* +%{_bindir}/testepsg +%{_bindir}/gnmanalyse +%{_bindir}/gnmmanage + +%files libs +%doc LICENSE.TXT NEWS PROVENANCE.TXT COMMITTERS +%{_libdir}/libgdal.so.26 +%{_libdir}/libgdal.so.26.* +%{_datadir}/%{name}/* +#TODO: Possibly remove files like .dxf, .dgn, ... +%dir %{_libdir}/%{name}plugins + +%files devel +%{_bindir}/%{name}-config +%{_includedir}/%{name}/*.h +%{_libdir}/*.a +%{_libdir}/*.la +%{_libdir}/*.so +%{_libdir}/pkgconfig/%{name}.pc + +%changelog +* Mon Jan 6 2020 Daniel Steiner +- Initial build + diff --git a/fedora/SPECS/proj.spec b/fedora/SPECS/proj.spec new file mode 100644 index 0000000..2e11712 --- /dev/null +++ b/fedora/SPECS/proj.spec @@ -0,0 +1,145 @@ +%global proj_version 6.3.0 +%global datumgrid_version 1.8 + +Name: proj +Version: %{proj_version} +Release: 1%{?dist} +Summary: Cartographic projection software (PROJ.4) + +License: MIT +URL: https://proj4.org +Source0: https://download.osgeo.org/%{name}/%{name}-%{version}.tar.gz +Source1: https://download.osgeo.org/%{name}/%{name}-datumgrid-%{datumgrid_version}.tar.gz + +BuildRequires: libtool gcc-c++ + +%description +Proj and invproj perform respective forward and inverse transformation of +cartographic data to or from cartesian data with a wide range of selectable +projection functions. + + +%package devel +Summary: Development files for PROJ.4 +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description devel +This package contains libproj and the appropriate header files and man pages. + + +%package static +Summary: Development files for PROJ.4 +Requires: %{name}-devel%{?_isa} = %{version}-%{release} + +%description static +This package contains libproj static library. + + +%package datumgrid +Summary: Additional datum shift grids for PROJ.4 +Version: %{datumgrid_version} +Release: 99%{?dist} +# See README.DATUMGRID +License: CC-BY and Freely Distributable and Ouverte and Public Domain +BuildArch: noarch + +# Renamed; remove after Fedora 31. +Obsoletes: proj-nad < 5.2.0-2 +Provides: proj-nad = %{proj_version}-%{release} + +%description datumgrid +This package contains additional datum shift grids. + + +%prep +%autosetup + +# Prepare datumgrid and file list (in {datadir}/proj and README marked as doc) +mkdir nad +tar xvf %{SOURCE1} -C nad | \ + sed -e 's!^!%{_datadir}/%{name}/!' -e '/README/s!^!%%doc !' > datumgrid.files + + +%build +# rebuild due to patch +autoreconf -i +%configure +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 +%make_build + + +%install +%make_install +chmod -x %{buildroot}%{_libdir}/libproj.la +install -p -m 0644 nad/README.DATUMGRID %{buildroot}%{_datadir}/%{name} +for f in $(egrep '^\/usr' datumgrid.files); do + bf=$(basename $f) + install -m 0644 nad/$bf %{buildroot}%{_datadir}/%{name}/$bf +done + +# Install cmake config manually because we use autotools for building +mkdir -p %{buildroot}%{_datadir}/cmake/Modules/ + +cat << EOF > %{buildroot}%{_datadir}/cmake/Modules/FindPROJ4.cmake +set(PROJ4_FOUND 1) +set(PROJ4_INCLUDE_DIRS %{_includedir}) +set(PROJ4_LIBRARIES proj) +if(\${LIB_SUFFIX} MATCHES 64) +set(PROJ4_LIBRARY_DIRS /usr/lib64) +else() +set(PROJ4_LIBRARY_DIRS /usr/lib) +endif() +set(PROJ4_BINARY_DIRS %{_bindir}) +set(PROJ4_VERSION %{proj_version}) +message(STATUS "Found PROJ4: version \${PROJ4_VERSION}") +EOF + + +%check +LD_LIBRARY_PATH=%{buildroot}%{_libdir} \ + make PROJ_LIB=%{buildroot}%{_datadir}/%{name} check || ( cat src/test-suite.log; exit 1 ) + + +%files +%doc NEWS AUTHORS COPYING README ChangeLog +%{_bindir}/* +%{_mandir}/man1/*.1* +%{_libdir}/libproj.so.15* +%dir %{_datadir}/%{name} +%{_datadir}/%{name}/CH +%{_datadir}/%{name}/GL27 +%{_datadir}/%{name}/ITRF2000 +%{_datadir}/%{name}/ITRF2008 +%{_datadir}/%{name}/ITRF2014 +%{_datadir}/%{name}/nad.lst +%{_datadir}/%{name}/nad27 +%{_datadir}/%{name}/nad83 +%{_datadir}/%{name}/null +%{_datadir}/%{name}/other.extra +%{_datadir}/%{name}/world +%{_datadir}/%{name}/projjson.schema.json +%{_datadir}/%{name}/%{name}.db + +%files devel +%{_mandir}/man3/*.3* +%{_includedir}/*.h +%{_includedir}/%{name}/*.hpp +%{_libdir}/libproj.so +%{_libdir}/pkgconfig/%{name}.pc +%{_datadir}/cmake/Modules/FindPROJ4.cmake +%exclude %{_libdir}/libproj.a +%exclude %{_libdir}/libproj.la + +%files static +%{_libdir}/libproj.a +%{_libdir}/libproj.la + +%files datumgrid -f datumgrid.files +%dir %{_datadir}/%{name} + + +%changelog +* Mon Jan 6 2020 Daniel Steiner +- Initial build + From 656acc67d71c936917dd89ee0d99d2f00c13d5b5 Mon Sep 17 00:00:00 2001 From: Daniel Steiner Date: Thu, 9 Jan 2020 23:29:11 +0100 Subject: [PATCH 04/56] GDAL package built --- fedora/SPECS/gdal.spec | 47 +++++++++++++++++++++++++++--------------- 1 file changed, 30 insertions(+), 17 deletions(-) diff --git a/fedora/SPECS/gdal.spec b/fedora/SPECS/gdal.spec index 4bb621c..f86dab5 100644 --- a/fedora/SPECS/gdal.spec +++ b/fedora/SPECS/gdal.spec @@ -1,9 +1,8 @@ -%define build_refman 1 %define bashcompletiondir %{_sysconfdir}/bash_completion.d Name: gdal Version: 3.0.2 -Release: 1%{?dist} +Release: 2%{?dist} #define debug_package #{nil} License: MIT Group: Applications/System @@ -12,11 +11,9 @@ URL: http://www.gdal.org Source0: %name-%{version}.tar.gz -#BuildRequires: armadillo-devel BuildRequires: freexl-devel BuildRequires: bash-completion BuildRequires: libzstd-devel -#BuildRequires: cfitsio-devel BuildRequires: libjpeg-devel BuildRequires: libpng-devel BuildRequires: libtiff-devel @@ -39,14 +36,8 @@ BuildRequires: python3-numpy %endif BuildRequires: sqlite-devel BuildRequires: swig -%if %{build_refman} -BuildRequires: texlive-latex -BuildRequires: texlive-collection-fontsrecommended -%if 0%{?fedora} -BuildRequires: texlive-collection-langcyrillic -BuildRequires: texlive-collection-langportuguese -%endif -%endif + +Obsoletes: gdal < 3 %global DONT_REMOVE_RPATH 1 # don't check for rpath: @@ -84,16 +75,35 @@ This package contains the GDAL file format library. %setup -q -n %{name}-%{version} %build -%configure \ - --bindir=%{_bindir} \ - --sbindir=%{_sbindir} \ +./configure \ + --datadir=%{_datadir}/%{name} \ --includedir=%{_includedir}/%{name} \ - --datadir=%{_datadir}/%{name} + --prefix=%{_prefix} \ + --libdir=%{_libdir} \ + --sysconfdir=%{_sysconfdir} \ + --localstatedir=%{_var} \ + --with-curl \ + --with-freexl \ + --with-geos \ + --with-png=%{_prefix} \ + --with-gif \ + --with-gta \ + --with-jpeg \ + --without-jpeg12 \ + --with-liblzma \ + --with-libtiff=%{_prefix} \ + --with-libz \ + --without-mdb \ + --without-msg \ + --with-proj \ + --with-threads \ + --enable-shared + make %install export DONT_REMOVE_RPATH=1 -%make_install +make install DESTDIR=%{buildroot} # move bashcompletion file to proper directory: mv %{buildroot}%{_prefix}/etc %{buildroot}/ @@ -144,6 +154,9 @@ mv %{buildroot}%{_prefix}/etc %{buildroot}/ %{_libdir}/pkgconfig/%{name}.pc %changelog +* Wed Jan 8 2020 Daniel Steiner +- Library path fixed. + * Mon Jan 6 2020 Daniel Steiner - Initial build From 80768a729e354f3b31f2c6180220e28c9afd092e Mon Sep 17 00:00:00 2001 From: Daniel Steiner Date: Sat, 11 Jan 2020 08:15:44 +0100 Subject: [PATCH 05/56] Gdal and proj have now different names --- fedora/SPECS/gdal.spec | 11 ++++++----- fedora/SPECS/proj.spec | 40 +++++++++------------------------------- 2 files changed, 15 insertions(+), 36 deletions(-) diff --git a/fedora/SPECS/gdal.spec b/fedora/SPECS/gdal.spec index f86dab5..aeab5cb 100644 --- a/fedora/SPECS/gdal.spec +++ b/fedora/SPECS/gdal.spec @@ -1,6 +1,7 @@ %define bashcompletiondir %{_sysconfdir}/bash_completion.d +%define realname gdal -Name: gdal +Name: gdal3 Version: 3.0.2 Release: 2%{?dist} #define debug_package #{nil} @@ -8,7 +9,7 @@ License: MIT Group: Applications/System Summary: GIS file format library URL: http://www.gdal.org -Source0: %name-%{version}.tar.gz +Source0: %realname-%{version}.tar.gz BuildRequires: freexl-devel @@ -72,7 +73,7 @@ This package contains the GDAL file format library. simple service for looking up your IP address. This is the code that powers https://echoip.daniel-steiner.org. %prep -%setup -q -n %{name}-%{version} +%setup -q -n %{realname}-%{version} %build ./configure \ @@ -143,7 +144,7 @@ mv %{buildroot}%{_prefix}/etc %{buildroot}/ %{_libdir}/libgdal.so.26.* %{_datadir}/%{name}/* #TODO: Possibly remove files like .dxf, .dgn, ... -%dir %{_libdir}/%{name}plugins +%dir %{_libdir}/%{realname}plugins %files devel %{_bindir}/%{name}-config @@ -151,7 +152,7 @@ mv %{buildroot}%{_prefix}/etc %{buildroot}/ %{_libdir}/*.a %{_libdir}/*.la %{_libdir}/*.so -%{_libdir}/pkgconfig/%{name}.pc +%{_libdir}/pkgconfig/%{realname}.pc %changelog * Wed Jan 8 2020 Daniel Steiner diff --git a/fedora/SPECS/proj.spec b/fedora/SPECS/proj.spec index 2e11712..504460e 100644 --- a/fedora/SPECS/proj.spec +++ b/fedora/SPECS/proj.spec @@ -1,15 +1,15 @@ %global proj_version 6.3.0 %global datumgrid_version 1.8 +%define realname proj -Name: proj +Name: proj6 Version: %{proj_version} Release: 1%{?dist} Summary: Cartographic projection software (PROJ.4) License: MIT URL: https://proj4.org -Source0: https://download.osgeo.org/%{name}/%{name}-%{version}.tar.gz -Source1: https://download.osgeo.org/%{name}/%{name}-datumgrid-%{datumgrid_version}.tar.gz +Source0: https://download.osgeo.org/%{realname}/%{realname}-%{version}.tar.gz BuildRequires: libtool gcc-c++ @@ -21,7 +21,7 @@ projection functions. %package devel Summary: Development files for PROJ.4 -Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{realname}%{?_isa} = %{version}-%{release} %description devel This package contains libproj and the appropriate header files and man pages. @@ -29,41 +29,22 @@ This package contains libproj and the appropriate header files and man pages. %package static Summary: Development files for PROJ.4 -Requires: %{name}-devel%{?_isa} = %{version}-%{release} +Requires: %{realname}-devel%{?_isa} = %{version}-%{release} %description static This package contains libproj static library. -%package datumgrid -Summary: Additional datum shift grids for PROJ.4 -Version: %{datumgrid_version} -Release: 99%{?dist} -# See README.DATUMGRID -License: CC-BY and Freely Distributable and Ouverte and Public Domain -BuildArch: noarch - -# Renamed; remove after Fedora 31. -Obsoletes: proj-nad < 5.2.0-2 -Provides: proj-nad = %{proj_version}-%{release} - -%description datumgrid -This package contains additional datum shift grids. - - %prep %autosetup -# Prepare datumgrid and file list (in {datadir}/proj and README marked as doc) -mkdir nad -tar xvf %{SOURCE1} -C nad | \ - sed -e 's!^!%{_datadir}/%{name}/!' -e '/README/s!^!%%doc !' > datumgrid.files - - %build # rebuild due to patch autoreconf -i -%configure +%configure \ + --includedir=%{_includedir}/%{name} \ + --datarootdir=%{_datadir}/%{name} + 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 %make_build @@ -135,9 +116,6 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} \ %{_libdir}/libproj.a %{_libdir}/libproj.la -%files datumgrid -f datumgrid.files -%dir %{_datadir}/%{name} - %changelog * Mon Jan 6 2020 Daniel Steiner From 17c5224cd51d295e789ebf64e2ad46b545734be2 Mon Sep 17 00:00:00 2001 From: Daniel Steiner Date: Sat, 11 Jan 2020 08:17:23 +0100 Subject: [PATCH 06/56] mod_tile updated --- fedora/SPECS/mod_tile.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fedora/SPECS/mod_tile.spec b/fedora/SPECS/mod_tile.spec index 88c0c5e..04512b7 100644 --- a/fedora/SPECS/mod_tile.spec +++ b/fedora/SPECS/mod_tile.spec @@ -1,6 +1,6 @@ Name: mod_tile Version: 0.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A program to efficiently render and serve map tiles for www.openstreetmap.org map using Apache and Mapnik. License: GPLv2 @@ -69,6 +69,9 @@ fi %{_mandir}/man8/* %changelog +* Thu Jan 9 2020 Daniel Steiner +- gdal-lib upgraded. + * Sat Nov 9 2019 Daniel Steiner - Fix for modules config path. From a32af88b8a36932b238d8eae28bc49e070f7c3f8 Mon Sep 17 00:00:00 2001 From: Daniel Steiner Date: Sat, 11 Jan 2020 10:27:37 +0100 Subject: [PATCH 07/56] Proj and gdla are now in /usr/local prefix --- fedora/SPECS/{gdal.spec => gdal3.spec} | 32 +++++++----- fedora/SPECS/{proj.spec => proj6.spec} | 68 ++++++++++++++------------ 2 files changed, 56 insertions(+), 44 deletions(-) rename fedora/SPECS/{gdal.spec => gdal3.spec} (85%) rename fedora/SPECS/{proj.spec => proj6.spec} (60%) diff --git a/fedora/SPECS/gdal.spec b/fedora/SPECS/gdal3.spec similarity index 85% rename from fedora/SPECS/gdal.spec rename to fedora/SPECS/gdal3.spec index aeab5cb..7d40185 100644 --- a/fedora/SPECS/gdal.spec +++ b/fedora/SPECS/gdal3.spec @@ -1,9 +1,17 @@ %define bashcompletiondir %{_sysconfdir}/bash_completion.d %define realname gdal +Prefix: /opt +%define sysprefix /usr +%define _prefix /usr/local +%define _includedir %{_prefix}/include +%define _datadir %{_prefix}/share +%define _bindir %{_prefix}/bin +%define _libdir %{_prefix}/lib64 +%define _mandir %{_prefix}/man Name: gdal3 Version: 3.0.2 -Release: 2%{?dist} +Release: 1%{?dist} #define debug_package #{nil} License: MIT Group: Applications/System @@ -24,9 +32,9 @@ BuildRequires: perl-generators BuildRequires: openjpeg2-devel BuildRequires: openjpeg-devel BuildRequires: perl(ExtUtils::MakeMaker) -BuildRequires: %{_bindir}/pkg-config +BuildRequires: %{sysprefix}/bin/pkg-config BuildRequires: libpq-devel -BuildRequires: proj-devel >= 6.0.2 +BuildRequires: proj6-devel >= 6.0.2 %if %{with python2} BuildRequires: python2-devel BuildRequires: python2-numpy @@ -38,8 +46,6 @@ BuildRequires: python3-numpy BuildRequires: sqlite-devel BuildRequires: swig -Obsoletes: gdal < 3 - %global DONT_REMOVE_RPATH 1 # don't check for rpath: %global __arch_install_post /usr/lib/rpm/check-buildroot @@ -77,8 +83,8 @@ This package contains the GDAL file format library. %build ./configure \ - --datadir=%{_datadir}/%{name} \ - --includedir=%{_includedir}/%{name} \ + --datadir=%{_datadir}/%{realname} \ + --includedir=%{_includedir}/%{realname} \ --prefix=%{_prefix} \ --libdir=%{_libdir} \ --sysconfdir=%{_sysconfdir} \ @@ -86,17 +92,17 @@ This package contains the GDAL file format library. --with-curl \ --with-freexl \ --with-geos \ - --with-png=%{_prefix} \ + --with-png=%{sysprefix} \ --with-gif \ --with-gta \ --with-jpeg \ --without-jpeg12 \ --with-liblzma \ - --with-libtiff=%{_prefix} \ + --with-libtiff=%{sysprefix} \ --with-libz \ --without-mdb \ --without-msg \ - --with-proj \ + --with-proj=%{_prefix} \ --with-threads \ --enable-shared @@ -142,13 +148,13 @@ mv %{buildroot}%{_prefix}/etc %{buildroot}/ %doc LICENSE.TXT NEWS PROVENANCE.TXT COMMITTERS %{_libdir}/libgdal.so.26 %{_libdir}/libgdal.so.26.* -%{_datadir}/%{name}/* +%{_datadir}/%{realname}/* #TODO: Possibly remove files like .dxf, .dgn, ... %dir %{_libdir}/%{realname}plugins %files devel -%{_bindir}/%{name}-config -%{_includedir}/%{name}/*.h +%{_bindir}/%{realname}-config +%{_includedir}/%{realname}/*.h %{_libdir}/*.a %{_libdir}/*.la %{_libdir}/*.so diff --git a/fedora/SPECS/proj.spec b/fedora/SPECS/proj6.spec similarity index 60% rename from fedora/SPECS/proj.spec rename to fedora/SPECS/proj6.spec index 504460e..8e5aa8b 100644 --- a/fedora/SPECS/proj.spec +++ b/fedora/SPECS/proj6.spec @@ -1,6 +1,12 @@ %global proj_version 6.3.0 %global datumgrid_version 1.8 %define realname proj +%define _prefix /usr/local +%define _includedir %{_prefix}/include +%define _datadir %{_prefix}/share +%define _bindir %{_prefix}/bin +%define _libdir %{_prefix}/lib64 +%define _mandir %{_datadir}/man Name: proj6 Version: %{proj_version} @@ -21,7 +27,7 @@ projection functions. %package devel Summary: Development files for PROJ.4 -Requires: %{realname}%{?_isa} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} %description devel This package contains libproj and the appropriate header files and man pages. @@ -29,21 +35,23 @@ This package contains libproj and the appropriate header files and man pages. %package static Summary: Development files for PROJ.4 -Requires: %{realname}-devel%{?_isa} = %{version}-%{release} +Requires: %{name}-devel%{?_isa} = %{version}-%{release} %description static This package contains libproj static library. %prep -%autosetup +%setup -q -n %{realname}-%{version} %build # rebuild due to patch autoreconf -i -%configure \ - --includedir=%{_includedir}/%{name} \ - --datarootdir=%{_datadir}/%{name} +./configure \ + --prefix=%{_prefix} \ + --libdir=%{_libdir} \ + --includedir=%{_includedir} \ + --datarootdir=%{_datadir} 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 @@ -51,13 +59,8 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool %install -%make_install +make install DESTDIR=%{buildroot} chmod -x %{buildroot}%{_libdir}/libproj.la -install -p -m 0644 nad/README.DATUMGRID %{buildroot}%{_datadir}/%{name} -for f in $(egrep '^\/usr' datumgrid.files); do - bf=$(basename $f) - install -m 0644 nad/$bf %{buildroot}%{_datadir}/%{name}/$bf -done # Install cmake config manually because we use autotools for building mkdir -p %{buildroot}%{_datadir}/cmake/Modules/ @@ -67,9 +70,9 @@ set(PROJ4_FOUND 1) set(PROJ4_INCLUDE_DIRS %{_includedir}) set(PROJ4_LIBRARIES proj) if(\${LIB_SUFFIX} MATCHES 64) -set(PROJ4_LIBRARY_DIRS /usr/lib64) +set(PROJ4_LIBRARY_DIRS %{_libdir}) else() -set(PROJ4_LIBRARY_DIRS /usr/lib) +set(PROJ4_LIBRARY_DIRS %{_prefix}/lib) endif() set(PROJ4_BINARY_DIRS %{_bindir}) set(PROJ4_VERSION %{proj_version}) @@ -79,7 +82,7 @@ EOF %check LD_LIBRARY_PATH=%{buildroot}%{_libdir} \ - make PROJ_LIB=%{buildroot}%{_datadir}/%{name} check || ( cat src/test-suite.log; exit 1 ) + make PROJ_LIB=%{buildroot}%{_datadir}/%{realname} check || ( cat src/test-suite.log; exit 1 ) %files @@ -87,27 +90,27 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} \ %{_bindir}/* %{_mandir}/man1/*.1* %{_libdir}/libproj.so.15* -%dir %{_datadir}/%{name} -%{_datadir}/%{name}/CH -%{_datadir}/%{name}/GL27 -%{_datadir}/%{name}/ITRF2000 -%{_datadir}/%{name}/ITRF2008 -%{_datadir}/%{name}/ITRF2014 -%{_datadir}/%{name}/nad.lst -%{_datadir}/%{name}/nad27 -%{_datadir}/%{name}/nad83 -%{_datadir}/%{name}/null -%{_datadir}/%{name}/other.extra -%{_datadir}/%{name}/world -%{_datadir}/%{name}/projjson.schema.json -%{_datadir}/%{name}/%{name}.db +%dir %{_datadir}/%{realname} +%{_datadir}/%{realname}/CH +%{_datadir}/%{realname}/GL27 +%{_datadir}/%{realname}/ITRF2000 +%{_datadir}/%{realname}/ITRF2008 +%{_datadir}/%{realname}/ITRF2014 +%{_datadir}/%{realname}/nad.lst +%{_datadir}/%{realname}/nad27 +%{_datadir}/%{realname}/nad83 +%{_datadir}/%{realname}/null +%{_datadir}/%{realname}/other.extra +%{_datadir}/%{realname}/world +%{_datadir}/%{realname}/projjson.schema.json +%{_datadir}/%{realname}/%{realname}.db %files devel %{_mandir}/man3/*.3* %{_includedir}/*.h -%{_includedir}/%{name}/*.hpp +%{_includedir}/%{realname}/*.hpp %{_libdir}/libproj.so -%{_libdir}/pkgconfig/%{name}.pc +%{_libdir}/pkgconfig/%{realname}.pc %{_datadir}/cmake/Modules/FindPROJ4.cmake %exclude %{_libdir}/libproj.a %exclude %{_libdir}/libproj.la @@ -118,6 +121,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} \ %changelog +* Sat Jan 11 2020 Daniel Steiner +- New name proj6 and relocation to /usr/local. + * Mon Jan 6 2020 Daniel Steiner - Initial build From 8990de711f6ede181ba128949b442cbcee18d8a3 Mon Sep 17 00:00:00 2001 From: Daniel Steiner Date: Sat, 11 Jan 2020 10:29:56 +0100 Subject: [PATCH 08/56] Comment for prefix added --- fedora/SPECS/gdal3.spec | 2 +- fedora/SPECS/proj6.spec | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/fedora/SPECS/gdal3.spec b/fedora/SPECS/gdal3.spec index 7d40185..2e1e9f3 100644 --- a/fedora/SPECS/gdal3.spec +++ b/fedora/SPECS/gdal3.spec @@ -1,7 +1,7 @@ %define bashcompletiondir %{_sysconfdir}/bash_completion.d %define realname gdal -Prefix: /opt %define sysprefix /usr +# Prefix is /usr/local! %define _prefix /usr/local %define _includedir %{_prefix}/include %define _datadir %{_prefix}/share diff --git a/fedora/SPECS/proj6.spec b/fedora/SPECS/proj6.spec index 8e5aa8b..4a3b0af 100644 --- a/fedora/SPECS/proj6.spec +++ b/fedora/SPECS/proj6.spec @@ -1,6 +1,7 @@ %global proj_version 6.3.0 %global datumgrid_version 1.8 %define realname proj +# Prefix is /usr/local! %define _prefix /usr/local %define _includedir %{_prefix}/include %define _datadir %{_prefix}/share From 85ebe2d4e74d8665c0b4bb1ae0b2dd3b774865f3 Mon Sep 17 00:00:00 2001 From: Daniel Steiner Date: Sun, 12 Jan 2020 08:53:28 +0100 Subject: [PATCH 09/56] phyghtmap renamed, gdal package simplified --- fedora/SPECS/gdal3.spec | 101 ++++++++++++++++++++++++++---------- fedora/SPECS/phyghtmap.spec | 52 +++++++++++++++++++ 2 files changed, 126 insertions(+), 27 deletions(-) create mode 100644 fedora/SPECS/phyghtmap.spec diff --git a/fedora/SPECS/gdal3.spec b/fedora/SPECS/gdal3.spec index 2e1e9f3..cd2d1de 100644 --- a/fedora/SPECS/gdal3.spec +++ b/fedora/SPECS/gdal3.spec @@ -6,12 +6,12 @@ %define _includedir %{_prefix}/include %define _datadir %{_prefix}/share %define _bindir %{_prefix}/bin -%define _libdir %{_prefix}/lib64 +%define _libdir %{_prefix}/lib %define _mandir %{_prefix}/man Name: gdal3 Version: 3.0.2 -Release: 1%{?dist} +Release: 2%{?dist} #define debug_package #{nil} License: MIT Group: Applications/System @@ -45,6 +45,7 @@ BuildRequires: python3-numpy %endif BuildRequires: sqlite-devel BuildRequires: swig +BuildRequires: /usr/bin/pathfix.py %global DONT_REMOVE_RPATH 1 # don't check for rpath: @@ -76,35 +77,74 @@ Summary: GDAL file format library %description libs This package contains the GDAL file format library. - simple service for looking up your IP address. This is the code that powers https://echoip.daniel-steiner.org. + +%package python-tools +Summary: GDAL python files + +%description python-tools +This package contains the GDAL python files + %prep %setup -q -n %{realname}-%{version} +%if 0%{?fedora} > 31 +pathfix.py -pni "%{__python3} %{py3_shbang_opts}" \ +%else +pathfix.py -pni "%{__python2} %{py2_shbang_opts}" \ +%endif + swig/python/scripts/epsg_tr.py \ + swig/python/scripts/gdal2tiles.py \ + swig/python/scripts/gdalchksum.py \ + swig/python/scripts/gdalident.py \ + swig/python/scripts/gdal_pansharpen.py \ + swig/python/scripts/gdal_sieve.py \ + swig/python/scripts/rgb2pct.py \ + swig/python/scripts/esri2wkt.py \ + swig/python/scripts/gdal2xyz.py \ + swig/python/scripts/gdalcompare.py \ + swig/python/scripts/gdalimport.py \ + swig/python/scripts/gdal_polygonize.py \ + swig/python/scripts/mkgraticule.py \ + swig/python/scripts/gcps2vec.py \ + swig/python/scripts/gdal_auth.py \ + swig/python/scripts/gdal_edit.py \ + swig/python/scripts/gdal_merge.py \ + swig/python/scripts/gdal_proximity.py \ + swig/python/scripts/ogrmerge.py \ + swig/python/scripts/gcps2wld.py \ + swig/python/scripts/gdal_calc.py \ + swig/python/scripts/gdal_fillnodata.py \ + swig/python/scripts/gdalmove.py \ + swig/python/scripts/gdal_retile.py \ + swig/python/scripts/pct2rgb.py + %build -./configure \ - --datadir=%{_datadir}/%{realname} \ - --includedir=%{_includedir}/%{realname} \ - --prefix=%{_prefix} \ - --libdir=%{_libdir} \ - --sysconfdir=%{_sysconfdir} \ - --localstatedir=%{_var} \ - --with-curl \ - --with-freexl \ - --with-geos \ - --with-png=%{sysprefix} \ - --with-gif \ - --with-gta \ - --with-jpeg \ - --without-jpeg12 \ - --with-liblzma \ - --with-libtiff=%{sysprefix} \ - --with-libz \ - --without-mdb \ - --without-msg \ - --with-proj=%{_prefix} \ - --with-threads \ - --enable-shared +./configure --with-python +#./configure \ + #--datadir=%{_datadir}/%{realname} \ + #--includedir=%{_includedir}/%{realname} \ + #--prefix=%{_prefix} \ + #--libdir=%{_libdir} \ + #--sysconfdir=%{_sysconfdir} \ + #--localstatedir=%{_var} \ + #--with-curl \ + #--with-freexl \ + #--with-geos \ + #--with-png=%{sysprefix} \ + #--with-gif \ + #--with-gta \ + #--with-jpeg \ + #--without-jpeg12 \ + #--with-liblzma \ + #--with-libtiff=%{sysprefix} \ + #--with-libz \ + #--without-mdb \ + #--without-msg \ + #--with-proj=%{_prefix} \ + #--with-python \ + #--with-threads \ + #--enable-shared make @@ -154,13 +194,20 @@ mv %{buildroot}%{_prefix}/etc %{buildroot}/ %files devel %{_bindir}/%{realname}-config -%{_includedir}/%{realname}/*.h +%{_includedir}/*.h %{_libdir}/*.a %{_libdir}/*.la %{_libdir}/*.so %{_libdir}/pkgconfig/%{realname}.pc +%files python-tools +%{_bindir}/*.py +%{_libdir}64/python*/site-packages/* + %changelog +* Sat Jan 11 2020 Daniel Steiner +- Python scripts added + * Wed Jan 8 2020 Daniel Steiner - Library path fixed. diff --git a/fedora/SPECS/phyghtmap.spec b/fedora/SPECS/phyghtmap.spec new file mode 100644 index 0000000..85cd428 --- /dev/null +++ b/fedora/SPECS/phyghtmap.spec @@ -0,0 +1,52 @@ +Name: phyghtmap +Version: 2.21 +Release: 99%{?dist} +Summary: Generate OSM contour lines from NASA SRTM data +License: GPLv2+ +URL: http://katze.tfiu.de/projects/phyghtmap/ +Source0: http://katze.tfiu.de/projects/%{modname}/%{modname}_%{version}.orig.tar.gz +BuildArch: noarch + +BuildRequires: python3-devel +BuildRequires: python3-setuptools + +%global _description\ +%{modname} is a little program which lets you easily generate OSM contour\ +lines from NASA SRTM data.\ + + +%description %_description + +%package +Summary: %summary +Requires: python3-numpy +Requires: python3-beautifulsoup4 +Requires: python3-matplotlib +%{?python_provide:%python_provide python3-phyghtmap} + +%description + +%prep +%setup -q -n %{name}-%{version} + + +%build +%py3_build + + +%install +%py3_install +install -Dpm 644 docs/%{modname}.1 %{buildroot}%{_mandir}/man1/%{modname}.1 + + +%files +%doc README LICENSE_GPL-2 COPYRIGHT Changelog +%{_bindir}/%{modname} +%{_mandir}/man1/%{modname}.1* +%{python3_sitelib}/%{modname}/ +%{python3_sitelib}/%{modname}-%{version}-py*.egg-info/ + +%changelog +* Sat Jan 11 2020 Daniel Steiner +- Initial build + From dfd2636a8b2cfeafea711e66214bd43c1d91b957 Mon Sep 17 00:00:00 2001 From: Daniel Steiner Date: Sun, 12 Jan 2020 09:12:23 +0100 Subject: [PATCH 10/56] Problems fixed --- fedora/SPECS/phyghtmap.spec | 26 +++++++++----------------- 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/fedora/SPECS/phyghtmap.spec b/fedora/SPECS/phyghtmap.spec index 85cd428..8633a91 100644 --- a/fedora/SPECS/phyghtmap.spec +++ b/fedora/SPECS/phyghtmap.spec @@ -1,30 +1,22 @@ Name: phyghtmap Version: 2.21 -Release: 99%{?dist} +Release: 1%{?dist} Summary: Generate OSM contour lines from NASA SRTM data License: GPLv2+ URL: http://katze.tfiu.de/projects/phyghtmap/ -Source0: http://katze.tfiu.de/projects/%{modname}/%{modname}_%{version}.orig.tar.gz +Source0: http://katze.tfiu.de/projects/%{name}/%{name}_%{version}.orig.tar.gz BuildArch: noarch BuildRequires: python3-devel BuildRequires: python3-setuptools -%global _description\ -%{modname} is a little program which lets you easily generate OSM contour\ -lines from NASA SRTM data.\ - - -%description %_description - -%package -Summary: %summary Requires: python3-numpy Requires: python3-beautifulsoup4 Requires: python3-matplotlib -%{?python_provide:%python_provide python3-phyghtmap} %description +%{name} is a little program which lets you easily generate OSM contour +lines from NASA SRTM data. %prep %setup -q -n %{name}-%{version} @@ -36,15 +28,15 @@ Requires: python3-matplotlib %install %py3_install -install -Dpm 644 docs/%{modname}.1 %{buildroot}%{_mandir}/man1/%{modname}.1 +install -Dpm 644 docs/%{name}.1 %{buildroot}%{_mandir}/man1/%{name}.1 %files %doc README LICENSE_GPL-2 COPYRIGHT Changelog -%{_bindir}/%{modname} -%{_mandir}/man1/%{modname}.1* -%{python3_sitelib}/%{modname}/ -%{python3_sitelib}/%{modname}-%{version}-py*.egg-info/ +%{_bindir}/%{name} +%{_mandir}/man1/%{name}.1* +%{python3_sitelib}/%{name}/ +%{python3_sitelib}/%{name}-%{version}-py*.egg-info/ %changelog * Sat Jan 11 2020 Daniel Steiner From 48fd7d852a7163031dff52e73f554ad2f5bc2fc1 Mon Sep 17 00:00:00 2001 From: Daniel Steiner Date: Fri, 17 Jan 2020 12:22:50 +0100 Subject: [PATCH 11/56] Polemarch and gitea updated --- fedora/SPECS/gitea.spec | 5 ++++- fedora/SPECS/polemarch.spec | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/fedora/SPECS/gitea.spec b/fedora/SPECS/gitea.spec index 2526ee6..d8cc273 100644 --- a/fedora/SPECS/gitea.spec +++ b/fedora/SPECS/gitea.spec @@ -1,5 +1,5 @@ Name: gitea -Version: 1.10.0 +Version: 1.10.2 Release: 1%{?dist} Summary: Gitea is a painless self-hosted Git service. %define MyVersion %version @@ -82,6 +82,9 @@ getent passwd gitea > /dev/null || \ %changelog +* Fri Jan 17 2020 Daniel Steiner +- Update to version 1.10.2. + * Fri Nov 22 2019 Daniel Steiner - Update to version 1.10.0. diff --git a/fedora/SPECS/polemarch.spec b/fedora/SPECS/polemarch.spec index a5d4f92..6e5160f 100644 --- a/fedora/SPECS/polemarch.spec +++ b/fedora/SPECS/polemarch.spec @@ -15,7 +15,7 @@ %define namebase polemarch %define user polemarch %define datad poledata -%define version 1.6.1 +%define version 1.6.2 %define release 1 %define __prelink_undo_cmd %{nil} %define _binaries_in_noarch_packages_terminate_build 0 @@ -114,6 +114,9 @@ sudo -u %{user} /opt/%{name}/bin/%{shortname}ctl migrate [ "%{_builddir}" != "/" ] && [ -d "%{_builddir}" ] && rm -rf %{_builddir}/* %changelog +* Fri Jan 17 2020 Daniel Steiner +- Update to 1.6.2 version. + * Mon Dec 30 2019 Daniel Steiner - Update to 1.6.1 version. From 2a0c6feb7b7534a027b8148112e6069cacf84a49 Mon Sep 17 00:00:00 2001 From: Daniel Steiner Date: Sat, 25 Jan 2020 22:52:52 +0100 Subject: [PATCH 12/56] Gitea updated --- fedora/SPECS/gitea.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fedora/SPECS/gitea.spec b/fedora/SPECS/gitea.spec index d8cc273..66e86c0 100644 --- a/fedora/SPECS/gitea.spec +++ b/fedora/SPECS/gitea.spec @@ -1,5 +1,5 @@ Name: gitea -Version: 1.10.2 +Version: 1.10.3 Release: 1%{?dist} Summary: Gitea is a painless self-hosted Git service. %define MyVersion %version @@ -82,6 +82,9 @@ getent passwd gitea > /dev/null || \ %changelog +* Sat Jan 25 2020 Daniel Steiner +- Update to version 1.10.3. + * Fri Jan 17 2020 Daniel Steiner - Update to version 1.10.2. From 30bee1717bd7e08cd0549f25d7604c995a72fc89 Mon Sep 17 00:00:00 2001 From: Daniel Steiner Date: Sat, 22 Feb 2020 10:56:48 +0100 Subject: [PATCH 13/56] Update for gitea --- fedora/SPECS/gitea.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/fedora/SPECS/gitea.spec b/fedora/SPECS/gitea.spec index 66e86c0..b99e76e 100644 --- a/fedora/SPECS/gitea.spec +++ b/fedora/SPECS/gitea.spec @@ -1,5 +1,5 @@ Name: gitea -Version: 1.10.3 +Version: 1.11.1 Release: 1%{?dist} Summary: Gitea is a painless self-hosted Git service. %define MyVersion %version @@ -7,7 +7,6 @@ Summary: Gitea is a painless self-hosted Git service. License: MIT URL: https://gitea.io -#Source0: https://github.com/go-gitea/gitea/archive/%{version}.tar.gz Source0: %name-%MyVersion.tar.gz Source1: gitea.service @@ -82,6 +81,9 @@ getent passwd gitea > /dev/null || \ %changelog +* Sat Feb 22 2020 Daniel Steiner +- Update to version 1.11.1. + * Sat Jan 25 2020 Daniel Steiner - Update to version 1.10.3. From ef061de8a8bd6956be60d160656f9b329abd529d Mon Sep 17 00:00:00 2001 From: Daniel Steiner Date: Sat, 22 Feb 2020 11:50:54 +0100 Subject: [PATCH 14/56] Dependency package added --- fedora/SPECS/gitea.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/fedora/SPECS/gitea.spec b/fedora/SPECS/gitea.spec index b99e76e..2440d08 100644 --- a/fedora/SPECS/gitea.spec +++ b/fedora/SPECS/gitea.spec @@ -16,6 +16,7 @@ BuildRequires: golang >= 1.8 BuildRequires: go-bindata %endif BuildRequires: make +BuildRequires: npm Requires: git From c1f4bf8a654b84e19a14ba45e34befb680b79156 Mon Sep 17 00:00:00 2001 From: Daniel Steiner Date: Sat, 22 Feb 2020 13:07:49 +0100 Subject: [PATCH 15/56] Nginx updated --- fedora/SPECS/nginx.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/fedora/SPECS/nginx.spec b/fedora/SPECS/nginx.spec index 586550a..5050e68 100644 --- a/fedora/SPECS/nginx.spec +++ b/fedora/SPECS/nginx.spec @@ -19,7 +19,7 @@ Name: nginx Epoch: 1 -Version: 1.17.6 +Version: 1.17.8 Release: 1%{?dist} Summary: A high performance web server and reverse proxy server @@ -150,7 +150,7 @@ BuildRequires: perl-devel %if 0%{?fedora} >= 24 BuildRequires: perl-generators %endif -BuildRequires: perl(ExtUtils::Embed) +BuildRequires: perl-ExtUtils-Embed Requires: nginx Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) @@ -569,6 +569,9 @@ fi [ "%{_builddir}" != "/" ] && [ -d "%{_builddir}" ] && rm -rf %{_builddir}/* %changelog +* Sat Feb 22 2020 Daniel Steiner +- Updated to mainline version 1.17.8. + * Thu Nov 21 2019 Daniel Steiner 1.17.6-1 - Updated to mainline version 1.17.6. From 0414bcc7b68c35b1b3733d0415365975d9c1ed57 Mon Sep 17 00:00:00 2001 From: Daniel Steiner Date: Fri, 6 Mar 2020 13:06:52 +0100 Subject: [PATCH 16/56] Kodi and MakeMKV udpates --- fedora/SPECS/kodi.spec | 5 ++++- fedora/SPECS/makemkv.spec | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/fedora/SPECS/kodi.spec b/fedora/SPECS/kodi.spec index 5cc7f6f..3fce3b6 100644 --- a/fedora/SPECS/kodi.spec +++ b/fedora/SPECS/kodi.spec @@ -29,7 +29,7 @@ %endif Name: kodi -Version: 18.5 +Version: 18.6 Release: 99.%{myRELEASE}.%{PRERELEASE}%{?dist} Summary: Media center @@ -544,6 +544,9 @@ rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/kodi-wiiremote.1 %changelog +* Fri Mar 3 2020 Daniel Steiner +- Update to 18.6 + * Sat Nov 16 2019 Daniel Steiner - Update to 18.5 diff --git a/fedora/SPECS/makemkv.spec b/fedora/SPECS/makemkv.spec index 13d1a6f..ecc45f6 100644 --- a/fedora/SPECS/makemkv.spec +++ b/fedora/SPECS/makemkv.spec @@ -6,7 +6,7 @@ # wget http://www.makemkv.com/download/makemkv-oss-$v.tar.gz -O makemkv-oss-$v.tar.gz Name: makemkv -Version: 1.14.7 +Version: 1.15.0 Release: 0%{?dist} BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: One click DVD and Blu-ray converter @@ -86,6 +86,9 @@ popd %{_datarootdir}/MakeMKV/* %changelog +* Fri Mar 6 2020 Daniel Steiner +- Update to 1.15.0. + * Mon Dec 30 2019 Daniel Steiner - Update to 1.14.7. From d2339fa204608a2d2bc65fca16abff92353d7b5d Mon Sep 17 00:00:00 2001 From: Daniel Steiner Date: Sun, 8 Mar 2020 13:06:35 +0100 Subject: [PATCH 17/56] Kodi switched to nvidia ffmpeg --- fedora/SPECS/ffmpeg-nvidia.spec | 191 ++++++++++++++++++++++++++++++++ fedora/SPECS/kodi.spec | 27 ++--- 2 files changed, 205 insertions(+), 13 deletions(-) create mode 100644 fedora/SPECS/ffmpeg-nvidia.spec diff --git a/fedora/SPECS/ffmpeg-nvidia.spec b/fedora/SPECS/ffmpeg-nvidia.spec new file mode 100644 index 0000000..535ff51 --- /dev/null +++ b/fedora/SPECS/ffmpeg-nvidia.spec @@ -0,0 +1,191 @@ +Summary: Digital VCR and streaming server +Name: ffmpeg-nvidia +Version: 4.2.2 +Release: 1%{?dist} +License: GPLv2+ +URL: http://ffmpeg.org/ +Source0: http://ffmpeg.org/releases/ffmpeg-%{version}.tar.xz + +%define cudav 10-1 +%define ffname ffmpeg +%define debug_package %{nil} + +BuildRequires: cuda-drivers-devel +BuildRequires: cuda-minimal-build-%{cudav} +BuildRequires: fdk-aac-devel +BuildRequires: gsm-devel +BuildRequires: jack-audio-connection-kit-devel +BuildRequires: libaom-devel +BuildRequires: libdav1d-devel +BuildRequires: librsvg2-devel +BuildRequires: libtheora-devel +BuildRequires: libv4l-devel +BuildRequires: libvmaf-devel +BuildRequires: libvpx-devel +BuildRequires: ocl-icd-devel +BuildRequires: openal-soft-devel +BuildRequires: opencl-headers +BuildRequires: opencore-amr-devel +BuildRequires: opus-devel +BuildRequires: soxr-devel +BuildRequires: speex-devel +BuildRequires: vo-amrwbenc-devel +BuildRequires: zimg-devel +BuildRequires: zvbi-devel +BuildRequires: intel-mediasdk-devel +BuildRequires: alsa-lib-devel +BuildRequires: bzip2-devel +BuildRequires: fontconfig-devel +BuildRequires: freetype-devel +BuildRequires: fribidi-devel +BuildRequires: gnutls-devel +BuildRequires: gsm-devel +BuildRequires: lame-devel +BuildRequires: libavc1394-devel +BuildRequires: libdc1394-devel +BuildRequires: libiec61883-devel +BuildRequires: libdrm-devel +BuildRequires: libgcrypt-devel +BuildRequires: libGL-devel +BuildRequires: libmodplug-devel +BuildRequires: librsvg2-devel +BuildRequires: libssh-devel +BuildRequires: libtheora-devel +BuildRequires: libv4l-devel +BuildRequires: libvdpau-devel +BuildRequires: libvorbis-devel +BuildRequires: nasm +BuildRequires: libxcb-devel +BuildRequires: opencl-headers ocl-icd-devel +BuildRequires: openjpeg2-devel +BuildRequires: perl(Pod::Man) +BuildRequires: soxr-devel +BuildRequires: speex-devel +BuildRequires: texinfo +BuildRequires: zimg-devel >= 2.7.0 +BuildRequires: zlib-devel + +Requires: %{name}-libs%{?_isa} = %{version}-%{release} +Provides: %{ffname} + +%description +%{ffname} is a complete and free Internet live audio and video +broadcasting solution for Linux/Unix. It also includes a digital +VCR. It can encode in real time in many formats including MPEG1 audio +and video, MPEG4, h263, ac3, asf, avi, real, mjpeg, and flash. + +%package libs +Summary: Libraries for %{name} +Provides: %{ffname}-libs +Provides: %{ffname}-libs(%{arch}) = %{version}-%{release}%{?dist} + +%description libs +%{ffname} is a complete and free Internet live audio and video +broadcasting solution for Linux/Unix. It also includes a digital +VCR. It can encode in real time in many formats including MPEG1 audio +and video, MPEG4, h263, ac3, asf, avi, real, mjpeg, and flash. +This package contains the libraries for %{name} + +%package -n libavdevice +Summary: Special devices muxing/demuxing library +Requires: %{name}-libs%{_isa} = %{version}-%{release} + +%description -n libavdevice%{?flavor} +Libavdevice is a complementary library to libavf "libavformat". It provides +various "special" platform-specific muxers and demuxers, e.g. for grabbing +devices, audio capture and playback etc. + +%package devel +Summary: Development package for %{name} +Requires: %{name}-libs%{_isa} = %{version}-%{release} +Requires: libavdevice%{?flavor}%{_isa} = %{version}-%{release} +Requires: pkgconfig +Provides: %{ffname}-devel + +%description devel +%{ffname} is a complete and free Internet live audio and video +broadcasting solution for Linux/Unix. It also includes a digital +VCR. It can encode in real time in many formats including MPEG1 audio +and video, MPEG4, h263, ac3, asf, avi, real, mjpeg, and flash. +This package contains development files for %{ffname} + + + +%prep +%setup -q -n %{ffname}-%{version} + +%build +# Don't use the %%configure macro as this is not an autotool script +./configure \ + --prefix=%{_prefix} \ + --bindir=%{_bindir} \ + --datadir=%{_datadir}/%{ffname} \ + --docdir=%{_docdir}/%{ffname} \ + --incdir=%{_includedir}/%{ffname} \ + --libdir=%{_libdir} \ + --mandir=%{_mandir} \ + --arch=x86_64 \ + --enable-cuda \ + --enable-cuvid \ + --enable-nvenc \ + --enable-nonfree \ + --extra-cflags=-I/usr/local/cuda-%{cudav}/include \ + --extra-ldflags=-L/usr/local/cuda-%{cudav}/lib64 \ + --disable-manpages \ + --enable-libbluray \ + --enable-libdrm \ + --enable-libmp3lame \ + --enable-openal \ + --enable-opencl \ + --enable-opengl \ + --enable-libopenjpeg \ + --enable-libopus \ + --enable-libpulse \ + --enable-librsvg \ + --enable-libsoxr \ + --enable-libspeex \ + --enable-libssh \ + --enable-libtheora \ + --enable-libvorbis \ + --enable-libv4l2 \ + --enable-libvmaf \ + --enable-libvpx \ + --enable-libzimg \ + --enable-libzvbi \ + --enable-shared \ + --enable-version3 + +%install +make install DESTDIR=%{?buildroot} +rm -f %{ffname}-%{version}/debugsourcefiles.list +rm -rf %{buildroot}/.build-id + +%files +%{_bindir}/%{ffname} +%{_bindir}/ffplay +%{_bindir}/ffprobe +%{_datadir}/%{ffname} + +%files libs +%doc CREDITS README.md +%license COPYING.* +%{_libdir}/lib*.so.* +%exclude %{_libdir}/libavdevice.so.* + +%files -n libavdevice +%{_libdir}/libavdevice.so.* + +%files devel +%doc MAINTAINERS doc/APIchanges doc/*.txt +%doc %{_docdir}/%{ffname}/*.html +%{_includedir}/%{ffname} +%{_libdir}/pkgconfig/lib*.pc +%{_libdir}/lib*.so +%{_libdir}/lib*.a + + +%changelog +* Sun Mar 8 2020 Daniel Steiner +- Initial build. +- Build with Nvidia Cuda support. + diff --git a/fedora/SPECS/kodi.spec b/fedora/SPECS/kodi.spec index 3fce3b6..3159934 100644 --- a/fedora/SPECS/kodi.spec +++ b/fedora/SPECS/kodi.spec @@ -19,8 +19,9 @@ %global _with_cwiid 1 %global _with_libssh 1 %global _with_libcec 1 -%global _with_external_ffmpeg 1 %global _with_wayland 1 +# only enable it, if you have a nvidia gpu! +%global _with_nvidia_ffmpeg 1 %endif %if 0%{?_with_wayland} %global kodi_backends x11 wayland gbm @@ -30,7 +31,7 @@ Name: kodi Version: 18.6 -Release: 99.%{myRELEASE}.%{PRERELEASE}%{?dist} +Release: 100.%{myRELEASE}.%{PRERELEASE}%{?dist} Summary: Media center License: GPLv2+ and GPLv3+ and LGPLv2+ and BSD and MIT @@ -56,11 +57,6 @@ Source3: kodi-libdvdread-6.0.0-Leia-Alpha-3.tar.gz Source4: kodi-libdvdcss-1.4.2-Leia-Beta-5.tar.gz %endif -%if ! 0%{?_with_external_ffmpeg} -# wget -O ffmpeg-4.0.4-Leia-18.4.tar.gz https://github.com/xbmc/FFmpeg/archive/4.0.4-Leia-18.4.tar.gz -Source5: ffmpeg-4.0.4-Leia-18.4.tar.gz -%endif - # Set program version parameters Patch1: kodi-18.0-versioning.patch @@ -104,10 +100,10 @@ BuildRequires: enca-devel BuildRequires: expat-devel BuildRequires: faad2-devel BuildRequires: firewalld-filesystem -%if 0%{?_with_external_ffmpeg} -BuildRequires: ffmpeg-devel +%if 0%{?_with_nvidia_ffmpeg} +BuildRequires: ffmpeg-nvidia-devel %else -BuildRequires: trousers-devel +BuildRequires: ffmpeg-devel %endif BuildRequires: flac-devel BuildRequires: flatbuffers-devel @@ -231,6 +227,11 @@ Requires: %{name}-common = %{version}-%{release} Requires: (%{name}-wayland = %{version}-%{release} if libwayland-server) Requires: (%{name}-x11 = %{version}-%{release} if xorg-x11-server-Xorg) Requires: (%{name}-firewalld = %{version}-%{release} if firewalld) +%if 0%{?_with_nvidia_ffmpeg} +Requires: ffmpeg-nvidia +Requires: ffmpeg-nvidia-libs +%endif + %description @@ -396,9 +397,6 @@ do -DLIBDVDCSS_URL=%{SOURCE4} \ %else -DENABLE_DVDCSS=OFF \ -%endif -%if ! 0%{?_with_external_ffmpeg} - -DFFMPEG_URL=%{SOURCE5} \ %endif -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -GNinja \ @@ -544,6 +542,9 @@ rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/kodi-wiiremote.1 %changelog +* Sun Mar 8 2020 Daniel Steiner +- Nvidia depend build with ffmpeg-nvidia library. + * Fri Mar 3 2020 Daniel Steiner - Update to 18.6 From 07ef337b3dea3356106733d1ee0dcef63d635c3f Mon Sep 17 00:00:00 2001 From: Daniel Steiner Date: Sun, 8 Mar 2020 13:09:00 +0100 Subject: [PATCH 18/56] Fallback to normal ffmpeg libs added --- fedora/SPECS/kodi.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/fedora/SPECS/kodi.spec b/fedora/SPECS/kodi.spec index 3159934..2abd95e 100644 --- a/fedora/SPECS/kodi.spec +++ b/fedora/SPECS/kodi.spec @@ -230,6 +230,9 @@ Requires: (%{name}-firewalld = %{version}-%{release} if firewalld) %if 0%{?_with_nvidia_ffmpeg} Requires: ffmpeg-nvidia Requires: ffmpeg-nvidia-libs +%else +Requires: ffmpeg +Requires: ffmpeg-libs %endif From 39f766141e6015d60fbc2fc040ad352fc978bc6c Mon Sep 17 00:00:00 2001 From: Daniel Steiner Date: Sun, 8 Mar 2020 13:10:25 +0100 Subject: [PATCH 19/56] Bogus date fixed --- fedora/SPECS/kodi.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fedora/SPECS/kodi.spec b/fedora/SPECS/kodi.spec index 2abd95e..20cdbac 100644 --- a/fedora/SPECS/kodi.spec +++ b/fedora/SPECS/kodi.spec @@ -548,7 +548,7 @@ rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/kodi-wiiremote.1 * Sun Mar 8 2020 Daniel Steiner - Nvidia depend build with ffmpeg-nvidia library. -* Fri Mar 3 2020 Daniel Steiner +* Fri Mar 6 2020 Daniel Steiner - Update to 18.6 * Sat Nov 16 2019 Daniel Steiner From a72a59a5cebcf4045be578808f3ff4ed3a4bab1c Mon Sep 17 00:00:00 2001 From: Daniel Steiner Date: Sun, 8 Mar 2020 14:08:50 +0100 Subject: [PATCH 20/56] postproc support added --- fedora/SPECS/ffmpeg-nvidia.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/fedora/SPECS/ffmpeg-nvidia.spec b/fedora/SPECS/ffmpeg-nvidia.spec index 535ff51..c6b97fc 100644 --- a/fedora/SPECS/ffmpeg-nvidia.spec +++ b/fedora/SPECS/ffmpeg-nvidia.spec @@ -153,6 +153,7 @@ This package contains development files for %{ffname} --enable-libzimg \ --enable-libzvbi \ --enable-shared \ + --enable-postproc \ --enable-version3 %install From 2381d85dedf8e364f98cc3aff737496a9aab62d2 Mon Sep 17 00:00:00 2001 From: Daniel Steiner Date: Sun, 8 Mar 2020 14:10:04 +0100 Subject: [PATCH 21/56] Release increased --- fedora/SPECS/ffmpeg-nvidia.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fedora/SPECS/ffmpeg-nvidia.spec b/fedora/SPECS/ffmpeg-nvidia.spec index c6b97fc..b96c4d1 100644 --- a/fedora/SPECS/ffmpeg-nvidia.spec +++ b/fedora/SPECS/ffmpeg-nvidia.spec @@ -1,7 +1,7 @@ Summary: Digital VCR and streaming server Name: ffmpeg-nvidia Version: 4.2.2 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: http://ffmpeg.org/ Source0: http://ffmpeg.org/releases/ffmpeg-%{version}.tar.xz From 5d8d06722063b9bf0675b4957562e1fac12f79b1 Mon Sep 17 00:00:00 2001 From: Daniel Steiner Date: Sun, 8 Mar 2020 21:56:01 +0100 Subject: [PATCH 22/56] More modules enabled --- fedora/SPECS/ffmpeg-nvidia.spec | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/fedora/SPECS/ffmpeg-nvidia.spec b/fedora/SPECS/ffmpeg-nvidia.spec index b96c4d1..d630409 100644 --- a/fedora/SPECS/ffmpeg-nvidia.spec +++ b/fedora/SPECS/ffmpeg-nvidia.spec @@ -9,6 +9,7 @@ Source0: http://ffmpeg.org/releases/ffmpeg-%{version}.tar.xz %define cudav 10-1 %define ffname ffmpeg %define debug_package %{nil} +%define _with_libnpp 1 BuildRequires: cuda-drivers-devel BuildRequires: cuda-minimal-build-%{cudav} @@ -126,9 +127,14 @@ This package contains development files for %{ffname} --mandir=%{_mandir} \ --arch=x86_64 \ --enable-cuda \ + --enable-cuda-sdk \ --enable-cuvid \ --enable-nvenc \ + --enable-libx264 \ + --enable-libx265 \ --enable-nonfree \ + --enable-gpl \ + --enable-libfdk_aac \ --extra-cflags=-I/usr/local/cuda-%{cudav}/include \ --extra-ldflags=-L/usr/local/cuda-%{cudav}/lib64 \ --disable-manpages \ @@ -154,7 +160,27 @@ This package contains development files for %{ffname} --enable-libzvbi \ --enable-shared \ --enable-postproc \ + --enable-libvo-amrwbenc \ + --enable-bzlib \ + --disable-crystalhd \ + --enable-fontconfig \ + --enable-gcrypt \ + --enable-gnutls \ + --enable-ladspa \ + --enable-libaom \ + --enable-libdav1d \ + --enable-libass \ + --enable-libfdk-aac \ + --enable-libjack \ + --enable-libfreetype \ + --enable-libfribidi \ + --enable-libgsm \ + %{?_with_libnpp:--enable-libnpp \} --enable-version3 + + +# interesting: +# https://patchwork.ffmpeg.org/project/ffmpeg/patch/0jvAo3VLhFQ4_4u5oIjRgKWsvUsMNzbFI7uRxyeg3q5DRtwQTeyeAKjnI6vW56j-ckb7etJOBCdiWpXRwMivvzlb9rvRTrZ9UY4ORW1vWww=@protonmail.com/#16559 %install make install DESTDIR=%{?buildroot} From cbd7349d30fa4297bcfdeea20ae5c68c960026dc Mon Sep 17 00:00:00 2001 From: Daniel Steiner Date: Fri, 27 Mar 2020 15:32:52 +0100 Subject: [PATCH 23/56] gitea and nginx updated --- fedora/SPECS/gitea.spec | 5 ++++- fedora/SPECS/nginx.spec | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/fedora/SPECS/gitea.spec b/fedora/SPECS/gitea.spec index 2440d08..fee7ab3 100644 --- a/fedora/SPECS/gitea.spec +++ b/fedora/SPECS/gitea.spec @@ -1,5 +1,5 @@ Name: gitea -Version: 1.11.1 +Version: 1.11.3 Release: 1%{?dist} Summary: Gitea is a painless self-hosted Git service. %define MyVersion %version @@ -82,6 +82,9 @@ getent passwd gitea > /dev/null || \ %changelog +* Fri Mar 27 2020 Daniel Steiner +- Update to version 1.11.3. + * Sat Feb 22 2020 Daniel Steiner - Update to version 1.11.1. diff --git a/fedora/SPECS/nginx.spec b/fedora/SPECS/nginx.spec index 5050e68..e55bce4 100644 --- a/fedora/SPECS/nginx.spec +++ b/fedora/SPECS/nginx.spec @@ -19,7 +19,7 @@ Name: nginx Epoch: 1 -Version: 1.17.8 +Version: 1.17.9 Release: 1%{?dist} Summary: A high performance web server and reverse proxy server @@ -569,6 +569,9 @@ fi [ "%{_builddir}" != "/" ] && [ -d "%{_builddir}" ] && rm -rf %{_builddir}/* %changelog +* Fri Mar 27 2020 Daniel Steiner +- Updated to mainline version 1.17.9. + * Sat Feb 22 2020 Daniel Steiner - Updated to mainline version 1.17.8. From 3c898f89dd9d8a3c54de30859b55af76d0e1eacb Mon Sep 17 00:00:00 2001 From: Daniel Steiner Date: Thu, 9 Apr 2020 10:40:55 +0200 Subject: [PATCH 24/56] New sockstat package added --- centos/SPECS/sockstat.spec | 39 +++++++++++++++++++++++++++++++++++++ fedora/SPECS/sockstat.spec | 40 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 79 insertions(+) create mode 100644 centos/SPECS/sockstat.spec create mode 100644 fedora/SPECS/sockstat.spec diff --git a/centos/SPECS/sockstat.spec b/centos/SPECS/sockstat.spec new file mode 100644 index 0000000..03bcd45 --- /dev/null +++ b/centos/SPECS/sockstat.spec @@ -0,0 +1,39 @@ +Name: sockstat +Version: 0.4.1 +Release: 1%{?dist} +Summary: View detailed information about open connections + +License: BSD-3 +URL: https://github.com/alteholz/sockstat/ +Source0: %{name}-%{version}.tar.gz + +# disable debug: +%global debug_package %{nil} + + +%description +View detailed information about open connections + + +%prep +%setup -q + + +%build +make %{?_smp_mflags} + + +%install +%{__install} -D %{name} %{buildroot}%{_bindir}/%{name} +%{__install} -D %{name}.1 %{buildroot}%{_mandir}/man1/%{name}.1 + +%files +%doc LICENSE +%{_bindir}/%{name} +%{_mandir}/man1/%{name}.1.gz + + +%changelog +* Thu Apr 9 2020 Daniel Steiner +- Initial version for CentOS 8 (0.4.1). + diff --git a/fedora/SPECS/sockstat.spec b/fedora/SPECS/sockstat.spec new file mode 100644 index 0000000..6c44549 --- /dev/null +++ b/fedora/SPECS/sockstat.spec @@ -0,0 +1,40 @@ +Name: sockstat +Version: 0.4.1 +Release: 1%{?dist} +Summary: View detailed information about open connections + +License: BSD-3 +URL: https://github.com/alteholz/sockstat/ +Source0: %{name}-%{version}.tar.gz + +# disable debug: +%global debug_package %{nil} + + +%description +View detailed information about open connections + + +%prep +%setup -q + + +%build +make %{?_smp_mflags} + + +%install +%{__install} -D %{name} %{buildroot}%{_bindir}/%{name} +%{__install} -D %{name}.1 %{buildroot}%{_mandir}/man1/%{name}.1 + +%files +%doc LICENSE +%{_bindir}/%{name} +%{_mandir}/man1/%{name}.1.gz + + + +%changelog +* Thu Apr 9 2020 Daniel Steiner +- Initial version for CentOS 8 (0.4.1). + From 252a42224aa08cb7591ab44f70eb10d42470d378 Mon Sep 17 00:00:00 2001 From: Daniel Steiner Date: Fri, 10 Apr 2020 08:41:30 +0200 Subject: [PATCH 25/56] Gitea updated --- fedora/SPECS/gitea.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fedora/SPECS/gitea.spec b/fedora/SPECS/gitea.spec index fee7ab3..075ce8e 100644 --- a/fedora/SPECS/gitea.spec +++ b/fedora/SPECS/gitea.spec @@ -1,5 +1,5 @@ Name: gitea -Version: 1.11.3 +Version: 1.11.4 Release: 1%{?dist} Summary: Gitea is a painless self-hosted Git service. %define MyVersion %version @@ -82,6 +82,9 @@ getent passwd gitea > /dev/null || \ %changelog +* Fri Apr 10 2020 Daniel Steiner +- Update to version 1.11.4. + * Fri Mar 27 2020 Daniel Steiner - Update to version 1.11.3. From 58da48d4e4e96e53c52868cf4c67f185d74e2863 Mon Sep 17 00:00:00 2001 From: Daniel Steiner Date: Sat, 11 Apr 2020 08:26:15 +0200 Subject: [PATCH 26/56] Nvidia dependency remove for kodi build --- fedora/SPECS/ffmpeg-nvidia.spec | 23 ++++++++++++++++++----- fedora/SPECS/kodi.spec | 7 +++++-- 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/fedora/SPECS/ffmpeg-nvidia.spec b/fedora/SPECS/ffmpeg-nvidia.spec index d630409..a2c3082 100644 --- a/fedora/SPECS/ffmpeg-nvidia.spec +++ b/fedora/SPECS/ffmpeg-nvidia.spec @@ -1,18 +1,22 @@ Summary: Digital VCR and streaming server Name: ffmpeg-nvidia Version: 4.2.2 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ URL: http://ffmpeg.org/ Source0: http://ffmpeg.org/releases/ffmpeg-%{version}.tar.xz -%define cudav 10-1 %define ffname ffmpeg %define debug_package %{nil} %define _with_libnpp 1 -BuildRequires: cuda-drivers-devel -BuildRequires: cuda-minimal-build-%{cudav} + +%if 0%{?_with_libnpp} +BuildRequires: cuda +BuildRequires: cuda-devel +%endif + + BuildRequires: fdk-aac-devel BuildRequires: gsm-devel BuildRequires: jack-audio-connection-kit-devel @@ -175,7 +179,9 @@ This package contains development files for %{ffname} --enable-libfreetype \ --enable-libfribidi \ --enable-libgsm \ - %{?_with_libnpp:--enable-libnpp \} + %if 0%{?_with_libnpp} + --enable-libnpp \ + %endif --enable-version3 @@ -187,6 +193,10 @@ make install DESTDIR=%{?buildroot} rm -f %{ffname}-%{version}/debugsourcefiles.list rm -rf %{buildroot}/.build-id +%clean +[ "%{buildroot}" != "/" ] && [ -d "%{buildroot}" ] && rm -rf %{buildroot} +[ "%{_builddir}" != "/" ] && [ -d "%{_builddir}" ] && rm -rf %{_builddir}/* + %files %{_bindir}/%{ffname} %{_bindir}/ffplay @@ -212,6 +222,9 @@ rm -rf %{buildroot}/.build-id %changelog +* Mon Mar 9 2020 Daniel Steiner +- More modules added. + * Sun Mar 8 2020 Daniel Steiner - Initial build. - Build with Nvidia Cuda support. diff --git a/fedora/SPECS/kodi.spec b/fedora/SPECS/kodi.spec index 20cdbac..638bd0f 100644 --- a/fedora/SPECS/kodi.spec +++ b/fedora/SPECS/kodi.spec @@ -21,7 +21,7 @@ %global _with_libcec 1 %global _with_wayland 1 # only enable it, if you have a nvidia gpu! -%global _with_nvidia_ffmpeg 1 +%global _with_nvidia_ffmpeg 0 %endif %if 0%{?_with_wayland} %global kodi_backends x11 wayland gbm @@ -31,7 +31,7 @@ Name: kodi Version: 18.6 -Release: 100.%{myRELEASE}.%{PRERELEASE}%{?dist} +Release: 101.%{myRELEASE}.%{PRERELEASE}%{?dist} Summary: Media center License: GPLv2+ and GPLv3+ and LGPLv2+ and BSD and MIT @@ -545,6 +545,9 @@ rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/kodi-wiiremote.1 %changelog +* Sat Apr 11 2020 Daniel Steiner +- Nvidia dependencies removed. + * Sun Mar 8 2020 Daniel Steiner - Nvidia depend build with ffmpeg-nvidia library. From 7dbc12cae2c5c363e924c060bd48388cd8468b64 Mon Sep 17 00:00:00 2001 From: Daniel Steiner Date: Sat, 2 May 2020 15:15:03 +0200 Subject: [PATCH 27/56] Updates to Fedora 32 --- fedora/SPECS/gitea.spec | 14 ++++---------- fedora/SPECS/mod_tile.spec | 5 +---- fedora/SPECS/nginx.spec | 5 ++++- fedora/SPECS/python3-argparse.spec | 3 +++ 4 files changed, 12 insertions(+), 15 deletions(-) diff --git a/fedora/SPECS/gitea.spec b/fedora/SPECS/gitea.spec index 075ce8e..62d9a63 100644 --- a/fedora/SPECS/gitea.spec +++ b/fedora/SPECS/gitea.spec @@ -1,5 +1,5 @@ Name: gitea -Version: 1.11.4 +Version: 1.10.4 Release: 1%{?dist} Summary: Gitea is a painless self-hosted Git service. %define MyVersion %version @@ -7,6 +7,7 @@ Summary: Gitea is a painless self-hosted Git service. License: MIT URL: https://gitea.io +#Source0: https://github.com/go-gitea/gitea/archive/%{version}.tar.gz Source0: %name-%MyVersion.tar.gz Source1: gitea.service @@ -16,7 +17,6 @@ BuildRequires: golang >= 1.8 BuildRequires: go-bindata %endif BuildRequires: make -BuildRequires: npm Requires: git @@ -82,14 +82,8 @@ getent passwd gitea > /dev/null || \ %changelog -* Fri Apr 10 2020 Daniel Steiner -- Update to version 1.11.4. - -* Fri Mar 27 2020 Daniel Steiner -- Update to version 1.11.3. - -* Sat Feb 22 2020 Daniel Steiner -- Update to version 1.11.1. +* Sat May 2 2020 Daniel Steiner +- Update to version 1.10.4. * Sat Jan 25 2020 Daniel Steiner - Update to version 1.10.3. diff --git a/fedora/SPECS/mod_tile.spec b/fedora/SPECS/mod_tile.spec index 04512b7..88c0c5e 100644 --- a/fedora/SPECS/mod_tile.spec +++ b/fedora/SPECS/mod_tile.spec @@ -1,6 +1,6 @@ Name: mod_tile Version: 0.5 -Release: 3%{?dist} +Release: 2%{?dist} Summary: A program to efficiently render and serve map tiles for www.openstreetmap.org map using Apache and Mapnik. License: GPLv2 @@ -69,9 +69,6 @@ fi %{_mandir}/man8/* %changelog -* Thu Jan 9 2020 Daniel Steiner -- gdal-lib upgraded. - * Sat Nov 9 2019 Daniel Steiner - Fix for modules config path. diff --git a/fedora/SPECS/nginx.spec b/fedora/SPECS/nginx.spec index e55bce4..6bda0ef 100644 --- a/fedora/SPECS/nginx.spec +++ b/fedora/SPECS/nginx.spec @@ -19,7 +19,7 @@ Name: nginx Epoch: 1 -Version: 1.17.9 +Version: 1.18.0 Release: 1%{?dist} Summary: A high performance web server and reverse proxy server @@ -569,6 +569,9 @@ fi [ "%{_builddir}" != "/" ] && [ -d "%{_builddir}" ] && rm -rf %{_builddir}/* %changelog +* Sat May 2 2020 Daniel Steiner +- Updated to mainline version 1.18.0. + * Fri Mar 27 2020 Daniel Steiner - Updated to mainline version 1.17.9. diff --git a/fedora/SPECS/python3-argparse.spec b/fedora/SPECS/python3-argparse.spec index 1272fab..a026765 100644 --- a/fedora/SPECS/python3-argparse.spec +++ b/fedora/SPECS/python3-argparse.spec @@ -55,6 +55,9 @@ rm -rf %{buildroot}%{python3_sitelib}/__pycache__ %{python3_sitelib}/* %changelog +* Sat May 2 2020 Daniel Steiner +- First build on Fedora 32. + * Sun Feb 3 2019 Daniel Steiner - First build, it's required by powerline_shell package. From 310b8c26575eaab53d648ef48c11c423eec56fa2 Mon Sep 17 00:00:00 2001 From: Daniel Steiner Date: Sun, 3 May 2020 06:57:42 +0200 Subject: [PATCH 28/56] Updated to Fedora 32 --- fedora/SPECS/kodi.spec | 51 +++++++++++++++++++++++++----------------- 1 file changed, 31 insertions(+), 20 deletions(-) diff --git a/fedora/SPECS/kodi.spec b/fedora/SPECS/kodi.spec index 638bd0f..04a01d3 100644 --- a/fedora/SPECS/kodi.spec +++ b/fedora/SPECS/kodi.spec @@ -1,8 +1,8 @@ %global PRERELEASE r %global myRELEASE 1 +%global DIRVERSION %{version} #global GITCOMMIT Gotham_r2-ge988513 # use the line below for pre-releases -%global DIRVERSION %{version} %global _hardened_build 1 # We support hte following options: @@ -16,12 +16,15 @@ %if 0%{?fedora} # (libbluray in EPEL 6 is too old.) %global _with_libbluray 1 +%if 0%{?fedora} < 31 %global _with_cwiid 1 +%else +%global _with_cwiid 0 +%endif %global _with_libssh 1 %global _with_libcec 1 +%global _with_external_ffmpeg 1 %global _with_wayland 1 -# only enable it, if you have a nvidia gpu! -%global _with_nvidia_ffmpeg 0 %endif %if 0%{?_with_wayland} %global kodi_backends x11 wayland gbm @@ -31,7 +34,7 @@ Name: kodi Version: 18.6 -Release: 101.%{myRELEASE}.%{PRERELEASE}%{?dist} +Release: 102.%{myRELEASE}.%{PRERELEASE}%{?dist} Summary: Media center License: GPLv2+ and GPLv3+ and LGPLv2+ and BSD and MIT @@ -57,6 +60,11 @@ Source3: kodi-libdvdread-6.0.0-Leia-Alpha-3.tar.gz Source4: kodi-libdvdcss-1.4.2-Leia-Beta-5.tar.gz %endif +%if ! 0%{?_with_external_ffmpeg} +# wget -O ffmpeg-4.0.4-Leia-18.4.tar.gz https://github.com/xbmc/FFmpeg/archive/4.0.4-Leia-18.4.tar.gz +Source5: ffmpeg-4.0.4-Leia-18.4.tar.gz +%endif + # Set program version parameters Patch1: kodi-18.0-versioning.patch @@ -72,6 +80,12 @@ Patch3: kodi-18-annobin-workaround.patch Patch4: kodi-18-python3-0001.patch Patch5: kodi-18-python3-0002.patch +# Fix missing include (gcc requirement) +Patch6: kodi-18-assert.patch + +# Workaround for brp-mangle-shebangs behavior (RHBZ#1787088) +Patch7: kodi-18-brp-mangle-shebangs.patch + %ifarch x86_64 i686 %global _with_crystalhd 1 %endif @@ -79,8 +93,6 @@ Patch5: kodi-18-python3-0002.patch # Upstream does not support ppc64 ExcludeArch: %{power64} -BuildRequires: SDL2-devel -BuildRequires: SDL_image-devel BuildRequires: a52dec-devel BuildRequires: afpfs-ng-devel BuildRequires: alsa-lib-devel @@ -100,10 +112,10 @@ BuildRequires: enca-devel BuildRequires: expat-devel BuildRequires: faad2-devel BuildRequires: firewalld-filesystem -%if 0%{?_with_nvidia_ffmpeg} -BuildRequires: ffmpeg-nvidia-devel -%else +%if 0%{?_with_external_ffmpeg} BuildRequires: ffmpeg-devel +%else +BuildRequires: trousers-devel %endif BuildRequires: flac-devel BuildRequires: flatbuffers-devel @@ -151,6 +163,7 @@ BuildRequires: libcrystalhd-devel %endif BuildRequires: libcurl-devel BuildRequires: libdca-devel +BuildRequires: libdrm-devel BuildRequires: libidn2-devel BuildRequires: libinput-devel %if 0%{?el6} @@ -227,14 +240,6 @@ Requires: %{name}-common = %{version}-%{release} Requires: (%{name}-wayland = %{version}-%{release} if libwayland-server) Requires: (%{name}-x11 = %{version}-%{release} if xorg-x11-server-Xorg) Requires: (%{name}-firewalld = %{version}-%{release} if firewalld) -%if 0%{?_with_nvidia_ffmpeg} -Requires: ffmpeg-nvidia -Requires: ffmpeg-nvidia-libs -%else -Requires: ffmpeg -Requires: ffmpeg-libs -%endif - %description @@ -369,6 +374,9 @@ This package contains the Kodi binary for X11 servers. %patch5 -p1 -b.python3-0002 %endif +%patch6 -p1 -b.assert +%patch7 -p1 -b.brp-mangle-shebangs + # Fix up Python shebangs %if 0%{?fedora} > 31 pathfix.py -pni "%{__python3} %{py3_shbang_opts}" \ @@ -400,8 +408,12 @@ do -DLIBDVDCSS_URL=%{SOURCE4} \ %else -DENABLE_DVDCSS=OFF \ +%endif +%if ! 0%{?_with_external_ffmpeg} + -DFFMPEG_URL=%{SOURCE5} \ %endif -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DENABLE_DEBUGFISSION=OFF \ -GNinja \ -DENABLE_EVENTCLIENTS=ON \ -DENABLE_INTERNAL_CROSSGUID=OFF \ @@ -438,9 +450,6 @@ done # remove the doc files from unversioned /usr/share/doc/xbmc, they should be in versioned docdir rm -r $RPM_BUILD_ROOT/%{_datadir}/doc/ -#rm -f ${RPM_BUILD_ROOT}%{_libdir}/debug/usr/bin/*.debug -#/usr/lib/debug/usr/bin/kodi-wiiremote-18.4-99.1.r.fc31.x86_64.debug - desktop-file-install \ --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \ $RPM_BUILD_ROOT%{_datadir}/applications/kodi.desktop @@ -456,6 +465,8 @@ ln -s %{python3_sitearch}/PIL $RPM_BUILD_ROOT%{_libdir}/kodi/addons/script.modul %else ln -s %{python2_sitearch}/PIL $RPM_BUILD_ROOT%{_libdir}/kodi/addons/script.module.pil/lib/PIL %endif +#install -d $RPM_BUILD_ROOT%{_libdir}/xbmc/addons/script.module.pysqlite/lib +#ln -s %{python2_sitearch}/pysqlite2 $RPM_BUILD_ROOT%{_libdir}/xbmc/addons/script.module.pysqlite/lib/pysqlite2 # Use external font files instead of bundled ones ln -sf %{_fontbasedir}/dejavu/DejaVuSans-Bold.ttf ${RPM_BUILD_ROOT}%{_datadir}/kodi/addons/skin.estouchy/fonts/ From 2d4970a6c7d17e4361f5da7879d788c852b75478 Mon Sep 17 00:00:00 2001 From: Daniel Steiner Date: Sun, 3 May 2020 09:44:22 +0200 Subject: [PATCH 29/56] Fixes for Fedora 32 --- fedora/SPECS/polemarch.spec | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/fedora/SPECS/polemarch.spec b/fedora/SPECS/polemarch.spec index 6e5160f..0dfec67 100644 --- a/fedora/SPECS/polemarch.spec +++ b/fedora/SPECS/polemarch.spec @@ -10,13 +10,14 @@ %global __arch_install_post /usr/lib/rpm/check-buildroot # Macros +%define pyversion 3.8 %define name polemarch %define shortname polemarch %define namebase polemarch %define user polemarch %define datad poledata %define version 1.6.2 -%define release 1 +%define release 2 %define __prelink_undo_cmd %{nil} %define _binaries_in_noarch_packages_terminate_build 0 %define unmangled_version %{version} @@ -34,6 +35,8 @@ Source0: %name-%version.tar.gz Source1: %name-settings Source2: %name-redis-patch.sh Source3: %name-mysql-patch.sh +# compiled binary tree: +Source10: %name-bin-%{version}.tgz Patch0: %name-python3.patch Patch1: %name-venvctrl.patch @@ -56,10 +59,15 @@ Simply WEB gui for orchestration infrastructure by ansible playbooks. %prep %setup -q -n %name-%version #patch0 -b python3-patch +%patch1 -b venvctrl-patch %install -make BUILD_DIR=%{buildroot} -install %{S:1} %{buildroot}%{_sysconfdir}/%{namebase}/settings.ini +#/usr/bin/make BUILD_DIR=%{buildroot} +# Install binary package (compiling does not work here! You need to compile it first!) +# /usr/bin/make BUILD_DIR=/root/rpmbuild/BUILDROOT/polemarch-1.6.2-1.fc32.x86_64 +# don't forget to replace version and release number! +tar xzf %{S:10} -C %{buildroot} +/usr/bin/install %{S:1} %{buildroot}%{_sysconfdir}/%{namebase}/settings.ini # fix for python3 redis access: bash %{S:2} # fix or workaround for mysqlclient version check: @@ -69,8 +77,13 @@ mv %{buildroot}/var/run %{buildroot}/ # create additional directories: install -d %{buildroot}/%{_var}/log/%{name} install -d %{buildroot}/opt/%{datad} -ln -s %{python3_sitearch}/MySQLdb %{buildroot}/opt/polemarch/lib/python3.7/site-packages/MySQLdb -ln -s %{python3_sitelib}/pymysql %{buildroot}/opt/polemarch/lib/python3.7/site-packages/pymysql +ln -s %{python3_sitearch}/MySQLdb %{buildroot}/opt/polemarch/lib/python%{pyversion}/site-packages/MySQLdb +ln -s %{python3_sitelib}/pymysql %{buildroot}/opt/polemarch/lib/python%{pyversion}/site-packages/pymysql +# remove compiled git python package, which are not working on Fedora 32 and pyton3.8 +rm -rf %{buildroot}/opt/polemarch/lib/python%{pyversion}/site-packages/git +ln -s %{python3_sitelib}/git %{buildroot}/opt/polemarch/lib/python%{pyversion}/site-packages/git +rm -rf %{buildroot}/opt/polemarch/lib/python%{pyversion}/site-packages/gitdb +ln -s %{python3_sitelib}/gitdb %{buildroot}/opt/polemarch/lib/python%{pyversion}/site-packages/gitdb # remove buildroot path in opt/polemarch/bin/activate.xsh: sed -i -e 's|/root/rpmbuild/BUILDROOT/polemarch.*x86_64||' %{buildroot}/opt/polemarch/bin/activate.xsh @@ -114,6 +127,9 @@ sudo -u %{user} /opt/%{name}/bin/%{shortname}ctl migrate [ "%{_builddir}" != "/" ] && [ -d "%{_builddir}" ] && rm -rf %{_builddir}/* %changelog +* Sun May 3 2020 Daniel Steiner +- Fixes for Fedora 32 installation. Git and gitdb packages are now symlinked. + * Fri Jan 17 2020 Daniel Steiner - Update to 1.6.2 version. From be8ace26e5b4f9547e7a6618485b0480cfc5df9f Mon Sep 17 00:00:00 2001 From: Daniel Steiner Date: Fri, 15 May 2020 07:21:51 +0200 Subject: [PATCH 30/56] Updata of gitea, dependency fixed in polemarch --- fedora/SPECS/gitea.spec | 18 ++++++++++++++---- fedora/SPECS/polemarch.spec | 27 ++++++++++++++++++++++----- 2 files changed, 36 insertions(+), 9 deletions(-) diff --git a/fedora/SPECS/gitea.spec b/fedora/SPECS/gitea.spec index 62d9a63..1337655 100644 --- a/fedora/SPECS/gitea.spec +++ b/fedora/SPECS/gitea.spec @@ -1,5 +1,5 @@ Name: gitea -Version: 1.10.4 +Version: 1.11.5 Release: 1%{?dist} Summary: Gitea is a painless self-hosted Git service. %define MyVersion %version @@ -7,7 +7,6 @@ Summary: Gitea is a painless self-hosted Git service. License: MIT URL: https://gitea.io -#Source0: https://github.com/go-gitea/gitea/archive/%{version}.tar.gz Source0: %name-%MyVersion.tar.gz Source1: gitea.service @@ -17,6 +16,7 @@ BuildRequires: golang >= 1.8 BuildRequires: go-bindata %endif BuildRequires: make +BuildRequires: npm Requires: git @@ -82,8 +82,18 @@ getent passwd gitea > /dev/null || \ %changelog -* Sat May 2 2020 Daniel Steiner -- Update to version 1.10.4. +* Fri May 15 2020 Daniel Steiner +- Update to version 1.11.5. + +* Fri Mar 27 2020 Daniel Steiner +* Fri Apr 10 2020 Daniel Steiner +- Update to version 1.11.4. + +* Fri Mar 27 2020 Daniel Steiner +- Update to version 1.11.3. + +* Sat Feb 22 2020 Daniel Steiner +- Update to version 1.11.1. * Sat Jan 25 2020 Daniel Steiner - Update to version 1.10.3. diff --git a/fedora/SPECS/polemarch.spec b/fedora/SPECS/polemarch.spec index 6e5160f..c6b5dfb 100644 --- a/fedora/SPECS/polemarch.spec +++ b/fedora/SPECS/polemarch.spec @@ -10,13 +10,14 @@ %global __arch_install_post /usr/lib/rpm/check-buildroot # Macros +%define pyversion 3.8 %define name polemarch %define shortname polemarch %define namebase polemarch %define user polemarch %define datad poledata %define version 1.6.2 -%define release 1 +%define release 2 %define __prelink_undo_cmd %{nil} %define _binaries_in_noarch_packages_terminate_build 0 %define unmangled_version %{version} @@ -34,6 +35,8 @@ Source0: %name-%version.tar.gz Source1: %name-settings Source2: %name-redis-patch.sh Source3: %name-mysql-patch.sh +# compiled binary tree: +Source10: %name-bin-%{version}.tgz Patch0: %name-python3.patch Patch1: %name-venvctrl.patch @@ -48,6 +51,7 @@ Requires: libyaml-devel Requires: krb5-devel, krb5-libs, openldap-devel Requires: mailcap Requires: python3-redis >= 3.2.0, python3-django-redis >= 4.0.0, redis >= 5.0.0 +Requires: python3-gitdb, python3-GitPython %description Polemarch is service for orchestration infrastructure by ansible. @@ -56,10 +60,15 @@ Simply WEB gui for orchestration infrastructure by ansible playbooks. %prep %setup -q -n %name-%version #patch0 -b python3-patch +%patch1 -b venvctrl-patch %install -make BUILD_DIR=%{buildroot} -install %{S:1} %{buildroot}%{_sysconfdir}/%{namebase}/settings.ini +#/usr/bin/make BUILD_DIR=%{buildroot} +# Install binary package (compiling does not work here! You need to compile it first!) +# /usr/bin/make BUILD_DIR=/root/rpmbuild/BUILDROOT/polemarch-1.6.2-1.fc32.x86_64 +# don't forget to replace version and release number! +tar xzf %{S:10} -C %{buildroot} +/usr/bin/install %{S:1} %{buildroot}%{_sysconfdir}/%{namebase}/settings.ini # fix for python3 redis access: bash %{S:2} # fix or workaround for mysqlclient version check: @@ -69,8 +78,13 @@ mv %{buildroot}/var/run %{buildroot}/ # create additional directories: install -d %{buildroot}/%{_var}/log/%{name} install -d %{buildroot}/opt/%{datad} -ln -s %{python3_sitearch}/MySQLdb %{buildroot}/opt/polemarch/lib/python3.7/site-packages/MySQLdb -ln -s %{python3_sitelib}/pymysql %{buildroot}/opt/polemarch/lib/python3.7/site-packages/pymysql +ln -s %{python3_sitearch}/MySQLdb %{buildroot}/opt/polemarch/lib/python%{pyversion}/site-packages/MySQLdb +ln -s %{python3_sitelib}/pymysql %{buildroot}/opt/polemarch/lib/python%{pyversion}/site-packages/pymysql +# remove compiled git python package, which are not working on Fedora 32 and pyton3.8 +rm -rf %{buildroot}/opt/polemarch/lib/python%{pyversion}/site-packages/git +ln -s %{python3_sitelib}/git %{buildroot}/opt/polemarch/lib/python%{pyversion}/site-packages/git +rm -rf %{buildroot}/opt/polemarch/lib/python%{pyversion}/site-packages/gitdb +ln -s %{python3_sitelib}/gitdb %{buildroot}/opt/polemarch/lib/python%{pyversion}/site-packages/gitdb # remove buildroot path in opt/polemarch/bin/activate.xsh: sed -i -e 's|/root/rpmbuild/BUILDROOT/polemarch.*x86_64||' %{buildroot}/opt/polemarch/bin/activate.xsh @@ -114,6 +128,9 @@ sudo -u %{user} /opt/%{name}/bin/%{shortname}ctl migrate [ "%{_builddir}" != "/" ] && [ -d "%{_builddir}" ] && rm -rf %{_builddir}/* %changelog +* Sun May 3 2020 Daniel Steiner +- Fixes for Fedora 32 installation. Git and gitdb packages are now symlinked. + * Fri Jan 17 2020 Daniel Steiner - Update to 1.6.2 version. From 04a84dd14fd84dc9c47d50e3ef381b6dbf460294 Mon Sep 17 00:00:00 2001 From: Daniel Steiner Date: Fri, 15 May 2020 14:48:21 +0200 Subject: [PATCH 31/56] Polemarch updated --- fedora/SPECS/polemarch.spec | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/fedora/SPECS/polemarch.spec b/fedora/SPECS/polemarch.spec index c6b5dfb..42b2c76 100644 --- a/fedora/SPECS/polemarch.spec +++ b/fedora/SPECS/polemarch.spec @@ -16,8 +16,8 @@ %define namebase polemarch %define user polemarch %define datad poledata -%define version 1.6.2 -%define release 2 +%define version 1.7.6 +%define release 1 %define __prelink_undo_cmd %{nil} %define _binaries_in_noarch_packages_terminate_build 0 %define unmangled_version %{version} @@ -44,6 +44,9 @@ Patch1: %name-venvctrl.patch # Build fails, if these two packages are installed! BuildRequires: python3, openssl-devel, libyaml-devel, python3-mysql BuildRequires: python3-sphinxcontrib-blockdiag, python3-virtualenv, openldap-devel +BuildRequires: python3-amqp, python3-vine, python3-billiard, python3-celery, python3-kombu +BuildRequires: python3-redis, python3-Cython, python3-django-timezone-field, python3-markdown2 +BuildRequires: python3-netaddr, python3-ldap, python3-smmap Requires: python3, openssl-devel, libxcrypt-compat Requires: python3-virtualenv, python3-mysql, python3-PyMySQL Requires: git @@ -52,6 +55,9 @@ Requires: krb5-devel, krb5-libs, openldap-devel Requires: mailcap Requires: python3-redis >= 3.2.0, python3-django-redis >= 4.0.0, redis >= 5.0.0 Requires: python3-gitdb, python3-GitPython +Requires: python3-amqp, python3-vine, python3-billiard, python3-celery, python3-kombu +Requires: python3-redis, python3-Cython, python3-django-timezone-field, python3-markdown2 +Requires: python3-netaddr, python3-ldap, python3-smmap %description Polemarch is service for orchestration infrastructure by ansible. @@ -65,7 +71,11 @@ Simply WEB gui for orchestration infrastructure by ansible playbooks. %install #/usr/bin/make BUILD_DIR=%{buildroot} # Install binary package (compiling does not work here! You need to compile it first!) -# /usr/bin/make BUILD_DIR=/root/rpmbuild/BUILDROOT/polemarch-1.6.2-1.fc32.x86_64 +# cd BUILD/polemarch-1.7.3 +# /usr/bin/patch --no-backup-if-mismatch -p0 -b --suffix ~/rpmbuild/SOURCES/venvctrl-patch --fuzz=0 +# /usr/bin/make BUILD_DIR=/root/rpmbuild/BUILDROOT/polemarch +# cd /root/rpmbuild/BUILDROOT/polemarch +# tar czf ~/rpmbuild/SOURCES/polemarch-bin-1.7.3.tgz . # don't forget to replace version and release number! tar xzf %{S:10} -C %{buildroot} /usr/bin/install %{S:1} %{buildroot}%{_sysconfdir}/%{namebase}/settings.ini @@ -128,6 +138,9 @@ sudo -u %{user} /opt/%{name}/bin/%{shortname}ctl migrate [ "%{_builddir}" != "/" ] && [ -d "%{_builddir}" ] && rm -rf %{_builddir}/* %changelog +* Fri May 15 2020 Daniel Steiner +- Update to 1.7.6 version. + * Sun May 3 2020 Daniel Steiner - Fixes for Fedora 32 installation. Git and gitdb packages are now symlinked. From 0d724fa87091ed354a1cc2acc718f9f8297a2b70 Mon Sep 17 00:00:00 2001 From: Daniel Steiner Date: Mon, 18 May 2020 06:06:46 +0200 Subject: [PATCH 32/56] Nodejs and yarn build dependencies added --- fedora/SPECS/polemarch.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/fedora/SPECS/polemarch.spec b/fedora/SPECS/polemarch.spec index 42b2c76..480727c 100644 --- a/fedora/SPECS/polemarch.spec +++ b/fedora/SPECS/polemarch.spec @@ -17,7 +17,7 @@ %define user polemarch %define datad poledata %define version 1.7.6 -%define release 1 +%define release 2 %define __prelink_undo_cmd %{nil} %define _binaries_in_noarch_packages_terminate_build 0 %define unmangled_version %{version} @@ -47,6 +47,7 @@ BuildRequires: python3-sphinxcontrib-blockdiag, python3-virtualenv, openldap-dev BuildRequires: python3-amqp, python3-vine, python3-billiard, python3-celery, python3-kombu BuildRequires: python3-redis, python3-Cython, python3-django-timezone-field, python3-markdown2 BuildRequires: python3-netaddr, python3-ldap, python3-smmap +BuildRequires: nodejs-has-yarn, yarnpkg, nodejs >= 10.0 Requires: python3, openssl-devel, libxcrypt-compat Requires: python3-virtualenv, python3-mysql, python3-PyMySQL Requires: git @@ -138,6 +139,9 @@ sudo -u %{user} /opt/%{name}/bin/%{shortname}ctl migrate [ "%{_builddir}" != "/" ] && [ -d "%{_builddir}" ] && rm -rf %{_builddir}/* %changelog +* Mon May 18 2020 Daniel Steiner +- Build dependencies added (nodejs and yarn). + * Fri May 15 2020 Daniel Steiner - Update to 1.7.6 version. From f4e729652cc95d87e7c7d5a08bf5c5ce29be5ba4 Mon Sep 17 00:00:00 2001 From: Daniel Steiner Date: Wed, 20 May 2020 16:43:01 +0200 Subject: [PATCH 33/56] Kodi updated to 18.7 --- fedora/SPECS/kodi.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/fedora/SPECS/kodi.spec b/fedora/SPECS/kodi.spec index 04a01d3..0d8f4e7 100644 --- a/fedora/SPECS/kodi.spec +++ b/fedora/SPECS/kodi.spec @@ -33,8 +33,8 @@ %endif Name: kodi -Version: 18.6 -Release: 102.%{myRELEASE}.%{PRERELEASE}%{?dist} +Version: 18.7 +Release: 100.%{myRELEASE}.%{PRERELEASE}%{?dist} Summary: Media center License: GPLv2+ and GPLv3+ and LGPLv2+ and BSD and MIT @@ -556,6 +556,9 @@ rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/kodi-wiiremote.1 %changelog +* Wed May 20 2020 Daniel Steiner +- Update to 18.7 + * Sat Apr 11 2020 Daniel Steiner - Nvidia dependencies removed. From 3b341f08c69852ff518beb8c0673512eb7a80d52 Mon Sep 17 00:00:00 2001 From: Daniel Steiner Date: Sun, 14 Jun 2020 08:56:25 +0200 Subject: [PATCH 34/56] Gitea update --- fedora/SPECS/gitea.spec | 5 +- fedora/SPECS/tilesweep.spec | 108 ++++++++++++++++++++++++++++++++++++ 2 files changed, 112 insertions(+), 1 deletion(-) create mode 100644 fedora/SPECS/tilesweep.spec diff --git a/fedora/SPECS/gitea.spec b/fedora/SPECS/gitea.spec index 1337655..80d8144 100644 --- a/fedora/SPECS/gitea.spec +++ b/fedora/SPECS/gitea.spec @@ -1,5 +1,5 @@ Name: gitea -Version: 1.11.5 +Version: 1.11.6 Release: 1%{?dist} Summary: Gitea is a painless self-hosted Git service. %define MyVersion %version @@ -82,6 +82,9 @@ getent passwd gitea > /dev/null || \ %changelog +* Sun Jun 14 2020 Daniel Steiner +- Update to version 1.11.6. + * Fri May 15 2020 Daniel Steiner - Update to version 1.11.5. diff --git a/fedora/SPECS/tilesweep.spec b/fedora/SPECS/tilesweep.spec new file mode 100644 index 0000000..5fabb5b --- /dev/null +++ b/fedora/SPECS/tilesweep.spec @@ -0,0 +1,108 @@ +# +# spec file for package tilesweep +# + +%define geouser geo + +Name: tilesweep +Summary: An OpenStreetMap tile server +Url: https://github.com/seemk/TileSweep +Version: 0.1.0 +Release: 1%{?dist} +License: BSD +Group: System Environment/Daemons +Source0: %{name}.tgz +Source1: %{name}-conf.ini +Source2: %{name}-tmpfiles.conf +Source3: %{name}-systemd.service +BuildRoot: %{_tmppath}/%{name}-%{version}-build + +BuildRequires: mapnik-devel >= 3.0.12 + +%description +An OpenStreetMap tile server. + +Features: + +- Prerendering based on polygon and zoom levels selection. +- Offline tile cache (tiles can be prerendered and served without Mapnik) +- Efficient disk usage + + +%prep +%setup -qn %{name} + +%build +pushd %{name} +mkdir build +cd build +cmake .. +make +popd + +%install +pushd %{name}/build/bundle +install -d %{buildroot}/opt/%{name} +install -d %{buildroot}/opt/%{name}/ui +install -d %{buildroot}%{_sysconfdir}/systemd +install -d %{buildroot}%{_sysconfdir}/tmpfiles.d +install %{name} %{buildroot}/opt/%{name}/%{name} +install ui/app.js %{buildroot}/opt/%{name}/ui/app.js +install ui/app.css %{buildroot}/opt/%{name}/ui/app.css +install ui/index.html %{buildroot}/opt/%{name}/ui/index.html +install %{S:1} %{buildroot}/opt/%{name}/conf.ini +install %{S:2} %{buildroot}%{_sysconfdir}/tmpfiles.d/%{name} +install %{S:3} %{buildroot}%{_sysconfdir}/systemd/%{name}.service +popd + +%clean +[ "%{buildroot}" != "/" ] && [ -d "%{buildroot}" ] && rm -rf %{buildroot} +[ "%{_builddir}" != "/" ] && [ -d "%{_builddir}" ] && rm -rf %{_builddir}/* + +%pre +getent group %{geouser} > /dev/null || groupadd -r %{geouser} +getent passwd %{geouser} > /dev/null || \ + useradd -m -g %{geouser} -s /bin/bash \ + -c "Geo Mapnik user" %{geouser} + +%post +%if 0%{?using_systemd} +%if 0%{?systemd_macro_scriptlet} +if [ $1 -eq 1 ]; then +%systemd_post %{name}.service +fi +%firewalld_reload +%endif +%endif + +%preun +%if 0%{?using_systemd} +if [ $1 -eq 0 ]; then +systectl stop %{name}.service +fi +%endif + +%postun +%if 0%{?using_systemd} +%if 0%{?systemd_macro_scriptlet} +if [ $1 -eq 1 ]; then +%systemd_postun_with_restart %{name}.service +%firewalld_reload +fi +%endif +%endif + +%files +%defattr(-,root,root,-) +%doc COPYING README.md +/opt/%{name}/%{name} +%dir /opt/%{name}/ui +/opt/%{name}/ui/* +%dir %{_rundir}/%{name} +%config(noreplace) /opt/%{name}/conf.ini +%config %{_sysconfdir}/tmpfiles.d/%{name} + +%changelog +* Thu May 21 2020 Daniel Steiner +- Initial setup. + From 6524e4719868deabbd5579fda01262efb65e1d76 Mon Sep 17 00:00:00 2001 From: Daniel Steiner Date: Sun, 14 Jun 2020 11:11:22 +0200 Subject: [PATCH 35/56] Frontend problems fixed --- fedora/SPECS/gitea.spec | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/fedora/SPECS/gitea.spec b/fedora/SPECS/gitea.spec index 80d8144..e82a294 100644 --- a/fedora/SPECS/gitea.spec +++ b/fedora/SPECS/gitea.spec @@ -1,6 +1,6 @@ Name: gitea Version: 1.11.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Gitea is a painless self-hosted Git service. %define MyVersion %version %define debug_package %{nil} @@ -43,12 +43,12 @@ done %endif %build -cd ../ -mkdir src/code.gitea.io -p -cp -av %name-%{MyVersion} src/code.gitea.io/gitea -export GOPATH=$(pwd) -cd src/code.gitea.io/gitea/ -TAGS="bindata sqlite" make generate build +#cd ../ +#mkdir src/code.gitea.io -p +#cp -av %name-%{MyVersion} src/code.gitea.io/gitea +#export GOPATH=$(pwd) +#cd src/code.gitea.io/gitea/ +TAGS="bindata" make build %install rm -rf $RPM_BUILD_ROOT @@ -56,7 +56,7 @@ mkdir -p $RPM_BUILD_ROOT/%{_sharedstatedir}/gitea mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/gitea mkdir -p $RPM_BUILD_ROOT/%{_unitdir} install custom/conf/app.ini.sample $RPM_BUILD_ROOT/%{_sysconfdir}/gitea/gitea.ini -install -m 755 ../src/code.gitea.io/gitea/gitea $RPM_BUILD_ROOT/%{_sharedstatedir}/gitea/gitea +install -m 755 gitea $RPM_BUILD_ROOT/%{_sharedstatedir}/gitea/gitea install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_unitdir}/gitea.service %files @@ -84,6 +84,7 @@ getent passwd gitea > /dev/null || \ %changelog * Sun Jun 14 2020 Daniel Steiner - Update to version 1.11.6. +- Fix for frontend JS location. * Fri May 15 2020 Daniel Steiner - Update to version 1.11.5. From 9c724ed5fccf805ab003825cd3587fde4a9d3597 Mon Sep 17 00:00:00 2001 From: Daniel Steiner Date: Fri, 3 Jul 2020 12:25:11 +0200 Subject: [PATCH 36/56] Gitea update to 1.12.1 --- fedora/SPECS/gitea.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/fedora/SPECS/gitea.spec b/fedora/SPECS/gitea.spec index e82a294..53790b2 100644 --- a/fedora/SPECS/gitea.spec +++ b/fedora/SPECS/gitea.spec @@ -1,6 +1,6 @@ Name: gitea -Version: 1.11.6 -Release: 2%{?dist} +Version: 1.12.1 +Release: 1%{?dist} Summary: Gitea is a painless self-hosted Git service. %define MyVersion %version %define debug_package %{nil} @@ -82,6 +82,9 @@ getent passwd gitea > /dev/null || \ %changelog +* Fri Jul 3 2020 Daniel Steiner +- Update to version 1.12.1. + * Sun Jun 14 2020 Daniel Steiner - Update to version 1.11.6. - Fix for frontend JS location. From 438edc92b2279d821c04af2c948c2c557bf59f97 Mon Sep 17 00:00:00 2001 From: Daniel Steiner Date: Sat, 11 Jul 2020 15:33:02 +0200 Subject: [PATCH 37/56] Mod tile apache module added --- centos/SPECS/mod_tile.spec | 77 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) create mode 100644 centos/SPECS/mod_tile.spec diff --git a/centos/SPECS/mod_tile.spec b/centos/SPECS/mod_tile.spec new file mode 100644 index 0000000..88c0c5e --- /dev/null +++ b/centos/SPECS/mod_tile.spec @@ -0,0 +1,77 @@ +Name: mod_tile +Version: 0.5 +Release: 2%{?dist} +Summary: A program to efficiently render and serve map tiles for www.openstreetmap.org map using Apache and Mapnik. + +License: GPLv2 +URL: https://github.com/openstreetmap/mod_tile +Source0: %{name}-%{version}.tgz +Source1: 10-tile.conf + +BuildRequires: httpd-devel, apr +BuildRequires: mapnik-devel + +%description +The rendering is implemented in a multithreaded process +called renderd which opens either a unix or tcp socket +and listens for requests to render tiles. It uses Mapnik +to render tiles using the rendering rules defined in +the configuration file /etc/renderd.conf. Its configuration +also allows to specify the number of rendering +threads. + +The render daemon implements a queuing mechanism with multiple +priority levels to provide an as up-to-date viewing experience +given the available rendering resources. The highest priority +is for on the fly rendering of tiles not yet in the tile cache, +two priority levels for re-rendering out of date tiles on the fly +and two background batch rendering queues. The on the fly rendering +queues are limited to a short 32 metatile size to minimize latency. +The size of the main background queue is determined +at compile time, see: render_config.h + +%prep +%setup -q -n %{name}-%{version} + +%build +%configure \ + --with-apxs \ + --with-libmapnik +%{__make} + +%install +%{__make} install DESTDIR=%{buildroot} +%{__make} install-%{name} DESTDIR=%{buildroot} +%{__install} -D %{S:1} %{buildroot}%{_sysconfdir}/httpd/conf.modules.d/10-tile.conf + +%post +if [ $1 -eq 1 ]; then + /usr/bin/systemctl reload httpd.service >/dev/null 2>&1 || : +fi + +%postun +if [ $1 -eq 1 ]; then + /usr/bin/systemctl reload httpd.service >/dev/null 2>&1 || : +fi + +%clean +[ "%{buildroot}" != "/" ] && [ -d "%{buildroot}" ] && rm -rf %{buildroot} +[ "%{_builddir}" != "/" ] && [ -d "%{_builddir}" ] && rm -rf %{_builddir}/* + +%files +%doc COPYING mod_tile.conf +%config(noreplace) %{_sysconfdir}/renderd.conf +%config %{_sysconfdir}/httpd/conf.modules.d/10-tile.conf +%{_bindir}/render* +%{_libdir}/httpd/modules/%{name}.so +%{_libdir}/libiniparser* +%{_mandir}/man1/* +%{_mandir}/man8/* + +%changelog +* Sat Nov 9 2019 Daniel Steiner +- Fix for modules config path. + +* Fri Nov 8 2019 Daniel Steiner +- First build on Fedora 31 httpd-2.4.41. + From de8d312dc72b3f06c78dc5be1fdb7bacb8ed4715 Mon Sep 17 00:00:00 2001 From: Daniel Steiner Date: Sat, 11 Jul 2020 16:53:09 +0200 Subject: [PATCH 38/56] History edited --- centos/SPECS/mod_tile.spec | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/centos/SPECS/mod_tile.spec b/centos/SPECS/mod_tile.spec index 88c0c5e..d5f96f7 100644 --- a/centos/SPECS/mod_tile.spec +++ b/centos/SPECS/mod_tile.spec @@ -69,9 +69,6 @@ fi %{_mandir}/man8/* %changelog -* Sat Nov 9 2019 Daniel Steiner -- Fix for modules config path. - -* Fri Nov 8 2019 Daniel Steiner -- First build on Fedora 31 httpd-2.4.41. +* Sat Jul 11 2020 Daniel Steiner +- First build on CentOS 8. From d6b68adc7b70b19193e5efab073a5b88aa182b4d Mon Sep 17 00:00:00 2001 From: Daniel Steiner Date: Fri, 17 Jul 2020 10:50:47 +0200 Subject: [PATCH 39/56] Version updates --- fedora/SPECS/gitea.spec | 5 ++++- fedora/SPECS/nginx.spec | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/fedora/SPECS/gitea.spec b/fedora/SPECS/gitea.spec index 53790b2..5266411 100644 --- a/fedora/SPECS/gitea.spec +++ b/fedora/SPECS/gitea.spec @@ -1,5 +1,5 @@ Name: gitea -Version: 1.12.1 +Version: 1.12.2 Release: 1%{?dist} Summary: Gitea is a painless self-hosted Git service. %define MyVersion %version @@ -82,6 +82,9 @@ getent passwd gitea > /dev/null || \ %changelog +* Fri Jul 17 2020 Daniel Steiner +- Update to version 1.12.2. + * Fri Jul 3 2020 Daniel Steiner - Update to version 1.12.1. diff --git a/fedora/SPECS/nginx.spec b/fedora/SPECS/nginx.spec index 6bda0ef..13dd59b 100644 --- a/fedora/SPECS/nginx.spec +++ b/fedora/SPECS/nginx.spec @@ -19,7 +19,7 @@ Name: nginx Epoch: 1 -Version: 1.18.0 +Version: 1.19.1 Release: 1%{?dist} Summary: A high performance web server and reverse proxy server @@ -569,6 +569,9 @@ fi [ "%{_builddir}" != "/" ] && [ -d "%{_builddir}" ] && rm -rf %{_builddir}/* %changelog +* Fri Jul 17 2020 Daniel Steiner +- Updated to mainline version 1.19.1. + * Sat May 2 2020 Daniel Steiner - Updated to mainline version 1.18.0. From eead9496284145d7f2ef63a2ed498fd236efeb16 Mon Sep 17 00:00:00 2001 From: Daniel Steiner Date: Fri, 24 Jul 2020 10:36:34 +0200 Subject: [PATCH 40/56] Using the patch, mod_tile compiles on Fedora 32 --- fedora/SPECS/mod_tile.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/fedora/SPECS/mod_tile.spec b/fedora/SPECS/mod_tile.spec index 88c0c5e..5d6bdc7 100644 --- a/fedora/SPECS/mod_tile.spec +++ b/fedora/SPECS/mod_tile.spec @@ -1,12 +1,13 @@ Name: mod_tile Version: 0.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A program to efficiently render and serve map tiles for www.openstreetmap.org map using Apache and Mapnik. License: GPLv2 URL: https://github.com/openstreetmap/mod_tile Source0: %{name}-%{version}.tgz Source1: 10-tile.conf +Patch0: mod_tile-move-variables-to-prevent-duplicates.patch BuildRequires: httpd-devel, apr BuildRequires: mapnik-devel @@ -32,6 +33,7 @@ at compile time, see: render_config.h %prep %setup -q -n %{name}-%{version} +%patch0 -p1 -b duplicated-variables %build %configure \ @@ -69,6 +71,9 @@ fi %{_mandir}/man8/* %changelog +* Fri Jul 23 2020 Daniel Steiner +- Patch for duplicated variables definition added, this compiles now on Fedora 32 and gcc 10. + * Sat Nov 9 2019 Daniel Steiner - Fix for modules config path. From 0bda84cb3ce2c8007f97cfe4b0733e2e100d046d Mon Sep 17 00:00:00 2001 From: Daniel Steiner Date: Sun, 2 Aug 2020 20:51:29 +0200 Subject: [PATCH 41/56] Kodi update to 18.8 --- fedora/SPECS/kodi.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/fedora/SPECS/kodi.spec b/fedora/SPECS/kodi.spec index 0d8f4e7..6ddc5ca 100644 --- a/fedora/SPECS/kodi.spec +++ b/fedora/SPECS/kodi.spec @@ -33,7 +33,7 @@ %endif Name: kodi -Version: 18.7 +Version: 18.8 Release: 100.%{myRELEASE}.%{PRERELEASE}%{?dist} Summary: Media center @@ -480,6 +480,8 @@ mv docs/manpages ${RPM_BUILD_ROOT}%{_mandir}/man1/ rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/kodi-wiiremote.1 %endif +# remove not needed dvdnav output: +rm -rf ${RPM_BUILD_ROOT}/root %post firewalld %firewalld_reload @@ -556,6 +558,9 @@ rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/kodi-wiiremote.1 %changelog +* Sun Aug 2 2020 Daniel Steiner +- Update to 18.8 + * Wed May 20 2020 Daniel Steiner - Update to 18.7 From 8ac398a0aad55bf7ffdfafa5b99bdd47c858ce34 Mon Sep 17 00:00:00 2001 From: Daniel Steiner Date: Fri, 7 Aug 2020 15:24:11 +0200 Subject: [PATCH 42/56] Patch for pnp4nagios for magic_quotes problem added --- fedora/SPECS/pnp4nagios.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/fedora/SPECS/pnp4nagios.spec b/fedora/SPECS/pnp4nagios.spec index f87b00a..30338c3 100644 --- a/fedora/SPECS/pnp4nagios.spec +++ b/fedora/SPECS/pnp4nagios.spec @@ -1,7 +1,7 @@ %define gitversion git.ff7cd69 Name: pnp4nagios Version: 0.6.27 -Release: 1.%{gitversion}%{?dist} +Release: 2.%{gitversion}%{?dist} Summary: Nagios performance data analysis tool Group: Applications/System @@ -14,6 +14,7 @@ Source3: pnp4nagios-README.fedora Patch1: pnp4nagios-httpd24.patch Patch2: pnp4nagios-pnp-helper.patch Patch3: pnp4nagios-fpdi.patch +Patch4: pnp4nagios_kohana_magic_quotes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # this package requires icinga2 instead of nagios! @@ -43,6 +44,7 @@ and stores them automatically into RRD-databases. #%patch1 -p1 #%patch2 -p0 #%patch3 -p0 +%patch4 -p0 autoreconf cp -p %{SOURCE3} README.fedora @@ -157,6 +159,9 @@ fi %{_datadir}/nagios/html/%{name} %changelog +* Fri Aug 7 2018 Daniel Steiner - 0.6.27-2-gitff7cd69 +- Patch for Kohana magic_quotes problem. + * Thu Dec 20 2018 Daniel Steiner - 0.6.27-1-gitff7cd69 - Upgrade to git master version ff7cd69. From ac3c4df3e505afb648b7471278adb704042c1a7e Mon Sep 17 00:00:00 2001 From: Daniel Steiner Date: Fri, 14 Aug 2020 09:59:19 +0200 Subject: [PATCH 43/56] Gitea updated --- fedora/SPECS/gitea.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fedora/SPECS/gitea.spec b/fedora/SPECS/gitea.spec index 5266411..b1f7c70 100644 --- a/fedora/SPECS/gitea.spec +++ b/fedora/SPECS/gitea.spec @@ -1,5 +1,5 @@ Name: gitea -Version: 1.12.2 +Version: 1.12.3 Release: 1%{?dist} Summary: Gitea is a painless self-hosted Git service. %define MyVersion %version @@ -82,6 +82,9 @@ getent passwd gitea > /dev/null || \ %changelog +* Fri Aug 14 2020 Daniel Steiner +- Update to version 1.12.3. + * Fri Jul 17 2020 Daniel Steiner - Update to version 1.12.2. From 353ef482e23b7cb41d2c062bcdaf6c1cbd5b84b1 Mon Sep 17 00:00:00 2001 From: Daniel Steiner Date: Fri, 14 Aug 2020 10:34:36 +0200 Subject: [PATCH 44/56] Polemarch update --- fedora/SPECS/polemarch.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fedora/SPECS/polemarch.spec b/fedora/SPECS/polemarch.spec index 480727c..b395da7 100644 --- a/fedora/SPECS/polemarch.spec +++ b/fedora/SPECS/polemarch.spec @@ -16,7 +16,7 @@ %define namebase polemarch %define user polemarch %define datad poledata -%define version 1.7.6 +%define version 1.8.0 %define release 2 %define __prelink_undo_cmd %{nil} %define _binaries_in_noarch_packages_terminate_build 0 @@ -139,6 +139,9 @@ sudo -u %{user} /opt/%{name}/bin/%{shortname}ctl migrate [ "%{_builddir}" != "/" ] && [ -d "%{_builddir}" ] && rm -rf %{_builddir}/* %changelog +* Fri Aug 14 2020 Daniel Steiner +- Update to 1.8.0 version. + * Mon May 18 2020 Daniel Steiner - Build dependencies added (nodejs and yarn). From 138f3b9e129b26d7afd9ef66c27b28f9f2a86771 Mon Sep 17 00:00:00 2001 From: Daniel Steiner Date: Fri, 28 Aug 2020 14:11:42 +0200 Subject: [PATCH 45/56] Most recent goaccess package added --- fedora/SPECS/goaccess.spec | 76 ++++++++++---------------------------- 1 file changed, 20 insertions(+), 56 deletions(-) diff --git a/fedora/SPECS/goaccess.spec b/fedora/SPECS/goaccess.spec index 0559388..242b41b 100644 --- a/fedora/SPECS/goaccess.spec +++ b/fedora/SPECS/goaccess.spec @@ -1,14 +1,10 @@ Name: goaccess -Version: 1.2 -Release: 3%{?dist} +Version: 1.4.1 +Release: 1%{?dist} Summary: Real-time web log analyzer and interactive viewer License: GPLv2+ URL: https://goaccess.io/ Source0: http://tar.goaccess.io/%{name}-%{version}.tar.gz -Source1: %{name}.service -Source2: %{name}-get-logs.pl -Source3: %{name}-sysconfig -Source4: %{name}-systemd.conf BuildRequires: autoconf BuildRequires: automake BuildRequires: gcc @@ -17,11 +13,10 @@ BuildRequires: ncurses-devel BuildRequires: tokyocabinet-devel BuildRequires: zlib-devel BuildRequires: bzip2-devel - -%if 0%{?using_systemd} -Requires(post): systemd-units -Requires(preun): systemd-units -Requires(postun): systemd-units +BuildRequires: gettext-devel +BuildRequires: libmaxminddb-devel +%if %{with openssl} +BuildRequires: openssl-devel %endif %description @@ -72,59 +67,28 @@ sed -i '/-pthread/d' configure.ac %build autoreconf -fiv %configure \ - --enable-debug \ - --enable-geoip=legacy \ - --enable-utf8 \ - --enable-tcb=btree \ - --with-getline \ - --with-openssl=%{_prefix} \ - --enable-bzip \ - --enable-zlib - + --enable-debug \ + --enable-geoip=legacy \ + --enable-geoip=mmdb \ + --enable-utf8 \ + --with-getline \ + --with-openssl %make_build %install %make_install -# install additional systemd service -install -D %{S:2} %{buildroot}%{_libexecdir}/%{name}-get-logs.pl -install -D %{S:1} %{buildroot}%{_unitdir}/%{name}.service -install -D %{S:3} %{buildroot}%{_sysconfdir}/sysconfig/%{name} -install -D %{S:4} %{buildroot}%{_sysconfdir}/%{name}-systemd.conf -install -d %{buildroot}%{_var}/www/html/%{name} +%find_lang %{name} -%post -%if 0%{?using_systemd} -%if 0%{?systemd_macro_scriptlet} -%systemd_post %{name}.service -%endif -%endif - -%postun -%if 0%{?using_systemd} -%if 0%{?systemd_macro_scriptlet} -%systemd_preun %{name}.service -%endif -%endif - -%files +%files -f %{name}.lang %license COPYING -%config(noreplace) %{_sysconfdir}/%{name}.conf +%config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf +%config(noreplace) %{_sysconfdir}/%{name}/browsers.list +%config(noreplace) %{_sysconfdir}/%{name}/podcast.list %{_bindir}/%{name} %{_mandir}/man1/%{name}.1* -%{_pkgdocdir} -%{_unitdir}/%{name}.service -%dir %{_var}/www/html/%{name} -%attr(755,-,-) %{_libexecdir}/%{name}-get-logs.pl -%config() %{_sysconfdir}/sysconfig/%{name} -%config(noreplace) %{_sysconfdir}/%{name}-systemd.conf %changelog -* Sun Jul 16 2017 Daniel Steiner - 1.2-3 -- Live status enable with systemd - -* Sun Jul 16 2017 Daniel Steiner - 1.2-2 -- Legacy GeoIP enabled. - -* Sun Jul 16 2017 Daniel Steiner - 1.2-1 -- Initial release for Fedora 25. +* Fri Aug 28 2020 Daniel Steiner +- mmdb enabled for new GeoLite2 dBs. +- First, initial version for Fedora 32 (1.4.1) From d6c0ffccdb48e90b9c753e5a5b68300caf3fb74e Mon Sep 17 00:00:00 2001 From: Daniel Steiner Date: Fri, 4 Sep 2020 09:08:36 +0200 Subject: [PATCH 46/56] Domain name change to dsteiner.ch --- centos/SPECS/fdupes.spec | 2 +- centos/SPECS/gitea.spec | 28 ++++++------ centos/SPECS/mod_tile.spec | 2 +- centos/SPECS/powerline_shell.spec | 8 ++-- centos/SPECS/python2-argparse.spec | 2 +- centos/SPECS/python3-argparse.spec | 2 +- centos/SPECS/tmux.spec | 4 +- fedora/SPECS/archive/libmodsecurity.spec | 4 +- fedora/SPECS/archive/modsecurity_apache.spec | 2 +- fedora/SPECS/archive/virt-backup.spec | 2 +- fedora/SPECS/echoip.spec | 4 +- fedora/SPECS/gitea.spec | 48 ++++++++++---------- fedora/SPECS/makemkv.spec | 10 ++-- fedora/SPECS/mod_tile.spec | 6 +-- fedora/SPECS/nagios-plugins-own.spec | 2 +- fedora/SPECS/ngxtop.spec | 2 +- fedora/SPECS/polemarch.spec | 44 +++++++++--------- fedora/SPECS/powerline_shell.spec | 8 ++-- fedora/SPECS/python-PyMySQL.spec | 2 +- fedora/SPECS/python-mysql.spec | 2 +- fedora/SPECS/python-redis.spec | 2 +- fedora/SPECS/python2-argparse.spec | 2 +- fedora/SPECS/python3-argparse.spec | 4 +- 23 files changed, 96 insertions(+), 96 deletions(-) diff --git a/centos/SPECS/fdupes.spec b/centos/SPECS/fdupes.spec index ac2d62a..660cb4e 100644 --- a/centos/SPECS/fdupes.spec +++ b/centos/SPECS/fdupes.spec @@ -82,6 +82,6 @@ EOF %changelog -* Sun Sep 29 2019 Daniel Steiner +* Sun Sep 29 2019 Daniel Steiner - First build for CentOS 8. diff --git a/centos/SPECS/gitea.spec b/centos/SPECS/gitea.spec index d1544f6..68b7d3f 100644 --- a/centos/SPECS/gitea.spec +++ b/centos/SPECS/gitea.spec @@ -82,46 +82,46 @@ getent passwd gitea > /dev/null || \ %changelog -* Fri Dec 6 2019 Daniel Steiner +* Fri Dec 6 2019 Daniel Steiner - Update to version 1.10.1. -* Fri Nov 22 2019 Daniel Steiner +* Fri Nov 22 2019 Daniel Steiner - Update to version 1.10.0. -* Fri Oct 18 2019 Daniel Steiner +* Fri Oct 18 2019 Daniel Steiner - Update to version 1.9.4. -* Sat Sep 21 2019 Daniel Steiner +* Sat Sep 21 2019 Daniel Steiner - Update to version 1.9.3. -* Fri Aug 16 2019 Daniel Steiner +* Fri Aug 16 2019 Daniel Steiner - Update to version 1.9.1. -* Fri Aug 2 2019 Daniel Steiner +* Fri Aug 2 2019 Daniel Steiner - Update to version 1.9.0. -* Mon Jun 3 2019 Daniel Steiner +* Mon Jun 3 2019 Daniel Steiner - Update to version 1.8.2. -* Sat May 11 2019 Daniel Steiner +* Sat May 11 2019 Daniel Steiner - Update to version 1.8.1. -* Sun Apr 28 2019 Daniel Steiner +* Sun Apr 28 2019 Daniel Steiner - Update to version 1.8.0. -* Sun Apr 7 2019 Daniel Steiner +* Sun Apr 7 2019 Daniel Steiner - Update to version 1.7.5. -* Fri Mar 15 2019 Daniel Steiner +* Fri Mar 15 2019 Daniel Steiner - Update to version 1.7.4. -* Wed Feb 27 2019 Daniel Steiner +* Wed Feb 27 2019 Daniel Steiner - Update to version 1.7.3. -* Sat Feb 16 2019 Daniel Steiner +* Sat Feb 16 2019 Daniel Steiner - Update to version 1.7.2. -* Wed Jan 30 2019 Daniel Steiner +* Wed Jan 30 2019 Daniel Steiner - Update to version 1.7.0. * Fri Jan 18 2019 Daniel Steiner diff --git a/centos/SPECS/mod_tile.spec b/centos/SPECS/mod_tile.spec index d5f96f7..3184e06 100644 --- a/centos/SPECS/mod_tile.spec +++ b/centos/SPECS/mod_tile.spec @@ -69,6 +69,6 @@ fi %{_mandir}/man8/* %changelog -* Sat Jul 11 2020 Daniel Steiner +* Sat Jul 11 2020 Daniel Steiner - First build on CentOS 8. diff --git a/centos/SPECS/powerline_shell.spec b/centos/SPECS/powerline_shell.spec index 453499c..3e91066 100644 --- a/centos/SPECS/powerline_shell.spec +++ b/centos/SPECS/powerline_shell.spec @@ -4,7 +4,7 @@ Release: 3%{?dist} Summary: A beautiful and useful prompt generator for Bash, ZSH, Fish, and tcsh License: MIT -URL: https://dev.daniel-steiner.org/dani/powerline-shell-enhanced#segment-configuration +URL: https://dev.dsteiner.ch/dani/powerline-shell-enhanced#segment-configuration Source0: powerline_shell.tar.gz %define debug_package %{nil} @@ -72,12 +72,12 @@ popd %changelog -* Sun Feb 3 2019 Daniel Steiner +* Sun Feb 3 2019 Daniel Steiner - Dependency added for python-setuptools rpm. -* Sun Feb 3 2019 Daniel Steiner +* Sun Feb 3 2019 Daniel Steiner - Dependency added for pythonX-argparse rpm. -* Sat Feb 2 2019 Daniel Steiner +* Sat Feb 2 2019 Daniel Steiner - First build. diff --git a/centos/SPECS/python2-argparse.spec b/centos/SPECS/python2-argparse.spec index 001c682..8dd5503 100644 --- a/centos/SPECS/python2-argparse.spec +++ b/centos/SPECS/python2-argparse.spec @@ -54,6 +54,6 @@ PYTHONPATH=../ %{__python} test_%{oname}.py %{python_sitelib}/* %changelog -* Sun Feb 3 2019 Daniel Steiner +* Sun Feb 3 2019 Daniel Steiner - First build, it's required by powerline_shell package. diff --git a/centos/SPECS/python3-argparse.spec b/centos/SPECS/python3-argparse.spec index 1272fab..bd34c48 100644 --- a/centos/SPECS/python3-argparse.spec +++ b/centos/SPECS/python3-argparse.spec @@ -55,6 +55,6 @@ rm -rf %{buildroot}%{python3_sitelib}/__pycache__ %{python3_sitelib}/* %changelog -* Sun Feb 3 2019 Daniel Steiner +* Sun Feb 3 2019 Daniel Steiner - First build, it's required by powerline_shell package. diff --git a/centos/SPECS/tmux.spec b/centos/SPECS/tmux.spec index 25950b8..6ebf4b7 100644 --- a/centos/SPECS/tmux.spec +++ b/centos/SPECS/tmux.spec @@ -69,9 +69,9 @@ fi %config(noreplace) %{_sysconfdir}/tmux.conf %changelog -* Sun Sep 29 2019 Daniel Steiner +* Sun Sep 29 2019 Daniel Steiner - Default tmux config added. -* Fri Aug 16 2019 Daniel Steiner +* Fri Aug 16 2019 Daniel Steiner - Initial to version 3.0 for CentOS. diff --git a/fedora/SPECS/archive/libmodsecurity.spec b/fedora/SPECS/archive/libmodsecurity.spec index 363e2ec..3ea2458 100644 --- a/fedora/SPECS/archive/libmodsecurity.spec +++ b/fedora/SPECS/archive/libmodsecurity.spec @@ -114,9 +114,9 @@ make install DESTDIR=%{buildroot} [ "%{_builddir}" != "/" ] && [ -d "%{_builddir}" ] && rm -rf %{_builddir}/* %changelog -* Thu Mar 7 2019 Daniel Steiner +* Thu Mar 7 2019 Daniel Steiner - lmdb disabled -* Tue Jan 22 2019 Daniel Steiner +* Tue Jan 22 2019 Daniel Steiner - New 3.x build for Fedora 29. diff --git a/fedora/SPECS/archive/modsecurity_apache.spec b/fedora/SPECS/archive/modsecurity_apache.spec index 4e9a433..fc62cac 100644 --- a/fedora/SPECS/archive/modsecurity_apache.spec +++ b/fedora/SPECS/archive/modsecurity_apache.spec @@ -114,6 +114,6 @@ rm -rf %{buildroot} %endif %changelog -* Thu Jan 22 2019 Daniel Steiner +* Thu Jan 22 2019 Daniel Steiner - New 3.x build for Fedora 29. diff --git a/fedora/SPECS/archive/virt-backup.spec b/fedora/SPECS/archive/virt-backup.spec index 9146705..3f82d14 100644 --- a/fedora/SPECS/archive/virt-backup.spec +++ b/fedora/SPECS/archive/virt-backup.spec @@ -63,6 +63,6 @@ sed -i -e "s|/sbin/lvcreate|/usr/sbin/lvcreate|g" \ %dir %attr(0770, qemu, qemu) %{_localstatedir}/lib/libvirt/backup %changelog -* Sun Apr 14 2019 Daniel Steiner +* Sun Apr 14 2019 Daniel Steiner - Initial build. diff --git a/fedora/SPECS/echoip.spec b/fedora/SPECS/echoip.spec index f7a224a..681e48d 100644 --- a/fedora/SPECS/echoip.spec +++ b/fedora/SPECS/echoip.spec @@ -4,7 +4,7 @@ %define gitv 58fd8a6 %define webd %{_var}/www %define gopath $(pwd)/go -%define domain echoip.daniel-steiner.org +%define domain echoip.dsteiner.ch %define protocol https %define port 443 @@ -30,7 +30,7 @@ Requires: geoipupdate-cron Requires: GeoIP %description -A simple service for looking up your IP address. This is the code that powers https://echoip.daniel-steiner.org. +A simple service for looking up your IP address. This is the code that powers https://echoip.dsteiner.ch. %prep %setup -q -n %{name}-%{version}.%{gitv} diff --git a/fedora/SPECS/gitea.spec b/fedora/SPECS/gitea.spec index b1f7c70..2827ed8 100644 --- a/fedora/SPECS/gitea.spec +++ b/fedora/SPECS/gitea.spec @@ -82,75 +82,75 @@ getent passwd gitea > /dev/null || \ %changelog -* Fri Aug 14 2020 Daniel Steiner +* Fri Aug 14 2020 Daniel Steiner - Update to version 1.12.3. -* Fri Jul 17 2020 Daniel Steiner +* Fri Jul 17 2020 Daniel Steiner - Update to version 1.12.2. -* Fri Jul 3 2020 Daniel Steiner +* Fri Jul 3 2020 Daniel Steiner - Update to version 1.12.1. -* Sun Jun 14 2020 Daniel Steiner +* Sun Jun 14 2020 Daniel Steiner - Update to version 1.11.6. - Fix for frontend JS location. -* Fri May 15 2020 Daniel Steiner +* Fri May 15 2020 Daniel Steiner - Update to version 1.11.5. -* Fri Mar 27 2020 Daniel Steiner -* Fri Apr 10 2020 Daniel Steiner +* Fri Mar 27 2020 Daniel Steiner +* Fri Apr 10 2020 Daniel Steiner - Update to version 1.11.4. -* Fri Mar 27 2020 Daniel Steiner +* Fri Mar 27 2020 Daniel Steiner - Update to version 1.11.3. -* Sat Feb 22 2020 Daniel Steiner +* Sat Feb 22 2020 Daniel Steiner - Update to version 1.11.1. -* Sat Jan 25 2020 Daniel Steiner +* Sat Jan 25 2020 Daniel Steiner - Update to version 1.10.3. -* Fri Jan 17 2020 Daniel Steiner +* Fri Jan 17 2020 Daniel Steiner - Update to version 1.10.2. -* Fri Nov 22 2019 Daniel Steiner +* Fri Nov 22 2019 Daniel Steiner - Update to version 1.10.0. -* Fri Oct 18 2019 Daniel Steiner +* Fri Oct 18 2019 Daniel Steiner - Update to version 1.9.4. -* Sat Sep 21 2019 Daniel Steiner +* Sat Sep 21 2019 Daniel Steiner - Update to version 1.9.3. -* Fri Aug 16 2019 Daniel Steiner +* Fri Aug 16 2019 Daniel Steiner - Update to version 1.9.1. -* Fri Aug 2 2019 Daniel Steiner +* Fri Aug 2 2019 Daniel Steiner - Update to version 1.9.0. -* Mon Jun 3 2019 Daniel Steiner +* Mon Jun 3 2019 Daniel Steiner - Update to version 1.8.2. -* Sat May 11 2019 Daniel Steiner +* Sat May 11 2019 Daniel Steiner - Update to version 1.8.1. -* Sun Apr 28 2019 Daniel Steiner +* Sun Apr 28 2019 Daniel Steiner - Update to version 1.8.0. -* Sun Apr 7 2019 Daniel Steiner +* Sun Apr 7 2019 Daniel Steiner - Update to version 1.7.5. -* Fri Mar 15 2019 Daniel Steiner +* Fri Mar 15 2019 Daniel Steiner - Update to version 1.7.4. -* Wed Feb 27 2019 Daniel Steiner +* Wed Feb 27 2019 Daniel Steiner - Update to version 1.7.3. -* Sat Feb 16 2019 Daniel Steiner +* Sat Feb 16 2019 Daniel Steiner - Update to version 1.7.2. -* Wed Jan 30 2019 Daniel Steiner +* Wed Jan 30 2019 Daniel Steiner - Update to version 1.7.0. * Fri Jan 18 2019 Daniel Steiner diff --git a/fedora/SPECS/makemkv.spec b/fedora/SPECS/makemkv.spec index ecc45f6..3b334d5 100644 --- a/fedora/SPECS/makemkv.spec +++ b/fedora/SPECS/makemkv.spec @@ -86,19 +86,19 @@ popd %{_datarootdir}/MakeMKV/* %changelog -* Fri Mar 6 2020 Daniel Steiner +* Fri Mar 6 2020 Daniel Steiner - Update to 1.15.0. -* Mon Dec 30 2019 Daniel Steiner +* Mon Dec 30 2019 Daniel Steiner - Update to 1.14.7. -* Sat Sep 14 2019 Daniel Steiner +* Sat Sep 14 2019 Daniel Steiner - Update to 1.14.5. -* Sat Jul 27 2019 Daniel Steiner +* Sat Jul 27 2019 Daniel Steiner - Update to 1.14.4. -* Thu Apr 4 2019 Daniel Steiner +* Thu Apr 4 2019 Daniel Steiner - Update to 1.14.3. * Fri Nov 16 2018 Daniel Steiner diff --git a/fedora/SPECS/mod_tile.spec b/fedora/SPECS/mod_tile.spec index 5d6bdc7..bc01e79 100644 --- a/fedora/SPECS/mod_tile.spec +++ b/fedora/SPECS/mod_tile.spec @@ -71,12 +71,12 @@ fi %{_mandir}/man8/* %changelog -* Fri Jul 23 2020 Daniel Steiner +* Fri Jul 23 2020 Daniel Steiner - Patch for duplicated variables definition added, this compiles now on Fedora 32 and gcc 10. -* Sat Nov 9 2019 Daniel Steiner +* Sat Nov 9 2019 Daniel Steiner - Fix for modules config path. -* Fri Nov 8 2019 Daniel Steiner +* Fri Nov 8 2019 Daniel Steiner - First build on Fedora 31 httpd-2.4.41. diff --git a/fedora/SPECS/nagios-plugins-own.spec b/fedora/SPECS/nagios-plugins-own.spec index 9c1a150..74bb26d 100644 --- a/fedora/SPECS/nagios-plugins-own.spec +++ b/fedora/SPECS/nagios-plugins-own.spec @@ -11,7 +11,7 @@ Release: %{svnrel}%{?dist} Summary: Nagios/Icinga own plugins License: GPL -URL: http://www.daniel-steiner.org/ +URL: http://www.dsteiner.ch/ # cd ~/svn; svn co --username sda https://intranet.trivadis.com/svn/TrivadisIT/Scripting/trunk/nagios/ # cd ~/svn; svn up # tar --exclude=templates --exclude=.svn -czf ../rpmbuild/SOURCES/nagios-952.tgz nagios diff --git a/fedora/SPECS/ngxtop.spec b/fedora/SPECS/ngxtop.spec index 831e671..082dbc6 100644 --- a/fedora/SPECS/ngxtop.spec +++ b/fedora/SPECS/ngxtop.spec @@ -44,6 +44,6 @@ specify your log and format, even parse remote Apache common access log with eas %python3_sitelib/%{name}*.egg-info %changelog -* Sat Jan 26 2019 Daniel Steiner +* Sat Jan 26 2019 Daniel Steiner - First release for Fedora 29 diff --git a/fedora/SPECS/polemarch.spec b/fedora/SPECS/polemarch.spec index b395da7..ada772e 100644 --- a/fedora/SPECS/polemarch.spec +++ b/fedora/SPECS/polemarch.spec @@ -139,72 +139,72 @@ sudo -u %{user} /opt/%{name}/bin/%{shortname}ctl migrate [ "%{_builddir}" != "/" ] && [ -d "%{_builddir}" ] && rm -rf %{_builddir}/* %changelog -* Fri Aug 14 2020 Daniel Steiner +* Fri Aug 14 2020 Daniel Steiner - Update to 1.8.0 version. -* Mon May 18 2020 Daniel Steiner +* Mon May 18 2020 Daniel Steiner - Build dependencies added (nodejs and yarn). -* Fri May 15 2020 Daniel Steiner +* Fri May 15 2020 Daniel Steiner - Update to 1.7.6 version. -* Sun May 3 2020 Daniel Steiner +* Sun May 3 2020 Daniel Steiner - Fixes for Fedora 32 installation. Git and gitdb packages are now symlinked. -* Fri Jan 17 2020 Daniel Steiner +* Fri Jan 17 2020 Daniel Steiner - Update to 1.6.2 version. -* Mon Dec 30 2019 Daniel Steiner +* Mon Dec 30 2019 Daniel Steiner - Update to 1.6.1 version. -* Sun Dec 15 2019 Daniel Steiner +* Sun Dec 15 2019 Daniel Steiner - Update to 1.6.0 version. -* Fri Dec 6 2019 Daniel Steiner +* Fri Dec 6 2019 Daniel Steiner - Update to 1.5.1 version. -* Sat Nov 9 2019 Daniel Steiner +* Sat Nov 9 2019 Daniel Steiner - Changes for Fedora 31. - mysqlcient symlink added. -* Sat Sep 21 2019 Daniel Steiner +* Sat Sep 21 2019 Daniel Steiner - Update to 1.4.4 version. -* Sun Sep 15 2019 Daniel Steiner +* Sun Sep 15 2019 Daniel Steiner - Update to 1.4.3 version. -* Fri Aug 16 2019 Daniel Steiner +* Fri Aug 16 2019 Daniel Steiner - Update to 1.4.1 version. -* Sat Jul 13 2019 Daniel Steiner +* Sat Jul 13 2019 Daniel Steiner - Update to 1.3.1 version. -* Sun Jun 16 2019 Daniel Steiner +* Sun Jun 16 2019 Daniel Steiner - Update to 1.2.1 version. -* Mon Jun 10 2019 Daniel Steiner +* Mon Jun 10 2019 Daniel Steiner - Update to 1.2.0 version, python 3 is required now. -* Sun May 12 2019 Daniel Steiner +* Sun May 12 2019 Daniel Steiner - Dependency for libxcrypt-compat added. -* Fri May 3 2019 Daniel Steiner +* Fri May 3 2019 Daniel Steiner - Workaround for mysql DB version failure. -* Sun Apr 28 2019 Daniel Steiner +* Sun Apr 28 2019 Daniel Steiner - Update to latest 1.1.4 version. -* Fri Mar 22 2019 Daniel Steiner +* Fri Mar 22 2019 Daniel Steiner - Update to latest 1.1.3 version. -* Fri Mar 8 2019 Daniel Steiner +* Fri Mar 8 2019 Daniel Steiner - Do migrate alltimes postinstall script. - Upgrade to latest 1.1.2 version. - redis-py patch for version 3.2.0 which is required but not resolved. -* Fri Feb 22 2019 Daniel Steiner +* Fri Feb 22 2019 Daniel Steiner - Some fixes for post script. -* Fri Feb 22 2019 Daniel Steiner +* Fri Feb 22 2019 Daniel Steiner - First setup for Fedora 29 diff --git a/fedora/SPECS/powerline_shell.spec b/fedora/SPECS/powerline_shell.spec index 73aa0a7..a437e87 100644 --- a/fedora/SPECS/powerline_shell.spec +++ b/fedora/SPECS/powerline_shell.spec @@ -4,7 +4,7 @@ Release: 3%{?dist} Summary: A beautiful and useful prompt generator for Bash, ZSH, Fish, and tcsh License: MIT -URL: https://dev.daniel-steiner.org/dani/powerline-shell-enhanced#segment-configuration +URL: https://dev.dsteiner.ch/dani/powerline-shell-enhanced#segment-configuration Source0: powerline_shell.tar.gz %define debug_package %{nil} @@ -57,12 +57,12 @@ The generated prompts are designed to resemble powerline, but otherwise this pro %changelog -* Sun Feb 3 2019 Daniel Steiner +* Sun Feb 3 2019 Daniel Steiner - Dependency added for pythonX-setuptools rpm. -* Sun Feb 3 2019 Daniel Steiner +* Sun Feb 3 2019 Daniel Steiner - Dependency added for pythonX-argparse rpm. -* Sat Feb 2 2019 Daniel Steiner +* Sat Feb 2 2019 Daniel Steiner - First build. diff --git a/fedora/SPECS/python-PyMySQL.spec b/fedora/SPECS/python-PyMySQL.spec index 4f97d45..7b0ae76 100644 --- a/fedora/SPECS/python-PyMySQL.spec +++ b/fedora/SPECS/python-PyMySQL.spec @@ -91,6 +91,6 @@ rm -rf tests %{python3_sitelib}/pymysql/ %changelog -* Sun Apr 28 2019 Daniel Steiner +* Sun Apr 28 2019 Daniel Steiner - Initial relase for fedora 29 (0.9.3). diff --git a/fedora/SPECS/python-mysql.spec b/fedora/SPECS/python-mysql.spec index d90fc02..dc15a1f 100644 --- a/fedora/SPECS/python-mysql.spec +++ b/fedora/SPECS/python-mysql.spec @@ -171,6 +171,6 @@ CFLAGS="$RPM_OPT_FLAGS" %{__python3}-debug setup.py build %endif # with debug %changelog -* Sun Apr 28 2019 Daniel Steiner +* Sun Apr 28 2019 Daniel Steiner - Initial relase for fedora 29 (1.4.2). diff --git a/fedora/SPECS/python-redis.spec b/fedora/SPECS/python-redis.spec index 74bbadc..ab7e9ac 100644 --- a/fedora/SPECS/python-redis.spec +++ b/fedora/SPECS/python-redis.spec @@ -97,6 +97,6 @@ kill %1 %endif %changelog -* Sun May 12 2019 Javier Peña +* Sun May 12 2019 Javier Peña - First build. diff --git a/fedora/SPECS/python2-argparse.spec b/fedora/SPECS/python2-argparse.spec index c5b26f4..cc0198a 100644 --- a/fedora/SPECS/python2-argparse.spec +++ b/fedora/SPECS/python2-argparse.spec @@ -54,6 +54,6 @@ PYTHONPATH=../ %{__python} test_%{oname}.py %{python2_sitelib}/* %changelog -* Sun Feb 3 2019 Daniel Steiner +* Sun Feb 3 2019 Daniel Steiner - First build, it's required by powerline_shell package. diff --git a/fedora/SPECS/python3-argparse.spec b/fedora/SPECS/python3-argparse.spec index a026765..f3ff487 100644 --- a/fedora/SPECS/python3-argparse.spec +++ b/fedora/SPECS/python3-argparse.spec @@ -55,9 +55,9 @@ rm -rf %{buildroot}%{python3_sitelib}/__pycache__ %{python3_sitelib}/* %changelog -* Sat May 2 2020 Daniel Steiner +* Sat May 2 2020 Daniel Steiner - First build on Fedora 32. -* Sun Feb 3 2019 Daniel Steiner +* Sun Feb 3 2019 Daniel Steiner - First build, it's required by powerline_shell package. From a5518ce65a6db96c6ceb3737241333b00616a943 Mon Sep 17 00:00:00 2001 From: Daniel Steiner Date: Fri, 4 Sep 2020 12:36:12 +0200 Subject: [PATCH 47/56] Release changed --- fedora/SPECS/goaccess.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fedora/SPECS/goaccess.spec b/fedora/SPECS/goaccess.spec index 242b41b..130cf2f 100644 --- a/fedora/SPECS/goaccess.spec +++ b/fedora/SPECS/goaccess.spec @@ -1,6 +1,6 @@ Name: goaccess Version: 1.4.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Real-time web log analyzer and interactive viewer License: GPLv2+ URL: https://goaccess.io/ From 2b60c668e5d05c998e17b3852edc776766caca98 Mon Sep 17 00:00:00 2001 From: Daniel Steiner Date: Fri, 4 Sep 2020 12:37:41 +0200 Subject: [PATCH 48/56] Nginx update --- fedora/SPECS/nginx.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fedora/SPECS/nginx.spec b/fedora/SPECS/nginx.spec index 13dd59b..18be8e9 100644 --- a/fedora/SPECS/nginx.spec +++ b/fedora/SPECS/nginx.spec @@ -19,7 +19,7 @@ Name: nginx Epoch: 1 -Version: 1.19.1 +Version: 1.19.2 Release: 1%{?dist} Summary: A high performance web server and reverse proxy server @@ -569,6 +569,9 @@ fi [ "%{_builddir}" != "/" ] && [ -d "%{_builddir}" ] && rm -rf %{_builddir}/* %changelog +* Fri Sep 4 2020 Daniel Steiner +- Updated to mainline version 1.19.2. + * Fri Jul 17 2020 Daniel Steiner - Updated to mainline version 1.19.1. From 3f53ffb29b74b1b1350495549e6e0f8ac866ebcc Mon Sep 17 00:00:00 2001 From: Daniel Steiner Date: Sat, 5 Sep 2020 14:27:35 +0200 Subject: [PATCH 49/56] Openidc module added --- centos/SPECS/mod_auth_openidc.spec | 108 +++++++++++++++++++++++++++++ fedora/SPECS/cjose.spec | 67 ++++++++++++++++++ fedora/SPECS/mod_auth_openidc.spec | 108 +++++++++++++++++++++++++++++ 3 files changed, 283 insertions(+) create mode 100644 centos/SPECS/mod_auth_openidc.spec create mode 100644 fedora/SPECS/cjose.spec create mode 100644 fedora/SPECS/mod_auth_openidc.spec diff --git a/centos/SPECS/mod_auth_openidc.spec b/centos/SPECS/mod_auth_openidc.spec new file mode 100644 index 0000000..21e3b24 --- /dev/null +++ b/centos/SPECS/mod_auth_openidc.spec @@ -0,0 +1,108 @@ +%{!?_httpd_mmn: %{expand: %%global _httpd_mmn %%(cat %{_includedir}/httpd/.mmn || echo 0-0)}} +%{!?_httpd_moddir: %{expand: %%global _httpd_moddir %%{_libdir}/httpd/modules}} +%{!?_httpd_confdir: %{expand: %%global _httpd_confdir %{_sysconfdir}/httpd/conf.d}} + +# Optionally build with hiredis if --with hiredis is passed +%{!?_with_hiredis: %{!?_without_hiredis: %global _without_hiredis --without-hiredis}} +# It is an error if both or neither required options exist. +%{?_with_hiredis: %{?_without_hiredis: %{error: both _with_hiredis and _without_hiredis}}} +%{!?_with_hiredis: %{!?_without_hiredis: %{error: neither _with_hiredis nor _without_hiredis}}} + +# /etc/httpd/conf.d with httpd < 2.4 and defined as /etc/httpd/conf.modules.d with httpd >= 2.4 +%{!?_httpd_modconfdir: %{expand: %%global _httpd_modconfdir %%{_sysconfdir}/httpd/conf.d}} + +%global httpd_pkg_cache_dir /var/cache/httpd/mod_auth_openidc + +Name: mod_auth_openidc +Version: 2.4.4.1 +Release: 1%{?dist} +Summary: OpenID Connect auth module for Apache HTTP Server + +License: ASL 2.0 +URL: https://github.com/zmartzone/mod_auth_openidc +Source0: https://github.com/zmartzone/mod_auth_openidc/releases/download/v%{version}/mod_auth_openidc-%{version}.tar.gz + +BuildRequires: gcc +BuildRequires: httpd-devel +BuildRequires: openssl-devel +BuildRequires: curl-devel +BuildRequires: jansson-devel +BuildRequires: pcre-devel +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: cjose-devel +#BuildRequires: jq-devel +BuildRequires: jq +%{?_with_hiredis:BuildRequires: hiredis-devel} +Requires: httpd-mmn = %{_httpd_mmn} + +%description +This module enables an Apache 2.x web server to operate as +an OpenID Connect Relying Party and/or OAuth 2.0 Resource Server. + +%prep +%setup -q + +%build +# workaround rpm-buildroot-usage +export MODULES_DIR=%{_httpd_moddir} +export APXS2_OPTS='-S LIBEXECDIR=${MODULES_DIR}' +autoreconf +%configure \ + --with-jq=/usr/lib64/ \ + %{?_with_hiredis} \ + %{?_without_hiredis} + +make %{?_smp_mflags} + +%check +export MODULES_DIR=%{_httpd_moddir} +export APXS2_OPTS='-S LIBEXECDIR=${MODULES_DIR}' +make test + +%install +mkdir -p $RPM_BUILD_ROOT%{_httpd_moddir} +make install MODULES_DIR=$RPM_BUILD_ROOT%{_httpd_moddir} + +install -m 755 -d $RPM_BUILD_ROOT%{_httpd_modconfdir} +echo 'LoadModule auth_openidc_module modules/mod_auth_openidc.so' > \ + $RPM_BUILD_ROOT%{_httpd_modconfdir}/10-auth_openidc.conf + +install -m 755 -d $RPM_BUILD_ROOT%{_httpd_confdir} +install -m 644 auth_openidc.conf $RPM_BUILD_ROOT%{_httpd_confdir} +# Adjust httpd cache location in install config file +sed -i 's!/var/cache/apache2/!/var/cache/httpd/!' $RPM_BUILD_ROOT%{_httpd_confdir}/auth_openidc.conf +install -m 700 -d $RPM_BUILD_ROOT%{httpd_pkg_cache_dir} +install -m 700 -d $RPM_BUILD_ROOT%{httpd_pkg_cache_dir}/metadata +install -m 700 -d $RPM_BUILD_ROOT%{httpd_pkg_cache_dir}/cache + + +%files +%if 0%{?rhel} && 0%{?rhel} < 7 +%doc LICENSE.txt +%else +%license LICENSE.txt +%endif +%doc ChangeLog +%doc AUTHORS +%doc README.md +%{_httpd_moddir}/mod_auth_openidc.so +%config(noreplace) %{_httpd_modconfdir}/10-auth_openidc.conf +%config(noreplace) %{_httpd_confdir}/auth_openidc.conf +%dir %attr(0700, apache, apache) %{httpd_pkg_cache_dir} +%dir %attr(0700, apache, apache) %{httpd_pkg_cache_dir}/metadata +%dir %attr(0700, apache, apache) %{httpd_pkg_cache_dir}/cache + +%changelog +* Sat Sep 5 2020 Daniel Steiner +- Update to 2.4.4.1. + +* Mon Jul 6 2020 Daniel Steiner +- Update to 2.4.3. + +* Thu Feb 13 2020 Daniel Steiner +- Update to 2.4.1. + +* Thu Dec 19 2019 Daniel Steiner +- First initial build. + diff --git a/fedora/SPECS/cjose.spec b/fedora/SPECS/cjose.spec new file mode 100644 index 0000000..c7f55eb --- /dev/null +++ b/fedora/SPECS/cjose.spec @@ -0,0 +1,67 @@ +Name: cjose +Version: 0.6.1 +Release: 3%{?dist} +Summary: C library implementing the Javascript Object Signing and Encryption (JOSE) + +License: MIT +URL: https://github.com/cisco/cjose +Source0: https://github.com/cisco/%{name}/archive/%{version}/%{name}-%{version}.tar.gz + +Patch1: concatkdf.patch + +BuildRequires: gcc +BuildRequires: doxygen +BuildRequires: openssl-devel +BuildRequires: jansson-devel +BuildRequires: check-devel + +%description +Implementation of JOSE for C/C++ + + +%package devel +Summary: Development files for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description devel +The %{name}-devel package contains libraries and header files for +developing applications that use %{name}. + + +%prep +%autosetup -n %{name}-%{version} -p1 + +%build +%configure +%make_build + + +%install +%make_install +find %{buildroot} -name '*.a' -exec rm -f {} ';' +find %{buildroot} -name '*.la' -exec rm -f {} ';' + + +%ldconfig_scriptlets + + +%check +make check || (cat test/test-suite.log; exit 1) + +%files +%license LICENSE +%doc CHANGELOG.md README.md +%doc /usr/share/doc/cjose +%{_libdir}/*.so.* + + +%files devel +%{_includedir}/* +%{_libdir}/*.so +%{_libdir}/pkgconfig/cjose.pc + + +%changelog +* Sat Sep 5 2020 Daniel Steiner +- First initial build. + diff --git a/fedora/SPECS/mod_auth_openidc.spec b/fedora/SPECS/mod_auth_openidc.spec new file mode 100644 index 0000000..21e3b24 --- /dev/null +++ b/fedora/SPECS/mod_auth_openidc.spec @@ -0,0 +1,108 @@ +%{!?_httpd_mmn: %{expand: %%global _httpd_mmn %%(cat %{_includedir}/httpd/.mmn || echo 0-0)}} +%{!?_httpd_moddir: %{expand: %%global _httpd_moddir %%{_libdir}/httpd/modules}} +%{!?_httpd_confdir: %{expand: %%global _httpd_confdir %{_sysconfdir}/httpd/conf.d}} + +# Optionally build with hiredis if --with hiredis is passed +%{!?_with_hiredis: %{!?_without_hiredis: %global _without_hiredis --without-hiredis}} +# It is an error if both or neither required options exist. +%{?_with_hiredis: %{?_without_hiredis: %{error: both _with_hiredis and _without_hiredis}}} +%{!?_with_hiredis: %{!?_without_hiredis: %{error: neither _with_hiredis nor _without_hiredis}}} + +# /etc/httpd/conf.d with httpd < 2.4 and defined as /etc/httpd/conf.modules.d with httpd >= 2.4 +%{!?_httpd_modconfdir: %{expand: %%global _httpd_modconfdir %%{_sysconfdir}/httpd/conf.d}} + +%global httpd_pkg_cache_dir /var/cache/httpd/mod_auth_openidc + +Name: mod_auth_openidc +Version: 2.4.4.1 +Release: 1%{?dist} +Summary: OpenID Connect auth module for Apache HTTP Server + +License: ASL 2.0 +URL: https://github.com/zmartzone/mod_auth_openidc +Source0: https://github.com/zmartzone/mod_auth_openidc/releases/download/v%{version}/mod_auth_openidc-%{version}.tar.gz + +BuildRequires: gcc +BuildRequires: httpd-devel +BuildRequires: openssl-devel +BuildRequires: curl-devel +BuildRequires: jansson-devel +BuildRequires: pcre-devel +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: cjose-devel +#BuildRequires: jq-devel +BuildRequires: jq +%{?_with_hiredis:BuildRequires: hiredis-devel} +Requires: httpd-mmn = %{_httpd_mmn} + +%description +This module enables an Apache 2.x web server to operate as +an OpenID Connect Relying Party and/or OAuth 2.0 Resource Server. + +%prep +%setup -q + +%build +# workaround rpm-buildroot-usage +export MODULES_DIR=%{_httpd_moddir} +export APXS2_OPTS='-S LIBEXECDIR=${MODULES_DIR}' +autoreconf +%configure \ + --with-jq=/usr/lib64/ \ + %{?_with_hiredis} \ + %{?_without_hiredis} + +make %{?_smp_mflags} + +%check +export MODULES_DIR=%{_httpd_moddir} +export APXS2_OPTS='-S LIBEXECDIR=${MODULES_DIR}' +make test + +%install +mkdir -p $RPM_BUILD_ROOT%{_httpd_moddir} +make install MODULES_DIR=$RPM_BUILD_ROOT%{_httpd_moddir} + +install -m 755 -d $RPM_BUILD_ROOT%{_httpd_modconfdir} +echo 'LoadModule auth_openidc_module modules/mod_auth_openidc.so' > \ + $RPM_BUILD_ROOT%{_httpd_modconfdir}/10-auth_openidc.conf + +install -m 755 -d $RPM_BUILD_ROOT%{_httpd_confdir} +install -m 644 auth_openidc.conf $RPM_BUILD_ROOT%{_httpd_confdir} +# Adjust httpd cache location in install config file +sed -i 's!/var/cache/apache2/!/var/cache/httpd/!' $RPM_BUILD_ROOT%{_httpd_confdir}/auth_openidc.conf +install -m 700 -d $RPM_BUILD_ROOT%{httpd_pkg_cache_dir} +install -m 700 -d $RPM_BUILD_ROOT%{httpd_pkg_cache_dir}/metadata +install -m 700 -d $RPM_BUILD_ROOT%{httpd_pkg_cache_dir}/cache + + +%files +%if 0%{?rhel} && 0%{?rhel} < 7 +%doc LICENSE.txt +%else +%license LICENSE.txt +%endif +%doc ChangeLog +%doc AUTHORS +%doc README.md +%{_httpd_moddir}/mod_auth_openidc.so +%config(noreplace) %{_httpd_modconfdir}/10-auth_openidc.conf +%config(noreplace) %{_httpd_confdir}/auth_openidc.conf +%dir %attr(0700, apache, apache) %{httpd_pkg_cache_dir} +%dir %attr(0700, apache, apache) %{httpd_pkg_cache_dir}/metadata +%dir %attr(0700, apache, apache) %{httpd_pkg_cache_dir}/cache + +%changelog +* Sat Sep 5 2020 Daniel Steiner +- Update to 2.4.4.1. + +* Mon Jul 6 2020 Daniel Steiner +- Update to 2.4.3. + +* Thu Feb 13 2020 Daniel Steiner +- Update to 2.4.1. + +* Thu Dec 19 2019 Daniel Steiner +- First initial build. + From 76ceba580ba6f5823ab06958f7450bb073cd10b4 Mon Sep 17 00:00:00 2001 From: Daniel Steiner Date: Sat, 5 Sep 2020 14:28:05 +0200 Subject: [PATCH 50/56] Openidc module added --- centos/SPECS/cjose.spec | 67 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) create mode 100644 centos/SPECS/cjose.spec diff --git a/centos/SPECS/cjose.spec b/centos/SPECS/cjose.spec new file mode 100644 index 0000000..c7f55eb --- /dev/null +++ b/centos/SPECS/cjose.spec @@ -0,0 +1,67 @@ +Name: cjose +Version: 0.6.1 +Release: 3%{?dist} +Summary: C library implementing the Javascript Object Signing and Encryption (JOSE) + +License: MIT +URL: https://github.com/cisco/cjose +Source0: https://github.com/cisco/%{name}/archive/%{version}/%{name}-%{version}.tar.gz + +Patch1: concatkdf.patch + +BuildRequires: gcc +BuildRequires: doxygen +BuildRequires: openssl-devel +BuildRequires: jansson-devel +BuildRequires: check-devel + +%description +Implementation of JOSE for C/C++ + + +%package devel +Summary: Development files for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description devel +The %{name}-devel package contains libraries and header files for +developing applications that use %{name}. + + +%prep +%autosetup -n %{name}-%{version} -p1 + +%build +%configure +%make_build + + +%install +%make_install +find %{buildroot} -name '*.a' -exec rm -f {} ';' +find %{buildroot} -name '*.la' -exec rm -f {} ';' + + +%ldconfig_scriptlets + + +%check +make check || (cat test/test-suite.log; exit 1) + +%files +%license LICENSE +%doc CHANGELOG.md README.md +%doc /usr/share/doc/cjose +%{_libdir}/*.so.* + + +%files devel +%{_includedir}/* +%{_libdir}/*.so +%{_libdir}/pkgconfig/cjose.pc + + +%changelog +* Sat Sep 5 2020 Daniel Steiner +- First initial build. + From 09c7257bdea28c12f68f3d9fb4703067ce5a8997 Mon Sep 17 00:00:00 2001 From: Daniel Steiner Date: Sat, 12 Sep 2020 13:30:49 +0200 Subject: [PATCH 51/56] First selinux policy package --- fedora/SPECS/danweb2-selinux.spec | 78 +++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) create mode 100644 fedora/SPECS/danweb2-selinux.spec diff --git a/fedora/SPECS/danweb2-selinux.spec b/fedora/SPECS/danweb2-selinux.spec new file mode 100644 index 0000000..501b2cb --- /dev/null +++ b/fedora/SPECS/danweb2-selinux.spec @@ -0,0 +1,78 @@ +%define myname danweb2 +%global selinuxtype targeted +%global moduletype services +%global modulenames %{myname} + +# Relabel files +%global relabel_files() \ # ADD files in *.fc file + + +# Version of distribution SELinux policy package +# rpm -q selinux-policy +%global selinux_policyver 3.14.0 + +# Package information +Name: %{myname}-selinux +Version: 1.0 +Release: 1%{?dist} +License: GPLv2 +Group: System Environment/Base +Summary: SELinux Policies for %{myname} +BuildArch: noarch +URL: https://www.dsteiner.ch +Requires(post): selinux-policy-base >= %{selinux_policyver}, +Requires(post): selinux-policy-targeted >= %{selinux_policyver} +Requires(post): policycoreutils +Requires(post): policycoreutils-python-utils +Requires(post): libselinux-utils +BuildRequires: selinux-policy selinux-policy-devel + +Source: selinux-%{myname}.tar + +%description +SELinux policy modules for use on %{myname} + +%prep +%setup -q -n selinux + +%build +# link Makefile to source dir: +ln -s /usr/share/selinux/devel/Makefile +make + +%install + +# Install SELinux interfaces +export INTERFACES="$(ls *.if)" +install -d %{buildroot}%{_datadir}/selinux/devel/include/%{moduletype} +install -p -m 644 $INTERFACES \ + %{buildroot}%{_datadir}/selinux/devel/include/%{moduletype} + +# Install policy modules +export MODULES="$(ls *.pp)" +install -d %{buildroot}%{_datadir}/selinux/packages +install -m 0644 $MODULES \ + %{buildroot}%{_datadir}/selinux/packages + +%post +# +# Install all modules in a single transaction +# +export MODULES="$(ls %{_datadir}/selinux/packages/*.pp)" +%selinux_modules_install -s %{selinuxtype} $MODULES + +%postun +export MODULES="$(rpm -ql %{name} | grep '.pp$')" +if [ $1 -eq 0 ]; then + %selinux_modules_uninstall -s %{selinuxtype} $MODULES +fi + +%files +%defattr(-,root,root,0755) +%attr(0644,root,root) %{_datadir}/selinux/packages/*.pp +%attr(0644,root,root) %{_datadir}/selinux/devel/include/%{moduletype}/*.if + +%changelog +* Sat Sep 12 2020 +- Additional selinux modules for danweb2 server + From 51f0d72548535b90f6701628ae2a648cc9620690 Mon Sep 17 00:00:00 2001 From: Daniel Steiner Date: Sun, 1 Nov 2020 10:47:45 +0100 Subject: [PATCH 52/56] Polemarch update to 1.8.1 --- fedora/SPECS/polemarch.spec | 57 ++++++++++++++++++++----------------- 1 file changed, 31 insertions(+), 26 deletions(-) diff --git a/fedora/SPECS/polemarch.spec b/fedora/SPECS/polemarch.spec index ada772e..bb91da1 100644 --- a/fedora/SPECS/polemarch.spec +++ b/fedora/SPECS/polemarch.spec @@ -10,14 +10,14 @@ %global __arch_install_post /usr/lib/rpm/check-buildroot # Macros -%define pyversion 3.8 +%define pyversion 3.9 %define name polemarch %define shortname polemarch %define namebase polemarch %define user polemarch %define datad poledata -%define version 1.8.0 -%define release 2 +%define version 1.8.1 +%define release 1 %define __prelink_undo_cmd %{nil} %define _binaries_in_noarch_packages_terminate_build 0 %define unmangled_version %{version} @@ -98,6 +98,8 @@ rm -rf %{buildroot}/opt/polemarch/lib/python%{pyversion}/site-packages/gitdb ln -s %{python3_sitelib}/gitdb %{buildroot}/opt/polemarch/lib/python%{pyversion}/site-packages/gitdb # remove buildroot path in opt/polemarch/bin/activate.xsh: sed -i -e 's|/root/rpmbuild/BUILDROOT/polemarch.*x86_64||' %{buildroot}/opt/polemarch/bin/activate.xsh +# remove .gitignore file: +rm -f %{buildroot}/opt/polemarch/.gitignore %pre getent group %{user} >/dev/null || \ @@ -123,9 +125,9 @@ sudo -u %{user} /opt/%{name}/bin/%{shortname}ctl migrate %dir %attr(-,%{user},%{user}) /opt/%{datad} %dir %attr(-,%{user},%{user}) %{_var}/log/%{namebase} %attr(-,%{user},%{user}) /opt/%{namebase}/bin/* -%attr(-,%{user},%{user}) /opt/%{namebase}/include/* %attr(-,%{user},%{user}) /opt/%{namebase}/lib/* /opt/%{namebase}/lib64 +/opt/%{namebase}/*.cfg %dir %{_sysconfdir}/%{namebase} %{_rundir}/%{namebase} %{_var}/lock/%{namebase} @@ -139,72 +141,75 @@ sudo -u %{user} /opt/%{name}/bin/%{shortname}ctl migrate [ "%{_builddir}" != "/" ] && [ -d "%{_builddir}" ] && rm -rf %{_builddir}/* %changelog -* Fri Aug 14 2020 Daniel Steiner +* Sat Oct 31 2020 Daniel Steiner +- Update to 1.8.1 version, first build on Fedora 33 and python 3.9. + +* Fri Aug 14 2020 Daniel Steiner - Update to 1.8.0 version. -* Mon May 18 2020 Daniel Steiner +* Mon May 18 2020 Daniel Steiner - Build dependencies added (nodejs and yarn). -* Fri May 15 2020 Daniel Steiner +* Fri May 15 2020 Daniel Steiner - Update to 1.7.6 version. -* Sun May 3 2020 Daniel Steiner +* Sun May 3 2020 Daniel Steiner - Fixes for Fedora 32 installation. Git and gitdb packages are now symlinked. -* Fri Jan 17 2020 Daniel Steiner +* Fri Jan 17 2020 Daniel Steiner - Update to 1.6.2 version. -* Mon Dec 30 2019 Daniel Steiner +* Mon Dec 30 2019 Daniel Steiner - Update to 1.6.1 version. -* Sun Dec 15 2019 Daniel Steiner +* Sun Dec 15 2019 Daniel Steiner - Update to 1.6.0 version. -* Fri Dec 6 2019 Daniel Steiner +* Fri Dec 6 2019 Daniel Steiner - Update to 1.5.1 version. -* Sat Nov 9 2019 Daniel Steiner +* Sat Nov 9 2019 Daniel Steiner - Changes for Fedora 31. - mysqlcient symlink added. -* Sat Sep 21 2019 Daniel Steiner +* Sat Sep 21 2019 Daniel Steiner - Update to 1.4.4 version. -* Sun Sep 15 2019 Daniel Steiner +* Sun Sep 15 2019 Daniel Steiner - Update to 1.4.3 version. -* Fri Aug 16 2019 Daniel Steiner +* Fri Aug 16 2019 Daniel Steiner - Update to 1.4.1 version. -* Sat Jul 13 2019 Daniel Steiner +* Sat Jul 13 2019 Daniel Steiner - Update to 1.3.1 version. -* Sun Jun 16 2019 Daniel Steiner +* Sun Jun 16 2019 Daniel Steiner - Update to 1.2.1 version. -* Mon Jun 10 2019 Daniel Steiner +* Mon Jun 10 2019 Daniel Steiner - Update to 1.2.0 version, python 3 is required now. -* Sun May 12 2019 Daniel Steiner +* Sun May 12 2019 Daniel Steiner - Dependency for libxcrypt-compat added. -* Fri May 3 2019 Daniel Steiner +* Fri May 3 2019 Daniel Steiner - Workaround for mysql DB version failure. -* Sun Apr 28 2019 Daniel Steiner +* Sun Apr 28 2019 Daniel Steiner - Update to latest 1.1.4 version. -* Fri Mar 22 2019 Daniel Steiner +* Fri Mar 22 2019 Daniel Steiner - Update to latest 1.1.3 version. -* Fri Mar 8 2019 Daniel Steiner +* Fri Mar 8 2019 Daniel Steiner - Do migrate alltimes postinstall script. - Upgrade to latest 1.1.2 version. - redis-py patch for version 3.2.0 which is required but not resolved. -* Fri Feb 22 2019 Daniel Steiner +* Fri Feb 22 2019 Daniel Steiner - Some fixes for post script. -* Fri Feb 22 2019 Daniel Steiner +* Fri Feb 22 2019 Daniel Steiner - First setup for Fedora 29 From be2d9e4e7b0dbff12ef779f03e1d2c0241c37b8d Mon Sep 17 00:00:00 2001 From: Daniel Steiner Date: Mon, 16 Nov 2020 13:25:57 +0100 Subject: [PATCH 53/56] Icinga packages added (temporary until they build rpms by themselves --- fedora/SPECS/icinga2.spec | 918 +++++++++++++++++++++++++++++++++++ fedora/SPECS/icingaweb2.spec | 481 ++++++++++++++++++ fedora/SPECS/l10n.spec | 114 +++++ 3 files changed, 1513 insertions(+) create mode 100644 fedora/SPECS/icinga2.spec create mode 100644 fedora/SPECS/icingaweb2.spec create mode 100644 fedora/SPECS/l10n.spec diff --git a/fedora/SPECS/icinga2.spec b/fedora/SPECS/icinga2.spec new file mode 100644 index 0000000..f0a34a3 --- /dev/null +++ b/fedora/SPECS/icinga2.spec @@ -0,0 +1,918 @@ +# Icinga 2 | (c) 2012 Icinga GmbH | GPLv2+ + +%define revision 1 + +# make sure that _rundir is working on older systems +%if ! %{defined _rundir} +%define _rundir %{_localstatedir}/run +%endif +%if ! %{defined _fillupdir} + %define _fillupdir %{_localstatedir}/adm/fillup-templates +%endif + +%define _libexecdir %{_prefix}/lib/ +%define plugindir %{_libdir}/nagios/plugins + +%if "%{_vendor}" == "redhat" +%define apachename httpd +%define apacheconfdir %{_sysconfdir}/httpd/conf.d +%define apacheuser apache +%define apachegroup apache + +%if 0%{?el6}%{?amzn} +%define use_systemd 0 +%define use_selinux 0 +%if %(uname -m) != "x86_64" +%define march_flag -march=i686 +%endif +%else +# fedora and el>=7 +%define use_systemd 1 +%define use_selinux 1 +%if 0%{?fedora} >= 24 +# for installing limits.conf on systemd >= 228 +%define configure_systemd_limits 1 +%else +%define configure_systemd_limits 0 +%endif +%endif +%endif + +%if "%{_vendor}" == "suse" +%define plugindir %{_libexecdir}/nagios/plugins +%define apachename apache2 +%define apacheconfdir %{_sysconfdir}/apache2/conf.d +%define apacheuser wwwrun +%define apachegroup www +%if 0%{?suse_version} >= 1310 +%define use_systemd 1 +%if 0%{?sle_version} >= 120200 || 0%{?suse_version} > 1320 +# for installing limits.conf on systemd >= 228 +%define configure_systemd_limits 1 +%else +%define configure_systemd_limits 0 +%endif +%else +%define use_systemd 0 +%endif +%endif + +%define icinga_user icinga +%define icinga_group icinga +%define icingacmd_group icingacmd + +# enable unity builds by default for all architectures except arm32 +%ifarch %{arm} +%bcond_with unity_build +%else +%bcond_without unity_build +%endif + +# Disable lto_build for older SUSE versions +# see https://github.com/Icinga/icinga2/issues/7149 +%if "%{_vendor}" == "suse" && 0%{?suse_version} <= 1315 +%bcond_with lto_build +%else # suse_version 1315 +%bcond_without lto_build +%endif # suse_version 1315 + +%bcond_with systemd_and_init +%bcond_without compat +%bcond_without livestatus +%bcond_without notification +%bcond_without perfdata +%bcond_without tests +%bcond_without mysql +%bcond_without pgsql + +%define logmsg logger -t %{name}/rpm + +%define boost_min_version 1.66 + +Summary: Network monitoring application +%if "%{_vendor}" == "suse" +License: GPL-2.0-or-later +%else +License: GPLv2+ +%endif # suse +Group: System/Monitoring +Name: icinga2 +Version: 2.12.1 +Release: %{revision}%{?dist} +Url: https://www.icinga.com/ +Source: https://github.com/Icinga/%{name}/archive/v%{version}%{?src_version_suffix}.tar.gz + +BuildRoot: %{_tmppath}/%{name}-%{version}-build +Requires: %{name}-bin = %{version}-%{release} +Requires: %{name}-common = %{version}-%{release} + +Conflicts: %{name}-common < %{version}-%{release} + +%description +Meta package for Icinga 2 Core, DB IDO and Web. + +%package bin +Summary: Icinga 2 binaries and libraries +Group: System/Monitoring + +Requires: %{name}-bin = %{version}-%{release} + +%if "%{_vendor}" == "suse" +Provides: monitoring_daemon +Recommends: monitoring-plugins +%if 0%{?suse_version} >= 1310 +BuildRequires: libyajl-devel +%endif +%endif +BuildRequires: libedit-devel +BuildRequires: ncurses-devel +%if "%{_vendor}" == "suse" && 0%{?suse_version} < 1210 +BuildRequires: gcc48-c++ +BuildRequires: libopenssl1-devel +BuildRequires: libstdc++48-devel +%else +%if "%{_vendor}" == "redhat" && (0%{?el6} || 0%{?rhel} == 6 || "%{?dist}" == ".el6") +# Requires devtoolset-7 scl +%define scl_name devtoolset-7 +%define scl_enable scl enable %{scl_name} -- +BuildRequires: %{scl_name}-binutils +BuildRequires: %{scl_name}-gcc-c++ +BuildRequires: %{scl_name}-libstdc++-devel +%else +BuildRequires: gcc-c++ +BuildRequires: libstdc++-devel +%endif +BuildRequires: openssl-devel +%endif +BuildRequires: bison +BuildRequires: cmake +BuildRequires: flex >= 2.5.35 +BuildRequires: make + +%if "%{_vendor}" == "suse" + %if 0%{?suse_version} >= 1315 + # SLES 12 and OpenSUSE 42 or later + %define boost_devel_pkg %nil + %if 0%{?suse_version} < 1320 + # before SLES 15 and OpenSUSE 15 + # Provided by packages.icinga.com + %define boost_library icinga-boost + %define boost_version 1.69 + %define boost_rpath %{_libdir}/%{boost_library} + # Note: the -impl suffix comes from current packages on OBS + %define boost_devel_suffix -impl + %endif # suse_version < 1320 +BuildRequires: libboost_context-devel%{?boost_devel_suffix} >= %{boost_min_version} +BuildRequires: libboost_coroutine-devel%{?boost_devel_suffix} >= %{boost_min_version} +BuildRequires: libboost_filesystem-devel%{?boost_devel_suffix} >= %{boost_min_version} +BuildRequires: libboost_program_options-devel%{?boost_devel_suffix} >= %{boost_min_version} +BuildRequires: libboost_regex-devel%{?boost_devel_suffix} >= %{boost_min_version} +BuildRequires: libboost_system-devel%{?boost_devel_suffix} >= %{boost_min_version} +BuildRequires: libboost_thread-devel%{?boost_devel_suffix} >= %{boost_min_version} +BuildRequires: libboost_test-devel%{?boost_devel_suffix} >= %{boost_min_version} + %else # suse_version >= 1315 + # old boost devel name + %define boost_devel_pkg boost-devel + %endif # suse_version >= 1315 +%else # vendor == suse - assuming redhat or compatible + # default boost devel package + %define boost_devel_pkg boost-devel + + %if (0%{?el6} || 0%{?rhel} == 6) + # Provided by packages.icinga.com + %define boost_library icinga-boost169 + %define boost_version 1.69 + %define boost_devel_pkg icinga-boost169-devel + %define boost_rpath %{_libdir}/%{boost_library} + %endif # el6 + %if (0%{?el7} || 0%{?rhel} == 7) + # Provided by EPEL + %define boost_library boost169 + %define boost_version 1.69 + %define boost_devel_pkg boost169-devel + %endif # el7 +%endif # vendor == suse + +%if "%{?boost_devel_pkg}" != "" +BuildRequires: %{boost_devel_pkg} >= %{boost_min_version} +%endif # boost_devel_pkg + +%if 0%{?use_systemd} +BuildRequires: systemd-devel +Requires: systemd +%endif + +Obsoletes: %{name}-libs <= 2.10.0 +Conflicts: %{name}-libs <= 2.10.0 + +%description bin +Icinga 2 is a general-purpose network monitoring application. +This subpackage provides the binaries for Icinga 2 Core. + +%package common +Summary: Common Icinga 2 configuration +Group: System/Monitoring +%if (0%{?amzn} || 0%{?fedora} || 0%{?rhel}) +Requires(pre): shadow-utils +Requires(post): shadow-utils +%endif +BuildRequires: logrotate +%if "%{_vendor}" == "suse" +PreReq: permissions +Provides: group(%{icinga_group}) +Provides: group(%{icingacmd_group}) +Provides: user(%{icinga_user}) +Requires(pre): shadow +Requires(post): shadow +# Coreutils is added because of autoyast problems reported +Requires(pre): coreutils +Requires(post): coreutils +%if 0%{?suse_version} >= 1200 +BuildRequires: monitoring-plugins-common +Requires: monitoring-plugins-common +%else +Recommends: monitoring-plugins-common +%endif +Recommends: logrotate +%endif + +%description common +This subpackage provides common directories, and the UID and GUID definitions +among Icinga 2 related packages. + + +%package doc +Summary: Documentation for Icinga 2 +Group: Documentation/Other + +%description doc +This subpackage provides documentation for Icinga 2. + + +%if %{with mysql} +%package ido-mysql +Summary: IDO MySQL database backend for Icinga 2 +Group: System/Monitoring +%if "%{_vendor}" == "suse" +BuildRequires: libmysqlclient-devel +%if 0%{?suse_version} >= 1310 +BuildRequires: mysql-devel +%endif + +%else +BuildRequires: mysql-devel +%endif #suse + +Requires: %{name}-bin = %{version}-%{release} + +%description ido-mysql +Icinga 2 IDO mysql database backend. Compatible with Icinga 1.x +IDOUtils schema >= 1.12 +%endif + + +%if %{with pgsql} +%package ido-pgsql +Summary: IDO PostgreSQL database backend for Icinga 2 +Group: System/Monitoring +%if "%{_vendor}" == "suse" && 0%{?suse_version} < 1210 +BuildRequires: postgresql-devel >= 8.4 +%else +BuildRequires: postgresql-devel +%endif +Requires: %{name}-bin = %{version}-%{release} + +%description ido-pgsql +Icinga 2 IDO PostgreSQL database backend. Compatible with Icinga 1.x +IDOUtils schema >= 1.12 +%endif + +%if 0%{?use_selinux} +%global selinux_variants mls targeted +%global selinux_modulename %{name} + +%package selinux +Summary: SELinux policy module supporting icinga2 +Group: System/Base +BuildRequires: checkpolicy +BuildRequires: hardlink +BuildRequires: selinux-policy-devel +Requires: %{name}-bin = %{version}-%{release} +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +Requires(post): policycoreutils-python-utils +Requires(postun): policycoreutils-python-utils +%else +Requires(post): policycoreutils-python +Requires(postun): policycoreutils-python +%endif + + +%description selinux +SELinux policy module supporting icinga2. +%endif + +%package -n vim-icinga2 +Summary: Vim syntax highlighting for icinga2 +Group: Productivity/Text/Editors +%if "%{_vendor}" == "suse" +BuildRequires: vim +Requires: vim +%else +Requires: vim-filesystem +%endif + +%description -n vim-icinga2 +Provides Vim syntax highlighting for icinga2. + + +%package -n nano-icinga2 +Summary: Nano syntax highlighting for icinga2 +Group: Productivity/Text/Editors +Requires: nano + +%description -n nano-icinga2 +Provides Nano syntax highlighting for icinga2. + +%prep +%setup -q -n %{name}-%{version}%{?src_version_suffix} +# use absolute shebang instead of env on SUSE distributions +%if "%{_vendor}" == "suse" +find . -type f -name '*.sh' -exec sed -i -e 's|\/usr\/bin\/env bash|\/bin\/bash|g' {} \; +%endif + +# quick & dirty hack for SLES11 & Kernel < 2.9 w/o SO_REUSEPORT +%if "%{_vendor}" == "suse" && 0%{?suse_version} < 1210 +find . -type f -name tcpsocket.cpp -exec sed -i -e 's|.*SO_REUSEPORT.*||g' {} \; +%endif + +%build +# set basedir to allow cache to hit between different builds +# this will make all paths below BUILD/icinga2-x.x.x relative for cache +export CCACHE_BASEDIR="${CCACHE_BASEDIR:-$(pwd)}" + +CMAKE_OPTS="-DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_SYSCONFDIR=/etc \ + -DCMAKE_INSTALL_LOCALSTATEDIR=/var \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DBoost_NO_BOOST_CMAKE=ON \ + -DICINGA2_PLUGINDIR=%{plugindir} \ + -DICINGA2_RUNDIR=%{_rundir} \ + -DICINGA2_SYSCONFIGFILE=/etc/sysconfig/icinga2 \ + -DICINGA2_USER=%{icinga_user} \ + -DICINGA2_GROUP=%{icinga_group} \ + -DICINGA2_COMMAND_GROUP=%{icingacmd_group}" +%if 0%{?fedora} +CMAKE_OPTS="$CMAKE_OPTS -DICINGA2_WITH_STUDIO=true" +%endif + +%if %{with unity_build} +CMAKE_OPTS="$CMAKE_OPTS -DICINGA2_UNITY_BUILD=ON" +%else +CMAKE_OPTS="$CMAKE_OPTS -DICINGA2_UNITY_BUILD=OFF" +%endif +%if %{with lto_build} +CMAKE_OPTS="$CMAKE_OPTS -DICINGA2_LTO_BUILD=ON" +%else +CMAKE_OPTS="$CMAKE_OPTS -DICINGA2_LTO_BUILD=OFF" +%endif +%if %{with systemd_and_init} +CMAKE_OPTS="$CMAKE_OPTS -DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=ON" +%else +CMAKE_OPTS="$CMAKE_OPTS -DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=OFF" +%endif +%if %{with compat} +CMAKE_OPTS="$CMAKE_OPTS -DICINGA2_WITH_COMPAT=ON" +%else +CMAKE_OPTS="$CMAKE_OPTS -DICINGA2_WITH_COMPAT=OFF" +%endif +%if %{with livestatus} +CMAKE_OPTS="$CMAKE_OPTS -DICINGA2_WITH_LIVESTATUS=ON" +%else +CMAKE_OPTS="$CMAKE_OPTS -DICINGA2_WITH_LIVESTATUS=OFF" +%endif +%if %{with notification} +CMAKE_OPTS="$CMAKE_OPTS -DICINGA2_WITH_NOTIFICATION=ON" +%else +CMAKE_OPTS="$CMAKE_OPTS -DICINGA2_WITH_NOTIFICATION=OFF" +%endif +%if %{with perfdata} +CMAKE_OPTS="$CMAKE_OPTS -DICINGA2_WITH_PERFDATA=ON" +%else +CMAKE_OPTS="$CMAKE_OPTS -DICINGA2_WITH_PERFDATA=OFF" +%endif +%if %{with tests} +CMAKE_OPTS="$CMAKE_OPTS -DICINGA2_WITH_TESTS=ON" +%else +CMAKE_OPTS="$CMAKE_OPTS -DICINGA2_WITH_TESTS=OFF" +%endif +%if %{with mysql} +CMAKE_OPTS="$CMAKE_OPTS -DICINGA2_WITH_MYSQL=ON" +%else +CMAKE_OPTS="$CMAKE_OPTS -DICINGA2_WITH_MYSQL=OFF" +%endif +%if %{with pgsql} +CMAKE_OPTS="$CMAKE_OPTS -DICINGA2_WITH_PGSQL=ON" +%else +CMAKE_OPTS="$CMAKE_OPTS -DICINGA2_WITH_PGSQL=OFF" +%endif + +%if (0%{?el6} || 0%{?rhel} == 6) +# Explicitly link against rt, because ld doesn't detect it automatically +CMAKE_OPTS="$CMAKE_OPTS -DCMAKE_EXE_LINKER_FLAGS=-lrt" +%endif # el6 + +%if "%{?boost_rpath}" != "" +CMAKE_OPTS="$CMAKE_OPTS -DCMAKE_INSTALL_RPATH=%{boost_rpath}" +%endif # boost_rpath + +%if "%{?boost_library}" != "" +# Boost_NO_BOOST_CMAKE=ON - disable search for cmake +# Boost_NO_SYSTEM_PATHS=ON - only search in specified locations +CMAKE_OPTS="$CMAKE_OPTS + -DBoost_NO_BOOST_CMAKE=TRUE \ + -DBoost_NO_SYSTEM_PATHS=TRUE \ + -DBOOST_LIBRARYDIR=%{_libdir}/%{boost_library} \ + -DBOOST_INCLUDEDIR=/usr/include/%{boost_library} \ + -DBoost_ADDITIONAL_VERSIONS='%{boost_version};%{boost_version}.0'" +%endif # boost_library + +%if 0%{?use_systemd} +CMAKE_OPTS="$CMAKE_OPTS -DUSE_SYSTEMD=ON" +%endif + +%if "%{_vendor}" == "suse" && 0%{?suse_version} < 1210 +# from package gcc48-c++ +export CC=gcc-4.8 +export CXX=g++-4.8 +%endif + +%if "%{?_buildhost}" != "" +CMAKE_OPTS="$CMAKE_OPTS -DICINGA2_BUILD_HOST_NAME:STRING=%_buildhost" +%endif + +%{?scl_enable} cmake $CMAKE_OPTS -DCMAKE_C_FLAGS:STRING="%{optflags} %{?march_flag}" -DCMAKE_CXX_FLAGS:STRING="%{optflags} %{?march_flag}" . + +%{?scl_enable} make %{?_smp_mflags} + +%if 0%{?use_selinux} +cd tools/selinux +for selinuxvariant in %{selinux_variants} +do + make NAME=${selinuxvariant} -f /usr/share/selinux/devel/Makefile + mv %{selinux_modulename}.pp %{selinux_modulename}.pp.${selinuxvariant} + make NAME=${selinuxvariant} -f /usr/share/selinux/devel/Makefile clean +done +cd - +%endif + +%install +%{?scl_enable} make install \ + DESTDIR="%{buildroot}" + +# install custom limits.conf for systemd +%if 0%{?configure_systemd_limits} +# for > 2.8 or > 2.7.2 +install -D -m 0644 etc/initsystem/icinga2.service.limits.conf %{buildroot}/etc/systemd/system/%{name}.service.d/limits.conf +%endif + +# remove features-enabled symlinks +rm -f %{buildroot}/%{_sysconfdir}/%{name}/features-enabled/*.conf + +# enable suse rc links +%if "%{_vendor}" == "suse" +%if 0%{?use_systemd} + ln -sf /usr/sbin/service %{buildroot}%{_sbindir}/rc%{name} +%else + ln -sf ../../%{_initrddir}/%{name} "%{buildroot}%{_sbindir}/rc%{name}" +%endif +mkdir -p "%{buildroot}%{_fillupdir}/" +mv "%{buildroot}%{_sysconfdir}/sysconfig/%{name}" "%{buildroot}%{_fillupdir}/sysconfig.%{name}" +%endif + +%if 0%{?use_selinux} +cd tools/selinux +for selinuxvariant in %{selinux_variants} +do + install -d %{buildroot}%{_datadir}/selinux/${selinuxvariant} + install -p -m 644 %{selinux_modulename}.pp.${selinuxvariant} \ + %{buildroot}%{_datadir}/selinux/${selinuxvariant}/%{selinux_modulename}.pp +done +cd - + +# TODO: Fix build problems on Icinga, see https://github.com/Icinga/puppet-icinga_build/issues/11 +#/usr/sbin/hardlink -cv %%{buildroot}%%{_datadir}/selinux +%endif + +%if "%{_vendor}" == "suse" +install -D -m 0644 tools/syntax/vim/syntax/%{name}.vim %{buildroot}%{_datadir}/vim/site/syntax/%{name}.vim +install -D -m 0644 tools/syntax/vim/ftdetect/%{name}.vim %{buildroot}%{_datadir}/vim/site/ftdetect/%{name}.vim +%else +install -D -m 0644 tools/syntax/vim/syntax/%{name}.vim %{buildroot}%{_datadir}/vim/vimfiles/syntax/%{name}.vim +install -D -m 0644 tools/syntax/vim/ftdetect/%{name}.vim %{buildroot}%{_datadir}/vim/vimfiles/ftdetect/%{name}.vim +%endif + +install -D -m 0644 tools/syntax/nano/%{name}.nanorc %{buildroot}%{_datadir}/nano/%{name}.nanorc + +%check +export CTEST_OUTPUT_ON_FAILURE=1 +make test + +%pre +%if "%{_vendor}" == "suse" +%if 0%{?use_systemd} + %service_add_pre %{name}.service +%endif + +%verifyscript +%verify_permissions -e %{_rundir}/%{name}/cmd +%endif + +%post +# suse +%if "%{_vendor}" == "suse" +%if 0%{?suse_version} >= 1310 +%set_permissions %{_rundir}/%{name}/cmd +%endif + +%if 0%{?use_systemd} +%fillup_only %{name} +%service_add_post %{name}.service +%else +%fillup_and_insserv %{name} +%endif + +if [ ${1:-0} -eq 1 ] +then + # initial installation, enable default features + for feature in checker notification mainlog; do + ln -sf ../features-available/${feature}.conf %{_sysconfdir}/%{name}/features-enabled/${feature}.conf + done +fi + +exit 0 + +%else +# rhel + +%if 0%{?use_systemd} +%systemd_post %{name}.service +%else +/sbin/chkconfig --add %{name} +%endif + +if [ ${1:-0} -eq 1 ] +then + # initial installation, enable default features + for feature in checker notification mainlog; do + ln -sf ../features-available/${feature}.conf %{_sysconfdir}/%{name}/features-enabled/${feature}.conf + done +fi + +exit 0 + +%endif +# suse/rhel + +%preun +# suse +%if "%{_vendor}" == "suse" + +%if 0%{?use_systemd} + %service_del_preun %{name}.service +%else + %stop_on_removal %{name} +%endif + +exit 0 + +%else +# rhel + +%if 0%{?use_systemd} +%systemd_preun %{name}.service +%else +if [ "$1" = "0" ]; then + /sbin/service %{name} stop > /dev/null 2>&1 || : + /sbin/chkconfig --del %{name} || : +fi +%endif + +exit 0 + +%endif +# suse / rhel + +%postun +# suse +%if "%{_vendor}" == "suse" +%if 0%{?use_systemd} + %service_del_postun %{name}.service +%else + %restart_on_update %{name} + %insserv_cleanup +%endif + +%else +# rhel + +%if 0%{?use_systemd} +%systemd_postun_with_restart %{name}.service +%else +if [ "$1" -ge "1" ]; then + /sbin/service %{name} condrestart >/dev/null 2>&1 || : +fi +%endif + +%endif +# suse / rhel + +if [ "$1" = "0" ]; then + # deinstallation of the package - remove enabled features + rm -rf %{_sysconfdir}/%{name}/features-enabled +fi + +exit 0 + +%pre common +getent group %{icinga_group} >/dev/null || %{_sbindir}/groupadd -r %{icinga_group} +getent group %{icingacmd_group} >/dev/null || %{_sbindir}/groupadd -r %{icingacmd_group} +getent passwd %{icinga_user} >/dev/null || %{_sbindir}/useradd -c "icinga" -s /sbin/nologin -r -d %{_localstatedir}/spool/%{name} -G %{icingacmd_group} -g %{icinga_group} %{icinga_user} + +%if "%{_vendor}" == "suse" +%verifyscript common +%verify_permissions -e %{_rundir}/%{name}/cmd +%endif + +%post common +%if "%{_vendor}" == "suse" +%if 0%{?suse_version} >= 1310 +%set_permissions %{_rundir}/%{name}/cmd +%endif +%endif + +%post ido-mysql +if [ ${1:-0} -eq 1 ] && [ -e %{_sysconfdir}/%{name}/features-enabled/ido-mysql.conf ] +then + # initial installation, enable ido-mysql feature + ln -sf ../features-available/ido-mysql.conf %{_sysconfdir}/%{name}/features-enabled/ido-mysql.conf +fi + +exit 0 + +%postun ido-mysql +if [ "$1" = "0" ]; then + # deinstallation of the package - remove feature + rm -f %{_sysconfdir}/%{name}/features-enabled/ido-mysql.conf +fi + +exit 0 + +%post ido-pgsql +if [ ${1:-0} -eq 1 ] && [ -e %{_sysconfdir}/%{name}/features-enabled/ido-pgsql.conf ] +then + # initial installation, enable ido-pgsql feature + ln -sf ../features-available/ido-pgsql.conf %{_sysconfdir}/%{name}/features-enabled/ido-pgsql.conf +fi + +exit 0 + +%postun ido-pgsql +if [ "$1" = "0" ]; then + # deinstallation of the package - remove feature + rm -f %{_sysconfdir}/%{name}/features-enabled/ido-pgsql.conf +fi + +exit 0 + +%if 0%{?use_selinux} +%post selinux +for selinuxvariant in %{selinux_variants} +do + /usr/sbin/semodule -s ${selinuxvariant} -i \ + %{_datadir}/selinux/${selinuxvariant}/%{selinux_modulename}.pp &> /dev/null || : +done +/sbin/fixfiles -R icinga2 restore &> /dev/null || : +/sbin/fixfiles -R icinga2-bin restore &> /dev/null || : +/sbin/fixfiles -R icinga2-common restore &> /dev/null || : +/sbin/semanage port -a -t icinga2_port_t -p tcp 5665 &> /dev/null || : + +%postun selinux +if [ $1 -eq 0 ] ; then + /sbin/semanage port -d -t icinga2_port_t -p tcp 5665 &> /dev/null || : + for selinuxvariant in %{selinux_variants} + do + /usr/sbin/semodule -s ${selinuxvariant} -r %{selinux_modulename} &> /dev/null || : + done + /sbin/fixfiles -R icinga2 restore &> /dev/null || : + /sbin/fixfiles -R icinga2-bin restore &> /dev/null || : + /sbin/fixfiles -R icinga2-common restore &> /dev/null || : +fi +%endif + + +%files +%defattr(-,root,root,-) +%doc COPYING + +%config(noreplace) %{_sysconfdir}/logrotate.d/%{name} + +%if 0%{?use_systemd} +%attr(644,root,root) %{_unitdir}/%{name}.service +%if 0%{?configure_systemd_limits} +%dir /etc/systemd/system/%{name}.service.d +%attr(644,root,root) %config(noreplace) /etc/systemd/system/%{name}.service.d/limits.conf +%endif +%else +%attr(755,root,root) %config(noreplace) %{_sysconfdir}/init.d/%{name} +%endif +%if "%{_vendor}" == "suse" +%{_sbindir}/rc%{name} +%{_fillupdir}/sysconfig.%{name} +%else +%config(noreplace) %{_sysconfdir}/sysconfig/%{name} +%endif + +%{_sbindir}/%{name} + +%dir %{_libexecdir}/%{name} +%{_libexecdir}/%{name}/prepare-dirs +%{_libexecdir}/%{name}/safe-reload + +%attr(0750,%{icinga_user},%{icinga_group}) %dir %{_sysconfdir}/%{name} +%attr(0750,%{icinga_user},%{icinga_group}) %dir %{_sysconfdir}/%{name}/conf.d +%attr(0750,%{icinga_user},%{icinga_group}) %dir %{_sysconfdir}/%{name}/features-available +%exclude %{_sysconfdir}/%{name}/features-available/ido-*.conf +%attr(0750,%{icinga_user},%{icinga_group}) %dir %{_sysconfdir}/%{name}/features-enabled +%attr(0750,%{icinga_user},%{icinga_group}) %dir %{_sysconfdir}/%{name}/scripts +%attr(0750,%{icinga_user},%{icinga_group}) %dir %{_sysconfdir}/%{name}/zones.d +%config(noreplace) %attr(0640,%{icinga_user},%{icinga_group}) %{_sysconfdir}/%{name}/%{name}.conf +%config(noreplace) %attr(0640,%{icinga_user},%{icinga_group}) %{_sysconfdir}/%{name}/constants.conf +%config(noreplace) %attr(0640,%{icinga_user},%{icinga_group}) %{_sysconfdir}/%{name}/zones.conf +%config(noreplace) %attr(0640,%{icinga_user},%{icinga_group}) %{_sysconfdir}/%{name}/conf.d/*.conf +%config(noreplace) %attr(0640,%{icinga_user},%{icinga_group}) %{_sysconfdir}/%{name}/features-available/*.conf +%config(noreplace) %attr(0640,%{icinga_user},%{icinga_group}) %{_sysconfdir}/%{name}/zones.d/* +%config(noreplace) %{_sysconfdir}/%{name}/scripts/* + +%attr(0750,%{icinga_user},%{icingacmd_group}) %{_localstatedir}/cache/%{name} +%attr(0750,%{icinga_user},%{icingacmd_group}) %dir %{_localstatedir}/log/%{name} +%attr(0750,%{icinga_user},%{icinga_group}) %dir %{_localstatedir}/log/%{name}/crash +%attr(0750,%{icinga_user},%{icingacmd_group}) %dir %{_localstatedir}/log/%{name}/compat +%attr(0750,%{icinga_user},%{icingacmd_group}) %dir %{_localstatedir}/log/%{name}/compat/archives +%attr(0750,%{icinga_user},%{icinga_group}) %{_localstatedir}/lib/%{name} +%attr(0750,%{icinga_user},%{icingacmd_group}) %ghost %dir %{_rundir}/%{name} +%attr(2750,%{icinga_user},%{icingacmd_group}) %ghost %{_rundir}/%{name}/cmd +%attr(0750,%{icinga_user},%{icinga_group}) %dir %{_localstatedir}/spool/%{name} +%attr(0770,%{icinga_user},%{icinga_group}) %dir %{_localstatedir}/spool/%{name}/perfdata +%attr(0750,%{icinga_user},%{icinga_group}) %dir %{_localstatedir}/spool/%{name}/tmp + +%files bin +%defattr(-,root,root,-) +%doc COPYING README.md NEWS AUTHORS CHANGELOG.md +%dir %{_libdir}/%{name} +%dir %{_libdir}/%{name}/sbin +%{_libdir}/%{name}/sbin/%{name} +%{plugindir}/check_nscp_api +%{_datadir}/%{name} +%exclude %{_datadir}/%{name}/include +%{_mandir}/man8/%{name}.8.gz + +%files common +%defattr(-,root,root,-) +%doc COPYING README.md NEWS AUTHORS CHANGELOG.md tools/syntax +%{_sysconfdir}/bash_completion.d/%{name} +%attr(0750,%{icinga_user},%{icinga_group}) %dir %{_datadir}/%{name}/include +%{_datadir}/%{name}/include/* + +%files doc +%defattr(-,root,root,-) +%{_datadir}/doc/%{name} +%docdir %{_datadir}/doc/%{name} + +%if %{with mysql} +%files ido-mysql +%defattr(-,root,root,-) +%doc COPYING README.md NEWS AUTHORS CHANGELOG.md +%config(noreplace) %attr(0640,%{icinga_user},%{icinga_group}) %{_sysconfdir}/%{name}/features-available/ido-mysql.conf +%{_libdir}/%{name}/libmysql_shim* +%{_datadir}/icinga2-ido-mysql +%endif + +%if %{with pgsql} +%files ido-pgsql +%defattr(-,root,root,-) +%doc COPYING README.md NEWS AUTHORS CHANGELOG.md +%config(noreplace) %attr(0640,%{icinga_user},%{icinga_group}) %{_sysconfdir}/%{name}/features-available/ido-pgsql.conf +%{_libdir}/%{name}/libpgsql_shim* +%{_datadir}/icinga2-ido-pgsql +%endif + +%if 0%{?use_selinux} +%files selinux +%defattr(-,root,root,0755) +%doc tools/selinux/* +%{_datadir}/selinux/*/%{selinux_modulename}.pp +%endif + +%files -n vim-icinga2 +%defattr(-,root,root,-) +%if "%{_vendor}" == "suse" +%{_datadir}/vim/site/syntax/%{name}.vim +%{_datadir}/vim/site/ftdetect/%{name}.vim +%else +%{_datadir}/vim/vimfiles/syntax/%{name}.vim +%{_datadir}/vim/vimfiles/ftdetect/%{name}.vim +%endif + +%files -n nano-icinga2 +%defattr(-,root,root,-) +%if "%{_vendor}" == "suse" +%dir %{_datadir}/nano +%endif +%{_datadir}/nano/%{name}.nanorc + +%changelog +* Tue Oct 13 2020 Alexander A. Klimov 2.12.1-1 +- Update to 2.12.1 + +* Wed Aug 05 2020 Henrik Triem 2.12.0-1 +- Update to 2.12.0 + +* Fri Mar 13 2020 Noah Hilverling 2.12.0-0.rc1.1 +- Update to 2.12.0-rc1 + +* Thu Oct 24 2019 Michael Friedrich 2.11.2-1 +- Update to 2.11.2 + +* Thu Oct 17 2019 Michael Friedrich 2.11.1-1 +- Update to 2.11.1 + +* Thu Sep 19 2019 Michael Friedrich 2.11.0-1 +- Update to 2.11.0 + +* Thu Jul 25 2019 Markus Frosch 2.11.0-0.rc1.1 +- Prepare pre-release 2.11.0-rc1 + +* Tue Mar 19 2019 Michael Friedrich 2.10.4-1 +- Update to 2.10.4 + +* Tue Feb 26 2019 Michael Friedrich 2.10.3-2 +- Apply quickfix for SLES11 + +* Tue Feb 26 2019 Michael Friedrich 2.10.3-1 +- Update to 2.10.3 + +* Wed Nov 14 2018 Michael Friedrich 2.10.2-1 +- Update to 2.10.2 + +* Thu Oct 18 2018 Michael Friedrich 2.10.1-1 +- Update to 2.10.1 + +* Thu Oct 11 2018 Michael Friedrich 2.10.0-1 +- Update to 2.10.0 + +* Wed Sep 26 2018 Michael Friedrich 2.9.2-1 +- Update to 2.9.2 + +* Wed Jul 25 2018 Markus Frosch 2.10.0-0 +- Remove obsoleted icinga2-libs package + +* Tue Jul 24 2018 Michael Friedrich 2.9.1-1 +- Update to 2.9.1 + +* Tue Jul 17 2018 Michael Friedrich 2.9.0-1 +- Update to 2.9.0 + +* Wed Apr 25 2018 Jean Flach 2.8.4-1 +- Update to 2.8.4 + +* Tue Apr 24 2018 Jean Flach 2.8.3-1 +- Update to 2.8.3 + +* Thu Mar 22 2018 Jean Flach 2.8.2-1 +- Update to 2.8.2 + +* Wed Jan 17 2018 Gunnar Beutner 2.8.1-1 +- Update to 2.8.1 + +* Fri Nov 24 2017 Markus Frosch 2.8.0-2 +- [SLES] Add systemd limits file +- Add config(noreplace) for the systemd limits file + (no need to release every OS immediately) +- Update SELinux handling to be compatible to Fedora 27 + (only affecting f27 builds) + +* Thu Nov 16 2017 Jean Flach 2.8.0-1 +- Update to 2.8.0 + +* Thu Nov 09 2017 Gunnar Beutner 2.7.2-1 +- Update to 2.7.2 + +* Mon Oct 02 2017 Markus Frosch 2.7.1-2 +- Fixing systemd limit issues on openSUSE > 42.1 + +* Thu Sep 21 2017 Michael Friedrich 2.7.1-1 +- Update to 2.7.1 + +* Tue Jun 20 2017 Markus Frosch 2.7.0-1 +- Update to 2.7.0 diff --git a/fedora/SPECS/icingaweb2.spec b/fedora/SPECS/icingaweb2.spec new file mode 100644 index 0000000..35e7fb7 --- /dev/null +++ b/fedora/SPECS/icingaweb2.spec @@ -0,0 +1,481 @@ +# Icinga Web 2 | (c) 2013-2017 Icinga Development Team | GPLv2+ + +%define revision 1 + +Name: icingaweb2 +Version: 2.8.2 +Release: %{revision}%{?dist} +Summary: Icinga Web 2 +Group: Applications/System +License: GPLv2+ and MIT and BSD +URL: https://icinga.com +Source0: icingaweb2-2.8.2.orig.tar.gz +BuildArch: noarch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release} +Packager: Icinga Team + +%if 0%{?fedora} || 0%{?rhel} || 0%{?amzn} +%if 0%{?rhel} == 7 +%define php_scl rh-php73 +%endif +%if 0%{?rhel} == 6 +%define php_scl rh-php70 +%endif + +%if 0%{?el5}%{?el6}%{?amzn} +%define use_selinux 0 +%else +%define use_selinux 1 +%endif + +%if 0%{?php_scl:1} +%define php_scl_prefix %{php_scl}- +%define php_runtime %{php_scl_prefix}php-fpm +%define php_bin /opt/rh/%{php_scl}/root/usr/bin/php +%define php_fpm 1 +%else +%define php_runtime %{php} +%endif + +%define php %{?php_scl_prefix}php +%define php_cli %{php}-cli +%define php_common %{php}-common +%define wwwconfigdir %{_sysconfdir}/httpd/conf.d +%define wwwuser apache + +# extra requirements on RHEL +Requires: %{php}-mysqlnd +Requires: %{php}-pgsql +Requires: %{php}-ldap +%endif + +# minimum required PHP version +%define php_version 5.6.0 + +%if 0%{?suse_version} +%define wwwconfigdir %{_sysconfdir}/apache2/conf.d +%define wwwuser wwwrun +%define php php +%define php_runtime mod_php_any +%define php_common %{php} +%define php_cli %{php} +# conflict with older PHP on SLES and openSUSE +Conflicts: php < %{php_version} +Conflicts: php5 < %{php_version} +Conflicts: php53 +%endif + +%{?amzn:Requires(pre): shadow-utils} +%{?fedora:Requires(pre): shadow-utils} +%{?rhel:Requires(pre): shadow-utils} +%{?suse_version:Requires(pre): pwdutils} + +Requires: %{php_runtime} >= %{php_version} +Requires: %{php_common} >= %{php_version} +%if 0%{?suse_version} +Requires: apache2 +%endif + +Requires: icinga-l10n +Requires: icingacli = %{version}-%{release} +Requires: %{name}-common = %{version}-%{release} +Requires: php-Icinga = %{version}-%{release} +Requires: %{name}-vendor-dompdf = %{version}-%{release} +Requires: %{name}-vendor-HTMLPurifier = 1:%{version}-%{release} +Requires: %{name}-vendor-JShrink = %{version}-%{release} +Requires: %{name}-vendor-lessphp = %{version}-%{release} +Requires: %{name}-vendor-Parsedown = %{version}-%{release} + +%define basedir %{_datadir}/%{name} +%define bindir %{_bindir} +%define configdir %{_sysconfdir}/%{name} +%define logdir %{_localstatedir}/log/%{name} +%define phpdir %{_datadir}/php +%define icingawebgroup icingaweb2 +%define docsdir %{_datadir}/doc/%{name} + + +%description +Icinga Web 2 + + +%package common +Summary: Common files for Icinga Web 2 and the Icinga CLI +Group: Applications/System +%{?amzn:Requires(pre): shadow-utils} +%{?fedora:Requires(pre): shadow-utils} +%{?rhel:Requires(pre): shadow-utils} +%{?suse_version:Requires(pre): pwdutils} +%if 0%{?suse_version} > 1320 +Requires(pre): system-user-wwwrun +%endif + +%description common +Common files for Icinga Web 2 and the Icinga CLI + + +%package -n php-Icinga +Summary: Icinga Web 2 PHP library +Group: Development/Libraries +Requires: %{php_common} >= %{php_version} +Requires: %{php}-gd %{php}-intl %{php}-mbstring +%{?rhel:Requires: %{php}-pdo %{php}-xml} +%if 0%{?rhel} >= 8 || 0%{?fedora} >= 30 +Requires: %{php}-json +%endif rhel >= 8 || fedora >= 30 +Requires: %{name}-vendor-zf1 = %{version}-%{release} +%{?amzn:Requires: %{php}-pecl-imagick} +%{?fedora:Requires: php-pecl-imagick} +%{?suse_version:Requires: %{php}-gettext %{php}-json %{php}-openssl %{php}-posix} + +%description -n php-Icinga +Icinga Web 2 PHP library + + +%package -n icingacli +Summary: Icinga CLI +Group: Applications/System +Requires: icinga-l10n +Requires: %{name}-common = %{version}-%{release} +Requires: php-Icinga = %{version}-%{release} +Requires: bash-completion +Requires: %{php_cli} >= %{php_version} +%if 0%{?suse_version} +# conflict with older PHP on SLES and openSUSE +Conflicts: php < %{php_version} +Conflicts: php5 < %{php_version} +Conflicts: php53 +%endif + + +%description -n icingacli +Icinga CLI + + +%if 0%{?use_selinux} +%define selinux_variants mls targeted + +%package selinux +Summary: SELinux policy for Icinga Web 2 +BuildRequires: checkpolicy, selinux-policy-devel, hardlink +Requires: %{name} = %{version}-%{release} +Requires(post): policycoreutils +Requires(postun): policycoreutils + +%description selinux +SELinux policy for Icinga Web 2 +%endif + + +%package vendor-dompdf +Summary: Icinga Web 2 vendor library dompdf +Group: Development/Libraries +License: LGPLv2.1 +Requires: %{php_common} >= %{php_version} +Requires: %{name}-common = %{version}-%{release} + +%description vendor-dompdf +Icinga Web 2 vendor library dompdf + + +%package vendor-HTMLPurifier +Epoch: 1 +Summary: Icinga Web 2 vendor library HTMLPurifier +Group: Development/Libraries +License: LGPLv2.1 +Requires: %{php_common} >= %{php_version} +Requires: %{name}-common = %{version}-%{release} + +%description vendor-HTMLPurifier +Icinga Web 2 vendor library HTMLPurifier + + +%package vendor-JShrink +Summary: Icinga Web 2 vendor library JShrink +Group: Development/Libraries +License: BSD +Requires: %{php_common} >= %{php_version} +Requires: %{name}-common = %{version}-%{release} + +%description vendor-JShrink +Icinga Web 2 vendor library JShrink + + +%package vendor-lessphp +Summary: Icinga Web 2 vendor library lessphp +Group: Development/Libraries +License: MIT +Requires: %{php_common} >= %{php_version} +Requires: %{name}-common = %{version}-%{release} + +%description vendor-lessphp +Icinga Web 2 vendor library lessphp + + +%package vendor-Parsedown +Summary: Icinga Web 2 vendor library Parsedown +Group: Development/Libraries +License: MIT +Requires: %{php_common} >= %{php_version} +Requires: %{name}-common = %{version}-%{release} + +%description vendor-Parsedown +Icinga Web 2 vendor library Parsedown + + +%package vendor-zf1 +Summary: Icinga Web 2's fork of Zend Framework 1 +Group: Development/Libraries +License: BSD +Requires: %{php_common} >= %{php_version} +Obsoletes: %{name}-vendor-Zend < 1.12.20 +Requires: %{name}-common = %{version}-%{release} + +%description vendor-zf1 +Icinga Web 2's fork of Zend Framework 1 + + +%prep +%setup -q +%if 0%{?use_selinux} +mkdir selinux +cp -p packages/selinux/icingaweb2.{fc,if,te} selinux +%endif + +%build +%if 0%{?use_selinux} +cd selinux +for selinuxvariant in %{selinux_variants} +do + make NAME=${selinuxvariant} -f /usr/share/selinux/devel/Makefile + mv icingaweb2.pp icingaweb2.pp.${selinuxvariant} + make NAME=${selinuxvariant} -f /usr/share/selinux/devel/Makefile clean +done +cd - +%endif + +%install +rm -rf %{buildroot} +mkdir -p %{buildroot}/{%{basedir}/{modules,library/vendor,public},%{bindir},%{configdir}/modules,%{logdir},%{phpdir},%{wwwconfigdir},%{_sysconfdir}/bash_completion.d,%{docsdir}} +cp -prv application doc %{buildroot}/%{basedir} +cp -pv etc/bash_completion.d/icingacli %{buildroot}/%{_sysconfdir}/bash_completion.d/icingacli +cp -prv modules/{monitoring,setup,doc,translation} %{buildroot}/%{basedir}/modules +cp -prv library/Icinga %{buildroot}/%{phpdir} +cp -prv library/vendor/{dompdf,HTMLPurifier*,JShrink,lessphp,Parsedown,Zend} %{buildroot}/%{basedir}/library/vendor +cp -prv public/{css,font,img,js,error_norewrite.html,error_unavailable.html} %{buildroot}/%{basedir}/public +%if 0%{?php_fpm:1} +cp -pv packages/files/apache/icingaweb2.fpm.conf %{buildroot}/%{wwwconfigdir}/icingaweb2.conf +%else +cp -pv packages/files/apache/icingaweb2.conf %{buildroot}/%{wwwconfigdir}/icingaweb2.conf +%endif +cp -pv packages/files/bin/icingacli %{buildroot}/%{bindir} +%if 0%{?php_bin:1} +sed -i '1 s~#!.*~#!%{php_bin}~' %{buildroot}/%{bindir}/icingacli +%endif +cp -pv packages/files/public/index.php %{buildroot}/%{basedir}/public +cp -prv etc/schema %{buildroot}/%{docsdir} +cp -prv packages/files/config/modules/{setup,translation} %{buildroot}/%{configdir}/modules +%if 0%{?use_selinux} +cd selinux +for selinuxvariant in %{selinux_variants} +do + install -d %{buildroot}%{_datadir}/selinux/${selinuxvariant} + install -p -m 644 icingaweb2.pp.${selinuxvariant} %{buildroot}%{_datadir}/selinux/${selinuxvariant}/icingaweb2.pp +done +cd - +# TODO: Fix build problems on Icinga, see https://github.com/Icinga/puppet-icinga_build/issues/11 +#/usr/sbin/hardlink -cv %{buildroot}%{_datadir}/selinux +%endif + +%pre +getent group icingacmd >/dev/null || groupadd -r icingacmd +%if 0%{?suse_version} && 0%{?suse_version} < 01200 +usermod -A icingacmd,%{icingawebgroup} %{wwwuser} +%else +usermod -a -G icingacmd,%{icingawebgroup} %{wwwuser} +%endif +exit 0 + +%clean +rm -rf %{buildroot} + +%files +%defattr(-,root,root) +%{basedir}/application/controllers +%{basedir}/application/fonts +%{basedir}/application/forms +%{basedir}/application/layouts +%{basedir}/application/views +%{basedir}/application/VERSION +%{basedir}/doc +%{basedir}/modules +%{basedir}/public +%if 0%{?suse_version} +# for lint on OBS +%dir %{dirname:%{wwwconfigdir}} +%dir %{wwwconfigdir} +%endif +%config(noreplace) %{wwwconfigdir}/icingaweb2.conf +%attr(2775,root,%{icingawebgroup}) %dir %{logdir} +%attr(2770,root,%{icingawebgroup}) %config(noreplace) %dir %{configdir}/modules/setup +%attr(0660,root,%{icingawebgroup}) %config(noreplace) %{configdir}/modules/setup/config.ini +%attr(2770,root,%{icingawebgroup}) %config(noreplace) %dir %{configdir}/modules/translation +%attr(0660,root,%{icingawebgroup}) %config(noreplace) %{configdir}/modules/translation/config.ini +%{docsdir} +%docdir %{docsdir} + + +%pre common +getent group %{icingawebgroup} >/dev/null || groupadd -r %{icingawebgroup} +exit 0 + +%files common +%defattr(-,root,root) +%dir %{basedir} +%dir %{basedir}/application +%dir %{basedir}/library +%dir %{basedir}/library/vendor +%dir %{basedir}/modules +%{basedir}/application/locale +%attr(2770,root,%{icingawebgroup}) %config(noreplace) %dir %{configdir} +%attr(2770,root,%{icingawebgroup}) %config(noreplace) %dir %{configdir}/modules + + +%files -n php-Icinga +%defattr(-,root,root) +%if 0%{?suse_version} +# for lint on OBS +%dir %{phpdir} +%endif +%{phpdir}/Icinga + + +%files -n icingacli +%defattr(-,root,root) +%{basedir}/application/clicommands +%{_sysconfdir}/bash_completion.d/icingacli +%attr(0755,root,root) %{bindir}/icingacli + + +%if 0%{?use_selinux} +%post selinux +for selinuxvariant in %{selinux_variants} +do + %{_sbindir}/semodule -s ${selinuxvariant} -i %{_datadir}/selinux/${selinuxvariant}/icingaweb2.pp &> /dev/null || : +done +%{_sbindir}/restorecon -R %{basedir} &> /dev/null || : +%{_sbindir}/restorecon -R %{configdir} &> /dev/null || : +%{_sbindir}/restorecon -R %{logdir} &> /dev/null || : + +%postun selinux +if [ $1 -eq 0 ] ; then + for selinuxvariant in %{selinux_variants} + do + %{_sbindir}/semodule -s ${selinuxvariant} -r icingaweb2 &> /dev/null || : + done + [ -d %{basedir} ] && %{_sbindir}/restorecon -R %{basedir} &> /dev/null || : + [ -d %{configdir} ] && %{_sbindir}/restorecon -R %{configdir} &> /dev/null || : + [ -d %{logdir} ] && %{_sbindir}/restorecon -R %{logdir} &> /dev/null || : +fi + +%files selinux +%defattr(-,root,root,0755) +%doc selinux/* +%{_datadir}/selinux/*/icingaweb2.pp +%endif + + +%files vendor-dompdf +%defattr(-,root,root) +%{basedir}/library/vendor/dompdf + + +%files vendor-HTMLPurifier +%defattr(-,root,root) +%{basedir}/library/vendor/HTMLPurifier +%{basedir}/library/vendor/HTMLPurifier.autoload.php +%{basedir}/library/vendor/HTMLPurifier.php + + +%files vendor-JShrink +%defattr(-,root,root) +%{basedir}/library/vendor/JShrink + + +%files vendor-lessphp +%defattr(-,root,root) +%{basedir}/library/vendor/lessphp + + +%files vendor-Parsedown +%defattr(-,root,root) +%{basedir}/library/vendor/Parsedown + + +%files vendor-zf1 +%defattr(-,root,root) +%{basedir}/library/vendor/Zend + +%changelog +* Tue Aug 18 2020 Johannes Meyer 2.8.2-1 +- Update to 2.8.2 + +* Mon Jun 29 2020 Johannes Meyer 2.8.1-1 +- Update to 2.8.1 + +* Mon Jun 8 2020 Johannes Meyer 2.8.0-1 +- Update to 2.8.0 +- Add new requirement for package icinga-l10n +- [EPEL 7] We now require PHP 7.3 instead of PHP 7.1 +- Please check uprading docs at /usr/share/icingaweb2/doc/80-Upgrading.md + +* Fri Oct 18 2019 Johannes Meyer 2.7.3-1 +- Update to 2.7.3 + +* Wed Oct 16 2019 Johannes Meyer 2.7.2-1 +- Update to 2.7.2 + +* Wed Aug 14 2019 Johannes Meyer 2.7.1-1 +- Update to 2.7.1 + +* Tue Jul 30 2019 Johannes Meyer 2.7.0-1 +- Update to 2.7.0 + +* Wed Apr 24 2019 Johannes Meyer 2.6.3-1 +- Update to 2.6.3 + +* Wed Nov 21 2018 Eric Lippmann 2.6.2-1 +- Update to 2.6.2 + +* Thu Aug 02 2018 Eric Lippmann 2.6.1-1 +- Update to 2.6.1 + +* Thu Jul 19 2018 Blerim Sheqa 2.6.0-1 +- Update to 2.6.0 + +* Fri Apr 27 2018 Eric Lippmann 2.5.3-1 +- Update to 2.5.3 + +* Thu Apr 26 2018 Eric Lippmann 2.5.2-1 +- Update to 2.5.2 + +* Mon Jan 22 2018 Markus Frosch 2.5.1-1 +- Update to 2.5.1 +- Remove FPM patches + +* Wed Nov 29 2017 Eric Lippmann 2.5.0-2 +- FPM: Add patch to support both Apache >= 2.4 and Apache < 2.4 + +* Tue Nov 28 2017 Eric Lippmann 2.5.0-1 +- Install error_unavailable.html +- Add patch to fix Apache FPM config + +* Mon Nov 27 2017 Markus Frosch 2.5.0-1 +- Update to 2.5.0 +- All packages now require PHP >= 5.6 +- [EPEL 6 + 7] We now require PHP 7 from SCL packages, php-fpm as runtime engine +- [SUSE / openSUSE] Requirements will force the installation of php7 +- Please check upgrading docs at /usr/share/icingaweb2/doc/80-Upgrading.md + +* Thu Sep 28 2017 Markus Frosch 2.4.2-1 +- Update to 2.4.2 diff --git a/fedora/SPECS/l10n.spec b/fedora/SPECS/l10n.spec new file mode 100644 index 0000000..09f5c56 --- /dev/null +++ b/fedora/SPECS/l10n.spec @@ -0,0 +1,114 @@ +# Icinga L10n | (c) 2020 Icinga GmbH + +%define revision 1 +%define basedir %{_datadir}/icinga-L10n + +%if 0%{?el5}%{?el6}%{?amzn}%{?suse_version} +%define use_selinux 0 +%else +%define use_selinux 1 +%define selinux_variants mls targeted +%endif + + +Name: icinga-l10n +Version: 1.0.0 +Release: %{revision}%{?dist} +Summary: Icinga L10n +License: GPLv2+ +URL: https://icinga.com +Source0: https://github.com/Icinga/L10n/archive/v%{version}.tar.gz +Source1: selinux.tgz +BuildArch: noarch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release} +Packager: Icinga GmbH + + +%prep +%setup -q -n L10n-1.0.0 +tar xzf %{S:1} + +%build +%if 0%{?use_selinux} +cd selinux +for selinuxvariant in %{selinux_variants} +do + make NAME=${selinuxvariant} -f /usr/share/selinux/devel/Makefile + mv icinga-l10n.pp icinga-l10n.pp.${selinuxvariant} + make NAME=${selinuxvariant} -f /usr/share/selinux/devel/Makefile clean +done +cd - +%endif + +%install +mkdir -p %{buildroot}/%{basedir} +cp *.md %{buildroot}/%{basedir} +cp COPYING %{buildroot}/%{basedir} +cp -prv locale %{buildroot}/%{basedir} +find %{buildroot}/%{basedir}/locale -name *.po -delete +%if 0%{?use_selinux} +cd selinux +for selinuxvariant in %{selinux_variants} +do + install -d %{buildroot}%{_datadir}/selinux/${selinuxvariant} + install -p -m 644 icinga-l10n.pp.${selinuxvariant} %{buildroot}%{_datadir}/selinux/${selinuxvariant}/icinga-l10n.pp +done +cd - +%endif + +%clean +rm -rf %{buildroot} + + +# Main package +%description +L10n (short for Localization) provides all translations available for Icinga. + +%files +%defattr(-,root,root) +%{basedir} +%doc README.md +%doc CONTRIBUTING.md + + +# Selinux package +%if 0%{?use_selinux} + +%package selinux +Summary: SELinux policy for Icinga L10n +BuildRequires: checkpolicy, selinux-policy-devel +Requires: %{name} = %{version}-%{release} +Requires(post): policycoreutils +Requires(postun): policycoreutils + +%description selinux +SELinux policy for Icinga L10n + +%post selinux +for selinuxvariant in %{selinux_variants} +do + %{_sbindir}/semodule -s ${selinuxvariant} -i %{_datadir}/selinux/${selinuxvariant}/icinga-l10n.pp &> /dev/null || : +done +%{_sbindir}/restorecon -R %{basedir} &> /dev/null || : + +%postun selinux +if [ $1 -eq 0 ] ; then + for selinuxvariant in %{selinux_variants} + do + %{_sbindir}/semodule -s ${selinuxvariant} -r icinga-l10n &> /dev/null || : + done + [ -d %{basedir} ] && %{_sbindir}/restorecon -R %{basedir} &> /dev/null || : +fi + +%files selinux +%defattr(-,root,root,0755) +%doc selinux/* +%{_datadir}/selinux/*/icinga-l10n.pp + +%endif + + +%changelog +* Mon Jun 8 2020 Johannes Meyer 1.0.0-1 +- Initial release + From a2a7b55ece0f84c2909ca2ee3b0602d3817bfa1a Mon Sep 17 00:00:00 2001 From: Daniel Steiner Date: Sun, 29 Nov 2020 08:35:49 +0100 Subject: [PATCH 54/56] New Gitea version --- fedora/SPECS/gitea.spec | 95 ++++++++--------------------------------- 1 file changed, 17 insertions(+), 78 deletions(-) diff --git a/fedora/SPECS/gitea.spec b/fedora/SPECS/gitea.spec index 2827ed8..4e0429e 100644 --- a/fedora/SPECS/gitea.spec +++ b/fedora/SPECS/gitea.spec @@ -1,5 +1,5 @@ Name: gitea -Version: 1.12.3 +Version: 1.12.6 Release: 1%{?dist} Summary: Gitea is a painless self-hosted Git service. %define MyVersion %version @@ -82,89 +82,28 @@ getent passwd gitea > /dev/null || \ %changelog -* Fri Aug 14 2020 Daniel Steiner +* Sun Nov 29 2020 Daniel Steiner +- Update to version 1.12.6. + +* Sat Oct 31 2020 Daniel Steiner +- First build for Fedora 33. + +* Thu Oct 22 2020 Daniel Steiner +- Update to version 1.12.5. + +* Sat Sep 19 2020 Daniel Steiner +- Update to version 1.12.4. + +* Fri Aug 14 2020 Daniel Steiner - Update to version 1.12.3. -* Fri Jul 17 2020 Daniel Steiner +* Fri Jul 17 2020 Daniel Steiner - Update to version 1.12.2. -* Fri Jul 3 2020 Daniel Steiner +* Fri Jul 3 2020 Daniel Steiner - Update to version 1.12.1. -* Sun Jun 14 2020 Daniel Steiner +* Sun Jun 14 2020 Daniel Steiner - Update to version 1.11.6. - Fix for frontend JS location. -* Fri May 15 2020 Daniel Steiner -- Update to version 1.11.5. - -* Fri Mar 27 2020 Daniel Steiner -* Fri Apr 10 2020 Daniel Steiner -- Update to version 1.11.4. - -* Fri Mar 27 2020 Daniel Steiner -- Update to version 1.11.3. - -* Sat Feb 22 2020 Daniel Steiner -- Update to version 1.11.1. - -* Sat Jan 25 2020 Daniel Steiner -- Update to version 1.10.3. - -* Fri Jan 17 2020 Daniel Steiner -- Update to version 1.10.2. - -* Fri Nov 22 2019 Daniel Steiner -- Update to version 1.10.0. - -* Fri Oct 18 2019 Daniel Steiner -- Update to version 1.9.4. - -* Sat Sep 21 2019 Daniel Steiner -- Update to version 1.9.3. - -* Fri Aug 16 2019 Daniel Steiner -- Update to version 1.9.1. - -* Fri Aug 2 2019 Daniel Steiner -- Update to version 1.9.0. - -* Mon Jun 3 2019 Daniel Steiner -- Update to version 1.8.2. - -* Sat May 11 2019 Daniel Steiner -- Update to version 1.8.1. - -* Sun Apr 28 2019 Daniel Steiner -- Update to version 1.8.0. - -* Sun Apr 7 2019 Daniel Steiner -- Update to version 1.7.5. - -* Fri Mar 15 2019 Daniel Steiner -- Update to version 1.7.4. - -* Wed Feb 27 2019 Daniel Steiner -- Update to version 1.7.3. - -* Sat Feb 16 2019 Daniel Steiner -- Update to version 1.7.2. - -* Wed Jan 30 2019 Daniel Steiner -- Update to version 1.7.0. - -* Fri Jan 18 2019 Daniel Steiner -- Update to version 1.6.4. - -* Mon Dec 10 2018 Daniel Steiner -- Update to version 1.6.1. - -* Mon Dec 3 2018 Daniel Steiner -- Update to version 1.6.0. - -* Tue Nov 13 2018 Daniel Steiner -- Update to RC1. - -* Sun Oct 28 2018 Daniel Steiner -- initial setup for CentOS 7. - From 4160616442483b5431d1028db8c80c24fa5bcea0 Mon Sep 17 00:00:00 2001 From: Daniel Steiner Date: Sun, 29 Nov 2020 08:56:32 +0100 Subject: [PATCH 55/56] Version updates for nginx and openidc --- fedora/SPECS/mod_auth_openidc.spec | 8 +++++++- fedora/SPECS/nginx.spec | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/fedora/SPECS/mod_auth_openidc.spec b/fedora/SPECS/mod_auth_openidc.spec index 21e3b24..4f3ca88 100644 --- a/fedora/SPECS/mod_auth_openidc.spec +++ b/fedora/SPECS/mod_auth_openidc.spec @@ -14,7 +14,7 @@ %global httpd_pkg_cache_dir /var/cache/httpd/mod_auth_openidc Name: mod_auth_openidc -Version: 2.4.4.1 +Version: 2.4.5 Release: 1%{?dist} Summary: OpenID Connect auth module for Apache HTTP Server @@ -94,6 +94,12 @@ install -m 700 -d $RPM_BUILD_ROOT%{httpd_pkg_cache_dir}/cache %dir %attr(0700, apache, apache) %{httpd_pkg_cache_dir}/cache %changelog +* Sun Nov 29 2020 Daniel Steiner +- Update to 2.4.5. + +* Sat Oct 31 2020 Daniel Steiner +- First build on Fedora 33. + * Sat Sep 5 2020 Daniel Steiner - Update to 2.4.4.1. diff --git a/fedora/SPECS/nginx.spec b/fedora/SPECS/nginx.spec index 18be8e9..5959c0a 100644 --- a/fedora/SPECS/nginx.spec +++ b/fedora/SPECS/nginx.spec @@ -19,7 +19,7 @@ Name: nginx Epoch: 1 -Version: 1.19.2 +Version: 1.19.5 Release: 1%{?dist} Summary: A high performance web server and reverse proxy server @@ -569,6 +569,12 @@ fi [ "%{_builddir}" != "/" ] && [ -d "%{_builddir}" ] && rm -rf %{_builddir}/* %changelog +* Sun Nov 29 2020 Daniel Steiner +- Updated to mainline version 1.19.5. + +* Sat Oct 31 2020 Daniel Steiner +- Updated to mainline version 1.19.4, first build for Fedora 33. + * Fri Sep 4 2020 Daniel Steiner - Updated to mainline version 1.19.2. From b0738d3c52f2eac9ca880a16df515ae479136165 Mon Sep 17 00:00:00 2001 From: Daniel Steiner Date: Sun, 29 Nov 2020 09:02:22 +0100 Subject: [PATCH 56/56] Version updated --- centos/SPECS/mod_auth_openidc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/centos/SPECS/mod_auth_openidc.spec b/centos/SPECS/mod_auth_openidc.spec index 21e3b24..41fb257 100644 --- a/centos/SPECS/mod_auth_openidc.spec +++ b/centos/SPECS/mod_auth_openidc.spec @@ -14,7 +14,7 @@ %global httpd_pkg_cache_dir /var/cache/httpd/mod_auth_openidc Name: mod_auth_openidc -Version: 2.4.4.1 +Version: 2.4.5 Release: 1%{?dist} Summary: OpenID Connect auth module for Apache HTTP Server @@ -94,6 +94,9 @@ install -m 700 -d $RPM_BUILD_ROOT%{httpd_pkg_cache_dir}/cache %dir %attr(0700, apache, apache) %{httpd_pkg_cache_dir}/cache %changelog +* Sun Nov 29 2020 Daniel Steiner +- Update to 2.4.5. + * Sat Sep 5 2020 Daniel Steiner - Update to 2.4.4.1.