- add makefile patch and longer description from debian

Changed files:
    csstidy.spec -> 1.8

diff --git a/csstidy.spec b/csstidy.spec
index d3d6393cab1a202c6348f4827ea46268cb109a94..965130bc1e9de6abf39fedf998f9d8bce700b547 100644 (file)
--- a/csstidy.spec
+++ b/csstidy.spec
@@ -1,31 +1,39 @@
 Summary:       Opensource CSS parser and optimiser
 Name:          csstidy
 Version:       1.2
 Summary:       Opensource CSS parser and optimiser
 Name:          csstidy
 Version:       1.2

-Release:       0.2
+Release:       0.3

 License:       GPL v2
 Group:         Applications/WWW
 Source0:       http://dl.sourceforge.net/csstidy/%{name}-source-%{version}.zip
 # Source0-md5: cd2e1e50289fdaba0c56dcb293de8c40
 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

 URL:           http://csstidy.sourceforge.net/
 BuildRequires: libstdc++-devel
 BuildRequires: sed >= 4.0
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 URL:           http://csstidy.sourceforge.net/
 BuildRequires: libstdc++-devel
 BuildRequires: sed >= 4.0
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description

-Opensource CSS parser and optimiser.
+csstidy parses and optimises your CSS code, making it cleaner and more
+concise. The end result is a smaller CSS file and better written code.
+It has a variety of option settings giving the user a significant
+amount of control over the level of file compression and readability.
+It is not meant to be a css validator.

 
 %prep
 %setup -qc
 
 %prep
 %setup -qc

-sed -i -e 's,g++,%{__cxx},;s,-o,%{rpmcxxflags} -o,' compile.sh
+%patch0 -p1
+%{__patch} -p1 < debian/patches/01_Makefiles.dpatch
+chmod +x configure

 
 %build
 
 %build

-sh -x ./compile.sh
+%configure
+%{__make}

 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %install
 rm -rf $RPM_BUILD_ROOT

-install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/%{name}}
-install csstidy $RPM_BUILD_ROOT%{_bindir}
-cp -a csstidy.layout $RPM_BUILD_ROOT%{_datadir}/%{name}
+%{__make} install \
+       DESTDIR=$RPM_BUILD_ROOT
+install -D csstidy.layout $RPM_BUILD_ROOT%{_datadir}/%{name}/csstidy.layout

 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT