packages: apache/apache-httpd.conf - The NameVirtualHost directive no longe...
Author: adamgDate: Sun Feb 26 08:46:14 2012 GMT Module: packages Tag: HEAD Log message: - The NameVirtualHost directive no longer has any effect Files affected: packages/apache: apache-httpd.conf (1.59 - 1.60) Diffs: Index: packages/apache/apache-httpd.conf diff -u packages/apache/apache-httpd.conf:1.59 packages/apache/apache-httpd.conf:1.60 --- packages/apache/apache-httpd.conf:1.59 Sat Feb 25 23:51:39 2012 +++ packages/apache/apache-httpd.conf Sun Feb 26 09:46:09 2012 @@ -100,7 +100,6 @@ # See also the BindAddress entry. # Setup default vhost (first one defined in config) and include vhosts configuration -NameVirtualHost *:80 VirtualHost *:80 ServerName localhost # ServerAdmin webmas...@host.example.com CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache/apache-httpd.conf?r1=1.59r2=1.60f=u ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: apache/apache-common.conf, apache/apache-example.net.conf, apache...
Author: adamgDate: Sun Feb 26 09:05:36 2012 GMT Module: packages Tag: HEAD Log message: - 2.4 way of access control Files affected: packages/apache: apache-common.conf (1.9 - 1.10) , apache-example.net.conf (1.4 - 1.5) , apache-httpd.conf (1.60 - 1.61) , apache-manual.conf (1.2 - 1.3) , apache-mod_authz_host.conf (1.2 - 1.3) , apache-mod_autoindex.conf (1.10 - 1.11) , apache-mod_info.conf (1.9 - 1.10) , apache-mod_proxy.conf (1.9 - 1.10) , apache-mod_status.conf (1.8 - 1.9) , apache-mod_userdir.conf (1.6 - 1.7) , apache-multilang-errordoc.conf (1.2 - 1.3) Diffs: Index: packages/apache/apache-common.conf diff -u packages/apache/apache-common.conf:1.9 packages/apache/apache-common.conf:1.10 --- packages/apache/apache-common.conf:1.9 Mon Jan 9 12:24:05 2006 +++ packages/apache/apache-common.conf Sun Feb 26 10:05:30 2012 @@ -16,8 +16,7 @@ Options FollowSymLinks AllowOverride None IfModule mod_authz_host.c - Order deny,allow - Deny from all + Require all denied /IfModule /Directory @@ -50,8 +49,7 @@ # Controls who can get stuff from this server. # IfModule mod_authz_host.c - Order allow,deny - Allow from all + Require all granted /IfModule /Directory Index: packages/apache/apache-example.net.conf diff -u packages/apache/apache-example.net.conf:1.4 packages/apache/apache-example.net.conf:1.5 --- packages/apache/apache-example.net.conf:1.4 Sun Aug 29 00:13:07 2010 +++ packages/apache/apache-example.net.conf Sun Feb 26 10:05:31 2012 @@ -18,7 +18,6 @@ # AllowOverride None # Options None # IfModule mod_authz_host.c -#Order allow,deny -#Allow from all +#Require all granted # /IfModule #/Directory Index: packages/apache/apache-httpd.conf diff -u packages/apache/apache-httpd.conf:1.60 packages/apache/apache-httpd.conf:1.61 --- packages/apache/apache-httpd.conf:1.60 Sun Feb 26 09:46:09 2012 +++ packages/apache/apache-httpd.conf Sun Feb 26 10:05:31 2012 @@ -85,8 +85,7 @@ AllowOverride None Options None IfModule mod_authz_host.c - Order allow,deny - Allow from all + Require all granted /IfModule /Directory /IfModule Index: packages/apache/apache-manual.conf diff -u packages/apache/apache-manual.conf:1.2 packages/apache/apache-manual.conf:1.3 --- packages/apache/apache-manual.conf:1.2 Wed Dec 21 14:27:28 2005 +++ packages/apache/apache-manual.conf Sun Feb 26 10:05:31 2012 @@ -12,8 +12,7 @@ Directory /home/services/httpd/manual Options Indexes AllowOverride None - Order allow,deny - Allow from all + Require all granted Files *.html SetHandler type-map Index: packages/apache/apache-mod_authz_host.conf diff -u packages/apache/apache-mod_authz_host.conf:1.2 packages/apache/apache-mod_authz_host.conf:1.3 --- packages/apache/apache-mod_authz_host.conf:1.2 Wed Dec 21 14:20:11 2005 +++ packages/apache/apache-mod_authz_host.conf Sun Feb 26 10:05:31 2012 @@ -6,7 +6,6 @@ # IfModule authz_host_module FilesMatch ^\.ht - Order allow,deny - Deny from all + Require all denied /FilesMatch /IfModule Index: packages/apache/apache-mod_autoindex.conf diff -u packages/apache/apache-mod_autoindex.conf:1.10 packages/apache/apache-mod_autoindex.conf:1.11 --- packages/apache/apache-mod_autoindex.conf:1.10 Sun Apr 3 15:22:25 2011 +++ packages/apache/apache-mod_autoindex.conf Sun Feb 26 10:05:31 2012 @@ -26,8 +26,7 @@ Options Indexes MultiViews AllowOverride None IfModule mod_authz_host.c - Order allow,deny - Allow from all + Require all granted /IfModule /Directory Index: packages/apache/apache-mod_info.conf diff -u packages/apache/apache-mod_info.conf:1.9 packages/apache/apache-mod_info.conf:1.10 --- packages/apache/apache-mod_info.conf:1.9Wed Dec 21 14:27:28 2005 +++ packages/apache/apache-mod_info.confSun Feb 26 10:05:31 2012 @@ -14,9 +14,7 @@ # Location /server-info SetHandler server-info - Order deny,allow - Deny from all - Allow from 127.0.0.1 + Require local /Location /IfModule
packages: apache/apache-mod_cache.conf - mod_disk_cache renamed to mod_cach...
Author: adamgDate: Sun Feb 26 09:25:20 2012 GMT Module: packages Tag: HEAD Log message: - mod_disk_cache renamed to mod_cache_disk - mod_mem_cache removed in 2.3.0 Files affected: packages/apache: apache-mod_cache.conf (1.6 - 1.7) Diffs: Index: packages/apache/apache-mod_cache.conf diff -u packages/apache/apache-mod_cache.conf:1.6 packages/apache/apache-mod_cache.conf:1.7 --- packages/apache/apache-mod_cache.conf:1.6 Fri Oct 30 15:15:21 2009 +++ packages/apache/apache-mod_cache.conf Sun Feb 26 10:25:14 2012 @@ -5,15 +5,12 @@ # IfModule mod_cache.c - # If you want to use mod_disk_cache instead of mod_mem_cache, - # just swap the two loadmodule comments. -# LoadModule disk_cache_module modules/mod_disk_cache.so - LoadModule mem_cache_module modules/mod_mem_cache.so + LoadModule cache_disk_module modules/mod_cache_disk.so # prevent apache from cacheing cookies CacheIgnoreHeaders Set-Cookie - IfModule mod_disk_cache.c + IfModule mod_cache_disk.c CacheRoot /var/cache/httpd CacheEnable disk / CacheDirLevels 5 @@ -23,14 +20,6 @@ # CacheMinExpire 3600 # CacheMinFileSize 64 # CacheMaxFileSize 64000 - /IfModule - - IfModule mod_mem_cache.c - CacheEnable mem / - MCacheSize 4096 - MCacheMaxObjectCount 100 - MCacheMinObjectSize 1 - MCacheMaxObjectSize 2048 /IfModule # When acting as a proxy, don't cache the list of security updates CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache/apache-mod_cache.conf?r1=1.6r2=1.7f=u ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: apache/apache.spec - merge mod_cache_disk into mod_cache package
Author: adamgDate: Sun Feb 26 09:32:26 2012 GMT
Module: packages Tag: HEAD
Log message:
- merge mod_cache_disk into mod_cache package
Files affected:
packages/apache:
apache.spec (1.651 - 1.652)
Diffs:
Index: packages/apache/apache.spec
diff -u packages/apache/apache.spec:1.651 packages/apache/apache.spec:1.652
--- packages/apache/apache.spec:1.651 Sat Feb 25 23:48:57 2012
+++ packages/apache/apache.spec Sun Feb 26 10:32:20 2012
@@ -902,16 +902,6 @@
(głównie użyteczne przy cache'owaniu lokalnej zawartości) oraz na
dysku (używane do cache'owania proxy).
-%package mod_cache_disk
-Summary: Disk based storage module for the HTTP caching filter.
-Group: Networking/Daemons/HTTP
-URL: http://httpd.apache.org/docs/2.4/mod/mod_cache_disk.html
-Requires: %{name}-base = %{version}-%{release}
-Provides: apache(mod_cache_disk) = %{version}-%{release}
-
-%description mod_cache_disk
-Disk based storage module for the HTTP caching filter.
-
%package mod_case_filter
Summary: Apache output filter that converts all output to upper case
Summary(pl.UTF-8): Filtr wyjściowy Apache'a zamieniający wszystkie litery
na wielkie
@@ -2346,7 +2336,6 @@
%if %{with bucketeer}
echo LoadModule bucketeer_module modules/mod_bucketeer.so
$CFG/00_mod_bucketeer.conf
%endif
-echo LoadModule cache_disk_module modules/mod_cache_disk.so
$CFG/00_mod_cache_disk.conf
echo LoadModule case_filter_in_module modules/mod_case_filter_in.so
$CFG/00_mod_case_filter_in.conf
echo LoadModule case_filter_modulemodules/mod_case_filter.so
$CFG/00_mod_case_filter.conf
echo LoadModule cern_meta_module modules/mod_cern_meta.so
$CFG/00_mod_cern_meta.conf
@@ -2655,7 +2644,6 @@
%module_scripts mod_bucketeer
%module_scripts mod_buffer
%module_scripts mod_cache
-%module_scripts mod_cache_disk
%module_scripts mod_case_filter
%module_scripts mod_case_filter_in
%module_scripts mod_cern_meta
@@ -3004,14 +2992,8 @@
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/conf.d/*_mod_cache.conf
%attr(755,root,root) %{_sbindir}/htcacheclean
%attr(755,root,root) %{_libexecdir}/mod_cache.so
-#%attr(755,root,root) %{_libexecdir}/mod_disk_cache.so
-#%attr(755,root,root) %{_libexecdir}/mod_mem_cache.so
-%{_mandir}/man8/htcacheclean.8*
-
-%files mod_cache_disk
-%defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/conf.d/*_mod_cache_disk.conf
%attr(755,root,root) %{_libexecdir}/mod_cache_disk.so
+%{_mandir}/man8/htcacheclean.8*
%files mod_case_filter
%defattr(644,root,root,755)
@@ -3388,6 +3370,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.652 2012/02/26 09:32:20 adamg
+- merge mod_cache_disk into mod_cache package
+
Revision 1.651 2012/02/25 22:48:57 adamg
- merge -mod_mpm_* into -base
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache/apache.spec?r1=1.651r2=1.652f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: apache/apache.spec - mod_authz_host += R: apache(mod_access_compa...
Author: adamgDate: Sun Feb 26 10:03:41 2012 GMT
Module: packages Tag: HEAD
Log message:
- mod_authz_host += R: apache(mod_access_compat) [to ease upgrade from 2.2]
Files affected:
packages/apache:
apache.spec (1.652 - 1.653)
Diffs:
Index: packages/apache/apache.spec
diff -u packages/apache/apache.spec:1.652 packages/apache/apache.spec:1.653
--- packages/apache/apache.spec:1.652 Sun Feb 26 10:32:20 2012
+++ packages/apache/apache.spec Sun Feb 26 11:03:34 2012
@@ -781,6 +781,8 @@
Group: Networking/Daemons/HTTP
URL: http://httpd.apache.org/docs/2.4/mod/mod_authz_host.html
Requires: %{name}-base = %{version}-%{release}
+# provides compatibility directives for 2.2-style access control
+Requires: apache(mod_access_compat) = %{version}-%{release}
Provides: apache(mod_authz_host) = %{version}-%{release}
# for apache 2.2.0
Provides: apache(mod_access) = %{version}-%{release}
@@ -3370,6 +3372,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.653 2012/02/26 10:03:34 adamg
+- mod_authz_host += R: apache(mod_access_compat) [to ease upgrade from 2.2]
+
Revision 1.652 2012/02/26 09:32:20 adamg
- merge mod_cache_disk into mod_cache package
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache/apache.spec?r1=1.652r2=1.653f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: apache/apache.spec - drop mpm related todo entries
Author: adamgDate: Sun Feb 26 10:29:07 2012 GMT Module: packages Tag: HEAD Log message: - drop mpm related todo entries Files affected: packages/apache: apache.spec (1.653 - 1.654) Diffs: Index: packages/apache/apache.spec diff -u packages/apache/apache.spec:1.653 packages/apache/apache.spec:1.654 --- packages/apache/apache.spec:1.653 Sun Feb 26 11:03:34 2012 +++ packages/apache/apache.spec Sun Feb 26 11:28:59 2012 @@ -2,8 +2,6 @@ # # TODO: # - config examples for mod_* # - --with-suexec-uidmin=500 or =1000 ? -# - subpackages for MPMs -# - !!!check if all modules (*.so) are exactly the same for different MPMs # - check those autn modules inner deps # - for external packages: don't use any apache module name in dep as they # differ for apache 1.3/2.0/2.2!? any better ideas? rpm Suggests: tags? @@ -12,7 +10,6 @@ # - same for mod_authz # - mod_auth_digest and mod_auth_basic R: apache(authn) ? # - drop mod_case_filter* or find summary and description for them -# - build modules only once (not with each mpm) # - FYI: http://wiki.apache.org/httpd/InternalDummyConnection # Conditional build: @@ -3372,6 +3369,9 @@ All persons listed below can be reached at cvs_login@pld-linux.org $Log$ +Revision 1.654 2012/02/26 10:28:59 adamg +- drop mpm related todo entries + Revision 1.653 2012/02/26 10:03:34 adamg - mod_authz_host += R: apache(mod_access_compat) [to ease upgrade from 2.2] CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache/apache.spec?r1=1.653r2=1.654f=u ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: apache/apache.spec - mod_auth{n, z}_default were removed in 2.3.0, ...
Author: adamgDate: Sun Feb 26 10:37:50 2012 GMT
Module: packages Tag: HEAD
Log message:
- mod_auth{n,z}_default were removed in 2.3.0, let _core replace them (not 100%
accurate, but better than nothing)
Files affected:
packages/apache:
apache.spec (1.654 - 1.655)
Diffs:
Index: packages/apache/apache.spec
diff -u packages/apache/apache.spec:1.654 packages/apache/apache.spec:1.655
--- packages/apache/apache.spec:1.654 Sun Feb 26 11:28:59 2012
+++ packages/apache/apache.spec Sun Feb 26 11:37:44 2012
@@ -582,14 +582,25 @@
być logowane.
%package mod_authn_core
-Summary: Core Authentication
+Summary: Apache module that rejects any credentials supplied by the user
+Summary(pl.UTF-8): Moduł Apache'a odrzucający wszystkie dane podane przez
użytkownika
Group: Networking/Daemons/HTTP
URL: http://httpd.apache.org/docs/2.4/mod/mod_authn_core.html
Requires: %{name}-base = %{version}-%{release}
Provides: apache(mod_authn_core) = %{version}-%{release}
+Provides: apache(mod_authn_default) = %{version}-%{release}
+Obsoletes: apache(mod_authn_default) = %{version}-%{release}
%description mod_authn_core
-Core Authentication
+This module is designed to be the fallback module, if you don't have
+configured an authentication module like mod_auth_basic. It simply
+rejects any credentials supplied by the user.
+
+%description mod_authn_core -l pl.UTF-8
+Ten moduł został pomyślany jako domyślny moduł uwierzytelniający,
+jeśli nie skonfigurowano modułu uwierzytelniającego takiego jak
+mod_auth_basic. Moduł ten po prostu odrzuca wszelkie dane przekazane
+przez użytkownika.
%package mod_authn_dbd
Summary: Apache module that allows user authentication using an SQL
@@ -628,25 +639,6 @@
mod_auth_digest i mod_auth_basic uwierzytelnianie użytkowników poprzez
wyszukiwanie w tabelach haseł DBM.
-%package mod_authn_default
-Summary: Apache module that rejects any credentials supplied by the user
-Summary(pl.UTF-8): Moduł Apache'a odrzucający wszystkie dane podane przez
użytkownika
-Group: Networking/Daemons/HTTP
-URL: http://httpd.apache.org/docs/2.4/mod/mod_authn_default.html
-Requires: %{name}-base = %{version}-%{release}
-Provides: apache(mod_authn_default) = %{version}-%{release}
-
-%description mod_authn_default
-This module is designed to be the fallback module, if you don't have
-configured an authentication module like mod_auth_basic. It simply
-rejects any credentials supplied by the user.
-
-%description mod_authn_default -l pl.UTF-8
-Ten moduł został pomyślany jako domyślny moduł uwierzytelniający,
-jeśli nie skonfigurowano modułu uwierzytelniającego takiego jak
-mod_auth_basic. Moduł ten po prostu odrzuca wszelkie dane przekazane
-przez użytkownika.
-
%package mod_authn_file
Summary: Apache module that allows user authentication using text files
Summary(pl.UTF-8): Moduł Apache'a umożliwiający uwierzytelnianie
użytkowników poprzez pliki tekstowe
@@ -698,14 +690,25 @@
mod_auth_basic uwierzytelnianie użytkowników poprzez katalog LDAP.
%package mod_authz_core
-Summary: Core Authorization
+Summary: Apache module that rejects any authorization request
+Summary(pl.UTF-8): Moduł Apache'a odrzucający wszystkie żądania autoryzacji
Group: Networking/Daemons/HTTP
URL: http://httpd.apache.org/docs/2.4/mod/mod_authz_core.html
Requires: %{name}-base = %{version}-%{release}
Provides: apache(mod_authz_core) = %{version}-%{release}
+Provides: apache(mod_authz_default) = %{version}-%{release}
+Obsoletes: apache(mod_authz_default) = %{version}-%{release}
%description mod_authz_core
-Core Authorization
+This module is designed to be the fallback module, if you don't have
+configured an authorization module like mod_authz_user or
+mod_authz_groupfile. It simply rejects any authorization request.
+
+%description mod_authz_core -l pl.UTF-8
+Ten moduł został pomyślany jako domyślny moduł autoryzujący jeśli nie
+skonfigurowano modułu autoryzującego takiego jak mod_authz_user czy
+mod_authz_groupfile. Moduł ten po prostu odrzuca wszelkie żądania
+autoryzacji.
%package mod_authz_dbd
Summary: Group Authorization and Login using SQL
@@ -735,25 +738,6 @@
WWW dla uwierzytelnionych użytkowników na podstawie ich przynależności
do grupy zapisywanej w pliku DBM.
-%package mod_authz_default
-Summary: Apache module that rejects any authorization request
-Summary(pl.UTF-8): Moduł Apache'a odrzucający wszystkie żądania autoryzacji
-Group: Networking/Daemons/HTTP
-URL: http://httpd.apache.org/docs/2.4/mod/mod_authz_default.html
-Requires: %{name}-base = %{version}-%{release}
-Provides: apache(mod_authz_default) = %{version}-%{release}
-
-%description mod_authz_default
-This module is designed
packages: apache/apache.spec - fix mod_auth{n, z}_core summaries/descriptions
Author: adamgDate: Sun Feb 26 10:46:23 2012 GMT
Module: packages Tag: HEAD
Log message:
- fix mod_auth{n,z}_core summaries/descriptions
Files affected:
packages/apache:
apache.spec (1.655 - 1.656)
Diffs:
Index: packages/apache/apache.spec
diff -u packages/apache/apache.spec:1.655 packages/apache/apache.spec:1.656
--- packages/apache/apache.spec:1.655 Sun Feb 26 11:37:44 2012
+++ packages/apache/apache.spec Sun Feb 26 11:46:18 2012
@@ -582,8 +582,8 @@
być logowane.
%package mod_authn_core
-Summary: Apache module that rejects any credentials supplied by the user
-Summary(pl.UTF-8): Moduł Apache'a odrzucający wszystkie dane podane przez
użytkownika
+Summary: Apache module that provides core authentication directives
+Summary(pl.UTF-8): Moduł Apache'a udostępniający podstawowe dyrektywy
dotyczące uwierzytelniania
Group: Networking/Daemons/HTTP
URL: http://httpd.apache.org/docs/2.4/mod/mod_authn_core.html
Requires: %{name}-base = %{version}-%{release}
@@ -592,15 +592,13 @@
Obsoletes: apache(mod_authn_default) = %{version}-%{release}
%description mod_authn_core
-This module is designed to be the fallback module, if you don't have
-configured an authentication module like mod_auth_basic. It simply
-rejects any credentials supplied by the user.
+This module provides core authentication capabilities to allow or deny
+access to portions of the web site. mod_authn_core provides directives
+that are common to all authentication providers.
%description mod_authn_core -l pl.UTF-8
-Ten moduł został pomyślany jako domyślny moduł uwierzytelniający,
-jeśli nie skonfigurowano modułu uwierzytelniającego takiego jak
-mod_auth_basic. Moduł ten po prostu odrzuca wszelkie dane przekazane
-przez użytkownika.
+Ten moduł dostarcza podstawowych funkcjonalności uwierzytelniania
+umożliwiając na kontrolę dostępu do części serwisu.
%package mod_authn_dbd
Summary: Apache module that allows user authentication using an SQL
@@ -690,8 +688,8 @@
mod_auth_basic uwierzytelnianie użytkowników poprzez katalog LDAP.
%package mod_authz_core
-Summary: Apache module that rejects any authorization request
-Summary(pl.UTF-8): Moduł Apache'a odrzucający wszystkie żądania autoryzacji
+Summary: Apache module that provides core authentication directives
+Summary(pl.UTF-8): Moduł Apache'a udostępniający podstawowe dyrektywy
dotyczące uwierzytelniania
Group: Networking/Daemons/HTTP
URL: http://httpd.apache.org/docs/2.4/mod/mod_authz_core.html
Requires: %{name}-base = %{version}-%{release}
@@ -700,15 +698,13 @@
Obsoletes: apache(mod_authz_default) = %{version}-%{release}
%description mod_authz_core
-This module is designed to be the fallback module, if you don't have
-configured an authorization module like mod_authz_user or
-mod_authz_groupfile. It simply rejects any authorization request.
+This module provides core authentication capabilities to allow or deny
+access to portions of the web site. mod_authz_core provides directives
+that are common to all authentication providers.
%description mod_authz_core -l pl.UTF-8
-Ten moduł został pomyślany jako domyślny moduł autoryzujący jeśli nie
-skonfigurowano modułu autoryzującego takiego jak mod_authz_user czy
-mod_authz_groupfile. Moduł ten po prostu odrzuca wszelkie żądania
-autoryzacji.
+Ten moduł dostarcza podstawowych funkcjonalności uwierzytelniania
+umożliwiając na kontrolę dostępu do części serwisu.
%package mod_authz_dbd
Summary: Group Authorization and Login using SQL
@@ -3339,6 +3335,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.656 2012/02/26 10:46:18 adamg
+- fix mod_auth{n,z}_core summaries/descriptions
+
Revision 1.655 2012/02/26 10:37:44 adamg
- mod_auth{n,z}_default were removed in 2.3.0, let _core replace them (not
100% accurate, but better than nothing)
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache/apache.spec?r1=1.655r2=1.656f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: couchdb/couchdb.spec, apache-couchdb/apache-couchdb.spec - merge ...
Author: glen Date: Sun Feb 26 10:59:22 2012 GMT Module: packages Tag: HEAD Log message: - merge todo Files affected: packages/couchdb: couchdb.spec (1.3 - 1.4) packages/apache-couchdb: apache-couchdb.spec (1.7 - 1.8) Diffs: Index: packages/couchdb/couchdb.spec diff -u packages/couchdb/couchdb.spec:1.3 packages/couchdb/couchdb.spec:1.4 --- packages/couchdb/couchdb.spec:1.3 Mon May 30 00:31:40 2011 +++ packages/couchdb/couchdb.spec Sun Feb 26 11:59:17 2012 @@ -1,6 +1,8 @@ # $Revision$, $Date$ # -# TODO: init script, sysconfig +# TODO: +# - init script, sysconfig +# - merge apache-couchdb/apache-couchdb.spec here # Summary: A distributed document-oriented database Summary(pl.UTF-8): Rozproszona baza danych oparta o dokumenty @@ -109,6 +111,9 @@ All persons listed below can be reached at cvs_login@pld-linux.org $Log$ +Revision 1.4 2012/02/26 10:59:17 glen +- merge todo + Revision 1.3 2011/05/29 22:31:40 zbyniu - up to 1.0.1, BRs, cleanups Index: packages/apache-couchdb/apache-couchdb.spec diff -u packages/apache-couchdb/apache-couchdb.spec:1.7 packages/apache-couchdb/apache-couchdb.spec:1.8 --- packages/apache-couchdb/apache-couchdb.spec:1.7 Wed May 18 07:16:08 2011 +++ packages/apache-couchdb/apache-couchdb.spec Sun Feb 26 11:59:17 2012 @@ -1,4 +1,6 @@ # $Revision$, $Date$ +# TODO +# - merge to couchdb/couchdb.spec %define _mochiwebver r113 %define _ibrowsever 2.1.2 @@ -173,6 +175,9 @@ All persons listed below can be reached at cvs_login@pld-linux.org $Log$ +Revision 1.8 2012/02/26 10:59:17 glen +- merge todo + Revision 1.7 2011/05/18 05:16:08 aredridel - 1.0.2 CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/couchdb/couchdb.spec?r1=1.3r2=1.4f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache-couchdb/apache-couchdb.spec?r1=1.7r2=1.8f=u ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: couchdb: ERRORS: couchdb-1.0.1.tar.gz
wget -nv --no-check-certificate --user-agent=PLD/distfiles -O ./tmp/e72abb21-df96-4096-aa91-aa58df4c4369/001cf286b72492617e9ffba271702a00/couchdb-1.0.1.tar.gz http://www.apache.org/dist/couchdb/1.0.1/couchdb-1.0.1.tar.gz: http://www.apache.org/dist/couchdb/1.0.1/couchdb-1.0.1.tar.gz: 2012-02-26 12:02:29 ERROR 404: Not Found. wget -nv --no-check-certificate --user-agent=PLD/distfiles -O ./tmp/e72abb21-df96-4096-aa91-aa58df4c4369/001cf286b72492617e9ffba271702a00/couchdb-1.0.1.tar.gz http://www.apache.org/dist/couchdb/1.0.1/couchdb-1.0.1.tar.gz: exited with code 8 (0x00) FATAL: http://www.apache.org/dist/couchdb/1.0.1/couchdb-1.0.1.tar.gz (001cf286b72492617e9ffba271702a00) was not fetched (wget -nv --no-check-certificate --user-agent=PLD/distfiles -O ./tmp/e72abb21-df96-4096-aa91-aa58df4c4369/001cf286b72492617e9ffba271702a00/couchdb-1.0.1.tar.gz http://www.apache.org/dist/couchdb/1.0.1/couchdb-1.0.1.tar.gz: http://www.apache.org/dist/couchdb/1.0.1/couchdb-1.0.1.tar.gz: 2012-02-26 12:02:29 ERROR 404: Not Found. ): file exists but has 0 length Files fetched: 0 -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: couchdb/couchdb.spec, couchdb/couchdb.init - restore initscript
Author: glen Date: Sun Feb 26 11:02:32 2012 GMT
Module: packages Tag: HEAD
Log message:
- restore initscript
Files affected:
packages/couchdb:
couchdb.spec (1.4 - 1.5) , couchdb.init (1.2 - 1.3)
Diffs:
Index: packages/couchdb/couchdb.spec
diff -u packages/couchdb/couchdb.spec:1.4 packages/couchdb/couchdb.spec:1.5
--- packages/couchdb/couchdb.spec:1.4 Sun Feb 26 11:59:17 2012
+++ packages/couchdb/couchdb.spec Sun Feb 26 12:02:26 2012
@@ -11,10 +11,10 @@
Release: 0.1
License: Apache
Group: Applications
-Source0:
http://www.apache.net.pl/couchdb/1.0.1/apache-%{name}-%{version}.tar.gz
+Source0:
http://www.apache.org/dist/couchdb/%{version}/%{name}-%{version}.tar.gz
# Source0-md5: 001cf286b72492617e9ffba271702a00
-#Source1: %{name}.init
-URL: http://incubator.apache.org/couchdb/
+Source1: %{name}.init
+URL: http://couchdb.apache.org/
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: curl-devel = 7.18.0
@@ -111,6 +111,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.5 2012/02/26 11:02:26 glen
+- restore initscript
+
Revision 1.4 2012/02/26 10:59:17 glen
- merge todo
Index: packages/couchdb/couchdb.init
diff -u /dev/null packages/couchdb/couchdb.init:1.3
--- /dev/null Sun Feb 26 12:02:32 2012
+++ packages/couchdb/couchdb.init Sun Feb 26 12:02:26 2012
@@ -0,0 +1,124 @@
+#!/bin/sh
+#
+# couchdb apache couchdb init script
+#
+# chkconfig: 345 85 25
+#
+# description: apache couchdb init script
+#
+# $Id$
+
+# Source function library
+. /etc/rc.d/init.d/functions
+
+# Get network config
+. /etc/sysconfig/network
+
+# Set defaults
+COUCHDB_INI='/etc/apache-couchdb/couch.ini'
+COUCHDB_PID='/var/run/couchdb.pid'
+COUCHDB_USER='couchdb'
+COUCHDB_STDOUT='/dev/null'
+COUCHDB_STDERR='/dev/null'
+COUCHDB_RESPAWN='5'
+
+# Get service config - may override defaults
+[ -f /etc/sysconfig/couchdb ] . /etc/sysconfig/couchdb
+
+# Check that networking is up.
+if is_yes ${NETWORKING}; then
+ if [ ! -f /var/lock/subsys/network -a $1 != stop -a $1 != status ];
then
+ msg_network_down couchdb
+ exit 1
+ fi
+else
+ exit 0
+fi
+
+start() {
+ # Check if the service is already running?
+ if [ ! -f /var/lock/subsys/couchdb ]; then
+ msg_starting couchdb
+test -n $COUCHDB_PID \
+ touch $COUCHDB_PID \
+ chown $COUCHDB_USER $COUCHDB_PID
+ daemon --user $COUCHDB_USER /usr/bin/couchdb \
+-b -c $COUCHDB_INI -p $COUCHDB_PID \
+-o $COUCHDB_STDOUT -e $COUCHDB_STDERR \
+-r $COUCHDB_RESPAWN
+ RETVAL=$?
+ [ $RETVAL -eq 0 ] touch /var/lock/subsys/couchdb
+ else
+ msg_already_running couchdb
+ fi
+}
+
+stop() {
+ if [ -f /var/lock/subsys/couchdb ]; then
+ # Stop daemons.
+ msg_stopping couchdb
+ killproc couchdb
+ killproc --pidfile $COUCHDB_PID couchdb -TERM
+ rm -f /var/lock/subsys/couchdb
+ else
+ msg_not_running couchdb
+ fi
+}
+
+reload() {
+ if [ -f /var/lock/subsys/couchdb ]; then
+ msg_reloading couchdb
+ killproc couchdb -HUP
+ killproc --pidfile $COUCHDB_PID couchdb -HUP
+ RETVAL=$?
+ else
+ msg_not_running couchdb
+ RETVAL=7
+ fi
+}
+
+condrestart() {
+ if [ -f /var/lock/subsys/couchdb ]; then
+ stop
+ start
+ else
+ msg_not_running couchdb
+ RETVAL=$1
+ fi
+}
+
+RETVAL=0
+# See how we were called.
+case $1 in
+ start)
+ start
+ ;;
+ stop)
+ stop
+ ;;
+ restart)
+ stop
+ start
+ ;;
+ try-restart)
+ condrestart 0
+ ;;
+# include force-reload here if program allows reloading without restart
+# otherwise remove reload action and support force-reload as restart if running
+ reload|force-reload)
+ reload
+ ;;
+# use this one if program doesn't support reloading without restart
+ force-reload)
+ condrestart 7
+ ;;
+ status)
+ status couchdb
+ RETVAL=$?
+ ;;
+ *)
+ msg_usage $0
{start|stop|restart|try-restart|reload|force-reload|status}
+ exit 3
+esac
+
+exit $RETVAL
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/couchdb/couchdb.spec?r1=1.4r2=1.5f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/couchdb/couchdb.init?r1=1.2r2=1.3f=u
packages: apache/apache.spec - mod_authn_alias merged into mod_authn_core
Author: adamgDate: Sun Feb 26 11:16:13 2012 GMT
Module: packages Tag: HEAD
Log message:
- mod_authn_alias merged into mod_authn_core
Files affected:
packages/apache:
apache.spec (1.656 - 1.657)
Diffs:
Index: packages/apache/apache.spec
diff -u packages/apache/apache.spec:1.656 packages/apache/apache.spec:1.657
--- packages/apache/apache.spec:1.656 Sun Feb 26 11:46:18 2012
+++ packages/apache/apache.spec Sun Feb 26 12:16:07 2012
@@ -540,22 +540,6 @@
%description mod_auth_form
Form authentication
-%package mod_authn_alias
-Summary: Apache module that provides the ability to create extended
authentication
-Summary(pl.UTF-8): Moduł Apache'a umożliwiający tworzenie rozszerzonego
uwierzytelniania
-Group: Networking/Daemons/HTTP
-URL: http://httpd.apache.org/docs/2.4/mod/mod_authn_alias.html
-Requires: %{name}-base = %{version}-%{release}
-Provides: apache(mod_authn_alias) = %{version}-%{release}
-
-%description mod_authn_alias
-This module allows extended authentication providers to be created
-within the configuration file and assigned an alias name.
-
-%description mod_authn_alias -l pl.UTF-8
-Ten moduł umożliwia tworzenie rozszerzonych sposobów uwierzytelniania
-w pliku konfiguracyjnym i nadawanie im aliasów.
-
%package mod_authn_anon
Summary: Apache module that allows anonymous user access to
authenticated areas
Summary(pl.UTF-8): Moduł Apache'a umożliwiający dostęp anonimowych
użytkowników do stref uwierzytelnianych
@@ -589,6 +573,7 @@
Requires: %{name}-base = %{version}-%{release}
Provides: apache(mod_authn_core) = %{version}-%{release}
Provides: apache(mod_authn_default) = %{version}-%{release}
+Obsoletes: apache(mod_authn_alias)
Obsoletes: apache(mod_authn_default) = %{version}-%{release}
%description mod_authn_core
@@ -2295,7 +2280,6 @@
echo LoadModule auth_basic_module modules/mod_auth_basic.so
$CFG/00_mod_auth_basic.conf
echo LoadModule auth_digest_modulemodules/mod_auth_digest.so
$CFG/00_mod_auth_digest.conf
echo LoadModule auth_form_module modules/mod_auth_form.so
$CFG/00_mod_auth_form.conf
-echo LoadModule authn_alias_modulemodules/mod_authn_alias.so
$CFG/00_mod_authn_alias.conf
echo LoadModule authn_anon_module modules/mod_authn_anon.so
$CFG/00_mod_authn_anon.conf
echo LoadModule authn_core_module modules/mod_authn_core.so
$CFG/00_mod_authn_core.conf
echo LoadModule authn_dbd_module modules/mod_authn_dbd.so
$CFG/00_mod_authn_dbd.conf
@@ -2600,7 +2584,6 @@
%module_scripts mod_auth_dbm
%module_scripts mod_auth_digest
%module_scripts mod_auth_form
-%module_scripts mod_authn_alias
%module_scripts mod_authn_anon
%module_scripts mod_authn_core
%module_scripts mod_authn_dbd
@@ -2863,11 +2846,6 @@
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/conf.d/*_mod_authn_core.conf
%attr(755,root,root) %{_libexecdir}/mod_authn_core.so
-%files mod_authn_alias
-%defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/conf.d/*_mod_authn_alias.conf
-#%attr(755,root,root) %{_libexecdir}/mod_authn_alias.so
-
%files mod_authn_anon
%defattr(644,root,root,755)
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/conf.d/*_mod_authn_anon.conf
@@ -3335,6 +3313,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.657 2012/02/26 11:16:07 adamg
+- mod_authn_alias merged into mod_authn_core
+
Revision 1.656 2012/02/26 10:46:18 adamg
- fix mod_auth{n,z}_core summaries/descriptions
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache/apache.spec?r1=1.656r2=1.657f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: couchdb/couchdb.spec - merge with apache-couchdb.spec
Author: glen Date: Sun Feb 26 11:22:08 2012 GMT
Module: packages Tag: HEAD
Log message:
- merge with apache-couchdb.spec
Files affected:
packages/couchdb:
couchdb.spec (1.5 - 1.6)
Diffs:
Index: packages/couchdb/couchdb.spec
diff -u packages/couchdb/couchdb.spec:1.5 packages/couchdb/couchdb.spec:1.6
--- packages/couchdb/couchdb.spec:1.5 Sun Feb 26 12:02:26 2012
+++ packages/couchdb/couchdb.spec Sun Feb 26 12:22:02 2012
@@ -3,81 +3,99 @@
# TODO:
# - init script, sysconfig
# - merge apache-couchdb/apache-couchdb.spec here
-#
+# - tmpfiles.d
+# - system packages:
+# erlang-ibrowse = 1.5.3
+# erlang-mochiweb
+# erlang-oauth
+
+%definemochiwebver r113
+%defineibrowsever 1.5.2
Summary: A distributed document-oriented database
Summary(pl.UTF-8): Rozproszona baza danych oparta o dokumenty
Name: couchdb
Version: 1.0.1
Release: 0.1
-License: Apache
+License: Apache v2.0
Group: Applications
-Source0:
http://www.apache.org/dist/couchdb/%{version}/%{name}-%{version}.tar.gz
+Source0:
http://www.apache.org/dist/couchdb/%{version}/apache-%{name}-%{version}.tar.gz
# Source0-md5: 001cf286b72492617e9ffba271702a00
Source1: %{name}.init
URL: http://couchdb.apache.org/
-BuildRequires: autoconf
-BuildRequires: automake
+BuildRequires: autoconf = 2.59
+BuildRequires: automake = 1.6.3
BuildRequires: curl-devel = 7.18.0
-BuildRequires: erlang
+BuildRequires: erlang = 1:R12B5
BuildRequires: help2man
BuildRequires: intltool
BuildRequires: js-devel
BuildRequires: libicu-devel = 3.4.1
+BuildRequires: libtool
BuildRequires: pakchois-devel
+BuildRequires: pkgconfig
BuildRequires: rpmbuild(macros) = 1.228
Requires(post,preun): /sbin/chkconfig
-Requires(post,preun): /sbin/chkconfig
Requires(pre): /bin/id
Requires(pre): /usr/bin/getgid
Requires(pre): /usr/sbin/groupadd
Requires(pre): /usr/sbin/useradd
+Requires: erlang = 1:R12B5
Provides: group(couchdb)
Provides: user(couchdb)
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+%defineno_install_post_check_tmpfiles 1
+
%description
Apache CouchDB is a distributed, fault-tolerant and schema-free
-document-oriented database accessible via a RESTful HTTP/JSON
-API. Among other features, it provides robust, incremental replication
-with bi-directional conflict detection and resolution, and is
-queryable and indexable using a table-oriented view engine with
-JavaScript acting as the default view definition language.
+document-oriented database accessible via a RESTful HTTP/JSON API.
+Among other features, it provides robust, incremental replication with
+bi-directional conflict detection and resolution, and is queryable and
+indexable using a table-oriented view engine with JavaScript acting as
+the default view definition language.
%description -l pl.UTF-8
-
Apache CouchDB jest rozproszoną, odporną na błędy, nie wymagającą
schematów, zorientowaną na dokument bazą danych z RESTowym API opartym
-o HTTP/JSON. Między innymi zapewnia solidną, przyrostową replikację
-z dwukierunkowym wykrywaniem i rozwiązywaniem konfliktów, oraz odpytywanie
-i indeksowanie za pośrednictwem opartego na tablicach silnika widoków
-używającego JavaScriptu jako głównego języka definicji widoku.
+o HTTP/JSON. Między innymi zapewnia solidną, przyrostową replikację z
+dwukierunkowym wykrywaniem i rozwiązywaniem konfliktów, oraz
+odpytywanie i indeksowanie za pośrednictwem opartego na tablicach
+silnika widoków używającego JavaScriptu jako głównego języka definicji
+widoku.
%prep
%setup -q -n apache-%{name}-%{version}
%build
-%configure --with-erlang=%{_libdir}/erlang/usr/include
+%{__libtoolize}
+%{__aclocal} -I m4
+%{__autoconf}
+%{__autoheader}
+%{__automake}
+%configure \
+ --with-erlang=%{_libdir}/erlang%{_includedir} \
+
%{__make}
%install
rm -rf $RPM_BUILD_ROOT
-
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
-rm -rf $RPM_BUILD_ROOT%{_defaultdocdir}/*
-
-install -d $RPM_BUILD_ROOT/etc/rc.d/init.d
+install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig}
+mv $RPM_BUILD_ROOT%{_sysconfdir}/default/couchdb $RPM_BUILD_ROOT/etc/sysconfig
mv $RPM_BUILD_ROOT/etc/rc.d/{,init.d}/%{name}
-#install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
+install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
+
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name}
%clean
rm -rf $RPM_BUILD_ROOT
%pre
-%groupadd -g 230 couchdb
-%useradd -u 230 -g couchdb -c CouchDB server couchdb
+%groupadd -g 203 -r -f couchdb
+%useradd -u 203 -r -d /var/lib/couchdb -s /bin/sh -c CouchDB Administrator
-g couchdb couchdb
%post
/sbin/chkconfig --add %{name}
@@ -89,21 +107,77 @@
/sbin/chkconfig --del %{name}
fi
+%postun
+if [ $1 = 0 ]; then
+ %userremove couchdb
+
packages: apache-couchdb/apache-couchdb-aclocal.patch (REMOVED), apache-cou...
Author: glen Date: Sun Feb 26 11:23:45 2012 GMT Module: packages Tag: HEAD Log message: - drop obsolete files Files affected: packages/apache-couchdb: apache-couchdb-aclocal.patch (1.1 - NONE) (REMOVED), apache-couchdb-init.d.patch (1.2 - NONE) (REMOVED) Diffs: ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: apache/apache.spec - fix Obsoletes in mod_auth{n,z}_core
Author: adamgDate: Sun Feb 26 11:23:48 2012 GMT
Module: packages Tag: HEAD
Log message:
- fix Obsoletes in mod_auth{n,z}_core
Files affected:
packages/apache:
apache.spec (1.657 - 1.658)
Diffs:
Index: packages/apache/apache.spec
diff -u packages/apache/apache.spec:1.657 packages/apache/apache.spec:1.658
--- packages/apache/apache.spec:1.657 Sun Feb 26 12:16:07 2012
+++ packages/apache/apache.spec Sun Feb 26 12:23:41 2012
@@ -574,7 +574,7 @@
Provides: apache(mod_authn_core) = %{version}-%{release}
Provides: apache(mod_authn_default) = %{version}-%{release}
Obsoletes: apache(mod_authn_alias)
-Obsoletes: apache(mod_authn_default) = %{version}-%{release}
+Obsoletes: apache-mod_authn_default %{version}-%{release}
%description mod_authn_core
This module provides core authentication capabilities to allow or deny
@@ -680,7 +680,7 @@
Requires: %{name}-base = %{version}-%{release}
Provides: apache(mod_authz_core) = %{version}-%{release}
Provides: apache(mod_authz_default) = %{version}-%{release}
-Obsoletes: apache(mod_authz_default) = %{version}-%{release}
+Obsoletes: apache-mod_authz_default %{version}-%{release}
%description mod_authz_core
This module provides core authentication capabilities to allow or deny
@@ -3313,6 +3313,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.658 2012/02/26 11:23:41 adamg
+- fix Obsoletes in mod_auth{n,z}_core
+
Revision 1.657 2012/02/26 11:16:07 adamg
- mod_authn_alias merged into mod_authn_core
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache/apache.spec?r1=1.657r2=1.658f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: couchdb/couchdb.init - unify
Author: glen Date: Sun Feb 26 11:28:52 2012 GMT
Module: packages Tag: HEAD
Log message:
- unify
Files affected:
packages/couchdb:
couchdb.init (1.3 - 1.4)
Diffs:
Index: packages/couchdb/couchdb.init
diff -u packages/couchdb/couchdb.init:1.3 packages/couchdb/couchdb.init:1.4
--- packages/couchdb/couchdb.init:1.3 Sun Feb 26 12:02:26 2012
+++ packages/couchdb/couchdb.init Sun Feb 26 12:28:47 2012
@@ -37,54 +37,58 @@
start() {
# Check if the service is already running?
- if [ ! -f /var/lock/subsys/couchdb ]; then
- msg_starting couchdb
-test -n $COUCHDB_PID \
- touch $COUCHDB_PID \
- chown $COUCHDB_USER $COUCHDB_PID
- daemon --user $COUCHDB_USER /usr/bin/couchdb \
--b -c $COUCHDB_INI -p $COUCHDB_PID \
--o $COUCHDB_STDOUT -e $COUCHDB_STDERR \
--r $COUCHDB_RESPAWN
- RETVAL=$?
- [ $RETVAL -eq 0 ] touch /var/lock/subsys/couchdb
- else
+ if [ -f /var/lock/subsys/couchdb ]; then
msg_already_running couchdb
+ return
fi
+
+ msg_starting couchdb
+ test -n $COUCHDB_PID \
+touch $COUCHDB_PID \
+chown $COUCHDB_USER $COUCHDB_PID
+ daemon --user $COUCHDB_USER /usr/bin/couchdb \
+ -b -c $COUCHDB_INI -p $COUCHDB_PID \
+ -o $COUCHDB_STDOUT -e $COUCHDB_STDERR \
+ -r $COUCHDB_RESPAWN
+ RETVAL=$?
+ [ $RETVAL -eq 0 ] touch /var/lock/subsys/couchdb
}
stop() {
- if [ -f /var/lock/subsys/couchdb ]; then
- # Stop daemons.
- msg_stopping couchdb
- killproc couchdb
- killproc --pidfile $COUCHDB_PID couchdb -TERM
- rm -f /var/lock/subsys/couchdb
- else
+ if [ ! -f /var/lock/subsys/couchdb ]; then
msg_not_running couchdb
+ return
fi
+
+ # Stop daemons.
+ msg_stopping couchdb
+ killproc couchdb
+ killproc --pidfile $COUCHDB_PID couchdb -TERM
+ rm -f /var/lock/subsys/couchdb
}
reload() {
- if [ -f /var/lock/subsys/couchdb ]; then
- msg_reloading couchdb
- killproc couchdb -HUP
- killproc --pidfile $COUCHDB_PID couchdb -HUP
- RETVAL=$?
- else
+ if [ ! -f /var/lock/subsys/couchdb ]; then
msg_not_running couchdb
RETVAL=7
+ return
fi
+
+ msg_reloading couchdb
+ killproc couchdb -HUP
+ killproc --pidfile $COUCHDB_PID couchdb -HUP
+ RETVAL=$?
}
condrestart() {
- if [ -f /var/lock/subsys/couchdb ]; then
- stop
- start
- else
+ if [ ! -f /var/lock/subsys/couchdb ]; then
msg_not_running couchdb
RETVAL=$1
+ return
fi
+
+ stop
+ start
}
RETVAL=0
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/couchdb/couchdb.init?r1=1.3r2=1.4f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: apache/apache-mod_ssl-vhost.conf (REMOVED) - unused since 2.2.14-9
Author: adamgDate: Sun Feb 26 11:29:04 2012 GMT Module: packages Tag: HEAD Log message: - unused since 2.2.14-9 Files affected: packages/apache: apache-mod_ssl-vhost.conf (1.19 - NONE) (REMOVED) Diffs: ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: apache/apache-mod_ssl.conf - NameVirtualHost directive no longer ...
Author: adamgDate: Sun Feb 26 11:30:12 2012 GMT Module: packages Tag: HEAD Log message: - NameVirtualHost directive no longer has any effect - SSLMutex replaced with Mutex which we already have defined in apache-mpm.conf Files affected: packages/apache: apache-mod_ssl.conf (1.20 - 1.21) Diffs: Index: packages/apache/apache-mod_ssl.conf diff -u packages/apache/apache-mod_ssl.conf:1.20 packages/apache/apache-mod_ssl.conf:1.21 --- packages/apache/apache-mod_ssl.conf:1.20Tue Jul 6 10:18:18 2010 +++ packages/apache/apache-mod_ssl.conf Sun Feb 26 12:30:07 2012 @@ -55,16 +55,10 @@ SSLSessionCacheshmcb:/var/cache/httpd/ssl_scache(512000) SSLSessionCacheTimeout 300 -# Semaphore: -# Configure the path to the mutual exclusion semaphore the -# SSL engine uses internally for inter-process synchronization. -SSLMutex file:/var/run/httpd/ssl_mutex - ## ## SSL Virtual Host Context ## -NameVirtualHost *:443 VirtualHost *:443 # SSL Engine Switch: # Enable/Disable SSL for this virtual host. CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache/apache-mod_ssl.conf?r1=1.20r2=1.21f=u ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: couchdb/couchdb.init - initscript fixups
Author: glen Date: Sun Feb 26 11:33:18 2012 GMT
Module: packages Tag: HEAD
Log message:
- initscript fixups
Files affected:
packages/couchdb:
couchdb.init (1.4 - 1.5)
Diffs:
Index: packages/couchdb/couchdb.init
diff -u packages/couchdb/couchdb.init:1.4 packages/couchdb/couchdb.init:1.5
--- packages/couchdb/couchdb.init:1.4 Sun Feb 26 12:28:47 2012
+++ packages/couchdb/couchdb.init Sun Feb 26 12:33:13 2012
@@ -1,10 +1,9 @@
#!/bin/sh
#
-# couchdb apache couchdb init script
-#
-# chkconfig: 345 85 25
-#
-# description: apache couchdb init script
+# couchdb Starts CouchDB
+# chkconfig: 2345 84 25
+# description: Apache CouchDB init script
+# pidfile: /var/run/couchdb.pid
#
# $Id$
@@ -15,6 +14,7 @@
. /etc/sysconfig/network
# Set defaults
+COUCHDB=/usr/bin/couchdb
COUCHDB_INI='/etc/apache-couchdb/couch.ini'
COUCHDB_PID='/var/run/couchdb.pid'
COUCHDB_USER='couchdb'
@@ -28,7 +28,7 @@
# Check that networking is up.
if is_yes ${NETWORKING}; then
if [ ! -f /var/lock/subsys/network -a $1 != stop -a $1 != status ];
then
- msg_network_down couchdb
+ msg_network_down CouchDB
exit 1
fi
else
@@ -38,15 +38,15 @@
start() {
# Check if the service is already running?
if [ -f /var/lock/subsys/couchdb ]; then
- msg_already_running couchdb
+ msg_already_running CouchDB
return
fi
- msg_starting couchdb
- test -n $COUCHDB_PID \
-touch $COUCHDB_PID \
-chown $COUCHDB_USER $COUCHDB_PID
- daemon --user $COUCHDB_USER /usr/bin/couchdb \
+ msg_starting CouchDB
+ test -n $COUCHDB_PID \
+touch $COUCHDB_PID \
+chown $COUCHDB_USER $COUCHDB_PID
+ daemon --user $COUCHDB_USER $COUCHDB \
-b -c $COUCHDB_INI -p $COUCHDB_PID \
-o $COUCHDB_STDOUT -e $COUCHDB_STDERR \
-r $COUCHDB_RESPAWN
@@ -56,33 +56,31 @@
stop() {
if [ ! -f /var/lock/subsys/couchdb ]; then
- msg_not_running couchdb
+ msg_not_running CouchDB
return
fi
# Stop daemons.
- msg_stopping couchdb
- killproc couchdb
+ msg_stopping CouchDB
killproc --pidfile $COUCHDB_PID couchdb -TERM
rm -f /var/lock/subsys/couchdb
}
reload() {
if [ ! -f /var/lock/subsys/couchdb ]; then
- msg_not_running couchdb
+ msg_not_running CouchDB
RETVAL=7
return
fi
- msg_reloading couchdb
- killproc couchdb -HUP
+ msg_reloading CouchDB
killproc --pidfile $COUCHDB_PID couchdb -HUP
RETVAL=$?
}
condrestart() {
if [ ! -f /var/lock/subsys/couchdb ]; then
- msg_not_running couchdb
+ msg_not_running CouchDB
RETVAL=$1
return
fi
@@ -107,14 +105,8 @@
try-restart)
condrestart 0
;;
-# include force-reload here if program allows reloading without restart
-# otherwise remove reload action and support force-reload as restart if running
reload|force-reload)
reload
- ;;
-# use this one if program doesn't support reloading without restart
- force-reload)
- condrestart 7
;;
status)
status couchdb
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/couchdb/couchdb.init?r1=1.4r2=1.5f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: couchdb/couchdb.spec, couchdb/couchdb.tmpfiles (NEW) - add tmpfil...
Author: glen Date: Sun Feb 26 11:40:12 2012 GMT
Module: packages Tag: HEAD
Log message:
- add tmpfiles.d
Files affected:
packages/couchdb:
couchdb.spec (1.6 - 1.7) , couchdb.tmpfiles (NONE - 1.1) (NEW)
Diffs:
Index: packages/couchdb/couchdb.spec
diff -u packages/couchdb/couchdb.spec:1.6 packages/couchdb/couchdb.spec:1.7
--- packages/couchdb/couchdb.spec:1.6 Sun Feb 26 12:22:02 2012
+++ packages/couchdb/couchdb.spec Sun Feb 26 12:40:06 2012
@@ -21,6 +21,7 @@
Source0:
http://www.apache.org/dist/couchdb/%{version}/apache-%{name}-%{version}.tar.gz
# Source0-md5: 001cf286b72492617e9ffba271702a00
Source1: %{name}.init
+Source2: %{name}.tmpfiles
URL: http://couchdb.apache.org/
BuildRequires: autoconf = 2.59
BuildRequires: automake = 1.6.3
@@ -33,7 +34,7 @@
BuildRequires: libtool
BuildRequires: pakchois-devel
BuildRequires: pkgconfig
-BuildRequires: rpmbuild(macros) = 1.228
+BuildRequires: rpmbuild(macros) = 1.647
Requires(post,preun): /sbin/chkconfig
Requires(pre): /bin/id
Requires(pre): /usr/bin/getgid
@@ -44,8 +45,6 @@
Provides: user(couchdb)
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-%defineno_install_post_check_tmpfiles 1
-
%description
Apache CouchDB is a distributed, fault-tolerant and schema-free
document-oriented database accessible via a RESTful HTTP/JSON API.
@@ -85,9 +84,12 @@
install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig}
mv $RPM_BUILD_ROOT%{_sysconfdir}/default/couchdb $RPM_BUILD_ROOT/etc/sysconfig
-mv $RPM_BUILD_ROOT/etc/rc.d/{,init.d}/%{name}
+%{__rm} $RPM_BUILD_ROOT/etc/rc.d/%{name}
install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
+install -d $RPM_BUILD_ROOT%{systemdtmpfilesdir}
+cp -p %{SOURCE2} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{name}.conf
+
%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name}
%clean
@@ -124,6 +126,7 @@
%attr(754,root,root) /etc/rc.d/init.d/%{name}
%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{name}
+%{systemdtmpfilesdir}/couchdb.conf
# XXX: sbindir?
%attr(755,root,root) %{_bindir}/couchdb
@@ -179,12 +182,17 @@
%config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/couchdb
%attr(700,couchdb,couchdb) %dir %{_localstatedir}/log/couchdb
+%attr(755,couchdb,root) %dir /var/run/couchdb
+
%define date %(echo `LC_ALL=C date +%a %b %d %Y`)
%changelog
* %{date} PLD Team feedb...@pld-linux.org
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.7 2012/02/26 11:40:06 glen
+- add tmpfiles.d
+
Revision 1.6 2012/02/26 11:22:02 glen
- merge with apache-couchdb.spec
Index: packages/couchdb/couchdb.tmpfiles
diff -u /dev/null packages/couchdb/couchdb.tmpfiles:1.1
--- /dev/null Sun Feb 26 12:40:12 2012
+++ packages/couchdb/couchdb.tmpfiles Sun Feb 26 12:40:06 2012
@@ -0,0 +1 @@
+d /var/run/couchdb 0755 couchdb root
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/couchdb/couchdb.spec?r1=1.6r2=1.7f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: couchdb: apache-couchdb-1.0.3.tar.gz
Files fetched: 1 STORED: http://www.apache.org/dist/couchdb/1.0.3/apache-couchdb-1.0.3.tar.gz cfdc2ab751bf18049c5ef7866602d8ed apache-couchdb-1.0.3.tar.gz Size: 1046728 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: couchdb/couchdb.spec - up to 1.0.3
Author: glen Date: Sun Feb 26 11:50:54 2012 GMT
Module: packages Tag: HEAD
Log message:
- up to 1.0.3
Files affected:
packages/couchdb:
couchdb.spec (1.7 - 1.8)
Diffs:
Index: packages/couchdb/couchdb.spec
diff -u packages/couchdb/couchdb.spec:1.7 packages/couchdb/couchdb.spec:1.8
--- packages/couchdb/couchdb.spec:1.7 Sun Feb 26 12:40:06 2012
+++ packages/couchdb/couchdb.spec Sun Feb 26 12:50:49 2012
@@ -5,31 +5,31 @@
# - merge apache-couchdb/apache-couchdb.spec here
# - tmpfiles.d
# - system packages:
-# erlang-ibrowse = 1.5.3
+# erlang-ibrowse = 2.2.0
# erlang-mochiweb
# erlang-oauth
%definemochiwebver r113
-%defineibrowsever 1.5.2
-Summary: A distributed document-oriented database
+%defineibrowsever 2.2.0
+%defineerlangver1:R12B5
+Summary: A document database server, accessible via a RESTful JSON API
Summary(pl.UTF-8): Rozproszona baza danych oparta o dokumenty
Name: couchdb
-Version: 1.0.1
+Version: 1.0.3
Release: 0.1
-License: Apache v2.0
-Group: Applications
+Group: Applications/Databases
Source0:
http://www.apache.org/dist/couchdb/%{version}/apache-%{name}-%{version}.tar.gz
-# Source0-md5: 001cf286b72492617e9ffba271702a00
+# Source0-md5: cfdc2ab751bf18049c5ef7866602d8ed
Source1: %{name}.init
Source2: %{name}.tmpfiles
URL: http://couchdb.apache.org/
BuildRequires: autoconf = 2.59
BuildRequires: automake = 1.6.3
BuildRequires: curl-devel = 7.18.0
-BuildRequires: erlang = 1:R12B5
+BuildRequires: erlang = %{erlangver}
BuildRequires: help2man
BuildRequires: intltool
-BuildRequires: js-devel
+BuildRequires: js-devel = 1.8
BuildRequires: libicu-devel = 3.4.1
BuildRequires: libtool
BuildRequires: pakchois-devel
@@ -40,7 +40,7 @@
Requires(pre): /usr/bin/getgid
Requires(pre): /usr/sbin/groupadd
Requires(pre): /usr/sbin/useradd
-Requires: erlang = 1:R12B5
+Requires: erlang = %{erlangver}
Provides: group(couchdb)
Provides: user(couchdb)
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -190,6 +190,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.8 2012/02/26 11:50:49 glen
+- up to 1.0.3
+
Revision 1.7 2012/02/26 11:40:06 glen
- add tmpfiles.d
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/couchdb/couchdb.spec?r1=1.7r2=1.8f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: couchdb/couchdb.init - remove pid on stop
Author: glen Date: Sun Feb 26 11:53:32 2012 GMT Module: packages Tag: HEAD Log message: - remove pid on stop Files affected: packages/couchdb: couchdb.init (1.5 - 1.6) Diffs: Index: packages/couchdb/couchdb.init diff -u packages/couchdb/couchdb.init:1.5 packages/couchdb/couchdb.init:1.6 --- packages/couchdb/couchdb.init:1.5 Sun Feb 26 12:33:13 2012 +++ packages/couchdb/couchdb.init Sun Feb 26 12:53:27 2012 @@ -63,6 +63,7 @@ # Stop daemons. msg_stopping CouchDB killproc --pidfile $COUCHDB_PID couchdb -TERM + rm -f $COUCHDB_PID rm -f /var/lock/subsys/couchdb } CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/couchdb/couchdb.init?r1=1.5r2=1.6f=u ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: couchdb/couchdb.spec - restore license line
Author: glen Date: Sun Feb 26 11:56:53 2012 GMT
Module: packages Tag: HEAD
Log message:
- restore license line
Files affected:
packages/couchdb:
couchdb.spec (1.8 - 1.9)
Diffs:
Index: packages/couchdb/couchdb.spec
diff -u packages/couchdb/couchdb.spec:1.8 packages/couchdb/couchdb.spec:1.9
--- packages/couchdb/couchdb.spec:1.8 Sun Feb 26 12:50:49 2012
+++ packages/couchdb/couchdb.spec Sun Feb 26 12:56:48 2012
@@ -17,6 +17,7 @@
Name: couchdb
Version: 1.0.3
Release: 0.1
+License: Apache v2.0
Group: Applications/Databases
Source0:
http://www.apache.org/dist/couchdb/%{version}/apache-%{name}-%{version}.tar.gz
# Source0-md5: cfdc2ab751bf18049c5ef7866602d8ed
@@ -190,6 +191,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.9 2012/02/26 11:56:48 glen
+- restore license line
+
Revision 1.8 2012/02/26 11:50:49 glen
- up to 1.0.3
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/couchdb/couchdb.spec?r1=1.8r2=1.9f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: couchdb/couchdb.init - rename COUCHDB_RESPAWN to COUCHDB_RESPAWN_...
Author: glen Date: Sun Feb 26 12:00:41 2012 GMT Module: packages Tag: HEAD Log message: - rename COUCHDB_RESPAWN to COUCHDB_RESPAWN_TIMEOUT; update descs; add $COUCHDB_OPTIONS Files affected: packages/couchdb: couchdb.init (1.6 - 1.7) Diffs: Index: packages/couchdb/couchdb.init diff -u packages/couchdb/couchdb.init:1.6 packages/couchdb/couchdb.init:1.7 --- packages/couchdb/couchdb.init:1.6 Sun Feb 26 12:53:27 2012 +++ packages/couchdb/couchdb.init Sun Feb 26 13:00:36 2012 @@ -1,8 +1,8 @@ #!/bin/sh # -# couchdb Starts CouchDB +# couchdb Apache CouchDB init script # chkconfig: 2345 84 25 -# description: Apache CouchDB init script +# description: Apache CouchDB init script for the database server. # pidfile: /var/run/couchdb.pid # # $Id$ @@ -20,7 +20,7 @@ COUCHDB_USER='couchdb' COUCHDB_STDOUT='/dev/null' COUCHDB_STDERR='/dev/null' -COUCHDB_RESPAWN='5' +COUCHDB_RESPAWN_TIMEOUT='5' # Get service config - may override defaults [ -f /etc/sysconfig/couchdb ] . /etc/sysconfig/couchdb @@ -47,9 +47,10 @@ touch $COUCHDB_PID \ chown $COUCHDB_USER $COUCHDB_PID daemon --user $COUCHDB_USER $COUCHDB \ - -b -c $COUCHDB_INI -p $COUCHDB_PID \ - -o $COUCHDB_STDOUT -e $COUCHDB_STDERR \ - -r $COUCHDB_RESPAWN + -b -c $COUCHDB_INI -p $COUCHDB_PID \ + -o $COUCHDB_STDOUT -e $COUCHDB_STDERR \ + -r $COUCHDB_RESPAWN_TIMEOUT \ + $COUCHDB_OPTIONS RETVAL=$? [ $RETVAL -eq 0 ] touch /var/lock/subsys/couchdb } CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/couchdb/couchdb.init?r1=1.6r2=1.7f=u ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: couchdb/couchdb.init - use command to shutdown
Author: glen Date: Sun Feb 26 12:03:03 2012 GMT Module: packages Tag: HEAD Log message: - use command to shutdown Files affected: packages/couchdb: couchdb.init (1.7 - 1.8) Diffs: Index: packages/couchdb/couchdb.init diff -u packages/couchdb/couchdb.init:1.7 packages/couchdb/couchdb.init:1.8 --- packages/couchdb/couchdb.init:1.7 Sun Feb 26 13:00:36 2012 +++ packages/couchdb/couchdb.init Sun Feb 26 13:02:58 2012 @@ -63,7 +63,14 @@ # Stop daemons. msg_stopping CouchDB - killproc --pidfile $COUCHDB_PID couchdb -TERM + su $COUCHDB_USER -c $COUCHDB -d $COUCHDB_OPTIONS + RETVAL=$? + if [ $RETVAL -eq 0 ]; then + ok + else + fail + fi + rm -f $COUCHDB_PID rm -f /var/lock/subsys/couchdb } CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/couchdb/couchdb.init?r1=1.7r2=1.8f=u ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: couchdb/couchdb.spec - daemon --user dep
Author: glen Date: Sun Feb 26 12:03:39 2012 GMT
Module: packages Tag: HEAD
Log message:
- daemon --user dep
Files affected:
packages/couchdb:
couchdb.spec (1.9 - 1.10)
Diffs:
Index: packages/couchdb/couchdb.spec
diff -u packages/couchdb/couchdb.spec:1.9 packages/couchdb/couchdb.spec:1.10
--- packages/couchdb/couchdb.spec:1.9 Sun Feb 26 12:56:48 2012
+++ packages/couchdb/couchdb.spec Sun Feb 26 13:03:34 2012
@@ -42,6 +42,7 @@
Requires(pre): /usr/sbin/groupadd
Requires(pre): /usr/sbin/useradd
Requires: erlang = %{erlangver}
+Requires: rc-scripts = 0.4.0.17
Provides: group(couchdb)
Provides: user(couchdb)
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -191,6 +192,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.10 2012/02/26 12:03:34 glen
+- daemon --user dep
+
Revision 1.9 2012/02/26 11:56:48 glen
- restore license line
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/couchdb/couchdb.spec?r1=1.9r2=1.10f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: couchdb/couchdb.init - show status
Author: glen Date: Sun Feb 26 12:04:44 2012 GMT Module: packages Tag: HEAD Log message: - show status Files affected: packages/couchdb: couchdb.init (1.8 - 1.9) Diffs: Index: packages/couchdb/couchdb.init diff -u packages/couchdb/couchdb.init:1.8 packages/couchdb/couchdb.init:1.9 --- packages/couchdb/couchdb.init:1.8 Sun Feb 26 13:02:58 2012 +++ packages/couchdb/couchdb.init Sun Feb 26 13:04:39 2012 @@ -118,6 +118,8 @@ reload ;; status) +# Display the status of the running Apache CouchDB process. +$COUCHDB -s status couchdb RETVAL=$? ;; CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/couchdb/couchdb.init?r1=1.8r2=1.9f=u ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: couchdb/couchdb.init - respawn timeout to 0
Author: glen Date: Sun Feb 26 12:05:36 2012 GMT Module: packages Tag: HEAD Log message: - respawn timeout to 0 Files affected: packages/couchdb: couchdb.init (1.9 - 1.10) Diffs: Index: packages/couchdb/couchdb.init diff -u packages/couchdb/couchdb.init:1.9 packages/couchdb/couchdb.init:1.10 --- packages/couchdb/couchdb.init:1.9 Sun Feb 26 13:04:39 2012 +++ packages/couchdb/couchdb.init Sun Feb 26 13:05:31 2012 @@ -20,7 +20,7 @@ COUCHDB_USER='couchdb' COUCHDB_STDOUT='/dev/null' COUCHDB_STDERR='/dev/null' -COUCHDB_RESPAWN_TIMEOUT='5' +COUCHDB_RESPAWN_TIMEOUT='0' # Get service config - may override defaults [ -f /etc/sysconfig/couchdb ] . /etc/sysconfig/couchdb CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/couchdb/couchdb.init?r1=1.9r2=1.10f=u ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: couchdb/couchdb.spec, couchdb/js185.patch (NEW) - js 1.8.5 patch ...
Author: glen Date: Sun Feb 26 12:18:59 2012 GMT
Module: packages Tag: HEAD
Log message:
- js 1.8.5 patch from fedora
Files affected:
packages/couchdb:
couchdb.spec (1.10 - 1.11) , js185.patch (NONE - 1.1) (NEW)
Diffs:
Index: packages/couchdb/couchdb.spec
diff -u packages/couchdb/couchdb.spec:1.10 packages/couchdb/couchdb.spec:1.11
--- packages/couchdb/couchdb.spec:1.10 Sun Feb 26 13:03:34 2012
+++ packages/couchdb/couchdb.spec Sun Feb 26 13:18:54 2012
@@ -23,6 +23,7 @@
# Source0-md5: cfdc2ab751bf18049c5ef7866602d8ed
Source1: %{name}.init
Source2: %{name}.tmpfiles
+Patch0:js185.patch
URL: http://couchdb.apache.org/
BuildRequires: autoconf = 2.59
BuildRequires: automake = 1.6.3
@@ -30,7 +31,7 @@
BuildRequires: erlang = %{erlangver}
BuildRequires: help2man
BuildRequires: intltool
-BuildRequires: js-devel = 1.8
+BuildRequires: js-devel = 2:1.8
BuildRequires: libicu-devel = 3.4.1
BuildRequires: libtool
BuildRequires: pakchois-devel
@@ -66,6 +67,7 @@
%prep
%setup -q -n apache-%{name}-%{version}
+%patch0 -p1
%build
%{__libtoolize}
@@ -192,6 +194,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.11 2012/02/26 12:18:54 glen
+- js 1.8.5 patch from fedora
+
Revision 1.10 2012/02/26 12:03:34 glen
- daemon --user dep
Index: packages/couchdb/js185.patch
diff -u /dev/null packages/couchdb/js185.patch:1.1
--- /dev/null Sun Feb 26 13:18:59 2012
+++ packages/couchdb/js185.patchSun Feb 26 13:18:54 2012
@@ -0,0 +1,465 @@
+From b513bbd1f13cf06aba9abb5e0e84df8c7b493b58 Mon Sep 17 00:00:00 2001
+From: Jan Horak jho...@redhat.com
+Date: Thu, 5 May 2011 16:24:08 +0200
+Subject: [PATCH 11/13] Spidermonkey 1.8.5 patch
+
+---
+ src/couchdb/priv/couch_js/http.c | 66
+ src/couchdb/priv/couch_js/main.c | 132 +
+ src/couchdb/priv/couch_js/utf8.c |4 +-
+ 3 files changed, 103 insertions(+), 99 deletions(-)
+
+diff --git a/src/couchdb/priv/couch_js/http.c
b/src/couchdb/priv/couch_js/http.c
+index a672b66..8bd3cb6 100644
+--- a/src/couchdb/priv/couch_js/http.c
b/src/couchdb/priv/couch_js/http.c
+@@ -49,12 +49,25 @@ go(JSContext* cx, JSObject* obj, HTTPData* http, char*
body, size_t blen);
+ static JSString*
+ str_from_binary(JSContext* cx, char* data, size_t length);
+
++JSClass CouchHTTPClass;
++
+ static JSBool
+-constructor(JSContext* cx, JSObject* obj, uintN argc, jsval* argv, jsval*
rval)
++constructor(JSContext* cx, uintN argc, jsval* vp)
+ {
+ HTTPData* http = NULL;
+ JSBool ret = JS_FALSE;
+-
++jsval* argv = JS_ARGV(cx, vp);
++JSObject *obj = NULL;
++//if (JS_IsConstructing(cx, vp)) {
++ obj = JS_NewObject(cx, CouchHTTPClass, NULL, NULL);
++ if (!obj)
++ return JS_FALSE;
++//} else {
++// obj = JS_THIS_OBJECT(cx, vp);
++//}
++//printf(con %x\n, obj);
++
++JSBool *con = JS_IsConstructing(cx, vp);
+ http = (HTTPData*) malloc(sizeof(HTTPData));
+ if(!http)
+ {
+@@ -67,6 +80,7 @@ constructor(JSContext* cx, JSObject* obj, uintN argc, jsval*
argv, jsval* rval)
+ http-req_headers = NULL;
+ http-last_status = -1;
+
++JS_SET_RVAL(cx, vp, OBJECT_TO_JSVAL(obj));
+ if(!JS_SetPrivate(cx, obj, http))
+ {
+ JS_ReportError(cx, Failed to set private CouchHTTP data.);
+@@ -90,6 +104,7 @@ destructor(JSContext* cx, JSObject* obj)
+ if(!http)
+ {
+ fprintf(stderr, Unable to destroy invalid CouchHTTP instance.\n);
++//printf(Unable to destroy invalid CouchHTTP instance.\n);
+ }
+ else
+ {
+@@ -100,12 +115,15 @@ destructor(JSContext* cx, JSObject* obj)
+ }
+
+ static JSBool
+-open(JSContext* cx, JSObject* obj, uintN argc, jsval* argv, jsval* rval)
+-{
+-HTTPData* http = (HTTPData*) JS_GetPrivate(cx, obj);
++open(JSContext* cx, uintN argc, jsval* vp)
++{
++JSObject *obj = JS_THIS_OBJECT(cx, vp);
++//printf(open %x\n, obj);
++HTTPData* http = (HTTPData*) JS_GetPrivate(cx, JS_THIS_OBJECT(cx, vp));
+ char* method = NULL;
+ char* url = NULL;
+ JSBool ret = JS_FALSE;
++jsval* argv = JS_ARGV(cx, vp);
+ int methid;
+
+ if(!http)
+@@ -182,14 +200,16 @@ done:
+ }
+
+ static JSBool
+-setheader(JSContext* cx, JSObject* obj, uintN argc, jsval* argv, jsval* rval)
++setheader(JSContext* cx, uintN argc, jsval* vp)
+ {
+-HTTPData* http = (HTTPData*) JS_GetPrivate(cx, obj);
++//printf(setheader %x\n, JS_THIS_OBJECT(cx, vp));
++HTTPData* http = (HTTPData*) JS_GetPrivate(cx, JS_THIS_OBJECT(cx, vp));
+ char* keystr = NULL;
+ char* valstr = NULL;
+ char* hdrbuf = NULL;
+ size_t hdrlen = -1;
+ JSBool ret = JS_FALSE;
++jsval* argv = JS_ARGV(cx, vp);
+
+
packages: couchdb/couchdb.spec, couchdb/pkg-config.patch (NEW) - use pkg-co...
Author: glen Date: Sun Feb 26 12:21:19 2012 GMT
Module: packages Tag: HEAD
Log message:
- use pkg-config patch from fc
Files affected:
packages/couchdb:
couchdb.spec (1.11 - 1.12) , pkg-config.patch (NONE - 1.1) (NEW)
Diffs:
Index: packages/couchdb/couchdb.spec
diff -u packages/couchdb/couchdb.spec:1.11 packages/couchdb/couchdb.spec:1.12
--- packages/couchdb/couchdb.spec:1.11 Sun Feb 26 13:18:54 2012
+++ packages/couchdb/couchdb.spec Sun Feb 26 13:21:14 2012
@@ -24,6 +24,7 @@
Source1: %{name}.init
Source2: %{name}.tmpfiles
Patch0:js185.patch
+Patch1:pkg-config.patch
URL: http://couchdb.apache.org/
BuildRequires: autoconf = 2.59
BuildRequires: automake = 1.6.3
@@ -68,6 +69,7 @@
%prep
%setup -q -n apache-%{name}-%{version}
%patch0 -p1
+%patch1 -p1
%build
%{__libtoolize}
@@ -75,9 +77,7 @@
%{__autoconf}
%{__autoheader}
%{__automake}
-%configure \
- --with-erlang=%{_libdir}/erlang%{_includedir} \
-
+%configure
%{__make}
%install
@@ -194,6 +194,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.12 2012/02/26 12:21:14 glen
+- use pkg-config patch from fc
+
Revision 1.11 2012/02/26 12:18:54 glen
- js 1.8.5 patch from fedora
Index: packages/couchdb/pkg-config.patch
diff -u /dev/null packages/couchdb/pkg-config.patch:1.1
--- /dev/null Sun Feb 26 13:21:19 2012
+++ packages/couchdb/pkg-config.patch Sun Feb 26 13:21:14 2012
@@ -0,0 +1,107 @@
+From e93f577e0c33d6fa6c5464dfa423fb66746ad5e4 Mon Sep 17 00:00:00 2001
+From: Peter Lemenkov lemen...@gmail.com
+Date: Tue, 31 May 2011 18:08:15 +0400
+Subject: [PATCH 13/13] Use pkg-config
+
+Signed-off-by: Peter Lemenkov lemen...@gmail.com
+---
+ configure.ac | 32 ++--
+ src/couchdb/priv/Makefile.am |4 ++--
+ 2 files changed, 16 insertions(+), 20 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 79fa8dd..0d81805 100644
+--- a/configure.ac
b/configure.ac
+@@ -51,39 +51,36 @@ AC_ARG_WITH([erlang], [AC_HELP_STRING([--with-erlang=PATH],
+ ERLANG_FLAGS=-I$withval
+ ], [
+ ERLANG_FLAGS=-I${libdir}/erlang/usr/include
+-ERLANG_FLAGS=$ERLANG_FLAGS -I/usr/lib/erlang/usr/include
+-ERLANG_FLAGS=$ERLANG_FLAGS -I/usr/local/lib/erlang/usr/include
+-ERLANG_FLAGS=$ERLANG_FLAGS -I/opt/local/lib/erlang/usr/include
+ ])
+
++AC_PATH_PROG([PKG_CONFIG], [pkg-config])
++
++if test x${PKG_CONFIG} = x; then
++ AC_MSG_ERROR([You have to install pkg-config to compile CouchDB.])
++fi
++
+ AC_ARG_WITH([js-include], [AC_HELP_STRING([--with-js-include=PATH],
+ [set PATH to the SpiderMonkey include directory])], [
+ JS_INCLUDE=$withval
+-JS_FLAGS=-I$JS_INCLUDE
++JS_FLAGS=-I$JS_INCLUDE `pkg-config mozjs185 --cflags`
+ ], [
+-JS_FLAGS=-I/usr/include
+-JS_FLAGS=$JS_FLAGS -I/usr/include/js
+-JS_FLAGS=$JS_FLAGS -I/usr/include/mozjs
+-JS_FLAGS=$JS_FLAGS -I/usr/local/include
+-JS_FLAGS=$JS_FLAGS -I/opt/local/include
+-JS_FLAGS=$JS_FLAGS -I/usr/local/include/js
+-JS_FLAGS=$JS_FLAGS -I/opt/local/include/js
++JS_FLAGS=`pkg-config mozjs185 --cflags`
+ ])
+
+ AC_ARG_WITH([js-lib], [AC_HELP_STRING([--with-js-lib=PATH],
+ [set PATH to the SpiderMonkey library directory])],
+ [
+ JS_LIB_DIR=$withval
+-JS_LIB_FLAGS=-L$withval
++JS_LIB_FLAGS=-L$withval `pkg-config mozjs185 --libs`
+ ], [
+ JS_LIB_DIR=
++JS_LIB_FLAGS=`pkg-config mozjs185 --libs`
+ ])
+ AC_SUBST(JS_LIB_DIR)
+
+ AC_ARG_VAR([ERLC_FLAGS], [general flags to prepend to ERLC_FLAGS])
+ AC_ARG_VAR([FLAGS], [general flags to prepend to LDFLAGS and CPPFLAGS])
+
+-LIB_FLAGS=$JS_LIB_FLAGS -L/usr/local/lib -L/opt/local/lib
+ LIBS=$LIB_FLAGS $LIBS
+
+ case $(uname -s) in
+@@ -98,11 +95,9 @@ case $(uname -s) in
+ LTCFLAGS=$CFLAGS
+ ;;
+ *)
+-# XP_UNIX required for jsapi.h and has been tested to work on Linux and
Darwin.
+-FLAGS=$LIB_FLAGS $ERLANG_FLAGS $JS_FLAGS -DXP_UNIX $FLAGS
+-CPPFLAGS=$FLAGS $CPPFLAGS
++CPPFLAGS=$FLAGS $ERLANG_FLAGS $JS_FLAGS $CPPFLAGS
+ # manually linking libm is requred for FreeBSD 7.0
+-LDFLAGS=$FLAGS -lm $LDFLAGS
++LDFLAGS=$FLAGS $JS_LIB_FLAGS -lm $LDFLAGS
+ ;;
+ esac
+
+@@ -215,7 +210,8 @@ AC_ARG_WITH([win32-curl],
[AC_HELP_STRING([--with-win32-curl=PATH],
+ CURL_LDFLAGS=-l$CURL_LIBS -lWs2_32 -lkernel32 -luser32 -ladvapi32
-lWldap32
+ ], [
+ AC_CHECK_CURL([7.18.0])
+-CURL_LDFLAGS=-lcurl
++CURL_CFLAGS=`pkg-config libcurl --cflags`
++CURL_LDFLAGS=`pkg-config libcurl --libs`
+ ])
+
+ AC_SUBST(CURL_CFLAGS)
+diff --git a/src/couchdb/priv/Makefile.am b/src/couchdb/priv/Makefile.am
+index 0a99cbf..5d0477e 100644
+--- a/src/couchdb/priv/Makefile.am
b/src/couchdb/priv/Makefile.am
+@@
packages: apache/apache.spec - merge mod_unixd into -base, it's required an...
Author: adamgDate: Sun Feb 26 12:43:06 2012 GMT
Module: packages Tag: HEAD
Log message:
- merge mod_unixd into -base, it's required anyway
Files affected:
packages/apache:
apache.spec (1.658 - 1.659)
Diffs:
Index: packages/apache/apache.spec
diff -u packages/apache/apache.spec:1.658 packages/apache/apache.spec:1.659
--- packages/apache/apache.spec:1.658 Sun Feb 26 12:23:41 2012
+++ packages/apache/apache.spec Sun Feb 26 13:43:00 2012
@@ -192,7 +192,6 @@
Requires(pre): /usr/sbin/groupadd
Requires(pre): /usr/sbin/useradd
Requires: /sbin/chkconfig
-Requires: %{name}-mod_unixd = %{version}-%{release}
Requires: apr = %{apr_ver}
Requires: psmisc = 20.1
Requires: rc-scripts = 0.4.1.23
@@ -1927,16 +1926,6 @@
maszyn. Moduł ustawia przy każdym zapytaniu zmienną środowiskową
UNIQUE_ID.
-%package mod_unixd
-Summary: Basic (required) security for Unix-family platforms.
-Group: Networking/Daemons/HTTP
-URL: http://httpd.apache.org/docs/2.4/mod/mod_unixd.html
-Requires: %{name}-base = %{version}-%{release}
-Provides: apache(mod_unixd) = %{version}-%{release}
-
-%description mod_unixd
-Basic (required) security for Unix-family platforms.
-
%package mod_userdir
Summary: User-specific directories
Summary(pl.UTF-8): Katalogi specyficzne dla użytkowników
@@ -2347,7 +2336,6 @@
echo LoadModule speling_modulemodules/mod_speling.so
$CFG/00_mod_speling.conf
echo LoadModule substitute_module modules/mod_substitute.so
$CFG/00_mod_substitute.conf
echo LoadModule unique_id_module modules/mod_unique_id.so
$CFG/00_mod_unique_id.conf
-echo LoadModule unixd_module modules/mod_unixd.so $CFG/00_mod_unixd.conf
echo LoadModule usertrack_module modules/mod_usertrack.so
$CFG/00_mod_usertrack.conf
echo LoadModule version_modulemodules/mod_version.so
$CFG/00_mod_version.conf
echo LoadModule watchdog_modulemodules/mod_watchdog.so
$CFG/00_mod_watchdog.conf
@@ -2663,7 +2651,6 @@
%module_scripts mod_status
%module_scripts mod_substitute
%module_scripts mod_unique_id
-%module_scripts mod_unixd
%module_scripts mod_userdir
%module_scripts mod_usertrack
%module_scripts mod_version
@@ -2748,6 +2735,7 @@
%attr(755,root,root) %{_libexecdir}/mod_mpm_event.so
%attr(755,root,root) %{_libexecdir}/mod_mpm_prefork.so
%attr(755,root,root) %{_libexecdir}/mod_mpm_worker.so
+%attr(755,root,root) %{_libexecdir}/mod_unixd.so
%files doc -f manual.files
%defattr(644,root,root,755)
@@ -3253,11 +3241,6 @@
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/conf.d/*_mod_unique_id.conf
%attr(755,root,root) %{_libexecdir}/mod_unique_id.so
-%files mod_unixd
-%defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/conf.d/*_mod_unixd.conf
-%attr(755,root,root) %{_libexecdir}/mod_unixd.so
-
%files mod_userdir
%defattr(644,root,root,755)
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/conf.d/*_mod_userdir.conf
@@ -3313,6 +3296,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.659 2012/02/26 12:43:00 adamg
+- merge mod_unixd into -base, it's required anyway
+
Revision 1.658 2012/02/26 11:23:41 adamg
- fix Obsoletes in mod_auth{n,z}_core
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache/apache.spec?r1=1.658r2=1.659f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: apache/apache-httpd.conf - load unixd_module
Author: adamgDate: Sun Feb 26 12:43:17 2012 GMT Module: packages Tag: HEAD Log message: - load unixd_module Files affected: packages/apache: apache-httpd.conf (1.61 - 1.62) Diffs: Index: packages/apache/apache-httpd.conf diff -u packages/apache/apache-httpd.conf:1.61 packages/apache/apache-httpd.conf:1.62 --- packages/apache/apache-httpd.conf:1.61 Sun Feb 26 10:05:31 2012 +++ packages/apache/apache-httpd.conf Sun Feb 26 13:43:12 2012 @@ -14,6 +14,7 @@ # User/Group: The name (or #number) of the user/group to run httpd as. # It is usually good practice to create a dedicated user and group for # running httpd, as with most system services. +LoadModule unixd_module modules/mod_unixd.so User http Group http CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache/apache-httpd.conf?r1=1.61r2=1.62f=u ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: apache/apache.spec - mod_auth{n, z}_* require appropriate core module
Author: adamgDate: Sun Feb 26 12:48:54 2012 GMT
Module: packages Tag: HEAD
Log message:
- mod_auth{n,z}_* require appropriate core module
Files affected:
packages/apache:
apache.spec (1.659 - 1.660)
Diffs:
Index: packages/apache/apache.spec
diff -u packages/apache/apache.spec:1.659 packages/apache/apache.spec:1.660
--- packages/apache/apache.spec:1.659 Sun Feb 26 13:43:00 2012
+++ packages/apache/apache.spec Sun Feb 26 13:48:46 2012
@@ -545,6 +545,7 @@
Group: Networking/Daemons/HTTP
URL: http://httpd.apache.org/docs/2.4/mod/mod_authn_anon.html
Requires: %{name}-base = %{version}-%{release}
+Requires: %{name}-mod_authn_core = %{version}-%{release}
Provides: apache(mod_authn_anon) = %{version}-%{release}
# compat
Provides: apache(mod_auth_anon) = %{version}-%{release}
@@ -590,6 +591,7 @@
Group: Networking/Daemons/HTTP
URL: http://httpd.apache.org/docs/2.4/mod/mod_authn_dbd.html
Requires: %{name}-base = %{version}-%{release}
+Requires: %{name}-mod_authn_core = %{version}-%{release}
Requires: %{name}-mod_dbd = %{version}-%{release}
Provides: apache(mod_authn_dbd) = %{version}-%{release}
@@ -609,6 +611,7 @@
Group: Networking/Daemons/HTTP
URL: http://httpd.apache.org/docs/2.4/mod/mod_authn_dbm.html
Requires: %{name}-base = %{version}-%{release}
+Requires: %{name}-mod_authn_core = %{version}-%{release}
Provides: apache(mod_authn_dbm) = %{version}-%{release}
%description mod_authn_dbm
@@ -627,6 +630,7 @@
Group: Networking/Daemons/HTTP
URL: http://httpd.apache.org/docs/2.4/mod/mod_authn_file.html
Requires: %{name}-base = %{version}-%{release}
+Requires: %{name}-mod_authn_core = %{version}-%{release}
Provides: apache(mod_authn_file) = %{version}-%{release}
%description mod_authn_file
@@ -644,6 +648,7 @@
Group: Networking/Daemons/HTTP
URL: http://httpd.apache.org/docs/2.4/mod/mod_authn_socache.html
Requires: %{name}-base = %{version}-%{release}
+Requires: %{name}-mod_authn_core = %{version}-%{release}
Provides: apache(mod_authn_socache) = %{version}-%{release}
%description mod_authn_socache
@@ -695,6 +700,7 @@
Group: Networking/Daemons/HTTP
URL: http://httpd.apache.org/docs/2.4/mod/mod_authz_dbd.html
Requires: %{name}-base = %{version}-%{release}
+Requires: %{name}-mod_authz_core = %{version}-%{release}
Provides: apache(mod_authz_dbd) = %{version}-%{release}
%description mod_authz_dbd
@@ -706,6 +712,7 @@
Group: Networking/Daemons/HTTP
URL: http://httpd.apache.org/docs/2.4/mod/mod_authz_dbm.html
Requires: %{name}-base = %{version}-%{release}
+Requires: %{name}-mod_authz_core = %{version}-%{release}
Provides: apache(mod_authz_dbm) = %{version}-%{release}
%description mod_authz_dbm
@@ -724,6 +731,7 @@
Group: Networking/Daemons/HTTP
URL: http://httpd.apache.org/docs/2.4/mod/mod_authz_groupfile.html
Requires: %{name}-base = %{version}-%{release}
+Requires: %{name}-mod_authz_core = %{version}-%{release}
Provides: apache(mod_authz_groupfile) = %{version}-%{release}
%description mod_authz_groupfile
@@ -742,6 +750,7 @@
Group: Networking/Daemons/HTTP
URL: http://httpd.apache.org/docs/2.4/mod/mod_authz_host.html
Requires: %{name}-base = %{version}-%{release}
+Requires: %{name}-mod_authz_core = %{version}-%{release}
# provides compatibility directives for 2.2-style access control
Requires: apache(mod_access_compat) = %{version}-%{release}
Provides: apache(mod_authz_host) = %{version}-%{release}
@@ -769,6 +778,7 @@
Group: Networking/Daemons/HTTP
URL: http://httpd.apache.org/docs/2.4/en/mod/mod_authz_owner.html
Requires: %{name}-base = %{version}-%{release}
+Requires: %{name}-mod_authz_core = %{version}-%{release}
#Requires: any-auth-module
Provides: apache(mod_authz_owner) = %{version}-%{release}
@@ -793,6 +803,7 @@
Group: Networking/Daemons/HTTP
URL: http://httpd.apache.org/docs/2.4/en/mod/mod_authz_user.html
Requires: %{name}-base = %{version}-%{release}
+Requires: %{name}-mod_authz_core = %{version}-%{release}
Provides: apache(mod_authz_user) = %{version}-%{release}
%description mod_authz_user
@@ -3296,6 +3307,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.660 2012/02/26 12:48:46 adamg
+- mod_auth{n,z}_* require appropriate core module
+
Revision 1.659 2012/02/26 12:43:00 adamg
- merge mod_unixd into -base, it's required anyway
CVS-web:
DISTFILES: farstream: farstream-0.1.1.tar.gz
Files fetched: 1 STORED: http://freedesktop.org/software/farstream/releases/farstream/farstream-0.1.1.tar.gz 74f8048c915e8f4675cb749bc10f54e9 farstream-0.1.1.tar.gz Size: 1262988 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: farstream/farstream.spec (NEW) - new
Author: megabajt Date: Sun Feb 26 13:00:41 2012 GMT
Module: packages Tag: HEAD
Log message:
- new
Files affected:
packages/farstream:
farstream.spec (NONE - 1.1) (NEW)
Diffs:
Index: packages/farstream/farstream.spec
diff -u /dev/null packages/farstream/farstream.spec:1.1
--- /dev/null Sun Feb 26 14:00:41 2012
+++ packages/farstream/farstream.spec Sun Feb 26 14:00:36 2012
@@ -0,0 +1,170 @@
+# $Revision$, $Date$
+#
+# Conditional build:
+%bcond_without apidocs # do not build and package API docs
+%bcond_without static_libs # don't build static libraries
+#
+%include /usr/lib/rpm/macros.gstreamer
+Summary: Audio/Video Communications Framework
+Name: farstream
+Version: 0.1.1
+Release: 1
+License: LGPL v2+
+Group: Libraries
+Source0:
http://freedesktop.org/software/farstream/releases/farstream/%{name}-%{version}.tar.gz
+# Source0-md5: 74f8048c915e8f4675cb749bc10f54e9
+URL: http://www.freedesktop.org/wiki/Software/Farstream
+BuildRequires: autoconf = 2.60
+BuildRequires: automake
+BuildRequires: glib2-devel = 1:2.26.0
+BuildRequires: gobject-introspection-devel = 0.10.1
+BuildRequires: gstreamer-devel = 0.10.33
+BuildRequires: gstreamer-plugins-base-devel = 0.10.33
+BuildRequires: gtk-doc = 1.8
+BuildRequires: gupnp-igd-devel
+BuildRequires: libnice-devel = 0.1.0
+BuildRequires: libtool
+BuildRequires: pkgconfig
+BuildRequires: python-devel = 1:2.4
+BuildRequires: python-gstreamer-devel = 0.10.10
+BuildRequires: python-pygobject-devel = 2.16.0
+BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+
+%description
+Farstream is a collection of GStreamer modules and libraries for
+videoconferencing.
+
+%package devel
+Summary: Header files for Farstream library
+Summary(pl.UTF-8): Pliki nagłówkowe biblioteki Farstream
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: gstreamer-devel = 0.10.33
+Requires: gstreamer-plugins-base-devel = 0.10.33
+
+%description devel
+Header files for Farstream library.
+
+%description devel -l pl.UTF-8
+Pliki nagłówkowe biblioteki Farstream.
+
+%package static
+Summary: Static Farstream library
+Summary(pl.UTF-8): Statyczna biblioteka Farstream
+Group: Development/Libraries
+Requires: %{name}-devel = %{version}-%{release}
+
+%description static
+Static Farstream library.
+
+%description static -l pl.UTF-8
+Statyczna biblioteka Farstream.
+
+%package apidocs
+Summary: Farstream API documentation
+Summary(pl.UTF-8): Dokumentacja API biblioteki Farstream
+Group: Documentation
+Requires: gtk-doc-common
+
+%description apidocs
+API documentation for Farstream library.
+
+%description apidocs -l pl.UTF-8
+Dokumentacja API biblioteki Farstream.
+
+%package -n python-farstream
+Summary: Farstream Python bindings
+Summary(pl.UTF-8): Wiązania języka Python do Farstream
+Group: Libraries/Python
+Requires: %{name} = %{version}-%{release}
+
+%description -n python-farstream
+Farstream Python bindings.
+
+%description -n python-farstream -l pl.UTF-8
+Wiązania języka Python do Farstream.
+
+%prep
+%setup -q
+
+%build
+%{__libtoolize}
+%{__aclocal} -I m4 -I common/m4
+%{__autoconf}
+%{__autoheader}
+%{__automake}
+%configure \
+ %{__enable_disable apidocs gtk-doc} \
+ %{__enable_disable static_libs static} \
+ --disable-silent-rules \
+ --with-html-dir=%{_gtkdocdir}
+%{__make}
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+%{__make} install \
+ DESTDIR=$RPM_BUILD_ROOT
+
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/{farstream-0.1,gstreamer-0.10}/*.{a,la}
+%{__rm} $RPM_BUILD_ROOT%{py_sitedir}/*.{a,la}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post -p /sbin/ldconfig
+%postun-p /sbin/ldconfig
+
+%files
+%defattr(644,root,root,755)
+%doc AUTHORS ChangeLog NEWS README
+%attr(755,root,root) %{_libdir}/libfarstream-0.1.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libfarstream-0.1.so.0
+%{_libdir}/girepository-1.0/Farstream-0.1.typelib
+%dir %{_libdir}/farstream-0.1
+%attr(755,root,root) %{_libdir}/farstream-0.1/libmulticast-transmitter.so
+%attr(755,root,root) %{_libdir}/farstream-0.1/libnice-transmitter.so
+%attr(755,root,root) %{_libdir}/farstream-0.1/librawudp-transmitter.so
+%attr(755,root,root) %{_libdir}/farstream-0.1/libshm-transmitter.so
+%attr(755,root,root) %{_libdir}/gstreamer-0.10/libfsfunnel.so
+%attr(755,root,root) %{_libdir}/gstreamer-0.10/libfsmsnconference.so
+%attr(755,root,root) %{_libdir}/gstreamer-0.10/libfsrawconference.so
+%attr(755,root,root) %{_libdir}/gstreamer-0.10/libfsrtcpfilter.so
+%attr(755,root,root) %{_libdir}/gstreamer-0.10/libfsrtpconference.so
+%attr(755,root,root) %{_libdir}/gstreamer-0.10/libfsvideoanyrate.so
+%{_datadir}/farstream
+
+%files devel
packages: apache/apache.spec - mod_ssl R += mod_socache_shmcb (should be S:...
Author: adamgDate: Sun Feb 26 13:26:19 2012 GMT
Module: packages Tag: HEAD
Log message:
- mod_ssl R += mod_socache_shmcb (should be S:, but require it to ease upgrade
from 2.2)
Files affected:
packages/apache:
apache.spec (1.660 - 1.661)
Diffs:
Index: packages/apache/apache.spec
diff -u packages/apache/apache.spec:1.660 packages/apache/apache.spec:1.661
--- packages/apache/apache.spec:1.660 Sun Feb 26 13:48:46 2012
+++ packages/apache/apache.spec Sun Feb 26 14:26:13 2012
@@ -1858,6 +1858,7 @@
Group: Networking/Daemons/HTTP
URL: http://httpd.apache.org/docs/2.4/mod/mod_ssl.html
Requires: %{name}-base = %{version}-%{release}
+Requires: %{name}-mod_socache_shmcb = %{version}-%{release}
Requires: openssl = %{openssl_ver}
%if %{pld_release} != ac
Requires: apr-util-dbm-db
@@ -3307,6 +3308,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.661 2012/02/26 13:26:13 adamg
+- mod_ssl R += mod_socache_shmcb (should be S:, but require it to ease upgrade
from 2.2)
+
Revision 1.660 2012/02/26 12:48:46 adamg
- mod_auth{n,z}_* require appropriate core module
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache/apache.spec?r1=1.660r2=1.661f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: apache/apache.spec - peruser mpm dropped almost 3 years ago - eve...
Author: adamgDate: Sun Feb 26 13:33:42 2012 GMT Module: packages Tag: HEAD Log message: - peruser mpm dropped almost 3 years ago - event mpm no longer experimental, no need to bcond it Files affected: packages/apache: apache.spec (1.661 - 1.662) Diffs: Index: packages/apache/apache.spec diff -u packages/apache/apache.spec:1.661 packages/apache/apache.spec:1.662 --- packages/apache/apache.spec:1.661 Sun Feb 26 14:26:13 2012 +++ packages/apache/apache.spec Sun Feb 26 14:33:35 2012 @@ -15,8 +15,6 @@ # Conditional build: %bcond_without ssl # build without SSL support %bcond_without ldap# build without LDAP support -%bcond_without peruser # peruser MPM -%bcond_without event # event MPM %bcond_withitk # ITK MPM %bcond_withdistcache # distcache support %bcond_withbucketeer # debug one @@ -3308,6 +3306,10 @@ All persons listed below can be reached at cvs_login@pld-linux.org $Log$ +Revision 1.662 2012/02/26 13:33:35 adamg +- peruser mpm dropped almost 3 years ago +- event mpm no longer experimental, no need to bcond it + Revision 1.661 2012/02/26 13:26:13 adamg - mod_ssl R += mod_socache_shmcb (should be S:, but require it to ease upgrade from 2.2) CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache/apache.spec?r1=1.661r2=1.662f=u ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: psmisc: psmisc-22.16.tar.gz psmisc-non-english-man-pages.tar.bz2
Files fetched: 1 STORED: http://downloads.sourceforge.net/psmisc/psmisc-22.16.tar.gz d52caf26159c905574c2ce4bd792b9ee psmisc-22.16.tar.gz Size: 465138 bytes ALREADY GOT: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/psmisc-non-english-man-pages.tar.bz2 9add7665e440bbd6b0b4f9293ba8b86d psmisc-non-english-man-pages.tar.bz2 -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: psmisc/psmisc.spec, psmisc/psmisc-commlen.patch (REMOVED) - up to...
Author: arekmDate: Sun Feb 26 14:12:11 2012 GMT
Module: packages Tag: HEAD
Log message:
- up to 22.16; pl.po patch needs update
Files affected:
packages/psmisc:
psmisc.spec (1.105 - 1.106) , psmisc-commlen.patch (1.1 - NONE) (REMOVED)
Diffs:
Index: packages/psmisc/psmisc.spec
diff -u packages/psmisc/psmisc.spec:1.105 packages/psmisc/psmisc.spec:1.106
--- packages/psmisc/psmisc.spec:1.105 Sat Feb 11 09:05:04 2012
+++ packages/psmisc/psmisc.spec Sun Feb 26 15:12:05 2012
@@ -14,16 +14,15 @@
Summary(tr.UTF-8): /proc dosya sistemi için ps tipi araçlar
Summary(uk.UTF-8): Утиліти роботи з процесами
Name: psmisc
-Version: 22.15
-Release: 2
+Version: 22.16
+Release: 1
License: GPL v2+
Group: Applications/System
Source0:
http://downloads.sourceforge.net/psmisc/%{name}-%{version}.tar.gz
-# Source0-md5: 35e155bae2e499a6dcba35884560db1e
+# Source0-md5: d52caf26159c905574c2ce4bd792b9ee
Source1:
http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
# Source1-md5: 9add7665e440bbd6b0b4f9293ba8b86d
Patch0:%{name}-pl.po-update.patch
-Patch1:psmisc-commlen.patch
URL: http://psmisc.sourceforge.net/
BuildRequires: autoconf = 2.61
BuildRequires: automake = 1:1.10
@@ -89,8 +88,7 @@
%prep
%setup -q
-%patch0 -p1
-%patch1 -p1
+#%patch0 -p1
%build
%{__gettextize}
@@ -146,6 +144,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.106 2012/02/26 14:12:05 arekm
+- up to 22.16; pl.po patch needs update
+
Revision 1.105 2012/02/11 08:05:04 arekm
- rel 2; fix pstree abort
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/psmisc/psmisc.spec?r1=1.105r2=1.106f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: builder - pass user-specified opts when updateding poldek indexes
Author: adamgDate: Sun Feb 26 14:27:15 2012 GMT
Module: packages Tag: HEAD
Log message:
- pass user-specified opts when updateding poldek indexes
Files affected:
packages:
builder (1.669 - 1.670)
Diffs:
Index: packages/builder
diff -u packages/builder:1.669 packages/builder:1.670
--- packages/builder:1.669 Sat Dec 10 17:18:35 2011
+++ packages/builderSun Feb 26 15:27:09 2012
@@ -152,6 +152,7 @@
fi
fi
+UPDATE_POLDEK_INDEXES_OPTS=
# Here we load saved user environment used to
# predefine options set above, or passed to builder
@@ -165,6 +166,7 @@
# Example of ~/.builderrc:
#
#UPDATE_POLDEK_INDEXES=yes
+#UPDATE_POLDEK_INDEXES_OPTS=--mo=nodiff
#FETCH_BUILD_REQUIRES=yes
#REMOVE_BUILD_REQUIRES=force
#GROUP_BCONDS=yes
@@ -2615,7 +2617,7 @@
esac
build_package
if [ $UPDATE_POLDEK_INDEXES = yes -a $COMMAND !=
build-prep ]; then
- run_poldek --sdir=${POLDEK_INDEX_DIR} --mkidxz
+ run_poldek --sdir=${POLDEK_INDEX_DIR}
${UPDATE_POLDEK_INDEXES_OPTS} --mkidxz
fi
remove_build_requires
;;
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/builder?r1=1.669r2=1.670f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: builder - updating poldek indexes makes only sense when building ...
Author: adamgDate: Sun Feb 26 14:34:19 2012 GMT
Module: packages Tag: HEAD
Log message:
- updating poldek indexes makes only sense when building binary rpms
Files affected:
packages:
builder (1.670 - 1.671)
Diffs:
Index: packages/builder
diff -u packages/builder:1.670 packages/builder:1.671
--- packages/builder:1.670 Sun Feb 26 15:27:09 2012
+++ packages/builderSun Feb 26 15:34:13 2012
@@ -2616,7 +2616,7 @@
;;
esac
build_package
- if [ $UPDATE_POLDEK_INDEXES = yes -a $COMMAND !=
build-prep ]; then
+ if [ $UPDATE_POLDEK_INDEXES = yes ] [ $COMMAND =
build -o $COMMAND = build-binary ]; then
run_poldek --sdir=${POLDEK_INDEX_DIR}
${UPDATE_POLDEK_INDEXES_OPTS} --mkidxz
fi
remove_build_requires
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/builder?r1=1.670r2=1.671f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: apache/apache.spec - triggers to ease upgrade to 2.4 (handles sim...
Author: adamgDate: Sun Feb 26 15:17:42 2012 GMT
Module: packages Tag: HEAD
Log message:
- triggers to ease upgrade to 2.4 (handles simple configuration properly)
Files affected:
packages/apache:
apache.spec (1.662 - 1.663)
Diffs:
Index: packages/apache/apache.spec
diff -u packages/apache/apache.spec:1.662 packages/apache/apache.spec:1.663
--- packages/apache/apache.spec:1.662 Sun Feb 26 14:33:35 2012
+++ packages/apache/apache.spec Sun Feb 26 16:17:37 2012
@@ -2412,6 +2412,16 @@
install -d /etc/httpd
ln -s conf.d /etc/httpd/httpd.conf
fi
+if [ -f /etc/sysconfig/httpd ]; then
+MPM=$(grep HTTPD_MPM /etc/sysconfig/httpd |sed 's,HTTPD_MPM=,,;s,,,g')
+if [ -n $MPM ]; then
+echo LoadModule mpm_${MPM}_module
modules/mod_mpm_${MPM}.so /etc/httpd/conf.d/10_mpm.conf.rpmnew
+cat /etc/httpd/conf.d/10_mpm.conf
/etc/httpd/conf.d/10_mpm.conf.rpmnew
+mv /etc/httpd/conf.d/10_mpm.conf.rpmnew
/etc/httpd/conf.d/10_mpm.conf
+sed -i -e 's,HTTPD_MPM.*,,g' /etc/sysconfig/httpd
+fi
+fi
+
exit 0
%post base
@@ -2527,6 +2537,18 @@
fi
%systemd_trigger httpd.service
+%triggerpostun base -- %{name} 2.4.0
+cp -f /etc/httpd/apache.conf{,.rpmsave}
+sed -i -e '
+ /^DefaultType.*/s,.*,,
+ /^Include /s,^Include ,IncludeOptional ,
+ /^NameVirtualHost.*/s,.*,,
+ /^User/s,^,LoadModule unixd_module modules/mod_unixd.so\n,
+' /etc/httpd/apache.conf
+sed -i -e '
+ s,^LockFile /var/run/httpd/accept.lock,Mutex file:/var/run/httpd/,g
+' /etc/httpd/conf.d/10_mpm.conf
+
%triggerpostun mod_ssl -- %{name}-mod_ssl 1:2.2.0-3.1
cp -f /etc/httpd/conf.d/40_mod_ssl.conf{,.rpmsave}
sed -i -e '
@@ -2534,6 +2556,13 @@
s,/var/cache/apache,/var/cache/httpd,g
' /etc/httpd/conf.d/40_mod_ssl.conf
+%triggerpostun mod_ssl -- %{name}-mod_ssl 1:2.4.0
+cp -f /etc/httpd/conf.d/40_mod_ssl.conf{,.rpmsave}
+sed -i -e '
+ /^SSLMutex/s,^,#,
+ /^NameVirtualHost.*/s,.*,,
+' /etc/httpd/conf.d/40_mod_ssl.conf
+
%posttrans base
# restore lock which we disabled in pretrans
mv -f /var/lock/subsys/httpd{.disabled,} 2/dev/null
@@ -3306,6 +3335,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.663 2012/02/26 15:17:37 adamg
+- triggers to ease upgrade to 2.4 (handles simple configuration properly)
+
Revision 1.662 2012/02/26 13:33:35 adamg
- peruser mpm dropped almost 3 years ago
- event mpm no longer experimental, no need to bcond it
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache/apache.spec?r1=1.662r2=1.663f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: zsh/zsh.spec - up to 4.3.17
Author: arekmDate: Sun Feb 26 15:22:39 2012 GMT
Module: packages Tag: HEAD
Log message:
- up to 4.3.17
Files affected:
packages/zsh:
zsh.spec (1.158 - 1.159)
Diffs:
Index: packages/zsh/zsh.spec
diff -u packages/zsh/zsh.spec:1.158 packages/zsh/zsh.spec:1.159
--- packages/zsh/zsh.spec:1.158 Fri Jan 13 15:12:07 2012
+++ packages/zsh/zsh.spec Sun Feb 26 16:22:34 2012
@@ -14,12 +14,12 @@
Summary(tr.UTF-8): Gelişmiş bir BASH sürümü
Summary(uk.UTF-8): Командний процесор (shell) схожий на ksh, але з
покращеннями
Name: zsh
-Version: 4.3.15
+Version: 4.3.17
Release: 1
License: BSD-like
Group: Applications/Shells
Source0:
ftp://sunsite.icm.edu.pl/pub/unix/shells/zsh/%{name}-%{version}.tar.bz2
-# Source0-md5: 11766b0dd674a513810903cd33ffcac4
+# Source0-md5: 8258967060b2654f30001a011946ac6a
#Source0: ftp://ftp.zsh.org/pub/%{name}-%{version}.tar.bz2
Source1: %{name}.1.pl
Source2: http://zsh.sunsite.dk/Guide/%{name}guide.pdf
@@ -312,6 +312,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.159 2012/02/26 15:22:34 arekm
+- up to 4.3.17
+
Revision 1.158 2012/01/13 14:12:07 zbyniu
- up to 4.3.15
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/zsh/zsh.spec?r1=1.158r2=1.159f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: zsh: zsh-4.3.17.tar.bz2 zshguide.pdf
Files fetched: 1 STORED: ftp://sunsite.icm.edu.pl/pub/unix/shells/zsh/zsh-4.3.17.tar.bz2 8258967060b2654f30001a011946ac6a zsh-4.3.17.tar.bz2 Size: 2978903 bytes ALREADY GOT: http://zsh.sunsite.dk/Guide/zshguide.pdf 70cc3760dd8140f9aed693d484cd87dc zshguide.pdf -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
PLD-doc: PLD-update-TODO - updated
Author: arekmDate: Sun Feb 26 15:28:50 2012 GMT Module: PLD-doc Tag: HEAD Log message: - updated Files affected: PLD-doc: PLD-update-TODO (1.1431 - 1.1432) Diffs: Index: PLD-doc/PLD-update-TODO diff -u PLD-doc/PLD-update-TODO:1.1431 PLD-doc/PLD-update-TODO:1.1432 --- PLD-doc/PLD-update-TODO:1.1431 Thu Feb 23 08:16:58 2012 +++ PLD-doc/PLD-update-TODO Sun Feb 26 16:28:45 2012 @@ -1,4 +1,5 @@ 4store(8) [OLD] 0.9.5 [NEW] 1.1.4 +ClanLib(20) [OLD] 2.3.4 [NEW] 2.3.5 DirectFB-examples(9) [OLD] 1.5.2 [NEW] 1.5.3 GUIlib(9) [OLD] 1.1.2 [NEW] 1.2.1 Gorm(9) [OLD] 1.2.8 [NEW] 1.2.16 @@ -56,12 +57,11 @@ asm(10) [OLD] 1.5.3 [NEW] 4.0 asm2(10) [OLD] 2.2.3 [NEW] 4.0 aspell-ca(12) [OLD] 2.1.5 [NEW] 20040130 -aspell-pl-alt(9) [OLD] 20120129 [NEW] 20120222 -asterisk(45) [OLD] 10.0.1 [NEW] 10.1.2 -asterisk-oh323(11) [OLD] 0.7.1 [NEW] 0.7.3 +aspell-pl-alt(9) [OLD] 20120129 [NEW] 20120226 +asterisk(45) [OLD] 10.0.1 [NEW] 10.1.3 asterisk-perl(14) [OLD] 0.10 [NEW] 1.03 asterisk-sounds-core(11) [OLD] 1.4.21 [NEW] 1.4.22 -asunder(9) [OLD] 1.0 [NEW] 2.1 +asunder(9) [OLD] 1.0 [NEW] 2.2 authconfig(15) [OLD] 6.1.17 [NEW] 6.2.1 autoconf2_13(18) [OLD] 2.13 [NEW] 2.68 autofs(21) [OLD] 5.0.5 [NEW] 5.0.6 @@ -101,6 +101,7 @@ cdl3(9) [OLD] 1.2.7 [NEW] 1.2.8 celt051(9) [OLD] 0.5.1.3 [NEW] 0.11.3 centerim(14) [OLD] 4.22.9 [NEW] 4.22.10 +ceph(8) [OLD] 0.41 [NEW] 0.42 cfengine(12) [OLD] 3.0.5p1 [NEW] 3.3.0a1 cfl(9) [OLD] 0.8.0 [NEW] 1.1 cfs(10) [OLD] 1.3.3 [NEW] 1.4.1 @@ -118,11 +119,10 @@ cman(13) [OLD] 2.03.10 [NEW] 3.0.7 cnmonitor.spec:10: impossible substitution: http://dl.sourceforge.net/project/cnmonitor/CN%3DMonitor/1.3/cnmonitor-1.3-3.tgz collectd(75) [OLD] 5.0.2 [NEW] 5.0.3 -colord(15) [OLD] 0.1.16 [NEW] 0.1.17 compat-gcc-34(13) [OLD] 3.4.6 [NEW] 4.6.2 conary(9) [OLD] 0.62.14 [NEW] 2.3.11 coq(17) [OLD] 8.3pl1 [NEW] 84 -crafty(12) [OLD] 20.1 [NEW] 23.4 +cpuid(9) [OLD] 20110305 [NEW] 20120225 crossalpha-binutils(13) [OLD] 2.17.50.0.3 [NEW] 2.22.52.0.1 crossalpha-gcc(14) [OLD] 4.1.1 [NEW] 4.6.2 crossarm-binutils(17) [OLD] 2.18.50.0.2 [NEW] 2.22.52.0.1 @@ -142,7 +142,6 @@ crossm68k-uClibc(17) [OLD] 0.9.27 [NEW] 0.9.33 crossmingw32-lua40(10) [OLD] 4.0.1 [NEW] 5.2.0 crossmingw32-lua50(10) [OLD] 5.0.2 [NEW] 5.2.0 -crossmingw32-tolua++(10) [OLD] 1.0.4 [NEW] 1.0.93 crossmingw32-xz(9) [OLD] 5.0.3 [NEW] 5.1.1alpha crossmipsel-binutils(13) [OLD] 2.20.51.0.5 [NEW] 2.22.52.0.1 crossmipsel-egcs(11) [OLD] 1.0.2 [NEW] 1.1.2 @@ -170,7 +169,7 @@ cyclone(11) [OLD] 0.5 [NEW] 0.8 daemon(10) [OLD] 0.6.3 [NEW] 0.6.4.html dahdi-tools(31) [OLD] 2.4.1 [NEW] 2.6.0 -dbus(15) [OLD] 1.4.16 [NEW] 1.5.10 +dbus(15) [OLD] 1.4.18 [NEW] 1.5.10 debhelper(13) [OLD] 8.9.6 [NEW] 9.20120115 debiandoc-sgml(10) [OLD] 1.1.101 [NEW] 1.2.25 debianutils(8) [OLD] 2.30 [NEW] 4.2.1 @@ -190,7 +189,9 @@ dotnet-gdata-sharp(11) [OLD] 1.7.0.1 [NEW] 1.9.0.0 dotnet-gtk-sharp(17) [OLD] 1.0.10 [NEW] 2.10.3 dotnet-ndesk-dbus-sharp(13) [OLD] 0.6.0 [NEW] 0.6.1a -dropbear(10) [OLD] 0.53 [NEW] 2011.54 +doxygen(18) [OLD] 1.7.6.1 [NEW] 1.8.0 +dropbear(10) [OLD] 0.53 [NEW] 2012.55 +dropto(8) [OLD] 0.3.2 [NEW] 0.3.3 drupal-mod-spam(10) [OLD] 2.0.13 [NEW] 2.1.4 drwright(9) [OLD] 3.2.2 [NEW] 3.2.4 dtrx(9) [OLD] 6.6 [NEW] 7.1 @@ -211,26 +212,24 @@ epic4(9) [OLD] 2.2 [NEW] 2.10.1 erlang-exmpp(8) [OLD] 0.9.2 [NEW] 0.9.9 exact-image(8) [OLD] 0.8.5 [NEW] 0.8.7 -exempi(9) [OLD] 2.1.1 [NEW] 2.2.0 exim-lite(11) [OLD] 4.51 [NEW] 4.69 fakechroot(9) [OLD] 2.3 [NEW] 2.16.orig fakeroot(10) [OLD] 1.18 [NEW] 1.18.2 fax4CUPS(9) [OLD] 1.24 [NEW] 1.29 -fbida(28) [OLD] 2.08 [NEW] 2.09 fbterm(9) [OLD] 1.7 [NEW] 1.7.0 fdmf(10) [OLD] 0.0.9r [NEW] 0.0.9s febootstrap(8) [OLD] 3.12 [NEW] 3.13 fence(10) [OLD] 2.03.10 [NEW] 3.0.7 -fftw(14) [OLD] 2.1.5 [NEW] 3.3 -file(36) [OLD] 5.10 [NEW] 5.11 +fftw(14) [OLD] 2.1.5 [NEW] 3.3.1 +fftw3(16) [OLD] 3.3 [NEW] 3.3.1 +fio(9) [OLD] 2.0.3 [NEW] 2.0.4 flickcurl(10) [OLD] 1.21 [NEW] 1.22 flow-tools(9) [OLD] 0.68.5 [NEW] 0.68.5.1 flumotion(9) [OLD] 0.5.1 [NEW] 0.10.0 -fonts-TTF-RedHat-liberation(10) [OLD] 1.07.1 [NEW] 1.07.2 +folks(8) [OLD] 0.6.6 [NEW] 0.6.7 fonts-TTF-hanazono(9) [OLD] 20110915 [NEW] 20120202 foomatic-filters(14) [OLD] 4.0.9 [NEW] 4.0.12 forked-daapd(12) [OLD] 0.16 [NEW] 0.19gcd -fox(16) [OLD] 1.7.32 [NEW] 1.7.33 freedt(9) [OLD] 0.21 [NEW] 0.22 freeipa(23) [OLD] 2.1.0 [NEW] 2.1.90.pre2 freepbx(12) [OLD] 2.3.0 [NEW] 2.6.0beta1 @@ -238,6 +237,7 @@ frox(12) [OLD] 0.7.18 [NEW] 20020304 fvwm2(27) [OLD] 2.5.28 [NEW] 2.7.0 fxscintilla(13) [OLD] 1.71 [NEW] 2.28.0 +gammu(10) [OLD] 1.31.0 [NEW] 1.31.90 gap-toric(8) [OLD] 1.6 [NEW] 1.7 gaphor(9) [OLD] 0.13.1 [NEW] 0.17.1 garcon(14) [OLD] 0.1.9 [NEW] 0.1.10 @@ -259,12 +259,11 @@ giFT-FastTrack(9) [OLD] 0.8.9 [NEW] 030518 gkrellm-bgchg(9) [OLD] 0.1.7 [NEW] 0.1.11 glm(9) [OLD] 0.3 [NEW] 0.3.1 -global(15) [OLD] 4.7 [NEW] 6.2 +global
packages: apache/apache.spec - better description (from docs)
Author: adamgDate: Sun Feb 26 15:42:09 2012 GMT
Module: packages Tag: HEAD
Log message:
- better description (from docs)
Files affected:
packages/apache:
apache.spec (1.663 - 1.664)
Diffs:
Index: packages/apache/apache.spec
diff -u packages/apache/apache.spec:1.663 packages/apache/apache.spec:1.664
--- packages/apache/apache.spec:1.663 Sun Feb 26 16:17:37 2012
+++ packages/apache/apache.spec Sun Feb 26 16:42:00 2012
@@ -337,14 +337,22 @@
desenvolver módulos adicionais para o Apache.
%package mod_access_compat
-Summary: Group authorizations based on host (name or IPaddress)
+Summary: Group authorizations based on host (name or IP address)
Group: Networking/Daemons/HTTP
URL: http://httpd.apache.org/docs/2.4/mod/mod_access_compat.html
Requires: %{name}-base = %{version}-%{release}
Provides: apache(mod_access_compat) = %{version}-%{release}
%description mod_access_compat
-Group authorizations based on host (name or IPaddress)
+The directives provided by mod_access_compat are used in Directory,
+Files, and Location sections as well as .htaccess files to control
+access to particular parts of the server. Access can be controlled
+based on the client hostname, IP address, or other characteristics of
+the client request, as captured in environment variables. The Allow
+and Deny directives are used to specify which clients are or are not
+allowed access to the server, while the Order directive sets the
+default access state, and configures how the Allow and Deny directives
+interact with each other.
%package mod_actions
Summary: Apache module for executing CGI scripts based on media type or
request method
@@ -419,7 +427,8 @@
Provides: apache(mod_allowmethods) = %{version}-%{release}
%description mod_allowmethods
-Easily restrict what HTTP methods can be used on the server
+This module makes it easy to restrict what HTTP methods can used on an
+server.
%package mod_asis
Summary: Sends files that contain their own HTTP headers
@@ -535,7 +544,11 @@
Provides: apache(mod_auth_form) = %{version}-%{release}
%description mod_auth_form
-Form authentication
+This module allows the use of an HTML login form to restrict access by
+looking up users in the given providers. HTML forms require
+significantly more configuration than the alternatives,
+however an HTML login form can provide a much friendlier experience
+for end users.
%package mod_authn_anon
Summary: Apache module that allows anonymous user access to
authenticated areas
@@ -650,7 +663,8 @@
Provides: apache(mod_authn_socache) = %{version}-%{release}
%description mod_authn_socache
-Manages a cache of authentication credentials to relievethe load on backends
+This module maintains a cache of authentication credentials, so that a
+new backend lookup is not required for every authenticated request.
%package mod_authnz_ldap
Summary: Apache module that allows an LDAP directory to be used to store
the database for HTTP Basic authentication
@@ -702,7 +716,19 @@
Provides: apache(mod_authz_dbd) = %{version}-%{release}
%description mod_authz_dbd
-Group Authorization and Login using SQL
+This module provides authorization capabilities so that authenticated
+users can be allowed or denied access to portions of the web site by
+group membership. Similar functionality is provided by
+mod_authz_groupfile and mod_authz_dbm, with the exception that this
+module queries a SQL database to determine whether a user is a member
+of a group.
+
+This module can also provide database-backed user login/logout
+capabilities. These are likely to be of most value when used in
+conjunction with mod_authn_dbd.
+
+This module relies on mod_dbd to specify the backend database driver
+and connection parameters, and manage the database connections.
%package mod_authz_dbm
Summary: Apache module that allows group authorization using DBM files
@@ -849,7 +875,21 @@
Provides: apache(mod_buffer) = %{version}-%{release}
%description mod_buffer
-Support for request buffering
+This module provides the ability to buffer the input and output filter
+stacks.
+
+Under certain circumstances, content generators might create content
+in small chunks. In order to promote memory reuse, in memory chunks
+are always 8k in size, regardless of the size of the chunk itself.
+When many small chunks are generated by a request, this can create a
+large memory footprint while the request is being processed, and an
+unnecessarily large amount of data on the wire. The addition of a
+buffer collapses the response into the fewest chunks possible.
+
+When httpd is used in front of an expensive content generator,
+buffering the response may allow the backend to complete processing
+and release resources sooner, depending on how the backend is
packages: sysfsutils/sysfsutils.spec - verbose files in system dirs; ghost ...
Author: glen Date: Sun Feb 26 17:21:56 2012 GMT
Module: packages Tag: HEAD
Log message:
- verbose files in system dirs; ghost soname symlink
Files affected:
packages/sysfsutils:
sysfsutils.spec (1.23 - 1.24)
Diffs:
Index: packages/sysfsutils/sysfsutils.spec
diff -u packages/sysfsutils/sysfsutils.spec:1.23
packages/sysfsutils/sysfsutils.spec:1.24
--- packages/sysfsutils/sysfsutils.spec:1.23Thu Mar 10 13:17:45 2011
+++ packages/sysfsutils/sysfsutils.spec Sun Feb 26 18:21:50 2012
@@ -1,13 +1,13 @@
# $Revision$, $Date$
+%defineorg_version 2.1.0
Summary: System utilities package
Summary(pl.UTF-8): Pakiet narzędzi systemowych
Name: sysfsutils
-%defineorg_version 2.1.0
Version: 2.2.0
-Release: 2
+Release: 3
License: LGPL v2.1/GPL v2
Group: Applications/System
-Source0:
http://dl.sourceforge.net/linux-diag/%{name}-%{org_version}.tar.gz
+Source0:
http://downloads.sourceforge.net/linux-diag/%{name}-%{org_version}.tar.gz
# Source0-md5: 14e7dcd0436d2f49aa403f67e1ef7ddc
Patch0:%{name}-lsi.patch
URL: http://linux-diag.sourceforge.net/Sysfsutils.html
@@ -98,20 +98,25 @@
%defattr(644,root,root,755)
# COPYING contains only note, not actual GPL/LGPL texts
%doc AUTHORS COPYING CREDITS ChangeLog NEWS README TODO
-%attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) %{_libdir}/lib*.so.*.*.*
-%{_mandir}/man1/*
+%attr(755,root,root) %{_bindir}/dlist_test
+%attr(755,root,root) %{_bindir}/get_device
+%attr(755,root,root) %{_bindir}/get_driver
+%attr(755,root,root) %{_bindir}/get_module
+%attr(755,root,root) %{_bindir}/systool
+%attr(755,root,root) %{_libdir}/libsysfs.so.*.*.*
+%ghost %{_libdir}/libsysfs.so.2
+%{_mandir}/man1/systool.1*
%files devel
%defattr(644,root,root,755)
%doc docs/libsysfs.txt
-%attr(755,root,root) %{_libdir}/lib*.so
-%{_libdir}/lib*.la
+%{_libdir}/libsysfs.so
+%{_libdir}/libsysfs.la
%{_includedir}/sysfs
%files static
%defattr(644,root,root,755)
-%{_libdir}/lib*.a
+%{_libdir}/libsysfs.a
%define date %(echo `LC_ALL=C date +%a %b %d %Y`)
%changelog
@@ -119,6 +124,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.24 2012/02/26 17:21:50 glen
+- verbose files in system dirs; ghost soname symlink
+
Revision 1.23 2011/03/10 12:17:45 arekm
- release 2
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/sysfsutils/sysfsutils.spec?r1=1.23r2=1.24f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: sqlite/sqlite.spec - release 4
Author: glen Date: Sun Feb 26 17:24:10 2012 GMT
Module: packages Tag: HEAD
Log message:
- release 4
Files affected:
packages/sqlite:
sqlite.spec (1.57 - 1.58)
Diffs:
Index: packages/sqlite/sqlite.spec
diff -u packages/sqlite/sqlite.spec:1.57 packages/sqlite/sqlite.spec:1.58
--- packages/sqlite/sqlite.spec:1.57Sun Feb 20 10:02:24 2011
+++ packages/sqlite/sqlite.spec Sun Feb 26 18:24:05 2012
@@ -2,12 +2,12 @@
#
# Conditional build:
%bcond_withutf8# build with UTF-8 support
-#
+
Summary: SQLite library
Summary(pl.UTF-8): Biblioteka SQLite
Name: sqlite
Version: 2.8.17
-Release: 3
+Release: 4
License: LGPL
Group: Libraries
# Source0Download: http://sqlite.org/download.html
@@ -143,7 +143,7 @@
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
-install sqlite.1 $RPM_BUILD_ROOT%{_mandir}/man1
+cp -p sqlite.1 $RPM_BUILD_ROOT%{_mandir}/man1
%clean
rm -rf $RPM_BUILD_ROOT
@@ -177,6 +177,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.58 2012/02/26 17:24:05 glen
+- release 4
+
Revision 1.57 2011/02/20 09:02:24 qboosh
- more verbose files, ghost soname symlink
- don't package CVS dir as doc
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/sqlite/sqlite.spec?r1=1.57r2=1.58f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: imap/imap.spec - package ghost soname symlink
Author: glen Date: Sun Feb 26 17:31:11 2012 GMT
Module: packages Tag: HEAD
Log message:
- package ghost soname symlink
Files affected:
packages/imap:
imap.spec (1.130 - 1.131)
Diffs:
Index: packages/imap/imap.spec
diff -u packages/imap/imap.spec:1.130 packages/imap/imap.spec:1.131
--- packages/imap/imap.spec:1.130 Fri Aug 12 19:52:40 2011
+++ packages/imap/imap.spec Sun Feb 26 18:31:06 2012
@@ -8,7 +8,7 @@
Summary(zh_CN.UTF-8): IMAP和POP服务器
Name: imap
Version: 2007f
-Release: 1
+Release: 2
Epoch: 1
License: Apache v2.0
Group: Networking/Daemons
@@ -459,6 +459,7 @@
%files lib
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libc-client.so.*.*
+%ghost %{_libdir}/libc-client.so.2007f
%files devel
%defattr(644,root,root,755)
@@ -480,6 +481,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.131 2012/02/26 17:31:06 glen
+- package ghost soname symlink
+
Revision 1.130 2011/08/12 17:52:40 qboosh
- updated to 2007f
- updated sharedlib patch
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/imap/imap.spec?r1=1.130r2=1.131f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: imap/imap.spec - create soname link in install
Author: glen Date: Sun Feb 26 17:35:52 2012 GMT
Module: packages Tag: HEAD
Log message:
- create soname link in install
Files affected:
packages/imap:
imap.spec (1.131 - 1.132)
Diffs:
Index: packages/imap/imap.spec
diff -u packages/imap/imap.spec:1.131 packages/imap/imap.spec:1.132
--- packages/imap/imap.spec:1.131 Sun Feb 26 18:31:06 2012
+++ packages/imap/imap.spec Sun Feb 26 18:35:47 2012
@@ -33,6 +33,7 @@
Patch8:%{name}-headers_fix.patch
Patch9:%{name}-annotations.patch
URL: http://www.washington.edu/imap/
+BuildRequires: /sbin/ldconfig
BuildRequires: openssl-devel = 0.9.7d
BuildRequires: pam-devel
BuildRequires: rpmbuild(macros) = 1.268
@@ -385,6 +386,8 @@
install %{SOURCE8} $RPM_BUILD_ROOT/etc/openssl/certs/ipop3d.pem
%endif
+/sbin/ldconfig -n $RPM_BUILD_ROOT%{_libdir}
+
touch $RPM_BUILD_ROOT/etc/security/blacklist.{pop3,imap}
%clean
@@ -481,6 +484,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.132 2012/02/26 17:35:47 glen
+- create soname link in install
+
Revision 1.131 2012/02/26 17:31:06 glen
- package ghost soname symlink
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/imap/imap.spec?r1=1.131r2=1.132f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: wv/wv.spec - verbose files in system dirs; ghost soname symlink
Author: glen Date: Sun Feb 26 17:49:11 2012 GMT
Module: packages Tag: HEAD
Log message:
- verbose files in system dirs; ghost soname symlink
Files affected:
packages/wv:
wv.spec (1.94 - 1.95)
Diffs:
Index: packages/wv/wv.spec
diff -u packages/wv/wv.spec:1.94 packages/wv/wv.spec:1.95
--- packages/wv/wv.spec:1.94Wed Feb 8 14:27:45 2012
+++ packages/wv/wv.spec Sun Feb 26 18:49:06 2012
@@ -2,16 +2,16 @@
#
# Conditional build:
%bcond_without static_libs # without static version
-#
+
Summary: MSWord Document to HTML converter
Summary(pl.UTF-8): Konwerter dokumentów MS Worda do HTML
Summary(pt_BR.UTF-8): Conversor de arquivos formato Word (6/7/8/9) para html
Name: wv
Version: 1.2.4
-Release: 9
+Release: 10
License: GPL
Group: Applications/Text
-Source0: http://dl.sourceforge.net/wvware/%{name}-%{version}.tar.gz
+Source0:
http://downloads.sourceforge.net/wvware/%{name}-%{version}.tar.gz
# Source0-md5: c1861c560491f121e12917fa76970ac5
Patch0:%{name}-pc.patch
URL: http://wvware.sourceforge.net/
@@ -32,7 +32,7 @@
Obsoletes: mswordview
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-%definespecflags_ia32 -fomit-frame-pointer
+%definespecflags_ia32 -fomit-frame-pointer
%description
MSWordView is a program that understands the Microsoft Word 8 binary
@@ -119,10 +119,39 @@
%files
%defattr(644,root,root,755)
%doc README
-%attr(755,root,root) %{_bindir}/wv*
+%attr(755,root,root) %{_bindir}/wvAbw
+%attr(755,root,root) %{_bindir}/wvCleanLatex
+%attr(755,root,root) %{_bindir}/wvConvert
+%attr(755,root,root) %{_bindir}/wvDVI
+%attr(755,root,root) %{_bindir}/wvDocBook
+%attr(755,root,root) %{_bindir}/wvHtml
+%attr(755,root,root) %{_bindir}/wvLatex
+%attr(755,root,root) %{_bindir}/wvMime
+%attr(755,root,root) %{_bindir}/wvPDF
+%attr(755,root,root) %{_bindir}/wvPS
+%attr(755,root,root) %{_bindir}/wvRTF
+%attr(755,root,root) %{_bindir}/wvSummary
+%attr(755,root,root) %{_bindir}/wvText
+%attr(755,root,root) %{_bindir}/wvVersion
+%attr(755,root,root) %{_bindir}/wvWare
+%attr(755,root,root) %{_bindir}/wvWml
%attr(755,root,root) %{_libdir}/libwv-*.so.*.*.*
+%ghost %{_libdir}/libwv-*.so.3
%{_datadir}/wv
-%{_mandir}/man*/*
+%{_mandir}/man1/wvAbw.1*
+%{_mandir}/man1/wvCleanLatex.1*
+%{_mandir}/man1/wvDVI.1*
+%{_mandir}/man1/wvHtml.1*
+%{_mandir}/man1/wvLatex.1*
+%{_mandir}/man1/wvMime.1*
+%{_mandir}/man1/wvPDF.1*
+%{_mandir}/man1/wvPS.1*
+%{_mandir}/man1/wvRTF.1*
+%{_mandir}/man1/wvSummary.1*
+%{_mandir}/man1/wvText.1*
+%{_mandir}/man1/wvVersion.1*
+%{_mandir}/man1/wvWare.1*
+%{_mandir}/man1/wvWml.1*
%files devel
%defattr(644,root,root,755)
@@ -143,6 +172,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.95 2012/02/26 17:49:06 glen
+- verbose files in system dirs; ghost soname symlink
+
Revision 1.94 2012/02/08 13:27:45 arekm
- release 9
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/wv/wv.spec?r1=1.94r2=1.95f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: qt4/qt4.spec, qt4/qt4-git.patch - rel 6; some fixes from git
Author: arekmDate: Sun Feb 26 18:42:00 2012 GMT
Module: packages Tag: HEAD
Log message:
- rel 6; some fixes from git
Files affected:
packages/qt4:
qt4.spec (1.305 - 1.306) , qt4-git.patch (1.5 - 1.6)
Diffs:
Index: packages/qt4/qt4.spec
diff -u packages/qt4/qt4.spec:1.305 packages/qt4/qt4.spec:1.306
--- packages/qt4/qt4.spec:1.305 Wed Feb 8 23:37:30 2012
+++ packages/qt4/qt4.spec Sun Feb 26 19:41:54 2012
@@ -57,7 +57,7 @@
Summary(pt_BR.UTF-8): Estrutura para rodar aplicações GUI Qt
Name: qt4
Version: 4.8.0
-Release: 5
+Release: 6
License: LGPL v2.1 or GPL v3.0
Group: X11/Libraries
Source0:
http://download.qt.nokia.com/qt/source/qt-everywhere-opensource-src-%{version}.tar.gz
@@ -82,6 +82,7 @@
Patch7:%{name}-x11_fonts.patch
Patch8:%{name}-pl-update.patch
Patch9:%{name}-ibase.patch
+Patch10: %{name}-git.patch
Patch11: qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch
URL: http://qt.nokia.com/
%{?with_ibase:BuildRequires: Firebird-devel}
@@ -1402,6 +1403,7 @@
%patch7 -p1
#%patch8 -p1
%patch9 -p1
+%patch10 -p1
%patch11 -p1
%{__sed} -i -e 's,usr/X11R6/,usr/g,' mkspecs/linux-g++-64/qmake.conf \
@@ -2408,6 +2410,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.306 2012/02/26 18:41:54 arekm
+- rel 6; some fixes from git
+
Revision 1.305 2012/02/08 22:37:30 adamg
- QMAKE_* vars are in g++-base.conf
Index: packages/qt4/qt4-git.patch
diff -u /dev/null packages/qt4/qt4-git.patch:1.6
--- /dev/null Sun Feb 26 19:42:00 2012
+++ packages/qt4/qt4-git.patch Sun Feb 26 19:41:54 2012
@@ -0,0 +1,398 @@
+commit 1095252559a937efcaaf012d8dfbb4e13c4fd6b5
+Author: John Stanley jpsinthe...@verizon.net
+Date: Tue Jan 17 20:04:59 2012 -0500
+
+Pass events to installed event dispatcher event filters before passing
them to x11ProcessEvent()
+
+Change-Id: If551c732b520b0105a3d4578db1b039c1b5d49fd
+
+Pass events to eventFilter first
+
+Change-Id: If551c732b520b0105a3d4578db1b039c1b5d49fd
+Reviewed-by: Bradley T. Hughes bradley.hug...@nokia.com
+
+diff --git a/src/gui/kernel/qclipboard_x11.cpp
b/src/gui/kernel/qclipboard_x11.cpp
+index 803b1ba..72110ed 100644
+--- a/src/gui/kernel/qclipboard_x11.cpp
b/src/gui/kernel/qclipboard_x11.cpp
+@@ -579,7 +579,10 @@ bool QX11Data::clipboardWaitForEvent(Window win, int
type, XEvent *event, int ti
+
+ // process other clipboard events, since someone is probably
requesting data from us
+ XEvent e;
+-if (XCheckIfEvent(X11-display, e, checkForClipboardEvents, 0))
++// Pass the event through the event dispatcher filter so that
applications
++// which install an event filter on the dispatcher get to handle
it first.
++if (XCheckIfEvent(X11-display, e, checkForClipboardEvents, 0)
++!QAbstractEventDispatcher::instance()-filterEvent(e))
+ qApp-x11ProcessEvent(e);
+
+ now.start();
+diff --git a/src/gui/kernel/qdnd_x11.cpp b/src/gui/kernel/qdnd_x11.cpp
+index 2b14743..d2050d1 100644
+--- a/src/gui/kernel/qdnd_x11.cpp
b/src/gui/kernel/qdnd_x11.cpp
+@@ -42,6 +42,7 @@
+ #include qplatformdefs.h
+
+ #include qapplication.h
++#include qabstracteventdispatcher.h
+
+ #ifndef QT_NO_DRAGANDDROP
+
+@@ -1967,7 +1968,10 @@ Qt::DropAction QDragManager::drag(QDrag * o)
+ timer.start();
+ do {
+ XEvent event;
+-if (XCheckTypedEvent(X11-display, ClientMessage, event))
++// Pass the event through the event dispatcher filter so that
applications
++// which install an event filter on the dispatcher get to handle
it first.
++if (XCheckTypedEvent(X11-display, ClientMessage, event)
++!QAbstractEventDispatcher::instance()-filterEvent(event))
+ qApp-x11ProcessEvent(event);
+
+ // sleep 50 ms, so we don't use up CPU cycles all the time.
+diff --git a/src/gui/kernel/qwidget_x11.cpp b/src/gui/kernel/qwidget_x11.cpp
+index 4cdd6e7..3cff3ee 100644
+--- a/src/gui/kernel/qwidget_x11.cpp
b/src/gui/kernel/qwidget_x11.cpp
+@@ -44,6 +44,7 @@
+ #include qdesktopwidget.h
+ #include qapplication.h
+ #include qapplication_p.h
++#include qabstracteventdispatcher.h
+ #include qnamespace.h
+ #include qpainter.h
+ #include qbitmap.h
+@@ -376,17 +377,21 @@ void qt_x11_wait_for_window_manager(QWidget *w, bool
sendPostedEvents)
+ do {
+ if (XEventsQueued(X11-display, QueuedAlready)) {
+ XNextEvent(X11-display, ev);
+-qApp-x11ProcessEvent(ev);
+-
+-switch (state) {
+-case Initial:
+-if
DISTFILES: snappy: snappy-1.0.5.tar.gz
Files fetched: 1 STORED: http://snappy.googlecode.com/files/snappy-1.0.5.tar.gz 4c0af044e654f5983f4acbf00d1ac236 snappy-1.0.5.tar.gz Size: 1731382 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: snappy/snappy.spec - updated to 1.0.5
Author: qboosh Date: Sun Feb 26 19:07:46 2012 GMT
Module: packages Tag: HEAD
Log message:
- updated to 1.0.5
Files affected:
packages/snappy:
snappy.spec (1.4 - 1.5)
Diffs:
Index: packages/snappy/snappy.spec
diff -u packages/snappy/snappy.spec:1.4 packages/snappy/snappy.spec:1.5
--- packages/snappy/snappy.spec:1.4 Tue Sep 20 18:16:05 2011
+++ packages/snappy/snappy.spec Sun Feb 26 20:07:40 2012
@@ -2,13 +2,13 @@
Summary: Snappy - fast compression/decompression library
Summary(pl.UTF-8): Snappy - biblioteka do szybkiej kompresji i dekompresji
Name: snappy
-Version: 1.0.4
+Version: 1.0.5
Release: 1
License: BSD
Group: Libraries
#Source0Download: http://code.google.com/p/snappy/downloads/list
Source0: http://snappy.googlecode.com/files/%{name}-%{version}.tar.gz
-# Source0-md5: b69151652e82168bc5c643bcd6f07162
+# Source0-md5: 4c0af044e654f5983f4acbf00d1ac236
URL: http://code.google.com/p/snappy/
BuildRequires: autoconf = 2.50
BuildRequires: automake
@@ -136,6 +136,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.5 2012/02/26 19:07:40 qboosh
+- updated to 1.0.5
+
Revision 1.4 2011/09/20 16:16:05 qboosh
- updated to 1.0.4
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/snappy/snappy.spec?r1=1.4r2=1.5f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: mpd_sima: mpd_sima_0.9.1.tar.xz
Files fetched: 1 STORED: http://codingteam.net/project/sima/download/file/mpd_sima_0.9.1.tar.xz 45ed7c6078338b0c41f66a87fcd7c75b mpd_sima_0.9.1.tar.xz Size: 110216 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: mpd_sima/mpd_sima.spec, mpd_sima/man.patch (NEW) - up to 0.9.1
Author: wigetDate: Sun Feb 26 19:12:06 2012 GMT
Module: packages Tag: HEAD
Log message:
- up to 0.9.1
Files affected:
packages/mpd_sima:
mpd_sima.spec (1.2 - 1.3) , man.patch (NONE - 1.1) (NEW)
Diffs:
Index: packages/mpd_sima/mpd_sima.spec
diff -u packages/mpd_sima/mpd_sima.spec:1.2 packages/mpd_sima/mpd_sima.spec:1.3
--- packages/mpd_sima/mpd_sima.spec:1.2 Thu Feb 16 20:45:43 2012
+++ packages/mpd_sima/mpd_sima.spec Sun Feb 26 20:12:01 2012
@@ -1,13 +1,14 @@
# $Revision$, $Date$
Summary: Automagically add titles to mpd playlist
Name: mpd_sima
-Version: 0.9.0
+Version: 0.9.1
Release: 1
License: GPL v3+
Group: Applications
Source0:
http://codingteam.net/project/sima/download/file/%{name}_%{version}.tar.xz
-# Source0-md5: 3c64d480ecbeec7e9b3e83a153f7ba90
+# Source0-md5: 45ed7c6078338b0c41f66a87fcd7c75b
Source1: %{name}.service
+Patch0:man.patch
URL: http://codingteam.net/project/sima
BuildRequires: rpm-pythonprov
BuildRequires: sed = 4.0
@@ -29,6 +30,7 @@
%prep
%setup -q -n %{name}_%{version}
+%patch0 -p1
for f in src/mpd_sima src/simadb_cli; do
sed -i -e 's=#!/usr/bin/env python=#!/usr/bin/python=' $f
done
@@ -87,8 +89,8 @@
%dir %{_datadir}/mpd-sima/utils
%{_datadir}/mpd-sima/utils/*.py[co]
%{_mandir}/man1/mpd-sima.1*
-%{_mandir}/man1/mpd-sima.cfg.1*
%{_mandir}/man1/simadb_cli.1*
+%{_mandir}/man5/mpd-sima.cfg.5*
%{systemdunitdir}/%{name}.service
%attr(770,mpd_sima,mpd_sima) %{_sharedstatedir}/mpd_sima
@@ -98,6 +100,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.3 2012/02/26 19:12:01 wiget
+- up to 0.9.1
+
Revision 1.2 2012/02/16 19:45:43 wiget
- up to 0.9.0
- vardir.patch applied upstream
Index: packages/mpd_sima/man.patch
diff -u /dev/null packages/mpd_sima/man.patch:1.1
--- /dev/null Sun Feb 26 20:12:06 2012
+++ packages/mpd_sima/man.patch Sun Feb 26 20:12:01 2012
@@ -0,0 +1,63 @@
+--- mpd_sima_0.9.1/data/Makefile.wiget 2012-02-26 20:03:31.113116022 +0100
mpd_sima_0.9.1/data/Makefile 2012-02-26 20:04:32.612348816 +0100
+@@ -36,7 +36,7 @@ man: simadb_cli mpd_sima mpd_sima.cfg
+
+ html: simadb_cli_html mpd_sima_html mpd_sima.cfg_html
+
+-pdf: simadb_cli.1 mpd_sima.1 mpd_sima.cfg.4
++pdf: simadb_cli.1 mpd_sima.1 mpd_sima.cfg.5
+ /usr/bin/man -l -Tps mpd-sima.1 | /usr/bin/ps2pdf - ./mpd_sima.pdf
+ /usr/bin/man -l -Tps mpd-sima.cfg.5 | /usr/bin/ps2pdf -
./mpd_sima.cfg.pdf
+ /usr/bin/man -l -Tps simadb_cli.1 | /usr/bin/ps2pdf - ./simadb_cli.pdf
+--- mpd_sima_0.9.1/Makefile.wiget 2012-02-26 20:00:43.138878721 +0100
mpd_sima_0.9.1/Makefile2012-02-26 20:02:30.003688218 +0100
+@@ -10,13 +10,13 @@ MANDIR = $(DATADIR)/man
+
+ all: man bin
+ clean:
+- rm -f mpd-sima.1.gz simadb_cli.1.gz mpd-sima.cfg.1.gz mpd-sima
simadb_cli
++ rm -f mpd-sima.1.gz simadb_cli.1.gz mpd-sima.cfg.5.gz mpd-sima
simadb_cli
+
+-mpd-sima.1.gz:
++mpd-sima.1.gz: data/mpd-sima.1
+ cat data/mpd-sima.1 | gzip mpd-sima.1.gz
+
+-mpd-sima.cfg.1.gz:
+- cat data/mpd-sima.cfg.1 | gzip mpd-sima.cfg.1.gz
++mpd-sima.cfg.5.gz: data/mpd-sima.cfg.5
++ cat data/mpd-sima.cfg.5 | gzip mpd-sima.cfg.5.gz
+
+ simadb_cli.1.gz:
+ cat data/simadb_cli.1 | gzip simadb_cli.1.gz
+@@ -32,17 +32,18 @@ bash_completion:
+ install -m644 data/mpd_sima.completion.sh $(ETC)/bash_completion.d/
+ mv $(ETC)/bash_completion.d/mpd_sima.completion.sh
$(ETC)/bash_completion.d/mpd-sima
+
+-man: mpd-sima.1.gz simadb_cli.1.gz mpd-sima.cfg.1.gz
++man: mpd-sima.1.gz simadb_cli.1.gz mpd-sima.cfg.5.gz
+
+ bin: mpd-sima simadb_cli
+
+ install: man bin
+- install -d $(BIN) $(DATADIR)/mpd-sima $(MANDIR)/man1
++ install -d $(BIN) $(DATADIR)/mpd-sima $(MANDIR)/man1 $(MANDIR)/man5
+
+ install -m755 mpd-sima $(BIN)
+ install -m755 simadb_cli $(BIN)
+
+- install -m644 mpd-sima.1.gz mpd-sima.cfg.1.gz simadb_cli.1.gz
$(MANDIR)/man1
++ install -m644 mpd-sima.1.gz simadb_cli.1.gz $(MANDIR)/man1
++ install -m644 mpd-sima.cfg.5.gz $(MANDIR)/man5
+
+ # listing all sub folder to install (prevent a remaining .svn directory
to be install)
+ for sourcedir in `find src/ -name .svn -prune -o -type d -print | sed
's:src/::g'` ; do \
+@@ -59,8 +60,8 @@ uninstall:
+ rm -f $(BIN)/mpd-sima
+ rm -f $(BIN)/simadb_cli
+ rm -f $(MANDIR)/man1/mpd-sima.1.gz
+- rm -f $(MANDIR)/man1/mpd-sima.cfg.1.gz
+ rm -f $(MANDIR)/man1/simadb_cli.1.gz
++ rm -f $(MANDIR)/man5/mpd-sima.cfg.5.gz
+ rm -f $(ETC)/bash_completion.d/mpd-sima
+ rm -rf $(DATADIR)/mpd-sima
+
CVS-web:
packages: usbredir/usbredir.spec - updated to 0.4.1 (bugfix release)
Author: qboosh Date: Sun Feb 26 19:13:41 2012 GMT
Module: packages Tag: HEAD
Log message:
- updated to 0.4.1 (bugfix release)
Files affected:
packages/usbredir:
usbredir.spec (1.6 - 1.7)
Diffs:
Index: packages/usbredir/usbredir.spec
diff -u packages/usbredir/usbredir.spec:1.6 packages/usbredir/usbredir.spec:1.7
--- packages/usbredir/usbredir.spec:1.6 Fri Feb 24 14:57:08 2012
+++ packages/usbredir/usbredir.spec Sun Feb 26 20:13:36 2012
@@ -2,12 +2,12 @@
Summary: USB network redirection protocol libraries
Summary(pl.UTF-8): Biblioteki protokołu przekierowania USB przez sieć
Name: usbredir
-Version: 0.4
+Version: 0.4.1
Release: 1
License: LGPL v2+
Group: Libraries
Source0:
http://spice-space.org/download/usbredir/%{name}-%{version}.tar.bz2
-# Source0-md5: 156b11e3325b4c5c8af692e001f741d1
+# Source0-md5: 11e2201018fba4b7af8751ebba91eb8e
URL: http://cgit.freedesktop.org/~jwrdegoede/usbredir/
BuildRequires: libusb-devel = 1.0.9
BuildRequires: pkgconfig
@@ -145,6 +145,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.7 2012/02/26 19:13:36 qboosh
+- updated to 0.4.1 (bugfix release)
+
Revision 1.6 2012/02/24 13:57:08 qboosh
- updated to 0.4
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/usbredir/usbredir.spec?r1=1.6r2=1.7f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: usbredir: usbredir-0.4.1.tar.bz2
Files fetched: 1 STORED: http://spice-space.org/download/usbredir/usbredir-0.4.1.tar.bz2 11e2201018fba4b7af8751ebba91eb8e usbredir-0.4.1.tar.bz2 Size: 297323 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: fpaste: fpaste-0.3.7.1.tar.bz2
Files fetched: 1 STORED: https://fedorahosted.org/released/fpaste/fpaste-0.3.7.1.tar.bz2 53201ed0fdd1b9f325c43178adcd8878 fpaste-0.3.7.1.tar.bz2 Size: 21554 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: fpaste/fpaste.spec (NEW) - new; from fedora
Author: glen Date: Sun Feb 26 19:48:22 2012 GMT
Module: packages Tag: HEAD
Log message:
- new; from fedora
Files affected:
packages/fpaste:
fpaste.spec (NONE - 1.1) (NEW)
Diffs:
Index: packages/fpaste/fpaste.spec
diff -u /dev/null packages/fpaste/fpaste.spec:1.1
--- /dev/null Sun Feb 26 20:48:22 2012
+++ packages/fpaste/fpaste.spec Sun Feb 26 20:48:17 2012
@@ -0,0 +1,51 @@
+# $Revision$, $Date$
+Summary: A simple tool for pasting info onto fpaste.org
+Name: fpaste
+Version: 0.3.7.1
+Release: 1
+License: GPL v3+
+Group: Applications/Networking
+URL: https://fedorahosted.org/fpaste/
+Source0:
https://fedorahosted.org/released/fpaste/%{name}-%{version}.tar.bz2
+# Source0-md5: 53201ed0fdd1b9f325c43178adcd8878
+BuildRequires: sed = 4.0
+BuildArch: noarch
+BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+
+%description
+It is often useful to be able to easily paste text to the Fedora
+Pastebin at http://fpaste.org and this simple script will do that
+and return the resulting URL so that people may examine the output.
+This can hopefully help folks who are for some reason stuck without X,
+working remotely, or any other reason they may be unable to paste
+something into the pastebin
+
+%prep
+%setup -q
+
+%{__sed} -i -e '1s,^#!.*python,#!%{__python},' %{name}
+
+%install
+rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT%{_bindir}
+%{__make} install \
+ BINDIR=$RPM_BUILD_ROOT%{_bindir} \
+ MANDIR=$RPM_BUILD_ROOT%{_mandir}
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(644,root,root,755)
+%doc CHANGELOG README TODO
+%attr(755,root,root) %{_bindir}/%{name}
+%{_mandir}/man1/%{name}.1*
+
+%define date %(echo `LC_ALL=C date +%a %b %d %Y`)
+%changelog
+* %{date} PLD Team feedb...@pld-linux.org
+All persons listed below can be reached at cvs_login@pld-linux.org
+
+$Log$
+Revision 1.1 2012/02/26 19:48:17 glen
+- new; from fedora
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: qhull: qhull-2012.1-src.tgz
Files fetched: 1 STORED: http://www.qhull.org/download/qhull-2012.1-src.tgz d0f978c0d8dfb2e919caefa56ea2953c qhull-2012.1-src.tgz Size: 716665 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: qhull/qhull-cmake.patch, qhull/qhull.spec - updated to 2012.1 - u...
Author: qboosh Date: Sun Feb 26 19:54:13 2012 GMT
Module: packages Tag: HEAD
Log message:
- updated to 2012.1
- updated cmake patch
Files affected:
packages/qhull:
qhull-cmake.patch (1.2 - 1.3) , qhull.spec (1.9 - 1.10)
Diffs:
Index: packages/qhull/qhull-cmake.patch
diff -u packages/qhull/qhull-cmake.patch:1.2
packages/qhull/qhull-cmake.patch:1.3
--- packages/qhull/qhull-cmake.patch:1.2Tue Jul 5 18:33:38 2011
+++ packages/qhull/qhull-cmake.patchSun Feb 26 20:54:08 2012
@@ -1,41 +1,33 @@
qhull-2011.1/CMakeLists.txt.orig 2011-05-19 03:53:36.0 +0200
-+++ qhull-2011.1/CMakeLists.txt2011-07-05 17:58:55.111627041 +0200
-@@ -166,21 +166,23 @@
+--- qhull-2012.1/CMakeLists.txt.orig 2012-02-22 04:38:47.0 +0100
qhull-2012.1/CMakeLists.txt2012-02-26 09:01:36.040986288 +0100
+@@ -226,13 +226,15 @@
+ include_directories(${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src/libqhull)
- string(REGEX MATCH [^.]+ qhull_MAJOR ${qhull_VERSION})
if(CMAKE_BUILD_TYPE MATCHES [dD]ebug)
-set(qhull_CPP qhullcpp_d)
--set(qhull_SHARED qhull_d${qhull_MAJOR})
+set(qhull_CPP_SHARED qhullcpp_d)
+set(qhull_CPP_STATIC qhullcppstatic_d)
-+set(qhull_SHARED qhull_d)
+ set(qhull_SHARED qhull_d)
+ set(qhull_SHAREDP qhull_pd)
set(qhull_STATIC qhullstatic_d)
set(qhull_STATICP qhullstatic_pd)
else()
-set(qhull_CPP qhullcpp)
--set(qhull_SHARED qhull${qhull_MAJOR})
+set(qhull_CPP_SHARED qhullcpp)
+set(qhull_CPP_STATIC qhullcppstatic)
-+set(qhull_SHARED qhull)
+ set(qhull_SHARED libqhull) # Avoid name conflict with qhull executable
+ set(qhull_SHAREDP qhull_p)
set(qhull_STATIC qhullstatic)
- set(qhull_STATICP qhullstatic_p)
- endif()
+@@ -241,7 +243,7 @@
set(
- qhull_TARGETS
--${qhull_CPP} ${qhull_SHARED} ${qhull_STATIC} ${qhull_STATICP}
--qhull rbox qconvex qdelaunay qvoronoi qhalf
-+${qhull_CPP_SHARED} ${qhull_CPP_STATIC} ${qhull_SHARED}
${qhull_STATIC} ${qhull_STATICP}
-+qhullprog rbox qconvex qdelaunay qvoronoi qhalf
- user_eg user_eg2 user_eg3
+ qhull_TARGETS_INSTALL
+-${qhull_CPP} ${qhull_STATIC} ${qhull_STATICP} ${qhull_SHARED}
${qhull_SHAREDP}
++${qhull_CPP_SHARED} ${qhull_CPP_STATIC} ${qhull_STATIC} ${qhull_STATICP}
${qhull_SHARED} ${qhull_SHAREDP}
+ qhull rbox qconvex qdelaunay qvoronoi qhalf
)
-
-@@ -193,21 +195,18 @@
- src/libqhull/qhull-exports.def)
- set_target_properties(${qhull_SHARED} PROPERTIES
- COMPILE_DEFINITIONS qh_QHpointer
--VERSION ${qhull_VERSION})
-+VERSION ${qhull_VERSION} SOVERSION ${qhull_MAJOR})
+ set(
+@@ -272,15 +274,6 @@
if(UNIX)
target_link_libraries(${qhull_SHARED} m)
@@ -50,16 +42,32 @@
-endif()
endif(UNIX)
+ # ---
+@@ -296,17 +289,14 @@
+
+ if(UNIX)
+ target_link_libraries(${qhull_SHAREDP} m)
+-if(APPLE)
+-set_target_properties(${qhull_SHAREDP} PROPERTIES
+-INSTALL_NAME_DIR ${LIB_INSTALL_DIR})
+-else()
+-set_target_properties(${qhull_SHAREDP} PROPERTIES
+-INSTALL_RPATH ${LIB_INSTALL_DIR}
+-INSTALL_RPATH_USE_LINK_PATH TRUE
+-BUILD_WITH_INSTALL_RPATH FALSE)
+-endif()
+ endif(UNIX)
+
+add_library(${qhull_CPP_SHARED} SHARED ${libqhullcpp_SOURCES})
+set_target_properties(${qhull_CPP_SHARED} PROPERTIES
+COMPILE_DEFINITIONS qh_QHpointer
-+VERSION ${qhull_VERSION} SOVERSION ${qhull_MAJOR})
++SOVERSION ${qhull_SOVERSION})
+target_link_libraries(${qhull_CPP_SHARED} ${qhull_SHARED})
+
# ---
# Define static libraries qhullstatic and qhullstatic_p (qh_QHpointer)
# ---
-@@ -230,8 +229,8 @@
+@@ -329,8 +319,8 @@
# Define C++ static library qhullcpp (qh_QHpointer)
# ---
@@ -70,76 +78,59 @@
COMPILE_DEFINITIONS qh_QHpointer
VERSION ${qhull_VERSION})
-@@ -252,40 +251,27 @@
- set(user_eg_DEFINES qh_QHpointer)
+@@ -354,22 +344,22 @@
endif()
--add_executable(qhull ${qhull_SOURCES})
+ add_executable(qhull ${qhull_SOURCES})
-target_link_libraries(qhull ${qhull_STATIC})
--set_target_properties(qhull PROPERTIES
--VERSION ${qhull_VERSION})
-+add_executable(qhullprog ${qhull_SOURCES})
-+target_link_libraries(qhullprog ${qhull_STATIC} m)
-+set_target_properties(qhullprog PROPERTIES OUTPUT_NAME qhull)
++target_link_libraries(qhull ${qhull_STATIC} m)
add_executable(rbox ${rbox_SOURCES})
-target_link_libraries(rbox ${qhull_STATIC})
--set_target_properties(rbox PROPERTIES
--VERSION ${qhull_VERSION})
+target_link_libraries(rbox ${qhull_STATIC} m)
add_executable(qconvex ${qconvex_SOURCES})
-target_link_libraries(qconvex ${qhull_STATIC})
packages: qhull/qhull.spec - BR: libstdc++-devel
Author: qboosh Date: Sun Feb 26 19:54:43 2012 GMT
Module: packages Tag: HEAD
Log message:
- BR: libstdc++-devel
Files affected:
packages/qhull:
qhull.spec (1.10 - 1.11)
Diffs:
Index: packages/qhull/qhull.spec
diff -u packages/qhull/qhull.spec:1.10 packages/qhull/qhull.spec:1.11
--- packages/qhull/qhull.spec:1.10 Sun Feb 26 20:54:08 2012
+++ packages/qhull/qhull.spec Sun Feb 26 20:54:38 2012
@@ -11,6 +11,7 @@
Patch0:%{name}-cmake.patch
URL: http://www.qhull.org/
BuildRequires: cmake = 2.6
+BuildRequires: libstdc++-devel
BuildRequires: rpmbuild(macros) = 1.603
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -160,6 +161,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.11 2012/02/26 19:54:38 qboosh
+- BR: libstdc++-devel
+
Revision 1.10 2012/02/26 19:54:08 qboosh
- updated to 2012.1
- updated cmake patch
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/qhull/qhull.spec?r1=1.10r2=1.11f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: spice-gtk/spice-gtk.spec, spice-gtk/spice-gtk-usbredir.patch (REM...
Author: qboosh Date: Sun Feb 26 20:03:28 2012 GMT
Module: packages Tag: HEAD
Log message:
- updated to 0.10
- removed obsolete usbredir patch
Files affected:
packages/spice-gtk:
spice-gtk.spec (1.9 - 1.10) , spice-gtk-usbredir.patch (1.2 - NONE)
(REMOVED)
Diffs:
Index: packages/spice-gtk/spice-gtk.spec
diff -u packages/spice-gtk/spice-gtk.spec:1.9
packages/spice-gtk/spice-gtk.spec:1.10
--- packages/spice-gtk/spice-gtk.spec:1.9 Sat Feb 4 15:01:05 2012
+++ packages/spice-gtk/spice-gtk.spec Sun Feb 26 21:03:23 2012
@@ -9,15 +9,14 @@
Summary: A GTK+ client and libraries for SPICE remote desktop servers
Summary(pl.UTF-8): Klient i biblioteki GTK+ dla serwerów zdalnych pulpitów
SPICE
Name: spice-gtk
-Version: 0.9
+Version: 0.10
Release: 1
License: LGPL v2.1+
Group: X11/Applications
Source0: http://spice-space.org/download/gtk/%{name}-%{version}.tar.bz2
-# Source0-md5: 29dd7372ac099aedb4d024fc4eacd374
+# Source0-md5: 5f3e49f3634a229af9b1679540c23019
Patch0:%{name}-sh.patch
Patch1:%{name}-builddir.patch
-Patch2:%{name}-usbredir.patch
URL: http://spice-space.org/
BuildRequires: autoconf = 2.57
BuildRequires: automake = 1.6
@@ -55,7 +54,7 @@
BuildRequires: libusb-devel = 1.0.9
BuildRequires: polkit-devel = 0.96
BuildRequires: udev-glib-devel
-BuildRequires: usbredir-devel = 0.3.3
+BuildRequires: usbredir-devel = 0.4
%endif
%{?with_smartcard:Requires:libcacard = 0.1.2}
Requires: spice-glib = %{version}-%{release}
@@ -114,7 +113,7 @@
Requires: pixman = 0.17.7
%if %{with usbredir}
Requires: libusb = 1.0.9
-Requires: usbredir = 0.3.3
+Requires: usbredir = 0.4
%endif
%description -n spice-glib
@@ -242,7 +241,6 @@
%setup -q
%patch0 -p1
%patch1 -p1
-%patch2 -p1
mkdir %{?with_gtk2:gtk2} %{?with_gtk3:gtk3}
@@ -400,6 +398,10 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.10 2012/02/26 20:03:23 qboosh
+- updated to 0.10
+- removed obsolete usbredir patch
+
Revision 1.9 2012/02/04 14:01:05 qboosh
- updated to 0.9
- updated builddir,usbredir patches (the first one now only changes python
module extension)
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/spice-gtk/spice-gtk.spec?r1=1.9r2=1.10f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: spice-gtk: spice-gtk-0.10.tar.bz2
Files fetched: 1 STORED: http://spice-space.org/download/gtk/spice-gtk-0.10.tar.bz2 5f3e49f3634a229af9b1679540c23019 spice-gtk-0.10.tar.bz2 Size: 861269 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: apache/apache-apxs.patch - bogus chunk
Author: adamgDate: Sun Feb 26 21:17:30 2012 GMT
Module: packages Tag: HEAD
Log message:
- bogus chunk
Files affected:
packages/apache:
apache-apxs.patch (1.11 - 1.12)
Diffs:
Index: packages/apache/apache-apxs.patch
diff -u packages/apache/apache-apxs.patch:1.11
packages/apache/apache-apxs.patch:1.12
--- packages/apache/apache-apxs.patch:1.11 Tue Feb 21 19:02:41 2012
+++ packages/apache/apache-apxs.patch Sun Feb 26 22:17:25 2012
@@ -25,15 +25,6 @@
print STDERR apxs:Error: no config variable $var\n;
usage;
}
-@@ -211,7 +212,7 @@
- error(your server binary `$httpd'.);
- exit 1;
- }
--
-+}
- sub get_config_vars{
- my ($file, $rh_config) = @_;
-
@@ -479,8 +480,8 @@
$t =~ s|\.[^./\\]+$|\.so|;
if ($opt_i) {
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache/apache-apxs.patch?r1=1.11r2=1.12f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: apache/apache.spec - mod_authz_dbd += R: mod_dbd
Author: adamgDate: Sun Feb 26 21:39:12 2012 GMT
Module: packages Tag: HEAD
Log message:
- mod_authz_dbd += R: mod_dbd
Files affected:
packages/apache:
apache.spec (1.664 - 1.665)
Diffs:
Index: packages/apache/apache.spec
diff -u packages/apache/apache.spec:1.664 packages/apache/apache.spec:1.665
--- packages/apache/apache.spec:1.664 Sun Feb 26 16:42:00 2012
+++ packages/apache/apache.spec Sun Feb 26 22:39:06 2012
@@ -713,6 +713,7 @@
URL: http://httpd.apache.org/docs/2.4/mod/mod_authz_dbd.html
Requires: %{name}-base = %{version}-%{release}
Requires: %{name}-mod_authz_core = %{version}-%{release}
+Requires: %{name}-mod_dbd = %{version}-%{release}
Provides: apache(mod_authz_dbd) = %{version}-%{release}
%description mod_authz_dbd
@@ -3506,6 +3507,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.665 2012/02/26 21:39:06 adamg
+- mod_authz_dbd += R: mod_dbd
+
Revision 1.664 2012/02/26 15:42:00 adamg
- better description (from docs)
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache/apache.spec?r1=1.664r2=1.665f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: apache/apache.spec - mod_heartbeat, mod_heartmonit += R: mod_stat...
Author: adamgDate: Sun Feb 26 21:41:14 2012 GMT
Module: packages Tag: HEAD
Log message:
- mod_heartbeat, mod_heartmonit += R: mod_status, mod_watchdog
Files affected:
packages/apache:
apache.spec (1.665 - 1.666)
Diffs:
Index: packages/apache/apache.spec
diff -u packages/apache/apache.spec:1.665 packages/apache/apache.spec:1.666
--- packages/apache/apache.spec:1.665 Sun Feb 26 22:39:06 2012
+++ packages/apache/apache.spec Sun Feb 26 22:41:08 2012
@@ -1357,6 +1357,8 @@
Group: Networking/Daemons/HTTP
URL: http://httpd.apache.org/docs/2.4/mod/mod_heartbeat.html
Requires: %{name}-base = %{version}-%{release}
+Requires: %{name}-mod_status = %{version}-%{release}
+Requires: %{name}-mod_watchdog = %{version}-%{release}
Provides: apache(mod_heartbeat) = %{version}-%{release}
%description mod_heartbeat
@@ -1374,6 +1376,8 @@
Group: Networking/Daemons/HTTP
URL: http://httpd.apache.org/docs/2.4/mod/mod_heartmonitor.html
Requires: %{name}-base = %{version}-%{release}
+Requires: %{name}-mod_status = %{version}-%{release}
+Requires: %{name}-mod_watchdog = %{version}-%{release}
Provides: apache(mod_heartmonitor) = %{version}-%{release}
%description mod_heartmonitor
@@ -3507,6 +3511,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.666 2012/02/26 21:41:08 adamg
+- mod_heartbeat, mod_heartmonit += R: mod_status, mod_watchdog
+
Revision 1.665 2012/02/26 21:39:06 adamg
- mod_authz_dbd += R: mod_dbd
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache/apache.spec?r1=1.665r2=1.666f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: apache/apache.spec - mod_watchdog, mod_status must be loaded befo...
Author: adamgDate: Sun Feb 26 21:42:32 2012 GMT Module: packages Tag: HEAD Log message: - mod_watchdog, mod_status must be loaded before mod_heartbeat, mod_heartmonitor Files affected: packages/apache: apache.spec (1.666 - 1.667) Diffs: Index: packages/apache/apache.spec diff -u packages/apache/apache.spec:1.666 packages/apache/apache.spec:1.667 --- packages/apache/apache.spec:1.666 Sun Feb 26 22:41:08 2012 +++ packages/apache/apache.spec Sun Feb 26 22:42:26 2012 @@ -2488,8 +2488,8 @@ echo LoadModule file_cache_module modules/mod_file_cache.so $CFG/00_mod_file_cache.conf echo LoadModule filter_module modules/mod_filter.so $CFG/00_mod_filter.conf echo LoadModule headers_modulemodules/mod_headers.so $CFG/00_mod_headers.conf -echo LoadModule heartbeat_module modules/mod_heartbeat.so $CFG/00_mod_heartbeat.conf -echo LoadModule heartmonitor_modulemodules/mod_heartmonitor.so $CFG/00_mod_heartmonitor.conf +echo LoadModule heartbeat_module modules/mod_heartbeat.so $CFG/01_mod_heartbeat.conf +echo LoadModule heartmonitor_modulemodules/mod_heartmonitor.so $CFG/01_mod_heartmonitor.conf echo LoadModule ident_module modules/mod_ident.so $CFG/00_mod_ident.conf echo LoadModule imagemap_module modules/mod_imagemap.so $CFG/00_mod_imagemap.conf echo LoadModule include_modulemodules/mod_include.so $CFG/00_mod_include.conf @@ -3511,6 +3511,9 @@ All persons listed below can be reached at cvs_login@pld-linux.org $Log$ +Revision 1.667 2012/02/26 21:42:26 adamg +- mod_watchdog, mod_status must be loaded before mod_heartbeat, mod_heartmonitor + Revision 1.666 2012/02/26 21:41:08 adamg - mod_heartbeat, mod_heartmonit += R: mod_status, mod_watchdog CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache/apache.spec?r1=1.666r2=1.667f=u ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: apache/apache.spec - mod_session_* += R: mod_session
Author: adamgDate: Sun Feb 26 21:47:02 2012 GMT
Module: packages Tag: HEAD
Log message:
- mod_session_* += R: mod_session
Files affected:
packages/apache:
apache.spec (1.668 - 1.669)
Diffs:
Index: packages/apache/apache.spec
diff -u packages/apache/apache.spec:1.668 packages/apache/apache.spec:1.669
--- packages/apache/apache.spec:1.668 Sun Feb 26 22:45:51 2012
+++ packages/apache/apache.spec Sun Feb 26 22:46:56 2012
@@ -1851,6 +1851,7 @@
Group: Networking/Daemons/HTTP
URL: http://httpd.apache.org/docs/2.4/mod/mod_session_cookie.html
Requires: %{name}-base = %{version}-%{release}
+Requires: %{name}-mod_session = %{version}-%{release}
Provides: apache(mod_session_cookie) = %{version}-%{release}
%description mod_session_cookie
@@ -1867,6 +1868,7 @@
Group: Networking/Daemons/HTTP
URL: http://httpd.apache.org/docs/2.4/mod/mod_session_crypto.html
Requires: %{name}-base = %{version}-%{release}
+Requires: %{name}-mod_session = %{version}-%{release}
Provides: apache(mod_session_crypto) = %{version}-%{release}
%description mod_session_crypto
@@ -1883,6 +1885,7 @@
Group: Networking/Daemons/HTTP
URL: http://httpd.apache.org/docs/2.4/mod/mod_session_dbd.html
Requires: %{name}-base = %{version}-%{release}
+Requires: %{name}-mod_session = %{version}-%{release}
Provides: apache(mod_session_dbd) = %{version}-%{release}
%description mod_session_dbd
@@ -3515,6 +3518,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.669 2012/02/26 21:46:56 adamg
+- mod_session_* += R: mod_session
+
Revision 1.668 2012/02/26 21:45:51 adamg
- mod_lbmethod_by* += R: mod_proxy (for mod_proxy_balancer)
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache/apache.spec?r1=1.668r2=1.669f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: apache/apache.spec - mod_session_dbd += R: mod_dbd
Author: adamgDate: Sun Feb 26 21:48:39 2012 GMT
Module: packages Tag: HEAD
Log message:
- mod_session_dbd += R: mod_dbd
Files affected:
packages/apache:
apache.spec (1.669 - 1.670)
Diffs:
Index: packages/apache/apache.spec
diff -u packages/apache/apache.spec:1.669 packages/apache/apache.spec:1.670
--- packages/apache/apache.spec:1.669 Sun Feb 26 22:46:56 2012
+++ packages/apache/apache.spec Sun Feb 26 22:48:33 2012
@@ -1885,6 +1885,7 @@
Group: Networking/Daemons/HTTP
URL: http://httpd.apache.org/docs/2.4/mod/mod_session_dbd.html
Requires: %{name}-base = %{version}-%{release}
+Requires: %{name}-mod_dbd = %{version}-%{release}
Requires: %{name}-mod_session = %{version}-%{release}
Provides: apache(mod_session_dbd) = %{version}-%{release}
@@ -3518,6 +3519,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.670 2012/02/26 21:48:33 adamg
+- mod_session_dbd += R: mod_dbd
+
Revision 1.669 2012/02/26 21:46:56 adamg
- mod_session_* += R: mod_session
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache/apache.spec?r1=1.669r2=1.670f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: baobab: baobab-3.3.2.tar.xz
Files fetched: 1 STORED: http://ftp.gnome.org/pub/GNOME/sources/baobab/3.3/baobab-3.3.2.tar.xz 635e05a1c06daf5acf64ff763d7647bb baobab-3.3.2.tar.xz Size: 792844 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: baobab/baobab.spec (NEW) - new
Author: megabajt Date: Sun Feb 26 22:24:47 2012 GMT
Module: packages Tag: HEAD
Log message:
- new
Files affected:
packages/baobab:
baobab.spec (NONE - 1.1) (NEW)
Diffs:
Index: packages/baobab/baobab.spec
diff -u /dev/null packages/baobab/baobab.spec:1.1
--- /dev/null Sun Feb 26 23:24:47 2012
+++ packages/baobab/baobab.spec Sun Feb 26 23:24:41 2012
@@ -0,0 +1,87 @@
+# $Revision$, $Date$
+Summary: Graphical directory tree analyzer
+Summary(pl.UTF-8): Graficzny analizator drzew katalogów
+Name: baobab
+Version: 3.3.2
+Release: 1
+License: GPL v2
+Group: X11/Applications
+Source0:
http://ftp.gnome.org/pub/GNOME/sources/baobab/3.3/%{name}-%{version}.tar.xz
+# Source0-md5: 635e05a1c06daf5acf64ff763d7647bb
+URL: http://live.gnome.org/GnomeUtils
+BuildRequires: autoconf = 2.63
+BuildRequires: automake = 1:1.11
+BuildRequires: gettext-devel = 0.17
+BuildRequires: glib2-devel = 1:2.30.0
+BuildRequires: gtk+3-devel = 3.0.0
+BuildRequires: intltool = 0.40.0
+BuildRequires: libgtop-devel
+BuildRequires: pkgconfig = 1:0.22
+BuildRequires: rpmbuild(find_lang) = 1.35
+BuildRequires: rpmbuild(macros) = 1.592
+BuildRequires: yelp-tools
+Requires(post,postun): glib2 = 1:2.26.0
+Requires(post,postun): gtk-update-icon-cache
+Requires: glib2 = 1:2.30.0
+Requires: hicolor-icon-theme
+Provides: gnome-utils-baobab
+Obsoletes: gnome-utils-baobab
+BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+
+%description
+baobab is a graphical directory tree analyzer.
+
+%description -l pl.UTF-8
+baobab jest graficznym analizatorem drzew katalogów.
+
+%prep
+%setup -q
+
+%build
+%{__intltoolize}
+%{__aclocal} -I m4
+%{__autoheader}
+%{__autoconf}
+%{__automake}
+%configure \
+ --disable-silent-rules
+%{__make}
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+%{__make} install \
+ DESTDIR=$RPM_BUILD_ROOT
+
+%find_lang %{name} --with-gnome
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post
+%update_icon_cache hicolor
+%glib_compile_schemas
+
+%postun
+%update_icon_cache hicolor
+%glib_compile_schemas
+
+%files -f %{name}.lang
+%defattr(644,root,root,755)
+%doc AUTHORS ChangeLog NEWS README TODO
+%attr(755,root,root) %{_bindir}/baobab
+%{_desktopdir}/baobab.desktop
+%{_iconsdir}/hicolor/*/*/*.png
+%{_datadir}/baobab
+%{_datadir}/glib-2.0/schemas/org.gnome.baobab.gschema.xml
+%{_mandir}/man1/baobab.1*
+
+%define date %(echo `LC_ALL=C date +%a %b %d %Y`)
+%changelog
+* %{date} PLD Team feedb...@pld-linux.org
+All persons listed below can be reached at cvs_login@pld-linux.org
+
+$Log$
+Revision 1.1 2012/02/26 22:24:41 megabajt
+- new
+
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: apache/apache.spec - package fcgistarter
Author: adamgDate: Sun Feb 26 23:50:21 2012 GMT
Module: packages Tag: HEAD
Log message:
- package fcgistarter
Files affected:
packages/apache:
apache.spec (1.670 - 1.671)
Diffs:
Index: packages/apache/apache.spec
diff -u packages/apache/apache.spec:1.670 packages/apache/apache.spec:1.671
--- packages/apache/apache.spec:1.670 Sun Feb 26 22:48:33 2012
+++ packages/apache/apache.spec Mon Feb 27 00:50:14 2012
@@ -3345,6 +3345,7 @@
%files mod_proxy
%defattr(644,root,root,755)
+%attr(4755,root,root) %{_sbindir}/fcgistarter
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/conf.d/*_mod_proxy.conf
%attr(755,root,root) %{_libexecdir}/mod_proxy*.so
@@ -3519,6 +3520,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.671 2012/02/26 23:50:14 adamg
+- package fcgistarter
+
Revision 1.670 2012/02/26 21:48:33 adamg
- mod_session_dbd += R: mod_dbd
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache/apache.spec?r1=1.670r2=1.671f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: boost: boost_1_49_0.tar.bz2
Files fetched: 1 STORED: http://downloads.sourceforge.net/boost/boost_1_49_0.tar.bz2 0d202cb811f934282dea64856a175698 boost_1_49_0.tar.bz2 Size: 48499961 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: smartmontools/smartmontools.spec - fix cp bug in %triggerpostun ...
Author: wigetDate: Mon Feb 27 06:35:28 2012 GMT
Module: packages Tag: HEAD
Log message:
- fix cp bug in %triggerpostun
- rel. 5
Files affected:
packages/smartmontools:
smartmontools.spec (1.47 - 1.48)
Diffs:
Index: packages/smartmontools/smartmontools.spec
diff -u packages/smartmontools/smartmontools.spec:1.47
packages/smartmontools/smartmontools.spec:1.48
--- packages/smartmontools/smartmontools.spec:1.47 Wed Feb 22 21:46:51 2012
+++ packages/smartmontools/smartmontools.spec Mon Feb 27 07:35:22 2012
@@ -9,7 +9,7 @@
Summary(pt.UTF-8): smartmontools - para monitorar discos e dispositivos
S.M.A.R.T.
Name: smartmontools
Version: 5.42
-Release: 4
+Release: 5
License: GPL v2+
Group: Applications/System
Source0:
http://downloads.sourceforge.net/smartmontools/%{name}-%{version}.tar.gz
@@ -189,8 +189,8 @@
%postun
%systemd_reload
-%triggerpostun -- %{name} 5.42-3
-%systemd_trigger crond.service
+%triggerpostun -- %{name} 5.42-5
+%systemd_trigger smartd.service
%files
%defattr(644,root,root,755)
@@ -213,6 +213,10 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.48 2012/02/27 06:35:22 wiget
+- fix cp bug in %triggerpostun
+- rel. 5
+
Revision 1.47 2012/02/22 20:46:51 arekm
- release 4
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/smartmontools/smartmontools.spec?r1=1.47r2=1.48f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
