OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/indent?expand=0&rev=3

indent.spec

@@ -1,10 +1,17 @@
 #
-# spec file for package indent (Version 2.2.9)
+# spec file for package indent (Version 2.2.10)
 #
 # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
 #
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
@@ -12,15 +19,17 @@
 
 
 Name:           indent
-License:        GPL v2 or later
+License:        GPL v3 or later
 Group:          Development/Languages/C and C++
 AutoReqProv:    on
-Version:        2.2.9
-Release:        288
+Version:        2.2.10
+Release:        1
 Source:         %{name}-%{version}.tar.bz2
-Patch:          %{name}-%{version}-overflow.patch
-Patch1:         %{name}-%{version}-nothing_is_void.diff
-Patch2:         %{name}-%{version}-warnings.diff
+Patch0:         %{name}-%{version}-nothing_is_void.diff
+Patch1:         %{name}-%{version}-warnings.diff
+Patch2:         %{name}-%{version}-lcall.diff
+Patch3:         %{name}-%{version}-cdw.diff
+Patch4:         %{name}-%{version}-man.diff
 Url:            ftp://ftp.gnu.org/pub/gnu/indent/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Summary:        Indent Formats C Source Code
@@ -36,24 +45,29 @@ incomplete and malformed syntax.
 
 %prep
 %setup -q
-%patch
-%patch1 -p1
+%patch0 -p1
+%patch1
 %patch2
+%patch3 -p1
+%patch4
 
 %build
-export CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" 
 %configure --with-pic
+# Parallel make doesn't work
 make
 
 %install
-make DESTDIR=$RPM_BUILD_ROOT/ install
+make DESTDIR=$RPM_BUILD_ROOT install
 # indent.html is installed with %doc below
-rm $RPM_BUILD_ROOT/usr/doc/indent/indent.html
-rm $RPM_BUILD_ROOT/usr/bin/texinfo2man
-mv $RPM_BUILD_ROOT/usr/share/locale/zh_TW.Big5 \
-   $RPM_BUILD_ROOT/usr/share/locale/zh_TW
+rm -f $RPM_BUILD_ROOT/usr/doc/indent/indent.html $RPM_BUILD_ROOT%{_bindir}/texinfo2man $RPM_BUILD_ROOT/%{_infodir}/dir
+mv $RPM_BUILD_ROOT%{_datadir}/locale/zh_TW.Big5 $RPM_BUILD_ROOT%{_datadir}/locale/zh_TW
 %find_lang %{name}
 
+%check
+echo =============== TEST BEGIN ===============
+make -C regression
+echo =============== TEST  END  ===============
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -71,6 +85,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/indent.1.gz
 
 %changelog
+* Tue Aug 05 2008 prusnak@suse.cz
+- updated to 2.2.10
+  * added --indent-label and --linux-style options to control
+  indentation of goto labels and supply a canned set of settings
+  that closely matches the preferred style for the linux kernel
+  * GPLv3 is used now
+- removed obsoleted patches:
+  * overflow.patch (included in update)
 * Sun Feb 24 2008 crrodriguez@suse.de
 - use find_lang macro
 * Wed Jan 25 2006 mls@suse.de