From 7604b2741a11dfcbbf29932bda55fe1ab7ebaad88afec23a95451d50083697fa Mon Sep 17 00:00:00 2001 From: Kristyna Streitova Date: Wed, 5 Oct 2016 11:43:00 +0000 Subject: [PATCH] Accepting request 432861 from home:scarabeus_iv:branches:Apache:Modules - Remove unused icon and shorten the description a bit 1-2 migration is quite irelevant in these days - Move tests to %check phase - Use proper group for devel subpackage OBS-URL: https://build.opensuse.org/request/show/432861 OBS-URL: https://build.opensuse.org/package/show/Apache:Modules/apache2-mod_perl?expand=0&rev=64 --- apache2-mod_perl.changes | 8 ++++ apache2-mod_perl.spec | 33 +++-------------- mod_perl.xpm | 80 ---------------------------------------- 3 files changed, 13 insertions(+), 108 deletions(-) delete mode 100644 mod_perl.xpm diff --git a/apache2-mod_perl.changes b/apache2-mod_perl.changes index 3b758a6..2b1b213 100644 --- a/apache2-mod_perl.changes +++ b/apache2-mod_perl.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Oct 3 11:15:45 UTC 2016 - tchvatal@suse.com + +- Remove unused icon and shorten the description a bit 1-2 migration + is quite irelevant in these days +- Move tests to %check phase +- Use proper group for devel subpackage + ------------------------------------------------------------------- Wed Dec 16 14:04:10 UTC 2015 - vcizek@suse.com diff --git a/apache2-mod_perl.spec b/apache2-mod_perl.spec index 4fc300a..5988ac5 100644 --- a/apache2-mod_perl.spec +++ b/apache2-mod_perl.spec @@ -1,7 +1,7 @@ # # spec file for package apache2-mod_perl # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,6 @@ %define srcname mod_perl - Name: apache2-mod_perl Version: 2.0.9 Release: 0 @@ -50,10 +49,9 @@ Requires: perl-Tie-IxHash Requires: perl-URI Requires: perl-libwww-perl Requires: perl(Linux::Pid) +Conflicts: mod_perl Obsoletes: mod_perl_2 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Conflicts: mod_perl -Icon: mod_perl.xpm %description The Apache/Perl integration project brings together the full power of @@ -69,29 +67,10 @@ gateway interface (CGI). mod_perl enables you to run Perl scripts in an embedded interpreter if the additional performance is needed, but may require modifications to the scripts. -Usage: - -To load the module into Apache, run the command "a2enmod perl" as root. - -To learn about the configuration, the best reference unequivocally is -http://perl.apache.org/docs/ - -For porting 1.0 applications to 2.0, the page -http://perl.apache.org/docs/2.0/user/porting/compat.html should give -the required information. - -Most mod_perl handlers use the perl-script handler. Scripts can run in -"mod_perl mode" (preconfigured for URLs starting with /perl/) or "perl -cgi mode" (preconfigured for URLs starting /cgi-perl). Plain CGI -scripts can be run via /cgi-bin/. In all these cases, the script would -be placed inside the /srv/www/cgi-bin/ directory. Refer to -%{_sysconfdir}/apache2/conf.d/mod_perl.conf about this configuration. - %package devel Summary: Embedded Perl for Apache - Development package -Group: Productivity/Networking/Web/Servers +Group: Development/Languages/Perl Requires: %{name} = %{version} -Provides: apache2-mod_perl:%{_includedir}/apache2/modules/perl/modperl_cgi.h %description devel The Apache/Perl integration project brings together the full power of @@ -108,16 +87,14 @@ software depending on apache2-mod_perl. %build perl Makefile.PL INSTALLDIRS=vendor MP_APXS=%{apache_apxs} MP_APR_CONFIG=%{_bindir}/apr-1-config MP_CCOPTS="%{apache_cflags} -fgnu89-inline" make %{?_smp_mflags} -# -# Run tests -# + +%check %if !0%{?qemu_user_space_build} mkdir t/run t/TEST -start-httpd -port select -startup_timeout 720 t/TEST -run-tests || true t/TEST -stop-httpd %endif -exit 0 %install %perl_make_install diff --git a/mod_perl.xpm b/mod_perl.xpm deleted file mode 100644 index af2ca05..0000000 --- a/mod_perl.xpm +++ /dev/null @@ -1,80 +0,0 @@ -/* XPM */ -static char *mod_perl[] = { -/* width height num_colors chars_per_pixel */ -" 90 30 43 1", -/* colors */ -". c #ffffff", -"# c #080808", -"a c #101010", -"b c #181818", -"c c #212121", -"d c #292929", -"e c #313131", -"f c #393939", -"g c #424242", -"h c #4a4a4a", -"i c #525252", -"j c #5a5a5a", -"k c #636363", -"l c #6b6b6b", -"m c #737373", -"n c #7b7b7b", -"o c #848484", -"p c #8c8c8c", -"q c #949494", -"r c #9c9c9c", -"s c #a5a5a5", -"t c #adadad", -"u c #b5b5b5", -"v c #bdbdbd", -"w c #c6c6c6", -"x c #cecece", -"y c #d6d6d6", -"z c #dedede", -"A c #e7e7e7", -"B c #efefef", -"C c #f7f7f7", -"D c #ff1000", -"E c #f73900", -"F c #ff7300", -"G c #efd600", -"H c #4a00ce", -"I c #7b00ff", -"J c #c600ff", -"K c #f700e7", -"L c #f700ad", -"M c #f70073", -"N c #ef0021", -"O c #000000", -/* pixels */ -"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", -"AOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOh", -"AOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOh", -"AOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOh", -"AOOOOOOHHIIOOOOOOOJJJJJJJKKKKOOOOOOLLLLLOOOOOOOOMMMMNNNDOOOOODDDOOOOOOEFFOOOOFFGGGGGGGGGOh", -"AOOOOOHHHIIIOOOOOOJJJOOOOOOKKKOOOOLLLOLLLOOOOOOMMMOOOONDDOOOODDDOOOOOOEFFOOOOFFGOOOOOOOOOh", -"AOOOOHHHOOIIIOOOOOJJJOOOOOOKKKOOOKLLOOOLLLOOOOOMMOOOOOOOOOOOODDDDEEEEEEFFOOOOFFGGGGGOOOOOh", -"AOOOHHHOOOOIIIOOOOJJJJJJJKKKKOOOKKLOOOOOLLMOOOOMMOOOOOOOOOOOODDDDEEEEEEFFOOOOFFGOOOOOOOOOh", -"AOOHHHHHHIIIIIJOOOJJJOOOOOOOOOOKKKLLLLLLLLMhhhhhhhOOOONDDOOOODDDOOOOOOEFFOOOOFFGOOOOOOOOOh", -"AOHHHOOOOOOOOIJJOOJJJOOOOOOOOOKKKOOOOOOOOhh.........NNNDOOOOODDDOOOOOOEFFOOOOFFGGGGGGGGGOh", -"AOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOhh..lp.........#OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOh", -"AOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOh...k#kOB...yauy.OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOh", -"AOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOh...u#nbaO...OhOql.OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOh", -"AOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOh...CdwBidkOC.#lez...OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOh", -"Ahhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh...movsqr.nOzijfj....hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh", -"A......................................AmwioqwByehlimi...................................h", -"A................................OO....eo.Asss.ucisqgf..............................OO...h", -"A................................OO...rmfctnsrukdyttOz..............................OO...h", -"A................................OO...hzibeeixkdbhsOu...............................OO...h", -"A.OO.OOO..OOO......OOOO......OOOOOO...rvgujfqmjdagnu...OO.OOO.......OOOO....OO.OOO..OO...h", -"A.OOO..OOO..OO....OO..OO....OO...OO....x#.wOsOs.Os.....OOO..OO.....OO..OO...OOOOOO..OO...h", -"A.OO...OO...OO...OO....OO..OO....OO....yf.Be.O#.Op.....OO....OO...OO...OO...OO......OO...h", -"A.OO...OO...OO...OO....OO..OO....OO....vm.Cl.Bi.jt.....OO....OO...OOOOOOO...OO......OO...h", -"A.OO...OO...OO...OO....OO..OO....OO....xt..xzBp.hC.....OO....OO...OO........OO......OO...h", -"A.OO...OO...OO...OO....OO..OO....OO....Cw...tv..nA.....OO....OO...OO........OO......OO...h", -"A.OO...OO...OO....OO..OO....OO..OOO....Cu..xhw..xw.....OO...OO.....OO..OO...OO......OO...h", -"A.OO...OO...OO.....OOOO......OOO.OO....xj..xzpB..u.....OOOOOO.......OOOO....OO......OO...h", -"A.......................................v........rs....OO................................h", -"A......................................................OO................................h", -"AhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhOOOOOOOOOOOOOOOOOhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh" -};