rpms/tidy/devel .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 tidy.spec, 1.9, 1.10

Rex Dieter (rdieter) fedora-extras-commits at redhat.com
Mon Aug 8 18:20:37 UTC 2005


Author: rdieter

Update of /cvs/extras/rpms/tidy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8228

Modified Files:
	.cvsignore sources tidy.spec 
Log Message:
* Mon Aug  8 2005 Rex Dieter <rexdieter at sf.net> 0.99.0-5.20050803
- Update to 050803 and docs to 050705
- simplify (fedora.us bug #2071)
- drop missing manpage 



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tidy/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	17 Dec 2004 19:22:39 -0000	1.5
+++ .cvsignore	8 Aug 2005 18:20:35 -0000	1.6
@@ -1,2 +1,2 @@
-tidy_docs_041206.tgz
-tidy_src_041214.tgz
+tidy_docs_050705.tgz
+tidy_src_050803.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tidy/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	17 Dec 2004 19:22:39 -0000	1.5
+++ sources	8 Aug 2005 18:20:35 -0000	1.6
@@ -1,2 +1,2 @@
-4ac92cbb22d86ae1a42c3d56b6c3f424  tidy_docs_041206.tgz
-dc87c8acba1e71690c5104911aee6ed7  tidy_src_041214.tgz
+2e6533fc48b077ff6243deaf21a781de  tidy_docs_050705.tgz
+c923202a85b3a430b61e780e4441e5e0  tidy_src_050803.tgz


Index: tidy.spec
===================================================================
RCS file: /cvs/extras/rpms/tidy/devel/tidy.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- tidy.spec	23 May 2005 00:00:44 -0000	1.9
+++ tidy.spec	8 Aug 2005 18:20:35 -0000	1.10
@@ -1,17 +1,24 @@
-Name:           tidy
-Version:        0.99.0
-Release:        4.20041214
-
-Summary:        Utility to clean up and pretty print HTML/XHTML/XML
-
-Group:          Applications/Text
-License:        W3C Software License
-URL:            http://tidy.sourceforge.net/
-Source0:        http://tidy.sourceforge.net/src/tidy_src_041214.tgz
-Source1:        http://tidy.sourceforge.net/docs/tidy_docs_041206.tgz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  libtool, doxygen
+Name:    tidy
+Summary: Utility to clean up and pretty print HTML/XHTML/XML
+Version: 0.99.0
+Release: 5.20050803%{?dist}
+
+Group:   Applications/Text
+License: W3C Software License
+URL:     http://tidy.sourceforge.net/
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0: http://tidy.sourceforge.net/src/tidy_src_050803.tgz
+# When next snapshot is released, to become:
+#Source0: http://tidy.sourceforge.net/src/old/tidy_src_050803.tgz
+Source1: http://tidy.sourceforge.net/docs/tidy_docs_050705.tgz
+
+BuildRequires: libtool
+BuildRequires: doxygen
+
+Obsoletes: libtidy < %{version}-%{release}
+#Provides:  libtidy = %{epoch}:%{version}-%{release}
 
 %description
 When editing HTML it's easy to make mistakes. Wouldn't it be nice if
@@ -23,78 +30,82 @@
 identify where you need to pay further attention on making your pages
 more accessible to people with disabilities.
 
-%package     -n lib%{name}
-Summary:        Shared libraries for tidy
-Group:          System Environment/Libraries
-
-%description -n lib%{name}
-%{summary}.
-
-%package     -n lib%{name}-devel
-Summary:        Development files for tidy
-Group:          Development/Libraries
-Requires:       lib%{name} = %{version}-%{release}
-
-%description -n lib%{name}-devel
+%package devel
+Summary: Development files for %{name} 
+Group:   Development/Libraries
+Obsoletes: libtidy-devel < %{version}-%{release}
+#Provides:  libtidy-devel = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
+%description devel
 %{summary}.
 
 
 %prep
 %setup -q -n %{name}
+
 %setup -q -n %{name} -T -D -b1
 rm -rf htmldoc/api
 mv htmldoc/doxygen.cfg Doxyfile
 
+sh build/gnuauto/setup.sh
+
 
 %build
-sh build/gnuauto/setup.sh
-%configure --disable-dependency-tracking
+%configure \
+  --disable-static \
+  --disable-dependancy-tracking
+
 make %{?_smp_mflags}
 doxygen
 
 
 %install
 rm -rf $RPM_BUILD_ROOT _api
-make install DESTDIR=$RPM_BUILD_ROOT
-install -Dpm 644 htmldoc/man_page.txt $RPM_BUILD_ROOT%{_mandir}/man1/tidy.1
+
+make install%{!?debug_package:-strip} DESTDIR=$RPM_BUILD_ROOT
+
+#install -D -p -m644 htmldoc/man_page.txt $RPM_BUILD_ROOT%{_mandir}/man1/tidy.1
+
 mv htmldoc/api _api
 
+## Unpackaged files
+rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
-%post -n lib%{name} -p /sbin/ldconfig
+%post -p /sbin/ldconfig
 
-%postun -n lib%{name} -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
 
 
 %files
 %defattr(-,root,root,-)
 %doc htmldoc/*
-%{_bindir}/tidy
-%{_bindir}/tab2space
-%{_mandir}/man1/tidy.1*
-
-%files -n lib%{name}
-%defattr(-,root,root,-)
-%{_libdir}/libtidy*.so.*
+%{_bindir}/*
+#{_mandir}/man1/*
+%{_libdir}/lib*.so.*
 
-%files -n lib%{name}-devel
+%files devel
 %defattr(-,root,root,-)
 %doc _api/*
-%{_includedir}/*.h
-%{_libdir}/libtidy.so
-%{_libdir}/libtidy.a
-%exclude %{_libdir}/libtidy.la
+%{_includedir}/*
+%{_libdir}/lib*.so
 
 
 %changelog
+* Mon Aug  8 2005 Rex Dieter <rexdieter at sf.net> 0.99.0-5.20050803
+- Update to 050803 and docs to 050705
+- simplify (fedora.us bug #2071)
+- drop missing manpage 
+
 * Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 0.99.0-4.20041214
 - rebuild on all arches
 
 * Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
-- rebuilt
+- rebuilt       
 
 * Thu Dec 16 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.99.0-2.20041214
 - Update to 041214 and docs to 041206.




More information about the fedora-extras-commits mailing list