[packages/nodejs] update deps for -devel package
commit 96f19ba54f7209c6f1244ac779841fc899352a1b Author: Elan Ruusamäe Date: Mon Apr 8 01:22:05 2013 +0300 update deps for -devel package nodejs.spec | 9 ++--- 1 file changed, 6 insertions(+), 3 deletions(-) --- diff --git a/nodejs.spec b/nodejs.spec index 46cd39d..b83b304 100644 --- a/nodejs.spec +++ b/nodejs.spec @@ -1,7 +1,7 @@ Summary: Asynchronous JavaScript Engine Name: nodejs Version: 0.10.3 -Release: 3 +Release: 4 License: BSD and MIT and Apache v2.0 and GPL v3 Group: Development/Languages Source0: http://nodejs.org/dist/v%{version}/node-v%{version}.tar.gz @@ -42,9 +42,14 @@ across distributed devices. Summary: Development headers for nodejs Group: Development/Libraries Requires: %{name} = %{version}-%{release} +Requires: c-ares-devel Requires: gcc +Requires: http-parser-devel Requires: libstdc++-devel +Requires: libuv-devel +Requires: openssl-devel Requires: v8-devel +Requires: zlib-devel %description devel Development headers for nodejs. @@ -122,8 +127,6 @@ echo '.so man1/node.1' > $RPM_BUILD_ROOT%{_mandir}/man1/nodejs.1 install -d $RPM_BUILD_ROOT%{_includedir}/node cp -p src/*.h $RPM_BUILD_ROOT%{_includedir}/node -cp -p deps/uv/include/uv.h $RPM_BUILD_ROOT%{_includedir}/node -cp -a deps/uv/include/uv-private $RPM_BUILD_ROOT%{_includedir}/node # install for node-gyp install -d $RPM_BUILD_ROOT%{_usrsrc}/%{name} gitweb: http://git.pld-linux.org/gitweb.cgi/packages/nodejs.git/commitdiff/96f19ba54f7209c6f1244ac779841fc899352a1b ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/nodejs-microtime] drop bogus npm dep
commit 23a328b38a770754c8e6aaed3e7c8d93e8559e80 Author: Elan Ruusamäe Date: Sun Apr 7 23:42:50 2013 +0300 drop bogus npm dep nodejs-microtime.spec | 1 - 1 file changed, 1 deletion(-) --- diff --git a/nodejs-microtime.spec b/nodejs-microtime.spec index 8ef4ebd..f49d80c 100644 --- a/nodejs-microtime.spec +++ b/nodejs-microtime.spec @@ -10,7 +10,6 @@ Source0: http://registry.npmjs.org/microtime/-/%{pkg}-%{version}.tgz # Source0-md5: 0235c2c7e670706dd9ad0d05c773706e BuildRequires: nodejs-devel >= 0.8 BuildRequires: rpmbuild(macros) >= 1.657 -BuildRequires: npm >= 1.1.5 BuildRequires: nodejs-gyp BuildRequires: sed >= 4.0 Requires: nodejs >= 0.6 gitweb: http://git.pld-linux.org/gitweb.cgi/packages/nodejs-microtime.git/commitdiff/23a328b38a770754c8e6aaed3e7c8d93e8559e80 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/nodejs] use system http parser library
commit e427e9b0dede18e7f7610ea7bbd9cf850d63dbd7 Author: Elan Ruusamäe Date: Mon Apr 8 01:17:44 2013 +0300 use system http parser library nodejs.spec | 2 ++ 1 file changed, 2 insertions(+) --- diff --git a/nodejs.spec b/nodejs.spec index 3629394..46cd39d 100644 --- a/nodejs.spec +++ b/nodejs.spec @@ -15,6 +15,7 @@ Patch5: uv-fpic.patch URL: http://www.nodejs.org/ BuildRequires: c-ares-devel BuildRequires: gcc >= 5:4.0 +BuildRequires: http-parser-devel >= 2.0 BuildRequires: libstdc++-devel BuildRequires: libuv-devel >= %{version} BuildRequires: openssl-devel @@ -85,6 +86,7 @@ export PYTHONPATH=tools --shared-openssl \ --shared-cares \ --shared-libuv \ + --shared-http-parser \ --without-npm \ --without-dtrace \ --prefix=%{_prefix} gitweb: http://git.pld-linux.org/gitweb.cgi/packages/nodejs.git/commitdiff/e427e9b0dede18e7f7610ea7bbd9cf850d63dbd7 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/nodejs] use system libuv
commit 8939ac26653b598764afdfe0672adfab5d62f6ae Author: Elan Ruusamäe Date: Mon Apr 8 01:16:13 2013 +0300 use system libuv nodejs.spec | 8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) --- diff --git a/nodejs.spec b/nodejs.spec index e0cb53a..3629394 100644 --- a/nodejs.spec +++ b/nodejs.spec @@ -16,6 +16,7 @@ URL: http://www.nodejs.org/ BuildRequires: c-ares-devel BuildRequires: gcc >= 5:4.0 BuildRequires: libstdc++-devel +BuildRequires: libuv-devel >= %{version} BuildRequires: openssl-devel BuildRequires: pkgconfig BuildRequires: python >= 1:2.5.2 @@ -72,13 +73,18 @@ This package contains the documentation for nodejs. # Error: V8 doesn't like ccache. Please set your CC env var to 'gcc' CC=${CC#ccache } -# NOT autoconf so dont use macro +# add defines from libuv (RHBZ#892601) +export CFLAGS="%{rpmcflags} -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" +export CXXFLAGS="%{rpmcppflags} -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" + +# NOT autoconf so don't use macro export PYTHONPATH=tools ./configure \ --shared-v8 \ --shared-zlib \ --shared-openssl \ --shared-cares \ + --shared-libuv \ --without-npm \ --without-dtrace \ --prefix=%{_prefix} gitweb: http://git.pld-linux.org/gitweb.cgi/packages/nodejs.git/commitdiff/8939ac26653b598764afdfe0672adfab5d62f6ae ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/http-parser] BR: libstdc++-devel
commit 1dcbed49668bd76ed367dc6d6a9637df3c6e6307 Author: Elan Ruusamäe Date: Mon Apr 8 01:15:05 2013 +0300 BR: libstdc++-devel AUTO: -- flock: g++: No such file or directory http-parser.spec | 1 + 1 file changed, 1 insertion(+) --- diff --git a/http-parser.spec b/http-parser.spec index a95e124..7c2db36 100644 --- a/http-parser.spec +++ b/http-parser.spec @@ -11,6 +11,7 @@ URL: http://github.com/joyent/http-parser # download from https://github.com/joyent/http-parser/tarball/%%{version} Source0: http://pkgs.fedoraproject.org/repo/pkgs/http-parser/joyent-%{name}-v%{version}-%{github_seq}-g%{git_commit_hash}.tar.gz/340f2aab333c435cbaf49a4949645a06/joyent-http-parser-v%{version}-%{github_seq}-g%{git_commit_hash}.tar.gz # Source0-md5: 340f2aab333c435cbaf49a4949645a06 +BuildRequires: libstdc++-devel BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) # Build shared library with SONAME using gyp and remove -O flags so optflags take over # TODO: do this nicely upstream gitweb: http://git.pld-linux.org/gitweb.cgi/packages/http-parser.git/commitdiff/1dcbed49668bd76ed367dc6d6a9637df3c6e6307 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/libuv] uses gyp library not binary
commit 2b5915b2b9ba5b397460c593b8282af049764e1d Author: Elan Ruusamäe Date: Mon Apr 8 01:10:32 2013 +0300 uses gyp library not binary libuv.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/libuv.spec b/libuv.spec index b3e80a8..8787262 100644 --- a/libuv.spec +++ b/libuv.spec @@ -12,9 +12,9 @@ Source2: %{name}.pc.in # backport fix to FTBFS in nodejs-0.10.3 # https://github.com/joyent/node/issues/5213 Patch0001: 0001-unix-include-uv.h-in-src-version.c.patch -BuildRequires: gyp BuildRequires: libstdc++-devel BuildRequires: pkgconfig +BuildRequires: python-gyp # Bundling exception request: # https://fedorahosted.org/fpc/ticket/231 Provides: bundled(libev) = 4.04 gitweb: http://git.pld-linux.org/gitweb.cgi/packages/libuv.git/commitdiff/2b5915b2b9ba5b397460c593b8282af049764e1d ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/libuv] BR libstcd++-devel, pkgconfig
commit fcb1ba24304dd654b081387bc41734889dc9e697 Author: Elan Ruusamäe Date: Mon Apr 8 00:48:21 2013 +0300 BR libstcd++-devel, pkgconfig libuv.spec | 2 ++ 1 file changed, 2 insertions(+) --- diff --git a/libuv.spec b/libuv.spec index 7b03d95..b3e80a8 100644 --- a/libuv.spec +++ b/libuv.spec @@ -13,6 +13,8 @@ Source2: %{name}.pc.in # https://github.com/joyent/node/issues/5213 Patch0001: 0001-unix-include-uv.h-in-src-version.c.patch BuildRequires: gyp +BuildRequires: libstdc++-devel +BuildRequires: pkgconfig # Bundling exception request: # https://fedorahosted.org/fpc/ticket/231 Provides: bundled(libev) = 4.04 gitweb: http://git.pld-linux.org/gitweb.cgi/packages/libuv.git/commitdiff/fcb1ba24304dd654b081387bc41734889dc9e697 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: http-parser: joyent-http-parser-v2.0-7-gcd01361.tar.gz
Files fetched: 1 STORED: http://pkgs.fedoraproject.org/repo/pkgs/http-parser/joyent-http-parser-v2.0-7-gcd01361.tar.gz/340f2aab333c435cbaf49a4949645a06/joyent-http-parser-v2.0-7-gcd01361.tar.gz 340f2aab333c435cbaf49a4949645a06 joyent-http-parser-v2.0-7-gcd01361.tar.gz Size: 39028 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/http-parser] new, version 2.0
commit 2889eff15e96e9b2cd82103d1a0c29392761db24 Author: Elan Ruusamäe Date: Mon Apr 8 00:46:47 2013 +0300 new, version 2.0 based on fedora package 1511f52a4f015770b8731efde5865479e6ebce13 http-parser-gyp-sharedlib.patch | 40 ++ http-parser.spec| 94 + 2 files changed, 134 insertions(+) --- diff --git a/http-parser.spec b/http-parser.spec new file mode 100644 index 000..a95e124 --- /dev/null +++ b/http-parser.spec @@ -0,0 +1,94 @@ +%define git_date 20121128 +%define git_commit_hash cd01361 +%define github_seq 7 +Summary: HTTP request/response parser for C +Name: http-parser +Version: 2.0 +Release: 0.git%{git_commit_hash} +License: MIT +Group: Libraries +URL: http://github.com/joyent/http-parser +# download from https://github.com/joyent/http-parser/tarball/%%{version} +Source0: http://pkgs.fedoraproject.org/repo/pkgs/http-parser/joyent-%{name}-v%{version}-%{github_seq}-g%{git_commit_hash}.tar.gz/340f2aab333c435cbaf49a4949645a06/joyent-http-parser-v%{version}-%{github_seq}-g%{git_commit_hash}.tar.gz +# Source0-md5: 340f2aab333c435cbaf49a4949645a06 +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) +# Build shared library with SONAME using gyp and remove -O flags so optflags take over +# TODO: do this nicely upstream +Patch1:%{name}-gyp-sharedlib.patch +BuildRequires: gyp +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) + +# we use the upstream version from http_parser.h as the SONAME +%define somajor 2 +%define sominor 0 +%define somicro 0 + +%description +This is a parser for HTTP messages written in C. It parses both +requests and responses. The parser is designed to be used in +performance HTTP applications. It does not make any syscalls nor +allocations, it does not buffer data, it can be interrupted at +anytime. Depending on your architecture, it only requires about 40 +bytes of data per message stream (in a web server that is per +connection). + +%package devel +Summary: Development headers and libraries for http-parser +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description devel +Development headers and libraries for http-parser. + +%prep +%setup -q -n joyent-%{name}-%{git_commit_hash} +%patch1 + +%build +# TODO: fix -fPIC upstream +export CFLAGS='%{optflags} -fPIC' +gyp -f make --depth=. http_parser.gyp +%{__make} V=1 BUILDTYPE=Release + +%if %{with tests} +export LD_LIBRARY_PATH='./out/Release/lib.target' +./out/Release/test-nonstrict +./out/Release/test-strict +%endif + +%install +rm -rf $RPM_BUILD_ROOT +install -d $RPM_BUILD_ROOT{%{_libdir},%{_includedir}} +cp -p http_parser.h $RPM_BUILD_ROOT%{_includedir} + +# install regular variant +install -p out/Release/lib.target/libhttp_parser.so.%{somajor} $RPM_BUILD_ROOT%{_libdir}/libhttp_parser.so.%{somajor}.%{sominor}.%{somicro} +lib=$(basename $RPM_BUILD_ROOT%{_libdir}/libhttp_parser.so.*.*.*) +ln -s $lib $RPM_BUILD_ROOT%{_libdir}/libhttp_parser.so.%{somajor} +ln -s $lib $RPM_BUILD_ROOT%{_libdir}/libhttp_parser.so + +# install strict variant +install -p out/Release/lib.target/libhttp_parser_strict.so.%{somajor} $RPM_BUILD_ROOT%{_libdir}/libhttp_parser_strict.so.%{somajor}.%{sominor}.%{somicro} +lib=$(basename $RPM_BUILD_ROOT%{_libdir}/libhttp_parser_strict.so.*.*.*) +ln -s $lib $RPM_BUILD_ROOT%{_libdir}/libhttp_parser_strict.so.%{somajor} +ln -s $lib $RPM_BUILD_ROOT%{_libdir}/libhttp_parser_strict.so + +%clean +rm -rf $RPM_BUILD_ROOT + +%post -p /sbin/ldconfig +%postun-p /sbin/ldconfig + +%files +%defattr(644,root,root,755) +%doc AUTHORS CONTRIBUTIONS LICENSE-MIT README.md +%attr(755,root,root) %{_libdir}/libhttp_parser.so.*.*.* +%ghost %{_libdir}/libhttp_parser.so.2 +%attr(755,root,root) %{_libdir}/libhttp_parser_strict.so.*.*.* +%ghost %{_libdir}/libhttp_parser_strict.so.2 + +%files devel +%defattr(644,root,root,755) +%{_includedir}/http_parser.h +%{_libdir}/libhttp_parser.so +%{_libdir}/libhttp_parser_strict.so diff --git a/http-parser-gyp-sharedlib.patch b/http-parser-gyp-sharedlib.patch new file mode 100644 index 000..3687b67 --- /dev/null +++ b/http-parser-gyp-sharedlib.patch @@ -0,0 +1,40 @@ +--- http_parser.gyp~ 2012-11-27 15:40:11.721398004 -0700 http_parser.gyp2012-11-27 15:40:11.721398004 -0700 +@@ -12,7 +12,7 @@ + # RuntimeLibrary MUST MATCH across the entire project + 'Debug': { + 'defines': [ 'DEBUG', '_DEBUG' ], +-'cflags': [ '-Wall', '-Wextra', '-O0', '-g', '-ftrapv' ], ++'cflags': [ '-Wall', '-Wextra', '-g', '-ftrapv' ], + 'msvs_settings': { + 'VCCLCompilerTool': { + 'RuntimeLibrary': 1, # static debug +@@ -21,7 +21,7 @@ + }, + 'Release': { + 'defines': [ 'NDEBUG' ], +-'cflags': [ '-Wall', '-Wextra', '-O3' ], ++'cflags': [ '-Wall', '-Wextra' ], + 'm
[packages/http-parser] Created branch master
The branch 'master' was created. Summary of new commits: 2889eff... new, version 2.0 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/nodejs] BR: openssl-devel, pkgconfig, zlib-devel
commit cd4c73aa67b1718f2b19e92eaf10cd321b494226 Author: Elan Ruusamäe Date: Mon Apr 8 00:23:23 2013 +0300 BR: openssl-devel, pkgconfig, zlib-devel AUTO: -- Package openssl was not found in the pkg-config search path. AUTO: -- sh: pkg-config: not found AUTO: -- ../src/node.cc:61:18: fatal error: zlib.h: No such file or directory nodejs.spec | 3 +++ 1 file changed, 3 insertions(+) --- diff --git a/nodejs.spec b/nodejs.spec index 4bb6191..e0cb53a 100644 --- a/nodejs.spec +++ b/nodejs.spec @@ -16,11 +16,14 @@ URL:http://www.nodejs.org/ BuildRequires: c-ares-devel BuildRequires: gcc >= 5:4.0 BuildRequires: libstdc++-devel +BuildRequires: openssl-devel +BuildRequires: pkgconfig BuildRequires: python >= 1:2.5.2 BuildRequires: python-jsmin BuildRequires: rpm >= 4.4.9-56 BuildRequires: rpmbuild(macros) >= 1.219 BuildRequires: v8-devel >= 3.15.11.10 +BuildRequires: zlib-devel BuildConflicts:eio Obsoletes: nodejs-waf ExclusiveArch: %{ix86} %{x8664} arm gitweb: http://git.pld-linux.org/gitweb.cgi/packages/nodejs.git/commitdiff/cd4c73aa67b1718f2b19e92eaf10cd321b494226 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/nodejs] use system c-ares
commit c1c359b8484c24c8bb1c033834da77f505f8a060 Author: Elan Ruusamäe Date: Mon Apr 8 00:22:12 2013 +0300 use system c-ares nodejs.spec | 7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) --- diff --git a/nodejs.spec b/nodejs.spec index e75c332..4bb6191 100644 --- a/nodejs.spec +++ b/nodejs.spec @@ -1,7 +1,7 @@ Summary: Asynchronous JavaScript Engine Name: nodejs Version: 0.10.3 -Release: 2 +Release: 3 License: BSD and MIT and Apache v2.0 and GPL v3 Group: Development/Languages Source0: http://nodejs.org/dist/v%{version}/node-v%{version}.tar.gz @@ -13,6 +13,7 @@ Patch2: %{name}-libpath.patch Patch3:%{name}-lib64path.patch Patch5:uv-fpic.patch URL: http://www.nodejs.org/ +BuildRequires: c-ares-devel BuildRequires: gcc >= 5:4.0 BuildRequires: libstdc++-devel BuildRequires: python >= 1:2.5.2 @@ -20,7 +21,7 @@ BuildRequires:python-jsmin BuildRequires: rpm >= 4.4.9-56 BuildRequires: rpmbuild(macros) >= 1.219 BuildRequires: v8-devel >= 3.15.11.10 -BuildConflicts: eio +BuildConflicts:eio Obsoletes: nodejs-waf ExclusiveArch: %{ix86} %{x8664} arm BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -74,7 +75,9 @@ export PYTHONPATH=tools --shared-v8 \ --shared-zlib \ --shared-openssl \ + --shared-cares \ --without-npm \ + --without-dtrace \ --prefix=%{_prefix} %{__make} -C out \ gitweb: http://git.pld-linux.org/gitweb.cgi/packages/nodejs.git/commitdiff/c1c359b8484c24c8bb1c033834da77f505f8a060 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: libuv: libuv-v0.10.3.tar.gz
Files fetched: 1 STORED: http://libuv.org/dist/v0.10.3/libuv-v0.10.3.tar.gz fb20265511ebb7f0785f83c60a650324 libuv-v0.10.3.tar.gz Size: 310035 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/libuv] new, version 0.10.3
commit 35f93c772fb23309f273885e846beb56e7cc3c26 Author: Elan Ruusamäe Date: Mon Apr 8 00:18:26 2013 +0300 new, version 0.10.3 based on fedora package 5245e183b43130b75ab9517850a369cd8a15f0e9 0001-unix-include-uv.h-in-src-version.c.patch | 42 ++ libuv.pc.in | 11 +++ libuv.spec| 115 ++ 3 files changed, 168 insertions(+) --- diff --git a/libuv.spec b/libuv.spec new file mode 100644 index 000..7b03d95 --- /dev/null +++ b/libuv.spec @@ -0,0 +1,115 @@ +%define git_snapshot 5462dab +Summary: Platform layer for node.js +Name: libuv +Version: 0.10.3 +Release: 1 +License: MIT +Group: Development/Tools +URL: http://nodejs.org/ +Source0: http://libuv.org/dist/v%{version}/%{name}-v%{version}.tar.gz +# Source0-md5: fb20265511ebb7f0785f83c60a650324 +Source2: %{name}.pc.in +# backport fix to FTBFS in nodejs-0.10.3 +# https://github.com/joyent/node/issues/5213 +Patch0001: 0001-unix-include-uv.h-in-src-version.c.patch +BuildRequires: gyp +# Bundling exception request: +# https://fedorahosted.org/fpc/ticket/231 +Provides: bundled(libev) = 4.04 +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) + +# we only need major.minor in the SONAME in the stable (even numbered) series +# this should be changed to %%{version} in unstable (odd numbered) releases +%definesover 0.10 + +%description +libuv is a new platform layer for Node. Its purpose is to abstract +IOCP on Windows and libev on Unix systems. We intend to eventually +contain all platform differences in this library. + +%package devel +Summary: Development libraries for libuv +Group: Development/Tools +Requires: %{name} = %{version}-%{release} + +%description devel +Development libraries for libuv + +%prep +%setup -q -n %{name}-v%{version} +%patch0001 -p1 + +%build +CC="%{__cc}" \ +CXX="%{__cxx}" \ +LDFLAGS="%{rpmldflags}" \ +CFLAGS="%{rpmcflags} %{rpmcppflags}" \ +CXXFLAGS="%{rpmcxxflags} %{rpmcppflags}" \ +./gyp_uv \ + -Dcomponent=shared_library \ + -Dlibrary=shared_library + +# Modify the build so it produces a versioned shared library +sed -i -e "s/libuv.so/libuv.so.%{sover}/g" out/{libuv,run-benchmarks,run-tests}.target.mk + +%{__make} V=1 -C out \ + CC="%{__cc}" \ + CXX="%{__cxx}" \ + BUILDTYPE=Release \ + CC.host="%{__cc}" \ + CXX.host="%{__cxx}" \ + LDFLAGS.host="%{rpmldflags}" + +%if %{with tests} +# Tests are currently disabled because some require network access +#./run-tests +#./run-benchmarks +%endif + +%install +rm -rf $RPM_BUILD_ROOT +# Copy the shared lib into the libdir +install -d $RPM_BUILD_ROOT%{_libdir} +cp -p out/Release/obj.target/libuv.so.%{sover} $RPM_BUILD_ROOT%{_libdir}/libuv.so.%{version} +lib=$(basename $RPM_BUILD_ROOT%{_libdir}/libuv.so.*.*.*) +ln -s $lib $RPM_BUILD_ROOT%{_libdir}/libuv.so.%{sover} +ln -s $lib $RPM_BUILD_ROOT%{_libdir}/libuv.so + +# Copy the headers into the include path +install -d $RPM_BUILD_ROOT/%{_includedir}/uv-private +cp -p include/uv.h $RPM_BUILD_ROOT/%{_includedir} +cp -p \ + include/uv-private/ngx-queue.h \ + include/uv-private/tree.h \ + include/uv-private/uv-linux.h \ + include/uv-private/uv-unix.h \ + $RPM_BUILD_ROOT/%{_includedir}/uv-private + +# Create the pkgconfig file +install -d $RPM_BUILD_ROOT/%{_pkgconfigdir} +sed -e "s#@prefix@#%{_prefix}#g" \ +-e "s#@exec_prefix@#%{_exec_prefix}#g" \ +-e "s#@libdir@#%{_libdir}#g" \ +-e "s#@includedir@#%{_includedir}#g" \ +-e "s#@version@#%{version}.git%{git_snapshot}#g" \ +%{SOURCE2} > $RPM_BUILD_ROOT%{_pkgconfigdir}/libuv.pc + +%clean +rm -rf $RPM_BUILD_ROOT + +%post -p /sbin/ldconfig +%postun-p /sbin/ldconfig + +%files +%defattr(644,root,root,755) +%doc README.md AUTHORS LICENSE +%attr(755,root,root) %{_libdir}/libuv.so.*.*.* +%ghost %{_libdir}/libuv.so.%{sover} + +%files devel +%defattr(644,root,root,755) +%doc README.md AUTHORS LICENSE +%{_libdir}/libuv.so +%{_pkgconfigdir}/libuv.pc +%{_includedir}/uv.h +%{_includedir}/uv-private diff --git a/0001-unix-include-uv.h-in-src-version.c.patch b/0001-unix-include-uv.h-in-src-version.c.patch new file mode 100644 index 000..a2e9792 --- /dev/null +++ b/0001-unix-include-uv.h-in-src-version.c.patch @@ -0,0 +1,42 @@ +From fb660262d4f8b6d0f300a3923063ec5a718411ad Mon Sep 17 00:00:00 2001 +From: Ben Noordhuis +Date: Thu, 4 Apr 2013 03:02:06 +0200 +Subject: [PATCH] unix: include uv.h in src/version.c + +Include uv.h so the compiler sees the right visibility attribute for +uv_version() and uv_version_string(). + +GYP builds compile with -fvisibility=hidden. Before this commit, the +symbols were not visible in libuv.so. + +Fixes joyent/node#5213. +(cherry picked from commit f1215b791811e5c860152ecde038f35537dab57f) +--- + src/version.c | 4 + 1 file changed, 4 insertions(+) + +diff --git a
[packages/libuv] Created branch master
The branch 'master' was created. Summary of new commits: 35f93c7... new, version 0.10.3 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: gyp: gyp-1602.tar.bz2
Files fetched: 1 STORED: no-url://gyp-1602.tar.bz2 fd1809e1716f46a585684aa0fb2df897 gyp-1602.tar.bz2 Size: 240044 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/gyp] version is 0.1, according to setup.py
commit e1338491de2bb28c36048d5b244562298839a091 Author: Elan Ruusamäe Date: Sun Apr 7 23:57:22 2013 +0300 version is 0.1, according to setup.py gyp.spec | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) --- diff --git a/gyp.spec b/gyp.spec index 7dd411c..cfe6de2 100644 --- a/gyp.spec +++ b/gyp.spec @@ -3,11 +3,12 @@ %bcond_withtests # build without tests %definesvnrev 1602 -#definerel %{nil} +%definerel 1 Summary: Generate Your Projects Name: gyp -Version: 1 -Release: %{svnrev}%{?rel:.%{rel}} +# grep version= setup.py +Version: 0.1 +Release: 0.svn%{svnrev}.%{rel} License: New BSD Group: Development/Building # use get-source.sh gitweb: http://git.pld-linux.org/gitweb.cgi/packages/gyp.git/commitdiff/e1338491de2bb28c36048d5b244562298839a091 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/gyp] up to 1602 (chromium 27.0.1453.6 dep)
commit 65e11e49ff25fcf2af5bd7aa205cc5a578049470 Author: Elan Ruusamäe Date: Sun Apr 7 22:41:24 2013 +0300 up to 1602 (chromium 27.0.1453.6 dep) gyp.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- diff --git a/gyp.spec b/gyp.spec index 17154cc..7dd411c 100644 --- a/gyp.spec +++ b/gyp.spec @@ -2,7 +2,7 @@ # Conditional build: %bcond_withtests # build without tests -%definesvnrev 1361 +%definesvnrev 1602 #definerel %{nil} Summary: Generate Your Projects Name: gyp @@ -12,7 +12,7 @@ License: New BSD Group: Development/Building # use get-source.sh Source0: %{name}-%{svnrev}.tar.bz2 -# Source0-md5: 2b3a0420cf92f8dc0cea8a5ab3b2c1ea +# Source0-md5: fd1809e1716f46a585684aa0fb2df897 URL: http://code.google.com/p/gyp/ BuildRequires: python-devel BuildRequires: rpm-pythonprov diff --git a/get-source.sh b/get-source.sh old mode 100644 new mode 100755 gitweb: http://git.pld-linux.org/gitweb.cgi/packages/gyp.git/commitdiff/e1338491de2bb28c36048d5b244562298839a091 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/nodejs-gyp] rel 1
commit 73b4fda82e0bd60d6e85c9cd14308670311f5e98 Author: Elan Ruusamäe Date: Sun Apr 7 23:43:59 2013 +0300 rel 1 nodejs-gyp.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/nodejs-gyp.spec b/nodejs-gyp.spec index 29f5fcc..3a6e69c 100644 --- a/nodejs-gyp.spec +++ b/nodejs-gyp.spec @@ -2,7 +2,7 @@ Summary: Node.js native addon build tool Name: nodejs-gyp Version: 0.9.5 -Release: 0.3 +Release: 1 License: MIT Group: Development/Libraries URL: https://github.com/TooTallNate/node-gyp gitweb: http://git.pld-linux.org/gitweb.cgi/packages/nodejs-gyp.git/commitdiff/73b4fda82e0bd60d6e85c9cd14308670311f5e98 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: ModemManager: ModemManager-0.6.0.0.tar.xz
Files fetched: 1 STORED: http://ftp.gnome.org/pub/GNOME/sources/ModemManager/0.6/ModemManager-0.6.0.0.tar.xz f32640f6672d997ec0887307186e9639 ModemManager-0.6.0.0.tar.xz Size: 531136 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/ModemManager] - up to 0.6.0.0
commit 618d8cdabcd700c9dad90d2df3da139da730e2be Author: Jan Palus Date: Sun Apr 7 21:37:43 2013 +0200 - up to 0.6.0.0 ModemManager.spec | 12 1 file changed, 8 insertions(+), 4 deletions(-) --- diff --git a/ModemManager.spec b/ModemManager.spec index 9b902b0..ad82347 100644 --- a/ModemManager.spec +++ b/ModemManager.spec @@ -1,12 +1,12 @@ Summary: Mobile broadband modem management service Summary(pl.UTF-8): Usługa zarządzająca szerokopasmowymi modemami komórkowymi Name: ModemManager -Version: 0.5.2.0 -Release: 4 +Version: 0.6.0.0 +Release: 1 License: GPL v2+ Group: Networking -Source0: http://ftp.gnome.org/pub/GNOME/sources/ModemManager/0.5/%{name}-%{version}.tar.xz -# Source0-md5: a4da11ad17f937156c30b08a29cee13f +Source0: http://ftp.gnome.org/pub/GNOME/sources/ModemManager/0.6/%{name}-%{version}.tar.xz +# Source0-md5: f32640f6672d997ec0887307186e9639 URL: http://www.gnome.org/projects/NetworkManager/ BuildRequires: autoconf >= 2.60 BuildRequires: automake >= 1:1.9 @@ -88,10 +88,12 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %{_sbindir}/modem-manager %dir %{_libdir}/ModemManager %attr(755,root,root) %{_libdir}/%{name}/libmm-plugin-anydata.so +%attr(755,root,root) %{_libdir}/%{name}/libmm-plugin-cinterion.so %attr(755,root,root) %{_libdir}/%{name}/libmm-plugin-generic.so %attr(755,root,root) %{_libdir}/%{name}/libmm-plugin-gobi.so %attr(755,root,root) %{_libdir}/%{name}/libmm-plugin-hso.so %attr(755,root,root) %{_libdir}/%{name}/libmm-plugin-huawei.so +%attr(755,root,root) %{_libdir}/%{name}/libmm-plugin-iridium.so %attr(755,root,root) %{_libdir}/%{name}/libmm-plugin-linktop.so %attr(755,root,root) %{_libdir}/%{name}/libmm-plugin-longcheer.so %attr(755,root,root) %{_libdir}/%{name}/libmm-plugin-mbm.so @@ -122,6 +124,7 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/dbus-1/interfaces/mm-modem-error.xml %{_datadir}/dbus-1/interfaces/mm-serial-error.xml %{_datadir}/dbus-1/interfaces/org.freedesktop.ModemManager.Modem.Cdma.xml +%{_datadir}/dbus-1/interfaces/org.freedesktop.ModemManager.Modem.Firmware.xml %{_datadir}/dbus-1/interfaces/org.freedesktop.ModemManager.Modem.Gsm.Card.xml %{_datadir}/dbus-1/interfaces/org.freedesktop.ModemManager.Modem.Gsm.Contacts.xml %{_datadir}/dbus-1/interfaces/org.freedesktop.ModemManager.Modem.Gsm.Hso.xml @@ -131,6 +134,7 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/dbus-1/interfaces/org.freedesktop.ModemManager.Modem.Gsm.xml %{_datadir}/dbus-1/interfaces/org.freedesktop.ModemManager.Modem.Location.xml %{_datadir}/dbus-1/interfaces/org.freedesktop.ModemManager.Modem.Simple.xml +%{_datadir}/dbus-1/interfaces/org.freedesktop.ModemManager.Modem.Time.xml %{_datadir}/dbus-1/interfaces/org.freedesktop.ModemManager.Modem.xml %{_datadir}/dbus-1/interfaces/org.freedesktop.ModemManager.xml %{_datadir}/dbus-1/system-services/org.freedesktop.ModemManager.service gitweb: http://git.pld-linux.org/gitweb.cgi/packages/ModemManager.git/commitdiff/618d8cdabcd700c9dad90d2df3da139da730e2be ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/nodejs-microtime] build with system gyp and node headers
commit 12dbb4d6f304294f23e1fdef70fe7f1fed1a15f4 Author: Elan Ruusamäe Date: Sun Apr 7 23:20:02 2013 +0300 build with system gyp and node headers nodejs-microtime.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) --- diff --git a/nodejs-microtime.spec b/nodejs-microtime.spec index 45cedb4..8ef4ebd 100644 --- a/nodejs-microtime.spec +++ b/nodejs-microtime.spec @@ -9,7 +9,7 @@ URL:https://github.com/wadey/node-microtime Source0: http://registry.npmjs.org/microtime/-/%{pkg}-%{version}.tgz # Source0-md5: 0235c2c7e670706dd9ad0d05c773706e BuildRequires: nodejs-devel >= 0.8 -BuildRequires: rpmbuild(macros) >= 1.634 +BuildRequires: rpmbuild(macros) >= 1.657 BuildRequires: npm >= 1.1.5 BuildRequires: nodejs-gyp BuildRequires: sed >= 4.0 @@ -34,7 +34,8 @@ continuously or in `ticks'. mv package/* . %build -node-gyp configure build +node-gyp configure --nodedir=/usr/src/nodejs --gyp=/usr/bin/gyp +node-gyp build --jobs=%{?__jobs} --verbose %install rm -rf $RPM_BUILD_ROOT gitweb: http://git.pld-linux.org/gitweb.cgi/packages/nodejs-microtime.git/commitdiff/12dbb4d6f304294f23e1fdef70fe7f1fed1a15f4 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/nodejs-gyp] add system gyp support via --gyp=/usr/bin/gyp
commit 61b1530d98a08592e2e71123fd6b43ae63c98e56 Author: Elan Ruusamäe Date: Sun Apr 7 23:18:52 2013 +0300 add system gyp support via --gyp=/usr/bin/gyp nodejs-gyp.spec | 13 + system-gyp.patch | 21 + 2 files changed, 26 insertions(+), 8 deletions(-) --- diff --git a/nodejs-gyp.spec b/nodejs-gyp.spec index 2088132..29f5fcc 100644 --- a/nodejs-gyp.spec +++ b/nodejs-gyp.spec @@ -1,18 +1,17 @@ -# TODO -# - use system gyp - %definepkg node-gyp Summary: Node.js native addon build tool Name: nodejs-gyp Version: 0.9.5 -Release: 0.2 +Release: 0.3 License: MIT Group: Development/Libraries URL: https://github.com/TooTallNate/node-gyp Source0: http://registry.npmjs.org/node-gyp/-/node-gyp-%{version}.tgz # Source0-md5: 3d8a5cf4b5b92457af68035bb0e0e96f Patch0:jobs-alias.patch +Patch1:system-gyp.patch BuildRequires: sed >= 4.0 +Requires: gyp Requires: make Requires: nodejs Requires: nodejs-devel @@ -51,6 +50,7 @@ replacement to the node-waf program which is removed for node v0.8. %setup -qc mv package/* . %patch0 -p1 +%patch1 -p1 # fix shebangs %{__sed} -i -e '1s,^#!.*node,#!/usr/bin/node,' \ @@ -61,7 +61,7 @@ rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT%{nodejs_libdir}/%{pkg} cp -pr bin lib legacy package.json $RPM_BUILD_ROOT%{nodejs_libdir}/%{pkg} -cp -pr *.gyp* gyp $RPM_BUILD_ROOT%{nodejs_libdir}/%{pkg} +cp -pr *.gyp* $RPM_BUILD_ROOT%{nodejs_libdir}/%{pkg} install -d $RPM_BUILD_ROOT%{_bindir} ln -s %{nodejs_libdir}/%{pkg}/bin/node-gyp.js $RPM_BUILD_ROOT%{_bindir}/node-gyp @@ -82,6 +82,3 @@ rm -rf $RPM_BUILD_ROOT # waf based tools %{nodejs_libdir}/%{pkg}/legacy - -%defattr(-,root,root,-) -%{nodejs_libdir}/%{pkg}/gyp diff --git a/system-gyp.patch b/system-gyp.patch new file mode 100644 index 000..2af4809 --- /dev/null +++ b/system-gyp.patch @@ -0,0 +1,21 @@ +--- nodejs-gyp-0.9.5/lib/configure.js 2013-03-09 03:34:37.0 +0200 ./lib/configure.js 2013-04-07 22:52:41.689964923 +0300 +@@ -373,7 +373,7 @@ + }) + + // this logic ported from the old `gyp_addon` python file +-var gyp_script = path.resolve(__dirname, '..', 'gyp', 'gyp') ++var gyp_script = gyp.opts.gyp || path.resolve(__dirname, '..', 'gyp', 'gyp') + var addon_gypi = path.resolve(__dirname, '..', 'addon.gypi') + var common_gypi = path.resolve(nodeDir, 'common.gypi') + var output_dir = 'build' +--- nodejs-gyp-0.9.5/lib/node-gyp.js 2013-03-09 01:42:19.0 +0200 ./lib/node-gyp.js 2013-04-07 22:54:31.155021983 +0300 +@@ -84,6 +84,7 @@ + , nodedir: String // 'configure' + , loglevel: String // everywhere + , python: String// 'configure' ++ , gyp: String // 'configure' + , 'dist-url': String // 'install' + , jobs: String // 'build' + , thin: String // 'configure' gitweb: http://git.pld-linux.org/gitweb.cgi/packages/nodejs-gyp.git/commitdiff/61b1530d98a08592e2e71123fd6b43ae63c98e56 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/xorg-driver-video-geode] - fix building with xserver 1.14 - rel 2
commit 9c5483a6456433ce4f52fae63a3dd1e51d2a7e81 Author: Jan Rękorajski Date: Sun Apr 7 22:13:47 2013 +0200 - fix building with xserver 1.14 - rel 2 mibstore.patch | 52 xorg-driver-video-geode.spec | 4 +++- 2 files changed, 55 insertions(+), 1 deletion(-) --- diff --git a/xorg-driver-video-geode.spec b/xorg-driver-video-geode.spec index a657146..8ba4b52 100644 --- a/xorg-driver-video-geode.spec +++ b/xorg-driver-video-geode.spec @@ -2,11 +2,12 @@ Summary: X.org video driver for AMD Geode integrated graphics chipsets Summary(pl.UTF-8): Sterownik obrazu X.org dla zintegrowanych układów graficznych AMD Geode Name: xorg-driver-video-geode Version: 2.11.14 -Release: 1 +Release: 2 License: MIT Group: X11/Applications Source0: http://xorg.freedesktop.org/releases/individual/driver/xf86-video-geode-%{version}.tar.bz2 # Source0-md5: c9a4e1c5438240e5bdce332f92df9163 +Patch0:mibstore.patch URL: http://xorg.freedesktop.org/ BuildRequires: autoconf >= 2.59 BuildRequires: automake @@ -52,6 +53,7 @@ produkowanych przez firmy Cyrix i NSC. Układy: %prep %setup -q -n xf86-video-geode-%{version} +%patch0 -p1 %build %{__libtoolize} diff --git a/mibstore.patch b/mibstore.patch new file mode 100644 index 000..f6c4f25 --- /dev/null +++ b/mibstore.patch @@ -0,0 +1,52 @@ +From ed0b153f320a95a11bd561726d2405823573500e Mon Sep 17 00:00:00 2001 +From: Adam Jackson +Date: Wed, 9 Jan 2013 22:16:26 -0500 +Subject: [PATCH] Remove mibstore.h + +Signed-off-by: Adam Jackson +--- + src/geode_driver.c | 2 -- + src/gx_driver.c| 1 - + src/lx_driver.c| 1 - + 3 files changed, 4 deletions(-) + +diff --git a/src/geode_driver.c b/src/geode_driver.c +index b27bfd5..9cd0af9 100644 +--- a/src/geode_driver.c b/src/geode_driver.c +@@ -59,8 +59,6 @@ + /* Machine independent stuff */ + #include "mipointer.h" + #include "micmap.h" +-/* All drivers implementing backing store need this */ +-#include "mibstore.h" + #include "vgaHW.h" + #include "vbe.h" + +diff --git a/src/gx_driver.c b/src/gx_driver.c +index 5268f29..7f44e19 100644 +--- a/src/gx_driver.c b/src/gx_driver.c +@@ -1350,7 +1350,6 @@ GXScreenInit(SCREEN_INIT_ARGS_DECL) + if (!pGeode->NoAccel) + GXAccelInit(pScrn); + +-miInitializeBackingStore(pScrn); + xf86SetBackingStore(pScrn); + + /* Set up the soft cursor */ +diff --git a/src/lx_driver.c b/src/lx_driver.c +index 6d7f37f..146578e 100644 +--- a/src/lx_driver.c b/src/lx_driver.c +@@ -932,7 +932,6 @@ LXScreenInit(SCREEN_INIT_ARGS_DECL) + if (!pGeode->NoAccel) + pGeode->NoAccel = LXExaInit(pScrn) ? FALSE : TRUE; + +-miInitializeBackingStore(pScrn); + xf86SetBackingStore(pScrn); + + /* Set up the soft cursor */ +-- +1.8.0.2 + gitweb: http://git.pld-linux.org/gitweb.cgi/packages/xorg-driver-video-geode.git/commitdiff/9c5483a6456433ce4f52fae63a3dd1e51d2a7e81 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/nodejs-gyp] add -j N alias for build
commit 55a30e86fd0a17b9d91025cb432703c8c141208e Author: Elan Ruusamäe Date: Sun Apr 7 23:02:32 2013 +0300 add -j N alias for build upstream PR: https://github.com/TooTallNate/node-gyp/pull/234 jobs-alias.patch | 10 ++ nodejs-gyp.spec | 4 +++- 2 files changed, 13 insertions(+), 1 deletion(-) --- diff --git a/nodejs-gyp.spec b/nodejs-gyp.spec index a87d105..2088132 100644 --- a/nodejs-gyp.spec +++ b/nodejs-gyp.spec @@ -5,12 +5,13 @@ Summary: Node.js native addon build tool Name: nodejs-gyp Version: 0.9.5 -Release: 0.1 +Release: 0.2 License: MIT Group: Development/Libraries URL: https://github.com/TooTallNate/node-gyp Source0: http://registry.npmjs.org/node-gyp/-/node-gyp-%{version}.tgz # Source0-md5: 3d8a5cf4b5b92457af68035bb0e0e96f +Patch0:jobs-alias.patch BuildRequires: sed >= 4.0 Requires: make Requires: nodejs @@ -49,6 +50,7 @@ replacement to the node-waf program which is removed for node v0.8. %prep %setup -qc mv package/* . +%patch0 -p1 # fix shebangs %{__sed} -i -e '1s,^#!.*node,#!/usr/bin/node,' \ diff --git a/jobs-alias.patch b/jobs-alias.patch new file mode 100644 index 000..b763844 --- /dev/null +++ b/jobs-alias.patch @@ -0,0 +1,10 @@ +--- node-gyp/lib/node-gyp.js 2013-03-09 01:42:19.0 +0200 nodejs-gyp-0.9.5/lib/node-gyp.js 2013-04-07 22:54:31.155021983 +0300 +@@ -97,6 +98,7 @@ + release: '--no-debug' + , C: '--directory' + , debug: '--debug' ++ , j: '--jobs' + , silly: '--loglevel=silly' + , verbose: '--loglevel=verbose' + } gitweb: http://git.pld-linux.org/gitweb.cgi/packages/nodejs-gyp.git/commitdiff/55a30e86fd0a17b9d91025cb432703c8c141208e ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/xorg-driver-video-sis] - updates/fixes from upstream - rel 4
commit 8264d520cd3a2b4f90170f216b134e6514dd5553 Author: Jan Rękorajski Date: Sun Apr 7 21:46:48 2013 +0200 - updates/fixes from upstream - rel 4 sis-git.patch | 121 + xorg-driver-video-sis.spec | 6 ++- 2 files changed, 126 insertions(+), 1 deletion(-) --- diff --git a/xorg-driver-video-sis.spec b/xorg-driver-video-sis.spec index 2745c01..e8f55df 100644 --- a/xorg-driver-video-sis.spec +++ b/xorg-driver-video-sis.spec @@ -2,11 +2,13 @@ Summary: X.org video driver for SiS and XGI video chips Summary(pl.UTF-8): Sterownik obrazu X.org dla układów graficznych SiS i XGI Name: xorg-driver-video-sis Version: 0.10.7 -Release: 3 +Release: 4 License: MIT Group: X11/Applications Source0: http://xorg.freedesktop.org/releases/individual/driver/xf86-video-sis-%{version}.tar.bz2 # Source0-md5: f01e5e20e37342acf1983d269886171b +Patch0:sis-git.patch +Patch1:format-security.patch URL: http://xorg.freedesktop.org/ BuildRequires: Mesa-libGL-devel BuildRequires: autoconf >= 2.60 @@ -57,6 +59,8 @@ XGI Volari Z7 (zwanych serią 315/330/340). %prep %setup -q -n xf86-video-sis-%{version} +%patch0 -p1 +%patch1 -p1 # https://bugs.freedesktop.org/show_bug.cgi?id=18304 sed -i -e 's|#define.*SIS_USE_BIOS_SCRATCH.*|#undef SIS_USE_BIOS_SCRATCH|g' src/sis.h diff --git a/sis-git.patch b/sis-git.patch new file mode 100644 index 000..8652375 --- /dev/null +++ b/sis-git.patch @@ -0,0 +1,121 @@ +diff --git a/src/sis.h b/src/sis.h +index 46fca2a..20e6134 100644 +--- a/src/sis.h b/src/sis.h +@@ -75,7 +75,6 @@ + + #include "compiler.h" + #include "xf86Pci.h" +-#include "xf86Priv.h" + #include "xf86_OSproc.h" + #if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6 + #include "xf86Resources.h" +diff --git a/src/sis_driver.c b/src/sis_driver.c +index 61e8075..0fd83d7 100644 +--- a/src/sis_driver.c b/src/sis_driver.c +@@ -57,7 +57,6 @@ + #include "fb.h" + #include "micmap.h" + #include "mipointer.h" +-#include "mibstore.h" + #include "edid.h" + + #define SIS_NEED_inSISREG +@@ -94,6 +93,10 @@ + #include "dri.h" + #endif + ++#ifndef DEFAULT_DPI ++#define DEFAULT_DPI 96 ++#endif ++ + /* + * LookupWindow was removed with video abi 11. + */ +@@ -7344,7 +7347,11 @@ SISUnmapMem(ScrnInfoPtr pScrn) + if(pSiSEnt->MapCountIOBase) { + pSiSEnt->MapCountIOBase--; + if((pSiSEnt->MapCountIOBase == 0) || (pSiSEnt->forceUnmapIOBase)) { ++#ifndef XSERVER_LIBPCIACCESS + xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pSiSEnt->IOBase, (pSiS->mmioSize * 1024)); ++#else ++ pci_device_unmap_range(pSiS->PciInfo, pSiSEnt->IOBase, (pSiS->mmioSize * 1024)); ++#endif + pSiSEnt->IOBase = NULL; + pSiSEnt->MapCountIOBase = 0; + pSiSEnt->forceUnmapIOBase = FALSE; +@@ -7355,7 +7362,11 @@ SISUnmapMem(ScrnInfoPtr pScrn) + if(pSiSEnt->MapCountIOBaseDense) { + pSiSEnt->MapCountIOBaseDense--; + if((pSiSEnt->MapCountIOBaseDense == 0) || (pSiSEnt->forceUnmapIOBaseDense)) { ++#ifndef XSERVER_LIBPCIACCESS + xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pSiSEnt->IOBaseDense, (pSiS->mmioSize * 1024)); ++#else ++ pci_device_unmap_range(pSiS->PciInfo, (pointer)pSiSEnt->IOBaseDense, (pSiS->mmioSize * 1024)); ++#endif + pSiSEnt->IOBaseDense = NULL; + pSiSEnt->MapCountIOBaseDense = 0; + pSiSEnt->forceUnmapIOBaseDense = FALSE; +@@ -7366,7 +7377,11 @@ SISUnmapMem(ScrnInfoPtr pScrn) + if(pSiSEnt->MapCountFbBase) { + pSiSEnt->MapCountFbBase--; + if((pSiSEnt->MapCountFbBase == 0) || (pSiSEnt->forceUnmapFbBase)) { ++#ifndef XSERVER_LIBPCIACCESS + xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pSiSEnt->RealFbBase, pSiS->FbMapSize); ++#else ++ pci_device_unmap_range(pSiS->PciInfo, (pointer)pSiSEnt->RealFbBase, pSiS->FbMapSize); ++#endif + pSiSEnt->FbBase = pSiSEnt->RealFbBase = NULL; + pSiSEnt->MapCountFbBase = 0; + pSiSEnt->forceUnmapFbBase = FALSE; +@@ -7376,13 +7391,25 @@ SISUnmapMem(ScrnInfoPtr pScrn) + } + } else { + #endif ++#ifndef XSERVER_LIBPCIACCESS + xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pSiS->IOBase, (pSiS->mmioSize * 1024)); ++#else ++ pci_device_unmap_range(pSiS->PciInfo, (pointer)pSiS->IOBase, (pSiS->mmioSize * 1024)); ++#endif + pSiS->IOBase = NULL; + #ifdef __alpha__ ++#ifndef XSERVER_LIBPCIACCESS + xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pSiS->IOBaseDense, (pSiS->mmioSize * 1024)); ++#else ++ pci_device_unmap_range(pSiS->PciInfo, (pointer)pSiS->IOBaseDense, (pSiS->mmioSize * 1024)); ++#endif + pSiS->IOBaseDense = NULL; + #endif ++#ifndef XSERVER_LIBPCIACCESS + xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pSiS->RealFbBase, pSiS->FbMapSize); ++#else ++ p
[packages/xorg-driver-video-sis] - fix errors caused by -format-security gcc option
commit 19ae85032ab327c20836fdc5035752b1f01c5eb2 Author: Jan Rękorajski Date: Sun Apr 7 21:46:06 2013 +0200 - fix errors caused by -format-security gcc option format-security.patch | 47 +++ 1 file changed, 47 insertions(+) --- diff --git a/format-security.patch b/format-security.patch new file mode 100644 index 000..45369c5 --- /dev/null +++ b/format-security.patch @@ -0,0 +1,47 @@ +--- xf86-video-sis-0.10.7/src/sis_driver.c.orig2013-04-07 21:43:38.806080625 +0200 xf86-video-sis-0.10.7/src/sis_driver.c 2013-04-07 21:45:02.936957482 +0200 +@@ -426,17 +426,16 @@ + SISErrorLog(ScrnInfoPtr pScrn, const char *format, ...) + { + va_list ap; +-static const char *str = "**\n"; + + va_start(ap, format); +-xf86DrvMsg(pScrn->scrnIndex, X_ERROR, str); ++xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "**\n"); + xf86DrvMsg(pScrn->scrnIndex, X_ERROR, + " ERROR:\n"); + xf86VDrvMsgVerb(pScrn->scrnIndex, X_ERROR, 1, format, ap); + va_end(ap); + xf86DrvMsg(pScrn->scrnIndex, X_ERROR, + " END OF MESSAGE\n"); +-xf86DrvMsg(pScrn->scrnIndex, X_ERROR, str); ++xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "**\n"); + } + + static void +@@ -1785,7 +1784,6 @@ + DisplayModePtr currentMode, firstMode; + Bool infochanged = FALSE; + Bool usenonrect = pSiS->NonRect; +-const char *rectxine = "\t... setting up rectangular Xinerama layout\n"; + + pSiS->MBXNR1XMAX = pSiS->MBXNR1YMAX = pSiS->MBXNR2XMAX = pSiS->MBXNR2YMAX = 65536; + pSiS->HaveNonRect = pSiS->HaveOffsRegions = FALSE; +@@ -1914,14 +1912,14 @@ +if(infochanged && !usenonrect) { + xf86DrvMsg(pScrn1->scrnIndex, X_INFO, + "Virtual screen size does not match maximum display modes...\n"); +-xf86DrvMsg(pScrn1->scrnIndex, X_INFO, rectxine); ++xf86DrvMsg(pScrn1->scrnIndex, X_INFO, "\t... setting up rectangular Xinerama layout\n"); + +} + } else if(infochanged && usenonrect) { +usenonrect = FALSE; +xf86DrvMsg(pScrn1->scrnIndex, X_INFO, + "Only clone modes available for this virtual screen size...\n"); +- xf86DrvMsg(pScrn1->scrnIndex, X_INFO, rectxine); ++ xf86DrvMsg(pScrn1->scrnIndex, X_INFO, "\t... setting up rectangular Xinerama layout\n"); + } + + if(pSiS->maxCRT1_X1) {/* Means we have at least one non-clone mode */ gitweb: http://git.pld-linux.org/gitweb.cgi/packages/xorg-driver-video-sis.git/commitdiff/8264d520cd3a2b4f90170f216b134e6514dd5553 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/xorg-driver-video-s3] - fix building with xserver 1.14 - rel 4
commit 303b51ae1dc7239b55878c9f68e5df4774f1a4f6 Author: Jan Rękorajski Date: Sun Apr 7 21:42:48 2013 +0200 - fix building with xserver 1.14 - rel 4 mibstore.patch| 18 ++ xorg-driver-video-s3.spec | 4 +++- 2 files changed, 21 insertions(+), 1 deletion(-) --- diff --git a/xorg-driver-video-s3.spec b/xorg-driver-video-s3.spec index a2a3ebf..bc7bf1d 100644 --- a/xorg-driver-video-s3.spec +++ b/xorg-driver-video-s3.spec @@ -2,11 +2,12 @@ Summary: X.org video driver for old S3 video adapters Summary(pl.UTF-8): Sterownik obrazu X.org dla starych kart graficznych S3 Name: xorg-driver-video-s3 Version: 0.6.5 -Release: 3 +Release: 4 License: MIT Group: X11/Applications Source0: http://xorg.freedesktop.org/releases/individual/driver/xf86-video-s3-%{version}.tar.bz2 # Source0-md5: 37248d5c5a04d7f91c6f634cc592b304 +Patch0:mibstore.patch URL: http://xorg.freedesktop.org/ BuildRequires: autoconf >= 2.60 BuildRequires: automake @@ -56,6 +57,7 @@ układy: %prep %setup -q -n xf86-video-s3-%{version} +%patch0 -p1 %build %{__libtoolize} diff --git a/mibstore.patch b/mibstore.patch new file mode 100644 index 000..73e415b --- /dev/null +++ b/mibstore.patch @@ -0,0 +1,18 @@ +--- xf86-video-s3-0.6.5/src/s3_driver.c~ 2012-07-17 06:50:05.0 +0200 xf86-video-s3-0.6.5/src/s3_driver.c2013-04-07 21:41:50.108276860 +0200 +@@ -52,7 +52,6 @@ + #include "compiler.h" + #include "mipointer.h" + #include "micmap.h" +-#include "mibstore.h" + #include "fb.h" + #include "inputstr.h" + #include "shadowfb.h" +@@ -822,7 +821,6 @@ + fbPictureInit (pScreen, 0, 0); + S3DGAInit(pScreen); + +-miInitializeBackingStore(pScreen); + xf86SetBackingStore(pScreen); + + /* framebuffer manager setup */ gitweb: http://git.pld-linux.org/gitweb.cgi/packages/xorg-driver-video-s3.git/commitdiff/303b51ae1dc7239b55878c9f68e5df4774f1a4f6 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/xorg-driver-video-ark] - fix building with xserver 1.14 - rel 4
commit 27503eb93e488c8536a85663c229a1018e1d87fa Author: Jan Rękorajski Date: Sun Apr 7 21:40:26 2013 +0200 - fix building with xserver 1.14 - rel 4 mibstore.patch | 18 ++ xorg-driver-video-ark.spec | 4 +++- 2 files changed, 21 insertions(+), 1 deletion(-) --- diff --git a/xorg-driver-video-ark.spec b/xorg-driver-video-ark.spec index 919d226..c89b728 100644 --- a/xorg-driver-video-ark.spec +++ b/xorg-driver-video-ark.spec @@ -2,11 +2,12 @@ Summary: X.org video driver for ARK Logic video adapters Summary(pl.UTF-8): Sterownik obrazu X.org do kart graficznych ARK Logic Name: xorg-driver-video-ark Version: 0.7.5 -Release: 3 +Release: 4 License: MIT Group: X11/Applications Source0: http://xorg.freedesktop.org/releases/individual/driver/xf86-video-ark-%{version}.tar.bz2 # Source0-md5: 2e9809b5ae3f01a56be0d6e5441da03c +Patch0:mibstore.patch URL: http://xorg.freedesktop.org/ BuildRequires: autoconf >= 2.60 BuildRequires: automake @@ -35,6 +36,7 @@ Logic. %prep %setup -q -n xf86-video-ark-%{version} +%patch0 -p1 %build %{__libtoolize} diff --git a/mibstore.patch b/mibstore.patch new file mode 100644 index 000..0901946 --- /dev/null +++ b/mibstore.patch @@ -0,0 +1,18 @@ +--- xf86-video-ark-0.7.5/src/ark_driver.c~ 2012-07-17 06:51:36.0 +0200 xf86-video-ark-0.7.5/src/ark_driver.c 2013-04-07 21:39:42.166932236 +0200 +@@ -39,7 +39,6 @@ + #include "compiler.h" + #include "mipointer.h" + #include "micmap.h" +-#include "mibstore.h" + #include "fb.h" + #include "ark.h" + +@@ -538,7 +537,6 @@ + + fbPictureInit (pScreen, 0, 0); + +- miInitializeBackingStore(pScreen); + xf86SetBackingStore(pScreen); + + if (!pARK->NoAccel) { gitweb: http://git.pld-linux.org/gitweb.cgi/packages/xorg-driver-video-ark.git/commitdiff/27503eb93e488c8536a85663c229a1018e1d87fa ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/xorg-driver-input-mutouch] - fix building with latest automake - rel 6
commit 80554f45360ccde0f08498acab5a682e9d546b2f Author: Jan Rękorajski Date: Sun Apr 7 21:38:27 2013 +0200 - fix building with latest automake - rel 6 am.patch | 11 +++ xorg-driver-input-mutouch.spec | 4 +++- 2 files changed, 14 insertions(+), 1 deletion(-) --- diff --git a/xorg-driver-input-mutouch.spec b/xorg-driver-input-mutouch.spec index f07503a..f459072 100644 --- a/xorg-driver-input-mutouch.spec +++ b/xorg-driver-input-mutouch.spec @@ -2,11 +2,12 @@ Summary: X.org input driver for MicroTouch devices Summary(pl.UTF-8): Sterownik wejściowy X.org dla urządzeń MicroTouch Name: xorg-driver-input-mutouch Version: 1.3.0 -Release: 5 +Release: 6 License: MIT Group: X11/Applications Source0: http://xorg.freedesktop.org/releases/individual/driver/xf86-input-mutouch-%{version}.tar.bz2 # Source0-md5: d84374b3eecc2d7156f5b694e79f66ac +Patch0:am.patch URL: http://xorg.freedesktop.org/ BuildRequires: autoconf >= 2.57 BuildRequires: automake @@ -29,6 +30,7 @@ Sterownik wejściowy X.org dla urządzeń MicroTouch. %prep %setup -q -n xf86-input-mutouch-%{version} +%patch0 -p1 %build %{__libtoolize} diff --git a/am.patch b/am.patch new file mode 100644 index 000..34adbbd --- /dev/null +++ b/am.patch @@ -0,0 +1,11 @@ +--- xf86-input-mutouch-1.3.0/configure.ac~ 2011-06-28 03:31:46.0 +0200 xf86-input-mutouch-1.3.0/configure.ac 2013-04-07 21:37:46.179040596 +0200 +@@ -35,7 +35,7 @@ + DRIVER_NAME=mutouch + AC_SUBST([DRIVER_NAME]) + +-AM_CONFIG_HEADER([config.h]) ++AC_CONFIG_HEADERS([config.h]) + + # Checks for programs. + AC_DISABLE_STATIC gitweb: http://git.pld-linux.org/gitweb.cgi/packages/xorg-driver-input-mutouch.git/commitdiff/80554f45360ccde0f08498acab5a682e9d546b2f ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/xorg-driver-input-hyperpen] - fix building with latest automake - rel 6
commit 7cf1e837394c1571a5f4d40ee0b71f12d8454426 Author: Jan Rękorajski Date: Sun Apr 7 21:37:05 2013 +0200 - fix building with latest automake - rel 6 am.patch| 11 +++ xorg-driver-input-hyperpen.spec | 4 +++- 2 files changed, 14 insertions(+), 1 deletion(-) --- diff --git a/xorg-driver-input-hyperpen.spec b/xorg-driver-input-hyperpen.spec index 420f87c..774facb 100644 --- a/xorg-driver-input-hyperpen.spec +++ b/xorg-driver-input-hyperpen.spec @@ -2,11 +2,12 @@ Summary: X.org input driver for Aiptek HyperPen devices Summary(pl.UTF-8): Sterownik wejściowy X.org dla urządzeń Aiptek HyperPen Name: xorg-driver-input-hyperpen Version: 1.4.1 -Release: 5 +Release: 6 License: MIT Group: X11/Applications Source0: http://xorg.freedesktop.org/releases/individual/driver/xf86-input-hyperpen-%{version}.tar.bz2 # Source0-md5: 75dc36477a291f8c2f7c808ab78a400a +Patch0:am.patch URL: http://xorg.freedesktop.org/ BuildRequires: autoconf >= 2.57 BuildRequires: automake @@ -31,6 +32,7 @@ Aiptek HyperPen 6000. %prep %setup -q -n xf86-input-hyperpen-%{version} +%patch0 -p1 %build %{__libtoolize} diff --git a/am.patch b/am.patch new file mode 100644 index 000..19546ac --- /dev/null +++ b/am.patch @@ -0,0 +1,11 @@ +--- xf86-input-hyperpen-1.4.1/configure.ac~2011-07-05 03:42:36.0 +0200 xf86-input-hyperpen-1.4.1/configure.ac 2013-04-07 21:36:17.091429090 +0200 +@@ -35,7 +35,7 @@ + DRIVER_NAME=hyperpen + AC_SUBST([DRIVER_NAME]) + +-AM_CONFIG_HEADER([config.h]) ++AC_CONFIG_HEADERS([config.h]) + + # Checks for programs. + AC_DISABLE_STATIC gitweb: http://git.pld-linux.org/gitweb.cgi/packages/xorg-driver-input-hyperpen.git/commitdiff/7cf1e837394c1571a5f4d40ee0b71f12d8454426 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/xorg-driver-input-fpit] - fix building with latest automake - rel 6
commit bf6a8be2ca30d6fd9643e6635584b104462b46a9 Author: Jan Rękorajski Date: Sun Apr 7 21:35:25 2013 +0200 - fix building with latest automake - rel 6 am.patch| 11 +++ xorg-driver-input-fpit.spec | 4 +++- 2 files changed, 14 insertions(+), 1 deletion(-) --- diff --git a/xorg-driver-input-fpit.spec b/xorg-driver-input-fpit.spec index cbeea10..8e0c13f 100644 --- a/xorg-driver-input-fpit.spec +++ b/xorg-driver-input-fpit.spec @@ -2,11 +2,12 @@ Summary: X.org input driver for Fujitsu Stylistic Tablet PCs Summary(pl.UTF-8): Sterownik wejściowy X.org dla komputerów Fujitsu Stylistic Tablet Name: xorg-driver-input-fpit Version: 1.4.0 -Release: 5 +Release: 6 License: MIT Group: X11/Applications Source0: http://xorg.freedesktop.org/releases/individual/driver/xf86-input-fpit-%{version}.tar.bz2 # Source0-md5: 042c95fec145d8b57ca62714131ff3f1 +Patch0:am.patch URL: http://xorg.freedesktop.org/ BuildRequires: autoconf >= 2.57 BuildRequires: automake @@ -35,6 +36,7 @@ FinePoint MP800 także będą działać z tym sterownikiem. %prep %setup -q -n xf86-input-fpit-%{version} +%patch0 -p1 %build %{__libtoolize} diff --git a/am.patch b/am.patch new file mode 100644 index 000..be605ff --- /dev/null +++ b/am.patch @@ -0,0 +1,11 @@ +--- xf86-input-fpit-1.4.0/configure.ac~2011-06-27 04:14:09.0 +0200 xf86-input-fpit-1.4.0/configure.ac 2013-04-07 21:34:34.026998273 +0200 +@@ -27,7 +27,7 @@ + xf86-input-fpit) + + AC_CONFIG_SRCDIR([Makefile.am]) +-AM_CONFIG_HEADER([config.h]) ++AC_CONFIG_HEADERS([config.h]) + AC_CONFIG_AUX_DIR(.) + + # Initialize Automake gitweb: http://git.pld-linux.org/gitweb.cgi/packages/xorg-driver-input-fpit.git/commitdiff/bf6a8be2ca30d6fd9643e6635584b104462b46a9 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/xorg-driver-input-elographics] - fix building with latest automake - rel 4
commit c35edb15ddc0e2d68458b547576476eb707ca7f4 Author: Jan Rękorajski Date: Sun Apr 7 21:33:45 2013 +0200 - fix building with latest automake - rel 4 am.patch | 11 +++ xorg-driver-input-elographics.spec | 4 +++- 2 files changed, 14 insertions(+), 1 deletion(-) --- diff --git a/xorg-driver-input-elographics.spec b/xorg-driver-input-elographics.spec index 3bea8ce..018d487 100644 --- a/xorg-driver-input-elographics.spec +++ b/xorg-driver-input-elographics.spec @@ -2,11 +2,12 @@ Summary: X.org input driver for Elographics touchscreen devices Summary(pl.UTF-8): Sterownik wejściowy X.org dla ekranów dotykowych Elographics Name: xorg-driver-input-elographics Version: 1.4.1 -Release: 3 +Release: 4 License: MIT Group: X11/Applications Source0: http://xorg.freedesktop.org/releases/individual/driver/xf86-input-elographics-%{version}.tar.bz2 # Source0-md5: b326f94647f4e81004aa15d74a14 +Patch0:am.patch URL: http://xorg.freedesktop.org/ BuildRequires: autoconf >= 2.57 BuildRequires: automake @@ -33,6 +34,7 @@ kompatybilne są obsługiwane bez niektórych możliwości. %prep %setup -q -n xf86-input-elographics-%{version} +%patch0 -p1 %build %{__libtoolize} diff --git a/am.patch b/am.patch new file mode 100644 index 000..ec2b943 --- /dev/null +++ b/am.patch @@ -0,0 +1,11 @@ +--- xf86-input-elographics-1.4.1/configure.ac~ 2012-08-20 03:11:22.0 +0200 xf86-input-elographics-1.4.1/configure.ac 2013-04-07 21:32:35.289061214 +0200 +@@ -35,7 +35,7 @@ + # Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG + m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])]) + XORG_MACROS_VERSION(1.2) +-AM_CONFIG_HEADER([config.h]) ++AC_CONFIG_HEADERS([config.h]) + + # Checks for programs. + AC_DISABLE_STATIC gitweb: http://git.pld-linux.org/gitweb.cgi/packages/xorg-driver-input-elographics.git/commitdiff/c35edb15ddc0e2d68458b547576476eb707ca7f4 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/xorg-driver-video-v4l] - fix building with latest automake
commit db5a8c09650a0d52a1cbc1436de3053f74a755d9 Author: Jan Rękorajski Date: Sun Apr 7 21:30:50 2013 +0200 - fix building with latest automake am.patch | 11 +++ 1 file changed, 11 insertions(+) --- diff --git a/am.patch b/am.patch new file mode 100644 index 000..b4797a7 --- /dev/null +++ b/am.patch @@ -0,0 +1,11 @@ +--- xf86-video-v4l-0.2.0/configure.ac~ 2008-03-19 21:42:34.0 +0100 xf86-video-v4l-0.2.0/configure.ac 2013-04-07 21:30:04.200813090 +0200 +@@ -27,7 +27,7 @@ + xf86-video-v4l) + + AC_CONFIG_SRCDIR([Makefile.am]) +-AM_CONFIG_HEADER([config.h]) ++AC_CONFIG_HEADERS([config.h]) + AC_CONFIG_AUX_DIR(.) + + AM_INIT_AUTOMAKE([dist-bzip2]) gitweb: http://git.pld-linux.org/gitweb.cgi/packages/xorg-driver-video-v4l.git/commitdiff/99af6b9501022d21537afe047292dc80f7b7d52f ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/xorg-driver-video-trident] - fix building with xserver 1.14 - rel 3
commit 3ea3ac03a989400e724e456233dc6288542419b8 Author: Jan Rękorajski Date: Sun Apr 7 21:26:58 2013 +0200 - fix building with xserver 1.14 - rel 3 fix-loading-the-driver-without-XAA.patch | 38 mibstore.patch | 33 +++ xorg-driver-video-trident.spec | 6 - 3 files changed, 76 insertions(+), 1 deletion(-) --- diff --git a/xorg-driver-video-trident.spec b/xorg-driver-video-trident.spec index e5f157e..b7ed460 100644 --- a/xorg-driver-video-trident.spec +++ b/xorg-driver-video-trident.spec @@ -2,11 +2,13 @@ Summary: X.org video driver for Trident video adapters Summary(pl.UTF-8): Sterownik obrazu X.org dla kart graficznych Trident Name: xorg-driver-video-trident Version: 1.3.6 -Release: 2 +Release: 3 License: MIT Group: X11/Applications Source0: http://xorg.freedesktop.org/releases/individual/driver/xf86-video-trident-%{version}.tar.bz2 # Source0-md5: 86fed7e2b2876cb349f958cdd8319118 +Patch0:mibstore.patch +Patch1:fix-loading-the-driver-without-XAA.patch URL: http://xorg.freedesktop.org/ BuildRequires: autoconf >= 2.60 BuildRequires: automake @@ -56,6 +58,8 @@ PCI, AGP i ISA oparte na następujących układach: %prep %setup -q -n xf86-video-trident-%{version} +%patch0 -p1 +%patch1 -p1 %build %{__libtoolize} diff --git a/fix-loading-the-driver-without-XAA.patch b/fix-loading-the-driver-without-XAA.patch new file mode 100644 index 000..4720ff9 --- /dev/null +++ b/fix-loading-the-driver-without-XAA.patch @@ -0,0 +1,38 @@ +From 48c15909691e28ad2c188a2978b1c8ef3d9d8760 Mon Sep 17 00:00:00 2001 +From: Timo Aaltonen +Date: Wed, 26 Sep 2012 11:01:26 +0300 +Subject: [PATCH 2/2] Fix loading the driver without XAA + +--- + src/trident_dga.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/trident_dga.c b/src/trident_dga.c +index 0263aa7..c4b5b9a 100644 +--- a/src/trident_dga.c b/src/trident_dga.c +@@ -37,10 +37,10 @@ + static Bool TRIDENT_OpenFramebuffer(ScrnInfoPtr, char **, unsigned char **, + int *, int *, int *); + static Bool TRIDENT_SetMode(ScrnInfoPtr, DGAModePtr); +-static void TRIDENT_Sync(ScrnInfoPtr); + static int TRIDENT_GetViewport(ScrnInfoPtr); + static void TRIDENT_SetViewport(ScrnInfoPtr, int, int, int); + #ifdef HAVE_XAA_H ++static void TRIDENT_Sync(ScrnInfoPtr); + static void TRIDENT_FillRect(ScrnInfoPtr, int, int, int, int, unsigned long); + static void TRIDENT_BlitRect(ScrnInfoPtr, int, int, int, int, int, int); + #if 0 +@@ -56,8 +56,8 @@ DGAFunctionRec TRIDENTDGAFuncs = { +TRIDENT_SetMode, +TRIDENT_SetViewport, +TRIDENT_GetViewport, +- TRIDENT_Sync, + #ifdef HAVE_XAA_H ++ TRIDENT_Sync, +TRIDENT_FillRect, +TRIDENT_BlitRect, + #if 0 +-- +1.8.0.2 + diff --git a/mibstore.patch b/mibstore.patch new file mode 100644 index 000..e8d43d7 --- /dev/null +++ b/mibstore.patch @@ -0,0 +1,33 @@ +From 30787294c837aefa8820b6f76f00fe30d4e54181 Mon Sep 17 00:00:00 2001 +From: Adam Jackson +Date: Tue, 25 Sep 2012 08:55:01 -0400 +Subject: [PATCH 1/2] Remove mibstore.h + +Signed-off-by: Adam Jackson +--- + src/trident_driver.c | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/src/trident_driver.c b/src/trident_driver.c +index dc12b76..408c870 100644 +--- a/src/trident_driver.c b/src/trident_driver.c +@@ -56,7 +56,6 @@ + + #include "mipointer.h" + +-#include "mibstore.h" + #include "shadow.h" + #include "trident.h" + #include "trident_regs.h" +@@ -3037,7 +3036,6 @@ TRIDENTScreenInit(SCREEN_INIT_ARGS_DECL) + TridentAccelInit(pScreen); + } + +-miInitializeBackingStore(pScreen); + xf86SetBackingStore(pScreen); + + /* Initialise cursor functions */ +-- +1.8.0.2 + gitweb: http://git.pld-linux.org/gitweb.cgi/packages/xorg-driver-video-trident.git/commitdiff/3ea3ac03a989400e724e456233dc6288542419b8 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/xorg-driver-video-s3virge] - release 3 (by relup.sh)
commit 9f61d9f096ce2e82adf1e513602f985baefa5a58 Author: Jan Rękorajski Date: Sun Apr 7 21:24:03 2013 +0200 - release 3 (by relup.sh) xorg-driver-video-s3virge.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/xorg-driver-video-s3virge.spec b/xorg-driver-video-s3virge.spec index ecda890..93a1382 100644 --- a/xorg-driver-video-s3virge.spec +++ b/xorg-driver-video-s3virge.spec @@ -2,7 +2,7 @@ Summary:X.org video driver for S3 ViRGE and Trio3D video chips Summary(pl.UTF-8): Sterownik obrazu X.org dla układów graficznych S3 ViRGE i Trio3D Name: xorg-driver-video-s3virge Version: 1.10.6 -Release: 2 +Release: 3 License: MIT Group: X11/Applications Source0: http://xorg.freedesktop.org/releases/individual/driver/xf86-video-s3virge-%{version}.tar.bz2 gitweb: http://git.pld-linux.org/gitweb.cgi/packages/xorg-driver-video-s3virge.git/commitdiff/9f61d9f096ce2e82adf1e513602f985baefa5a58 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/xorg-driver-video-mga] - release 3 (by relup.sh)
commit 5da61898404fd828b1c75c225e8a19ffb35946be Author: Jan Rękorajski Date: Sun Apr 7 21:23:26 2013 +0200 - release 3 (by relup.sh) xorg-driver-video-mga.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/xorg-driver-video-mga.spec b/xorg-driver-video-mga.spec index 733ac79..806816d 100644 --- a/xorg-driver-video-mga.spec +++ b/xorg-driver-video-mga.spec @@ -3,7 +3,7 @@ Summary(pl.UTF-8): Sterownik obrazu X.org dla kart graficznych Matrox Name: xorg-driver-video-mga # NOTE: 1.9.100 is older than 1.6.2 Version: 1.6.2 -Release: 2 +Release: 3 Epoch: 1 License: MIT Group: X11/Applications gitweb: http://git.pld-linux.org/gitweb.cgi/packages/xorg-driver-video-mga.git/commitdiff/5da61898404fd828b1c75c225e8a19ffb35946be ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/xorg-driver-video-sisusb] - fix building with xserver 1.14 - rel 3
commit 02c5d754b28e3600ca4dd724bd40fa1f62b2f846 Author: Jan Rękorajski Date: Sun Apr 7 21:21:31 2013 +0200 - fix building with xserver 1.14 - rel 3 mibstore.patch| 33 + xorg-driver-video-sisusb.spec | 4 +++- 2 files changed, 36 insertions(+), 1 deletion(-) --- diff --git a/xorg-driver-video-sisusb.spec b/xorg-driver-video-sisusb.spec index 363f164..26945ca 100644 --- a/xorg-driver-video-sisusb.spec +++ b/xorg-driver-video-sisusb.spec @@ -2,11 +2,12 @@ Summary: X.org video driver for SiS video chips connected via a Net2280-based US Summary(pl.UTF-8): Sterownik obrazu X.org dla układów SiS podłączonych poprzez przejściówkę USB Net2280 Name: xorg-driver-video-sisusb Version: 0.9.6 -Release: 2 +Release: 3 License: MIT Group: X11/Applications Source0: http://xorg.freedesktop.org/releases/individual/driver/xf86-video-sisusb-%{version}.tar.bz2 # Source0-md5: 8ebcd2bc5a87a3f1362fa76616a83e57 +Patch0:mibstore.patch URL: http://xorg.freedesktop.org/ BuildRequires: autoconf >= 2.60 BuildRequires: automake @@ -45,6 +46,7 @@ Uwaga: wymaga sterownika jądra Linuksa (załączonego w wersji Linuksa %prep %setup -q -n xf86-video-sisusb-%{version} +%patch0 -p1 %build %{__libtoolize} diff --git a/mibstore.patch b/mibstore.patch new file mode 100644 index 000..bf1e4b7 --- /dev/null +++ b/mibstore.patch @@ -0,0 +1,33 @@ +From 293d0902705c272b83432a955fb6a3c96dd6cea7 Mon Sep 17 00:00:00 2001 +From: Adam Jackson +Date: Tue, 25 Sep 2012 08:54:52 -0400 +Subject: [PATCH] Remove mibstore.h + +Signed-off-by: Adam Jackson +--- + src/sisusb_driver.c | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/src/sisusb_driver.c b/src/sisusb_driver.c +index 539b9f1..0fdc8e9 100644 +--- a/src/sisusb_driver.c b/src/sisusb_driver.c +@@ -39,7 +39,6 @@ + #include "shadowfb.h" + #include "micmap.h" + #include "mipointer.h" +-#include "mibstore.h" + + #include "sisusb_regs.h" + #include "sisusb_dac.h" +@@ -1907,7 +1906,6 @@ SISUSBScreenInit(SCREEN_INIT_ARGS_DECL) + /* Initialize the accelerators */ + SiSUSBAccelInit(pScreen); + +-miInitializeBackingStore(pScreen); + xf86SetBackingStore(pScreen); + + /* NO SilkenMouse. Never. Ever. */ +-- +1.8.0.2 + gitweb: http://git.pld-linux.org/gitweb.cgi/packages/xorg-driver-video-sisusb.git/commitdiff/02c5d754b28e3600ca4dd724bd40fa1f62b2f846 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/xorg-driver-video-siliconmotion] - fix building with xserver 1.14 - rel 3
commit 12251ac23783b62b7ff1a6d555bc0e8bb6610d65 Author: Jan Rękorajski Date: Sun Apr 7 21:18:12 2013 +0200 - fix building with xserver 1.14 - rel 3 mibstore.patch | 26 ++ xorg-driver-video-siliconmotion.spec | 4 +++- 2 files changed, 29 insertions(+), 1 deletion(-) --- diff --git a/xorg-driver-video-siliconmotion.spec b/xorg-driver-video-siliconmotion.spec index 1b68110..7c20fa4 100644 --- a/xorg-driver-video-siliconmotion.spec +++ b/xorg-driver-video-siliconmotion.spec @@ -2,11 +2,12 @@ Summary: X.org video driver for Silicon Motion video chips Summary(pl.UTF-8): Sterownik obrazu X.org dla układów graficznych Silicon Motion Name: xorg-driver-video-siliconmotion Version: 1.7.7 -Release: 2 +Release: 3 License: MIT Group: X11/Applications Source0: http://xorg.freedesktop.org/releases/individual/driver/xf86-video-siliconmotion-%{version}.tar.bz2 # Source0-md5: dc139f8ea17c40fb7bcc89181e9dbfb3 +Patch0:mibstore.patch URL: http://xorg.freedesktop.org/ BuildRequires: autoconf >= 2.60 BuildRequires: automake @@ -54,6 +55,7 @@ Obsługuje karty PCI i AGP oparte na następujących układach: %prep %setup -q -n xf86-video-siliconmotion-%{version} +%patch0 -p1 %build %{__libtoolize} diff --git a/mibstore.patch b/mibstore.patch new file mode 100644 index 000..32e38fc --- /dev/null +++ b/mibstore.patch @@ -0,0 +1,26 @@ +From f19d7e463c30f1364e82e8c9f87b8a8407d53680 Mon Sep 17 00:00:00 2001 +From: Adam Jackson +Date: Wed, 9 Jan 2013 22:59:39 -0500 +Subject: [PATCH] Remove miInitializeBackingStore() + +Signed-off-by: Adam Jackson +--- + src/smi_driver.c | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/src/smi_driver.c b/src/smi_driver.c +index 4794571..134db79 100644 +--- a/src/smi_driver.c b/src/smi_driver.c +@@ -1750,8 +1750,6 @@ SMI_ScreenInit(SCREEN_INIT_ARGS_DECL) + "Done writing mode. Register dump:\n"); + SMI_PrintRegs(pScrn); + +-miInitializeBackingStore(pScreen); +- + #ifdef HAVE_XMODES + xf86DiDGAInit(pScreen, (unsigned long)(pSmi->FBBase + pScrn->fbOffset)); + #endif +-- +1.8.0.2 + gitweb: http://git.pld-linux.org/gitweb.cgi/packages/xorg-driver-video-siliconmotion.git/commitdiff/12251ac23783b62b7ff1a6d555bc0e8bb6610d65 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/xorg-driver-video-rendition] - fix building with xserver 1.14 - rel 3
commit 04350cf9138e34758e740c7b1319ebfbe9d19a92 Author: Jan Rękorajski Date: Sun Apr 7 21:16:13 2013 +0200 - fix building with xserver 1.14 - rel 3 mibstore.patch | 40 xorg-driver-video-rendition.spec | 4 +++- 2 files changed, 43 insertions(+), 1 deletion(-) --- diff --git a/xorg-driver-video-rendition.spec b/xorg-driver-video-rendition.spec index c8e2d97..d764785 100644 --- a/xorg-driver-video-rendition.spec +++ b/xorg-driver-video-rendition.spec @@ -2,11 +2,12 @@ Summary: X.org video driver for Rendition/Micron video chips Summary(pl.UTF-8): Sterownik obrazu X.org dla układów graficznych Rendition/Micron Name: xorg-driver-video-rendition Version: 4.2.5 -Release: 2 +Release: 3 License: MIT Group: X11/Applications Source0: http://xorg.freedesktop.org/releases/individual/driver/xf86-video-rendition-%{version}.tar.bz2 # Source0-md5: 6db439a0f89e6f00c4f5175510d8e0c1 +Patch0:mibstore.patch URL: http://xorg.freedesktop.org/ BuildRequires: autoconf >= 2.60 BuildRequires: automake @@ -42,6 +43,7 @@ V1000, Verite V2100, Verite V2200. %prep %setup -q -n xf86-video-rendition-%{version} +%patch0 -p1 %build %{__libtoolize} diff --git a/mibstore.patch b/mibstore.patch new file mode 100644 index 000..9ada951 --- /dev/null +++ b/mibstore.patch @@ -0,0 +1,40 @@ +From 3a3ee1c45e54a808947cc26ca11f0a5299571053 Mon Sep 17 00:00:00 2001 +From: Adam Jackson +Date: Tue, 25 Sep 2012 08:54:50 -0400 +Subject: [PATCH] Remove mibstore.h + +Signed-off-by: Adam Jackson +--- + src/rendition.c | 1 - + src/rendition.h | 3 --- + 2 files changed, 4 deletions(-) + +diff --git a/src/rendition.c b/src/rendition.c +index 7c74f76..888bb4a 100644 +--- a/src/rendition.c b/src/rendition.c +@@ -1173,7 +1173,6 @@ renditionScreenInit(SCREEN_INIT_ARGS_DECL) + fbPictureInit (pScreen, 0, 0); + + xf86SetBlackWhitePixels(pScreen); +-miInitializeBackingStore(pScreen); + + /*/ + /* The actual setup of the driver-specific code */ +diff --git a/src/rendition.h b/src/rendition.h +index f7f13d4..297117e 100644 +--- a/src/rendition.h b/src/rendition.h +@@ -28,9 +28,6 @@ + /* All drivers initialising the SW cursor need this */ + #include "mipointer.h" + +-/* All drivers implementing backing store need this */ +-#include "mibstore.h" +- + /* All drivers using the mi colormap manipulation need this */ + #include "micmap.h" + +-- +1.8.0.2 + gitweb: http://git.pld-linux.org/gitweb.cgi/packages/xorg-driver-video-rendition.git/commitdiff/04350cf9138e34758e740c7b1319ebfbe9d19a92 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/xorg-driver-video-i740] - fix building with xserver 1.14 - rel 3
commit 5481b6f2e1e90ab066cfc87e688c5743eca9709e Author: Jan Rękorajski Date: Sun Apr 7 21:13:17 2013 +0200 - fix building with xserver 1.14 - rel 3 mibstore.patch | 36 xorg-driver-video-i740.spec | 4 +++- 2 files changed, 39 insertions(+), 1 deletion(-) --- diff --git a/xorg-driver-video-i740.spec b/xorg-driver-video-i740.spec index 9bfcdc0..7287054 100644 --- a/xorg-driver-video-i740.spec +++ b/xorg-driver-video-i740.spec @@ -2,11 +2,12 @@ Summary: X.org video driver for Intel i740 video adapters Summary(pl.UTF-8): Sterownik obrazu X.org dla kart graficznych Intel i740 Name: xorg-driver-video-i740 Version: 1.3.4 -Release: 2 +Release: 3 License: MIT Group: X11/Applications Source0: http://xorg.freedesktop.org/releases/individual/driver/xf86-video-i740-%{version}.tar.bz2 # Source0-md5: 11c0aa1036ba8c203a03d1f00bbec195 +Patch0:mibstore.patch URL: http://xorg.freedesktop.org/ BuildRequires: autoconf >= 2.60 BuildRequires: automake @@ -38,6 +39,7 @@ i740. %prep %setup -q -n xf86-video-i740-%{version} +%patch0 -p1 %build %{__libtoolize} diff --git a/mibstore.patch b/mibstore.patch new file mode 100644 index 000..0ce9a03 --- /dev/null +++ b/mibstore.patch @@ -0,0 +1,36 @@ +From 084aa23643bf4245c917e3d672576bc9e5717017 Mon Sep 17 00:00:00 2001 +From: Adam Jackson +Date: Wed, 9 Jan 2013 22:21:52 -0500 +Subject: [PATCH] Remove mibstore.h + +Signed-off-by: Adam Jackson +--- + src/i740_driver.c | 5 - + 1 file changed, 5 deletions(-) + +diff --git a/src/i740_driver.c b/src/i740_driver.c +index 1c82198..7c1051d 100644 +--- a/src/i740_driver.c b/src/i740_driver.c +@@ -63,10 +63,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + + #include "compiler.h" + +-/* Drivers using the mi implementation of backing store need: */ +- +-#include "mibstore.h" +- + /* All drivers using the vgahw module need this */ + /* This driver needs to be modified to not use vgaHW for multihead operation */ + #include "vgaHW.h" +@@ -1558,7 +1554,6 @@ I740ScreenInit(SCREEN_INIT_ARGS_DECL) { + } + } + +- miInitializeBackingStore(pScreen); + xf86SetBackingStore(pScreen); + xf86SetSilkenMouse(pScreen); + +-- +1.8.0.2 + gitweb: http://git.pld-linux.org/gitweb.cgi/packages/xorg-driver-video-i740.git/commitdiff/5481b6f2e1e90ab066cfc87e688c5743eca9709e ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/nodejs] install extra files for node-gyp; expand license names
commit d5764a432cdca50083a95c1138825e3ecb4f103d Author: Elan Ruusamäe Date: Sun Apr 7 22:12:17 2013 +0300 install extra files for node-gyp; expand license names nodejs.spec | 12 ++-- 1 file changed, 10 insertions(+), 2 deletions(-) --- diff --git a/nodejs.spec b/nodejs.spec index 171ed04..e75c332 100644 --- a/nodejs.spec +++ b/nodejs.spec @@ -1,8 +1,8 @@ Summary: Asynchronous JavaScript Engine Name: nodejs Version: 0.10.3 -Release: 1 -License: BSD and MIT and ASL 2.0 and GPLv3 +Release: 2 +License: BSD and MIT and Apache v2.0 and GPL v3 Group: Development/Languages Source0: http://nodejs.org/dist/v%{version}/node-v%{version}.tar.gz # Source0-md5: 4daca92618515708a4631e98a8e8c779 @@ -108,6 +108,13 @@ echo '.so man1/node.1' > $RPM_BUILD_ROOT%{_mandir}/man1/nodejs.1 install -d $RPM_BUILD_ROOT%{_includedir}/node cp -p src/*.h $RPM_BUILD_ROOT%{_includedir}/node +cp -p deps/uv/include/uv.h $RPM_BUILD_ROOT%{_includedir}/node +cp -a deps/uv/include/uv-private $RPM_BUILD_ROOT%{_includedir}/node + +# install for node-gyp +install -d $RPM_BUILD_ROOT%{_usrsrc}/%{name} +cp -p common.gypi $RPM_BUILD_ROOT%{_usrsrc}/%{name} +ln -s %{_includedir}/node $RPM_BUILD_ROOT%{_usrsrc}/%{name}/src # for compat of fedora derivered scripts (shebangs) ln -s node $RPM_BUILD_ROOT%{_bindir}/nodejs @@ -164,6 +171,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libnode.so %{_includedir}/node %{_pkgconfigdir}/nodejs.pc +%{_usrsrc}/%{name} %files doc %defattr(644,root,root,755) gitweb: http://git.pld-linux.org/gitweb.cgi/packages/nodejs.git/commitdiff/d5764a432cdca50083a95c1138825e3ecb4f103d ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/xorg-driver-video-glint] - fix building with xserver 1.14 - rel 3
commit 387c59dd568b03a973496056eb0ddc012fd87efd Author: Jan Rękorajski Date: Sun Apr 7 21:10:51 2013 +0200 - fix building with xserver 1.14 - rel 3 mibstore.patch | 34 ++ xorg-driver-video-glint.spec | 4 +++- 2 files changed, 37 insertions(+), 1 deletion(-) --- diff --git a/xorg-driver-video-glint.spec b/xorg-driver-video-glint.spec index 0af3ac8..5c4a0ca 100644 --- a/xorg-driver-video-glint.spec +++ b/xorg-driver-video-glint.spec @@ -2,11 +2,12 @@ Summary: X.org video driver for GLINT/Permedia video chips Summary(pl.UTF-8): Sterownik obrazu X.org dla układów graficznych GLINT/Permedia Name: xorg-driver-video-glint Version: 1.2.8 -Release: 2 +Release: 3 License: MIT Group: X11/Applications Source0: http://xorg.freedesktop.org/releases/individual/driver/xf86-video-glint-%{version}.tar.bz2 # Source0-md5: 775579c67dc55ff4909de3638bafd19f +Patch0:mibstore.patch URL: http://xorg.freedesktop.org/ BuildRequires: autoconf >= 2.60 BuildRequires: automake @@ -41,6 +42,7 @@ Permedia 3, R3, R4) oraz Texas Instruments (Permedia, Permedia 2). %prep %setup -q -n xf86-video-glint-%{version} +%patch0 -p1 %build %{__libtoolize} diff --git a/mibstore.patch b/mibstore.patch new file mode 100644 index 000..157b9a6 --- /dev/null +++ b/mibstore.patch @@ -0,0 +1,34 @@ +From 073d5b0b392781bf4a6aa7f9e2dbe2ae51caed2c Mon Sep 17 00:00:00 2001 +From: Adam Jackson +Date: Tue, 25 Sep 2012 08:54:38 -0400 +Subject: [PATCH] Remove mibstore.h + +Signed-off-by: Adam Jackson +--- + src/glint_driver.c | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/src/glint_driver.c b/src/glint_driver.c +index b6d20a9..aa78516 100644 +--- a/src/glint_driver.c b/src/glint_driver.c +@@ -52,8 +52,6 @@ + #include "compiler.h" + #include "mipointer.h" + +-#include "mibstore.h" +- + #include "pm3_regs.h" + #include "glint_regs.h" + #include "IBM.h" +@@ -2904,7 +2902,6 @@ GLINTScreenInit(SCREEN_INIT_ARGS_DECL) + } + } + +-miInitializeBackingStore(pScreen); + xf86SetBackingStore(pScreen); + xf86SetSilkenMouse(pScreen); + +-- +1.8.0.2 + gitweb: http://git.pld-linux.org/gitweb.cgi/packages/xorg-driver-video-glint.git/commitdiff/387c59dd568b03a973496056eb0ddc012fd87efd ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: evas: evas-1.7.6.1.tar.bz2
Files fetched: 1 STORED: http://download.enlightenment.org/releases/evas-1.7.6.1.tar.bz2 65d40c3fd08a815efe50cf77c40b5c64 evas-1.7.6.1.tar.bz2 Size: 9408947 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/evas] - updated to 1.7.6.1 - updated wayland patch - added fribidi patch
commit 599b9aa6081dd77e643791ec5fc802002d487671 Author: Jakub Bogusz Date: Sun Apr 7 20:56:10 2013 +0200 - updated to 1.7.6.1 - updated wayland patch - added fribidi patch evas-fribidi.patch | 10 ++ evas-wayland.patch | 9 - evas.spec | 6 -- 3 files changed, 14 insertions(+), 11 deletions(-) --- diff --git a/evas.spec b/evas.spec index c5b6ae5..d784ac1 100644 --- a/evas.spec +++ b/evas.spec @@ -37,13 +37,14 @@ Summary: Multi-platform Canvas Library Summary(pl.UTF-8): Wieloplatformowa biblioteka do rysowania Name: evas -Version: 1.7.5 +Version: 1.7.6.1 Release: 1 License: BSD Group: Libraries Source0: http://download.enlightenment.org/releases/%{name}-%{version}.tar.bz2 -# Source0-md5: 2c965b836128a839292161d4ca89380d +# Source0-md5: 65d40c3fd08a815efe50cf77c40b5c64 Patch0:%{name}-wayland.patch +Patch1:%{name}-fribidi.patch URL: http://trac.enlightenment.org/e/wiki/Evas %{?with_directfb:BuildRequires:DirectFB-devel >= 0.9.16} BuildRequires: Mesa-libGLU-devel @@ -484,6 +485,7 @@ Moduł zapisywania obrazów TIFF dla Evas. %prep %setup -q -n %{name}-%{version} %patch0 -p1 +%patch1 -p1 %build %{__libtoolize} diff --git a/evas-fribidi.patch b/evas-fribidi.patch new file mode 100644 index 000..73119a1 --- /dev/null +++ b/evas-fribidi.patch @@ -0,0 +1,10 @@ +--- evas-1.7.6.1/src/lib/engines/common_8/Makefile.am.orig 2012-11-23 17:35:06.0 +0100 evas-1.7.6.1/src/lib/engines/common_8/Makefile.am 2013-04-07 19:29:09.633616777 +0200 +@@ -6,6 +6,7 @@ + -I$(top_srcdir)/src/lib \ + -I$(top_srcdir)/src/lib/include \ + @FREETYPE_CFLAGS@ \ ++@FRIBIDI_CFLAGS@ \ + @PIXMAN_CFLAGS@ \ + @VALGRIND_CFLAGS@ \ + @EVAS_GENERAL_CFLAGS@ \ diff --git a/evas-wayland.patch b/evas-wayland.patch index c14a42d..db43e11 100644 --- a/evas-wayland.patch +++ b/evas-wayland.patch @@ -26,15 +26,6 @@ #include #include # endif -@@ -341,7 +341,7 @@ -/* If this is set: Force drawing with a particular filter */ -GLuint filter_prog; - --#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX) -+#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX) || defined (GLES_WAYLAND) - // FIXME: hack. expose egl display to gl core for egl image sec extn. -void *egldisp; - #endif @@ -633,7 +633,7 @@ extern void (*glsym_glProgramParameteri)(GLuint a, GLuint b, GLint d); extern void (*glsym_glReleaseShaderCompiler)(void); gitweb: http://git.pld-linux.org/gitweb.cgi/packages/evas.git/commitdiff/599b9aa6081dd77e643791ec5fc802002d487671 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: python3: Python-3.3.1.tar.xz
Files fetched: 1 STORED: http://www.python.org/ftp/python/3.3.1/Python-3.3.1.tar.xz 993232d9f4d9b4863cc1ec69a792e9cd Python-3.3.1.tar.xz Size: 11852964 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/python3] - started upgrade to ver. 3.3.1
commit fd3fc14e5ab0016e62d590c5eeaa3ab866dc1549 Author: wrobell Date: Sun Apr 7 19:46:45 2013 +0100 - started upgrade to ver. 3.3.1 python3-makefile-location.patch | 12 ++-- python3-no_cmdline_tests.patch | 28 ++-- python3.spec| 6 +++--- 3 files changed, 23 insertions(+), 23 deletions(-) --- diff --git a/python3.spec b/python3.spec index 61e2c0b..d8a8a12 100644 --- a/python3.spec +++ b/python3.spec @@ -33,13 +33,13 @@ Summary(ru.UTF-8): Язык программирования очень высо Summary(tr.UTF-8): X arayüzlü, yüksek düzeyli, kabuk yorumlayıcı dili Summary(uk.UTF-8): Мова програмування дуже високого рівня з X-інтерфейсом Name: python3 -Version: %{py_ver}.0 -Release: 1 +Version: %{py_ver}.1 +Release: 0.1 Epoch: 1 License: PSF Group: Applications Source0: http://www.python.org/ftp/python/%{version}/Python-%{version}.tar.xz -# Source0-md5: 2e7533b4009ac4adae62a7797a442e7a +# Source0-md5: 993232d9f4d9b4863cc1ec69a792e9cd Patch0:%{name}-pythonpath.patch Patch1:%{name}-ac_fixes.patch Patch2:%{name}-lib64.patch diff --git a/python3-makefile-location.patch b/python3-makefile-location.patch index be95bba..912e4cd 100644 --- a/python3-makefile-location.patch +++ b/python3-makefile-location.patch @@ -1,12 +1,12 @@ Python-3.2.3/Lib/distutils/sysconfig.py~ 2012-05-31 10:30:41.0 +0200 -+++ Python-3.2.3/Lib/distutils/sysconfig.py2012-05-31 10:31:01.624339294 +0200 -@@ -257,7 +257,7 @@ +diff -Nur Python-3.3.1.orig/Lib/distutils/sysconfig.py Python-3.3.1/Lib/distutils/sysconfig.py +--- Python-3.3.1.orig/Lib/distutils/sysconfig.py 2013-04-06 08:41:35.0 +0100 Python-3.3.1/Lib/distutils/sysconfig.py2013-04-07 19:45:29.409178359 +0100 +@@ -256,7 +256,7 @@ + """Return full pathname of installed Makefile from the Python build.""" if python_build: - return os.path.join(_sys_home or os.path.dirname(sys.executable), - "Makefile") + return os.path.join(_sys_home or project_base, "Makefile") -lib_dir = get_python_lib(plat_specific=0, standard_lib=1) +lib_dir = get_python_lib(plat_specific=1, standard_lib=1) config_file = 'config-{}{}'.format(get_python_version(), build_flags) return os.path.join(lib_dir, config_file, 'Makefile') - diff --git a/python3-no_cmdline_tests.patch b/python3-no_cmdline_tests.patch index fed9ed7..ad01727 100644 --- a/python3-no_cmdline_tests.patch +++ b/python3-no_cmdline_tests.patch @@ -1,7 +1,7 @@ -diff -dur Python-3.2.1.orig/Lib/test/regrtest.py Python-3.2.1/Lib/test/regrtest.py Python-3.2.1.orig/Lib/test/regrtest.py 2011-07-09 08:58:49.0 +0200 -+++ Python-3.2.1/Lib/test/regrtest.py 2011-07-15 15:21:06.0 +0200 -@@ -216,7 +216,7 @@ +diff -Nur Python-3.3.1.orig/Lib/test/regrtest.py Python-3.3.1/Lib/test/regrtest.py +--- Python-3.3.1.orig/Lib/test/regrtest.py 2013-04-06 08:41:41.0 +0100 Python-3.3.1/Lib/test/regrtest.py 2013-04-07 19:39:23.432490962 +0100 +@@ -243,7 +243,7 @@ from test import support @@ -10,9 +10,9 @@ diff -dur Python-3.2.1.orig/Lib/test/regrtest.py Python-3.2.1/Lib/test/regrtest. 'decimal', 'cpu', 'subprocess', 'urlfetch', 'gui') TEMPDIR = os.path.abspath(tempfile.gettempdir()) -diff -dur Python-3.2.1.orig/Lib/test/test_compileall.py Python-3.2.1/Lib/test/test_compileall.py Python-3.2.1.orig/Lib/test/test_compileall.py 2011-07-09 08:58:50.0 +0200 -+++ Python-3.2.1/Lib/test/test_compileall.py 2011-07-15 15:21:06.0 +0200 +diff -Nur Python-3.3.1.orig/Lib/test/test_compileall.py Python-3.3.1/Lib/test/test_compileall.py +--- Python-3.3.1.orig/Lib/test/test_compileall.py 2013-04-06 08:41:41.0 +0100 Python-3.3.1/Lib/test/test_compileall.py 2013-04-07 19:39:23.449157629 +0100 @@ -130,7 +130,7 @@ finally: sys.stdout = orig_stdout @@ -22,10 +22,10 @@ diff -dur Python-3.2.1.orig/Lib/test/test_compileall.py Python-3.2.1/Lib/test/te class CommandLineTests(unittest.TestCase): """Test compileall's CLI.""" -diff -dur Python-3.2.1.orig/Lib/test/test_warnings.py Python-3.2.1/Lib/test/test_warnings.py Python-3.2.1.orig/Lib/test/test_warnings.py2011-07-09 08:58:51.0 +0200 -+++ Python-3.2.1/Lib/test/test_warnings.py 2011-07-15 15:21:06.0 +0200 -@@ -715,6 +715,7 @@ +diff -Nur Python-3.3.1.orig/Lib/test/test_warnings.py Python-3.3.1/Lib/test/test_warnings.py +--- Python-3.3.1.orig/Lib/test/test_warnings.py2013-04-06 08:41:46.0 +0100 Python-3.3.1/Lib/test/test_warnings.py 2013-04-07 19:41:25.529164545 +0100 +@@ -717,6 +717,7 @@ module = py_warnings @@ -33,16 +33,16 @@ diff -dur Python-3.2.1.orig/Lib/test/test_warnings.py Python-3.2.1/Li
DISTFILES: xorg-driver-video-nvidia: NVIDIA-Linux-x86-313.30.run NVIDIA-Linux-x86_64-313.30-no-compat32.run
Files fetched: 2 STORED: http://us.download.nvidia.com/XFree86/Linux-x86/313.30/NVIDIA-Linux-x86-313.30.run 69c0f66c9246217a4fe4d28e95bb7bb6 NVIDIA-Linux-x86-313.30.run Size: 38845860 bytes STORED: http://us.download.nvidia.com/XFree86/Linux-x86_64/313.30/NVIDIA-Linux-x86_64-313.30-no-compat32.run e5f147fbcdcad71472b4ddeccf259bd7 NVIDIA-Linux-x86_64-313.30-no-compat32.run Size: 39694243 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/xorg-driver-video-nvidia] - updated to 313.30, supports xserver ABI 1.14
commit cb018f944e54224ccdbc2079ae755b24e8e4640c Author: Jan Rękorajski Date: Sun Apr 7 20:47:14 2013 +0200 - updated to 313.30, supports xserver ABI 1.14 xorg-driver-video-nvidia.spec | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) --- diff --git a/xorg-driver-video-nvidia.spec b/xorg-driver-video-nvidia.spec index 34dc683..8b564df 100644 --- a/xorg-driver-video-nvidia.spec +++ b/xorg-driver-video-nvidia.spec @@ -21,22 +21,22 @@ %endif %defineno_install_post_check_so 1 -%definerel 19 +%definerel 1 %definepname xorg-driver-video-nvidia Summary: Linux Drivers for nVidia GeForce/Quadro Chips Summary(hu.UTF-8): Linux meghajtók nVidia GeForce/Quadro chipekhez Summary(pl.UTF-8): Sterowniki do kart graficznych nVidia GeForce/Quadro Name: %{pname}%{_alt_kernel} # when updating version here, keep nvidia-settings.spec in sync as well -Version: 310.32 +Version: 313.30 Release: %{rel} Epoch: 1 License: nVidia Binary Group: X11 Source0: http://us.download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86-%{version}.run -# Source0-md5: 219608da023a318e2c023497e5ba9296 +# Source0-md5: 69c0f66c9246217a4fe4d28e95bb7bb6 Source1: http://us.download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-no-compat32.run -# Source1-md5: 2e9a8aeb74c17df70376fd59ff1c4125 +# Source1-md5: e5f147fbcdcad71472b4ddeccf259bd7 Source2: %{pname}-xinitrc.sh Source3: gl.pc.in Source4: 10-nvidia.conf @@ -53,7 +53,7 @@ BuildRequires:sed >= 4.0 BuildConflicts:XFree86-nvidia Requires: %{pname}-libs = %{epoch}:%{version}-%{rel} Requires: xorg-xserver-server -Requires: xorg-xserver-server(videodrv-abi) <= 13.1 +Requires: xorg-xserver-server(videodrv-abi) <= 14.1 Requires: xorg-xserver-server(videodrv-abi) >= 2.0 Provides: xorg-driver-video Provides: xorg-xserver-module(glx) gitweb: http://git.pld-linux.org/gitweb.cgi/packages/xorg-driver-video-nvidia.git/commitdiff/cb018f944e54224ccdbc2079ae755b24e8e4640c ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/rpm-build-macros] split %_smp_mflags to %__jobs macro, so unprefixed (with -j) value is available as well
commit 82f23c63247282a8231c3dcb47f594348030a8ff Author: Elan Ruusamäe Date: Sun Apr 7 21:39:52 2013 +0300 split %_smp_mflags to %__jobs macro, so unprefixed (with -j) value is available as well rpm-build-macros.spec | 2 +- rpm.macros| 12 +++- 2 files changed, 8 insertions(+), 6 deletions(-) --- diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec index b035a07..2ccd3ac 100644 --- a/rpm-build-macros.spec +++ b/rpm-build-macros.spec @@ -1,4 +1,4 @@ -%definerpm_macros_rev 1.656 +%definerpm_macros_rev 1.657 %definefind_lang_rev 1.36 Summary: PLD Linux RPM build macros Summary(pl.UTF-8): Makra do budowania pakietów RPM dla Linuksa PLD diff --git a/rpm.macros b/rpm.macros index 0769b7e..61da454 100644 --- a/rpm.macros +++ b/rpm.macros @@ -26,18 +26,20 @@ %__autopoint autopoint --force # add parallel build flags: -jN +# jobs macro is available since 1.657 # # if you want to disable parallel build do: -# echo '%_smp_mflags %{nil}' >> ~/.rpmmacros -# +# echo '%__jobs %{nil}' >> ~/.rpmmacros +%__jobs%{expand:%%global __jobs %(_NCPUS=$(/usr/bin/getconf _NPROCESSORS_ONLN); [ "$_NCPUS" -gt 2 ] && echo $(($_NCPUS / 2)))}%__jobs + +# expands to -jN if %__jobs has a value +%_smp_mflags %{expand:%%global _smp_mflags %(jobs=%{__jobs}; echo ${jobs:+-j$jobs}%%{nil})}%_smp_mflags + %__make/usr/bin/make %{?_smp_mflags} %__scons /usr/bin/scons %{?_smp_mflags} %__waf /usr/bin/waf %{?_smp_mflags} %__cmake /usr/bin/cmake -%_smp_mflags %(_NCPUS=$(/usr/bin/getconf _NPROCESSORS_ONLN); \\\ - [ "$_NCPUS" -gt 2 ] && echo "-j$(($_NCPUS / 2))") - %__gettextize { \ if grep -qs 'AM_GNU_GETTEXT.*external' configure.{ac,in} ; then \ gettextize --copy --force --no-changelog; \ gitweb: http://git.pld-linux.org/gitweb.cgi/packages/rpm-build-macros.git/commitdiff/82f23c63247282a8231c3dcb47f594348030a8ff ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: brltty: brltty-4.5.tar.gz
Files fetched: 1 STORED: http://mielke.cc/brltty/releases/brltty-4.5.tar.gz 7b52fa7746fed41ed344a1f75ce55951 brltty-4.5.tar.gz Size: 3260872 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/brltty] - updated to 4.5 (brlapi 0.6.0, new soname) - added java patch (fix jni.h detection) - added speech-
commit 0b1afa7ba83a31015cb400ff9c29d9eaf2945ba3 Author: Jakub Bogusz Date: Sun Apr 7 20:38:04 2013 +0200 - updated to 4.5 (brlapi 0.6.0, new soname) - added java patch (fix jni.h detection) - added speech-dispatcher patch (build with speech-dispatcher 0.8+) brltty-java.patch | 11 +++ brltty-speech-dispatcher.patch | 31 +++ brltty.spec| 21 ++--- 3 files changed, 56 insertions(+), 7 deletions(-) --- diff --git a/brltty.spec b/brltty.spec index 5b23db5..26978c7 100644 --- a/brltty.spec +++ b/brltty.spec @@ -20,19 +20,21 @@ %bcond_without at_spi # AtSpi screen driver %bcond_without at_spi2 # AtSpi2 screen driver # -%definebrlapi_ver 0.5.7 +%definebrlapi_ver 0.6.0 # %include /usr/lib/rpm/macros.java Summary: Braille display driver for Linux/Unix Summary(pl.UTF-8): Sterownik do wyświetlaczy Braille'a Name: brltty -Version: 4.4 -Release: 3 +Version: 4.5 +Release: 1 Group: Daemons License: GPL v2+ (brltty and drivers), LGPL v2.1+ (APIs) Source0: http://mielke.cc/brltty/releases/%{name}-%{version}.tar.gz -# Source0-md5: 8ebe96efe679f5f6ccff08928fec5b26 +# Source0-md5: 7b52fa7746fed41ed344a1f75ce55951 Patch0:%{name}-stat.patch +Patch1:%{name}-java.patch +Patch2:%{name}-speech-dispatcher.patch URL: http://mielke.cc/brltty/ BuildRequires: alsa-lib-devel %{?with_at_spi:BuildRequires: at-spi-devel} @@ -47,6 +49,7 @@ BuildRequires:bluez-libs-devel %{?with_flite:BuildRequires: flite-devel} %{?with_gpm:BuildRequires: gpm-devel} %{?with_java:BuildRequires:jdk} +%{?with_java:BuildRequires:jpackage-utils} %{?with_libbraille:BuildRequires: libbraille-devel} BuildRequires: libicu-devel BuildRequires: ncurses-devel @@ -55,7 +58,7 @@ BuildRequires:pkgconfig %{?with_python:BuildRequires: python-Pyrex} %{?with_java:BuildRequires:rpm-javaprov} %{?with_python:BuildRequires: rpm-pythonprov} -%{?with_speech_dispatcher:BuildRequires: speech-dispatcher-devel} +%{?with_speech_dispatcher:BuildRequires: speech-dispatcher-devel >= 0.8} %{?with_tcl:BuildRequires: tcl-devel} %if %{with x} BuildRequires: xorg-lib-libX11-devel @@ -229,10 +232,14 @@ Biblioteka BrlAPI dla Tcl. %prep %setup -q %patch0 -p1 +%patch1 -p1 +%patch2 -p1 %build +%{__autoconf} CFLAGS="%{rpmcflags} -I/usr/include/ncurses" %configure \ + %{?with_java:JAVA_HOME=%{java_home}} \ --with-install-root="$RPM_BUILD_ROOT" \ %{!?with_libbraille:--without-libbraille} \ %{!?with_espeak:--without-espeak} \ @@ -580,13 +587,13 @@ exit 0 %attr(755,root,root) %{_libdir}/brltty/libbrlttybbm.so %attr(755,root,root) %{_libdir}/brltty/libbrlttybbn.so %attr(755,root,root) %{_libdir}/brltty/libbrlttybcb.so +%attr(755,root,root) %{_libdir}/brltty/libbrlttybce.so %attr(755,root,root) %{_libdir}/brltty/libbrlttybec.so %attr(755,root,root) %{_libdir}/brltty/libbrlttybeu.so %attr(755,root,root) %{_libdir}/brltty/libbrlttybfs.so %attr(755,root,root) %{_libdir}/brltty/libbrlttybhm.so %attr(755,root,root) %{_libdir}/brltty/libbrlttybht.so %attr(755,root,root) %{_libdir}/brltty/libbrlttybhw.so -%attr(755,root,root) %{_libdir}/brltty/libbrlttybil.so %attr(755,root,root) %{_libdir}/brltty/libbrlttybir.so %{?with_libbraille:%attr(755,root,root) %{_libdir}/brltty/libbrlttyblb.so} %attr(755,root,root) %{_libdir}/brltty/libbrlttyblt.so @@ -637,7 +644,7 @@ exit 0 %files -n brlapi %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/libbrlapi.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libbrlapi.so.0.5 +%attr(755,root,root) %ghost %{_libdir}/libbrlapi.so.0.6 %files -n brlapi-devel %defattr(644,root,root,755) diff --git a/brltty-java.patch b/brltty-java.patch new file mode 100644 index 000..ddf63ba --- /dev/null +++ b/brltty-java.patch @@ -0,0 +1,11 @@ +--- brltty-4.5/Bindings/Java/bindings.m4.orig 2013-03-27 23:51:37.0 +0100 brltty-4.5/Bindings/Java/bindings.m4 2013-04-07 18:39:56.903678323 +0200 +@@ -63,7 +63,7 @@ +JAVA_JNI_INC="${JAVA_ROOT}/include" +JAVA_JNI_HDR="jni.h" +JAVA_JNI_FLAGS="" +- AC_CHECK_HEADER([${JAVA_JNI_HDR}], [], [AC_CHECK_FILE(["${JAVA_JNI_INC}/${JAVA_JNI_HDR}"], [JAVA_JNI_FLAGS="-I${JAVA_JNI_INC}"], [JAVA_OK=false])]) ++ AC_CHECK_HEADER([${JAVA_JNI_HDR}], [], [AC_CHECK_FILE(["${JAVA_JNI_INC}/${JAVA_JNI_HDR}"], [JAVA_JNI_FLAGS="-I${JAVA_JNI_INC} -I${JAVA_JNI_INC}/linux"], [JAVA_OK=false])]) +AC_SUBST([JAVA_JNI_HDR]) +AC_SUBST([JAVA_JNI_INC]) +AC_SUBST([JAVA_JNI_FLAGS]) diff --git a/brltty-speech-dispatcher.patch b/brltty-speech-dispatcher.patch new file mode 100644 index 000..3b2f949 --- /dev/null +++ b/brltty-speech-dispatcher.patch @@ -0,0 +1,31 @@ +--- brltty-4.5/configure.ac.
[packages/VirtualBox] - bump xserver ABI, vboxvideo is built with system xorg - rel 4
commit c8a0226f153911adc49582be78b9743e1bd6edbc Author: Jan Rękorajski Date: Sun Apr 7 20:36:10 2013 +0200 - bump xserver ABI, vboxvideo is built with system xorg - rel 4 VirtualBox.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- diff --git a/VirtualBox.spec b/VirtualBox.spec index f21adb1..51e8508 100644 --- a/VirtualBox.spec +++ b/VirtualBox.spec @@ -32,7 +32,7 @@ %define_enable_debug_packages 0 %endif -%definerel 3 +%definerel 4 %definepname VirtualBox Summary: VirtualBox - x86 hardware virtualizer Summary(pl.UTF-8): VirtualBox - wirtualizator sprzętu x86 @@ -292,7 +292,7 @@ Group: X11/Applications Requires: Mesa-dri-driver-swrast Requires: xorg-xserver-libdri >= 1.7.4 Requires: xorg-xserver-server >= 1.0.99.901 -Requires: xorg-xserver-server(videodrv-abi) <= 13.1 +Requires: xorg-xserver-server(videodrv-abi) <= 14.1 Requires: xorg-xserver-server(videodrv-abi) >= 2.0 %description -n xorg-driver-video-vboxvideo gitweb: http://git.pld-linux.org/gitweb.cgi/packages/VirtualBox.git/commitdiff/c8a0226f153911adc49582be78b9743e1bd6edbc ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/tigervnc] - fix building with xorg 1.14 - rel 14
commit 5bd16a60968475c22a1e60825118c1be3ae4b6b0 Author: Jan Rękorajski Date: Sun Apr 7 20:26:01 2013 +0200 - fix building with xorg 1.14 - rel 14 tigervnc.spec| 6 -- xorg114.patch| 22 ++ xserver113.patch | 8 3 files changed, 26 insertions(+), 10 deletions(-) --- diff --git a/tigervnc.spec b/tigervnc.spec index 85a8dfe..bbdd68c 100644 --- a/tigervnc.spec +++ b/tigervnc.spec @@ -1,13 +1,13 @@ # TODO: # - tigervnc.init -%definexversion1.13.2 +%definexversion1.14.0 Summary: A TigerVNC remote display system Summary(pl.UTF-8): System zdalnego dostępu TigerVNC Name: tigervnc Version: 1.2.0 -Release: 13 +Release: 14 License: GPL v2 Group: X11/Applications/Networking Source0: http://dl.sourceforge.net/tigervnc/1.2.0/%{name}-%{version}.tar.gz @@ -29,6 +29,7 @@ Patch12: sed-all.patch Patch13: xorg113.patch Patch14: xserver113.patch Patch15: format-security.patch +Patch16: xorg114.patch URL: http://www.tigervnc.com/ BuildRequires: ImageMagick BuildRequires: ImageMagick-coder-png @@ -196,6 +197,7 @@ cd - %patch6 -p1 %patch10 -p1 %patch13 -p1 +%patch16 -p1 %build %cmake . diff --git a/xorg114.patch b/xorg114.patch new file mode 100644 index 000..6fef6d1 --- /dev/null +++ b/xorg114.patch @@ -0,0 +1,22 @@ +diff -up tigervnc/unix/xserver/hw/vnc/xorg-version.h.xorg113 tigervnc/unix/xserver/hw/vnc/xorg-version.h +--- tigervnc/unix/xserver/hw/vnc/xorg-version.h.xorg1132012-07-19 21:19:27.560942582 -0400 tigervnc/unix/xserver/hw/vnc/xorg-version.h2012-07-19 21:19:27.576942382 -0400 +@@ -42,6 +42,8 @@ + #define XORG 112 + #elif XORG_VERSION_CURRENT < ((1 * 1000) + (13 * 10) + (99 * 1000)) + #define XORG 113 ++#elif XORG_VERSION_CURRENT < ((1 * 1000) + (14 * 10) + (99 * 1000)) ++#define XORG 114 + #else + #error "X.Org newer than 1.10 is not supported" + #endif +--- tigervnc-1.2.0/unix/xserver/hw/vnc/xvnc.cc~2013-04-07 20:20:47.297384278 +0200 tigervnc-1.2.0/unix/xserver/hw/vnc/xvnc.cc 2013-04-07 20:23:13.141847987 +0200 +@@ -54,7 +54,6 @@ + #include "servermd.h" + #include "fb.h" + #include "mi.h" +-#include "mibstore.h" + #include "colormapst.h" + #include "gcstruct.h" + #include "input.h" diff --git a/xserver113.patch b/xserver113.patch index e0a03d8..bc0d17e 100644 --- a/xserver113.patch +++ b/xserver113.patch @@ -1,14 +1,6 @@ diff -up xserver/configure.ac.vnc xserver/configure.ac --- xserver/configure.ac.vnc 2012-08-28 15:35:23.778810954 +0200 +++ xserver/configure.ac 2012-08-28 15:54:46.396743431 +0200 -@@ -31,7 +31,6 @@ RELEASE_DATE="2012-08-21" - RELEASE_NAME="Splashing Orca" - AC_CONFIG_SRCDIR([Makefile.am]) - AM_INIT_AUTOMAKE([foreign dist-bzip2]) --AM_MAINTAINER_MODE - - # Require xorg-macros minimum of 1.14 for XORG_COMPILER_BRAND in XORG_DEFAULT_OPTIONS - m4_ifndef([XORG_MACROS_VERSION], @@ -73,6 +72,7 @@ dnl forcing an entire recompile.x AC_CONFIG_HEADERS(include/version-config.h) gitweb: http://git.pld-linux.org/gitweb.cgi/packages/tigervnc.git/commitdiff/5bd16a60968475c22a1e60825118c1be3ae4b6b0 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/nodejs-gyp] R: nodejs-devel with it's deps
commit 541244a4a1b74673ee0a14bf54ae25891ce287e9 Author: Elan Ruusamäe Date: Sun Apr 7 20:41:00 2013 +0300 R: nodejs-devel with it's deps nodejs-gyp.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/nodejs-gyp.spec b/nodejs-gyp.spec index 56a050e..a87d105 100644 --- a/nodejs-gyp.spec +++ b/nodejs-gyp.spec @@ -12,9 +12,9 @@ URL: https://github.com/TooTallNate/node-gyp Source0: http://registry.npmjs.org/node-gyp/-/node-gyp-%{version}.tgz # Source0-md5: 3d8a5cf4b5b92457af68035bb0e0e96f BuildRequires: sed >= 4.0 -Requires: gcc Requires: make Requires: nodejs +Requires: nodejs-devel Requires: nodejs-fstream Requires: nodejs-glob < 4.0.0 Requires: nodejs-glob >= 3.0.0 gitweb: http://git.pld-linux.org/gitweb.cgi/packages/nodejs-gyp.git/commitdiff/541244a4a1b74673ee0a14bf54ae25891ce287e9 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: nodejs-microtime: microtime-0.3.3.tgz
Files fetched: 1 STORED: http://registry.npmjs.org/microtime/-/microtime-0.3.3.tgz 0235c2c7e670706dd9ad0d05c773706e microtime-0.3.3.tgz Size: 31183 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/nodejs-microtime] up to 0.3.3
commit 8be661cc76348020df5a48d38b0f8b29fa3cfa5e Author: Elan Ruusamäe Date: Sun Apr 7 20:36:46 2013 +0300 up to 0.3.3 library-path.patch| 12 nodejs-microtime.spec | 27 ++- 2 files changed, 10 insertions(+), 29 deletions(-) --- diff --git a/nodejs-microtime.spec b/nodejs-microtime.spec index 967b0be..45cedb4 100644 --- a/nodejs-microtime.spec +++ b/nodejs-microtime.spec @@ -1,18 +1,20 @@ %definepkg microtime Summary: Get the current time in microseconds Name: nodejs-%{pkg} -Version: 0.2.0 -Release: 3 +Version: 0.3.3 +Release: 1 License: MIT Group: Development/Libraries URL: https://github.com/wadey/node-microtime Source0: http://registry.npmjs.org/microtime/-/%{pkg}-%{version}.tgz -# Source0-md5: 9bc25aebc64b0c7370727013098dd6c3 -Patch0:library-path.patch -BuildRequires: nodejs-devel +# Source0-md5: 0235c2c7e670706dd9ad0d05c773706e +BuildRequires: nodejs-devel >= 0.8 BuildRequires: rpmbuild(macros) >= 1.634 +BuildRequires: npm >= 1.1.5 +BuildRequires: nodejs-gyp BuildRequires: sed >= 4.0 -Requires: nodejs +Requires: nodejs >= 0.6 +Requires: nodejs-bindings >= 1.0.0 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) # redefine for arch specific @@ -30,24 +32,15 @@ continuously or in `ticks'. %prep %setup -qc mv package/* . -%patch0 -p1 - -# make it noop for npm link -%{__sed} -i -e 's,node-waf configure build,/bin/true,' package.json %build -NODE_PATH=%{nodejs_libdir}/%{pkg} \ -node-waf configure build +node-gyp configure build %install rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT%{nodejs_libdir}/%{pkg} cp -pr index.js package.json $RPM_BUILD_ROOT%{nodejs_libdir}/%{pkg} - -node-waf install \ - --destdir=$RPM_BUILD_ROOT - -chmod a+x $RPM_BUILD_ROOT%{nodejs_libdir}/%{pkg}/microtime.node +install -p build/Release/microtime.node $RPM_BUILD_ROOT%{nodejs_libdir}/%{pkg} %clean rm -rf $RPM_BUILD_ROOT diff --git a/library-path.patch b/library-path.patch deleted file mode 100644 index 5c7e36e..000 --- a/library-path.patch +++ /dev/null @@ -1,12 +0,0 @@ nodejs-microtime-0.2.0/index.js~ 2011-11-07 20:47:19.0 +0200 -+++ nodejs-microtime-0.2.0/index.js2012-06-17 18:24:15.300783077 +0300 -@@ -5,8 +5,7 @@ - // `node@0.4.x` and `node@0.6.x`. - // (from https://github.com/indexzero/daemon.node) - // --try { binding = require('./build/default/microtime') } --catch (ex) { binding = require('./build/Release/microtime') } -+binding = require('./microtime') - - exports.now = binding.now - exports.nowDouble = binding.nowDouble gitweb: http://git.pld-linux.org/gitweb.cgi/packages/nodejs-microtime.git/commitdiff/8be661cc76348020df5a48d38b0f8b29fa3cfa5e ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/nodejs-bindings] unshift module topdir into loadpath
commit d18ec6634c99523da5431fef423f291e2114e1dd Author: Elan Ruusamäe Date: Sun Apr 7 20:35:15 2013 +0300 unshift module topdir into loadpath load-path.patch | 11 +++ nodejs-bindings.spec | 5 +++-- 2 files changed, 14 insertions(+), 2 deletions(-) --- diff --git a/nodejs-bindings.spec b/nodejs-bindings.spec index 693c740..93abc05 100644 --- a/nodejs-bindings.spec +++ b/nodejs-bindings.spec @@ -8,6 +8,7 @@ Group: Development/Libraries URL: https://github.com/TooTallNate/node-bindings Source0: http://registry.npmjs.org/bindings/-/%{pkg}-%{version}.tgz # Source0-md5: 52921674f0d3a9f69f058f99fa12847d +Patch0:load-path.patch BuildRequires: rpmbuild(macros) >= 1.634 BuildRequires: sed >= 4.0 Requires: nodejs @@ -31,12 +32,12 @@ would be built at, and returns the first one that loads successfully. %prep %setup -qc mv package/* . +%patch0 -p1 %install rm -rf $RPM_BUILD_ROOT - install -d $RPM_BUILD_ROOT%{nodejs_libdir}/%{pkg} -cp -pr bindings.js package.json $RPM_BUILD_ROOT%{nodejs_libdir}/%{pkg} +cp -p bindings.js package.json $RPM_BUILD_ROOT%{nodejs_libdir}/%{pkg} %clean rm -rf $RPM_BUILD_ROOT diff --git a/load-path.patch b/load-path.patch new file mode 100644 index 000..bbf3797 --- /dev/null +++ b/load-path.patch @@ -0,0 +1,11 @@ +--- nodejs-bindings-1.0.0/bindings.js~ 2012-07-10 20:54:35.0 +0300 nodejs-bindings-1.0.0/bindings.js 2013-04-07 20:29:01.117914415 +0300 +@@ -16,6 +16,8 @@ + , version: process.versions.node + , bindings: 'bindings.node' + , try: [ ++ // rpm installed binding ++ [ 'module_root', 'bindings' ], + // node-gyp's linked version in the "build" dir + [ 'module_root', 'build', 'bindings' ] + // node-waf and gyp_addon (a.k.a node-gyp) gitweb: http://git.pld-linux.org/gitweb.cgi/packages/nodejs-bindings.git/commitdiff/d18ec6634c99523da5431fef423f291e2114e1dd ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: nodejs-bindings: bindings-1.0.0.tgz
Files fetched: 1 STORED: http://registry.npmjs.org/bindings/-/bindings-1.0.0.tgz 52921674f0d3a9f69f058f99fa12847d bindings-1.0.0.tgz Size: 3456 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/nodejs-bindings] new, version 1.0.0
commit 281a4642622e4f4a1eaab843717e4b5b4b40bbae Author: Elan Ruusamäe Date: Sun Apr 7 20:23:29 2013 +0300 new, version 1.0.0 nodejs-bindings.spec | 47 +++ 1 file changed, 47 insertions(+) --- diff --git a/nodejs-bindings.spec b/nodejs-bindings.spec new file mode 100644 index 000..693c740 --- /dev/null +++ b/nodejs-bindings.spec @@ -0,0 +1,47 @@ +%definepkg bindings +Summary: Helper module for loading your native module's .node file +Name: nodejs-%{pkg} +Version: 1.0.0 +Release: 1 +License: MIT +Group: Development/Libraries +URL: https://github.com/TooTallNate/node-bindings +Source0: http://registry.npmjs.org/bindings/-/%{pkg}-%{version}.tgz +# Source0-md5: 52921674f0d3a9f69f058f99fa12847d +BuildRequires: rpmbuild(macros) >= 1.634 +BuildRequires: sed >= 4.0 +Requires: nodejs +BuildArch: noarch +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) + +%description +This is a helper module for authors of Node.js native addon modules. +It is basically the "swiss army knife" of `require()`ing your native +module's `.node` file. + +Throughout the course of Node's native addon history, addons have +ended up being compiled in a variety of different places, depending on +which build tool and which version of node was used. To make matters +worse, now the _gyp_ build tool can produce either a _Release_ or +_Debug_ build, each being built into different locations. + +This module checks _all_ the possible locations that a native addon +would be built at, and returns the first one that loads successfully. + +%prep +%setup -qc +mv package/* . + +%install +rm -rf $RPM_BUILD_ROOT + +install -d $RPM_BUILD_ROOT%{nodejs_libdir}/%{pkg} +cp -pr bindings.js package.json $RPM_BUILD_ROOT%{nodejs_libdir}/%{pkg} + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(644,root,root,755) +%doc README.md +%{nodejs_libdir}/%{pkg} gitweb: http://git.pld-linux.org/gitweb.cgi/packages/nodejs-bindings.git/commitdiff/281a4642622e4f4a1eaab843717e4b5b4b40bbae ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/nodejs-bindings] Created branch master
The branch 'master' was created. Summary of new commits: 281a464... new, version 1.0.0 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: eet: eet-1.7.6.tar.bz2
Files fetched: 1 STORED: http://download.enlightenment.org/releases/eet-1.7.6.tar.bz2 24cb0f2c33bfcc403bd0ce2860bd3633 eet-1.7.6.tar.bz2 Size: 578741 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/eet] - updated to 1.7.6
commit 35d78ab20df1650aa8c5fb280ae572c072e0d67f Author: Jakub Bogusz Date: Sun Apr 7 18:00:49 2013 +0200 - updated to 1.7.6 eet.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- diff --git a/eet.spec b/eet.spec index bfe8d16..dd1d47d 100644 --- a/eet.spec +++ b/eet.spec @@ -5,12 +5,12 @@ Summary: Library for speedy data storage, retrieval, and compression Summary(pl.UTF-8): Biblioteka do szybkiego zapisywania, odtwarzania i kompresji danych Name: eet -Version: 1.7.5 +Version: 1.7.6 Release: 1 License: BSD Group: Libraries Source0: http://download.enlightenment.org/releases/%{name}-%{version}.tar.bz2 -# Source0-md5: ec3fffbeff0be2699aeed1ed4377ee9d +# Source0-md5: 24cb0f2c33bfcc403bd0ce2860bd3633 URL: http://trac.enlightenment.org/e/wiki/Eet BuildRequires: autoconf >= 2.52 BuildRequires: automake >= 1.6 gitweb: http://git.pld-linux.org/gitweb.cgi/packages/eet.git/commitdiff/35d78ab20df1650aa8c5fb280ae572c072e0d67f ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: nodejs-forever: forever-0.10.0.tgz
Files fetched: 1 STORED: http://registry.npmjs.org/forever/-/forever-0.10.0.tgz f17e356a9550e56e11b7b19e122145b8 forever-0.10.0.tgz Size: 25197 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/nodejs-forever] up to 0.10.0, no arch dependant packages
commit 9e4b28164f583b52d8da3fbaa37c64c448393aa1 Author: Elan Ruusamäe Date: Sun Apr 7 18:53:12 2013 +0300 up to 0.10.0, no arch dependant packages nodejs-forever.spec | 44 ++-- 1 file changed, 14 insertions(+), 30 deletions(-) --- diff --git a/nodejs-forever.spec b/nodejs-forever.spec index 7e315eb..8af3e83 100644 --- a/nodejs-forever.spec +++ b/nodejs-forever.spec @@ -1,37 +1,28 @@ %definepkg forever Summary: node.js forever module and CLI tools Name: nodejs-%{pkg} -Version: 0.9.2 +Version: 0.10.0 Release: 0.8 License: MIT Group: Development/Libraries URL: https://github.com/nodejitsu/forever Source0: http://registry.npmjs.org/forever/-/%{pkg}-%{version}.tgz -# Source0-md5: 204b32de54867b91183293e537dfbfa9 -BuildRequires: nodejs-daemon >= 0.5 -BuildRequires: nodejs-microtime >= 0.2 -BuildRequires: nodejs-node-fork >= 0.4 +# Source0-md5: f17e356a9550e56e11b7b19e122145b8 BuildRequires: npm BuildRequires: rpmbuild(macros) >= 1.634 BuildRequires: sed >= 4.0 Requires: nodejs -#Requires: nodejs-broadway >= 0.1 -#Requires: nodejs-cliff >= 0 -Requires: nodejs-daemon >= 0.5 -#Requires: nodejs-flatiron >= 0.1 -Requires: nodejs-microtime >= 0.2 -#Requires: nodejs-minimatch >= 0.2 -#Requires: nodejs-nconf >= 0.5 -Requires: nodejs-node-fork >= 0.4 -#Requires: nodejs-nssocket >= 0.3 -#Requires: nodejs-optimist >= 0.3 -#Requires: nodejs-pkginfo >= 0 -#Requires: nodejs-portfinder >= 0 -#Requires: nodejs-ps-tree >= 0.0 -#Requires: nodejs-timespan >= 2.0 -#Requires: nodejs-utile >= 0.0 -#Requires: nodejs-watch >= 0.5 -#Requires: nodejs-winston >= 0.5 +Requires: nodejs-cliff >= 0.1.8 +Requires: nodejs-flatiron >= 0.2.3 +Requires: nodejs-forever-monitor >= 1.0.1 +Requires: nodejs-nconf >= 0.6.1 +Requires: nodejs-nssocket >= 0.3.8 +Requires: nodejs-optimist >= 0.3.4 +Requires: nodejs-pkginfo >= 0.2.3 +Requires: nodejs-timespan >= 2.0.1 +Requires: nodejs-utile >= 0.1.2 +Requires: nodejs-watch >= 0.5.1 +Requires: nodejs-winston >= 0.6.2 BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -51,10 +42,6 @@ mv package/* . find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f %build -# arch specific packages -npm link daemon -npm link node-fork -npm link microtime # install others local npm install . @@ -69,9 +56,6 @@ ln -s %{nodejs_libdir}/%{pkg}/bin/foreverd $RPM_BUILD_ROOT%{_sbindir}/foreverd # bundle node_modules cp -a node_modules $RPM_BUILD_ROOT%{nodejs_libdir}/%{pkg} -install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version} -cp -a examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version} - %clean rm -rf $RPM_BUILD_ROOT @@ -86,7 +70,7 @@ rm -rf $RPM_BUILD_ROOT %dir %{nodejs_libdir}/%{pkg}/bin %attr(755,root,root) %{nodejs_libdir}/%{pkg}/bin/forever %attr(755,root,root) %{nodejs_libdir}/%{pkg}/bin/foreverd -%{_examplesdir}/%{name}-%{version} +%attr(755,root,root) %{nodejs_libdir}/%{pkg}/bin/monitor # bundle node_modules %defattr(-,root,root,-) gitweb: http://git.pld-linux.org/gitweb.cgi/packages/nodejs-forever.git/commitdiff/9e4b28164f583b52d8da3fbaa37c64c448393aa1 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: libguestfs: libguestfs-1.20.5.tar.gz
Files fetched: 1 STORED: http://libguestfs.org/download/1.20-stable/libguestfs-1.20.5.tar.gz a3633aea4c5e21588e72a88019acd739 libguestfs-1.20.5.tar.gz Size: 9527006 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/libguestfs] - updated to 1.20.5 - adjusted for current ruby packaging
commit 333efa05089659b45a7c5eca7688f0aab0350783 Author: Jakub Bogusz Date: Sun Apr 7 17:46:18 2013 +0200 - updated to 1.20.5 - adjusted for current ruby packaging libguestfs.spec | 10 ++ 1 file changed, 6 insertions(+), 4 deletions(-) --- diff --git a/libguestfs.spec b/libguestfs.spec index bf36e4a..d041bc6 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -23,12 +23,12 @@ Summary: Library and tools for accessing and modifying virtual machine disk images Summary(pl.UTF-8): Biblioteka i narzędzia do dostępu i modyfikacji obrazów dysków maszyn wirtualnych Name: libguestfs -Version: 1.20.4 +Version: 1.20.5 Release: 1 License: LGPL v2+ Group: Libraries Source0: http://libguestfs.org/download/1.20-stable/%{name}-%{version}.tar.gz -# Source0-md5: 169bcb12858781bae1b2646d675b5315 +# Source0-md5: a3633aea4c5e21588e72a88019acd739 Patch0:ncurses.patch Patch1:augeas-libxml2.patch Patch2:%{name}-link.patch @@ -111,6 +111,8 @@ BuildRequires: rpmbuild(macros) >= 1.322 BuildRequires: ruby BuildRequires: ruby-devel BuildRequires: ruby-rake +BuildRequires: ruby-rdoc +BuildRequires: ruby-rubygems %endif BuildRequires: yajl-devel >= 2 Requires: qemu-common >= 1.1.0 @@ -719,8 +721,8 @@ rm -rf $RPM_BUILD_ROOT %if %{with ruby} %files -n ruby-libguestfs %defattr(644,root,root,755) -%attr(755,root,root) %{ruby_sitearchdir}/_guestfs.so -%{ruby_sitelibdir}/guestfs.rb +%attr(755,root,root) %{ruby_vendorarchdir}/_guestfs.so +%{ruby_vendorlibdir}/guestfs.rb %{_mandir}/man3/guestfs-ruby.3* %lang(ja) %{_mandir}/ja/man3/guestfs-ruby.3* %lang(uk) %{_mandir}/uk/man3/guestfs-ruby.3* gitweb: http://git.pld-linux.org/gitweb.cgi/packages/libguestfs.git/commitdiff/333efa05089659b45a7c5eca7688f0aab0350783 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: cito: cito-0.3.0.tar.gz
Files fetched: 1 STORED: http://downloads.sourceforge.net/cito/cito-0.3.0.tar.gz 794676f282dc8a2d0b9af220a92ad349 cito-0.3.0.tar.gz Size: 79578 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/cito] - new
commit 0dbce04d15d933558ef3f97a9753616f956badb7 Author: Jakub Bogusz Date: Sun Apr 7 17:45:16 2013 +0200 - new cito.spec | 55 +++ 1 file changed, 55 insertions(+) --- diff --git a/cito.spec b/cito.spec new file mode 100644 index 000..c7314ef --- /dev/null +++ b/cito.spec @@ -0,0 +1,55 @@ +Summary: Ci programming language +Summary(en.UTF-8): Ć programming language +Summary(pl.UTF-8): Język programowania Ć +Name: cito +Version: 0.3.0 +Release: 1 +License: GPL v3+ +Group: Development/Languages +Source0: http://downloads.sourceforge.net/cito/%{name}-%{version}.tar.gz +# Source0-md5: 794676f282dc8a2d0b9af220a92ad349 +URL: http://cito.sourceforge.net/ +# .NET 3.5 - what is minimal mono version? +BuildRequires: mono-csharp >= 3 +Requires: mono >= 3 +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) + +%description +Ci is a programming language which can be automatically translated to +C, Java, C#, JavaScript, ActionScript and D. The translator is called +`cito`. + +%description -l en.UTF-8 +Ć is a programming language which can be automatically translated to +C, Java, C#, JavaScript, ActionScript and D. The translator is called +`cito`. + +%description -l pl.UTF-8 +Ć to język programowania, który można automatycznie tłumaczyć do +języków C, Java, C#, JavaScript, ActionScript i D. Translator nazywa +się "cito". + +%prep +%setup -q + +%build +%{__make} + +%install +rm -rf $RPM_BUILD_ROOT + +%{__make} install \ + DESTDIR=$RPM_BUILD_ROOT \ + prefix=/usr + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(644,root,root,755) +%doc README.html ci.html ci-logo.ico ci-logo.svg hello.ci +%attr(755,root,root) %{_bindir}/cipad +%attr(755,root,root) %{_bindir}/cito +%dir %{_prefix}/lib/cito +%{_prefix}/lib/cito/cipad.exe +%{_prefix}/lib/cito/cito.exe gitweb: http://git.pld-linux.org/gitweb.cgi/packages/cito.git/commitdiff/0dbce04d15d933558ef3f97a9753616f956badb7 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/cito] Created branch master
The branch 'master' was created. Summary of new commits: 0dbce04... - new ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: eina: eina-1.7.6.tar.bz2
Files fetched: 1 STORED: http://download.enlightenment.org/releases/eina-1.7.6.tar.bz2 65bc85229b914e0e26102e7e3ed2e687 eina-1.7.6.tar.bz2 Size: 9791442 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/eina] - updated to 1.7.6
commit 97b605dc11ed504077dba8feb3d1018af967e867 Author: Jakub Bogusz Date: Sun Apr 7 17:26:58 2013 +0200 - updated to 1.7.6 eina.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- diff --git a/eina.spec b/eina.spec index 0172c58..aac2645 100644 --- a/eina.spec +++ b/eina.spec @@ -22,17 +22,17 @@ Summary: Data types library (list, hash, etc.) Summary(pl.UTF-8): Biblioteka struktur danych (lista, hasz, itp.) Name: eina -Version: 1.7.5 +Version: 1.7.6 Release: 1 License: LGPL v2.1+ Group: Libraries Source0: http://download.enlightenment.org/releases/%{name}-%{version}.tar.bz2 -# Source0-md5: ea505aa52729de68ed6c00e1e45c3c50 +# Source0-md5: 65bc85229b914e0e26102e7e3ed2e687 URL: http://trac.enlightenment.org/e/wiki/Eina BuildRequires: pkgconfig >= 1:0.22 # ememoa-devel >= 0.0.26 # escape (for ps3 platform) -# evil >= 1.7.5 (for win32 platform) +# evil >= 1.7.6 (for win32 platform) # exotic (for ??? platforms) BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) gitweb: http://git.pld-linux.org/gitweb.cgi/packages/eina.git/commitdiff/97b605dc11ed504077dba8feb3d1018af967e867 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/nodejs-node-fork] update desc, this module not needed in node 0.6+
commit 25c1600227ae92457c40b00659d770976df1b798 Author: Elan Ruusamäe Date: Sun Apr 7 18:19:54 2013 +0300 update desc, this module not needed in node 0.6+ nodejs-node-fork.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/nodejs-node-fork.spec b/nodejs-node-fork.spec index cb6c3b5..f404897 100644 --- a/nodejs-node-fork.spec +++ b/nodejs-node-fork.spec @@ -1,5 +1,5 @@ %definepkg node-fork -Summary: Look-alike nodejs 0.6.x child_process.fork() function module +Summary: Backported child_process.fork() function module from nodejs 5.x/6.x for nodejs 4.x Name: nodejs-%{pkg} Version: 0.4.2 Release: 6 gitweb: http://git.pld-linux.org/gitweb.cgi/packages/nodejs-node-fork.git/commitdiff/25c1600227ae92457c40b00659d770976df1b798 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: nodejs-daemon: daemon-1.1.0.tgz
Files fetched: 1 STORED: http://registry.npmjs.org/daemon/-/daemon-1.1.0.tgz 58e1b7b90b453eb610dd4c85de800e5d daemon-1.1.0.tgz Size: 3686 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/nodejs-daemon] up to 1.1.0. now noarch
commit 67bf99bc778f8adc9005692e390442516bdb8fad Author: Elan Ruusamäe Date: Sun Apr 7 18:14:35 2013 +0300 up to 1.1.0. now noarch nodejs-daemon.spec | 34 -- 1 file changed, 8 insertions(+), 26 deletions(-) --- diff --git a/nodejs-daemon.spec b/nodejs-daemon.spec index 6132cba..53622dc 100644 --- a/nodejs-daemon.spec +++ b/nodejs-daemon.spec @@ -1,48 +1,33 @@ %definepkg daemon Summary: Add-on for creating *nix daemons Name: nodejs-%{pkg} -Version: 0.5.1 -Release: 4 +Version: 1.1.0 +Release: 1 License: MIT Group: Development/Libraries URL: https://github.com/indexzero/daemon.node Source0: http://registry.npmjs.org/daemon/-/%{pkg}-%{version}.tgz -# Source0-md5: 31730d0308efdc9435440e1880e82b9d -BuildRequires: nodejs-devel +# Source0-md5: 58e1b7b90b453eb610dd4c85de800e5d BuildRequires: rpmbuild(macros) >= 1.634 -# due library being versioned -%requires_eq nodejs -Requires: nodejs +Requires: nodejs >= 0.8 +BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) # redefine for arch specific %definenodejs_libdir %{_libdir}/node %description -A C++ add-on for Node.js to enable simple daemons in JavaScript plus -some useful wrappers in JavaScript. +Turn a node script into a daemon. %prep %setup -qc mv package/* . -cat > install
[packages/python-logilab-common] - License is LGPL; use __python macro
commit fc5535c6fb519aaf1c1a211cdecab99c6481750f Author: Jakub Bogusz Date: Sun Apr 7 17:12:48 2013 +0200 - License is LGPL; use __python macro python-logilab-common.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- diff --git a/python-logilab-common.spec b/python-logilab-common.spec index 5ef6bac..dcd8185 100644 --- a/python-logilab-common.spec +++ b/python-logilab-common.spec @@ -5,7 +5,7 @@ Summary(pl.UTF-8): Wspólne moduły Logilab Name: python-logilab-common Version: 0.57.1 Release: 1 -License: GPL +License: LGPL v2.1+ Group: Development/Languages/Python Source0: ftp://ftp.logilab.fr/pub/common/%{module}-%{version}.tar.gz # Source0-md5: b0431a91f0765be32483d1703747e45a @@ -32,12 +32,12 @@ projekty tworzone przez Logilab. %setup -q -n %{module}-%{version} %build -python setup.py build +%{__python} setup.py build %install rm -rf $RPM_BUILD_ROOT -python setup.py install \ +%{__python} setup.py install \ --optimize=2 \ --root=$RPM_BUILD_ROOT gitweb: http://git.pld-linux.org/gitweb.cgi/packages/python-logilab-common.git/commitdiff/fc5535c6fb519aaf1c1a211cdecab99c6481750f ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/python-logilab-astng] - License is LGPL; removed obsoelete rm
commit f33b82423af755b311505043be223ad7066f3c4b Author: Jakub Bogusz Date: Sun Apr 7 17:11:04 2013 +0200 - License is LGPL; removed obsoelete rm python-logilab-astng.spec | 14 +- 1 file changed, 5 insertions(+), 9 deletions(-) --- diff --git a/python-logilab-astng.spec b/python-logilab-astng.spec index d96c4ad..c3a6831 100644 --- a/python-logilab-astng.spec +++ b/python-logilab-astng.spec @@ -1,11 +1,10 @@ - %definemodule logilab-astng Summary: Python Abstract Syntax Tree New Generation Summary(pl.UTF-8): Abstrakcyjne drzewa składniowe Pythona nowej generacji Name: python-logilab-astng Version: 0.23.1 Release: 1 -License: GPL +License: LGPL v2.1+ Group: Development/Languages/Python Source0: ftp://ftp.logilab.fr/pub/astng/%{module}-%{version}.tar.gz # Source0-md5: 67b57848eca454b72c8a8bdb93e47adf @@ -35,20 +34,17 @@ potrzebami pylinta. %setup -q -n %{module}-%{version} %build -python setup.py build +%{__python} setup.py build %install rm -rf $RPM_BUILD_ROOT -python setup.py install \ +%{__python} setup.py install \ --optimize=2 \ --root=$RPM_BUILD_ROOT %py_postclean -# see install section of python-logilab-common for explanation -rm -f $RPM_BUILD_ROOT%{py_sitescriptdir}/logilab/__init__.* - %clean rm -rf $RPM_BUILD_ROOT @@ -56,5 +52,5 @@ rm -rf $RPM_BUILD_ROOT %defattr(644,root,root,755) %doc ChangeLog README %{py_sitescriptdir}/logilab/astng -%{py_sitescriptdir}/*.egg-info -%{py_sitescriptdir}/*.pth +%{py_sitescriptdir}/logilab_astng-%{version}-py*.egg-info +%{py_sitescriptdir}/logilab_astng-%{version}-py*-nspkg.pth gitweb: http://git.pld-linux.org/gitweb.cgi/packages/python-logilab-astng.git/commitdiff/f33b82423af755b311505043be223ad7066f3c4b ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: nodejs-gyp: node-gyp-0.9.5.tgz
Files fetched: 1 STORED: http://registry.npmjs.org/node-gyp/-/node-gyp-0.9.5.tgz 3d8a5cf4b5b92457af68035bb0e0e96f node-gyp-0.9.5.tgz Size: 480284 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/nodejs-gyp] up to 0.9.5, only changes are in gyp lib
commit 44af83c5124159239b871ab6723e3bdb6814bb9f Author: Elan Ruusamäe Date: Sun Apr 7 18:07:06 2013 +0300 up to 0.9.5, only changes are in gyp lib nodejs-gyp.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- diff --git a/nodejs-gyp.spec b/nodejs-gyp.spec index a53e272..56a050e 100644 --- a/nodejs-gyp.spec +++ b/nodejs-gyp.spec @@ -4,13 +4,13 @@ %definepkg node-gyp Summary: Node.js native addon build tool Name: nodejs-gyp -Version: 0.9.3 -Release: 1.2 +Version: 0.9.5 +Release: 0.1 License: MIT Group: Development/Libraries URL: https://github.com/TooTallNate/node-gyp Source0: http://registry.npmjs.org/node-gyp/-/node-gyp-%{version}.tgz -# Source0-md5: 7b7c87c7ede0614e34acce0b7fab7ea6 +# Source0-md5: 3d8a5cf4b5b92457af68035bb0e0e96f BuildRequires: sed >= 4.0 Requires: gcc Requires: make gitweb: http://git.pld-linux.org/gitweb.cgi/packages/nodejs-gyp.git/commitdiff/44af83c5124159239b871ab6723e3bdb6814bb9f ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/nodejs-gyp] package required addon.gypi, also bundle gyp for now
commit bc7326cee4d81bc1f373f9f052a68899c20c13c2 Author: Elan Ruusamäe Date: Sun Apr 7 18:02:35 2013 +0300 package required addon.gypi, also bundle gyp for now nodejs-gyp.spec | 29 +++-- 1 file changed, 19 insertions(+), 10 deletions(-) --- diff --git a/nodejs-gyp.spec b/nodejs-gyp.spec index 54e7078..a53e272 100644 --- a/nodejs-gyp.spec +++ b/nodejs-gyp.spec @@ -1,7 +1,11 @@ +# TODO +# - use system gyp + +%definepkg node-gyp Summary: Node.js native addon build tool Name: nodejs-gyp Version: 0.9.3 -Release: 1 +Release: 1.2 License: MIT Group: Development/Libraries URL: https://github.com/TooTallNate/node-gyp @@ -53,11 +57,12 @@ mv package/* . %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT%{nodejs_libdir}/node-gyp -cp -pr bin lib legacy package.json $RPM_BUILD_ROOT%{nodejs_libdir}/node-gyp +install -d $RPM_BUILD_ROOT%{nodejs_libdir}/%{pkg} +cp -pr bin lib legacy package.json $RPM_BUILD_ROOT%{nodejs_libdir}/%{pkg} +cp -pr *.gyp* gyp $RPM_BUILD_ROOT%{nodejs_libdir}/%{pkg} install -d $RPM_BUILD_ROOT%{_bindir} -ln -s %{nodejs_libdir}/node-gyp/bin/node-gyp.js $RPM_BUILD_ROOT%{_bindir}/node-gyp +ln -s %{nodejs_libdir}/%{pkg}/bin/node-gyp.js $RPM_BUILD_ROOT%{_bindir}/node-gyp %clean rm -rf $RPM_BUILD_ROOT @@ -66,11 +71,15 @@ rm -rf $RPM_BUILD_ROOT %defattr(644,root,root,755) %doc README.md LICENSE %attr(755,root,root) %{_bindir}/node-gyp -%dir %{nodejs_libdir}/node-gyp -%{nodejs_libdir}/node-gyp/package.json -%{nodejs_libdir}/node-gyp/lib -%dir %{nodejs_libdir}/node-gyp/bin -%attr(755,root,root) %{nodejs_libdir}/node-gyp/bin/node-gyp.js +%dir %{nodejs_libdir}/%{pkg} +%{nodejs_libdir}/%{pkg}/package.json +%{nodejs_libdir}/%{pkg}/addon.gypi +%{nodejs_libdir}/%{pkg}/lib +%dir %{nodejs_libdir}/%{pkg}/bin +%attr(755,root,root) %{nodejs_libdir}/%{pkg}/bin/node-gyp.js # waf based tools -%{nodejs_libdir}/node-gyp/legacy +%{nodejs_libdir}/%{pkg}/legacy + +%defattr(-,root,root,-) +%{nodejs_libdir}/%{pkg}/gyp gitweb: http://git.pld-linux.org/gitweb.cgi/packages/nodejs-gyp.git/commitdiff/bc7326cee4d81bc1f373f9f052a68899c20c13c2 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/python-logilab-common] - be more verbose directly in py_sitescriptdir
commit 1d87f752d580ebbb8db65c6bf15842b1061df6bf Author: Jakub Bogusz Date: Sun Apr 7 17:02:33 2013 +0200 - be more verbose directly in py_sitescriptdir python-logilab-common.spec | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) --- diff --git a/python-logilab-common.spec b/python-logilab-common.spec index 26c8106..5ef6bac 100644 --- a/python-logilab-common.spec +++ b/python-logilab-common.spec @@ -58,4 +58,8 @@ rm -rf $RPM_BUILD_ROOT %doc ChangeLog README # isn't name too generic? %attr(755,root,root) %{_bindir}/pytest -%{py_sitescriptdir}/* +%dir %{py_sitescriptdir}/logilab +%{py_sitescriptdir}/logilab/__init__.py[co] +%{py_sitescriptdir}/logilab/common +%{py_sitescriptdir}/logilab_common-%{version}-py*-nspkg.pth +%{py_sitescriptdir}/logilab_common-%{version}-py*.egg-info gitweb: http://git.pld-linux.org/gitweb.cgi/packages/python-logilab-common.git/commitdiff/1d87f752d580ebbb8db65c6bf15842b1061df6bf ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/rpm-build-tools] note about used external programs
commit f249f99add2c5ab3306c6475714f529e9d538135 Author: Elan Ruusamäe Date: Sun Apr 7 17:55:22 2013 +0300 note about used external programs pldnotify.awk | 9 - 1 file changed, 8 insertions(+), 1 deletion(-) --- diff --git a/pldnotify.awk b/pldnotify.awk index 39850eb..a11735a 100644 --- a/pldnotify.awk +++ b/pldnotify.awk @@ -1,5 +1,4 @@ #!/bin/awk -f -# $Revision$, $Date$ # # Copyright (C) 2000-2013 PLD-Team # Authors: @@ -19,6 +18,14 @@ # NOTE: # to test run this, run: # $ awk -vDEBUG=1 pldnotify.awk < specfile +# +# To get full out of it, you need to have following tools installed: +# - perl, sed, wget, coreutils, util-linux +# - perl HTML::TreeBuilder module for better links parser (-vUSE_PERL=0 to disable) +# - pear for php-pear package updates +# - npm for nodejs packages +# +# Additionally "mirrors" file in current dir, controls local mirrors you prefer function d(s) { if (!DEBUG) { gitweb: http://git.pld-linux.org/gitweb.cgi/packages/rpm-build-tools.git/commitdiff/f249f99add2c5ab3306c6475714f529e9d538135 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/rpm-build-tools] use less local vars. overwrite params not needed
commit 3445a27e854db29384d8b56fe136f6c363cb7415 Author: Elan Ruusamäe Date: Sun Apr 7 17:50:44 2013 +0300 use less local vars. overwrite params not needed pldnotify.awk | 45 + 1 file changed, 21 insertions(+), 24 deletions(-) --- diff --git a/pldnotify.awk b/pldnotify.awk index 75f271f..39850eb 100644 --- a/pldnotify.awk +++ b/pldnotify.awk @@ -565,15 +565,15 @@ function process_source(number, lurl, name, version) { } } -function rss_upgrade(name, ver, url, regex, cmd, nver) { +function rss_upgrade(name, ver, url, regex, cmd) { regex = "s/.*" regex "<\/title>.*/\\1/p" cmd = "wget -t 2 -T 45 -q -O - " url " | sed -nre '" regex "' | head -n1" d("rss_upgrade_cmd: " cmd) - cmd | getline nver + cmd | getline ver close(cmd) - return nver + return ver } # check for ZF upgrade from rss @@ -592,50 +592,47 @@ function hudson_upgrade(name, ver) { } # upgrade check for pear package using PEAR CLI -function pear_upgrade(name, ver,pname, pearcmd, nver) { - pname = name; - sub(/^php-pear-/, "", pname); +function pear_upgrade(name, ver,cmd) { + sub(/^php-pear-/, "", name); - pearcmd = "pear remote-info " pname " | awk '/^Latest/{print $NF}'" - d("pearcmd: " pearcmd) - pearcmd | getline nver - close(pearcmd) + cmd = "pear remote-info " name " | awk '/^Latest/{print $NF}'" + d("PEAR: " cmd) + cmd | getline ver + close(cmd) - return nver + return ver } -function vim_upgrade(name, ver, mver, nver, vimcmd) { +function vim_upgrade(name, ver, cmd) { # %patchset_source -f ftp://ftp.vim.org/pub/editors/vim/patches/7.2/7.2.%03g 1 %{patchlevel} - mver = substr(ver, 0, 3) - vimcmd = "wget -q -O - ftp://ftp.vim.org/pub/editors/vim/patches/"; mver "/MD5SUMS|grep -vF .gz|tail -n1|awk '{print $2}'" - d("vimcmd: " vimcmd) - vimcmd | getline nver - close(vimcmd) - - return nver + cmd = "wget -q -O - ftp://ftp.vim.org/pub/editors/vim/patches/"; DEFS["ver"] "/MD5SUMS|grep -vF .gz|tail -n1|awk '{print $2}'" + d("VIM: " cmd) + cmd | getline ver + close(cmd) + return ver } -function nodejs_upgrade(name, ver, cmd, nver) { +function nodejs_upgrade(name, ver, cmd) { d("NODEJS " name " (as " DEFS["pkg"] ") " ver); if (DEFS["pkg"]) { cmd = "npm info " DEFS["pkg"] " dist-tags.latest" } else { cmd = "npm info " name " dist-tags.latest" } - cmd | getline nver + cmd | getline ver close(cmd) - return nver + return ver } function chrome_upgrade(name, ver, cmd, sourceurl) { sourceurl = "http://dl.google.com/linux/chrome/rpm/stable/x86_64/repodata/primary.xml.gz"; cmd = "curl -s " sourceurl " | zcat | perl -ne 'm{google-chrome-" DEFS["state"] "} and m{http://git.pld-linux.org/gitweb.cgi/packages/rpm-build-tools.git/commitdiff/f249f99add2c5ab3306c6475714f529e9d538135 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/rpm-build-tools] handle google chrome upgrades
commit 48371291502eff0999319a2c9dda6b523cc64cc6 Author: Elan Ruusamäe Date: Sun Apr 7 17:44:49 2013 +0300 handle google chrome upgrades pldnotify.awk | 12 1 file changed, 12 insertions(+) --- diff --git a/pldnotify.awk b/pldnotify.awk index aa5cd8e..75f271f 100644 --- a/pldnotify.awk +++ b/pldnotify.awk @@ -628,6 +628,16 @@ function nodejs_upgrade(name, ver, cmd, nver) { return nver } +function chrome_upgrade(name, ver, cmd, sourceurl) { + sourceurl = "http://dl.google.com/linux/chrome/rpm/stable/x86_64/repodata/primary.xml.gz"; + cmd = "curl -s " sourceurl " | zcat | perl -ne 'm{google-chrome-" DEFS["state"] "} and m{http://git.pld-linux.org/gitweb.cgi/packages/rpm-build-tools.git/commitdiff/48371291502eff0999319a2c9dda6b523cc64cc6 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/gnome-abrt] - R: libreport-python
commit 10ce2c2539cfd1d977d484a34726c10abde513f4 Author: Jakub Bogusz Date: Sun Apr 7 16:43:25 2013 +0200 - R: libreport-python gnome-abrt.spec | 1 + 1 file changed, 1 insertion(+) --- diff --git a/gnome-abrt.spec b/gnome-abrt.spec index 7f4d395..679c0d8 100644 --- a/gnome-abrt.spec +++ b/gnome-abrt.spec @@ -27,6 +27,7 @@ BuildRequires:rpmbuild(macros) >= 1.596 BuildRequires: xmlto Requires(post,postun): gtk-update-icon-cache Requires: hicolor-icon-theme +Requires: libreport-python Requires: python-dbus Requires: python-inotify Requires: python-pygobject3 gitweb: http://git.pld-linux.org/gitweb.cgi/packages/gnome-abrt.git/commitdiff/10ce2c2539cfd1d977d484a34726c10abde513f4 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: p11-kit: p11-kit-0.18.0.tar.gz
Files fetched: 1 STORED: http://p11-glue.freedesktop.org/releases/p11-kit-0.18.0.tar.gz abb4683c7f193df6e48dbfad443ec9a8 p11-kit-0.18.0.tar.gz Size: 961382 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/p11-kit] - updated to 0.18.0
commit b95fe76773a61e1d9971ebac21403d7b7546e0a3 Author: Jakub Bogusz Date: Sun Apr 7 16:41:38 2013 +0200 - updated to 0.18.0 p11-kit.spec | 8 1 file changed, 4 insertions(+), 4 deletions(-) --- diff --git a/p11-kit.spec b/p11-kit.spec index 64f318e..86ee0be 100644 --- a/p11-kit.spec +++ b/p11-kit.spec @@ -5,13 +5,13 @@ Summary: Library and proxy module for properly loading and sharing PKCS#11 modules Summary(pl.UTF-8): Biblioteka i moduł proxy do właściwego wczytywania i współdzielenia modułów PKCS#11 Name: p11-kit -# NOTE: 0.16.x is stable, 0.17.x unstable -Version: 0.16.4 +# NOTE: 0.18.x is stable, 0.19.x unstable +Version: 0.18.0 Release: 1 License: BSD Group: Libraries Source0: http://p11-glue.freedesktop.org/releases/%{name}-%{version}.tar.gz -# Source0-md5: 62446439ed7e25d626e96f825d345c76 +# Source0-md5: abb4683c7f193df6e48dbfad443ec9a8 URL: http://p11-glue.freedesktop.org/p11-kit.html BuildRequires: gtk-doc >= 1.15 BuildRequires: libtasn1-devel >= 2.14 @@ -62,7 +62,7 @@ Dokumentacja API biblioteki P11-KIT. %{!?with_apidocs:--disable-gtk-doc} \ --disable-silent-rules \ --with-html-dir=%{_gtkdocdir} \ - --with-system-anchors=/etc/certs/ca-certificates.crt + --with-trust-paths=/etc/certs/ca-certificates.crt %{__make} %install gitweb: http://git.pld-linux.org/gitweb.cgi/packages/p11-kit.git/commitdiff/b95fe76773a61e1d9971ebac21403d7b7546e0a3 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: xfce4-smartbookmark-plugin: xfce4-smartbookmark-plugin-0.4.5.tar.bz2
Files fetched: 1 STORED: http://archive.xfce.org/src/panel-plugins/xfce4-smartbookmark-plugin/0.4/xfce4-smartbookmark-plugin-0.4.5.tar.bz2 820422dfc5c212689b2908e1ff09c548 xfce4-smartbookmark-plugin-0.4.5.tar.bz2 Size: 271402 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/xfce4-smartbookmark-plugin] up to 0.4.5 : 2013/01/20
commit 6880956d37e9b045748401b6a393eeb8abb4c650 Author: Elan Ruusamäe Date: Sun Apr 7 17:35:52 2013 +0300 up to 0.4.5 : 2013/01/20 - Port to libxfce4ui - Build the plugin as a module - Fix broken argument handling (bug #8642) - Save config after destroying the dialog (bug #9523) - Allow numpad enter to trigger the search too (bug #9663) xfce4-smartbookmark-plugin.spec | 30 +++--- 1 file changed, 15 insertions(+), 15 deletions(-) --- diff --git a/xfce4-smartbookmark-plugin.spec b/xfce4-smartbookmark-plugin.spec index 11da282..4e68b4c 100644 --- a/xfce4-smartbookmark-plugin.spec +++ b/xfce4-smartbookmark-plugin.spec @@ -1,24 +1,24 @@ Summary: Xfce panel smartbookmark plugin Summary(pl.UTF-8): Sprytne zakładki dla Xfce panel Name: xfce4-smartbookmark-plugin -Version: 0.4.4 -Release: 3 +Version: 0.4.5 +Release: 1 License: GPL Group: X11/Applications Source0: http://archive.xfce.org/src/panel-plugins/xfce4-smartbookmark-plugin/0.4/%{name}-%{version}.tar.bz2 -# Source0-md5: 273e38306a82f14e1b8c2c5db912f6c3 -Patch0:%{name}-ui.patch +# Source0-md5: 820422dfc5c212689b2908e1ff09c548 URL: http://goodies.xfce.org/projects/panel-plugins/xfce4-smartbookmark-plugin BuildRequires: autoconf BuildRequires: automake BuildRequires: gettext-devel BuildRequires: intltool -BuildRequires: libtool +BuildRequires: libtool >= 2:2.2.6 BuildRequires: libxfce4ui-devel BuildRequires: pkgconfig -BuildRequires: xfce4-dev-tools >= 4.4.0 -BuildRequires: xfce4-panel-devel >= 4.4.0 -Requires: xfce4-panel >= 4.4.0 +BuildRequires: xfce4-dev-tools >= 4.8.0 +BuildRequires: xfce4-panel-devel >= 4.8.0 +Requires: exo +Requires: xfce4-panel >= 4.8.0 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -31,7 +31,8 @@ stron WWW. %prep %setup -q -%patch0 -p1 + +%{__sed} -i -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac %build %{__intltoolize} @@ -45,13 +46,12 @@ stron WWW. %install rm -rf $RPM_BUILD_ROOT - %{__make} install \ DESTDIR=$RPM_BUILD_ROOT -%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/locale/ur_PK +%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/ur_PK -%{__rm} $RPM_BUILD_ROOT%{_libdir}/xfce4/panel-plugins/*.la +%{__rm} $RPM_BUILD_ROOT%{_libdir}/xfce4/panel/plugins/libsmartbookmark.la %find_lang %{name} @@ -60,6 +60,6 @@ rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(644,root,root,755) -%doc AUTHORS ChangeLog README -%attr(755,root,root) %{_libdir}/xfce4/panel-plugins/libsmartbookmark.so -%{_datadir}/xfce4/panel-plugins/smartbookmark.desktop +%doc AUTHORS ChangeLog README NEWS +%attr(755,root,root) %{_libdir}/xfce4/panel/plugins/libsmartbookmark.so +%{_datadir}/xfce4/panel/plugins/smartbookmark.desktop gitweb: http://git.pld-linux.org/gitweb.cgi/packages/xfce4-smartbookmark-plugin.git/commitdiff/6880956d37e9b045748401b6a393eeb8abb4c650 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/pylint] - verbose files/package pylint-gui(1) man in proper package
commit 6abb03ef4ac1099c095aab88b729cc4083989903 Author: Jakub Bogusz Date: Sun Apr 7 16:32:12 2013 +0200 - verbose files/package pylint-gui(1) man in proper package pylint.spec | 9 +++-- 1 file changed, 7 insertions(+), 2 deletions(-) --- diff --git a/pylint.spec b/pylint.spec index dd9890d..919823f 100644 --- a/pylint.spec +++ b/pylint.spec @@ -75,9 +75,14 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %{_bindir}/pyreverse %attr(755,root,root) %{_bindir}/symilar %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pylintrc -%{py_sitescriptdir}/* -%{_mandir}/man1/* +%{py_sitescriptdir}/pylint +%{py_sitescriptdir}/pylint-%{version}-py*.egg-info +%{_mandir}/man1/epylint.1* +%{_mandir}/man1/pylint.1* +%{_mandir}/man1/pyreverse.1* +%{_mandir}/man1/symilar.1* %files gui %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/pylint-gui +%{_mandir}/man1/pylint-gui.1* gitweb: http://git.pld-linux.org/gitweb.cgi/packages/pylint.git/commitdiff/6abb03ef4ac1099c095aab88b729cc4083989903 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/xfce4-eyes-plugin] BR: gettext-devel
commit e67789cd640bad12832026e181b79a0f87da22de Author: Elan Ruusamäe Date: Sun Apr 7 17:27:21 2013 +0300 BR: gettext-devel AUTO: -- configure:11615: error: possibly undefined macro: AM_NLS xfce4-eyes-plugin.spec | 1 + 1 file changed, 1 insertion(+) --- diff --git a/xfce4-eyes-plugin.spec b/xfce4-eyes-plugin.spec index 7f4cfdb..f3a53e5 100644 --- a/xfce4-eyes-plugin.spec +++ b/xfce4-eyes-plugin.spec @@ -10,6 +10,7 @@ Source0: http://archive.xfce.org/src/panel-plugins/xfce4-eyes-plugin/4.4/%{name} URL: http://goodies.xfce.org/projects/panel-plugins/xfce4-eyes-plugin BuildRequires: autoconf >= 2.50 BuildRequires: automake >= 1:1.8 +BuildRequires: gettext-devel BuildRequires: intltool BuildRequires: libtool BuildRequires: libxfce4ui-devel gitweb: http://git.pld-linux.org/gitweb.cgi/packages/xfce4-eyes-plugin.git/commitdiff/e67789cd640bad12832026e181b79a0f87da22de ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/VirtualBox] - cleanup post scriptlets for kernel modules - rel 3
commit ece7f2f1750293d06f06535ee882ca0567c7de89 Author: Jan Rękorajski Date: Sun Apr 7 16:25:52 2013 +0200 - cleanup post scriptlets for kernel modules - rel 3 VirtualBox.spec | 117 +--- 1 file changed, 70 insertions(+), 47 deletions(-) --- diff --git a/VirtualBox.spec b/VirtualBox.spec index c6a2417..f21adb1 100644 --- a/VirtualBox.spec +++ b/VirtualBox.spec @@ -32,7 +32,7 @@ %define_enable_debug_packages 0 %endif -%definerel 2 +%definerel 3 %definepname VirtualBox Summary: VirtualBox - x86 hardware virtualizer Summary(pl.UTF-8): VirtualBox - wirtualizator sprzętu x86 @@ -175,6 +175,15 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) # which lead to 'Stripping ... ELF shared libraries... (...)/nls/qt_ro.qm: File format not recognized' %define_noautostrip.*%{_libdir}/%{name}/.* +%definevbox_kernel_post(d:)\ +if [ -x /etc/rc.d/init.d/%{-d*} ]; then \ + %{expand:%service %%{-d*} restart %%*} \ +else \ + /sbin/rmmod %{-d*} || : \ + /sbin/modprobe -s %{-d*} || : \ +fi \ +%{nil} + %description Oracle VirtualBox is a general-purpose full virtualizer for x86 hardware. Targeted at server, desktop and embedded use, it is now the @@ -726,102 +735,116 @@ if [ "$1" = "0" ]; then %groupremove vbox fi -%post -n kernel%{_alt_kernel}-misc-vboxguest -%depmod %{_kernel_ver} -/sbin/chkconfig --add vboxguest -%service vboxguest restart "VirtualBox Guest additions driver" -%systemd_reload - -%postun-n kernel%{_alt_kernel}-misc-vboxguest -%depmod %{_kernel_ver} - -%preun -n kernel%{_alt_kernel}-misc-vboxguest -if [ "$1" = "0" ]; then - %service vboxguest stop - /sbin/chkconfig --del vboxguest -fi - %post -n kernel%{_alt_kernel}-misc-vboxdrv %depmod %{_kernel_ver} -/sbin/chkconfig --add vboxdrv -%service vboxdrv restart "VirtualBox Support Driver" -%systemd_reload - -%postun-n kernel%{_alt_kernel}-misc-vboxdrv -%depmod %{_kernel_ver} +%vbox_kernel_post -d vboxdrv VirtualBox Support Driver %preun -n kernel%{_alt_kernel}-misc-vboxdrv if [ "$1" = "0" ]; then %service vboxdrv stop - /sbin/chkconfig --del vboxdrv fi -%post -n kernel%{_alt_kernel}-misc-vboxnetadp +%postun-n kernel%{_alt_kernel}-misc-vboxdrv %depmod %{_kernel_ver} -/sbin/chkconfig --add vboxnetadp -%service vboxnetadp restart "VirtualBox Network HostOnly driver" -%systemd_reload -%postun-n kernel%{_alt_kernel}-misc-vboxnetadp +%post -n kernel%{_alt_kernel}-misc-vboxnetadp %depmod %{_kernel_ver} +%vbox_kernel_post -d vboxnetadp VirtualBox Network HostOnly driver %preun -n kernel%{_alt_kernel}-misc-vboxnetadp if [ "$1" = "0" ]; then %service vboxnetadp stop - /sbin/chkconfig --del vboxnetadp fi -%post -n kernel%{_alt_kernel}-misc-vboxnetflt +%postun-n kernel%{_alt_kernel}-misc-vboxnetadp %depmod %{_kernel_ver} -/sbin/chkconfig --add vboxnetflt -%service vboxnetflt restart "VirtualBox Network Filter driver" -%systemd_reload -%postun-n kernel%{_alt_kernel}-misc-vboxnetflt +%post -n kernel%{_alt_kernel}-misc-vboxnetflt %depmod %{_kernel_ver} +%vbox_kernel_post -d vboxnetflt VirtualBox Network Filter driver %preun -n kernel%{_alt_kernel}-misc-vboxnetflt if [ "$1" = "0" ]; then %service vboxnetflt stop - /sbin/chkconfig --del vboxnetflt fi -%post -n kernel%{_alt_kernel}-misc-vboxpci +%postun-n kernel%{_alt_kernel}-misc-vboxnetflt %depmod %{_kernel_ver} -/sbin/chkconfig --add vboxpci -%service vboxnetflt restart "VirtualBox PCI passthrough driver" -%systemd_reload -%postun-n kernel%{_alt_kernel}-misc-vboxpci +%post -n kernel%{_alt_kernel}-misc-vboxpci %depmod %{_kernel_ver} +%vbox_kernel_post -d vboxpci VirtualBox PCI passthrough driver %preun -n kernel%{_alt_kernel}-misc-vboxpci if [ "$1" = "0" ]; then %service vboxpci stop - /sbin/chkconfig --del vboxpci fi -%post -n kernel%{_alt_kernel}-misc-vboxsf +%postun-n kernel%{_alt_kernel}-misc-vboxpci %depmod %{_kernel_ver} -/sbin/chkconfig --add vboxsf -%service vboxsf restart "VirtualBox Host file system access (Shared Folders)" -%systemd_reload -%postun-n kernel%{_alt_kernel}-misc-vboxsf +%post -n kernel%{_alt_kernel}-misc-vboxguest +%depmod %{_kernel_ver} +%vbox_kernel_post -d vboxguest VirtualBox Guest additions driver + +%preun -n kernel%{_alt_kernel}-misc-vboxguest +if [ "$1" = "0" ]; then + %service vboxguest stop +fi + +%postun-n kernel%{_alt_kernel}-misc-vboxguest %depmod %{_kernel_ver} +%post -n kernel%{_alt_kernel}-misc-vboxsf +%depmod %{_kernel_ver} +%vbox_kernel_post -d vboxsf VirtualBox Host file system access (Shared Folders) + %preun -n kernel%{_alt_kernel}-misc-vboxsf if [ "$1" = "0" ]; then %service vboxsf stop - /s
DISTFILES: xfce4-eyes-plugin: xfce4-eyes-plugin-4.4.2.tar.bz2
Files fetched: 1 STORED: http://archive.xfce.org/src/panel-plugins/xfce4-eyes-plugin/4.4/xfce4-eyes-plugin-4.4.2.tar.bz2 1ef352c68dd8929c9e8743200b758b3c xfce4-eyes-plugin-4.4.2.tar.bz2 Size: 308935 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/xfce4-eyes-plugin] up to 4.4.2. Build the plugin as a module.
commit b786fc699405e533b8a97e08f1cd70e68e7cd96c Author: Elan Ruusamäe Date: Sun Apr 7 17:24:14 2013 +0300 up to 4.4.2. Build the plugin as a module. xfce4-eyes-plugin-ui.patch | 54 -- xfce4-eyes-plugin.spec | 21 +- 2 files changed, 10 insertions(+), 65 deletions(-) --- diff --git a/xfce4-eyes-plugin.spec b/xfce4-eyes-plugin.spec index b075fca..7f4cfdb 100644 --- a/xfce4-eyes-plugin.spec +++ b/xfce4-eyes-plugin.spec @@ -1,13 +1,12 @@ Summary: A eyes plugin for Xfce panel Summary(pl.UTF-8): Wtyczka eyes dla panelu Xfce Name: xfce4-eyes-plugin -Version: 4.4.1 -Release: 3 +Version: 4.4.2 +Release: 1 License: GPL v2 Group: X11/Applications Source0: http://archive.xfce.org/src/panel-plugins/xfce4-eyes-plugin/4.4/%{name}-%{version}.tar.bz2 -# Source0-md5: dcbf6ea9035d379d168b479be0d09f14 -Patch0:%{name}-ui.patch +# Source0-md5: 1ef352c68dd8929c9e8743200b758b3c URL: http://goodies.xfce.org/projects/panel-plugins/xfce4-eyes-plugin BuildRequires: autoconf >= 2.50 BuildRequires: automake >= 1:1.8 @@ -17,7 +16,7 @@ BuildRequires:libxfce4ui-devel BuildRequires: pkgconfig BuildRequires: rpmbuild(macros) >= 1.601 BuildRequires: xfce4-dev-tools >= 4.4.0 -BuildRequires: xfce4-panel-devel >= 4.4.0 +BuildRequires: xfce4-panel-devel >= 4.9.0 Requires: gtk-update-icon-cache Requires: hicolor-icon-theme BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -31,7 +30,6 @@ użytkownika. %prep %setup -q -%patch0 -p1 %build %{__intltoolize} @@ -46,11 +44,12 @@ użytkownika. %install rm -rf $RPM_BUILD_ROOT - %{__make} install \ DESTDIR=$RPM_BUILD_ROOT -%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/locale/ur_PK +%{__rm} $RPM_BUILD_ROOT%{_libdir}/xfce4/panel/plugins/libeyes.la + +%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/ur_PK %find_lang %{name} @@ -65,8 +64,8 @@ rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(644,root,root,755) -%doc AUTHORS ChangeLog README -%attr(755,root,root) %{_libdir}/xfce4/panel-plugins/xfce4-eyes-plugin -%{_datadir}/xfce4/panel-plugins/eyes.desktop +%doc AUTHORS ChangeLog README NEWS +%attr(755,root,root) %{_libdir}/xfce4/panel/plugins/libeyes.so +%{_datadir}/xfce4/panel/plugins/eyes.desktop %{_datadir}/xfce4/eyes %{_iconsdir}/hicolor/*/apps/xfce4-eyes.png diff --git a/xfce4-eyes-plugin-ui.patch b/xfce4-eyes-plugin-ui.patch deleted file mode 100644 index c60cb2c..000 --- a/xfce4-eyes-plugin-ui.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff -ur xfce4-eyes-plugin-4.4.1-orig/configure.ac xfce4-eyes-plugin-4.4.1/configure.ac xfce4-eyes-plugin-4.4.1-orig/configure.ac 2010-12-17 17:38:26.0 +0100 -+++ xfce4-eyes-plugin-4.4.1/configure.ac 2011-03-01 11:48:12.466067636 +0100 -@@ -61,7 +61,7 @@ - dnl *** - XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.6.0]) - XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.6.0]) --XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.3.90.2]) -+XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.8.0]) - XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.3.90.2]) - XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.99.1]) - -diff -ur xfce4-eyes-plugin-4.4.1-orig/panel-plugin/eyes.c xfce4-eyes-plugin-4.4.1/panel-plugin/eyes.c xfce4-eyes-plugin-4.4.1-orig/panel-plugin/eyes.c 2010-12-17 04:48:17.0 +0100 -+++ xfce4-eyes-plugin-4.4.1/panel-plugin/eyes.c2011-03-01 11:22:54.644067640 +0100 -@@ -33,7 +33,7 @@ - #include - - #include --#include -+#include - - #include "eyes.h" - #include "themes.h" -diff -ur xfce4-eyes-plugin-4.4.1-orig/panel-plugin/eyes.h xfce4-eyes-plugin-4.4.1/panel-plugin/eyes.h xfce4-eyes-plugin-4.4.1-orig/panel-plugin/eyes.h 2010-12-17 04:48:17.0 +0100 -+++ xfce4-eyes-plugin-4.4.1/panel-plugin/eyes.h2011-03-01 11:27:42.255067643 +0100 -@@ -19,7 +19,7 @@ - #define __EYES_H__ - - #include --#include -+#include - - typedef struct - { -diff -ur xfce4-eyes-plugin-4.4.1-orig/panel-plugin/Makefile.am xfce4-eyes-plugin-4.4.1/panel-plugin/Makefile.am xfce4-eyes-plugin-4.4.1-orig/panel-plugin/Makefile.am 2010-12-17 04:48:17.0 +0100 -+++ xfce4-eyes-plugin-4.4.1/panel-plugin/Makefile.am 2011-03-01 11:42:08.074067641 +0100 -@@ -13,12 +13,12 @@ - themes.c - - xfce4_eyes_plugin_CFLAGS =\ -- $(LIBXFCEGUI4_CFLAGS) \ -+ $(LIBXFCE4UI_CFLAGS)\ - $(LIBXFCE4PANEL_CFLAGS) - - xfce4_eyes_plugin_LDADD = \ - $(LIBXFCE4PANEL_LIBS) \ -- $(LIBXFCEGUI4_LIBS) -+ $(LIBXFCE4UI_LIBS) - - desktopdir = $(datadir)/xfce4/panel-plugins - desktop_in_in_files = eyes.desktop
DISTFILES: qdigidoc: qdigidoc-0.4.1.tar.bz2
Files fetched: 1 STORED: http://esteid.googlecode.com/files/qdigidoc-0.4.1.tar.bz2 a4bb53bcd00a4b1914c028e3bd2b3872 qdigidoc-0.4.1.tar.bz2 Size: 512687 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/qdigidoc] - up to 0.4.1 - removed applied patch
commit ea84a298210d9181416a6a49b100f632d90cb055 Author: Lukasz Glebicki Date: Sun Apr 7 16:24:42 2013 +0200 - up to 0.4.1 - removed applied patch qdigidoc.spec | 9 - 1 file changed, 4 insertions(+), 5 deletions(-) --- diff --git a/qdigidoc.spec b/qdigidoc.spec index 794bfdc..27e2b08 100644 --- a/qdigidoc.spec +++ b/qdigidoc.spec @@ -1,15 +1,14 @@ %defineqtver 4.4.0 Summary: Estonian digital signature application Name: qdigidoc -Version: 0.4.0 -Release: 6 +Version: 0.4.1 +Release: 1 License: LGPL v2+ Group: X11/Applications URL: http://code.google.com/p/esteid/ Source0: http://esteid.googlecode.com/files/%{name}-%{version}.tar.bz2 -# Source0-md5: bf6fc905f5c806c1309d5e2861fe840e +# Source0-md5: a4bb53bcd00a4b1914c028e3bd2b3872 Patch0:desktop.patch -Patch1:%{name}-nautilus-extensions-dir.patch BuildRequires: QtWebKit-devel >= %{qtver} BuildRequires: cmake BuildRequires: desktop-file-utils @@ -55,7 +54,6 @@ This package contains the qdigidoc extension for Konqueror. %prep %setup -q %patch0 -p1 -%patch1 -p1 %build install -d build @@ -93,6 +91,7 @@ rm -rf $RPM_BUILD_ROOT %{_desktopdir}/*.desktop %{_datadir}/mime/packages/*.xml %{_iconsdir}/hicolor/*/*/*.png +%{_mandir}/man1/qdig* %files -n nautilus-%{name} -f nautilus-qdigidoc.lang %defattr(644,root,root,755) gitweb: http://git.pld-linux.org/gitweb.cgi/packages/qdigidoc.git/commitdiff/ea84a298210d9181416a6a49b100f632d90cb055 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/gnome-abrt] - added pylint patch, but still fails (looks like false positive)
commit 11bdae2fc6a928f2f894de8bc6760e4205237de6 Author: Jakub Bogusz Date: Sun Apr 7 16:25:05 2013 +0200 - added pylint patch, but still fails (looks like false positive) gnome-abrt-pylint.patch | 11 +++ gnome-abrt.spec | 5 - 2 files changed, 15 insertions(+), 1 deletion(-) --- diff --git a/gnome-abrt.spec b/gnome-abrt.spec index 58598af..7f4d395 100644 --- a/gnome-abrt.spec +++ b/gnome-abrt.spec @@ -1,6 +1,6 @@ # # Conditional build: -%bcond_without tests # "make check" run +%bcond_withtests # "make check" run (some pylint false positive?) # Summary: A utility for viewing problems that have occurred with the system Summary(pl.UTF-8): Narzędzie do przeglądania problemów, które wystąpiły w systemie @@ -11,12 +11,14 @@ License:GPL v2+ Group: Applications/System Source0: https://fedorahosted.org/released/abrt/%{name}-%{version}.tar.gz # Source0-md5: 9cdb88de911163980add38fad1e3df72 +Patch0:%{name}-pylint.patch URL: https://fedorahosted.org/abrt/ BuildRequires: asciidoc BuildRequires: gettext-devel >= 0.17 BuildRequires: gtk+3-devel >= 3.0 BuildRequires: intltool >= 0.35.0 BuildRequires: libreport-gtk-devel >= 2.0.19 +%{?with_tests:BuildRequires: libreport-python} BuildRequires: pkgconfig %{?with_tests:BuildRequires: pylint} BuildRequires: python-devel >= 1:2.7 @@ -40,6 +42,7 @@ zapewniająca wygodny sposób zarządzania tymi problemami. %prep %setup -q +%patch0 -p1 %build %configure \ diff --git a/gnome-abrt-pylint.patch b/gnome-abrt-pylint.patch new file mode 100644 index 000..01f1fed --- /dev/null +++ b/gnome-abrt-pylint.patch @@ -0,0 +1,11 @@ +--- gnome-abrt-0.2.10/src/gnome-abrt.orig 2013-03-26 13:28:58.0 +0100 gnome-abrt-0.2.10/src/gnome-abrt 2013-04-07 13:40:20.995848644 +0200 +@@ -71,7 +71,7 @@ + self._app = application + + @dbus.service.method(dbus_interface=GNOME_ABRT_INTERFACE, +- in_signature='as', out_signature='') ++ in_signature = 'as', out_signature = '') + def command_line(self, argv): + """DBus service method accepting a new command line arguments + """ gitweb: http://git.pld-linux.org/gitweb.cgi/packages/gnome-abrt.git/commitdiff/11bdae2fc6a928f2f894de8bc6760e4205237de6 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/libgda5] - added patch to fix documentation building issues - disable broken Vala support - added to TODO
commit e9d229a1a6ba4f969b8d4b7b34289eb06922a752 Author: Łukasz Kieś Date: Sun Apr 7 16:20:49 2013 +0200 - added patch to fix documentation building issues - disable broken Vala support - added to TODO doc-fixes.patch | 23 +++ libgda5.spec| 6 -- 2 files changed, 27 insertions(+), 2 deletions(-) --- diff --git a/libgda5.spec b/libgda5.spec index 27211dd..9482d56 100644 --- a/libgda5.spec +++ b/libgda5.spec @@ -1,9 +1,9 @@ -# TODO: oracle, bdbsql providers +# TODO: oracle, bdbsql providers; fix broken Vala support? # # Conditional build: %bcond_without apidocs # don't generate API documentation %bcond_without static_libs # don't build static libraries -%bcond_without vala# Vala support +%bcond_withvala# Vala support # - database plugins: %bcond_without jdbc# build without JDBC plugin %bcond_without ldap# build without LDAP plugin @@ -27,6 +27,7 @@ Source0: http://ftp.gnome.org/pub/GNOME/sources/libgda/5.0/libgda-%{version}.tar Patch0:%{name}-configure.patch Patch1:gi.patch Patch2:graphviz-api.patch +Patch3:doc-fixes.patch URL: http://www.gnome-db.org/ BuildRequires: autoconf >= 2.67 BuildRequires: automake >= 1:1.8 @@ -318,6 +319,7 @@ Narzędzia graficzne dla GDA. %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build # included version is bash-specific, use system file diff --git a/doc-fixes.patch b/doc-fixes.patch new file mode 100644 index 000..813fa64 --- /dev/null +++ b/doc-fixes.patch @@ -0,0 +1,23 @@ +diff -uNr libgda-5.0.3.old/doc/C/libgda-5.0-docs.sgml libgda-5.0.3/doc/C/libgda-5.0-docs.sgml +--- libgda-5.0.3.old/doc/C/libgda-5.0-docs.sgml2012-01-24 19:39:55.0 +0100 libgda-5.0.3/doc/C/libgda-5.0-docs.sgml2013-04-07 15:55:37.155192668 +0200 +@@ -310,7 +310,6 @@ + + + +- + + + +diff -uNr libgda-5.0.3.old/tools/browser/doc/gda-browser-docs.sgml libgda-5.0.3/tools/browser/doc/gda-browser-docs.sgml +--- libgda-5.0.3.old/tools/browser/doc/gda-browser-docs.sgml 2012-01-24 19:06:49.0 +0100 libgda-5.0.3/tools/browser/doc/gda-browser-docs.sgml 2013-04-07 15:30:00.193516920 +0200 +@@ -161,7 +161,7 @@ + + + Appendix +- ++ + + + gitweb: http://git.pld-linux.org/gitweb.cgi/packages/libgda5.git/commitdiff/e9d229a1a6ba4f969b8d4b7b34289eb06922a752 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/qdigidoc] - removed applied qdigidoc-nautilus-extensions-dir.patch - added two manuals - up to 0.4.1
commit 0a1cc2d55704961cf787d999292c494a7e34ab81 Author: Lukasz Glebicki Date: Sun Apr 7 16:19:38 2013 +0200 - removed applied qdigidoc-nautilus-extensions-dir.patch - added two manuals - up to 0.4.1 qdigidoc-nautilus-extensions-dir.patch | 8 1 file changed, 8 deletions(-) --- diff --git a/qdigidoc-nautilus-extensions-dir.patch b/qdigidoc-nautilus-extensions-dir.patch deleted file mode 100644 index 4fd92bf..000 --- a/qdigidoc-nautilus-extensions-dir.patch +++ /dev/null @@ -1,8 +0,0 @@ qdigidoc-0.4.0/client/nautilus/CMakeLists.txt.orig 2011-05-20 20:43:28.408950058 +0200 -+++ qdigidoc-0.4.0/client/nautilus/CMakeLists.txt 2011-05-20 20:44:34.031927880 +0200 -@@ -6,4 +6,4 @@ find_package(Gettext) - file(GLOB PO_FILES po/*.po) - gettext_create_translations(po/nautilus-qdigidoc.pot ALL ${PO_FILES}) - --install(FILES nautilus-qdigidoc.py DESTINATION ${LIB_INSTALL_DIR}/nautilus/extensions-2.0/python/) -+install(FILES nautilus-qdigidoc.py DESTINATION ${SHARE_INSTALL_PREFIX}/nautilus-python/extensions/) gitweb: http://git.pld-linux.org/gitweb.cgi/packages/qdigidoc.git/commitdiff/0a1cc2d55704961cf787d999292c494a7e34ab81 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: crossmingw32-evil: evil-1.7.6.tar.bz2
Files fetched: 1 STORED: http://download.enlightenment.org/releases/evil-1.7.6.tar.bz2 869f827d33e86bd912c006a85d3f9504 evil-1.7.6.tar.bz2 Size: 459617 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