[packages/digikam] - up to 2.9.0
commit d6f862d3a5b40790f0fcab5c5766a294b8585b91 Author: Arkadiusz Miśkiewicz ar...@maven.pl Date: Sat Nov 17 10:38:30 2012 +0100 - up to 2.9.0 digikam.spec | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) --- diff --git a/digikam.spec b/digikam.spec index 61a6d94..aa74765 100644 --- a/digikam.spec +++ b/digikam.spec @@ -1,16 +1,16 @@ # -%defineqtver 4.8.1 -%definekdever 4.8.0 +%defineqtver 4.8.3 +%definekdever 4.9.2 Summary: A KDE frontend for gphoto2 Summary(pl.UTF-8): Interfejs KDE do gphoto2 Name: digikam -Version: 2.8.0 -Release: 4 +Version: 2.9.0 +Release: 1 License: GPL Group: X11/Applications/Graphics Source0: http://downloads.sourceforge.net/digikam/%{name}-%{version}.tar.bz2 -# Source0-md5: 6b87a62ca3721ccfc39ebf8738794554 +# Source0-md5: eb2971c98cadb31a2d63c4189d26ccab Patch0:%{name}-build.patch URL: http://www.digikam.org/ BuildRequires: Qt3Support-devel = %{qtver} gitweb: http://git.pld-linux.org/gitweb.cgi/packages/digikam.git/commitdiff/d6f862d3a5b40790f0fcab5c5766a294b8585b91 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: digikam: digikam-2.9.0.tar.bz2
Files fetched: 1 STORED: http://downloads.sourceforge.net/digikam/digikam-2.9.0.tar.bz2 eb2971c98cadb31a2d63c4189d26ccab digikam-2.9.0.tar.bz2 Size: 56765772 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/llvm] TODO added.
commit d015c902ca1c83854957eae817e97de6cb761a41 Author: Paweł Sikora pawel.sik...@agmk.net Date: Sat Nov 17 11:52:51 2012 +0100 TODO added. llvm.spec | 4 1 file changed, 4 insertions(+) --- diff --git a/llvm.spec b/llvm.spec index 0257ac4..380f570 100644 --- a/llvm.spec +++ b/llvm.spec @@ -1,4 +1,8 @@ # +# TODO: +# - fix include search path to support libdir/gcc/platform/version/include. +# current error: /usr/include/wchar.h:39:11: fatal error: 'stdarg.h' file not found# include stdarg.h +# # Conditional build: %bcond_without ocaml # ocaml binding %bcond_withapidocs # The doxygen docs are HUGE, so they are not built by default. gitweb: http://git.pld-linux.org/gitweb.cgi/packages/llvm.git/commitdiff/d015c902ca1c83854957eae817e97de6cb761a41 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/icedtea-web] URL added
commit 0b382fbc7d65a5f9a1064a006054af00124f4585 Author: Jacek Konieczny jaj...@jajcus.net Date: Sat Nov 17 11:55:09 2012 +0100 URL added icedtea-web.spec | 1 + 1 file changed, 1 insertion(+) --- diff --git a/icedtea-web.spec b/icedtea-web.spec index 9fb71ee..ca53bb4 100644 --- a/icedtea-web.spec +++ b/icedtea-web.spec @@ -17,6 +17,7 @@ License: GPL v2 Group: Applications Source0: http://icedtea.classpath.org/download/source/%{name}-%{version}.tar.gz # Source0-md5: 8f50cfb1b65d620a7812b5976f394598 +URL: http://icedtea.classpath.org/wiki/IcedTea-Web %buildrequires_jdk BuildRequires: rpm-javaprov BuildRequires: xulrunner-devel gitweb: http://git.pld-linux.org/gitweb.cgi/packages/icedtea-web.git/commitdiff/825d76263a329c1106ab93e13f543e157f07961d ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/icedtea-web] Version: 1.3.1
commit 825d76263a329c1106ab93e13f543e157f07961d Author: Jacek Konieczny jaj...@jajcus.net Date: Sat Nov 17 12:00:28 2012 +0100 Version: 1.3.1 icedtea-web.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- diff --git a/icedtea-web.spec b/icedtea-web.spec index ca53bb4..e119d80 100644 --- a/icedtea-web.spec +++ b/icedtea-web.spec @@ -11,12 +11,12 @@ Summary: Web browser Java plugin and an implementation of Java Web Start Summary(pl.UTF-8): Wtyczka Java dla przeglądarek WWW i implementacja Java Web Start Name: icedtea-web -Version: 1.2 -Release: 2 +Version: 1.3.1 +Release: 1 License: GPL v2 Group: Applications Source0: http://icedtea.classpath.org/download/source/%{name}-%{version}.tar.gz -# Source0-md5: 8f50cfb1b65d620a7812b5976f394598 +# Source0-md5: b22490c8e52ebafeaa17631076472d72 URL: http://icedtea.classpath.org/wiki/IcedTea-Web %buildrequires_jdk BuildRequires: rpm-javaprov gitweb: http://git.pld-linux.org/gitweb.cgi/packages/icedtea-web.git/commitdiff/825d76263a329c1106ab93e13f543e157f07961d ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: icedtea-web: icedtea-web-1.3.1.tar.gz
Files fetched: 1 STORED: http://icedtea.classpath.org/download/source/icedtea-web-1.3.1.tar.gz b22490c8e52ebafeaa17631076472d72 icedtea-web-1.3.1.tar.gz Size: 995777 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/asterisk] - disable openais with a bcond
commit 223f361dd237340b199b77b41670c5e80a10fc22 Author: Jan Rękorajski bagg...@pld-linux.org Date: Sat Nov 17 12:03:30 2012 +0100 - disable openais with a bcond asterisk.spec | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) --- diff --git a/asterisk.spec b/asterisk.spec index b875496..9666524 100644 --- a/asterisk.spec +++ b/asterisk.spec @@ -28,6 +28,7 @@ # issuing pulse-dialled calls to weird numbers %bcond_withbristuff# BRIstuff (Junghanns.NET BRI adapters) support %bcond_withmisdn # chan_misdn requires ancient mISDN (1.x) +%bcond_withopenais # openais is dead project %bcond_without h323# without h323 support %bcond_without apidocs # disable apidocs building %bcond_without verbose # verbose build @@ -112,7 +113,7 @@ BuildRequires: ncurses-devel BuildRequires: neon-devel BuildRequires: net-snmp-devel BuildRequires: newt-devel -BuildRequires: openais-devel +%{?with_openais:BuildRequires: openais-devel} %if %{with h323} BuildRequires: openh323-devel = 1.19.0 %endif @@ -1097,10 +1098,12 @@ chown -R asterisk:asterisk /var/lib/asterisk %doc doc/api/html/* %endif +%if %{with openais} %files ais %defattr(644,root,root,755) %attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/ais.conf %attr(755,root,root) %{_libdir}/asterisk/modules/res_ais.so +%endif %files alsa %defattr(644,root,root,755) gitweb: http://git.pld-linux.org/gitweb.cgi/packages/asterisk.git/commitdiff/223f361dd237340b199b77b41670c5e80a10fc22 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/fox16] - added format patch (remove unnecessary tr() calls, which trigger format-security warnings
commit 1907e12818dd39b4cf58cfbddab4161aeb8479eb Author: Jakub Bogusz qbo...@pld-linux.org Date: Sat Nov 17 12:38:05 2012 +0100 - added format patch (remove unnecessary tr() calls, which trigger format-security warnings fox16-format.patch | 31 +++ fox16.spec | 2 ++ 2 files changed, 33 insertions(+) --- diff --git a/fox16.spec b/fox16.spec index 1c1fd3c..9aa9793 100644 --- a/fox16.spec +++ b/fox16.spec @@ -14,6 +14,7 @@ Source0: http://ftp.fox-toolkit.org/pub/fox-%{version}.tar.gz Patch0:%{name}-opt.patch Patch1:%{name}-link.patch Patch2:%{name}-Makefile.patch +Patch3:%{name}-format.patch URL: http://www.fox-toolkit.org/ BuildRequires: OpenGL-GLU-devel BuildRequires: autoconf = 2.59-9 @@ -131,6 +132,7 @@ FOX 1.6 - przykładowe programy. %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build %{__libtoolize} diff --git a/fox16-format.patch b/fox16-format.patch new file mode 100644 index 000..bc5d413 --- /dev/null +++ b/fox16-format.patch @@ -0,0 +1,31 @@ +--- fox-1.6.47/src/FXGLViewer.cpp.orig 2012-11-14 17:56:11.0 +0100 fox-1.6.47/src/FXGLViewer.cpp 2012-11-17 09:39:53.180687901 +0100 +@@ -2420,7 +2420,7 @@ + + // Try open printer + if(!pdc.beginPrint(printer)){ +-FXMessageBox::error(this,MBOX_OK,tr(Printer Error),tr(Unable to print.)); ++FXMessageBox::error(this,MBOX_OK,tr(Printer Error),Unable to print.); + return 1; + } + +@@ -2595,7 +2595,7 @@ + dlg.getPrinter(printer); + FXDCPrint pdc(getApp()); + if(!pdc.beginPrint(printer)){ +- FXMessageBox::error(this,MBOX_OK,tr(Printer Error),tr(Unable to print.)); ++ FXMessageBox::error(this,MBOX_OK,tr(Printer Error),Unable to print.); + return 1; + } + +--- fox-1.6.47/adie/TextWindow.cpp.orig2012-11-14 17:56:11.0 +0100 fox-1.6.47/adie/TextWindow.cpp 2012-11-17 09:44:08.195862341 +0100 +@@ -1421,7 +1421,7 @@ + // Reopen file + long TextWindow::onCmdReopen(FXObject*,FXSelector,void*){ + if(isModified()){ +-if(FXMessageBox::question(this,MBOX_YES_NO,tr(Document was changed),tr(Discard changes to this document?))==MBOX_CLICKED_NO) return 1; ++if(FXMessageBox::question(this,MBOX_YES_NO,tr(Document was changed),Discard changes to this document?)==MBOX_CLICKED_NO) return 1; + } + loadFile(filename); + return 1; gitweb: http://git.pld-linux.org/gitweb.cgi/packages/fox16.git/commitdiff/1907e12818dd39b4cf58cfbddab4161aeb8479eb ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/gucharmap] - updated to 3.6.1
commit ab90e7db87563555995afaff3ec751c0a3766f56 Author: Jakub Bogusz qbo...@pld-linux.org Date: Sat Nov 17 13:25:56 2012 +0100 - updated to 3.6.1 gucharmap.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- diff --git a/gucharmap.spec b/gucharmap.spec index f9ef0f6..25ef53f 100644 --- a/gucharmap.spec +++ b/gucharmap.spec @@ -5,12 +5,12 @@ Summary: Unicode character map Summary(pl.UTF-8): Mapa znaków unikodowych Name: gucharmap -Version: 3.6.0 +Version: 3.6.1 Release: 1 License: GPL v3+ Group: X11/Applications Source0: http://ftp.gnome.org/pub/GNOME/sources/gucharmap/3.6/%{name}-%{version}.tar.xz -# Source0-md5: 89d9042cd3ec011c61958dcd9e45e968 +# Source0-md5: a0e0cdf05a0db8a66b2da35b4f8b7f6e URL: http://live.gnome.org/Gucharmap BuildRequires: autoconf = 2.56 BuildRequires: automake = 1:1.11 gitweb: http://git.pld-linux.org/gitweb.cgi/packages/gucharmap.git/commitdiff/ab90e7db87563555995afaff3ec751c0a3766f56 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: gucharmap: gucharmap-3.6.1.tar.xz
Files fetched: 1 STORED: http://ftp.gnome.org/pub/GNOME/sources/gucharmap/3.6/gucharmap-3.6.1.tar.xz a0e0cdf05a0db8a66b2da35b4f8b7f6e gucharmap-3.6.1.tar.xz Size: 1888388 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/mysql] invoke mysql rotation daily
commit 84837ab6139e59e53a311abec8da382cb41a8d02 Author: Elan Ruusamäe g...@delfi.ee Date: Sat Nov 17 12:54:01 2012 + invoke mysql rotation daily otherwise using expire-logs-days can't work as it has no source of flush logs event mysql.logrotate | 7 +++ mysql.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) --- diff --git a/mysql.spec b/mysql.spec index 3c3b340..7de9380 100644 --- a/mysql.spec +++ b/mysql.spec @@ -38,7 +38,7 @@ Summary(uk.UTF-8):MySQL - швидкий SQL-сервер Summary(zh_CN.UTF-8): MySQL数据库服务器 Name: mysql Version: 5.5.28 -Release: 1 +Release: 2 License: GPL + MySQL FLOSS Exception Group: Applications/Databases # Source0Download: http://dev.mysql.com/downloads/mysql/5.5.html#downloads diff --git a/mysql.logrotate b/mysql.logrotate index 6a4f7c0..4bb78ce 100644 --- a/mysql.logrotate +++ b/mysql.logrotate @@ -21,6 +21,13 @@ missingok create 640 mysql mysql sharedscripts + + # NOTE: + # if you run the rotation less often than daily then the + # expire-logs-days mysqld server parameter may no longer work as you + # expect + daily + postrotate /sbin/service mysql flush-logs endscript gitweb: http://git.pld-linux.org/gitweb.cgi/packages/mysql.git/commitdiff/288d6415de974d83a192d4cae8c740f863e97e5e ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/mysql] mysql status formatting cosmetics
commit 288d6415de974d83a192d4cae8c740f863e97e5e Author: Elan Ruusamäe g...@delfi.ee Date: Sat Nov 17 12:55:10 2012 + mysql status formatting cosmetics mysql.init | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/mysql-ndb-cpc.init b/mysql-ndb-cpc.init old mode 100644 new mode 100755 diff --git a/mysql-ndb-mgm.init b/mysql-ndb-mgm.init old mode 100644 new mode 100755 diff --git a/mysql-ndb.init b/mysql-ndb.init old mode 100644 new mode 100755 diff --git a/mysql.init b/mysql.init index fadce4c..b3a306e 100755 --- a/mysql.init +++ b/mysql.init @@ -365,7 +365,7 @@ slave_status() { return fi - printf \tSlave Status:\n + printf Slave Status:\n eval $(echo $slave_status | awk -F': ' '/^ *[A-Za-z_]+:/{ k = tolower($1); gitweb: http://git.pld-linux.org/gitweb.cgi/packages/mysql.git/commitdiff/288d6415de974d83a192d4cae8c740f863e97e5e ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/mozilla-firefox-bin] - up to 16.0.2 - use rmp5 url hack fix
commit 806ffd6ddf51a321f0ff87a3d435f90e42e307f1 Author: Bartlomiej Zimon uz...@o2.pl Date: Sat Nov 17 14:07:42 2012 +0100 - up to 16.0.2 - use rmp5 url hack fix Signed-off-by: Bartlomiej Zimon uz...@o2.pl mozilla-firefox-bin.spec | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) --- diff --git a/mozilla-firefox-bin.spec b/mozilla-firefox-bin.spec index f3a9289..8d4e9f9 100644 --- a/mozilla-firefox-bin.spec +++ b/mozilla-firefox-bin.spec @@ -2,14 +2,14 @@ Summary: Mozilla Firefox web browser Summary(pl.UTF-8): Mozilla Firefox - przeglądarka WWW Name: mozilla-firefox-bin -Version: 15.0.1 +Version: 16.0.2 Release: 1 License: MPL/LGPL Group: X11/Applications/Networking -Source0: http://releases.mozilla.org/pub/mozilla.org/%{realname}/releases/%{version}/linux-i686/en-US/%{realname}-%{version}.tar.bz2#/%{realname}-%{version}.i686.tar.bz2 -# Source0-md5: 29f7a807530358f576fe1b978343811d -Source1: http://releases.mozilla.org/pub/mozilla.org/%{realname}/releases/%{version}/linux-x86_64/en-US/%{realname}-%{version}.tar.bz2#/%{realname}-%{version}.x8664.tar.bz2 -# Source1-md5: 005907010b2118acd623bdf5553f4db5 +Source0: http://releases.mozilla.org/pub/mozilla.org/%{realname}/releases/%{version}/linux-i686/en-US/%{realname}-%{version}.tar.bz2?/%{realname}-%{version}.i686.tar.bz2 +# Source0-md5: 79378b314f1c35689c6908c8bb97b19a +Source1: http://releases.mozilla.org/pub/mozilla.org/%{realname}/releases/%{version}/linux-x86_64/en-US/%{realname}-%{version}.tar.bz2?/%{realname}-%{version}.x8664.tar.bz2 +# Source1-md5: 5258b203d85c44224672fda9682ecaed Source2: %{name}.desktop Source3: %{name}.sh #Patch0: %{name}-agent.patch gitweb: http://git.pld-linux.org/gitweb.cgi/packages/mozilla-firefox-bin.git/commitdiff/806ffd6ddf51a321f0ff87a3d435f90e42e307f1 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: mozilla-firefox-bin: firefox-16.0.2.i686.tar.bz2 firefox-16.0.2.x8664.tar.bz2
Files fetched: 2 STORED: http://releases.mozilla.org/pub/mozilla.org/firefox/releases/16.0.2/linux-i686/en-US/firefox-16.0.2.tar.bz2?/firefox-16.0.2.i686.tar.bz2 79378b314f1c35689c6908c8bb97b19a firefox-16.0.2.i686.tar.bz2 Size: 19790521 bytes STORED: http://releases.mozilla.org/pub/mozilla.org/firefox/releases/16.0.2/linux-x86_64/en-US/firefox-16.0.2.tar.bz2?/firefox-16.0.2.x8664.tar.bz2 5258b203d85c44224672fda9682ecaed firefox-16.0.2.x8664.tar.bz2 Size: 21883731 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/percona-toolkit] - up to 2.1.6
commit acedff0621bebce7f23df1e4676f013e0fc85f6a Author: Elan Ruusamäe g...@delfi.ee Date: Sat Nov 17 15:14:59 2012 +0200 - up to 2.1.6 percona-toolkit.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- diff --git a/percona-toolkit.spec b/percona-toolkit.spec index d29eefe..fbe359b 100644 --- a/percona-toolkit.spec +++ b/percona-toolkit.spec @@ -1,12 +1,12 @@ %include /usr/lib/rpm/macros.perl Summary: Essential command-line utilities for MySQL Name: percona-toolkit -Version: 2.1.4 +Version: 2.1.6 Release: 1 License: GPL v2 Group: Applications/Databases Source0: https://www.percona.com/downloads/percona-toolkit/%{version}/%{name}-%{version}.tar.gz -# Source0-md5: 686313c3037c557ad21b0508f0bc6d5b +# Source0-md5: 60ca819e1b7b65928d109fd47b06608e URL: http://www.percona.com/software/percona-toolkit/ BuildRequires: perl-ExtUtils-MakeMaker BuildRequires: rpm-perlprov = 4.1-13 gitweb: http://git.pld-linux.org/gitweb.cgi/packages/percona-toolkit.git/commitdiff/acedff0621bebce7f23df1e4676f013e0fc85f6a ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: percona-toolkit: percona-toolkit-2.1.6.tar.gz
Files fetched: 1 STORED: https://www.percona.com/downloads/percona-toolkit/2.1.6/percona-toolkit-2.1.6.tar.gz 60ca819e1b7b65928d109fd47b06608e percona-toolkit-2.1.6.tar.gz Size: 1467858 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/xen] More tmpfiles
commit 5c00ee359d1265f322edb5ac2cf308963cd90c18 Author: Jacek Konieczny jaj...@jajcus.net Date: Sat Nov 17 12:38:56 2012 +0100 More tmpfiles xen.spec | 3 +++ xen.tmpfiles | 2 ++ 2 files changed, 5 insertions(+) --- diff --git a/xen.spec b/xen.spec index be187f2..5fc06de 100644 --- a/xen.spec +++ b/xen.spec @@ -72,6 +72,7 @@ Source52: xenstored.init Source53: xen-watchdog.init Source54: xendomains.init Source55: xen.logrotate +Source56: xen.tmpfiles Patch0:%{name}-python_scripts.patch Patch1:%{name}-symbols.patch Patch2:%{name}-curses.patch @@ -447,6 +448,7 @@ install %{SOURCE52} $RPM_BUILD_ROOT/etc/rc.d/init.d/xenstored install %{SOURCE53} $RPM_BUILD_ROOT/etc/rc.d/init.d/xen-watchdog install %{SOURCE54} $RPM_BUILD_ROOT/etc/rc.d/init.d/xendomains install %{SOURCE55} $RPM_BUILD_ROOT/etc/logrotate.d/xen +install %{SOURCE56} $RPM_BUILD_ROOT/usr/lib/tmpfiles.d/xen.conf mv $RPM_BUILD_ROOT/etc/xen/{x{m,l}example*,examples} @@ -626,6 +628,7 @@ fi %{_sharedstatedir}/xenstored %dir /var/run/xenstored %{systemdtmpfilesdir}/xenstored.conf +%{systemdtmpfilesdir}/xen.conf %dir %attr(0700,root,root) /var/log/xen %dir %attr(0700,root,root) /var/log/xen/console %{_datadir}/qemu-xen diff --git a/xen.tmpfiles b/xen.tmpfiles new file mode 100644 index 000..43bf90c --- /dev/null +++ b/xen.tmpfiles @@ -0,0 +1,2 @@ +D /var/run/xen 0700 root root - +D /var/run/xen-hotplug 0700 root root - gitweb: http://git.pld-linux.org/gitweb.cgi/packages/xen.git/commitdiff/291689a11152f9ea4bb81d2b0549fd0a5fedd10a ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/xen] Use the %%{systemdtmpfilesdir} macro
commit 997245239255b1299a46d33b1524c206921a7451 Author: Jacek Konieczny jaj...@jajcus.net Date: Sat Nov 17 12:40:39 2012 +0100 Use the %%{systemdtmpfilesdir} macro xen.spec | 8 1 file changed, 4 insertions(+), 4 deletions(-) --- diff --git a/xen.spec b/xen.spec index 5fc06de..7cc0a64 100644 --- a/xen.spec +++ b/xen.spec @@ -415,7 +415,7 @@ unset CXXFLAGS %install rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT/etc/{xen/examples,modules-load.d,logrotate.d} \ - $RPM_BUILD_ROOT{/usr/lib/tmpfiles.d,%{systemdunitdir},/var/log/xen/console} + $RPM_BUILD_ROOT{%{systemdtmpfilesdir},%{systemdunitdir},/var/log/xen/console} %{__make} -j1 install-xen install-tools install-stubdom install-docs \ %{!?with_ocaml:OCAML_TOOLS=n} \ @@ -435,9 +435,9 @@ install %{SOURCE34} $RPM_BUILD_ROOT%{systemdunitdir}/xenconsoled.service install %{SOURCE35} $RPM_BUILD_ROOT/etc/sysconfig/xenconsoled install %{SOURCE36} $RPM_BUILD_ROOT%{systemdunitdir}/xenstored.service install %{SOURCE37} $RPM_BUILD_ROOT/etc/sysconfig/xenstored -install %{SOURCE38} $RPM_BUILD_ROOT/usr/lib/tmpfiles.d/xenstored.conf +install %{SOURCE38} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/xenstored.conf install %{SOURCE39} $RPM_BUILD_ROOT%{systemdunitdir}/xend.service -install %{SOURCE40} $RPM_BUILD_ROOT/usr/lib/tmpfiles.d/xend.conf +install %{SOURCE40} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/xend.conf install %{SOURCE41} $RPM_BUILD_ROOT%{systemdunitdir}/xen-watchdog.service install %{SOURCE42} $RPM_BUILD_ROOT/etc/modules-load.d/xen-dom0.conf # sysvinit scripts @@ -448,7 +448,7 @@ install %{SOURCE52} $RPM_BUILD_ROOT/etc/rc.d/init.d/xenstored install %{SOURCE53} $RPM_BUILD_ROOT/etc/rc.d/init.d/xen-watchdog install %{SOURCE54} $RPM_BUILD_ROOT/etc/rc.d/init.d/xendomains install %{SOURCE55} $RPM_BUILD_ROOT/etc/logrotate.d/xen -install %{SOURCE56} $RPM_BUILD_ROOT/usr/lib/tmpfiles.d/xen.conf +install %{SOURCE56} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/xen.conf mv $RPM_BUILD_ROOT/etc/xen/{x{m,l}example*,examples} gitweb: http://git.pld-linux.org/gitweb.cgi/packages/xen.git/commitdiff/291689a11152f9ea4bb81d2b0549fd0a5fedd10a ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/xen] Another scripts locking patch, from upstream
commit 7abe351d55ff7aba8b3a3af2c48fef6ccc21fc99 Author: Jacek Konieczny jaj...@jajcus.net Date: Sat Nov 17 12:52:45 2012 +0100 Another scripts locking patch, from upstream http://xenbits.xen.org/hg/staging/xen-unstable.hg/rev/b3b03536789a Fixes starting VMs with more than one bridged interface xen-close_lockfd_after_lock_attempt.patch | 37 +++ xen.spec | 2 ++ 2 files changed, 39 insertions(+) --- diff --git a/xen.spec b/xen.spec index 7cc0a64..6d90d0d 100644 --- a/xen.spec +++ b/xen.spec @@ -87,6 +87,7 @@ Patch9: xen-initscript.patch Patch10: xen-quemu-softloat-c99.patch Patch11: xen-qemu.patch Patch12: xen-scripts-locking.patch +Patch13: xen-close_lockfd_after_lock_attempt.patch URL: http://www.xen.org/products/xenhyp.html %{?with_opengl:BuildRequires: OpenGL-devel} %{?with_sdl:BuildRequires: SDL-devel = 1.2.1} @@ -372,6 +373,7 @@ Nadzorca Xen w postaci, która może być uruchomiona wprost z firmware %patch10 -p1 %patch11 -p1 %patch12 -p1 +%patch13 -p1 # stubdom sources ln -s %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} %{SOURCE14} stubdom diff --git a/xen-close_lockfd_after_lock_attempt.patch b/xen-close_lockfd_after_lock_attempt.patch new file mode 100644 index 000..9295636 --- /dev/null +++ b/xen-close_lockfd_after_lock_attempt.patch @@ -0,0 +1,37 @@ + +# HG changeset patch +# User Olaf Hering o...@aepfle.de +# Date 1350549301 -3600 +# Node ID b3b03536789abbf2c4b7d62377034c1f14c6340c +# Parent 019ca95dfa34efc71b1707f785b5112573e7d02e +hotplug/Linux: close lockfd after lock attempt + +When a HVM guest is shutdown some of the 'remove' events can not claim +the lock for some reason. Instead they try to grab the lock in a busy +loop, until udev reaps the xen-hotplug-cleanup helper. +After analyzing the resulting logfile its not obvious what the cause is. +The only explanation is that bash (?) gets confused if the same lockfd +is opened again and again. Closing it in each iteration seem to fix the +issue. + +This was observed with sles11sp2 (bash 3.2) and 4.2 xend. + +Signed-off-by: Olaf Hering o...@aepfle.de +Acked-by: Ian Campbell ian.campb...@citrix.com +[ ijc -- added the comment ] +Committed-by: Ian Campbell ian.campb...@citrix.com + +diff -r 019ca95dfa34 -r b3b03536789a tools/hotplug/Linux/locking.sh +--- a/tools/hotplug/Linux/locking.sh Thu Oct 18 09:35:00 2012 +0100 b/tools/hotplug/Linux/locking.sh Thu Oct 18 09:35:01 2012 +0100 +@@ -59,6 +59,9 @@ claim_lock() + print y\n if $fd_inum eq $file_inum; + ' $_lockfile ) + if [ x$rightfile = xy ]; then break; fi ++ # Some versions of bash appear to be buggy if the same ++ # $_lockfile is opened repeatedly. Close the current fd here. ++eval exec $_lockfd- + done + } + + gitweb: http://git.pld-linux.org/gitweb.cgi/packages/xen.git/commitdiff/291689a11152f9ea4bb81d2b0549fd0a5fedd10a ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/xen] xendomains.init 'status' action fixes
commit bf0f888a6411b41ca9649b1850f62c8875f4e199 Author: Jacek Konieczny jaj...@jajcus.net Date: Sat Nov 17 13:30:52 2012 +0100 xendomains.init 'status' action fixes - shell syntax errors fixed – made compatible with 'xl' output (I hope 'xm' still works if anybody needs the obsolete tool) That is still a very, very ugly hack. I just made it work. xendomains.init | 45 ++--- 1 file changed, 26 insertions(+), 19 deletions(-) --- diff --git a/xendomains.init b/xendomains.init index 3dc2a77..1ecefe9 100644 --- a/xendomains.init +++ b/xendomains.init @@ -47,7 +47,8 @@ contains_something() { # read name from xen config file rdname() { - NM=$($CMD create --quiet --dryrun --defconfig $1 | sed -n 's/^.*(name \(.*\))$/\1/p') + NM=$($CMD create --quiet --dryrun --defconfig $1 21 | sed -n 's/^.*\(name \(.*\)\)\|\(name: \([^]*\),\?\)$/\2\4/p') + NM=$(echo $NM) } rdnames() { @@ -66,11 +67,16 @@ rdnames() { } parseln() { -if [[ $1 = *(domain* ]]; then +if [[ $1 = *(domain* ]]; then name=;id= -elif [[ $1 = *(name* ]]; then +elif [[ $1 = *\domid\:* ]]; then +name= + id=$(echo $1 | sed -s 's/^.*: \([0-9]*\),$/\1/') +elif [[ $1 = *\name\:* ]]; then + name=$(echo $1 | sed -s 's/^.*: \([^]*\),$/\1/') +elif [[ $1 = *(name* ]]; then name=$(echo $1 | sed -e 's/^.*(name \(.*\))$/\1/') -elif [[ $1 = *(domid* ]]; then +elif [[ $1 = *(domid* ]]; then id=$(echo $1 | sed -e 's/^.*(domid \(.*\))$/\1/') fi [ -n $name -a -n $id ] return 0 || return 1 @@ -79,7 +85,7 @@ parseln() { is_running() { rdname $1 name=;id= -$CMD list -l | grep '(\(domain\|domid\|name\)' | \ +$CMD list -l | grep '[(]\(domain\|domid\|name\)' | \ while read LN; do parseln $LN || continue [ $id = 0 ] continue @@ -157,7 +163,7 @@ start() { all_zombies() { name=;id= -$CMD list -l | grep '(\(domain\|domid\|name\)' | \ +$CMD list -l | grep '[(]\(domain\|domid\|name\)' | \ while read LN; do parseln $LN || continue if test $id = 0; then continue; fi @@ -204,7 +210,7 @@ stop() { fi echo -n Shutting down Xen domains: name=;id= -$CMD list -l | grep '(\(domain\|domid\|name\)' | \ +$CMD list -l | grep '[(]\(domain\|domid\|name\)' | \ while read LN; do parseln $LN || continue if test $id = 0; then continue; fi @@ -313,18 +319,18 @@ stop() { check_domain_up() { + local result + result=1 name=;id= -$CMD list -l | grep '(\(domain\|domid\|name\)' | \ +$CMD list -l | grep '[(]\(domain\|domid\|name\)' | \ while read LN; do - parseln $LN || continue - if test $id = 0; then continue; fi - case $name in - ($1) - return 0 - ;; - esac + parseln $LN || continue + if test $id = 0; then continue; fi + if [ $name = $1 ] ; then + echo 1 + break + fi done -return 1 } check_all_auto_domains_up() @@ -336,8 +342,8 @@ check_all_auto_domains_up() for nm in $XENDOMAINS_AUTO/*; do rdname $nm found=0 - if check_domain_up $NM; then - echo -n $name + if [ -n $(check_domain_up $NM) ] ; then + echo -n $NM else missing=$missing $NM fi @@ -377,10 +383,11 @@ case $1 in start ;; status) - if [ -f /var/lock/subsys/xendomains; then + if [ -f /var/lock/subsys/xendomains ]; then echo -n Checking for xendomains: check_all_auto_domains_up check_all_saved_domains_up + echo fi ;; *) gitweb: http://git.pld-linux.org/gitweb.cgi/packages/xen.git/commitdiff/291689a11152f9ea4bb81d2b0549fd0a5fedd10a ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/xen] Release: 3
commit 291689a11152f9ea4bb81d2b0549fd0a5fedd10a Author: Jacek Konieczny jaj...@jajcus.net Date: Sat Nov 17 14:34:27 2012 +0100 Release: 3 xen.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/xen.spec b/xen.spec index 6d90d0d..d40ff48 100644 --- a/xen.spec +++ b/xen.spec @@ -30,7 +30,7 @@ Summary: Xen - a virtual machine monitor Summary(pl.UTF-8): Xen - monitor maszyny wirtualnej Name: xen Version: 4.2.0 -Release: 2 +Release: 3 License: GPL v2, interface parts on BSD-like Group: Applications/System Source0: http://bits.xensource.com/oss-xen/release/%{version}/%{name}-%{version}.tar.gz gitweb: http://git.pld-linux.org/gitweb.cgi/packages/xen.git/commitdiff/291689a11152f9ea4bb81d2b0549fd0a5fedd10a ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/h323plus] (8 commits) Created branch master
The branch 'master' was created. Summary of new commits: ba10ac8... - new dd6d7a5... - this software uses old celt api db1d1a6... - fix ptlib detection cad1738... - fix building with gcc 4.7 da7dd04... - set up sane paths e890e72... - hardcode ptlib version to the one required in spec eca6a06... - use system libs, patch from openh323 80a03e0... - add a note about ptlib-version patch ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/h323plus: 1/8] - new
commit ba10ac83ef950dde47a527db274837a2b1fdde61 Author: Jan Rękorajski bagg...@pld-linux.org Date: Sat Nov 17 15:35:07 2012 +0100 - new h323plus.spec | 164 ++ 1 file changed, 164 insertions(+) --- diff --git a/h323plus.spec b/h323plus.spec new file mode 100644 index 000..ef39eb3 --- /dev/null +++ b/h323plus.spec @@ -0,0 +1,164 @@ +# TODO: +# - separate plugins to subpackages +# - gsm-amr plugin (using system amrnb if possible) +# - use system libilbc or at least use optflags for plugins/audio/iLBC +# - configure: Skipping tests for RFC 2190 H.263 support +# - configure: Disabled non-RFC2190 H.263 using ffmpeg +# - configure: Disabled H.263 using VIC + +%definefver%(echo %{version} | tr . _) +Summary: H.323 Plus Library +Summary(pl.UTF-8): Biblioteka OpenH323 +Name: h323plus +Version: 1.24.0 +Release: 0.1 +License: MPL 1.0 +Group: Libraries +Source0: http://www.h323plus.org/source/download/%{name}-v%{fver}.tar.gz +# Source0-md5: 459d527c3b52dc34837c9530899f556a +Patch0:%{name}-configure.patch +Patch1:%{name}-ptlib-version.patch +Patch2:%{name}-mak-paths.patch +Patch3:%{name}-gcc47.patch +Patch4:%{name}-celt051.patch +URL: http://www.h323plus.org/ +BuildRequires: autoconf = 2.50 +BuildRequires: automake +BuildRequires: celt051-devel +BuildRequires: ffmpeg-devel = 0.4.6 +BuildRequires: libgsm-devel = 1.0.10 +BuildRequires: libstdc++-devel +BuildRequires: lpc10-devel = 1.5 +BuildRequires: ptlib-devel = 2.10.1 +BuildRequires: sed = 4.0 +BuildRequires: speex-devel = 1:1.1.5 +Requires: speex = 1:1.1.5 +Obsoletes: openh323 %{version}-%{release} +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) + +%description +The OpenH323 project aims to create a full featured, interoperable, +Open Source implementation of the ITU H.323 teleconferencing protocol +that can be used by personal developers and commercial users without +charge. + +%description -l pl.UTF-8 +Celem projektu OpenH323 jest stworzenie w pełni funkcjonalnej i +wyposażonej implementacji protokołu telekonferencyjnego ITU H.323, +który może być używany przez użytkowników prywatnych i komercyjnych +bez opłat. + +%package devel +Summary: OpenH323 development files +Summary(pl.UTF-8): Pliki dla developerów OpenH323 +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Requires: ffmpeg-devel +Requires: ptlib-devel = 2.10.1 +Obsoletes: openh323-devel %{version}-%{release} + +%description devel +Header files and libraries for developing applications that use +OpenH323. + +%description devel -l pl.UTF-8 +Pliki nagłówkowe i biblioteki konieczne do rozwoju aplikacji +używających OpenH323. + +%package static +Summary: OpenH323 static libraries +Summary(pl.UTF-8): Biblioteki statyczne OpenH323 +Group: Development/Libraries +Requires: %{name}-devel = %{version}-%{release} +Obsoletes: openh323-ststic %{version}-%{release} + +%description static +OpenH323 static libraries. + +%description static -l pl.UTF-8 +Biblioteki statyczne OpenH323. + +%prep +%setup -q -n %{name} +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 + +%build +%{__autoconf} +%configure \ + --enable-localspeex=no \ + --enable-plugins + +BUILDDIR=$(pwd) +%{__make} %{?debug:debug}%{!?debug:opt}shared \ + CC=%{__cc} \ + CPLUS=%{__cxx} \ + OPTCCFLAGS=%{rpmcflags} %{!?debug:-DNDEBUG} \ + OPENH323DIR=$BUILDDIR \ + OH323_INCDIR=$BUILDDIR/include \ + OH323_LIBDIR=$BUILDDIR/%{_lib} + +%{__make} -C plugins %{?debug:debug}%{!?debug:opt}shared \ + CC=%{__cc} \ + CPLUS=%{__cxx} \ + OPTCCFLAGS=%{rpmcflags} %{!?debug:-DNDEBUG} \ + OPENH323DIR=$BUILDDIR \ + OH323_INCDIR=$BUILDDIR/include \ + OH323_LIBDIR=$BUILDDIR/%{_lib} + +%{__make} -C samples/simple \ + CC=%{__cc} \ + CPLUS=%{__cxx} \ + OPTCCFLAGS=%{rpmcflags} %{!?debug:-DNDEBUG} \ + OPENH323DIR=$BUILDDIR \ + OH323_INCDIR=$BUILDDIR/include \ + OH323_LIBDIR=$BUILDDIR/%{_lib} + +%install +rm -rf $RPM_BUILD_ROOT +install -d $RPM_BUILD_ROOT{%{_libdir},%{_bindir}} + +%{__make} install \ + OH323_LIBDIR=%{_lib} \ + PREFIX=$RPM_BUILD_ROOT%{_prefix} \ + LIBDIR=$RPM_BUILD_ROOT%{_libdir} + +%{__make} -C plugins install \ + DESTDIR=$RPM_BUILD_ROOT \ + PREFIX=$RPM_BUILD_ROOT%{_prefix} \ + LIBDIR=$RPM_BUILD_ROOT%{_libdir} + +# using cp as install won't preserve links +cp -pd %{_lib}/lib*.a $RPM_BUILD_ROOT%{_libdir} +install -p samples/simple/obj_*/simph323 $RPM_BUILD_ROOT%{_bindir} +cp -a version.h $RPM_BUILD_ROOT%{_includedir}/openh323 + +%clean +rm -rf $RPM_BUILD_ROOT + +%post -p /sbin/ldconfig +%postun-p /sbin/ldconfig + +%files +%defattr(644,root,root,755) +%doc *.txt
[packages/h323plus: 2/8] - this software uses old celt api
commit dd6d7a53747e86a0a6f26a75f6f63170949c11a3 Author: Jan Rękorajski bagg...@pld-linux.org Date: Sat Nov 17 15:35:17 2012 +0100 - this software uses old celt api h323plus-celt051.patch | 22 ++ 1 file changed, 22 insertions(+) --- diff --git a/h323plus-celt051.patch b/h323plus-celt051.patch new file mode 100644 index 000..6a8f6c6 --- /dev/null +++ b/h323plus-celt051.patch @@ -0,0 +1,22 @@ +--- h323plus/plugins/configure.ac~ 2010-09-20 11:04:24.0 +0200 h323plus/plugins/configure.ac 2012-11-17 13:00:12.200193585 +0100 +@@ -361,7 +361,7 @@ + AC_MSG_RESULT(Manually disabled CELT) + else + PKG_CHECK_MODULES([CELT], +-[celt], ++[celt051], + [ + AC_SUBST(CELT_CFLAGS) + AC_SUBST(CELT_LIBS) +--- h323plus/plugins/audio/celt/celtcodec.c~ 2010-02-24 03:19:19.0 +0100 h323plus/plugins/audio/celt/celtcodec.c2012-11-17 13:01:19.631672865 +0100 +@@ -14,7 +14,7 @@ + #include plugin-config.h + + #include codec/opalplugin.h +-#include celt/celt.h ++#include celt051/celt.h + + #ifndef FALSE + #define FALSE 0 gitweb: http://git.pld-linux.org/gitweb.cgi/packages/h323plus.git/commitdiff/80a03e028e264835f927118d78091e61e180d860 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/h323plus: 3/8] - fix ptlib detection
commit db1d1a690c9c3c1f4f640130f2fe11a4492cf4bf Author: Jan Rękorajski bagg...@pld-linux.org Date: Sat Nov 17 15:35:45 2012 +0100 - fix ptlib detection h323plus-configure.patch | 34 ++ 1 file changed, 34 insertions(+) --- diff --git a/h323plus-configure.patch b/h323plus-configure.patch new file mode 100644 index 000..c0b0bab --- /dev/null +++ b/h323plus-configure.patch @@ -0,0 +1,34 @@ +--- h323plus/configure.ac.orig 2012-11-17 12:29:50.353591179 +0100 h323plus/configure.ac 2012-11-17 12:30:55.086922230 +0100 +@@ -70,25 +70,13 @@ + fi + + if test ${HAS_PTLIB:-unset} = unset ; then +- AC_CHECK_HEADER(${OPENH323DIR}/../ptlib/version.h, HAS_PTLIB=1) +- if test ${HAS_PTLIB:-unset} != unset ; then +-PTLIBDIR=${OPENH323DIR}/../ptlib ++ AC_PATH_PROG(PTLIB_CONFIG, ptlib-config, , /usr/bin) ++else ++ if test ${PTLIB_CONFIG:-unset} = unset ; then ++AC_PATH_PROG(PTLIB_CONFIG, ptlib-config, , /usr/share/ptlib/make/) + else +-AC_CHECK_HEADER(${HOME}/ptlib/version.h, HAS_PTLIB=1) +-if test ${HAS_PTLIB:-unset} != unset ; then +- PTLIBDIR=${HOME}/ptlib +-else +- if test ${HAS_PTLIB:-unset} = unset ; then +-AC_PATH_PROG(PTLIB_CONFIG, ptlib-config, , /usr/local/bin) +- else +-if test ${PTLIB_CONFIG:-unset} = unset ; then +- AC_PATH_PROG(PTLIB_CONFIG, ptlib-config, , /usr/share/ptlib/make/) +-else +- if test ${PTLIB_CONFIG:-unset} = unset ; then +-AC_PATH_PROG(PTLIB_CONFIG, ptlib-config, , /usr/share/ptlib/make/) +- fi +-fi +- fi ++if test ${PTLIB_CONFIG:-unset} = unset ; then ++ AC_PATH_PROG(PTLIB_CONFIG, ptlib-config, , /usr/share/ptlib/make/) + fi + fi + fi gitweb: http://git.pld-linux.org/gitweb.cgi/packages/h323plus.git/commitdiff/80a03e028e264835f927118d78091e61e180d860 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/h323plus: 4/8] - fix building with gcc 4.7
commit cad173871ed60cb911c643ac00f6c77dbbc5634c Author: Jan Rękorajski bagg...@pld-linux.org Date: Sat Nov 17 15:35:58 2012 +0100 - fix building with gcc 4.7 h323plus-gcc47.patch | 11 +++ 1 file changed, 11 insertions(+) --- diff --git a/h323plus-gcc47.patch b/h323plus-gcc47.patch new file mode 100644 index 000..c80af1e --- /dev/null +++ b/h323plus-gcc47.patch @@ -0,0 +1,11 @@ +--- h323plus/include/h460/h460_std23.h~2011-12-16 11:29:04.0 +0100 h323plus/include/h460/h460_std23.h 2012-11-17 13:15:55.842757960 +0100 +@@ -63,7 +63,7 @@ + { + // compile issue with PTLIB SVN object.h/cxx r26772 revert both files back to SVN r26754 - SH + // commenting out will create a ambiguous delete in class destructor compile error. +-PCLASSINFO(PNatMethod_H46024, PNatMethod); ++//PCLASSINFO(PNatMethod_H46024, PNatMethod); + + public: + PNatMethod_H46024(); gitweb: http://git.pld-linux.org/gitweb.cgi/packages/h323plus.git/commitdiff/80a03e028e264835f927118d78091e61e180d860 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: h323plus: h323plus-v1_24_0.tar.gz
Files fetched: 1 STORED: http://www.h323plus.org/source/download/h323plus-v1_24_0.tar.gz 459d527c3b52dc34837c9530899f556a h323plus-v1_24_0.tar.gz Size: 4181887 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/h323plus: 5/8] - set up sane paths
commit da7dd042b34173fb8a72dd93bd77de24629cff37 Author: Jan Rękorajski bagg...@pld-linux.org Date: Sat Nov 17 15:36:43 2012 +0100 - set up sane paths h323plus-mak-paths.patch | 60 1 file changed, 60 insertions(+) --- diff --git a/h323plus-mak-paths.patch b/h323plus-mak-paths.patch new file mode 100644 index 000..906bdb5 --- /dev/null +++ b/h323plus-mak-paths.patch @@ -0,0 +1,60 @@ +--- h323plus/openh323u.mak.in~ 2011-09-01 05:15:08.0 +0200 h323plus/openh323u.mak.in 2012-11-17 13:12:41.416098151 +0100 +@@ -25,9 +25,9 @@ + # + + PTLIBDIR = @PTLIBDIR@ + ifndef OPENH323DIR +-OPENH323DIR = @OPENH323DIR@ ++OPENH323DIR = @prefix@ + endif + STDCCFLAGS+= @STDCCFLAGS@ + LDFLAGS += @LDFLAGS@ + LDLIBS+= @LDLIBS@ +@@ -65,20 +64,18 @@ + include $(PTLIBDIR)/make/ptlib.mak + endif # LIBRARY_MAKEFILE + +-LIBDIRS += $(OPENH323DIR) +- + #OH323_SUPPRESS_H235 = 1 + + OH323_SRCDIR = $(OPENH323DIR)/src +-ifdef PREFIX +-OH323_INCDIR = $(PREFIX)/include/openh323 ++ifndef OH323_INCDIR ++OH323_INCDIR = @includedir@/openh323 +-else +-OH323_INCDIR = $(OPENH323DIR)/include +-endif # PREFIX ++endif # OH323_INCDIR + + ifndef OH323_LIBDIR +-OH323_LIBDIR = $(OPENH323DIR)/lib ++OH323_LIBDIR = @libdir@ + endif # OH323_LIBDIR ++ ++LIBDIRS += $(OH323_LIBDIR) + + ifeq ($(NOTRACE), 1) + STDCCFLAGS += -DPASN_NOPRINTON -DPASN_LEANANDMEAN +@@ -89,7 +89,7 @@ + OH323_SUFFIX = $(OBJ_SUFFIX) + endif # NOTRACE + +-OH323_BASE = h323_$(PLATFORM_TYPE)_$(OH323_SUFFIX)$(LIB_TYPE) ++OH323_BASE = h323 + OH323_FILE = lib$(OH323_BASE).$(LIB_SUFFIX) + + LDFLAGS += -L$(OH323_LIBDIR) +--- h323plus/Makefile.in~ 2011-09-10 06:31:33.0 +0200 h323plus/Makefile.in 2012-11-17 13:34:23.042718902 +0100 +@@ -86,7 +86,7 @@ + install: + mkdir -p $(DESTDIR)$(LIBDIR) + rm -f $(DESTDIR)$(LIBDIR)/libh323_*_r.so* +- $(INSTALL) -m 444 lib/$(OH323_FILE).@MAJOR_VERSION@.@MINOR_VERSION@.@BUILD_NUMBER@ $(DESTDIR)$(LIBDIR) ++ $(INSTALL) -m 444 $(OH323_LIBDIR)/$(OH323_FILE).@MAJOR_VERSION@.@MINOR_VERSION@.@BUILD_NUMBER@ $(DESTDIR)$(LIBDIR) + (cd $(DESTDIR)$(LIBDIR) ; \ + rm -f $(OH323_FILE).@MAJOR_VERSION@.@MINOR_VERSION@ ; \ + ln -sf $(OH323_FILE).@MAJOR_VERSION@.@MINOR_VERSION@.@BUILD_NUMBER@ $(OH323_FILE).@MAJOR_VERSION@.@MINOR_VERSION@ \ gitweb: http://git.pld-linux.org/gitweb.cgi/packages/h323plus.git/commitdiff/80a03e028e264835f927118d78091e61e180d860 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/h323plus: 6/8] - hardcode ptlib version to the one required in spec
commit e890e72c326162fd9a633625b84c16060075801a Author: Jan Rękorajski bagg...@pld-linux.org Date: Sat Nov 17 15:36:58 2012 +0100 - hardcode ptlib version to the one required in spec h323plus-ptlib-version.patch | 19 +++ 1 file changed, 19 insertions(+) --- diff --git a/h323plus-ptlib-version.patch b/h323plus-ptlib-version.patch new file mode 100644 index 000..ac9d664 --- /dev/null +++ b/h323plus-ptlib-version.patch @@ -0,0 +1,19 @@ +--- h323plus/include/openh323buildopts.h.in.orig 2012-11-17 12:46:27.496889338 +0100 h323plus/include/openh323buildopts.h.in2012-11-17 12:48:24.873551865 +0100 +@@ -33,15 +33,7 @@ + #define _OPENH323_BUILDOPTS_H + + #include ptbuildopts.h +-#include ptlib/../../revision.h +- +-#if PTLIB_MAJOR == 2 PTLIB_MINOR 10 +- #define PTLIB_VER ( PTLIB_MAJOR*100 + PTLIB_MINOR*10 + PTLIB_BUILD ) +-#else +- #define PTLIB_VER ( PTLIB_MAJOR*1000 + PTLIB_MINOR*10 + PTLIB_BUILD ) +-#endif +- +-#define PTLIB_SVN_REVISION SVN_REVISION ++#define PTLIB_VER 2108 + + / + // gitweb: http://git.pld-linux.org/gitweb.cgi/packages/h323plus.git/commitdiff/80a03e028e264835f927118d78091e61e180d860 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/h323plus: 7/8] - use system libs, patch from openh323
commit eca6a060aa98b422b6a1c5f67db4ef72d4c66ed9 Author: Jan Rękorajski bagg...@pld-linux.org Date: Sat Nov 17 15:37:28 2012 +0100 - use system libs, patch from openh323 h323plus-system-libs.patch | 79 ++ 1 file changed, 79 insertions(+) --- diff --git a/h323plus-system-libs.patch b/h323plus-system-libs.patch new file mode 100644 index 000..54605ce --- /dev/null +++ b/h323plus-system-libs.patch @@ -0,0 +1,79 @@ +--- openh323_v1_18_0.org/plugins/audio/GSM0610/Makefile.in 2006-02-20 09:55:03.0 +0100 openh323_v1_18_0/plugins/audio/GSM0610/Makefile.in 2006-04-13 00:33:57.113558000 +0200 +@@ -63,7 +63,7 @@ + libdir=@libdir@ + target_os=@target_os@ + +-GSM_SYSTEM=@GSM_SYSTEM@ ++GSM_SYSTEM=1 + GSM_LIBS=@GSM_LIBS@ + GSM_CFLAGS=@GSM_CFLAGS@ + SONAME= gsm0610 +--- openh323_v1_18_0.org/plugins/audio/LPC_10/lpc_10_codec.c 2005-07-15 12:09:00.0 +0200 openh323_v1_18_0/plugins/audio/LPC_10/lpc_10_codec.c 2006-04-13 00:33:28.883793750 +0200 +@@ -44,7 +44,7 @@ + + #include codec/opalplugin.h + +-#include lpc10.h ++#include lpc10.h + + + enum { +--- openh323_v1_18_0.org/plugins/audio/LPC_10/Makefile.in 2004-08-22 06:20:19.0 +0200 openh323_v1_18_0/plugins/audio/LPC_10/Makefile.in 2006-04-13 00:33:28.883793750 +0200 +@@ -52,41 +52,8 @@ + + HEADER_FILES += $(LPC10_INCDIR)/lpc10.h + +-SRCS += lpc_10_codec.c \ +- $(SRCDIR)/f2clib.c \ +- $(SRCDIR)/analys.c \ +- $(SRCDIR)/bsynz.c \ +- $(SRCDIR)/chanwr.c \ +- $(SRCDIR)/dcbias.c \ +- $(SRCDIR)/decode_.c \ +- $(SRCDIR)/deemp.c \ +- $(SRCDIR)/difmag.c \ +- $(SRCDIR)/dyptrk.c \ +- $(SRCDIR)/encode_.c \ +- $(SRCDIR)/energy.c \ +- $(SRCDIR)/ham84.c \ +- $(SRCDIR)/hp100.c \ +- $(SRCDIR)/invert.c \ +- $(SRCDIR)/irc2pc.c \ +- $(SRCDIR)/ivfilt.c \ +- $(SRCDIR)/lpcdec.c \ +- $(SRCDIR)/lpcenc.c \ +- $(SRCDIR)/lpcini.c \ +- $(SRCDIR)/lpfilt.c \ +- $(SRCDIR)/median.c \ +- $(SRCDIR)/mload.c \ +- $(SRCDIR)/onset.c \ +- $(SRCDIR)/pitsyn.c \ +- $(SRCDIR)/placea.c \ +- $(SRCDIR)/placev.c \ +- $(SRCDIR)/preemp.c \ +- $(SRCDIR)/prepro.c \ +- $(SRCDIR)/random.c \ +- $(SRCDIR)/rcchk.c \ +- $(SRCDIR)/synths.c \ +- $(SRCDIR)/tbdm.c \ +- $(SRCDIR)/voicin.c \ +- $(SRCDIR)/vparms.c \ ++SRCS += lpc_10_codec.c ++EXTRALIBS = -llpc10 + + vpath %.o $(OBJDIR) + vpath %.c $(SRCDIR) +--- openh323_v1_18_0.org/plugins/audio/Speex/speexcodec.cxx2005-08-15 03:57:13.0 +0200 openh323_v1_18_0/plugins/audio/Speex/speexcodec.cxx2006-04-13 00:33:28.883793750 +0200 +@@ -88,7 +88,7 @@ + #endif + + extern C { +-#include libspeex/speex.h ++#include speex/speex.h + } + + #define NARROW_SAMPLES_PER_FRAME 160 gitweb: http://git.pld-linux.org/gitweb.cgi/packages/h323plus.git/commitdiff/80a03e028e264835f927118d78091e61e180d860 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/h323plus: 8/8] - add a note about ptlib-version patch
commit 80a03e028e264835f927118d78091e61e180d860 Author: Jan Rękorajski bagg...@pld-linux.org Date: Sat Nov 17 15:38:05 2012 +0100 - add a note about ptlib-version patch h323plus.spec | 1 + 1 file changed, 1 insertion(+) --- diff --git a/h323plus.spec b/h323plus.spec index ef39eb3..11d7c8b 100644 --- a/h323plus.spec +++ b/h323plus.spec @@ -17,6 +17,7 @@ Group:Libraries Source0: http://www.h323plus.org/source/download/%{name}-v%{fver}.tar.gz # Source0-md5: 459d527c3b52dc34837c9530899f556a Patch0:%{name}-configure.patch +# update this patch when bumping ptlib BR Patch1:%{name}-ptlib-version.patch Patch2:%{name}-mak-paths.patch Patch3:%{name}-gcc47.patch gitweb: http://git.pld-linux.org/gitweb.cgi/packages/h323plus.git/commitdiff/80a03e028e264835f927118d78091e61e180d860 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/php] Created branch PHP_5_5
The branch 'PHP_5_5' was created. Summary of new commits: 9efb510... up to 5.5.0alpha1 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/php/PHP_5_5] up to 5.5.0alpha1
commit 9efb51021ecaab5bfa98f50e8d126668c42dba8c Author: Elan Ruusamäe g...@delfi.ee Date: Sat Nov 17 16:46:48 2012 +0200 up to 5.5.0alpha1 embedded logo needs to be redone for DATA URI's in suhosin and pld logos suhosin patch needs to be updated for expose_php changes php.spec | 31 +- suhosin.patch | 179 +- 2 files changed, 107 insertions(+), 103 deletions(-) --- diff --git a/php.spec b/php.spec index a54b4ae..ccd2f54 100644 --- a/php.spec +++ b/php.spec @@ -124,9 +124,10 @@ ERROR: You need to select at least one Apache SAPI to build shared modules. %endif %defineorgname php -%definephp_suffix 54 +%definephp_suffix 55 -%definerel 0.20 +%definerel 0.1 +%definesubver alpha1 Summary: PHP: Hypertext Preprocessor Summary(fr.UTF-8): Le langage de script embarque-HTML PHP Summary(pl.UTF-8): Język skryptowy PHP @@ -134,13 +135,13 @@ Summary(pt_BR.UTF-8): A linguagem de script PHP Summary(ru.UTF-8): PHP Версии 5 - язык препроцессирования HTML-файлов, выполняемый на сервере Summary(uk.UTF-8): PHP Версії 5 - мова препроцесування HTML-файлів, виконувана на сервері Name: %{orgname}%{php_suffix} -Version: 5.4.8 -Release: %{rel}%{?with_type_hints:.th}%{?with_oci8:.oci} +Version: 5.5.0 +Release: %{rel}%{?subver:.%{subver}}%{?with_type_hints:.th}%{?with_oci8:.oci} Epoch: 4 License: PHP Group: Libraries -Source0: http://www.php.net/distributions/%{orgname}-%{version}.tar.bz2 -# Source0-md5: bb8c816a9299be8995255ef70c63b800 +Source0: http://downloads.php.net/dsp/%{orgname}-%{version}%{subver}.tar.xz +# Source0-md5: 2fb61817fad8e059d6fc846c69803e2d Source2: %{orgname}-mod_%{orgname}.conf Source3: %{orgname}-cgi-fcgi.ini Source4: %{orgname}-apache.ini @@ -241,7 +242,7 @@ BuildRequires: gd-devel(imagerotate) = 5.2.0 BuildRequires: gdbm-devel BuildRequires: gmp-devel %{?with_imap:BuildRequires:imap-devel = 1:2007e-2} -%{?with_intl:BuildRequires:libicu-devel} +%{?with_intl:BuildRequires:libicu-devel = 4.4} BuildRequires: libjpeg-devel BuildRequires: libltdl-devel = 1.4 BuildRequires: libmcrypt-devel = 2.4.4 @@ -276,6 +277,8 @@ BuildRequires: readline-devel BuildRequires: rpm = 4.4.9-56 BuildRequires: rpm-build = 4.4.0 BuildRequires: rpmbuild(macros) = 1.566 +BuildRequires: tar = 1:1.22 +BuildRequires: xz %if %{with sqlite3} || %{with pdo_sqlite} BuildRequires: sqlite3-devel = 3.3.9 %endif @@ -302,19 +305,19 @@ BuildRoot:%{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define_sysconfdir %{php_sysconfdir} # must be in sync with source. extra check ensuring that it is so is done in %%build -%definephp_api_version 20100412 -%definezend_module_api 20100525 -%definezend_extension_api 220100525 +%definephp_api_version 20121113 +%definezend_module_api 20121113 +%definezend_extension_api 220121113 # Extension versions %definebz2ver 1.0 %defineenchantver 1.1.0 -%definefileinfover 1.0.5 +%definefileinfover 1.0.5-dev %definehashver 1.0 %defineintlver 1.1.0 %definejsonver 1.2.1 %definepharver 2.0.1 -%definesqlite3ver 0.7 +%definesqlite3ver 0.7-dev %definezipver 1.11.0 %definezend_zts%{!?with_zts:0}%{?with_zts:1} @@ -1861,9 +1864,9 @@ compression support to PHP. Moduł PHP umożliwiający używanie kompresji zlib. %prep -%setup -q -n %{orgname}-%{version} +%setup -q -n %{orgname}-%{version}%{?subver} %patch0 -p1 -%patch1 -p1 +#%patch1 -p1 # redo with _DATA_URI %patch2 -p1 %patch3 -p1 %patch4 -p1 diff --git a/suhosin.patch b/suhosin.patch index 3452120..d3bc214 100644 --- a/suhosin.patch +++ b/suhosin.patch @@ -9,16 +9,16 @@ the following modifications have been made: * removed changes to ./configure ./main/php_config.h.in since those files are autogenerated * quilt refresh has been run to clean up the offsets, etc - * chunk adjusted for PLD Logo patch a/Zend/Makefile.am -+++ b/Zend/Makefile.am -@@ -17,7 +17,8 @@ libZend_la_SOURCES=\ - zend_objects_API.c zend_ts_hash.c zend_stream.c \ + * logo patch disabled (needs porting to DATA_URIs) + * expose php disabled (unref symbols) +--- php-5.5.0alpha1/Zend/Makefile.am~ 2012-11-13 22:00:16.0 +0200 php-5.5.0alpha1/Zend/Makefile.am 2012-11-17 13:37:04.263279745 +0200 +@@ -18,7 +18,7 @@ zend_default_classes.c \
DISTFILES: php: php-5.5.0alpha1.tar.xz
Files fetched: 1 STORED: http://downloads.php.net/dsp/php-5.5.0alpha1.tar.xz 2fb61817fad8e059d6fc846c69803e2d php-5.5.0alpha1.tar.xz Size: 9287244 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/mana] - pl
commit e1da268d85f854de910bd9022624db72bf34ff0b Author: Jakub Bogusz qbo...@pld-linux.org Date: Sat Nov 17 15:50:49 2012 +0100 - pl mana.spec | 19 ++- 1 file changed, 10 insertions(+), 9 deletions(-) --- diff --git a/mana.spec b/mana.spec index ccd713e..48a9aa4 100644 --- a/mana.spec +++ b/mana.spec @@ -1,18 +1,14 @@ # -# TODO: -# - subpackage for uim stuff? -# -# # Conditional build: %bcond_withbootstrap # don't require dictionary for package build # Summary: A kana(romaji)-kanji conversion engine using ChaSen algorithm -#Summary(pl.UTF-8):- +Summary(pl.UTF-8): Silnik konwersji kana(romaji)-kanji, wykorzystujący algorytm ChaSen Name: mana Version: 0.2.1 Release: 6 License: GPL v2 -Group: Applications +Group: Applications/Text Source0: http://dl.sourceforge.jp/shinji/20514/%{name}-%{version}.tar.bz2 # Source0-md5: 3a173e9c6047ed18ae8080cfcd38f3a4 Patch0:%{name}-DESTDIR.patch @@ -36,16 +32,21 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description A kana(romaji)-kanji conversion engine using ChaSen algorithm. -#%description -l pl.UTF-8 +%description -l pl.UTF-8 +Silnik konwersji kana(romaji)-kanji, wykorzystujący algorytm ChaSen. %package uim -Summary: UIM support +Summary: Mana UIM support +Summary(pl.UTF-8): Wsparcie Mana dla UIM-a Group: Libraries Requires: %{name} = %{version}-%{release} Requires: uim %description uim -UIM support. +Mana UIM support. + +%description uim -l pl.UTF-8 +Wsparcie Mana dla UIM-a. %prep %setup -q gitweb: http://git.pld-linux.org/gitweb.cgi/packages/mana.git/commitdiff/e1da268d85f854de910bd9022624db72bf34ff0b ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/gucharmap2] Created branch master
The branch 'master' was created. Summary of new commits: 0d43183... - last gucharmap version supporting gtk+2 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/gucharmap2] - last gucharmap version supporting gtk+2
commit 0d43183c1427de1935c19e1c0edf3d31fed29d5a Author: Jakub Bogusz qbo...@pld-linux.org Date: Sat Nov 17 15:58:59 2012 +0100 - last gucharmap version supporting gtk+2 gucharmap2-doc.patch | 9 +++ gucharmap2.spec | 172 +++ 2 files changed, 181 insertions(+) --- diff --git a/gucharmap2.spec b/gucharmap2.spec new file mode 100644 index 000..8269409 --- /dev/null +++ b/gucharmap2.spec @@ -0,0 +1,172 @@ +Summary: Unicode character map (GTK+ 2 version) +Summary(pl.UTF-8): Mapa znaków unikodowych (wersja dla GTK+ 2) +Name: gucharmap2 +Version: 3.0.1 +Release: 1 +License: GPL v3+ +Group: X11/Applications +Source0: http://ftp.gnome.org/pub/GNOME/sources/gucharmap/3.0/gucharmap-%{version}.tar.bz2 +# Source0-md5: 754e1bc0ff7c190a8e8d855b2ca4ba16 +Patch0:%{name}-doc.patch +URL: http://live.gnome.org/Gucharmap +BuildRequires: GConf2-devel = 2.24.0 +BuildRequires: autoconf = 2.56 +BuildRequires: automake = 1:1.11 +BuildRequires: docbook-dtd412-xml +BuildRequires: gettext-devel +BuildRequires: glib2-devel = 1:2.28.0 +BuildRequires: gnome-doc-utils = 0.12.2 +BuildRequires: gobject-introspection-devel = 0.10.0 +BuildRequires: gtk+2-devel = 2:2.18.0 +BuildRequires: gtk-doc = 1.0 +BuildRequires: intltool = 0.40.0 +BuildRequires: libtool +BuildRequires: libxml2-progs +BuildRequires: pkgconfig +BuildRequires: rpmbuild(find_lang) = 1.23 +BuildRequires: rpmbuild(macros) = 1.311 +Requires(post,postun): scrollkeeper +Requires(post,preun): GConf2 = 2.24.0 +Requires: GConf2 = 2.24.0 +Requires: %{name}-libs = %{version}-%{release} +Conflicts: gucharmap +# sr@Latn vs. sr@latin +Conflicts: glibc-misc 6:2.7 +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) + +%description +Gucharmap is a featureful unicode character map. + +%description -l pl.UTF-8 +Gucharmap jest wartościową mapą znaków unikodowych. + +%package libs +Summary: gucharmap library for GTK+ 2 +Summary(pl.UTF-8): Biblioteka gucharmap dla GTK+ 2 +Group: X11/Libraries +Requires: glib2 = 1:2.28.0 +Requires: gtk+2 = 2:2.18.0 + +%description libs +This package contains gucharmap library for GTK+ 2. + +%description libs -l pl.UTF-8 +Pakiet ten zawiera bibliotekę gucharmap dla GTK+ 2. + +%package devel +Summary: Headers for gucharmap (GTK+ 2 verson) +Summary(pl.UTF-8): Pliki nagłówkowe gucharmap (wersja dla GTK+ 2) +Group: X11/Development/Libraries +Requires: %{name}-libs = %{version}-%{release} +Requires: glib2-devel = 1:2.28.0 +Requires: gtk+2-devel = 2:2.18.0 + +%description devel +The gucharmap-devel package includes the header files that you will +need to use gucharmap. This version is targeted for GTK+ 2. + +%description devel -l pl.UTF-8 +Ten pakiet zawiera pliki nagłówkowe potrzebne do kompilacji programów +używających gucharmap. Ta wersja jest przeznaczona dla GTK+ 2. + +%package static +Summary: Static gucharmap library for GTK+ 2 +Summary(pl.UTF-8): Statyczna biblioteka gucharmap dla GTK+ 2 +Group: X11/Development/Libraries +Requires: %{name}-devel = %{version}-%{release} + +%description static +Static version of gucharmap library for GTK+ 2. + +%description static -l pl.UTF-8 +Statyczna wersja biblioteki gucharmap dla GTK+ 2. + +%package apidocs +Summary: gucharmap library API documentation (GTK+ 2 version) +Summary(pl.UTF-8): Dokumentacja API biblioteki gucharmap (wersja dla GTK+ 2) +Group: Documentation +Requires: gtk-doc-common + +%description apidocs +gucharmap library API documentation (GTK+ 2 version). + +%description apidocs -l pl.UTF-8 +Dokumentacja API biblioteki gucharmap (wersja dla GTK+ 2). + +%prep +%setup -q -n gucharmap-%{version} +%patch0 -p1 + +%build +%{__glib_gettextize} +%{__intltoolize} +%{__libtoolize} +%{__aclocal} -I m4 +%{__automake} +%{__autoheader} +%{__autoconf} +%configure \ + --disable-scrollkeeper \ + --disable-silent-rules \ + --enable-gtk-doc \ + --enable-introspection \ + --enable-static \ + --with-gtk=2.0 \ + --with-html-dir=%{_gtkdocdir} +%{__make} + +%install +rm -rf $RPM_BUILD_ROOT + +%{__make} install \ + DESTDIR=$RPM_BUILD_ROOT + +%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la + +%find_lang gucharmap --with-gnome --with-omf + +%clean +rm -rf $RPM_BUILD_ROOT + +%post +%gconf_schema_install gucharmap.schemas +%scrollkeeper_update_post + +%preun +%gconf_schema_uninstall gucharmap.schemas + +%postun +%scrollkeeper_update_postun + +%post libs -p /sbin/ldconfig +%postunlibs -p /sbin/ldconfig + +%files -f gucharmap.lang +%defattr(644,root,root,755) +%doc AUTHORS COPYING.UNICODE ChangeLog NEWS README TODO +%attr(755,root,root) %{_bindir}/charmap +%attr(755,root,root) %{_bindir}/gucharmap +%attr(755,root,root) %{_bindir}/gnome-character-map +%{_sysconfdir}/gconf/schemas/gucharmap.schemas
[packages/kernel-tools] Created branch master
The branch 'master' was created. Summary of new commits: 49fba13... new; build kernel tools, version 3.6.6 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/kernel-tools] new; build kernel tools, version 3.6.6
commit 49fba13ae2ec6363013312dca76278084e60f9ea Author: Elan Ruusamäe g...@delfi.ee Date: Sat Nov 17 15:14:17 2012 + new; build kernel tools, version 3.6.6 kernel-tools.spec | 178 ++ 1 file changed, 178 insertions(+) --- diff --git a/kernel-tools.spec b/kernel-tools.spec new file mode 100644 index 000..40a9534 --- /dev/null +++ b/kernel-tools.spec @@ -0,0 +1,178 @@ +# +# Conditional build: +%bcond_without verbose # verbose build (V=1) + +%definerel 0.1 +%definebasever 3.6 +%definepostver .6 +Summary: Assortment of tools for the Linux kernel +Name: kernel-tools +Version: %{basever}%{postver} +Release: %{rel} +License: GPL v2 +Group: Base +Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%{basever}.tar.xz +# Source0-md5: 1a1760420eac802c541a20ab51a093d1 +%if %{postver} != .0 +Patch0: http://www.kernel.org/pub/linux/kernel/v3.x/patch-%{version}.bz2 +# Patch0-md5: 363e730147333182616cc687345e7fe2 +%endif +BuildRequires: tar = 1:1.22 +BuildRequires: xz +Requires: %{name}-libs = %{version}-%{release} +Provides: cpufreq-utils = 1:009-0.6.p1 +Provides: cpufrequtils = 1:009-0.6.p1 +Provides: cpupowerutils = 1:009-0.6.p1 +Obsoletes: cpufreq-utils 1:009-0.6.p1 +Obsoletes: cpufrequtils 1:009-0.6.p1 +Obsoletes: cpupowerutils 1:009-0.6.p1 +Obsoletes: cpuspeed 1:1.5-16 +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) + +%description +This package contains the tools/ directory from the kernel source and +the supporting documentation. + +%package libs +Summary: Libraries for the kernels-tools +License: GPL v2 +Group: Libraries + +%description libs +This package contains the libraries built from the tools/ directory +from the kernel source. + +%package libs-devel +Summary: Assortment of tools for the Linux kernel +License: GPL v2 +Group: Development/Libraries +Requires: kernel-tools = %{version}-%{release} +Requires: kernel-tools-libs = %{version}-%{release} +Provides: cpupowerutils-devel = 1:009-0.6.p1 +Provides: kernel-tools-devel +Obsoletes: cpupowerutils-devel 1:009-0.6.p1 + +%description libs-devel +This package contains the development files for the tools/ directory +from the kernel source. + +%prep +%setup -qc +cd linux-%{basever} + +%if %{postver} != .0 +%patch0 -p1 +%endif + +%build +cd linux-%{basever} + +# cpupower +%{__make} -C tools/power/cpupower \ + CC=%{__cc} \ + %{?with_verbose:V=1} \ + CPUFREQ_BENCH=false + +%ifarch %{ix86} +%{__make} -C tools/power/cpupower/debug/i386 centrino-decode powernow-k8-decode \ + CC=%{__cc} \ + %{?with_verbose:V=1} +%endif + +%ifarch %{x8664} +%{__make} -C tools/power/cpupower/debug/x86_64 centrino-decode powernow-k8-decode \ + CC=%{__cc} \ + %{?with_verbose:V=1} +%endif + +%ifarch %{ix86} %{x8664} +%{__make} -C tools/power/x86/x86_energy_perf_policy \ + CC=%{__cc} \ + %{?with_verbose:V=1} +%{__make} -C tools/power/x86/turbostat \ + CC=%{__cc} \ + %{?with_verbose:V=1} +%endif + +%install +rm -rf $RPM_BUILD_ROOT +cd linux-%{basever} + +%{__make} -C tools/power/cpupower install \ + DESTDIR=$RPM_BUILD_ROOT \ + libdir=%{_libdir} \ + mandir=%{_mandir} \ + CPUFREQ_BENCH=false + +%find_lang cpupower +mv cpupower.lang .. + +%ifarch %{ix86} +cd tools/power/cpupower/debug/i386 +install -p centrino-decode $RPM_BUILD_ROOT%{_bindir}/centrino-decode +install -p powernow-k8-decode $RPM_BUILD_ROOT%{_bindir}/powernow-k8-decode +cd - +%endif +%ifarch %{x8664} +cd tools/power/cpupower/debug/x86_64 +install -p centrino-decode $RPM_BUILD_ROOT%{_bindir}/centrino-decode +install -p powernow-k8-decode $RPM_BUILD_ROOT%{_bindir}/powernow-k8-decode +cd - +%endif + +%ifarch %{ix86} %{x8664} +install -d $RPM_BUILD_ROOT%{_mandir}/man8 +# broken makefile, install manually +%if 0 +%{__make} install \ + -C tools/power/x86/x86_energy_perf_policy \ + DESTDIR=$RPM_BUILD_ROOT +%else +cd tools/power/x86/x86_energy_perf_policy +install -p x86_energy_perf_policy $RPM_BUILD_ROOT%{_bindir} +install -p x86_energy_perf_policy.8 $RPM_BUILD_ROOT%{_mandir}/man8 +cd - +%endif + +# broken makefile, install manually +%if 0 +%{__make} install \ + -C tools/power/x86/turbostat \ + DESTDIR=$RPM_BUILD_ROOT +%else +cd tools/power/x86/turbostat +install -p turbostat $RPM_BUILD_ROOT%{_bindir}/turbostat +install -p turbostat.8 $RPM_BUILD_ROOT%{_mandir}/man8 +%endif +%endif + +%clean +rm -rf $RPM_BUILD_ROOT + +%post libs -p /sbin/ldconfig +%postunlibs -p /sbin/ldconfig + +%files -f cpupower.lang +%defattr(644,root,root,755) +%attr(755,root,root) %{_bindir}/cpupower +%ifarch %{ix86} %{x8664} +%attr(755,root,root) %{_bindir}/centrino-decode +%attr(755,root,root)
[packages/tomoe-gtk] - added gucharmap patch from gentoo (gucharmap-2 compatibility); build with gucharmap2
commit 094b738d52973ebc084a077f803b4a25f12733ab Author: Jakub Bogusz qbo...@pld-linux.org Date: Sat Nov 17 16:40:19 2012 +0100 - added gucharmap patch from gentoo (gucharmap-2 compatibility); build with gucharmap2 tomoe-gtk-gucharmap.patch | 245 ++ tomoe-gtk.spec| 4 +- 2 files changed, 248 insertions(+), 1 deletion(-) --- diff --git a/tomoe-gtk.spec b/tomoe-gtk.spec index 2156d0b..0e4d151 100644 --- a/tomoe-gtk.spec +++ b/tomoe-gtk.spec @@ -1,6 +1,6 @@ # # Conditional build: -%bcond_withgucharmap # gucharmap support [= 1.4.0 3.0] +%bcond_without gucharmap # gucharmap support %bcond_without python # build without python bindings %bcond_without static_libs # don't build static libraries # @@ -16,6 +16,7 @@ Source0: http://downloads.sourceforge.net/tomoe/%{name}-%{version}.tar.gz # Source0-md5: bd49ac64549d8a7ab092bea1c1dc04fc Patch0:%{name}-rpath.patch Patch1:%{name}-cflags.patch +Patch2:%{name}-gucharmap.patch URL: http://scim-imengine.sourceforge.jp/ BuildRequires: autoconf = 2.59 BuildRequires: automake @@ -92,6 +93,7 @@ Wiązania Tomoe-GTK dla Pythona. %setup -q %patch0 -p0 %patch1 -p0 +%patch2 -p1 %build %{__libtoolize} diff --git a/tomoe-gtk-gucharmap.patch b/tomoe-gtk-gucharmap.patch new file mode 100644 index 000..f175e95 --- /dev/null +++ b/tomoe-gtk-gucharmap.patch @@ -0,0 +1,245 @@ +--- + Update libtomoe-gtk to gucharmap-2 API + https://bugs.gentoo.org/show_bug.cgi?id=243160 + + bindings/python/Makefile.am |5 ++- + configure.ac| 14 +--- + src/tomoe-gucharmap.c | 71 +++- + 4 files changed, 78 insertions(+), 13 deletions(-) + +--- a/configure.ac 2007-06-12 17:17:23.0 +0900 b/configure.ac 2008-12-21 01:08:16.0 +0900 +@@ -94,6 +94,9 @@ + AC_SUBST(TOMOE_CFLAGS) + AC_SUBST(TOMOE_LIBS) + ++TOMOE_GTK_REQUIRED_LIBS=tomoe = 0.4.0 gtk+-2.0 = 2.4.0 ++AC_SUBST(TOMOE_GTK_REQUIRED_LIBS) ++ + # Checks for gucharmap + AC_ARG_WITH(gucharmap, + AS_HELP_STRING([--with-gucharmap], +@@ -102,14 +105,15 @@ + [use_gucharmap=yes]) + if test x$use_gucharmap = xyes; then + # Checks for gucharmap +- PKG_CHECK_MODULES(GUCHARMAP, [gucharmap = 1.4.0]) +- TOMOE_GTK_REQUIRED_LIBS=tomoe = 0.4.0 gtk+-2.0 = 2.4.0 gucharmap = 1.4.0 +-else +- TOMOE_GTK_REQUIRED_LIBS=tomoe = 0.4.0 gtk+-2.0 = 2.4.0 ++ PKG_CHECK_EXISTS(gucharmap-2, ++ [PKG_CHECK_MODULES(GUCHARMAP, [gucharmap-2], ++[gucharmap_lib=gucharmap-2])], ++ [PKG_CHECK_MODULES(GUCHARMAP, [gucharmap = 1.4.0], ++ [gucharmap_lib=gucharmap = 1.4.0])]) ++ TOMOE_GTK_REQUIRED_LIBS=$TOMOE_GTK_REQUIRED_LIBS $gucharmap_lib + fi + AC_SUBST(GUCHARMAP_CFLAGS) + AC_SUBST(GUCHARMAP_LIBS) +-AC_SUBST(TOMOE_GTK_REQUIRED_LIBS) + AM_CONDITIONAL([USE_GUCHARMAP], [test x$use_gucharmap = xyes]) + + # Check for pygtk +--- a/src/tomoe-gucharmap.c2007-04-27 14:41:40.0 +0900 b/src/tomoe-gucharmap.c2008-12-21 01:08:16.0 +0900 +@@ -34,7 +34,11 @@ + { + GtkWidget *chapters_type_combobox; + GtkWidget *chapters_combobox; ++#ifdef GUCHARMAP_TYPE_CHAPTERS + GucharmapChapters *chapters; ++#else ++GucharmapChaptersModel *chapters_model; ++#endif + GucharmapCharmap *charmap; + gchar *selected; + }; +@@ -120,14 +124,24 @@ + gtk_widget_show (combobox); + + /* gucharmap */ ++#ifdef GUCHARMAP_TYPE_CHAPTERS + priv-chapters = GUCHARMAP_CHAPTERS (gucharmap_block_chapters_new ()); + priv-charmap = GUCHARMAP_CHARMAP (gucharmap_charmap_new (priv-chapters)); ++#else ++priv-chapters_model = gucharmap_block_chapters_model_new (); ++priv-charmap = GUCHARMAP_CHARMAP (gucharmap_charmap_new ()); ++gucharmap_charmap_set_chapters_model (priv-charmap, priv-chapters_model); ++#endif + widget = GTK_WIDGET (priv-charmap); + gtk_box_pack_start (GTK_BOX (vbox), widget, TRUE, TRUE, 2); + gtk_widget_show (widget); + + /* Hide chapters page by default. Usually use combo box instead. */ ++#ifdef GUCHARMAP_TYPE_CHAPTERS + gtk_widget_hide (GTK_WIDGET (priv-chapters)); ++#else ++gucharmap_charmap_set_chapters_visible (priv-charmap, FALSE); ++#endif + + #if 0 + /* CharDetails view will be here */ +@@ -146,10 +160,11 @@ + g_signal_connect (G_OBJECT (priv-chapters_combobox), changed, + G_CALLBACK (on_chapters_combo_changed), + (gpointer) page); +-g_signal_connect (G_OBJECT (priv-charmap-chartable), activate, ++g_signal_connect (G_OBJECT (gucharmap_charmap_get_chartable (priv-charmap)), ++ activate, + G_CALLBACK (on_gucharmap_activate), + (gpointer) page); +-
DISTFILES: FreeWnn: FreeWnn-1.1.1-a021.tar.bz2
Files fetched: 1 STORED: http://dl.sourceforge.jp/freewnn/17724/FreeWnn-1.1.1-a021.tar.bz2 7e15ab385932d58e3743400d303a05e6 FreeWnn-1.1.1-a021.tar.bz2 Size: 3108905 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/mana] - added no-libiconv patch to avoid using libiconv if found (iconv() is in glibc)
commit 308ad1353e0b9d92ff2a1d871b62e9388440cae6 Author: Jakub Bogusz qbo...@pld-linux.org Date: Sat Nov 17 16:49:28 2012 +0100 - added no-libiconv patch to avoid using libiconv if found (iconv() is in glibc) mana-no-libiconv.patch | 13 + mana.spec | 12 2 files changed, 21 insertions(+), 4 deletions(-) --- diff --git a/mana.spec b/mana.spec index 48a9aa4..375b7f4 100644 --- a/mana.spec +++ b/mana.spec @@ -7,15 +7,16 @@ Summary(pl.UTF-8):Silnik konwersji kana(romaji)-kanji, wykorzystujący algorytm Name: mana Version: 0.2.1 Release: 6 -License: GPL v2 +License: GPL v2+ Group: Applications/Text Source0: http://dl.sourceforge.jp/shinji/20514/%{name}-%{version}.tar.bz2 # Source0-md5: 3a173e9c6047ed18ae8080cfcd38f3a4 Patch0:%{name}-DESTDIR.patch Patch1:%{name}-change_scheme_dir.patch Patch2:%{name}-chasen.patch +Patch3:%{name}-no-libiconv.patch URL: http://sourceforge.jp/projects/shinji/ -BuildRequires: autoconf +BuildRequires: autoconf = 2.13 BuildRequires: automake BuildRequires: gdbm-devel BuildRequires: glib2-devel @@ -53,6 +54,7 @@ Wsparcie Mana dla UIM-a. %patch0 -p1 %patch1 -p0 %patch2 -p1 +%patch3 -p1 mv lib/{,mana-}chasen.h @@ -60,6 +62,7 @@ mv lib/{,mana-}chasen.h %{__libtoolize} %{__aclocal} %{__autoconf} +%{__autoheader} %{__automake} %configure %{__make} -j1 @@ -79,8 +82,9 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(644,root,root,755) -%doc README -%attr(755,root,root) %{_bindir}/* +%doc README {AUTHORS,COPYING,NEWS,README}.chasen +%attr(755,root,root) %{_bindir}/mana +%attr(755,root,root) %{_bindir}/mana-config %dir %{_libdir}/mana %attr(755,root,root) %{_libdir}/mana/make* diff --git a/mana-no-libiconv.patch b/mana-no-libiconv.patch new file mode 100644 index 000..934dee1 --- /dev/null +++ b/mana-no-libiconv.patch @@ -0,0 +1,13 @@ +--- mana-0.2.1/configure.in.orig 2006-06-11 20:01:00.0 +0200 mana-0.2.1/configure.in2012-11-17 16:46:57.579669747 +0100 +@@ -44,8 +44,9 @@ + AC_SUBST(ICONV_CFLAGS) + fi]) + ++AC_CHECK_FUNC(iconv, [], [ + AC_CHECK_LIB(iconv, iconv, [], [ +- AC_CHECK_HEADER(iconv.h, [], AC_MSG_ERROR([ChaSen needs iconv]))]) ++ AC_MSG_ERROR([ChaSen needs iconv])])]) + + AC_DEFUN(cl_VAR_ICONV_ARG, [ + for CODE in $2; do gitweb: http://git.pld-linux.org/gitweb.cgi/packages/mana.git/commitdiff/308ad1353e0b9d92ff2a1d871b62e9388440cae6 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/FreeWnn] - added format patch (allow build with -Werror=format-security) - use make -j1 (parallel build broke
commit d1311dcf79260d32de017307ec9e9af13d8f2bda Author: Jakub Bogusz qbo...@pld-linux.org Date: Sat Nov 17 17:02:20 2012 +0100 - added format patch (allow build with -Werror=format-security) - use make -j1 (parallel build broken on dicts) FreeWnn-format.patch | 26 ++ FreeWnn.spec | 5 +++-- 2 files changed, 29 insertions(+), 2 deletions(-) --- diff --git a/FreeWnn.spec b/FreeWnn.spec index 2230224..f7bf083 100644 --- a/FreeWnn.spec +++ b/FreeWnn.spec @@ -24,6 +24,7 @@ Patch6: %{name}-libtool.patch Patch7:%{name}-cpp.patch Patch8:%{name}-install.patch Patch9:%{name}-link.patch +Patch10: %{name}-format.patch URL: http://www.freewnn.org/ BuildRequires: autoconf BuildRequires: automake @@ -259,6 +260,7 @@ Ten pakiet zawiera statyczną wersję biblioteki kWnn. %patch7 -p1 %patch8 -p1 %patch9 -p1 +%patch10 -p1 cp -p Wnn-consortium/dic/README README.Wnn-consortium.dic @@ -269,8 +271,7 @@ cp -p Wnn-consortium/dic/README README.Wnn-consortium.dic CFLAGS=%{rpmcflags} -I/usr/include/ncurses %configure -%{__make} -# CDEBUGFLAGS=%{rpmcflags} -I/usr/include/ncurses +%{__make} -j1 %install rm -rf $RPM_BUILD_ROOT diff --git a/FreeWnn-format.patch b/FreeWnn-format.patch new file mode 100644 index 000..ad5fa9a --- /dev/null +++ b/FreeWnn-format.patch @@ -0,0 +1,26 @@ +--- FreeWnn-1.1.1-a021/Wnn/jutil/wddel.c.orig 2002-05-13 00:51:17.0 +0200 FreeWnn-1.1.1-a021/Wnn/jutil/wddel.c 2012-11-17 16:52:08.354757471 +0100 +@@ -95,8 +95,8 @@ usage () + static void + err () + { +- printf ((char *) wnn_perror ()); +- printf (\n bye.\n); ++ puts ((char *) wnn_perror ()); ++ printf ( bye.\n); + exit (1); + } + +--- FreeWnn-1.1.1-a021/Wnn/jutil/wdreg.c.orig 2002-05-13 00:51:17.0 +0200 FreeWnn-1.1.1-a021/Wnn/jutil/wdreg.c 2012-11-17 16:52:18.701902804 +0100 +@@ -95,8 +95,8 @@ usage () + static void + err () + { +- printf ((char *) wnn_perror ()); +- printf (\n bye.\n); ++ puts ((char *) wnn_perror ()); ++ printf ( bye.\n); + exit (1); + } + gitweb: http://git.pld-linux.org/gitweb.cgi/packages/FreeWnn.git/commitdiff/d1311dcf79260d32de017307ec9e9af13d8f2bda ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/mcelog] - no reload action, so don't show it in usage
commit 319a8fe7ebc2831fe69ded6611fe0d765a211f12 Author: Jakub Bogusz qbo...@pld-linux.org Date: Sat Nov 17 17:15:45 2012 +0100 - no reload action, so don't show it in usage mcelog.init | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/mcelog.init b/mcelog.init index dba0c9e..c6875ba 100644 --- a/mcelog.init +++ b/mcelog.init @@ -182,7 +182,7 @@ case $1 in rc_status ;; *) - msg_usage $0 {start|stop|restart|try-restart|reload|force-reload|checkconfig|status} + msg_usage $0 {start|stop|restart|try-restart|force-reload|checkconfig|status} exit 3 esac gitweb: http://git.pld-linux.org/gitweb.cgi/packages/mcelog.git/commitdiff/319a8fe7ebc2831fe69ded6611fe0d765a211f12 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/conntrack-tools] - added try-restart action
commit e5ebccaa28358ce4eee8c60a76b79ce8d05360dd Author: Jakub Bogusz qbo...@pld-linux.org Date: Sat Nov 17 17:21:05 2012 +0100 - added try-restart action conntrack-tools.init | 20 +++- 1 file changed, 15 insertions(+), 5 deletions(-) --- diff --git a/conntrack-tools.init b/conntrack-tools.init index 11e8037..93c1eaf 100644 --- a/conntrack-tools.init +++ b/conntrack-tools.init @@ -49,6 +49,16 @@ stop() { fi } +condrestart() { + if [ ! -f /var/lock/subsys/conntrackd ]; then + msg_not_running conntrackd + RETVAL=$1 + return + fi + stop + start +} + reload() { if [ -f /var/lock/subsys/conntrackd ]; then msg_reloading conntrackd @@ -72,18 +82,18 @@ case $1 in stop start ;; - reload) - reload + try-restart) + condrestart 0 ;; - force-reload) - reload + reload|force-reload) + reload ;; status) status conntrackd RETVAL=$? ;; *) - msg_usage $0 {start|stop|restart|reload|force-reload|status} + msg_usage $0 {start|stop|restart|try-restart|reload|force-reload|status} exit 3 esac gitweb: http://git.pld-linux.org/gitweb.cgi/packages/conntrack-tools.git/commitdiff/e5ebccaa28358ce4eee8c60a76b79ce8d05360dd ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/FreeWnn] - updated init scripts (added try-restart, adjusted force-reload exit codes wrt. LSB)
commit 1395a66dd92fc736e88467a45c545b033b1b123d Author: Jakub Bogusz qbo...@pld-linux.org Date: Sat Nov 17 17:57:48 2012 +0100 - updated init scripts (added try-restart, adjusted force-reload exit codes wrt. LSB) FreeWnn-cWnn.init | 48 +++- FreeWnn-kWnn.init | 51 +-- FreeWnn-tWnn.init | 47 +++ FreeWnn.init | 51 +-- 4 files changed, 144 insertions(+), 53 deletions(-) --- diff --git a/FreeWnn-cWnn.init b/FreeWnn-cWnn.init index 2ae67d0..91e8458 100644 --- a/FreeWnn-cWnn.init +++ b/FreeWnn-cWnn.init @@ -31,10 +31,7 @@ if [ -f /etc/FreeWnn/zh_CN/cserverrc ]; then exit 6 fi -RETVAL=0 -# See how we were called. -case $1 in - start) +start() { if [ ! -f /var/lock/subsys/cWnn ]; then msg_starting cWnn rm -f /tmp/jd_sockV4 @@ -45,28 +42,53 @@ case $1 in else msg_already_running cWnn fi - ;; - stop) +} + +stop() { if [ -f /var/lock/subsys/cWnn ]; then msg_stopping cWnn killproc cserver rm -f /var/lock/subsys/cWnn /tmp/jd_sockV4 - exit $RETVAL else msg_not_running cWnn fi +} + +condrestart() { + if [ ! -f /var/lock/subsys/cWnn ]; then + msg_not_running cWnn + RETVAL=$1 + return + fi + stop + start +} + +RETVAL=0 +# See how we were called. +case $1 in + start) + start + ;; + stop) + stop ;; status) status cserver - exit $? + RETVAL=$? + ;; + restart) + stop + start + ;; + try-restart) + condrestart 0 ;; - restart|force-reload) - $0 stop - $0 start - exit $? + force-reload) + condrestart 7 ;; *) - msg_usage $0 {start|stop|restart|force-reload|status} + msg_usage $0 {start|stop|restart|try-restart|force-reload|status} exit 3 ;; esac diff --git a/FreeWnn-kWnn.init b/FreeWnn-kWnn.init index afa6945..0de5cc7 100644 --- a/FreeWnn-kWnn.init +++ b/FreeWnn-kWnn.init @@ -31,10 +31,7 @@ if [ -f /etc/FreeWnn/ko_KR/kserverrc ]; then exit 6 fi -RETVAL=0 -# See how we were called. -case $1 in -start) +start() { if [ ! -f /var/lock/subsys/kWnn ]; then msg_starting kWnn rm -f /tmp/jd_sockV4 @@ -45,8 +42,9 @@ case $1 in else msg_already_running kWnn fi - ;; -stop) +} + +stop() { if [ -f /var/lock/subsys/kWnn ]; then msg_stopping kWnn killproc kserver @@ -54,18 +52,43 @@ case $1 in else msg_not_running kWnn fi +} + +condrestart() { + if [ ! -f /var/lock/subsys/kWnn ]; then + msg_not_running kWnn + RETVAL=$1 + return + fi + stop + start +} + +RETVAL=0 +# See how we were called. +case $1 in + start) + start + ;; + stop) + stop ;; -status) + status) status kserver - exit $? + RETVAL=$? + ;; + restart) + stop + start + ;; + try-restart) + condrestart 0 ;; -restart|force-reload) - $0 stop - $0 start - exit $? + force-reload) + condrestart 7 ;; -*) - msg_usage $0 {start|stop|restart|force-reload|status} + *) + msg_usage $0 {start|stop|restart|try-restart|force-reload|status} exit 3 ;; esac diff --git a/FreeWnn-tWnn.init b/FreeWnn-tWnn.init index 02841a2..69bf9c6 100644 --- a/FreeWnn-tWnn.init +++ b/FreeWnn-tWnn.init @@ -31,10 +31,7 @@ if [ -f /etc/FreeWnn/zh_TW/tserverrc ]; then exit 6 fi -RETVAL=0 -# See how we were called. -case $1 in - start) +start() { if [ ! -f /var/lock/subsys/tWnn ]; then msg_starting tWnn rm -f /tmp/jd_sockV4 @@ -45,8 +42,9 @@ case $1 in else msg_already_running tWnn fi - ;; - stop) +} + +stop() { if [ -f /var/lock/subsys/tWnn ]; then msg_stopping tWnn killproc tserver @@ -54,18 +52,43 @@ case $1 in else msg_not_running tWnn fi +} + +condrestart() { + if [ ! -f /var/lock/subsys/tWnn ]; then + msg_not_running tWnn + RETVAL=$1 + return + fi + stop + start +} + +RETVAL=0 +# See how we were called. +case $1 in + start) + start + ;; + stop) + stop ;; status) status tserver - exit $? + RETVAL=$? + ;; + restart) + stop + start + ;; + try-restart) + condrestart 0 ;; - restart|force-reload) - $0 stop -
[packages/kernel-tools] Created branch LINUX_3_5
The branch 'LINUX_3_5' was created. Summary of new commits: ea56b4b... from kernel 3.5.7 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/kernel-tools/LINUX_3_5] from kernel 3.5.7
commit ea56b4b8ff3713ba88984a4baa0da52756b92c1f Author: Elan Ruusamäe g...@delfi.ee Date: Sat Nov 17 15:24:36 2012 + from kernel 3.5.7 kernel-tools.spec | 8 1 file changed, 4 insertions(+), 4 deletions(-) --- diff --git a/kernel-tools.spec b/kernel-tools.spec index 40a9534..36ab90d 100644 --- a/kernel-tools.spec +++ b/kernel-tools.spec @@ -3,8 +3,8 @@ %bcond_without verbose # verbose build (V=1) %definerel 0.1 -%definebasever 3.6 -%definepostver .6 +%definebasever 3.5 +%definepostver .7 Summary: Assortment of tools for the Linux kernel Name: kernel-tools Version: %{basever}%{postver} @@ -12,10 +12,10 @@ Release:%{rel} License: GPL v2 Group: Base Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%{basever}.tar.xz -# Source0-md5: 1a1760420eac802c541a20ab51a093d1 +# Source0-md5: 24153eaaa81dedc9481ada8cd9c3b83d %if %{postver} != .0 Patch0: http://www.kernel.org/pub/linux/kernel/v3.x/patch-%{version}.bz2 -# Patch0-md5: 363e730147333182616cc687345e7fe2 +# Patch0-md5: f908f8c222cf4a1988b8bf180df46bb2 %endif BuildRequires: tar = 1:1.22 BuildRequires: xz gitweb: http://git.pld-linux.org/gitweb.cgi/packages/kernel-tools.git/commitdiff/ea56b4b8ff3713ba88984a4baa0da52756b92c1f ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/FreeWnn] - fixed [ckt]server socket filename
commit 73ed412eecab7ed2ac98c7a231880715d8c6f1d8 Author: Jakub Bogusz qbo...@pld-linux.org Date: Sat Nov 17 18:06:02 2012 +0100 - fixed [ckt]server socket filename FreeWnn-cWnn.init | 4 ++-- FreeWnn-kWnn.init | 4 ++-- FreeWnn-tWnn.init | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) --- diff --git a/FreeWnn-cWnn.init b/FreeWnn-cWnn.init index 91e8458..9b98b1c 100644 --- a/FreeWnn-cWnn.init +++ b/FreeWnn-cWnn.init @@ -34,7 +34,7 @@ fi start() { if [ ! -f /var/lock/subsys/cWnn ]; then msg_starting cWnn - rm -f /tmp/jd_sockV4 + rm -f /tmp/cd_sockV4 ( su - wnn -s /bin/sh -c '/usr/bin/cserver' | grep Finished /dev/null ) \ ok || fail RETVAL=$? @@ -48,7 +48,7 @@ stop() { if [ -f /var/lock/subsys/cWnn ]; then msg_stopping cWnn killproc cserver - rm -f /var/lock/subsys/cWnn /tmp/jd_sockV4 + rm -f /var/lock/subsys/cWnn /tmp/cd_sockV4 else msg_not_running cWnn fi diff --git a/FreeWnn-kWnn.init b/FreeWnn-kWnn.init index 0de5cc7..a2bdd29 100644 --- a/FreeWnn-kWnn.init +++ b/FreeWnn-kWnn.init @@ -34,7 +34,7 @@ fi start() { if [ ! -f /var/lock/subsys/kWnn ]; then msg_starting kWnn - rm -f /tmp/jd_sockV4 + rm -f /tmp/kd_sockV4 ( su - wnn -s /bin/sh -c '/usr/bin/kserver' | grep Finished /dev/null ) \ ok || fail RETVAL=$? @@ -48,7 +48,7 @@ stop() { if [ -f /var/lock/subsys/kWnn ]; then msg_stopping kWnn killproc kserver - rm -f /var/lock/subsys/kWnn /tmp/jd_sockV4 + rm -f /var/lock/subsys/kWnn /tmp/kd_sockV4 else msg_not_running kWnn fi diff --git a/FreeWnn-tWnn.init b/FreeWnn-tWnn.init index 69bf9c6..9b0a587 100644 --- a/FreeWnn-tWnn.init +++ b/FreeWnn-tWnn.init @@ -34,7 +34,7 @@ fi start() { if [ ! -f /var/lock/subsys/tWnn ]; then msg_starting tWnn - rm -f /tmp/jd_sockV4 + rm -f /tmp/td_sockV4 ( su - wnn -s /bin/sh -c '/usr/bin/tserver' | grep Finished /dev/null ) \ ok || fail RETVAL=$? @@ -48,7 +48,7 @@ stop() { if [ -f /var/lock/subsys/tWnn ]; then msg_stopping tWnn killproc tserver - rm -f /var/lock/subsys/tWnn /tmp/jd_sockV4 + rm -f /var/lock/subsys/tWnn /tmp/td_sockV4 else msg_not_running tWnn fi gitweb: http://git.pld-linux.org/gitweb.cgi/packages/FreeWnn.git/commitdiff/73ed412eecab7ed2ac98c7a231880715d8c6f1d8 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/manadic] - License is kind of BSDish, package COPYING
commit dadcb9978a85916b64b3e0b6452ce52c4ff185f4 Author: Jakub Bogusz qbo...@pld-linux.org Date: Sat Nov 17 18:22:15 2012 +0100 - License is kind of BSDish, package COPYING manadic.spec | 8 1 file changed, 4 insertions(+), 4 deletions(-) --- diff --git a/manadic.spec b/manadic.spec index 056a9a1..711e027 100644 --- a/manadic.spec +++ b/manadic.spec @@ -3,13 +3,13 @@ Summary(pl.UTF-8):Słownik dla Mana Name: manadic Version: 0.1.4 Release: 3 -License: GPL -Group: Applications +License: BSD-like +Group: Applications/Text Source0: http://dl.sourceforge.jp/shinji/15963/%{name}-%{version}.tar.bz2 # Source0-md5: 051b564ccea0e0257fe404a715845fe9 Patch0:%{name}-DESTDIR.patch URL: http://sourceforge.jp/projects/shinji/ -BuildRequires: autoconf +BuildRequires: autoconf = 2.13 BuildRequires: automake BuildRequires: mana Requires: mana @@ -46,6 +46,6 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(644,root,root,755) -%doc AUTHORS ChangeLog NEWS README doc/ipadic-ja.pdf +%doc AUTHORS COPYING ChangeLog NEWS README doc/ipadic-ja.pdf %config(noreplace) %verify(not md5 mtime size) /etc/manarc %{_libdir}/mana/dic gitweb: http://git.pld-linux.org/gitweb.cgi/packages/manadic.git/commitdiff/dadcb9978a85916b64b3e0b6452ce52c4ff185f4 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/manadic] - release 4
commit 229b6d97129c6efba6fe1380aa31e656934cfe1d Author: Jakub Bogusz qbo...@pld-linux.org Date: Sat Nov 17 18:23:19 2012 +0100 - release 4 manadic.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/manadic.spec b/manadic.spec index 711e027..8a40232 100644 --- a/manadic.spec +++ b/manadic.spec @@ -2,7 +2,7 @@ Summary:A dictionary for Mana Summary(pl.UTF-8): Słownik dla Mana Name: manadic Version: 0.1.4 -Release: 3 +Release: 4 License: BSD-like Group: Applications/Text Source0: http://dl.sourceforge.jp/shinji/15963/%{name}-%{version}.tar.bz2 gitweb: http://git.pld-linux.org/gitweb.cgi/packages/manadic.git/commitdiff/229b6d97129c6efba6fe1380aa31e656934cfe1d ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/uim] - build with wnn support
commit b2aa69ad73a67ad92a1da59656087a535f76c31f Author: Jakub Bogusz qbo...@pld-linux.org Date: Sat Nov 17 18:55:01 2012 +0100 - build with wnn support uim.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- diff --git a/uim.spec b/uim.spec index 83966ce..b1d20eb 100644 --- a/uim.spec +++ b/uim.spec @@ -9,8 +9,8 @@ %bcond_without eb # EB text search support %bcond_without m17n# m17n IM support %bcond_without mana# mana IM support -%bcond_withscim# scim support [broken] -%bcond_withwnn # Wnn IM support +%bcond_withscim# scim support [broken acc. to configure] +%bcond_without wnn # Wnn IM support # Summary: Multilingual input method library Summary(pl.UTF-8): Biblioteka obsługująca wejście w wielu językach @@ -459,7 +459,7 @@ cp -a xim/README xim/README.xim --with-skk \ --with-sqlite3 \ --with-ssl-engine \ - %{?with_wnn:--with-wnn} \ + %{?with_wnn:--with-wnn --with-wnn-includes=/usr/include/wnn} \ --with-x \ --with-xft gitweb: http://git.pld-linux.org/gitweb.cgi/packages/uim.git/commitdiff/b2aa69ad73a67ad92a1da59656087a535f76c31f ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/sary] - pl, cleanup
commit 181c3df88532f35dfb863e5aec34346d364abb35 Author: Jakub Bogusz qbo...@pld-linux.org Date: Sat Nov 17 18:55:31 2012 +0100 - pl, cleanup sary.spec | 32 +++- 1 file changed, 23 insertions(+), 9 deletions(-) --- diff --git a/sary.spec b/sary.spec index 7cab0e4..a46bb9f 100644 --- a/sary.spec +++ b/sary.spec @@ -7,33 +7,42 @@ Summary(pl.UTF-8):Biblioteka tablic sufiksowych Name: sary Version: 1.2.0 Release: 1 -License: LGPL +License: LGPL v2+ Group: Libraries Source0: http://sary.sourceforge.net/%{name}-%{version}.tar.gz # Source0-md5: 10b9a803025c5f428014a7f1ff849ecc Patch0:%{name}-link.patch URL: http://sary.sourceforge.net/ -BuildRequires: glib2-devel -BuildRequires: autoconf -BuildRequires: automake +BuildRequires: autoconf = 2.52 +BuildRequires: automake = 1.4 +BuildRequires: glib2-devel = 2.0.0 BuildRequires: libtool +BuildRequires: pkgconfig BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description sary is a suffix array library and tools. + It provides fast full-text search facilities for text files on the order of 10 to 100 MB using a data structure called a suffix array. It can also search specific fields in a text file by assigning index points to those fields. -#%description -l pl.UTF-8 +%description -l pl.UTF-8 +sary to biblioteka oraz narzędzia do tablic sufiksowych. + +Zapewnia szybkie funkcje do przeszukiwania pełnotekstowego dla +plików tekstowych rzędu wielkości od 10 do 100 MB przy użyciu +struktury danych zwanej tablicą sufiksową. Potrafi także +wyszukiwać konkretnych pól w pliku tekstowym przypisując punkty +indeksu do tych pól. %package devel Summary: Header files for sary library Summary(pl.UTF-8): Pliki nagłówkowe biblioteki sary Group: Development/Libraries Requires: %{name} = %{version}-%{release} -Requires: glib2-devel +Requires: glib2-devel = 2.0.0 %description devel Header files for sary library. @@ -76,6 +85,9 @@ rm -rf $RPM_BUILD_ROOT %{__rm} -rf devel-doc mv $RPM_BUILD_ROOT%{_datadir}/%{name}/docs devel-doc +# obsoleted by pkg-config +%{__rm} $RPM_BUILD_ROOT%{_libdir}/libsary.la + %clean rm -rf $RPM_BUILD_ROOT @@ -85,15 +97,17 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(644,root,root,755) %doc AUTHORS ChangeLog NEWS README TODO -%attr(755,root,root) %{_bindir}/* +%attr(755,root,root) %{_bindir}/mksary +%attr(755,root,root) %{_bindir}/sary %attr(755,root,root) %{_libdir}/libsary.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/libsary.so.10 -%{_mandir}/man1/*.1* +%{_mandir}/man1/mksary.1* +%{_mandir}/man1/sary.1* %files devel %defattr(644,root,root,755) %doc devel-doc/* -%{_libdir}/libsary.so +%attr(755,root,root) %{_libdir}/libsary.so %{_includedir}/sary %{_includedir}/sary.h %{_pkgconfigdir}/sary.pc gitweb: http://git.pld-linux.org/gitweb.cgi/packages/sary.git/commitdiff/181c3df88532f35dfb863e5aec34346d364abb35 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/ruby-sary] - pl, use glib 2.x headers instead of glib 1.2.x
commit f2f4c6d939c728965bb45e3a92685c8562c5a3f8 Author: Jakub Bogusz qbo...@pld-linux.org Date: Sat Nov 17 19:02:20 2012 +0100 - pl, use glib 2.x headers instead of glib 1.2.x ruby-sary.spec | 16 +++- 1 file changed, 11 insertions(+), 5 deletions(-) --- diff --git a/ruby-sary.spec b/ruby-sary.spec index 08ab9f8..b61c73c 100644 --- a/ruby-sary.spec +++ b/ruby-sary.spec @@ -1,26 +1,31 @@ %define pkgname sary Summary: Ruby Binding of Sary +Summary(pl.UTF-8): Wiązanie języka Ruby do biblioteki Sary Name: ruby-%{pkgname} Version: 1.2.0 Release: 1 -License: LGPL +License: LGPL v2.1+ +Group: Development/Languages Source0: http://sary.sourceforge.net/%{pkgname}-ruby-%{version}.tar.gz # Source0-md5: c885abffea72f25cb0f6286770a78ac1 Patch0:%{name}-no-version.patch Patch1:%{name}-ruby19.patch -Group: Development/Languages URL: http://sary.sourceforge.net/ +BuildRequires: glib2-devel = 2.0 +BuildRequires: pkgconfig BuildRequires: rpmbuild(macros) = 1.484 BuildRequires: ruby = 1:1.8.6 BuildRequires: ruby-modules BuildRequires: sary-devel -BuildRequires: pkgconfig %{?ruby_mod_ver_requires_eq} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description Ruby Binding of Sary. +%description -l pl.UTF-8 +Wiązanie języka Ruby do biblioteki Sary. + %prep %setup -q -n %{pkgname}-ruby-%{version} %patch0 -p1 @@ -31,7 +36,7 @@ Ruby Binding of Sary. %{__make} \ CC=%{__cc} \ LDFLAGS=%{rpmldflags} \ - CFLAGS=%{rpmcflags} -fPIC `pkg-config glib --cflags` + CFLAGS=%{rpmcflags} -fPIC `pkg-config glib-2.0 --cflags` %install rm -rf $RPM_BUILD_ROOT @@ -44,5 +49,6 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(644,root,root,755) -%doc ChangeLog README* +%doc ChangeLog README.en.rd Reference.en.rd +%lang(ja) %doc README.ja.rd Reference.ja.rd %attr(755,root,root) %{ruby_sitearchdir}/%{pkgname}.so gitweb: http://git.pld-linux.org/gitweb.cgi/packages/ruby-sary.git/commitdiff/f2f4c6d939c728965bb45e3a92685c8562c5a3f8 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/kernel-tools] add perf building and packaging (partly from arekm kernel.spec patch)
commit fea1e6053fde7c05adb51924841973708e9ae241 Author: Elan Ruusamäe g...@delfi.ee Date: Sat Nov 17 18:15:43 2012 + add perf building and packaging (partly from arekm kernel.spec patch) bconded out as not finished kernel-tools.spec | 106 +- 1 file changed, 105 insertions(+), 1 deletion(-) --- diff --git a/kernel-tools.spec b/kernel-tools.spec index 40a9534..5d7ffaa 100644 --- a/kernel-tools.spec +++ b/kernel-tools.spec @@ -1,6 +1,11 @@ +# TODO +# - BR deps for -perf +# - asciidoc used at install stage of perf (should build doc in build section) +# - different packages for perf-slang and perf-gtk # # Conditional build: %bcond_without verbose # verbose build (V=1) +%bcond_withperf# perf tools (unfinished) %definerel 0.1 %definebasever 3.6 @@ -10,7 +15,7 @@ Name: kernel-tools Version: %{basever}%{postver} Release: %{rel} License: GPL v2 -Group: Base +Group: Applications/System Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%{basever}.tar.xz # Source0-md5: 1a1760420eac802c541a20ab51a093d1 %if %{postver} != .0 @@ -19,6 +24,13 @@ Patch0: http://www.kernel.org/pub/linux/kernel/v3.x/patch-%{version}.bz2 %endif BuildRequires: tar = 1:1.22 BuildRequires: xz +%if %{with perf} +BuildRequires: asciidoc +BuildRequires: rpm-pythonprov +BuildRequires: xmlto +# provides perf.h which util/parse-events.l loads via ../perf.h, and -I/usr/include/slang makes it being loaded first +BuildConflicts:Firebird-devel +%endif Requires: %{name}-libs = %{version}-%{release} Provides: cpufreq-utils = 1:009-0.6.p1 Provides: cpufrequtils = 1:009-0.6.p1 @@ -56,6 +68,16 @@ Obsoletes: cpupowerutils-devel 1:009-0.6.p1 This package contains the development files for the tools/ directory from the kernel source. +%package perf +Summary: perf tool +Group: Applications/System + +%description perf +Perf is a profiler tool for Linux 2.6+ based systems that abstracts +away CPU hardware differences in Linux performance measurements and +presents a simple commandline interface. Perf is based on the +perf_events interface exported by recent versions of the Linux kernel. + %prep %setup -qc cd linux-%{basever} @@ -94,6 +116,29 @@ cd linux-%{basever} %{?with_verbose:V=1} %endif +%if %{with perf} +# perf slang version +PWD=${PWD:-$(pwd)} +install -d $PWD/perf-{slang,gtk} +%{__make} -C tools/perf \ + O=$PWD/perf-slang \ + NO_GTK2=1 \ + CC=%{__cc} \ + %{?with_verbose:V=1} \ + prefix=%{_prefix} \ + perfexecdir=%{_datadir}/perf-core \ + template_dir=%{_datadir}/perf-core/templates + +# perf gtk version +%{__make} -C tools/perf \ + O=$PWD/perf-gtk \ + CC=%{__cc} \ + %{?with_verbose:V=1} \ + prefix=%{_prefix} \ + perfexecdir=%{_datadir}/perf-core \ + template_dir=%{_datadir}/perf-core/templates +%endif + %install rm -rf $RPM_BUILD_ROOT cd linux-%{basever} @@ -143,7 +188,35 @@ cd - cd tools/power/x86/turbostat install -p turbostat $RPM_BUILD_ROOT%{_bindir}/turbostat install -p turbostat.8 $RPM_BUILD_ROOT%{_mandir}/man8 +cd - +%endif %endif + +%if %{with perf} +# perf slang +PWD=${PWD:-$(pwd)} +# perf slang version +%{__make} -j1 install install-man \ + -C tools/perf \ + O=$PWD/perf-slang \ + NO_GTK2=1 \ + CC=%{__cc} \ + %{?with_verbose:V=1} \ + prefix=%{_prefix} \ + perfexecdir=%{_datadir}/perf-core \ + template_dir=%{_datadir}/perf-core/templates \ + DESTDIR=$RPM_BUILD_ROOT + +# perf gtk +%{__make} -j1 install install-man \ + -C tools/perf \ + O=$PWD/perf-gtk \ + CC=%{__cc} \ + %{?with_verbose:V=1} \ + prefix=%{_prefix} \ + perfexecdir=%{_datadir}/perf-core \ + template_dir=%{_datadir}/perf-core/templates \ + DESTDIR=$RPM_BUILD_ROOT %endif %clean @@ -176,3 +249,34 @@ rm -rf $RPM_BUILD_ROOT %defattr(644,root,root,755) %{_libdir}/libcpupower.so %{_includedir}/cpufreq.h + +%if %{with perf} +%files perf +%defattr(644,root,root,755) +%attr(755,root,root) %{_bindir}/perf +%{_mandir}/man1/perf*.1* +%dir %{_datadir}/perf-core +%attr(755,root,root) %{_datadir}/perf-core/perf-archive + +%dir %{_datadir}/perf-core/scripts + +%dir %{_datadir}/perf-core/scripts/perl +%dir %{_datadir}/perf-core/scripts/perl/Perf-Trace-Util +%dir %{_datadir}/perf-core/scripts/perl/Perf-Trace-Util/lib +%dir %{_datadir}/perf-core/scripts/perl/Perf-Trace-Util/lib/Perf +%dir %{_datadir}/perf-core/scripts/perl/Perf-Trace-Util/lib/Perf/Trace +%{_datadir}/perf-core/scripts/perl/Perf-Trace-Util/lib/Perf/Trace/*.pm +%dir %{_datadir}/perf-core/scripts/perl/bin +%attr(755,root,root) %{_datadir}/perf-core/scripts/perl/bin/* +%{_datadir}/perf-core/scripts/perl/*.pl + +%dir %{_datadir}/perf-core/scripts/python +%dir
[packages/setup.rb] - License is LGPL - proper lang tag
commit a4de4c40a517be007c59ac821bee4bdbe73d8191 Author: Jakub Bogusz qbo...@pld-linux.org Date: Sat Nov 17 19:26:32 2012 +0100 - License is LGPL - proper lang tag setup.rb.spec | 7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) --- diff --git a/setup.rb.spec b/setup.rb.spec index 7112fce..3e03944 100644 --- a/setup.rb.spec +++ b/setup.rb.spec @@ -3,7 +3,7 @@ Summary(pl.UTF-8): setup.rb - ogólny instalator dla skryptów języka Ruby Name: setup.rb Version: 3.4.1 Release: 3 -License: GPL +License: LGPL v2.1 Group: Development/Tools Source0: http://i.loveruby.net/archive/setup/setup-%{version}.tar.gz # Source0-md5: f0759ec72473e5802d9571df4da6642c @@ -33,7 +33,6 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(644,root,root,755) -%doc ChangeLog Makefile README.en TODO doc.en NEWS.en Template.README.en -%doc Usage_en.txt sample -%lang(jp) %doc README.ja doc.ja NEWS.ja Template.README.ja Usage_ja.txt +%doc ChangeLog Makefile README.en TODO doc.en NEWS.en Template.README.en Usage_en.txt sample +%lang(ja) %doc README.ja doc.ja NEWS.ja Template.README.ja Usage_ja.txt %attr(755,root,root) %{_datadir}/%{name} gitweb: http://git.pld-linux.org/gitweb.cgi/packages/setup.rb.git/commitdiff/a4de4c40a517be007c59ac821bee4bdbe73d8191 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/ibus] - updated to 1.4.99.20121109 - updated xkb patch - removed obsolete HEAD patch
commit 83223d0564361b67b37992a833a7f4171d2183c9 Author: Jakub Bogusz qbo...@pld-linux.org Date: Sat Nov 17 20:02:19 2012 +0100 - updated to 1.4.99.20121109 - updated xkb patch - removed obsolete HEAD patch ibus-541492-xkb.patch | 88 +-- ibus-HEAD.patch | 53 --- ibus.spec | 18 +-- 3 files changed, 51 insertions(+), 108 deletions(-) --- diff --git a/ibus.spec b/ibus.spec index a8d78a4..edcc110 100644 --- a/ibus.spec +++ b/ibus.spec @@ -8,20 +8,19 @@ Summary: Intelligent Input Bus for Linux OS Summary(pl.UTF-8): IBus - inteligentna szyna wejściowa dla Linuksa Name: ibus -Version: 1.4.99.20121006 +Version: 1.4.99.20121109 Release: 1 License: LGPL v2+ Group: Libraries #Source0Download: http://code.google.com/p/ibus/downloads/list Source0: http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz -# Source0-md5: 28b26c84f021a0c15023d6326d4ad58e +# Source0-md5: be482479357210283e91a47f43a0a0fe Source1: %{name}.xinputd -Patch0:%{name}-HEAD.patch -Patch1:%{name}-810211-no-switch-by-no-trigger.patch -Patch2:%{name}-541492-xkb.patch -Patch3:%{name}-530711-preload-sys.patch -Patch4:%{name}-xx-setup-frequent-lang.patch -Patch5:%{name}-xx-no-use.diff +Patch0:%{name}-810211-no-switch-by-no-trigger.patch +Patch1:%{name}-541492-xkb.patch +Patch2:%{name}-530711-preload-sys.patch +Patch3:%{name}-xx-setup-frequent-lang.patch +Patch4:%{name}-xx-no-use.diff URL: http://code.google.com/p/ibus/ BuildRequires: GConf2-devel = 2.12 BuildRequires: atk-devel @@ -197,12 +196,11 @@ Bashowe dopełnianie parametrów dla poleceń ibus. %prep %setup -q %patch0 -p1 -%patch1 -p1 %{__rm} bindings/vala/ibus-1.0.vapi +%patch1 -p1 %patch2 -p1 %patch3 -p1 %patch4 -p1 -%patch5 -p1 %build %{__libtoolize} diff --git a/ibus-541492-xkb.patch b/ibus-541492-xkb.patch index eda3e61..bff737b 100644 --- a/ibus-541492-xkb.patch +++ b/ibus-541492-xkb.patch @@ -2708,8 +2708,8 @@ index 5ff0c65..bfe560c 100644 } diff --git a/ui/gtk3/panel.vala b/ui/gtk3/panel.vala index 40079ec..8e6f756 100644 a/ui/gtk3/panel.vala -+++ b/ui/gtk3/panel.vala +--- ibus-1.4.99.20121109/ui/gtk3/panel.vala.orig 2012-11-09 07:16:19.0 +0100 ibus-1.4.99.20121109/ui/gtk3/panel.vala2012-11-17 19:22:03.176142457 +0100 @@ -21,6 +21,20 @@ */ @@ -2731,10 +2731,10 @@ index 40079ec..8e6f756 100644 private IBus.Bus m_bus; private IBus.Config m_config; private Gtk.StatusIcon m_status_icon; -@@ -33,10 +47,17 @@ class Panel : IBus.PanelService { - private GLib.Pid m_setup_pid = 0; +@@ -34,10 +48,17 @@ private Gtk.AboutDialog m_about_dialog; private Gtk.CssProvider m_css_provider; + private int m_switcher_delay_time = 400; +private GkbdLayout m_gkbdlayout = null; +private XKBLayout m_xkblayout = null; +private string[] m_layouts = {}; @@ -2751,15 +2751,15 @@ index 40079ec..8e6f756 100644 public Panel(IBus.Bus bus) { GLib.assert(bus.is_connected()); -@@ -59,7 +80,6 @@ class Panel : IBus.PanelService { +@@ -60,7 +81,6 @@ m_candidate_panel.page_down.connect((w) = this.page_down()); m_switcher = new Switcher(); -bind_switch_shortcut(); - m_property_manager = new PropertyManager(); - m_property_manager.property_activate.connect((k, s) = { -@@ -71,64 +91,135 @@ class Panel : IBus.PanelService { + if (m_switcher_delay_time = 0) { + m_switcher.set_popup_delay_time((uint) m_switcher_delay_time); +@@ -76,64 +96,135 @@ ~Panel() { unbind_switch_shortcut(); @@ -2826,15 +2826,15 @@ index 40079ec..8e6f756 100644 + switch_modifiers, + reverse); +m_keybindings.append(keybinding); - --// accelerator already has Shift mask --if ((m_switch_modifiers Gdk.ModifierType.SHIFT_MASK) != 0) --return; ++ +keybinding_manager.bind(switch_keysym, switch_modifiers, +(e, _reverse) = handle_engine_switch(e, _reverse), +reverse); +} -+ + +-// accelerator already has Shift mask +-if ((m_switch_modifiers Gdk.ModifierType.SHIFT_MASK) != 0) +-return; +// ToDo: Customize the input method with ibus-setup +private void bind_switch_shortcut() { +string locale = GLib.Intl.setlocale(GLib.LocaleCategory.ALL, @@ -2845,7 +2845,10 @@ index 40079ec..8e6f756 100644 + +string[] ACCELERATOR_IME_HOTKEYS = {}; +ACCELERATOR_IME_HOTKEYS += ACCELERATOR_SWITCH_IME_FOREWARD; -+ + +-
DISTFILES: ibus: ibus-1.4.99.20121109.tar.gz
Files fetched: 1 STORED: http://ibus.googlecode.com/files/ibus-1.4.99.20121109.tar.gz be482479357210283e91a47f43a0a0fe ibus-1.4.99.20121109.tar.gz Size: 1897096 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/ruby-progressbar] - pl
commit 7127edcbdc371f088593b1c5d587f12f5a00dd6c Author: Jakub Bogusz qbo...@pld-linux.org Date: Sat Nov 17 20:15:24 2012 +0100 - pl ruby-progressbar.spec | 27 +-- 1 file changed, 17 insertions(+), 10 deletions(-) --- diff --git a/ruby-progressbar.spec b/ruby-progressbar.spec index 5c61d97..e599b39 100644 --- a/ruby-progressbar.spec +++ b/ruby-progressbar.spec @@ -1,12 +1,13 @@ %define pkgname progressbar Summary: Text progress bar library for Ruby +Summary(pl.UTF-8): Biblioteka tekstowego paska postępu dla języka Ruby Name: ruby-%{pkgname} Version: 0.9.1 Release: 1 License: Ruby License +Group: Development/Languages Source0: http://rubygems.org/downloads/%{pkgname}-%{version}.gem # Source0-md5: 4ca56a4052fbfdaeebae15f3525c4178 -Group: Development/Languages URL: https://github.com/peleteiro/progressbar BuildRequires: rpmbuild(macros) = 1.484 BuildRequires: ruby = 1:1.8.6 @@ -20,13 +21,18 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define_enable_debug_packages 0 %description -Ruby/ProgressBar is a text progress bar library for Ruby. -It can indicate progress with percentage, a progress bar, -and estimated remaining time. +Ruby/ProgressBar is a text progress bar library for Ruby. It can +indicate progress with percentage, a progress bar, and estimated +remaining time. + +%description -l pl.UTF-8 +Ruby/ProgressBar to biblioteka tekstowego paska postępu dla języka +Ruby. Potrafi podawać postęp przy użyciu procentów, paska postępu +oraz estymacji czasu pozostałego do zakończenia. %package rdoc Summary: HTML documentation for %{pkgname} -Summary(pl.UTF-8): Dokumentacja w formacie HTML dla %{pkgname} +Summary(pl.UTF-8): Dokumentacja w formacie HTML do biblioteki %{pkgname} Group: Documentation Requires: ruby = 1:1.8.7-4 @@ -34,11 +40,11 @@ Requires: ruby = 1:1.8.7-4 HTML documentation for %{pkgname}. %description rdoc -l pl.UTF-8 -Dokumentacja w formacie HTML dla %{pkgname}. +Dokumentacja w formacie HTML do biblioteki %{pkgname}. %package ri Summary: ri documentation for %{pkgname} -Summary(pl.UTF-8): Dokumentacja w formacie ri dla %{pkgname} +Summary(pl.UTF-8): Dokumentacja w formacie ri do biblioteki %{pkgname} Group: Documentation Requires: ruby @@ -46,7 +52,7 @@ Requires: ruby ri documentation for %{pkgname}. %description ri -l pl.UTF-8 -Dokumentacji w formacie ri dla %{pkgname}. +Dokumentacja w formacie ri do biblioteki %{pkgname}. %prep %setup -q -c @@ -65,7 +71,7 @@ cp %{_datadir}/setup.rb . rdoc --ri --op ri lib rdoc --op rdoc lib -rm ri/created.rid +%{__rm} ri/created.rid %install rm -rf $RPM_BUILD_ROOT @@ -73,8 +79,9 @@ install -d $RPM_BUILD_ROOT{%{ruby_rubylibdir},%{ruby_ridir},%{ruby_rdocdir}} %{__ruby} setup.rb install \ --prefix=$RPM_BUILD_ROOT -cp -a ri/* $RPM_BUILD_ROOT%{ruby_ridir} cp -a rdoc $RPM_BUILD_ROOT%{ruby_rdocdir}/%{name}-%{version} +cp -a ri/* $RPM_BUILD_ROOT%{ruby_ridir} +%{__rm} $RPM_BUILD_ROOT%{ruby_ridir}/cache.ri %clean rm -rf $RPM_BUILD_ROOT gitweb: http://git.pld-linux.org/gitweb.cgi/packages/ruby-progressbar.git/commitdiff/7127edcbdc371f088593b1c5d587f12f5a00dd6c ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/ruby-progressbar] - updated to 0.11.0
commit d8fff31638cd740529bb494d812568d1980adb11 Author: Jakub Bogusz qbo...@pld-linux.org Date: Sat Nov 17 20:35:57 2012 +0100 - updated to 0.11.0 ruby-progressbar.spec | 8 1 file changed, 4 insertions(+), 4 deletions(-) --- diff --git a/ruby-progressbar.spec b/ruby-progressbar.spec index e599b39..3c1ca28 100644 --- a/ruby-progressbar.spec +++ b/ruby-progressbar.spec @@ -2,12 +2,12 @@ Summary: Text progress bar library for Ruby Summary(pl.UTF-8): Biblioteka tekstowego paska postępu dla języka Ruby Name: ruby-%{pkgname} -Version: 0.9.1 +Version: 0.11.0 Release: 1 License: Ruby License Group: Development/Languages Source0: http://rubygems.org/downloads/%{pkgname}-%{version}.gem -# Source0-md5: 4ca56a4052fbfdaeebae15f3525c4178 +# Source0-md5: b0aeb7f9bb4b6c5562582a009132c285 URL: https://github.com/peleteiro/progressbar BuildRequires: rpmbuild(macros) = 1.484 BuildRequires: ruby = 1:1.8.6 @@ -59,7 +59,7 @@ Dokumentacja w formacie ri do biblioteki %{pkgname}. # gem install %{__tar} xf %{SOURCE0} -O data.tar.gz | %{__tar} xz -find -newer README.rd -o -print | xargs touch --reference %{SOURCE0} +find -newer README.rdoc -o -print | xargs touch --reference %{SOURCE0} %build cp %{_datadir}/setup.rb . @@ -88,7 +88,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(644,root,root,755) -%doc ChangeLog README.rd +%doc ChangeLog README.rdoc %{ruby_rubylibdir}/%{pkgname}.rb %files rdoc gitweb: http://git.pld-linux.org/gitweb.cgi/packages/ruby-progressbar.git/commitdiff/d8fff31638cd740529bb494d812568d1980adb11 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: ruby-progressbar: progressbar-0.11.0.gem
Files fetched: 1 STORED: http://rubygems.org/downloads/progressbar-0.11.0.gem b0aeb7f9bb4b6c5562582a009132c285 progressbar-0.11.0.gem Size: 9216 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/xen] another syntax fix in xendomains.init
commit 8448d7630f342c07282c4f2c6de8980c53e87fe1 Author: Jacek Konieczny jaj...@jajcus.net Date: Sat Nov 17 20:37:56 2012 +0100 another syntax fix in xendomains.init xendomains.init | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/xendomains.init b/xendomains.init index 1ecefe9..494e013 100644 --- a/xendomains.init +++ b/xendomains.init @@ -113,7 +113,7 @@ start() { for dom in $XENDOMAINS_SAVE/*; do if [ -f $dom ] ; then HEADER=`head -c 16 $dom | head -n 1 2 /dev/null` -if [ $HEADER = LinuxGuestRecord ]; then +if [ $HEADER = LinuxGuestRecord ]; then echo -n ${dom##*/} XMR=`$CMD restore $dom 21 1/dev/null` #$CMD restore $dom gitweb: http://git.pld-linux.org/gitweb.cgi/packages/xen.git/commitdiff/8448d7630f342c07282c4f2c6de8980c53e87fe1 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/ibus-table] - updated to 1.4.99.20121112
commit 8622ca0cb6adcf6a5b7da419e2621d043736025d Author: Jakub Bogusz qbo...@pld-linux.org Date: Sat Nov 17 20:39:06 2012 +0100 - updated to 1.4.99.20121112 ibus-table.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- diff --git a/ibus-table.spec b/ibus-table.spec index 8726528..73696c1 100644 --- a/ibus-table.spec +++ b/ibus-table.spec @@ -1,13 +1,13 @@ Summary: The Table engine for IBus platform Summary(pl.UTF-8): Silnik Table dla platformy IBus Name: ibus-table -Version: 1.4.99.20121012 +Version: 1.4.99.20121112 Release: 1 License: LGPL v2+ Group: Libraries #Source0Download: http://code.google.com/p/ibus/downloads/list Source0: http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz -# Source0-md5: d5024b4cb879cba665927246fb142d0c +# Source0-md5: 85c3a57bcbb052d3222c5b6d07e0e565 Patch0:ibus-table-uppercase-umlauts.patch URL: http://code.google.com/p/ibus/ BuildRequires: gettext-devel = 0.16.1 gitweb: http://git.pld-linux.org/gitweb.cgi/packages/ibus-table.git/commitdiff/8622ca0cb6adcf6a5b7da419e2621d043736025d ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: ibus-table: ibus-table-1.4.99.20121112.tar.gz
Files fetched: 1 STORED: http://ibus.googlecode.com/files/ibus-table-1.4.99.20121112.tar.gz 85c3a57bcbb052d3222c5b6d07e0e565 ibus-table-1.4.99.20121112.tar.gz Size: 426922 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/accountsservice] - updated to 0.6.26
commit 8855c9b6fbeddf05214dae4e7c78861a9fee3abc Author: Łukasz Kieś kie...@pld-linux.org Date: Sat Nov 17 20:52:22 2012 +0100 - updated to 0.6.26 accountsservice.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- diff --git a/accountsservice.spec b/accountsservice.spec index a6e03be..d95ed41 100644 --- a/accountsservice.spec +++ b/accountsservice.spec @@ -1,12 +1,12 @@ Summary: D-Bus interface for user accounts management Summary(pl.UTF-8): Interfejs D-Bus do zarządzania kontami użytkowników Name: accountsservice -Version: 0.6.25 -Release: 2 +Version: 0.6.26 +Release: 1 License: GPL v3 Group: Applications/System Source0: http://cgit.freedesktop.org/accountsservice/snapshot/%{name}-%{version}.tar.xz -# Source0-md5: 8438df64afffa3bd065c9c3134adb1e7 +# Source0-md5: ff6b5c318b065e7eb3514d8653b9aa1c URL: http://cgit.freedesktop.org/accountsservice/ BuildRequires: autoconf BuildRequires: automake gitweb: http://git.pld-linux.org/gitweb.cgi/packages/accountsservice.git/commitdiff/8855c9b6fbeddf05214dae4e7c78861a9fee3abc ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: accountsservice: accountsservice-0.6.26.tar.xz
Files fetched: 1 STORED: http://cgit.freedesktop.org/accountsservice/snapshot/accountsservice-0.6.26.tar.xz ff6b5c318b065e7eb3514d8653b9aa1c accountsservice-0.6.26.tar.xz Size: 82836 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/anjuta] - updated to 3.6.2
commit 0c4f764d779dd7def5be09ab9e4f8ee38f2dfa83 Author: Łukasz Kieś kie...@pld-linux.org Date: Sat Nov 17 21:05:27 2012 +0100 - updated to 3.6.2 anjuta.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- diff --git a/anjuta.spec b/anjuta.spec index b2a08d2..e8eeced 100644 --- a/anjuta.spec +++ b/anjuta.spec @@ -3,13 +3,13 @@ Summary(es.UTF-8):Entorno integrado de desarrollo (IDE) de GNOME Summary(pl.UTF-8): Zintegrowane środowisko programowania dla GNOME Summary(pt_BR.UTF-8): Ambiente de desenvolvimento integrado C e C++ Name: anjuta -Version: 3.6.1 +Version: 3.6.2 Release: 1 Epoch: 1 License: GPL v2+ Group: X11/Development/Tools Source0: http://ftp.gnome.org/pub/GNOME/sources/anjuta/3.6/%{name}-%{version}.tar.xz -# Source0-md5: 04aabe89e6abb58d6a6cf77fe83d40a8 +# Source0-md5: 3cd2e771df0768af6274a0334fb24502 Patch0:autoconf-cxx.patch URL: http://projects.gnome.org/anjuta/ BuildRequires: autoconf = 2.65 gitweb: http://git.pld-linux.org/gitweb.cgi/packages/anjuta.git/commitdiff/0c4f764d779dd7def5be09ab9e4f8ee38f2dfa83 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: anjuta: anjuta-3.6.2.tar.xz
Files fetched: 1 STORED: http://ftp.gnome.org/pub/GNOME/sources/anjuta/3.6/anjuta-3.6.2.tar.xz 3cd2e771df0768af6274a0334fb24502 anjuta-3.6.2.tar.xz Size: 5178068 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/caribou] - updated to 0.4.4.2
commit 46a20ebd82a1ac549039ccc56ec2d42e3ed5d80d Author: Łukasz Kieś kie...@pld-linux.org Date: Sat Nov 17 21:09:02 2012 +0100 - updated to 0.4.4.2 caribou.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- diff --git a/caribou.spec b/caribou.spec index ae6e311..379b1db 100644 --- a/caribou.spec +++ b/caribou.spec @@ -1,12 +1,12 @@ Summary: On-screen keyboard Summary(pl.UTF-8): Klawiatura ekranowa Name: caribou -Version: 0.4.4 +Version: 0.4.4.2 Release: 1 License: LGPL v2+ Group: X11/Applications/Accessibility Source0: http://ftp.gnome.org/pub/GNOME/sources/caribou/0.4/%{name}-%{version}.tar.xz -# Source0-md5: 6df53b3d9d2441ab763c9b55c01c8167 +# Source0-md5: 02f6c153723ab89f67d5644df6c27b52 URL: http://live.gnome.org/Caribou BuildRequires: autoconf = 2.63 BuildRequires: automake = 1:1.11 gitweb: http://git.pld-linux.org/gitweb.cgi/packages/caribou.git/commitdiff/46a20ebd82a1ac549039ccc56ec2d42e3ed5d80d ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: caribou: caribou-0.4.4.2.tar.xz
Files fetched: 1 STORED: http://ftp.gnome.org/pub/GNOME/sources/caribou/0.4/caribou-0.4.4.2.tar.xz 02f6c153723ab89f67d5644df6c27b52 caribou-0.4.4.2.tar.xz Size: 360216 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/drbl] Created branch unstable
The branch 'unstable' was created. Summary of new commits: ccd226f... Up to 2.1.33 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/drbl/unstable] Up to 2.1.33
commit ccd226fa558e3fa19294cdf5c3e34a56158cd40b Author: Artur Frysiak ar...@frysiak.net Date: Sat Nov 17 21:16:45 2012 +0100 Up to 2.1.33 drbl.spec | 29 ++--- 1 file changed, 10 insertions(+), 19 deletions(-) --- diff --git a/drbl.spec b/drbl.spec index 89cd7b9..a09911e 100644 --- a/drbl.spec +++ b/drbl.spec @@ -5,15 +5,14 @@ # - more FHS thing (config to /etc) Summary: DRBL (Diskless Remote Boot in Linux) package Name: drbl -Version: 1.10.31 -Release: 1 +Version: 2.1.33 +Release: 0.1 License: GPL Group: Networking/Utilities -Source0: http://downloads.sourceforge.net/drbl/drbl_stable/%{version}/%{name}-%{version}.tar.bz2 -# Source0-md5: 8e5dce6822336b7d1a6672849de84827 +Source0: http://free.nchc.org.tw/drbl-core/src/unstable/%{name}-%{version}.tar.bz2 +# Source0-md5: ab5d805195c72b7638019a1259b682b8 URL: http://www.drbl.org/ BuildRequires: bash -BuildRequires: sed = 4.0 Requires: findutils BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -28,15 +27,12 @@ Symantec Ghost(TM) or True Image(TM). %prep %setup -q -n %{name}-%{version} -grep -rl /opt/drbl/ . | xargs sed -i -e 's,/opt/drbl,%{_libdir}/%{name},g' - %build %{__make} all %install rm -rf $RPM_BUILD_ROOT %{__make} install \ - maindir=%{_libdir}/%{name} \ DESTDIR=$RPM_BUILD_ROOT %clean @@ -44,15 +40,10 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(644,root,root,755) -%defattr(-,root,root,-) -%dir %{_libdir}/%{name} -%{_libdir}/%{name}/setup -%{_libdir}/%{name}/conf -%{_libdir}/%{name}/lang -%{_libdir}/%{name}/pkg -%{_libdir}/%{name}/pki -%{_libdir}/%{name}/image -%{_libdir}/%{name}/doc -%{_libdir}/%{name}/sbin -%{_libdir}/%{name}/bin +%dir /etc/drbl +/etc/drbl/* +%attr(755,root,root) /usr/sbin/* +%attr(755,root,root) /usr/bin/* %{_datadir}/gdm/themes/drbl-gdm +%defattr(-,root,root,-) +%{_datadir}/drbl gitweb: http://git.pld-linux.org/gitweb.cgi/packages/drbl.git/commitdiff/ccd226fa558e3fa19294cdf5c3e34a56158cd40b ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: drbl: drbl-2.1.33.tar.bz2
Files fetched: 1 STORED: http://free.nchc.org.tw/drbl-core/src/unstable/drbl-2.1.33.tar.bz2 ab5d805195c72b7638019a1259b682b8 drbl-2.1.33.tar.bz2 Size: 1303137 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/clonezilla] Created branch unstable
The branch 'unstable' was created. Summary of new commits: 180f227... Up to 3.1.18 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/clonezilla/unstable] Up to 3.1.18
commit 180f22735103d5a2ae853f30a44a3822b65cec99 Author: Artur Frysiak ar...@frysiak.net Date: Sat Nov 17 21:18:51 2012 +0100 Up to 3.1.18 clonezilla.spec | 27 +++ 1 file changed, 11 insertions(+), 16 deletions(-) --- diff --git a/clonezilla.spec b/clonezilla.spec index ebb9a0d..b779ead 100644 --- a/clonezilla.spec +++ b/clonezilla.spec @@ -1,14 +1,14 @@ Summary: Opensource Clone System (ocs), clonezilla Name: clonezilla -Version: 2.3.58 -Release: 1 +Version: 3.1.18 +Release: 0.1 License: GPL Group: Networking/Utilities -Source0: http://free.nchc.org.tw/drbl-core/src/stable/%{name}-%{version}.tar.bz2 -# Source0-md5: 37b8e7563607c4e43050fd3b598f6672 +Source0: http://free.nchc.org.tw/drbl-core/src/unstable/%{name}-%{version}.tar.bz2 +# Source0-md5: 9451285a0f6ec4c5446e4fd2191d4eb6 URL: http://www.clonezilla.org/ Requires: bash -Requires: drbl = 1.9.9-19 +Requires: drbl = 2.1.33 Requires: ntfsprogs = 1.13.1 Requires: partclone = 0.2.22 Requires: partimage = 0.6.9 @@ -17,8 +17,6 @@ Requires: psmisc Requires: udpcast BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%definedrbldir %{_libdir}/drbl - %description Clonezilla, based on DRBL, Partition Image, ntfsclone, partclone, and udpcast, allows you to do bare metal backup and recovery. Two types of @@ -30,15 +28,12 @@ many (40 plus!) computers simultaneously. %prep %setup -q -n %{name}-%{version} -grep -rl /opt/drbl/ . | xargs sed -i -e 's,/opt/drbl,%{drbldir},g' - %build %{__make} all %install rm -rf $RPM_BUILD_ROOT %{__make} install \ - maindir=%{drbldir} \ DESTDIR=$RPM_BUILD_ROOT %clean @@ -46,10 +41,10 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(644,root,root,755) -%doc AUTHORS +%doc doc/AUTHORS doc/ChangeLog.txt doc/VERSION +%dir /etc/drbl +/etc/drbl/*.conf +%attr(755,root,root) /usr/sbin/* +%attr(755,root,root) /usr/bin/* %defattr(-,root,root) -%{drbldir}/bin/* -%{drbldir}/sbin/* -%{drbldir}/conf/* -%{drbldir}/setup/* -%{drbldir}/samples/* +/usr/share/drbl gitweb: http://git.pld-linux.org/gitweb.cgi/packages/clonezilla.git/commitdiff/180f22735103d5a2ae853f30a44a3822b65cec99 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: clonezilla: clonezilla-3.1.18.tar.bz2
Files fetched: 1 STORED: http://free.nchc.org.tw/drbl-core/src/unstable/clonezilla-3.1.18.tar.bz2 9451285a0f6ec4c5446e4fd2191d4eb6 clonezilla-3.1.18.tar.bz2 Size: 1026140 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/partclone] Created branch DEVEL
The branch 'DEVEL' was created. Summary of new commits: 1317225... Up to 0.2.56 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/partclone/DEVEL] Up to 0.2.56
commit 13172250ed7b20d92f073ad2643657d829b6fa5a Author: Artur Frysiak ar...@frysiak.net Date: Sat Nov 17 21:32:20 2012 +0100 Up to 0.2.56 am.patch | 11 +++ partclone.spec | 55 +-- 2 files changed, 60 insertions(+), 6 deletions(-) --- diff --git a/partclone.spec b/partclone.spec index 0c1335e..37a6a11 100644 --- a/partclone.spec +++ b/partclone.spec @@ -1,11 +1,12 @@ Summary: Utility to clone and restore partitions Name: partclone -Version: 0.2.33 -Release: 1 +Version: 0.2.56 +Release: 0.1 License: GPL v2+ Group: Applications/System Source0: http://downloads.sourceforge.net/partclone/%{name}-%{version}.tar.gz -# Source0-md5: 65591745052f7537fd7f0e3181cdef82 +# Source0-md5: 75ee528b13f55feff80e09f74cf1da20 +Patch0:am.patch URL: http://partclone.org/ BuildRequires: autoconf BuildRequires: automake @@ -30,6 +31,7 @@ e2fslibs. %prep %setup -q +%patch0 -p1 #sed -e 's|libxfs.h|xfs.h|' -i configure.ac -i src/xfsclone.[ch] sed -e 's|ncurses.h|ncurses/ncurses.h|' -i configure.ac -i src/{partclone,progress}.c @@ -66,6 +68,47 @@ rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(644,root,root,755) -%doc AUTHORS ChangeLog README TODO src/gauge -%attr(755,root,root) %{_sbindir}/%{name}.* -%{_mandir}/man8/%{name}.*.8* +%doc AUTHORS ChangeLog README TODO +%attr(755,root,root) %{_sbindir}/partclone.btrfs +%attr(755,root,root) %{_sbindir}/partclone.chkimg +%attr(755,root,root) %{_sbindir}/partclone.dd +%attr(755,root,root) %{_sbindir}/partclone.ext2 +%attr(755,root,root) %{_sbindir}/partclone.ext3 +%attr(755,root,root) %{_sbindir}/partclone.ext4 +%attr(755,root,root) %{_sbindir}/partclone.ext4dev +%attr(755,root,root) %{_sbindir}/partclone.extfs +%attr(755,root,root) %{_sbindir}/partclone.fat +%attr(755,root,root) %{_sbindir}/partclone.fat12 +%attr(755,root,root) %{_sbindir}/partclone.fat16 +%attr(755,root,root) %{_sbindir}/partclone.fat32 +%attr(755,root,root) %{_sbindir}/partclone.hfs+ +%attr(755,root,root) %{_sbindir}/partclone.hfsp +%attr(755,root,root) %{_sbindir}/partclone.hfsplus +%attr(755,root,root) %{_sbindir}/partclone.info +%attr(755,root,root) %{_sbindir}/partclone.ntfs +%attr(755,root,root) %{_sbindir}/partclone.ntfsfixboot +%attr(755,root,root) %{_sbindir}/partclone.ntfsreloc +%attr(755,root,root) %{_sbindir}/partclone.restore +%attr(755,root,root) %{_sbindir}/partclone.vfat +%{_mandir}/man8/partclone.8* +%{_mandir}/man8/partclone.btrfs.8* +%{_mandir}/man8/partclone.chkimg.8* +%{_mandir}/man8/partclone.dd.8* +%{_mandir}/man8/partclone.ext2.8* +%{_mandir}/man8/partclone.ext3.8* +%{_mandir}/man8/partclone.ext4.8* +%{_mandir}/man8/partclone.ext4dev.8* +%{_mandir}/man8/partclone.extfs.8* +%{_mandir}/man8/partclone.fat.8* +%{_mandir}/man8/partclone.fat12.8* +%{_mandir}/man8/partclone.fat16.8* +%{_mandir}/man8/partclone.fat32.8* +%{_mandir}/man8/partclone.hfs+.8* +%{_mandir}/man8/partclone.hfsp.8* +%{_mandir}/man8/partclone.hfsplus.8* +%{_mandir}/man8/partclone.info.8* +%{_mandir}/man8/partclone.ntfs.8* +%{_mandir}/man8/partclone.ntfsfixboot.8* +%{_mandir}/man8/partclone.ntfsreloc.8* +%{_mandir}/man8/partclone.restore.8* +%{_mandir}/man8/partclone.vfat.8* diff --git a/am.patch b/am.patch new file mode 100644 index 000..1a601f7 --- /dev/null +++ b/am.patch @@ -0,0 +1,11 @@ +--- partclone-0.2.56/configure.ac.wiget2012-11-17 21:25:42.281686732 +0100 partclone-0.2.56/configure.ac 2012-11-17 21:26:01.388352614 +0100 +@@ -1,7 +1,7 @@ + AC_INIT([Partclone], [0.2.56], [tho...@nchc.org.tw]) + #AC_CONFIG_AUX_DIR([build-aux]) + #AC CONFIG SRCDIR([src/main.c]) +-AM_INIT_AUTOMAKE([-Wall -Werror foreign]) ++AM_INIT_AUTOMAKE([-Wall foreign]) + AM_GNU_GETTEXT_VERSION([0.16.1]) + AM_GNU_GETTEXT([external]) + AC_PROG_CC gitweb: http://git.pld-linux.org/gitweb.cgi/packages/partclone.git/commitdiff/13172250ed7b20d92f073ad2643657d829b6fa5a ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: partclone: partclone-0.2.56.tar.gz
Files fetched: 1 STORED: http://downloads.sourceforge.net/partclone/partclone-0.2.56.tar.gz 75ee528b13f55feff80e09f74cf1da20 partclone-0.2.56.tar.gz Size: 442140 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/cheese] - updated to 3.6.2
commit 607400a348dd416e3b5896e7066c818be3ad853e Author: Łukasz Kieś kie...@pld-linux.org Date: Sat Nov 17 21:41:22 2012 +0100 - updated to 3.6.2 cheese.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- diff --git a/cheese.spec b/cheese.spec index 10ec136..4daeeac 100644 --- a/cheese.spec +++ b/cheese.spec @@ -1,12 +1,12 @@ Summary: A cheesy program to take pictures and videos from your web cam Summary(pl.UTF-8): Program do pobierania zdjęć i filmów z kamery internetowej Name: cheese -Version: 3.6.1 -Release: 4 +Version: 3.6.2 +Release: 1 License: GPL Group: X11/Applications Source0: http://ftp.gnome.org/pub/GNOME/sources/cheese/3.6/%{name}-%{version}.tar.xz -# Source0-md5: 5278f0223fb5e25957f20f14716ff760 +# Source0-md5: d152bd8bd29684a89213c633310634ac URL: http://projects.gnome.org/cheese/ BuildRequires: autoconf = 2.64 BuildRequires: automake = 1:1.11 gitweb: http://git.pld-linux.org/gitweb.cgi/packages/cheese.git/commitdiff/607400a348dd416e3b5896e7066c818be3ad853e ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: cheese: cheese-3.6.2.tar.xz
Files fetched: 1 STORED: http://ftp.gnome.org/pub/GNOME/sources/cheese/3.6/cheese-3.6.2.tar.xz d152bd8bd29684a89213c633310634ac cheese-3.6.2.tar.xz Size: 3709504 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/devhelp] - updated to 3.6.1
commit c69a01272623441373fa676b4f267fcb2e4bcb46 Author: Łukasz Kieś kie...@pld-linux.org Date: Sat Nov 17 21:43:54 2012 +0100 - updated to 3.6.1 devhelp.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- diff --git a/devhelp.spec b/devhelp.spec index d06d625..77f0ac8 100644 --- a/devhelp.spec +++ b/devhelp.spec @@ -1,12 +1,12 @@ Summary: API documentation browser for GNOME Summary(pl.UTF-8): Przeglądarka dokumentacji API dla GNOME Name: devhelp -Version: 3.6.0 -Release: 2 +Version: 3.6.1 +Release: 1 License: GPL v2+ Group: X11/Applications Source0: http://ftp.gnome.org/pub/GNOME/sources/devhelp/3.6/%{name}-%{version}.tar.xz -# Source0-md5: 8076f10f493be38cef55e770db2579c5 +# Source0-md5: 56c03dfc591f4a1a7b975291338bf12f Patch0:%{name}-bookdir.patch URL: http://www.imendio.com/projects/devhelp/ BuildRequires: GConf2-devel = 2.24.0 gitweb: http://git.pld-linux.org/gitweb.cgi/packages/devhelp.git/commitdiff/c69a01272623441373fa676b4f267fcb2e4bcb46 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: devhelp: devhelp-3.6.1.tar.xz
Files fetched: 1 STORED: http://ftp.gnome.org/pub/GNOME/sources/devhelp/3.6/devhelp-3.6.1.tar.xz 56c03dfc591f4a1a7b975291338bf12f devhelp-3.6.1.tar.xz Size: 499156 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/empathy] - updated to 3.6.2
commit 044b3bccaa288e1208aefbb5fbcf88f3b89ab8a9 Author: Łukasz Kieś kie...@pld-linux.org Date: Sat Nov 17 21:51:17 2012 +0100 - updated to 3.6.2 empathy.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- diff --git a/empathy.spec b/empathy.spec index 0d7d7ef..e8bf9a1 100644 --- a/empathy.spec +++ b/empathy.spec @@ -1,12 +1,12 @@ Summary: High-level library and user-interface for Telepathy Summary(pl.UTF-8): Bardzo łatwy w użyciu klient Telepathy dla GNOME Name: empathy -Version: 3.6.1 +Version: 3.6.2 Release: 1 License: GPL v2+ Group: Applications/Communications Source0: http://ftp.gnome.org/pub/GNOME/sources/empathy/3.6/%{name}-%{version}.tar.xz -# Source0-md5: f707f5a091150f48247f2cfb463e7b93 +# Source0-md5: c300224c8f920ff3b9c1a5e353ae1027 URL: http://live.gnome.org/Empathy BuildRequires: NetworkManager-devel = 0.7.0 BuildRequires: autoconf = 2.64 gitweb: http://git.pld-linux.org/gitweb.cgi/packages/empathy.git/commitdiff/044b3bccaa288e1208aefbb5fbcf88f3b89ab8a9 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: empathy: empathy-3.6.2.tar.xz
Files fetched: 1 STORED: http://ftp.gnome.org/pub/GNOME/sources/empathy/3.6/empathy-3.6.2.tar.xz c300224c8f920ff3b9c1a5e353ae1027 empathy-3.6.2.tar.xz Size: 3443720 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/evolution-data-server] - updated to 3.6.2
commit e68d1dd5948a4bf98ae676b3e62843d04a171906 Author: Łukasz Kieś kie...@pld-linux.org Date: Sat Nov 17 22:03:53 2012 +0100 - updated to 3.6.2 evolution-data-server.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- diff --git a/evolution-data-server.spec b/evolution-data-server.spec index 2bb3ebf..a9408bc 100644 --- a/evolution-data-server.spec +++ b/evolution-data-server.spec @@ -13,12 +13,12 @@ Summary: Evolution data server Summary(pl.UTF-8): Serwer danych Evolution Name: evolution-data-server -Version: 3.6.1 +Version: 3.6.2 Release: 1 License: LGPL v2+ Group: X11/Libraries Source0: http://ftp.gnome.org/pub/GNOME/sources/evolution-data-server/3.6/%{name}-%{version}.tar.xz -# Source0-md5: 8c87771a808f4e8e590ad647a9a79771 +# Source0-md5: 80daab03dbdb535296151a762e433a7e URL: http://www.gnome.org/projects/evolution/ BuildRequires: autoconf = 2.62 BuildRequires: automake = 1:1.11 gitweb: http://git.pld-linux.org/gitweb.cgi/packages/evolution-data-server.git/commitdiff/e68d1dd5948a4bf98ae676b3e62843d04a171906 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: evolution-data-server: evolution-data-server-3.6.2.tar.xz
Files fetched: 1 STORED: http://ftp.gnome.org/pub/GNOME/sources/evolution-data-server/3.6/evolution-data-server-3.6.2.tar.xz 80daab03dbdb535296151a762e433a7e evolution-data-server-3.6.2.tar.xz Size: 3953424 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/prime] - pl - verbose bin and config files
commit f574d46543f449cf59f2fd9a7b8770bda5caf6aa Author: Jakub Bogusz qbo...@pld-linux.org Date: Sat Nov 17 22:07:11 2012 +0100 - pl - verbose bin and config files prime.spec | 29 + 1 file changed, 21 insertions(+), 8 deletions(-) --- diff --git a/prime.spec b/prime.spec index fa6abb5..168d1e1 100644 --- a/prime.spec +++ b/prime.spec @@ -1,17 +1,17 @@ Summary: PRIME - a Japanese PRedictive Input Method Editor -#Summary(pl.UTF-8):- +Summary(pl.UTF-8): PRIME - edytor przewidującej metody wprowadzania tekstu japońskiego Name: prime Version: 1.0.0.1 Release: 1 -License: GPL +License: GPL v2 Group: Libraries Source0: http://prime.sourceforge.jp/src/%{name}-%{version}.tar.gz # Source0-md5: c3bb6df8590986104e41c23330d90aef URL: http://taiyaki.org/prime/ -BuildRequires: sed = 4.0 BuildRequires: rpmbuild(macros) = 1.484 BuildRequires: ruby = 1:1.8.6 BuildRequires: ruby-modules +BuildRequires: sed = 4.0 %{?ruby_mod_ver_requires_eq} Requires: ruby Requires: ruby-sary @@ -24,13 +24,21 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description PRIME predicts user's input words using the knowledge of natural language and the history of user's operations, and reduces the -cost of typing by the user. For example, if a user wants to input +cost of typing by the user. For example, if a user wants to input application and types ap as the beginning characters of the word, PRIME might predict some candidate words like apple, application, -appointment, etc... And then the user can input application +appointment, etc... And then the user can input application easily by selecting the word from the candidate words by PRIME. -#%description -l pl.UTF-8 +%description -l pl.UTF-8 +PRIME (PRedictive Input Method Editor) przewiduje słowa wprowadzane +przez użytkownika, wykorzystując znajomość języka naturalnego oraz +historię operacji użytkownika; zmniejsza przy tym koszt pisania przez +użytkownika. Na przykład, jeśli użytkownik chce wprowadzić słowo +aplikacja i napisze ap jako początkowe znaki słowa, PRIME może +przewidzieć pasujące słowa, takie jak aparycja, aplikacja, +aprobata itp. Następnie użytkownik może łatwo wprowadzić słowo +aplikacja wybierając słowo z proponowanych przez PRIME. %prep %setup -q @@ -59,8 +67,13 @@ rm -rf $RPM_BUILD_ROOT %defattr(644,root,root,755) %doc AUTHORS ChangeLog README TODO prime-docs/* %dir %{_sysconfdir}/%{name} -%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/* -%attr(755,root,root) %{_bindir}/* +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/Custom_prime.rb +%attr(755,root,root) %{_bindir}/prime +%attr(755,root,root) %{_bindir}/prime-dict-convert +%attr(755,root,root) %{_bindir}/prime-dict-index +%attr(755,root,root) %{_bindir}/prime-refresh +%attr(755,root,root) %{_bindir}/prime-userdict-convert +%attr(755,root,root) %{_bindir}/prime-userdict-update %{ruby_rubylibdir}/%{name} %{_datadir}/%{name} %{_pkgconfigdir}/prime.pc gitweb: http://git.pld-linux.org/gitweb.cgi/packages/prime.git/commitdiff/f574d46543f449cf59f2fd9a7b8770bda5caf6aa ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/ibus-xkb] - finished
commit b4c51eee4ca0f1dabb960d273fbe0d188f7fe464 Author: Jakub Bogusz qbo...@pld-linux.org Date: Sat Nov 17 22:11:22 2012 +0100 - finished ibus-xkb.spec | 47 +++ 1 file changed, 43 insertions(+), 4 deletions(-) --- diff --git a/ibus-xkb.spec b/ibus-xkb.spec index e5d4c37..a5c8b94 100644 --- a/ibus-xkb.spec +++ b/ibus-xkb.spec @@ -2,14 +2,14 @@ # Conditional build: %bcond_without static_libs # static library %bcond_without gnomekbd# libgnomekbd support -%bcond_withdconf # dconf-based configuration +%bcond_without dconf # dconf-based configuration %bcond_without gconf # GConf support # Summary: XKB module for IBus Summary(pl.UTF-8): Moduł XKB dla platformy IBus Name: ibus-xkb Version: 1.4.99.20120525 -Release: 0.1 +Release: 1 License: LGPL v2+ Group: Libraries #Source0Download: http://code.google.com/p/ibus/downloads/list @@ -29,6 +29,7 @@ BuildRequires:intltool = 0.35.0 BuildRequires: pkgconfig BuildRequires: python = 1:2.5 BuildRequires: vala = 2:0.14 +BuildRequires: vala-ibus = 1.4.99 BuildRequires: xorg-lib-libX11-devel BuildRequires: xorg-lib-libxkbfile-devel Requires: %{name}-libs = %{version}-%{release} @@ -82,6 +83,20 @@ Static ibus-xkb library. %description static -l pl.UTF-8 Statyczna biblioteka ibus-xkb. +%package -n vala-ibus-xkb +Summary: Vala API for ibus-xkb library +Summary(pl.UTF-8): API języka Vala dla biblioteki ibus-xkb +Group: Development/Libraries +Requires: %{name}-devel = %{version}-%{release} +Requires: vala = 2:0.14 +Requires: vala-ibus = 1.4.99 + +%description -n vala-ibus-xkb +Vala API for ibus-xkb library. + +%description -n vala-ibus-xkb -l pl.UTF-8 +API języka Vala dla biblioteki ibus-xkb. + %prep %setup -q @@ -109,6 +124,24 @@ rm -rf $RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT +%post +%if %{with gconf} +%gconf_schema_install ibus-xkb.schemas +%endif +%if %{with dconf} +%glib_compile_schemas +%endif + +%if %{with gconf} +%preun +%gconf_schema_uninstall ibus-xkb.schemas +%endif + +%if %{with dconf} +%postun +%glib_compile_schemas +%endif + %post libs -p /sbin/ldconfig %postunlibs -p /sbin/ldconfig @@ -120,20 +153,21 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %{_libexecdir}/ibus-xkb %attr(755,root,root) %{_libexecdir}/ibus-xkb-ui-gtk3 %{_datadir}/ibus/component/gtkxkbpanel.xml +%{_datadir}/ibus/component/xkb.xml %{_datadir}/ibus/setup-xkb %{_desktopdir}/ibus-setup-xkb.desktop %{?with_gconf:%{_sysconfdir}/gconf/schemas/ibus-xkb.schemas} %if %{with dconf} %dir %{_sysconfdir}/dconf/db/ibus.d %{_sysconfdir}/dconf/db/ibus.d/01-xkb -%{_datadir}/glib-2.0/schemas/org.freedesktop.ibus.xkb.schema.xml +%{_datadir}/glib-2.0/schemas/org.freedesktop.ibus.xkb.gschema.xml %{_datadir}/GConf/gsettings/ibus-xkb.convert %endif %files libs %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/libibus-xkb-1.0.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libibus-xkb-1.0.so.0 +%attr(755,root,root) %ghost %{_libdir}/libibus-xkb-1.0.so.5 %{_libdir}/girepository-1.0/IBusXKB-1.0.typelib %files devel @@ -148,3 +182,8 @@ rm -rf $RPM_BUILD_ROOT %defattr(644,root,root,755) %{_libdir}/libibus-xkb-1.0.a %endif + +%files -n vala-ibus-xkb +%defattr(644,root,root,755) +%{_datadir}/vala/vapi/ibus-xkb-1.0.deps +%{_datadir}/vala/vapi/ibus-xkb-1.0.vapi gitweb: http://git.pld-linux.org/gitweb.cgi/packages/ibus-xkb.git/commitdiff/b4c51eee4ca0f1dabb960d273fbe0d188f7fe464 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/ibus-table-chinese] - updated to 1.4.0.20121008
commit f39cd42a4acd704ea61355196c7cb158732bf727 Author: Jakub Bogusz qbo...@pld-linux.org Date: Sat Nov 17 22:16:52 2012 +0100 - updated to 1.4.0.20121008 ibus-table-chinese.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- diff --git a/ibus-table-chinese.spec b/ibus-table-chinese.spec index 6c3330e..7e15d2c 100644 --- a/ibus-table-chinese.spec +++ b/ibus-table-chinese.spec @@ -3,13 +3,13 @@ Summary(pl.UTF-8):Tablice wprowadzania znaków chińskich dla platformy IBus Summary(zh_CN.UTF-8): 中文码表输入法 Summary(zh_TW.UTF-8): 中文碼表輸入法 Name: ibus-table-chinese -Version: 1.4.0 +Version: 1.4.0.20121008 Release: 1 License: GPL v3+ Group: Libraries #Source0Download: http://code.google.com/p/ibus/downloads/list Source0: http://ibus.googlecode.com/files/%{name}-%{version}-Source.tar.gz -# Source0-md5: f65ce1bb41eb90e7ecc122b7d34df776 +# Source0-md5: 5c484d4a0a0dcfaf463949fc54e1cece Patch0:%{name}-no-fedora.patch URL: http://code.google.com/p/ibus/ BuildRequires: cmake = 2.6.2 @@ -320,7 +320,7 @@ Metoda wprowadzania znaków chińskich YongMa. 永碼輸入法。 %prep -%setup -q -n %{name}-%{version}-Source +%setup -q -n %{name}-1.4.0-Source %patch0 -p1 %build gitweb: http://git.pld-linux.org/gitweb.cgi/packages/ibus-table-chinese.git/commitdiff/f39cd42a4acd704ea61355196c7cb158732bf727 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: ibus-table-chinese: ibus-table-chinese-1.4.0.20121008-Source.tar.gz
Files fetched: 1 STORED: http://ibus.googlecode.com/files/ibus-table-chinese-1.4.0.20121008-Source.tar.gz 5c484d4a0a0dcfaf463949fc54e1cece ibus-table-chinese-1.4.0.20121008-Source.tar.gz Size: 22260647 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/evolution] - updated to 3.6.2
commit f62952087944e6a79eba4a2af4b32eee4894b0ae Author: Łukasz Kieś kie...@pld-linux.org Date: Sat Nov 17 22:43:01 2012 +0100 - updated to 3.6.2 evolution.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- diff --git a/evolution.spec b/evolution.spec index ce7a258..6fab53f 100644 --- a/evolution.spec +++ b/evolution.spec @@ -10,12 +10,12 @@ Summary(pl.UTF-8): Klient poczty dla GNOME/Kalendarz/Książka Adresowa Summary(pt_BR.UTF-8): Cliente de email integrado com calendário e catálogo de endereços Summary(zh_CN.UTF-8): Evolution - GNOME个人和工作组信息管理工具(包括电子邮件,日历和地址薄) Name: evolution -Version: 3.6.1 +Version: 3.6.2 Release: 1 License: GPL v2+ Group: X11/Applications Source0: http://ftp.gnome.org/pub/GNOME/sources/evolution/3.6/%{name}-%{version}.tar.xz -# Source0-md5: 1ee557f05e57f0620a011bd10bdd1370 +# Source0-md5: fd4a19f9d524b4a0510e85e280c362e0 Source1: %{name}-gg16.png Source2: %{name}-gg48.png Source3: %{name}-addressbook.desktop gitweb: http://git.pld-linux.org/gitweb.cgi/packages/evolution.git/commitdiff/f62952087944e6a79eba4a2af4b32eee4894b0ae ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: evolution: evolution-3.6.2.tar.xz
Files fetched: 1 STORED: http://ftp.gnome.org/pub/GNOME/sources/evolution/3.6/evolution-3.6.2.tar.xz fd4a19f9d524b4a0510e85e280c362e0 evolution-3.6.2.tar.xz Size: 12006684 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/eog] - updated to 3.6.2
commit f772d622e8c795180a16c8c2737af821aba90635 Author: Łukasz Kieś kie...@pld-linux.org Date: Sat Nov 17 22:49:32 2012 +0100 - updated to 3.6.2 eog.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- diff --git a/eog.spec b/eog.spec index 76e0624..05e2282 100644 --- a/eog.spec +++ b/eog.spec @@ -6,12 +6,12 @@ Summary: The Eye of GNOME image viewer Summary(pl.UTF-8): Oko GNOME - przeglądarka obrazków Summary(pt_BR.UTF-8): Visualizador de imagem Eye of GNOME Name: eog -Version: 3.6.1 +Version: 3.6.2 Release: 1 License: GPL v2+ Group: X11/Applications/Graphics Source0: http://ftp.gnome.org/pub/GNOME/sources/eog/3.6/%{name}-%{version}.tar.xz -# Source0-md5: b8345fe47f6079416186655c0e18b817 +# Source0-md5: da1c7011ba3c86f3fb9d6aca36048a45 URL: http://www.gnome.org/projects/eog/ BuildRequires: autoconf = 2.59 BuildRequires: automake = 1:1.11 gitweb: http://git.pld-linux.org/gitweb.cgi/packages/eog.git/commitdiff/f772d622e8c795180a16c8c2737af821aba90635 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: eog: eog-3.6.2.tar.xz
Files fetched: 1 STORED: http://ftp.gnome.org/pub/GNOME/sources/eog/3.6/eog-3.6.2.tar.xz da1c7011ba3c86f3fb9d6aca36048a45 eog-3.6.2.tar.xz Size: 3615284 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/file-roller] - updated to 3.6.2
commit 0ab551d23750925ef51f9ac6d1ae6989b47a8c23 Author: Łukasz Kieś kie...@pld-linux.org Date: Sat Nov 17 22:59:08 2012 +0100 - updated to 3.6.2 file-roller.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- diff --git a/file-roller.spec b/file-roller.spec index 66ada07..83a3a5c 100644 --- a/file-roller.spec +++ b/file-roller.spec @@ -2,12 +2,12 @@ Summary: An archive manager for GNOME Summary(pl.UTF-8): Zarządca archiwów dla GNOME Summary(pt_BR.UTF-8): Gerenciador de arquivos compactados para o GNOME Name: file-roller -Version: 3.6.1.1 +Version: 3.6.2 Release: 1 License: GPL v2 Group: X11/Applications Source0: http://ftp.gnome.org/pub/GNOME/sources/file-roller/3.6/%{name}-%{version}.tar.xz -# Source0-md5: b85c1cb8a336287c244d5d4fac9defbe +# Source0-md5: 381c6efe41b7de424f675397bf057f9c URL: http://www.gnome.org/ BuildRequires: autoconf = 2.61 BuildRequires: automake = 1:1.11 gitweb: http://git.pld-linux.org/gitweb.cgi/packages/file-roller.git/commitdiff/0ab551d23750925ef51f9ac6d1ae6989b47a8c23 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: file-roller: file-roller-3.6.2.tar.xz
Files fetched: 1 STORED: http://ftp.gnome.org/pub/GNOME/sources/file-roller/3.6/file-roller-3.6.2.tar.xz 381c6efe41b7de424f675397bf057f9c file-roller-3.6.2.tar.xz Size: 1483616 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/gdl] - updated to 3.6.2
commit 67097ead067bedfc1ab68ef963ca74e32790a858 Author: Łukasz Kieś kie...@pld-linux.org Date: Sat Nov 17 23:05:02 2012 +0100 - updated to 3.6.2 gdl.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- diff --git a/gdl.spec b/gdl.spec index bb4fc79..eff5c9d 100644 --- a/gdl.spec +++ b/gdl.spec @@ -1,12 +1,12 @@ Summary: GNOME Devtool Libraries Summary(pl.UTF-8): Biblioteki GNOME Devtool Name: gdl -Version: 3.6.0 -Release: 2 +Version: 3.6.2 +Release: 1 License: GPL v2+ Group: Libraries Source0: http://ftp.gnome.org/pub/GNOME/sources/gdl/3.6/%{name}-%{version}.tar.xz -# Source0-md5: cb1ce1aab8aa5bef56505237d711b83b +# Source0-md5: c871909b2948cd173b80ce8565a5d168 BuildRequires: autoconf = 2.65 BuildRequires: automake BuildRequires: docbook-dtd412-xml gitweb: http://git.pld-linux.org/gitweb.cgi/packages/gdl.git/commitdiff/67097ead067bedfc1ab68ef963ca74e32790a858 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: gdl: gdl-3.6.2.tar.xz
Files fetched: 1 STORED: http://ftp.gnome.org/pub/GNOME/sources/gdl/3.6/gdl-3.6.2.tar.xz c871909b2948cd173b80ce8565a5d168 gdl-3.6.2.tar.xz Size: 530604 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/gnome-desktop] - updated to 3.6.2
commit 2f7ab7a1f682045b60b6671e929cb8d6c4b2c013 Author: Łukasz Kieś kie...@pld-linux.org Date: Sat Nov 17 23:12:17 2012 +0100 - updated to 3.6.2 gnome-desktop.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- diff --git a/gnome-desktop.spec b/gnome-desktop.spec index 68dbd0a..55dd847 100644 --- a/gnome-desktop.spec +++ b/gnome-desktop.spec @@ -1,12 +1,12 @@ Summary: gnome-desktop library Summary(pl.UTF-8): Biblioteka gnome-desktop Name: gnome-desktop -Version: 3.6.1 +Version: 3.6.2 Release: 1 License: LGPL Group: X11/Applications Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-desktop/3.6/%{name}-%{version}.tar.xz -# Source0-md5: 05a16c52b7fe44883c4032cb0357dde5 +# Source0-md5: df8f12afd088674bff1664c3fd6619c0 URL: http://www.gnome.org/ BuildRequires: autoconf BuildRequires: automake = 1:1.11 gitweb: http://git.pld-linux.org/gitweb.cgi/packages/gnome-desktop.git/commitdiff/2f7ab7a1f682045b60b6671e929cb8d6c4b2c013 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit