Skip to content

Commit f30bb57

Browse files
committed
Split mod_magick.h into a devel RPM package.
1 parent 0635652 commit f30bb57

File tree

4 files changed

+29
-1
lines changed

4 files changed

+29
-1
lines changed

ChangeLog

+3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11

22
Changes with v1.0.1
33

4+
*) Split mod_magick.h into a devel RPM package. [Graham
5+
Leggett]
6+
47
*) Prevent spurious warnings when handling empty bodies, such
58
as those from 304 Not Modified requests. [Graham Leggett]
69

Makefile.am

+4
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,12 @@ all-local:
1111

1212
install-exec-local:
1313
if test -z "$${LIBEXECDIR}"; then LIBEXECDIR=`$(APXS) -q LIBEXECDIR`; fi;\
14+
if test -z "$${INCLUDEDIR}"; then INCLUDEDIR=`$(APXS) -q includedir`; fi;\
1415
\
1516
mkdir -p $(DESTDIR)$${LIBEXECDIR}; \
17+
mkdir -p $(DESTDIR)$${INCLUDEDIR}; \
18+
\
19+
$(INSTALL) mod_magick.h $(DESTDIR)$${INCLUDEDIR}; \
1620
\
1721
$(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; \
1822
$(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; \

configure.ac

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Process this file with autoconf to produce a configure script.
33

44
AC_PREREQ(2.59)
5-
AC_INIT(mod_magick, 1.0.0, [email protected])
5+
AC_INIT(mod_magick, 1.0.1, [email protected])
66
AM_INIT_AUTOMAKE([dist-bzip2])
77
AC_CONFIG_FILES([Makefile mod_magick.spec])
88
AC_CONFIG_SRCDIR([mod_magick.c])

mod_magick.spec.in

+21
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,32 @@ Requires: httpd
2424

2525
%if 0%{?is_opensuse}
2626
%define moduledir %{_libdir}/apache2
27+
%define includedir %{_includedir}/apache2
2728
%else
2829
%define moduledir %{_libdir}/httpd/modules
30+
%define includedir %{_includedir}/httpd
2931
%endif
3032

3133
%description
3234
The Apache mod_magick filter provides image filtering for requests.
3335

36+
%package devel
37+
Group: Development/Libraries
38+
Summary: Development tools for the mod_magick provider.
39+
%if 0%{?is_opensuse}
40+
Requires: apache2-devel
41+
%else
42+
%if 0%{?mgaversion}
43+
Requires: apache-devel
44+
%else
45+
Requires: httpd-devel
46+
%endif
47+
%endif
48+
49+
%description devel
50+
Header file for the mod_magick filter and magick bucket used to
51+
manipulate image requests.
52+
3453
%prep
3554
%setup -q
3655
%build
@@ -43,4 +62,6 @@ The Apache mod_magick filter provides image filtering for requests.
4362
%files
4463
%{moduledir}/%{name}*.so
4564

65+
%files devel
66+
%{includedir}/mod_magick.h
4667

0 commit comments

Comments
 (0)