Hello community,
here is the log from the commit of package php5-pear-Date_Holidays_Germany for
openSUSE:Factory checked in at 2014-11-07 09:06:05
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/php5-pear-Date_Holidays_Germany (Old)
and /work/SRC/openSUSE:Factory/.php5-pear-Date_Holidays_Germany.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "php5-pear-Date_Holidays_Germany"
Changes:
--------
---
/work/SRC/openSUSE:Factory/php5-pear-Date_Holidays_Germany/php5-pear-Date_Holidays_Germany.changes
2012-02-16 10:07:34.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.php5-pear-Date_Holidays_Germany.new/php5-pear-Date_Holidays_Germany.changes
2014-11-07 09:06:35.000000000 +0100
@@ -1,0 +2,7 @@
+Thu Nov 6 10:39:32 UTC 2014 - [email protected]
+
+- Fixed download link to make the package includeable in factory
+- Removed php-macros from buildrequires, simplified installation
+- Improved includes for php-pear
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ php5-pear-Date_Holidays_Germany.spec ++++++
--- /var/tmp/diff_new_pack.RKec8s/_old 2014-11-07 09:06:36.000000000 +0100
+++ /var/tmp/diff_new_pack.RKec8s/_new 2014-11-07 09:06:36.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package php5-pear-Date_Holidays_Germany
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 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
@@ -16,36 +16,42 @@
#
-Name: php5-pear-Date_Holidays_Germany
+%{!?pear_phpdir: %{expand: %%global pear_phpdir %(pear config-get php_dir
2> /dev/null)}}
+%{!?pear_xmldir: %{expand: %%global pear_xmldir /var/lib/pear}}
+%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
+
%define pear_name Date_Holidays_Germany
%define pear_sname date_holidays_germany
-Summary: Driver class to calculate holidays in Germoney
+
+Name: php5-pear-%{pear_name}
+Summary: Driver class to calculate holidays in Germany
License: PHP-3.01
Group: Productivity/Networking/Web/Servers
Version: 0.1.2
Release: 0
BuildArch: noarch
Url: http://pear.php.net/package/%{pear_name}
-Source: %{pear_name}-%{version}.tgz
+Source:
http://download.pear.php.net/package/%{pear_name}-%{version}.tgz
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: php >= 4.2.0
-BuildRequires: php-macros
BuildRequires: php5-pear
-Requires: php5-pear
Requires: php >= 4.2.0
+Requires(post): php-pear
+Requires(postun): php-pear
Requires: php5-pear-Date_Holidays
-Provides: php-pear-%{pear_name} pear-%{pear_name}
+Provides: pear-%{pear_name}
+Provides: php-pear-%{pear_name}
# Fix for renaming (package convention)
-Provides: php5-pear-%{pear_sname} = %{version}
-Provides: php-pear-%{pear_sname} = %{version}
Provides: pear-%{pear_sname} = %{version}
-Obsoletes: php5-pear-%{pear_sname} < %{version}
-Obsoletes: php-pear-%{pear_sname} < %{version}
+Provides: php-pear-%{pear_sname} = %{version}
+Provides: php5-pear-%{pear_sname} = %{version}
Obsoletes: pear-%{pear_sname} < %{version}
+Obsoletes: php-pear-%{pear_sname} < %{version}
+Obsoletes: php5-pear-%{pear_sname} < %{version}
%description
Date_Holidays helps you calculate the dates and titles of holidays and other
special celebrations.
-This is the driver for Austria
+This is the driver for Germany
%prep
%setup -c
@@ -53,22 +59,10 @@
%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
-
+%{__pear} -d date.timezone=UTC install --nodeps --offline --packagingroot
%{buildroot} package.xml
+%{__install} -D -m 0644 package.xml %{buildroot}%{pear_xmldir}/%{pear_name}.xml
%{__rm} -rf %{buildroot}/{doc,tmp}
-%{__rm} -rf
"%{buildroot}"/%{php_peardir}/.{filemap,lock,registry,channels,depdb,depdblock}
-cd ..
-
-%php_pear_gen_filelist
+%{__rm} -rf
"%{buildroot}"/%{pear_phpdir}/.{filemap,lock,registry,channels,depdb,depdblock}
%check
%{__pear} run-tests
@@ -77,10 +71,10 @@
# 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
+ %{__pear} install --nodeps --soft --force --register-only
%{pear_xmldir}/%{pear_name}.xml
fi
if [ "$1" = "2" ]; then
- %{__pear} upgrade --offline --register-only
%{php_pearxmldir}/%{pear_name}.xml
+ %{__pear} upgrade --offline --register-only %{pear_xmldir}/%{pear_name}.xml
fi
%postun
@@ -92,7 +86,9 @@
%clean
%{__rm} -rf %{buildroot}
-%files -f %{name}.files
+%files
%defattr(-, root, root)
+%{pear_phpdir}/*
+%{pear_xmldir}/%{pear_name}.xml
%changelog
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
