From 6b15ed4442fb220f60771db8779abd3b638f7b46e7e6fd0357021e2c8f628ae7 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 9 Mar 2018 09:40:25 +0000 Subject: [PATCH] Accepting request 582853 from GNOME:Factory spec-cleaner (forwarded request 581286 from dimstar) OBS-URL: https://build.opensuse.org/request/show/582853 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/log4net?expand=0&rev=18 --- log4net.changes | 5 ++++ log4net.spec | 62 +++++++++++++------------------------------------ 2 files changed, 21 insertions(+), 46 deletions(-) diff --git a/log4net.changes b/log4net.changes index 35eeff5..cc444bb 100644 --- a/log4net.changes +++ b/log4net.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Feb 28 16:37:03 UTC 2018 - dimstar@opensuse.org + +- Modernize spec-file by calling spec-cleaner + ------------------------------------------------------------------- Fri Mar 1 12:45:58 UTC 2013 - dimstar@opensuse.org diff --git a/log4net.spec b/log4net.spec index 8915319..b5f4a46 100644 --- a/log4net.spec +++ b/log4net.spec @@ -1,7 +1,7 @@ # # spec file for package log4net # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -14,30 +14,23 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# icecream 0 Name: log4net -BuildRequires: mono-basic -BuildRequires: mono-data-sqlite -BuildRequires: mono-devel -BuildRequires: unzip -BuildRequires: update-desktop-files -Url: http://logging.apache.org/log4net/ -%define prefix /usr -%define sysconfdir /etc -#Requires: mono-core >= 1.1.7.7 -#Requires: mono-data >= 1.1.7.7 -#Requires: mono-web >= 1.1.7.7 Version: 1.2.10 Release: 0 Summary: A .NET framework for logging License: Apache-2.0 Group: System/Libraries +URL: http://logging.apache.org/log4net/ Source: incubating-log4net-1.2.10.zip Source1: log4net.key Source2: log4net.pc -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: mono-basic +BuildRequires: mono-data-sqlite +BuildRequires: mono-devel +BuildRequires: unzip +BuildRequires: update-desktop-files BuildArch: noarch #============================================================================= @@ -46,33 +39,15 @@ log4net is a tool to help the programmer output log statements to a variety of output targets. log4net is a port of the excellent log4j framework to the .NET runtime - - -Authors: --------- - Nicko Cadell - Niall Daley - Gert Driesen - Ron Grabowski - Julian Biddle - Daniel Cazzulino - Aspi Havewala - Rick Hobbs - Lance Nehring - Angelika Schnagl - Edward Smit - Douglas de la Torre - Thomas Voss - %prep -%setup -c -n %{name}-%{version} +%setup -q -c #============================================================================= %build export LC_CTYPE=en_US.UTF-8 cd log4net-%{version} mcs -out:../log4net.dll \ - -keyfile:%{S:1} \ + -keyfile:%{SOURCE1} \ /target:library \ /r:System.dll \ /r:System.Data.dll \ @@ -279,24 +254,19 @@ mcs -out:../log4net.dll \ src/LogManager.cs \ src/MDC.cs \ src/NDC.cs \ - src/ThreadContext.cs + src/ThreadContext.cs #============================================================================= %install -%{__rm} -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT/%{prefix}/share/pkgconfig -cp %{S:2} $RPM_BUILD_ROOT/%{prefix}/share/pkgconfig -gacutil -package log4net -gacdir /usr/lib -root ${RPM_BUILD_ROOT}/usr/lib -i log4net.dll > /dev/null -#============================================================================= - -%clean -%{__rm} -rf $RPM_BUILD_ROOT +mkdir -p %{buildroot}/%{_datadir}/pkgconfig +cp %{SOURCE2} %{buildroot}/%{_datadir}/pkgconfig +gacutil -package log4net -gacdir %{_prefix}/lib -root %{buildroot}%{_prefix}/lib -i log4net.dll > /dev/null #============================================================================= %files %defattr(755,root,root) -%{prefix}/share/pkgconfig/log4net.pc -%{prefix}/lib/mono/gac -%{prefix}/lib/mono/log4net +%{_datadir}/pkgconfig/log4net.pc +%{_prefix}/lib/mono/gac +%{_prefix}/lib/mono/log4net %changelog