date:20111111

packages: subversion/subversion.spec - strict deps (at least) on -libs pack...

2011-11-11 Thread glen

Author: glen Date: Fri Nov 11 10:00:34 2011 GMT
Module: packages  Tag: HEAD
 Log message:
- strict deps (at least) on -libs package to avoid errors like:
  $ svn up
  svn: E200019: Version mismatch in 'svn_gnome_keyring': found 1.6.17, expected 
1.7.1

 Files affected:
packages/subversion:
   subversion.spec (1.326 -> 1.327) 

 Diffs:


Index: packages/subversion/subversion.spec
diff -u packages/subversion/subversion.spec:1.326 
packages/subversion/subversion.spec:1.327
--- packages/subversion/subversion.spec:1.326   Wed Oct 26 13:37:59 2011
+++ packages/subversion/subversion.spec Fri Nov 11 11:00:29 2011
@@ -52,7 +52,7 @@
 Summary(pt_BR.UTF-8):  Sistema de versionamento concorrente
 Name:  subversion
 Version:   1.7.1
-Release:   1
+Release:   2
 License:   Apache/BSD-like
 Group: Development/Version Control
 Source0:   http://www.apache.org/dist/subversion/%{name}-%{version}.tar.bz2
@@ -116,8 +116,8 @@
 BuildRequires: swig-python >= 1.3.24
 %endif
 %if %{with ruby}
-BuildRequires: ruby-devel >= 1:1.8.2
 BuildRequires: ruby-devel < 1:1.9
+BuildRequires: ruby-devel >= 1:1.8.2
 BuildRequires: ruby-rubygems
 BuildRequires: swig-ruby >= 1.3.24
 %endif
@@ -386,6 +386,7 @@
 Summary:   Apache module: Subversion Server - path-based authorization
 Summary(pl.UTF-8): Moduł apache: autoryzacja na podstawie ścieżki dla 
serwera Subversion
 Group: Networking/Daemons
+Requires:  %{name}-libs = %{version}-%{release}
 Requires:  apache(modules-api) = %apache_modules_api
 Requires:  apache-mod_dav_svn = %{version}-%{release}
 
@@ -399,6 +400,7 @@
 Summary:   GNOME Keyring authentication provider for Subversion
 Summary(pl.UTF-8): Moduł uwierzytelniający GNOME Keyring dla Subversion
 Group: X11/Applications
+Requires:  %{name}-libs = %{version}-%{release}
 
 %description -n gnome-keyring-subversion
 Authentication provider module for Subversion which allows SVN client
@@ -412,6 +414,7 @@
 Summary:   KDE Wallet authentication provider for Subversion
 Summary(pl.UTF-8): Moduł uwierzytelniający dla Subversion wykorzystujący 
Portfel KDE
 Group: X11/Applications
+Requires:  %{name}-libs = %{version}-%{release}
 
 %description -n kde4-kwallet-subversion
 Authentication provider module for Subversion which allows SVN client
@@ -922,6 +925,11 @@
 All persons listed below can be reached at @pld-linux.org
 
 $Log$
+Revision 1.327  2011/11/11 10:00:29  glen
+- strict deps (at least) on -libs package to avoid errors like:
+  $ svn up
+  svn: E200019: Version mismatch in 'svn_gnome_keyring': found 1.6.17, 
expected 1.7.1
+
 Revision 1.326  2011/10/26 11:37:59  arekm
 - up to 1.7.1
 


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/subversion/subversion.spec?r1=1.326&r2=1.327&f=u

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

packages: syslog-ng/syslog-ng.spec, syslog-ng/syslog-ng-nolibs.patch (NEW) ...

2011-11-11 Thread qboosh

Author: qboosh   Date: Fri Nov 11 09:45:05 2011 GMT
Module: packages  Tag: HEAD
 Log message:
- added nolibs patch (drop unnecessary linking with -lnsl -lresolv)
- added missing release 3 note to previous changelog entry

 Files affected:
packages/syslog-ng:
   syslog-ng.spec (1.224 -> 1.225) , syslog-ng-nolibs.patch (NONE -> 1.1)  (NEW)

 Diffs:


Index: packages/syslog-ng/syslog-ng.spec
diff -u packages/syslog-ng/syslog-ng.spec:1.224 
packages/syslog-ng/syslog-ng.spec:1.225
--- packages/syslog-ng/syslog-ng.spec:1.224 Fri Nov 11 10:35:03 2011
+++ packages/syslog-ng/syslog-ng.spec   Fri Nov 11 10:45:00 2011
@@ -39,6 +39,7 @@
 Source6:   %{name}.upstart
 Patch0:%{name}-datadir.patch
 Patch1:cap_syslog-vserver-workaround.patch
+Patch2:%{name}-nolibs.patch
 URL:   http://www.balabit.com/products/syslog_ng/
 BuildRequires: autoconf >= 2.53
 BuildRequires: automake
@@ -180,6 +181,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 cp -a %{SOURCE4} doc
 cp -a %{SOURCE5} contrib/syslog-ng.conf.simple
 
@@ -386,12 +388,17 @@
 All persons listed below can be reached at @pld-linux.org
 
 $Log$
+Revision 1.225  2011/11/11 09:45:00  qboosh
+- added nolibs patch (drop unnecessary linking with -lnsl -lresolv)
+- added missing release 3 note to previous changelog entry
+
 Revision 1.224  2011/11/11 09:35:03  qboosh
 - package -devel
 - separated -libs (required by -devel), so no daemon is required for 
development
 - filterout_ld as-needed options for dynamic linking too (otherwise tests fail)
 - BRs/Rs cleanup wrt. dynamic/mixed linking: only core (libsyslong-ng and 
syslog-ng daemon)
   use mixed linking, everything else is always linked dynamically)
+- release 3
 
 Revision 1.223  2011/11/10 17:42:42  qboosh
 - use system libmongo-client


Index: packages/syslog-ng/syslog-ng-nolibs.patch
diff -u /dev/null packages/syslog-ng/syslog-ng-nolibs.patch:1.1
--- /dev/null   Fri Nov 11 10:45:05 2011
+++ packages/syslog-ng/syslog-ng-nolibs.patch   Fri Nov 11 10:45:00 2011
@@ -0,0 +1,17 @@
+--- syslog-ng-3.3.1/configure.in.orig  2011-09-29 08:35:39.0 +0200
 syslog-ng-3.3.1/configure.in   2011-11-11 10:37:51.371629795 +0100
+@@ -465,11 +465,10 @@
+ dnl 
***
+ dnl Checks for libraries
+ AC_CHECK_LIB(door, door_create, BASE_LIBS="$BASE_LIBS -ldoor")
+-AC_CHECK_LIB(socket, socket, BASE_LIBS="$BASE_LIBS -lsocket")
++AC_CHECK_FUNC([socket], [:], [AC_CHECK_LIB(socket, socket, 
BASE_LIBS="$BASE_LIBS -lsocket")])
+ AC_CHECK_LIB(rt, nanosleep, BASE_LIBS="$BASE_LIBS -lrt")
+-AC_CHECK_LIB(nsl, gethostbyname, BASE_LIBS="$BASE_LIBS -lnsl")
+-AC_CHECK_LIB(regex, regexec, REGEX_LIBS="-lregex")
+-AC_CHECK_LIB(resolv, res_init, RESOLV_LIBS="-lresolv")
++AC_CHECK_FUNC([gethostbyname], [:], [AC_CHECK_LIB(nsl, gethostbyname, 
BASE_LIBS="$BASE_LIBS -lnsl")])
++AC_CHECK_FUNC([regexec], [:], [AC_CHECK_LIB(regex, regexec, 
REGEX_LIBS="-lregex")])
+ 
+ 
+ if test "x$enable_linux_caps" = "xyes" -o "x$enable_linux_caps" = "xauto"; 
then


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/syslog-ng/syslog-ng.spec?r1=1.224&r2=1.225&f=u

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

packages: syslog-ng/syslog-ng.spec - package -devel - separated -libs (requ...

2011-11-11 Thread qboosh

Author: qboosh   Date: Fri Nov 11 09:35:08 2011 GMT
Module: packages  Tag: HEAD
 Log message:
- package -devel
- separated -libs (required by -devel), so no daemon is required for development
- filterout_ld as-needed options for dynamic linking too (otherwise tests fail)
- BRs/Rs cleanup wrt. dynamic/mixed linking: only core (libsyslong-ng and 
syslog-ng daemon)
  use mixed linking, everything else is always linked dynamically)

 Files affected:
packages/syslog-ng:
   syslog-ng.spec (1.223 -> 1.224) 

 Diffs:


Index: packages/syslog-ng/syslog-ng.spec
diff -u packages/syslog-ng/syslog-ng.spec:1.223 
packages/syslog-ng/syslog-ng.spec:1.224
--- packages/syslog-ng/syslog-ng.spec:1.223 Thu Nov 10 18:42:42 2011
+++ packages/syslog-ng/syslog-ng.spec   Fri Nov 11 10:35:03 2011
@@ -1,12 +1,13 @@
 # $Revision$, $Date$
 #
 # TODO:
-#  - move SQL module to a separate package
-#  - relies on libs in /usr/ which is wrong
-#  - use external libivykis [>= 0.18+syslog-ng updates], libmongo_client 
[>= 0.1.0]
+# - move SQL module to a separate package
+# - relies on libs in /usr which is wrong
+#   (well, for modules bringing additional functionality it's acceptable IMO 
--q)
+# - use external libivykis [>= 0.18+syslog-ng updates]
 #
 # Conditional build:
-%bcond_withdynamic # link dynamically with glib, eventlog, pcre, 
openssl
+%bcond_withdynamic # link dynamically with glib, eventlog, pcre 
(modules are always linked dynamically)
 %if "%{pld_release}" == "ac"
 %bcond_withsql # build with support for logging to SQL DB
 %else
@@ -20,11 +21,11 @@
 %defineglib2_ver   2.24.0
 %endif
 Summary:   Syslog-ng - new generation of the system logger
-Summary(pl.UTF-8): Syslog-ng - zamiennik syskloga
+Summary(pl.UTF-8): Syslog-ng - systemowy demon logujący nowej generacji
 Summary(pt_BR.UTF-8):  Daemon de log nova geração
 Name:  syslog-ng
 Version:   3.3.1
-Release:   2
+Release:   3
 License:   GPL v2
 Group: Daemons
 Source0:   
http://www.balabit.com/downloads/files/syslog-ng/open-source-edition/%{version}/source/%{name}_%{version}.tar.gz
@@ -42,8 +43,18 @@
 BuildRequires: autoconf >= 2.53
 BuildRequires: automake
 BuildRequires: bison >= 2.4
+BuildRequires: eventlog-devel >= 0.2.12
 BuildRequires: flex
+BuildRequires: glib2-devel >= 1:%{glib2_ver}
+BuildRequires: json-c-devel >= 0.7
+BuildRequires: libcap-devel
+%{?with_sql:BuildRequires: libdbi-devel >= 0.8.3-2}
+BuildRequires: libmongo-client-devel >= 0.1.0
+BuildRequires: libnet-devel >= 1:1.1.2.1-3
 BuildRequires: libtool >= 2:2.0
+BuildRequires: libwrap-devel
+BuildRequires: openssl-devel >= 0.9.8
+BuildRequires: pcre-devel >= 6.1
 BuildRequires: pkgconfig
 BuildRequires: rpm >= 4.4.9-56
 BuildRequires: rpmbuild(macros) >= 1.561
@@ -54,45 +65,26 @@
 BuildRequires: python-modules
 BuildRequires: tzdata
 %endif
-%if %{with dynamic}
-BuildRequires: eventlog-devel >= 0.2.12
-BuildRequires: glib2-devel >= 1:%{glib2_ver}
-BuildRequires: json-c-devel >= 0.7
-BuildRequires: libcap-devel
-%{?with_sql:BuildRequires: libdbi-devel >= 0.8.3-2}
-BuildRequires: libmongo-client-devel >= 0.1.0
-BuildRequires: libnet-devel >= 1:1.1.2.1-3
-BuildRequires: libwrap-devel
-BuildRequires: openssl-devel >= 0.9.8
-BuildRequires: pcre-devel >= 6.1
-%else
+%if %{without dynamic}
 BuildRequires: eventlog-static >= 0.2.12
 BuildRequires: glib2-static >= 1:%{glib2_ver}
-BuildRequires: glibc-static
-BuildRequires: json-c-static >= 0.7
-BuildRequires: libcap-static
-%{?with_sql:BuildRequires: libdbi-static >= 0.8.3-2}
-BuildRequires: libmongo-client-static >= 0.1.0
-BuildRequires: libnet-static >= 1:1.1.2.1-3
-BuildRequires: libwrap-static
-BuildRequires: openssl-static >= 0.9.8
 BuildRequires: pcre-static >= 6.1
 BuildRequires: zlib-static
 %endif
 Requires(post):fileutils
 Requires(post,preun):  /sbin/chkconfig
+Requires:  %{name}-libs = %{version}-%{release}
+Requires:  eventlog >= 0.2.12
 Requires:  glib2 >= 1:%{glib2_ver}
+Requires:  pcre >= 6.1
 Requires:  psmisc >= 20.1
 Requires:  rc-scripts >= 0.4.3.0
-%if %{with dynamic}
-Requires:  eventlog >= 0.2.12
+# for modules
 Requires:  json-c >= 0.7
 Requires:  libdbi >= 0.8.3-2
 Requires:  libmongo-client >= 0.1.0
 Requires:  libnet >= 1:1.1.2.1-7
 Requires:  openssl >= 0.9.8
-Requires:  pcre >= 6.1
-%endif
 Provides:  syslogdaemon
 Conflicts: klogd
 Conflicts: msyslog
@@ -104,10 +96,10 @@
 # - libsyslog-ng.so has undefined symbols for third party libraries
 #   and these symbols should go via main syslog-ng binary
 # - same applies for modules
+# In dynamic case tests are forcily linked with dynamic modules, which doesn't 
work with as-needed.
+%definefilterout_ld-Wl,--as-needed 
-Wl,--no-copy-dt-ne

DISTFILES: yaz: yaz-4.2.20.tar.gz

2011-11-11 Thread qboosh


Files fetched: 1

STORED: http://ftp.indexdata.dk/pub/yaz/yaz-4.2.20.tar.gz
31d2ad4cd0855e5b04280d97936c97e9  yaz-4.2.20.tar.gz
Size: 2363907 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: yaz/yaz.spec - updated to 4.2.20

2011-11-11 Thread qboosh

Author: qboosh   Date: Fri Nov 11 09:22:22 2011 GMT
Module: packages  Tag: HEAD
 Log message:
- updated to 4.2.20

 Files affected:
packages/yaz:
   yaz.spec (1.78 -> 1.79) 

 Diffs:


Index: packages/yaz/yaz.spec
diff -u packages/yaz/yaz.spec:1.78 packages/yaz/yaz.spec:1.79
--- packages/yaz/yaz.spec:1.78  Sun Oct 30 15:34:19 2011
+++ packages/yaz/yaz.spec   Fri Nov 11 10:22:17 2011
@@ -2,12 +2,12 @@
 Summary:   Z39.50 protocol support library
 Summary(pl.UTF-8): Biblioteka obsługująca protokół Z39.50
 Name:  yaz
-Version:   4.2.18
+Version:   4.2.20
 Release:   1
 License:   BSD-like
 Group: Libraries
 Source0:   http://ftp.indexdata.dk/pub/yaz/%{name}-%{version}.tar.gz
-# Source0-md5: 4d8ed31a45d09dcfd03b6121ef52b024
+# Source0-md5: 31d2ad4cd0855e5b04280d97936c97e9
 URL:   http://www.indexdata.dk/yaz/
 BuildRequires: autoconf >= 2.60
 BuildRequires: automake >= 1:1.9
@@ -153,6 +153,9 @@
 All persons listed below can be reached at @pld-linux.org
 
 $Log$
+Revision 1.79  2011/11/11 09:22:17  qboosh
+- updated to 4.2.20
+
 Revision 1.78  2011/10/30 14:34:19  qboosh
 - updated to 4.2.18
 


 CVS-web:

http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/yaz/yaz.spec?r1=1.78&r2=1.79&f=u

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

packages: subversion/subversion.spec - strict deps (at least) on -libs pack...

packages: syslog-ng/syslog-ng.spec, syslog-ng/syslog-ng-nolibs.patch (NEW) ...

packages: syslog-ng/syslog-ng.spec - package -devel - separated -libs (requ...

DISTFILES: yaz: yaz-4.2.20.tar.gz

packages: yaz/yaz.spec - updated to 4.2.20

< 1 2

101 - 105 of 105 matches

Site Navigation

Mail list logo

Footer information