diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index e5a2966..0000000 --- a/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -# Makefile for source rpm: alchemist -# $Id$ -NAME := alchemist -SPECFILE = $(firstword $(wildcard *.spec)) - -include ../common/Makefile.common diff --git a/alchemist.spec b/alchemist.spec index ba5da59..8fd4b29 100644 --- a/alchemist.spec +++ b/alchemist.spec @@ -1,17 +1,19 @@ %{expand: %%define pyver %(python -c 'import sys;print(sys.version[0:3])')} -Summary: A multi-sourced configuration back-end. +Summary: A multi-sourced configuration back-end Name: alchemist Version: 1.0.37 -Release: 2%{?dist} +Release: 4%{?dist} License: GPLv2+ Group: System Environment/Base +# No URL as this project never had an upstream other than Red Hat. +# Do not use alchemist in new projects. Source0: %{name}-%{version}.tar.gz -Prereq: /sbin/ldconfig +Requires(post,postun): /sbin/ldconfig Requires: libxml2 >= 2.3.8, libxslt >= 0.9.0 Requires: python-abi = %{pyver} -BuildPreReq: libxml2 >= 2.3.8, libxslt >= 0.9.0, libxslt-devel >= 0.9.0 -BuildPreReq: doxygen >= 1.2.7, python-devel, zlib-devel +BuildRequires: libxml2 >= 2.3.8, libxslt >= 0.9.0, libxslt-devel >= 0.9.0 +BuildRequires: doxygen >= 1.2.7, python-devel, zlib-devel BuildRequires: glib2-devel >= 2.0 BuildRequires: gawk BuildRoot: %{_tmppath}/%{name}-root @@ -49,6 +51,8 @@ mkdir -p $RPM_BUILD_ROOT/%{_mandir} cd src doxygen cp -a doc/man/* $RPM_BUILD_ROOT/%{_mandir}/ +rm -f $RPM_BUILD_ROOT/%{_libdir}/*a +rm -f $RPM_BUILD_ROOT/%{_libdir}/alchemist/blackbox/*a %clean [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT @@ -70,15 +74,21 @@ cp -a doc/man/* $RPM_BUILD_ROOT/%{_mandir}/ %files devel %defattr(-,root,root) %{_includedir}/alchemist -%{_libdir}/*.a -%{_libdir}/*.la %{_libdir}/*.so %{_mandir}/*/* -%{_libdir}/alchemist/blackbox/*a %{_libdir}/alchemist/blackbox/*.so -%doc src/doc/html %changelog +* Wed Feb 13 2008 Tim Waugh 1.0.37-4 +- Converted spec file to UTF-8 (bug #225240). +- Removed use of PreReq and BuildPreReq (bug #225240). +- Fixed summary (bug #225240). +- Removed static libraries (bug #225240). + +* Tue Feb 12 2008 Tim Waugh 1.0.37-3 +- Removed HTML documentation to avoid multilib conflict (bug #340601). + Don't use alchemist in new software. + * Thu Aug 23 2007 Tim Waugh 1.0.37-2 - More specific license tag. Added dist tag. - Build requires gawk. @@ -144,22 +154,22 @@ cp -a doc/man/* $RPM_BUILD_ROOT/%{_mandir}/ * Fri Dec 13 2002 Elliot Lee 1.0.25-1 - Rebuild, fix bugs -* Wed Jul 10 2002 Trond Eivind Glomsrød 1.0.244 +* Wed Jul 10 2002 Trond Eivind Glomsrød 1.0.244 - Move the blackbox .a and .la file to the devel subpackage (#68461) -* Tue May 14 2002 Trond Eivind Glomsrød 1.0.24-1 +* Tue May 14 2002 Trond Eivind Glomsrød 1.0.24-1 - Back to Python 2.2 -* Tue Feb 26 2002 Trond Eivind Glomsrød 1.0.23-1 +* Tue Feb 26 2002 Trond Eivind Glomsrød 1.0.23-1 - rebuild -* Thu Jan 24 2002 Trond Eivind Glomsrød 1.0.22-1 +* Thu Jan 24 2002 Trond Eivind Glomsrød 1.0.22-1 - Make build with newer automake -* Thu Dec 13 2001 Trond Eivind Glomsrød 1.0.21-1 +* Thu Dec 13 2001 Trond Eivind Glomsrød 1.0.21-1 - Include .pyo files -* Fri Dec 7 2001 Trond Eivind Glomsrød 1.0.20-1 +* Fri Dec 7 2001 Trond Eivind Glomsrød 1.0.20-1 - s/Copyright/License/ - build for python 2.2 @@ -254,7 +264,7 @@ cp -a doc/man/* $RPM_BUILD_ROOT/%{_mandir}/ * Tue Feb 13 2001 Crutcher Dunnavant - rebuilt for pknirsh's moveChild fix. (He should have written this changelog!) -* Fri Feb 9 2001 Trond Eivind Glomsrød +* Fri Feb 9 2001 Trond Eivind Glomsrød - Truncate files when opening for writing (ForgeBlackBox, FileBlackBox) * Thu Feb 08 2001 Harald Hoyer @@ -269,7 +279,7 @@ cp -a doc/man/* $RPM_BUILD_ROOT/%{_mandir}/ * Wed Jan 24 2001 Crutcher Dunnavant - changed valid name to include '-' character -* Tue Jan 23 2001 Trond Eivind Glomsrød +* Tue Jan 23 2001 Trond Eivind Glomsrød - require 4Suite * Mon Jan 22 2001 Crutcher Dunnavant