diff --git a/ChangeLog b/ChangeLog index 567fdc8..1612152 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,9 @@ Changes with v1.0.1 + *) Split mod_magick.h into a devel RPM package. [Graham + Leggett] + *) Prevent spurious warnings when handling empty bodies, such as those from 304 Not Modified requests. [Graham Leggett] diff --git a/Makefile.am b/Makefile.am index 7999ef3..284755f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -11,8 +11,12 @@ all-local: install-exec-local: if test -z "$${LIBEXECDIR}"; then LIBEXECDIR=`$(APXS) -q LIBEXECDIR`; fi;\ + if test -z "$${INCLUDEDIR}"; then INCLUDEDIR=`$(APXS) -q includedir`; fi;\ \ mkdir -p $(DESTDIR)$${LIBEXECDIR}; \ + mkdir -p $(DESTDIR)$${INCLUDEDIR}; \ + \ + $(INSTALL) mod_magick.h $(DESTDIR)$${INCLUDEDIR}; \ \ $(APXS) -S LIBEXECDIR=$(DESTDIR)`$(APXS) -q LIBEXECDIR` -c -i $(DEF_LDLIBS) -Wc,"$(CFLAGS)" -Wc,"$(AM_CFLAGS)" -Wl,"$(LDFLAGS)" -Wl,"$(AM_LDFLAGS)" $(LIBS) @srcdir@/mod_magick.c; \ $(APXS) -S LIBEXECDIR=$(DESTDIR)`$(APXS) -q LIBEXECDIR` -c -i $(DEF_LDLIBS) -Wc,"$(CFLAGS)" -Wc,"$(AM_CFLAGS)" -Wl,"$(LDFLAGS)" -Wl,"$(AM_LDFLAGS)" $(LIBS) @srcdir@/mod_magick_colorspace.c; \ diff --git a/configure.ac b/configure.ac index 3f6ea2e..8583dad 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) -AC_INIT(mod_magick, 1.0.0, minfrin@sharp.fm) +AC_INIT(mod_magick, 1.0.1, minfrin@sharp.fm) AM_INIT_AUTOMAKE([dist-bzip2]) AC_CONFIG_FILES([Makefile mod_magick.spec]) AC_CONFIG_SRCDIR([mod_magick.c]) diff --git a/mod_magick.spec.in b/mod_magick.spec.in index ebc13c3..2bc16be 100644 --- a/mod_magick.spec.in +++ b/mod_magick.spec.in @@ -24,13 +24,32 @@ Requires: httpd %if 0%{?is_opensuse} %define moduledir %{_libdir}/apache2 +%define includedir %{_includedir}/apache2 %else %define moduledir %{_libdir}/httpd/modules +%define includedir %{_includedir}/httpd %endif %description The Apache mod_magick filter provides image filtering for requests. +%package devel +Group: Development/Libraries +Summary: Development tools for the mod_magick provider. +%if 0%{?is_opensuse} +Requires: apache2-devel +%else +%if 0%{?mgaversion} +Requires: apache-devel +%else +Requires: httpd-devel +%endif +%endif + +%description devel +Header file for the mod_magick filter and magick bucket used to +manipulate image requests. + %prep %setup -q %build @@ -43,4 +62,6 @@ The Apache mod_magick filter provides image filtering for requests. %files %{moduledir}/%{name}*.so +%files devel +%{includedir}/mod_magick.h