Hello community,
here is the log from the commit of package php5-pear-Crypt_Blowfish for
openSUSE:Factory checked in at 2012-02-02 17:59:15
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/php5-pear-Crypt_Blowfish (Old)
and /work/SRC/openSUSE:Factory/.php5-pear-Crypt_Blowfish.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "php5-pear-Crypt_Blowfish", Maintainer is ""
Changes:
--------
---
/work/SRC/openSUSE:Factory/php5-pear-Crypt_Blowfish/php5-pear-Crypt_Blowfish.changes
2011-09-23 12:39:51.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.php5-pear-Crypt_Blowfish.new/php5-pear-Crypt_Blowfish.changes
2012-02-02 17:59:18.000000000 +0100
@@ -1,0 +2,5 @@
+Thu Jan 12 11:30:50 UTC 2012 - [email protected]
+
+- change license to be in spdx.org format
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ php5-pear-Crypt_Blowfish.spec ++++++
--- /var/tmp/diff_new_pack.uz2NgD/_old 2012-02-02 17:59:19.000000000 +0100
+++ /var/tmp/diff_new_pack.uz2NgD/_new 2012-02-02 17:59:19.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package php5-pear-Crypt_Blowfish
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -15,28 +15,29 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
-
-Name: php5-pear-Crypt_Blowfish
%define pear_name Crypt_Blowfish
%define pear_sname crypt_blowfish
-Summary: Two-way blowfish encryption without requiring the MCrypt PHP
extension
+%define peardir %(pear config-get php_dir 2> /dev/null || echo
%{_datadir}/pear)
+%define xmldir /var/lib/pear
+
+Summary: Allows for quick two-way blowfish encryption without the
MCrypt PHP extension
+License: BSD-3-Clause
+Group: Development/Libraries/PHP
+
+Name: php5-pear-Crypt_Blowfish
Version: 1.1.0RC2
-Release: 1
-License: New BSD License
-Group: Productivity/Networking/Web/Servers
-BuildArch: noarch
-Url: http://pear.php.net/package/%{pear_name}
-Source: %{pear_name}-%{version}.tgz
+Release: 0
+Source0: http://pear.php.net/get/Crypt_Blowfish-%{version}.tgz
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-BuildRequires: php-macros
-BuildRequires: php >= 4.3.2
-BuildRequires: php5-pear >= 1.7.2
+Url: http://pear.php.net/package/Crypt_Blowfish
+BuildRequires: php5 >= 1.4.7
+BuildRequires: php5-pear
+Requires: php5-pear php5 >= 1.4.7
+BuildArch: noarch
Requires: php >= 4.3.2
Requires: php5-pear
Suggests: php5-mcrypt
-Provides: php-pear-%{pear_name} pear-%{pear_name}
# Fix for renaming (package convention)
Provides: php5-pear-%{pear_sname} = %{version}
Provides: php-pear-%{pear_sname} = %{version}
@@ -46,61 +47,55 @@
Obsoletes: pear-%{pear_sname} < %{version}
%description
-Allows for quick two-way blowfish encryption without requiring the MCrypt PHP
extension
-
-This package allows you to perform two-way blowfish encryption on the fly
using only PHP. This package does not require the MCrypt PHP extension to work,
although it can make use of it if available.
-
-Maintainers
-
-* Philippe Jausions (lead)
-* Matthew Fonda (lead, inactive)
+This package allows you to perform two-way blowfish encryption on the fly
+using only PHP. This package does not require the MCrypt PHP extension to
+work, although it can make use of it if available.
%prep
-%setup -c
+%setup -c -T
+pear -v -c pearrc \
+ -d php_dir=%{peardir} \
+ -d doc_dir=/docs \
+ -d bin_dir=%{_bindir} \
+ -d data_dir=%{peardir}/data \
+ -d test_dir=%{peardir}/tests \
+ -d ext_dir=%{_libdir} \
+ -s
%build
%install
-%{__mv} package*.xml %{pear_name}-%{version}
-cd %{pear_name}-%{version}
-PHP_PEAR_PHP_BIN="$(which php) -d memory_limit=50m"
-%{__pear} -v \
- -d doc_dir=/doc \
- -d bin_dir=%{_bindir} \
- -d data_dir=%{php_peardir}/data \
- install --offline --nodeps -R "%{buildroot}" package.xml
-
-%{__install} -D -m 0644 package.xml
%{buildroot}%{php_pearxmldir}/%{pear_name}.xml
-
-%{__rm} -rf %{buildroot}/{doc,tmp}
-%{__rm} -rf
%{buildroot}%{php_peardir}/.{filemap,lock,registry,channels,depdb,depdblock}
-# remove data, LICENSE to docdir
-%{__rm} -rf $RPM_BUILD_ROOT/%{php_peardir}/data
+pear -c pearrc install --nodeps --packagingroot %{buildroot} %{SOURCE0}
-cd ..
+# Clean up unnecessary files
+rm pearrc
+rm %{buildroot}/%{peardir}/.filemap
+rm %{buildroot}/%{peardir}/.lock
+rm -rf %{buildroot}/%{peardir}/.registry
+rm -rf %{buildroot}%{peardir}/.channels
+rm %{buildroot}%{peardir}/.depdb
+rm %{buildroot}%{peardir}/.depdblock
+
+# Install XML package description
+mkdir -p %{buildroot}%{xmldir}
+tar -xzf %{SOURCE0} package.xml
+cp -p package.xml %{buildroot}%{xmldir}/Crypt_Blowfish.xml
-%php_pear_gen_filelist
+%clean
+rm -rf %{buildroot}
%post
-# on `rpm -ivh` PARAM is 1
-# on `rpm -Uvh` PARAM is 2
-if [ "$1" = "1" ]; then
- %{__pear} install --nodeps --soft --force --register-only
%{php_pearxmldir}/%{pear_name}.xml
-fi
-if [ "$1" = "2" ]; then
- %{__pear} upgrade --offline --register-only
%{php_pearxmldir}/%{pear_name}.xml
-fi
+pear install --nodeps --soft --force --register-only
%{xmldir}/Crypt_Blowfish.xml
%postun
-# on `rpm -e` PARAM is 0
-if [ "$1" = "0" ]; then
- %{__pear} uninstall --nodeps --ignore-errors --register-only
pear.php.net/%{pear_name}
+if [ "$1" -eq "0" ]; then
+ pear uninstall --nodeps --ignore-errors --register-only
pear.php.net/Crypt_Blowfish
fi
-%clean
-%{__rm} -rf %{buildroot}
+%files
+%defattr(-,root,root)
-%files -f %{name}.files
-%defattr(-, root, root)
+%{peardir}/*
+%{xmldir}/Crypt_Blowfish.xml
%changelog
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
