From 074f6aee3632e3127af5902d2233d8e9c55c6c33 Mon Sep 17 00:00:00 2001 From: Peter Bieringer Date: Feb 04 2016 07:15:31 +0000 Subject: conditionally set compiler option -Wno-unused-const-variable --- diff --git a/.gitignore b/.gitignore index 99d8abe..e7165c3 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ ipv6calc-0.73.0.tar.gz /ipv6calc-0.99.0.tar.gz /ipv6calc-0.99.1.tar.gz /ipv6calc-0.99.1-2016-02-03.patch +/ipv6calc-0.99.1-2016-02-04.patch diff --git a/ipv6calc.spec b/ipv6calc.spec index ffb3ae5..fa132fd 100644 --- a/ipv6calc.spec +++ b/ipv6calc.spec @@ -8,7 +8,7 @@ Summary: IPv6 address format change and calculation utility Name: ipv6calc Version: 0.99.1%{?headtag} -Release: 14%{?dist} +Release: 15%{?dist} Group: Applications/Text URL: http://www.deepspace6.net/projects/%{name}.html License: GPLv2 @@ -18,14 +18,15 @@ BuildRequires: perl(Digest::MD5), perl(Digest::SHA1), perl(URI::Escape) BuildRequires: perl(strict), perl(warnings) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %if %{enable_shared} -Provides: ipv6calc-libs = %{version}-%{release}} +Provides: ipv6calc-libs = %{version}-%{release}} %else -Conflicts: ipv6calc-libs +Conflicts: ipv6calc-libs %endif BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch0: ipv6calc-0.99.1-2016-02-03.patch +Patch1: ipv6calc-0.99.1-2016-02-04.patch # mod_ipv6calc related %{!?_httpd_apxs: %{expand: %%global _httpd_apxs %%{_sbindir}/apxs}} @@ -136,7 +137,7 @@ Default restricts access to localhost %if %{enable_mod_ipv6calc} %package mod_ipv6calc -Summary: Apache module for ipv6calc +Summary: Apache module for ipv6calc Group: Applications/Internet BuildRequires: httpd-devel psmisc curl Requires: httpd >= 2.4.0 @@ -164,6 +165,7 @@ By default the module is disabled. %prep %setup -q %patch0 +%patch1 %configure \ %{?enable_ip2location:--enable-ip2location} \ @@ -223,7 +225,7 @@ install -d %{buildroot}%{_sysconfdir}/httpd/conf.d install -d %{buildroot}%{_localstatedir}/www/cgi-bin install ipv6calcweb/ipv6calcweb.conf %{buildroot}%{_sysconfdir}/httpd/conf.d -install -m 555 ipv6calcweb/ipv6calcweb.cgi %{buildroot}%{_localstatedir}/www/cgi-bin +install -m 755 ipv6calcweb/ipv6calcweb.cgi %{buildroot}%{_localstatedir}/www/cgi-bin %clean @@ -262,6 +264,8 @@ rm -rf %{buildroot} %{external_db} # examples +%attr(755,-,-) %{_datadir}/%{name}/examples/*/*.pl +%attr(755,-,-) %{_datadir}/%{name}/examples/*/*.sh %{_datadir}/%{name}/examples/* @@ -275,7 +279,7 @@ rm -rf %{buildroot} %defattr(644,root,root,755) -%attr(555,-,-) %{_localstatedir}/www/cgi-bin/ipv6calcweb.cgi +%attr(755,-,-) %{_localstatedir}/www/cgi-bin/ipv6calcweb.cgi %config(noreplace) %{_sysconfdir}/httpd/conf.d/ipv6calcweb.conf @@ -293,7 +297,18 @@ rm -rf %{buildroot} %attr(755,-,-) %{_httpd_moddir}/mod_ipv6calc.so +%post +/usr/sbin/ldconfig + + +%postun +/usr/sbin/ldconfig + + %changelog +* Thu Feb 04 2016 Peter Bieringer - 0.99.1-15 +- minor fixes to make fedpkg lint happy + * Wed Feb 03 2016 Peter Bieringer - 0.99.1-14 - conditionally set compiler option -Wno-unused-const-variable diff --git a/sources b/sources index 314302a..60061f9 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ aa3c0bb7267bc98d50c12f6b5ca4504f ipv6calc-0.99.1.tar.gz 9971edf0bbd6621d32c9c43be8206128 ipv6calc-0.99.1-2016-02-03.patch +50fda4a6002cc2857e37138fbd79506e ipv6calc-0.99.1-2016-02-04.patch