[rpmfusion-free-release] Update to 29
by Nicolas Chauvet
commit c95fb9827ffc9a59334aa04872b2a40ea671e052
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Mon Mar 5 21:24:16 2018 +0100
Update to 29
rpmfusion-free-release.spec | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/rpmfusion-free-release.spec b/rpmfusion-free-release.spec
index ea9553c..9e5af9f 100644
--- a/rpmfusion-free-release.spec
+++ b/rpmfusion-free-release.spec
@@ -3,11 +3,10 @@
%global israwhide 1
Name: rpmfusion-%{repo}-release
-Version: 28
-Release: 0.3
+Version: 29
+Release: 0.1
Summary: RPM Fusion (%{repo}) Repository Configuration
-Group: System Environment/Base
License: BSD
URL: http://rpmfusion.org
Source1: rpmfusion-%{repo}.repo
@@ -90,6 +89,9 @@ ln -s $(basename %{SOURCE28}) %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY
%config(noreplace) %{_sysconfdir}/yum.repos.d/rpmfusion-%{repo}-rawhide.repo
%changelog
+* Mon Mar 05 2018 Nicolas Chauvet <kwizart(a)gmail.com> - 29-0.1
+- Bump to 29
+
* Mon Nov 13 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 28-0.3
- Add f29 key
- Remove f26 key
6 years, 8 months
[ffmpeg] Update to 20180305
by Leigh Scott
commit 6e3bbc181c8606d046fd57ca0c1f1d7d4b7ffb50
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Mon Mar 5 20:16:37 2018 +0000
Update to 20180305
.gitignore | 1 +
ffmpeg.spec | 15 ++++++++-------
sources | 2 +-
3 files changed, 10 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 405b666..afc1358 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ ffmpeg-*.tar.xz
ffmpeg-*.rpm
/ffmpeg-20180116.tar.bz2
/ffmpeg-20180211.tar.bz2
+/ffmpeg-20180305.tar.bz2
diff --git a/ffmpeg.spec b/ffmpeg.spec
index a76957d..e824bef 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -1,7 +1,7 @@
# TODO: add make test to %%check section
#global branch oldabi-
-%global date 20180211
+%global date 20180305
#global rel rc1
# Cuda and others are only available on some arches
@@ -45,9 +45,6 @@
%endif
# extras flags
-%if 0%{!?_without_nvenc:1}
-%global nvenc_cflags -I%{_includedir}/nvenc
-%endif
%if 0%{!?_cuda_version:1}
%global _cuda_version 9.1
%endif
@@ -75,7 +72,7 @@
Summary: Digital VCR and streaming server
Name: ffmpeg%{?flavor}
Version: 3.5
-Release: 0.5.%{?date}%{?date:git}%{?rel}%{?dist}
+Release: 0.6.%{?date}%{?date:git}%{?rel}%{?dist}
License: %{ffmpeg_license}
URL: http://ffmpeg.org/
%if 0%{?date}
@@ -134,7 +131,7 @@ BuildRequires: nasm
%endif
%{?_with_webp:BuildRequires: libwebp-devel}
%{?_with_netcdf:BuildRequires: netcdf-devel}
-%{!?_without_nvenc:BuildRequires: nvenc-devel}
+%{!?_without_nvenc:BuildRequires: nv-codec-headers}
%{!?_without_amr:BuildRequires: opencore-amr-devel vo-amrwbenc-devel}
%{!?_without_openal:BuildRequires: openal-soft-devel}
%if 0%{!?_without_opencl:1}
@@ -216,7 +213,7 @@ This package contains development files for %{name}
--arch=%{_target_cpu} \\\
--optflags="%{optflags}" \\\
--extra-ldflags="%{?__global_ldflags} %{?cuda_ldflags} %{?libnpp_ldlags}" \\\
- --extra-cflags="%{?nvenc_cflags} %{?cuda_cflags} %{?libnpp_cflags}" \\\
+ --extra-cflags="%{?cuda_cflags} %{?libnpp_cflags}" \\\
%{?flavor:--disable-manpages} \\\
%{?progs_suffix:--progs-suffix=%{progs_suffix}} \\\
%{?build_suffix:--build-suffix=%{build_suffix}} \\\
@@ -407,6 +404,10 @@ install -pm755 tools/qt-faststart %{buildroot}%{_bindir}
%changelog
+* Mon Mar 05 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 3.5-0.6.20180305git
+- Update to 20180305
+- Change build requires for nvenc
+
* Wed Feb 28 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 3.5-0.5.20180211git
- Rebuilt for x265
diff --git a/sources b/sources
index 19d034b..8fbdcf5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-abe62958209357f45fda48e596df4a36 ffmpeg-20180211.tar.bz2
+9178849048554d8701609fbaf8029a17 ffmpeg-20180305.tar.bz2
6 years, 8 months
[staging-kmod-addons] unmaintained
by Nicolas Chauvet
commit f356ae0661db1c8a3ec85f25063aae06b48e965b
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Mon Mar 5 20:38:13 2018 +0100
unmaintained
.gitignore | 1 -
create-linux-staging-tarball.sh | 29 ------
dead.package | 1 +
sources | 1 -
staging-kmod-addons.spec | 215 ----------------------------------------
5 files changed, 1 insertion(+), 246 deletions(-)
---
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..2e41f85
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+unmaintained
6 years, 8 months
[nrdp/el6] Initial import
by Xavier Bachelot
Summary of changes:
3588be3... Initial import (*)
(*) This commit already existed in another branch; no separate mail sent
6 years, 8 months
[nrdp/el7] Initial import
by Xavier Bachelot
Summary of changes:
3588be3... Initial import (*)
(*) This commit already existed in another branch; no separate mail sent
6 years, 8 months
[nrdp/f26] Initial import
by Xavier Bachelot
Summary of changes:
3588be3... Initial import (*)
(*) This commit already existed in another branch; no separate mail sent
6 years, 8 months
[nrdp/f27] Initial import
by Xavier Bachelot
Summary of changes:
3588be3... Initial import (*)
(*) This commit already existed in another branch; no separate mail sent
6 years, 8 months
[nrdp] Initial import
by Xavier Bachelot
commit 3588be36d03d433be9c05168b395566e34f3781b
Author: Xavier Bachelot <xavier(a)bachelot.org>
Date: Mon Mar 5 12:31:15 2018 +0100
Initial import
.gitignore | 1 +
nrdp-config.inc.php | 76 ++++++++++++++++++++++++++++++
nrdp-httpd.conf | 16 +++++++
nrdp.spec | 132 ++++++++++++++++++++++++++++++++++++++++++++++++++++
sources | 1 +
5 files changed, 226 insertions(+)
---
diff --git a/.gitignore b/.gitignore
index e69de29..e943d1a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/nrdp-1.5.1.tar.gz
diff --git a/nrdp-config.inc.php b/nrdp-config.inc.php
new file mode 100644
index 0000000..7095255
--- /dev/null
+++ b/nrdp-config.inc.php
@@ -0,0 +1,76 @@
+<?php
+//
+// NRDP Config File
+//
+// Copyright (c) 2010-2017 - Nagios Enterprises, LLC.
+// License: Nagios Open Software License <http://www.nagios.com/legal/licenses>
+//
+
+// An array of one or more tokens that are valid for this NRDP install
+// a client request must contain a valid token in order for the NRDP to response or honor the request
+// NOTE: Tokens are just alphanumeric strings - make them hard to guess!
+$cfg['authorized_tokens'] = array(
+ //"mysecrettoken", // <-- not a good token
+ //"90dfs7jwn3", // <-- a better token (don't use this exact one, make your own)
+);
+
+// By default, all authorized tokens are allowed to submit any
+// external command (unless it's disable below)
+// This is a deny mapping in the form of COMMAND => TOKEN or TOKENS
+// You can specify a whole command, or use * as a wildcard
+// Or you can specify 'all' to stop any token from using any external command
+// the tokens specified can either be a string with 1 token, or an array of 1 or more tokens
+$cfg['external_commands_deny_tokens'] = array(
+// "ACKNOWLEDGE_HOST_PROBLEM" => array("mysecrettoken", "myothertoken"),
+// "ACKNOWLEDGE_SVC_PROBLEM" => "mysecrettoken",
+// "all" => array("mysecrettoken", "myothertoken"),
+// "ACKNOWLEDGE_*" => "mysecrettoken",
+// "*_HOST_*" => array("mysecrettoken", "myothertoken"),
+);
+
+
+// Do we require that HTTPS be used to access NRDP?
+// set this value to 'false' to disable HTTPS requirement
+$cfg["require_https"] = false;
+
+// Do we require that basic authentication be used to access NRDP?
+// set this value to 'false' to disable basic auth requirement
+$cfg["require_basic_auth"] = false;
+
+// What basic authentication users are allowed to access NRDP?
+// comment this variable out to allow all authenticated users access to the NRDP
+$cfg["valid_basic_auth_users"] = array(
+ "nrdpuser"
+);
+
+// The name of the system group that has write permissions to the external command file
+// this group is also used to set file permissions when writing bulk commands or passive check results
+// NOTE: both the Apache and Nagios users must be a member of this group
+$cfg["nagios_command_group"] = "nagios";
+
+// Full path to Nagios external command file
+$cfg["command_file"] = "/var/spool/nagios/cmd/nagios.cmd";
+
+// Full path to check results spool directory
+$cfg["check_results_dir"] = "/var/log/nagios/spool/checkresults";
+
+// Should we allow external commands? Set to true or false (Boolean, not a string)
+$cfg["disable_external_commands"] = false;
+
+// Allows Nagios XI to send old check results directly into NDO if configured
+$cfg["allow_old_results"] = false;
+
+// Enable debug logging
+$cfg["debug"] = false;
+
+// Where should the logs go?
+$cfg["debug_log"] = "/usr/local/nrdp/server/debug.log";
+
+
+///////// DONT MODIFY ANYTHING BELOW THIS LINE /////////
+
+$cfg['product_name'] = 'nrdp';
+$cfg['product_version'] = '1.5.0'
+
+
+?>
diff --git a/nrdp-httpd.conf b/nrdp-httpd.conf
new file mode 100644
index 0000000..00b08b2
--- /dev/null
+++ b/nrdp-httpd.conf
@@ -0,0 +1,16 @@
+Alias /nrdp "/usr/share/nrdp/"
+<Directory "/usr/share/nrdp">
+ # ACL for Apache 2.4
+ <IfModule mod_authz_core.c>
+ Require local
+ </IfModule>
+
+ # ACL for Apache 2.2
+ <IfModule !mod_authz_core.c>
+ Order Deny,Allow
+ Deny from all
+ Allow from 127.0.0.1
+ Allow from ::1
+ </IfModule>
+</Directory>
+
diff --git a/nrdp.spec b/nrdp.spec
new file mode 100644
index 0000000..e080d72
--- /dev/null
+++ b/nrdp.spec
@@ -0,0 +1,132 @@
+# TODO: unbundle JS from server/includes
+# - jquery 3.2.1
+# - bootstrap 4.0.0-beta2
+
+Name: nrdp
+Version: 1.5.1
+Release: 4%{?dist}
+Summary: Nagios Remote Data Processor
+
+# NRDP php client is BSD
+# Bundled jquery and boostrap are MIT
+# Everything else is Nagios Open Software License (which is non-free)
+License: Nagios Open Software License and BSD and MIT
+URL: https://github.com/NagiosEnterprises/nrdp
+Source0: https://github.com/NagiosEnterprises/%{name}/archive/%{version}/%{name}-%...
+Source1: %{name}-httpd.conf
+Source2: %{name}-config.inc.php
+
+BuildArch: noarch
+
+Requires: nagios
+# For clarity since Nagios should pull them
+Requires: httpd
+Requires: mod_php
+
+Provides: bundled(js-jquery) = 3.2.1
+Provides: bundled(js-bootstrap) = 4.0.0
+
+
+%description
+Nagios Remote Data Processor (NDRP) is a flexible data transport
+mechanism and processor for Nagios. It is designed with a simple
+and powerful architecture that allows for it to be easily extended
+and customized to fit individual users needs. It uses standard ports
+protocols (HTTP(S) and XML) and can be implemented as a replacement for NSCA.
+
+
+%package client-shell
+Summary: Send NRDP shell script for Nagios
+%description client-shell
+A shell script to send NRDP data to a Nagios server.
+
+%package client-php
+Summary: Send NRDP php script for Nagios
+%description client-php
+A php script to send NRDP data to a Nagios server.
+
+%package client-python
+Summary: Send NRDP python script for Nagios
+%description client-python
+A python script to send NRDP data to a Nagios server.
+
+
+%prep
+%setup -q
+# Fix perms
+chmod a-x server/includes/bootstrap.bundle.min.js
+chmod a-x server/includes/bootstrap.min.css
+chmod a-x server/includes/jquery-3.2.1.min.js
+# Fix shebang
+sed -i -e '1d;2i#!/usr/bin/python' clients/send_nrdp.py
+# Fix EOL
+sed -i "s|\r||g" clients/send_nrdp.php
+
+
+%build
+# Nothing here
+
+
+%install
+# Server
+mkdir -p %{buildroot}%{_datadir}/%{name}/
+rm -f server/config.inc.php
+cp -pr server/* %{buildroot}%{_datadir}/%{name}/
+ln -s %{_sysconfdir}/%{name}/config.inc.php \
+ ${RPM_BUILD_ROOT}%{_datadir}/%{name}/config.inc.php
+# Server conf file
+mkdir -p %{buildroot}%{_sysconfdir}/%{name}/
+install -m 0644 -D -p %{SOURCE2} %{buildroot}%{_sysconfdir}/%{name}/config.inc.php
+# httpd conf
+mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d/
+install -m 0644 -D -p %{SOURCE1} \
+ %{buildroot}%{_sysconfdir}/httpd/conf.d/nrdp.conf
+# Client scripts
+mkdir -p %{buildroot}%{_bindir}/
+install -m 0755 -D -p clients/* %{buildroot}%{_bindir}/
+
+
+%files
+%license LICENSE.rst
+%doc CHANGES.rst README.rst
+%{_datadir}/%{name}/
+%dir %{_sysconfdir}/%{name}/
+%config(noreplace) %{_sysconfdir}/%{name}/config.inc.php
+%config(noreplace) %{_sysconfdir}/httpd/conf.d/nrdp.conf
+
+%files client-shell
+%license LICENSE.rst
+%{_bindir}/send_nrdp.sh
+
+%files client-php
+%license LICENSE.rst
+%{_bindir}/send_nrdp.php
+
+%files client-python
+%license LICENSE.rst
+%{_bindir}/send_nrdp.py
+
+
+%changelog
+* Mon Feb 26 2018 Xavier Bachelot <xavier(a)bachelot.org> 1.5.1-4
+- Clarify license.
+- Own %%{_sysconfdir}/%%{name}.
+- Requires mod_php rather than php.
+
+* Fri Feb 23 2018 Athmane Madjoudj <athmane(a)fedoraproject.org> - 1.5.1-3
+- Revamp requirements
+
+* Fri Feb 23 2018 Xavier Bachelot <xavier(a)bachelot.org> 1.5.1-2
+- More clean up.
+
+* Fri Feb 23 2018 Xavier Bachelot <xavier(a)bachelot.org> 1.5.1-1
+- Update to 1.5.1.
+- Clean up spec.
+
+* Sat Nov 21 2015 Athmane Madjoudj <athmane(a)fedoraproject.org> 0.20150122gitbd1b5d0-2
+- Use better version (pre-release)
+- Include license file in the clients sub-pkg
+- Add a license workaround
+
+* Fri Nov 20 2015 Athmane Madjoudj <athmane(a)fedoraproject.org> 0.bd1b5d0git-1
+- Initial spec file.
diff --git a/sources b/sources
index e69de29..c8b9a41 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+766b741b5d005e0546cdf6145b90273f nrdp-1.5.1.tar.gz
6 years, 8 months
[mplayer] Disable runtime cpu detection for i686
by Leigh Scott
commit a71ef72afbd28483b7c2347e108689c9f18b3a2b
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Mon Mar 5 09:12:47 2018 +0000
Disable runtime cpu detection for i686
mplayer.spec | 21 +++++++--------------
1 file changed, 7 insertions(+), 14 deletions(-)
---
diff --git a/mplayer.spec b/mplayer.spec
index 3183aa7..0c69c31 100644
--- a/mplayer.spec
+++ b/mplayer.spec
@@ -7,9 +7,9 @@
Name: mplayer
Version: 1.3.0
%if 0%{?svn}
-Release: 18.%{?pre}%{?dist}
+Release: 19.%{?pre}%{?dist}
%else
-Release: 18%{?dist}
+Release: 19%{?dist}
%endif
Summary: Movie player playing most video formats and DVDs
@@ -34,7 +34,6 @@ Patch1: %{name}-manlinks.patch
# use system FFmpeg libraries
Patch3: %{name}-ffmpeg.patch
-ExcludeArch: %{ix86}
BuildRequires: SDL-devel
BuildRequires: a52dec-devel
@@ -185,7 +184,7 @@ This package contains various scripts from MPlayer TOOLS directory.
--enable-menu \\\
--enable-radio \\\
--enable-radio-capture \\\
-%ifarch %{ix86} x86_64 ppc ppc64 \
+%ifarch x86_64 ppc ppc64 \
--enable-runtime-cpudetection \\\
%endif \
--enable-unrarexec \\\
@@ -306,16 +305,6 @@ desktop-file-install \
install -dm 755 $RPM_BUILD_ROOT%{codecdir}
-%post gui
-gtk-update-icon-cache -qf %{_datadir}/icons/hicolor &>/dev/null || :
-update-desktop-database &>/dev/null || :
-
-
-%postun gui
-gtk-update-icon-cache -qf %{_datadir}/icons/hicolor &>/dev/null || :
-update-desktop-database &>/dev/null || :
-
-
%files
%{_bindir}/mplayer
@@ -383,6 +372,10 @@ update-desktop-database &>/dev/null || :
%{_datadir}/mplayer/*.fp
%changelog
+* Mon Mar 05 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 1.3.0-19.20180119svn
+- Disable runtime cpu detection for i686
+- Remove scriptlets
+
* Thu Mar 01 2018 RPM Fusion Release Engineering <leigh123linux(a)googlemail.com> - 1.3.0-18.20180119svn
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
6 years, 8 months
