packages: csstidy/csstidy.spec - up to 1.4 from debian

glen glen at pld-linux.org
Thu Dec 10 15:23:11 CET 2009


Author: glen                         Date: Thu Dec 10 14:23:11 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 1.4 from debian

---- Files affected:
packages/csstidy:
   csstidy.spec (1.9 -> 1.10) 

---- Diffs:

================================================================
Index: packages/csstidy/csstidy.spec
diff -u packages/csstidy/csstidy.spec:1.9 packages/csstidy/csstidy.spec:1.10
--- packages/csstidy/csstidy.spec:1.9	Fri Aug  3 19:24:11 2007
+++ packages/csstidy/csstidy.spec	Thu Dec 10 15:23:05 2009
@@ -1,14 +1,17 @@
 # $Revision$, $Date$
+# 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
@@ -29,22 +32,20 @@
 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
@@ -52,8 +53,6 @@
 %files
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/csstidy
-%dir %{_datadir}/%{name}
-%{_datadir}/%{name}/csstidy.layout
 %{_mandir}/man1/csstidy.1*
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -62,6 +61,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.10  2009/12/10 14:23:05  glen
+- up to 1.4 from debian
+
 Revision 1.9  2007/08/03 17:24:11  qboosh
 - pl
 - install man page from debian patch
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/csstidy/csstidy.spec?r1=1.9&r2=1.10&f=u



More information about the pld-cvs-commit mailing list