Skip to content

Commit

Permalink
Split mod_magick.h into a devel RPM package.
Browse files Browse the repository at this point in the history
  • Loading branch information
minfrin committed Aug 17, 2020
1 parent 0635652 commit f30bb57
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 1 deletion.
3 changes: 3 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -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]

Expand Down
4 changes: 4 additions & 0 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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; \
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -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])
Expand Down
21 changes: 21 additions & 0 deletions mod_magick.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -43,4 +62,6 @@ The Apache mod_magick filter provides image filtering for requests.
%files
%{moduledir}/%{name}*.so

%files devel
%{includedir}/mod_magick.h

0 comments on commit f30bb57

Please sign in to comment.