From: Elan Ruusamäe <glen@pld-linux.org>
Date: Thu, 10 Dec 2009 14:23:05 +0000 (+0000)
Subject: - up to 1.4 from debian
X-Git-Tag: auto/ac/csstidy-1_4-1~2
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fcsstidy.git;a=commitdiff_plain;h=50fcee576de94f49a2bc821a5bca627733ba7fa3

- up to 1.4 from debian

Changed files:
    csstidy.spec -> 1.10
---

diff --git a/csstidy.spec b/csstidy.spec
index d5532d5..e6be231 100644
--- a/csstidy.spec
+++ b/csstidy.spec
@@ -1,13 +1,16 @@
+# TODO
+# - optlfags
 Summary:	Open Source CSS parser and optimiser
 Summary(pl.UTF-8):	Analizator i optymalizator CSS z otwartymi źródłami
 Name:		csstidy
-Version:	1.2
+Version:	1.4
 Release:	0.3
 License:	GPL v2+
 Group:		Applications/WWW
-Source0:	http://dl.sourceforge.net/csstidy/%{name}-source-%{version}.zip
-# Source0-md5:	cd2e1e50289fdaba0c56dcb293de8c40
-Patch0:		http://ftp.debian.org/debian/pool/main/c/csstidy/%{name}_%{version}-1.diff.gz
+Source0:	http://dl.sourceforge.net/project/csstidy/CSSTidy%20%28C%2B%2B%2C%20stable%29/1.3/%{name}-source-%{version}.zip
+# Source0-md5:	7087cc0c6cfdb42a3e796621a5d12a09
+Source1:	http://ftp.debian.org/debian/pool/main/c/csstidy/%{name}_%{version}-3.diff.gz
+# Source1-md5:	8fcbf5c1c3cafd9232552b3286aabcb9
 URL:		http://csstidy.sourceforge.net/
 BuildRequires:	libstdc++-devel
 BuildRequires:	sed >= 4.0
@@ -28,22 +31,20 @@ kontrolę nad poziomem kompresji i czytelności pliku. Program nie jest
 przeznaczony do sprawdzania poprawności CSS.
 
 %prep
-%setup -qc
-%patch0 -p1
-%{__patch} -p1 < debian/patches/01_Makefiles.dpatch
-chmod +x configure
+%setup -qcT
+%{__unzip} -qq %{SOURCE0} || :
+%{__gzip} -dc %{S:1} | %{__patch} -p1
+%{__patch} -p1 < debian/patches/001_emptyfile.dpatch
+%{__patch} -p1 < debian/patches/002_gcc43fix.dpatch
 
 %build
-%configure
-%{__make}
+%scons
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT
-
-install -D csstidy.layout $RPM_BUILD_ROOT%{_datadir}/%{name}/csstidy.layout
-install -D debian/csstidy.1 $RPM_BUILD_ROOT%{_mandir}/man1/csstidy.1
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1}
+install -p release/csstidy/csstidy $RPM_BUILD_ROOT%{_bindir}/csstidy
+cp -a debian/csstidy.1 $RPM_BUILD_ROOT%{_mandir}/man1/csstidy.1
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -51,6 +52,4 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/csstidy
-%dir %{_datadir}/%{name}
-%{_datadir}/%{name}/csstidy.layout
 %{_mandir}/man1/csstidy.1*