rpms/SILLY/F-7 .cvsignore, 1.2, 1.3 SILLY.spec, 1.1, 1.2 sources, 1.2, 1.3

[Ian Chapman (oddsocks)]

Author: oddsocks

Update of /cvs/extras/rpms/SILLY/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30484

Modified Files:
	.cvsignore SILLY.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/SILLY/F-7/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	14 Mar 2007 01:16:20 -0000	1.2
+++ .cvsignore	28 Oct 2007 21:36:39 -0000	1.3
@@ -1 +1,2 @@
 SILLY-0.1.0.tar.gz
+SILLY-DOCS-0.1.0.tar.gz


Index: SILLY.spec
===================================================================
RCS file: /cvs/extras/rpms/SILLY/F-7/SILLY.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SILLY.spec	14 Mar 2007 01:16:20 -0000	1.1
+++ SILLY.spec	28 Oct 2007 21:36:39 -0000	1.2
@@ -1,14 +1,14 @@
 Name:           SILLY
 Version:        0.1.0
-Release:        2%{?dist}
+Release:        4%{?dist}
 Summary:        Simple and easy to use library for image loading
 Group:          System Environment/Libraries
 License:        MIT
 URL:            http://www.cegui.org.uk
 Source0:        http://downloads.sourceforge.net/crayzedsgui/%{name}-%{version}.tar.gz
+Source1:        http://downloads.sourceforge.net/crayzedsgui/%{name}-DOCS-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  doxygen
-BuildRequires:  graphviz
 BuildRequires:  libpng-devel
 BuildRequires:  libjpeg-devel
 BuildRequires:  pkgconfig >= 0.9.0
@@ -34,8 +34,7 @@
 
 
 %prep
-%setup -q
-
+%setup -q -a1
 # Don't use full path, otherwise it shows buildroot as part of the path
 sed -i 's|\(FULL_PATH_NAMES[ \t][ \t]*= \)YES|\1NO|' Doxyfile
 
@@ -47,6 +46,9 @@
 # Generate developer man pages
 sed -i 's|\(GENERATE_MAN[ \t][ \t]*= \)NO|\1YES|' Doxyfile
 
+# Multiarch hack, we are now using prebuilt HTML
+sed -i 's|\(GENERATE_HTML[ \t][ \t]*= \)YES|\1NO|' Doxyfile
+
 #Fix encoding on AUTHORS
 iconv -f iso8859-1 AUTHORS -t utf8 > AUTHORS.conv && /bin/mv -f AUTHORS.conv AUTHORS
 
@@ -92,15 +94,21 @@
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/%{name}.pc
 %{_mandir}/man3/*
-%doc doc/html
+%doc %{name}-%{version}/doc/html
 
 
 %changelog
-* Sun Mar 11 2007 Ian Chapman <packages at amiga-hardware.com> 0.1.0-2%{?dist}
+* Sun Oct 28 2007 Ian Chapman <packages[AT]amiga-hardware.com> 0.1.0-4
+- Multiarch fixes (BZ 343181)
+
+* Wed Aug 22 2007 Ian Chapman <packages[AT]amiga-hardware.com> 0.1.0-3
+- Release bump for F8 mass rebuild
+
+* Sun Mar 11 2007 Ian Chapman <packages[AT]amiga-hardware.com> 0.1.0-2
 - Preserve timestamps on install
 - Changed source URL
 - Improved sed replacements
 - Changed encoding of AUTHORS to UTF-8
 
-* Mon Feb 26 2007 Ian Chapman <packages at amiga-hardware.com> 0.1.0-1%{?dist}
+* Mon Feb 26 2007 Ian Chapman <packages[AT]amiga-hardware.com> 0.1.0-1
 - Initial Release
\ No newline at end of file


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/SILLY/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Mar 2007 01:16:20 -0000	1.2
+++ sources	28 Oct 2007 21:36:39 -0000	1.3
@@ -1 +1,2 @@
 c3721547fced7792a36ffc9ce6ec23fd  SILLY-0.1.0.tar.gz
+e52e9043b21a9d35a6da66ce9e84d3e1  SILLY-DOCS-0.1.0.tar.gz