From 9a79e22a90407036a43ee705d15f1c68f0e4cde0802f47687e44ba29aabaccc8 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Fri, 15 Jan 2010 13:57:22 +0000 Subject: [PATCH 1/7] Accepting request 29661 from home:vuntz:branches:GNOME:Factory Copy from home:vuntz:branches:GNOME:Factory/epiphany-branding-openSUSE via accept of submit request 29661 revision 9. Request was accepted with message: ok OBS-URL: https://build.opensuse.org/request/show/29661 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/epiphany-branding-openSUSE?expand=0&rev=15 --- COPYING | 340 +++++++++++++++++++++++++++++ branding.conf.in | 4 + epiphany-branding-SLED.changes | 51 +++++ epiphany-branding-SLED.spec | 84 +++++++ epiphany-branding-openSUSE.changes | 12 + epiphany-branding-openSUSE.spec | 54 +++-- epiphany-branding.changes | 51 +++++ epiphany-branding.spec.in | 83 +++++++ pre_checkin.sh | 16 ++ sled-bookmarks.patch | 21 ++ 10 files changed, 699 insertions(+), 17 deletions(-) create mode 100644 COPYING create mode 100644 branding.conf.in create mode 100644 epiphany-branding-SLED.changes create mode 100644 epiphany-branding-SLED.spec create mode 100644 epiphany-branding.changes create mode 100644 epiphany-branding.spec.in create mode 100644 pre_checkin.sh create mode 100644 sled-bookmarks.patch diff --git a/COPYING b/COPYING new file mode 100644 index 0000000..927f7f2 --- /dev/null +++ b/COPYING @@ -0,0 +1,340 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) 19yy + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) 19yy name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. diff --git a/branding.conf.in b/branding.conf.in new file mode 100644 index 0000000..af81743 --- /dev/null +++ b/branding.conf.in @@ -0,0 +1,4 @@ +[User Agent] +Vendor=SUSE +VendorSub=@distroversion@ +VendorComment=@pkgversion@ diff --git a/epiphany-branding-SLED.changes b/epiphany-branding-SLED.changes new file mode 100644 index 0000000..1d3fbcf --- /dev/null +++ b/epiphany-branding-SLED.changes @@ -0,0 +1,51 @@ +------------------------------------------------------------------- +Fri Jan 15 03:58:43 CET 2010 - vuntz@opensuse.org + +- Merge openSUSE and SLED branding packaging, and generate the + packages from the same sources. +- Change version to 11.3. +- Add COPYING file. +- Add branding.conf.in: with a recent epiphany, we can change the + user agent with a simple file. +- Add BuildRequires on lsb-release and openSUSE-release to get the + version of the distribution, to put in the user agent. + +------------------------------------------------------------------- +Wed Aug 26 12:53:54 CEST 2009 - mls@suse.de + +- make patch0 usage consistent + +------------------------------------------------------------------- +Thu Aug 13 14:55:52 CEST 2009 - vuntz@novell.com + +- Respin opensuse-bookmarks.patch to apply to latest epiphany. + +------------------------------------------------------------------- +Mon Aug 3 23:10:28 CEST 2009 - vuntz@novell.com + +- Update for epiphany webkit change: the user agent isn't set here + anymore (it's set in gconf2-branding). +- Bump version to 11.2. + +------------------------------------------------------------------- +Tue Nov 4 13:48:43 CET 2008 - vuntz@novell.com + +- Bump version to 11.1. Part of bnc#440849. + +------------------------------------------------------------------- +Mon Oct 6 15:56:53 CEST 2008 - sbrabec@suse.cz + +- Conflict with other branding providers (FATE#304881). + +------------------------------------------------------------------- +Thu Sep 11 02:18:59 CEST 2008 - vuntz@novell.com + +- Add more openSUSE bookmarks. +- Clean up spec file. + +------------------------------------------------------------------- +Tue Jul 29 16:00:03 CEST 2008 - vuntz@novell.com + +- New package. +- Add openSUSE documentation bookmark. (fate#305003) + diff --git a/epiphany-branding-SLED.spec b/epiphany-branding-SLED.spec new file mode 100644 index 0000000..c8e1976 --- /dev/null +++ b/epiphany-branding-SLED.spec @@ -0,0 +1,84 @@ +# +# spec file for package epiphany-branding-openSUSE (Version 11.3) +# +# Copyright (c) 2009 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 +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + +%define build_openSUSE 0 +%define build_SLED 1 + +# Do not edit this auto generated file! Edit epiphany-branding.spec.in. +Name: epiphany-branding-SLED +License: GPL v2 or later +Version: 11.3 +Release: 1 +Summary: SLED branding of epiphany +Group: Productivity/Networking/Web/Browsers +Source0: COPYING +Source1: branding.conf.in +# PATCH-FEATURE-OPENSUSE opensuse-bookmarks.patch vuntz@novell.com -- Add openSUSE bookmarks +Patch0: opensuse-bookmarks.patch +# PATCH-FEATURE-SLED sled-bookmarks.patch vuntz@novell.com -- Add SLED bookmarks +Patch1: sled-bookmarks.patch +BuildRequires: epiphany +# To be in sync with upstream defaults, do branding as a patch for upstream file. +# WARNING: As this package conflicts with epiphany-branding-SLED, you cannot +# reuse build root. You have to build in a clean build root every time! +BuildRequires: epiphany-branding-upstream +%if 0%{suse_version} > 1110 +BuildRequires: lsb-release +%else +BuildRequires: lsb +%endif +BuildRequires: SLED-release +%define distro_version %(lsb_release -r -s) +%define epiphany_version %(rpm -q --qf '%%{version}-%%{release}' epiphany) +Provides: epiphany-branding = %{epiphany_version} +Conflicts: otherproviders(epiphany-branding) +Supplements: packageand(epiphany:branding-SLED) +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch + +%description +This package provides SLED Look and Feel for Epiphany. + +%prep +cp -a %{_datadir}/epiphany/default-bookmarks.rdf . +%if %build_openSUSE +%patch0 +%endif +%if %build_SLED +%patch1 +%endif +cp -a %{SOURCE0} . + +%build +sed "s,@distroversion@,%{distro_version},g;s,@pkgversion@,%{epiphany_version},g" %{SOURCE1} > branding.conf + +%install +# custom bookmarks +install -D -m0644 default-bookmarks.rdf %{buildroot}%{_datadir}/epiphany/default-bookmarks.rdf +# user agent +install -D -m0644 branding.conf %{buildroot}%{_datadir}/epiphany/branding.conf + +%clean +rm -rf %{buildroot} + +%files +%defattr(-,root,root) +%doc COPYING +%{_datadir}/epiphany/default-bookmarks.rdf +%{_datadir}/epiphany/branding.conf + +%changelog diff --git a/epiphany-branding-openSUSE.changes b/epiphany-branding-openSUSE.changes index 5c09449..1d3fbcf 100644 --- a/epiphany-branding-openSUSE.changes +++ b/epiphany-branding-openSUSE.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Fri Jan 15 03:58:43 CET 2010 - vuntz@opensuse.org + +- Merge openSUSE and SLED branding packaging, and generate the + packages from the same sources. +- Change version to 11.3. +- Add COPYING file. +- Add branding.conf.in: with a recent epiphany, we can change the + user agent with a simple file. +- Add BuildRequires on lsb-release and openSUSE-release to get the + version of the distribution, to put in the user agent. + ------------------------------------------------------------------- Wed Aug 26 12:53:54 CEST 2009 - mls@suse.de diff --git a/epiphany-branding-openSUSE.spec b/epiphany-branding-openSUSE.spec index a2453c4..68b0a43 100644 --- a/epiphany-branding-openSUSE.spec +++ b/epiphany-branding-openSUSE.spec @@ -1,5 +1,5 @@ # -# spec file for package epiphany-branding-openSUSE (Version 11.2) +# spec file for package epiphany-branding-openSUSE (Version 11.3) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -15,50 +15,70 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - +%define build_openSUSE 1 +%define build_SLED 0 +# Do not edit this auto generated file! Edit epiphany-branding.spec.in. Name: epiphany-branding-openSUSE License: GPL v2 or later -Version: 11.2 -Release: 3 +Version: 11.3 +Release: 1 Summary: openSUSE branding of epiphany Group: Productivity/Networking/Web/Browsers +Source0: COPYING +Source1: branding.conf.in # PATCH-FEATURE-OPENSUSE opensuse-bookmarks.patch vuntz@novell.com -- Add openSUSE bookmarks Patch0: opensuse-bookmarks.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Provides: epiphany-branding = 2.27.4 -Conflicts: otherproviders(epiphany-branding) -Supplements: packageand(epiphany:branding-openSUSE) -BuildArch: noarch +# PATCH-FEATURE-SLED sled-bookmarks.patch vuntz@novell.com -- Add SLED bookmarks +Patch1: sled-bookmarks.patch +BuildRequires: epiphany # To be in sync with upstream defaults, do branding as a patch for upstream file. # WARNING: As this package conflicts with epiphany-branding-openSUSE, you cannot # reuse build root. You have to build in a clean build root every time! BuildRequires: epiphany-branding-upstream -# For directory ownership: -BuildRequires: epiphany +%if 0%{suse_version} > 1110 +BuildRequires: lsb-release +%else +BuildRequires: lsb +%endif +BuildRequires: openSUSE-release +%define distro_version %(lsb_release -r -s) +%define epiphany_version %(rpm -q --qf '%%{version}-%%{release}' epiphany) +Provides: epiphany-branding = %{epiphany_version} +Conflicts: otherproviders(epiphany-branding) +Supplements: packageand(epiphany:branding-openSUSE) +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch %description This package provides openSUSE Look and Feel for Epiphany. - - %prep cp -a %{_datadir}/epiphany/default-bookmarks.rdf . +%if %build_openSUSE %patch0 +%endif +%if %build_SLED +%patch1 +%endif +cp -a %{SOURCE0} . %build +sed "s,@distroversion@,%{distro_version},g;s,@pkgversion@,%{epiphany_version},g" %{SOURCE1} > branding.conf %install -install -d $RPM_BUILD_ROOT/%{_datadir}/epiphany # custom bookmarks -install -m0644 default-bookmarks.rdf $RPM_BUILD_ROOT/%{_datadir}/epiphany +install -D -m0644 default-bookmarks.rdf %{buildroot}%{_datadir}/epiphany/default-bookmarks.rdf +# user agent +install -D -m0644 branding.conf %{buildroot}%{_datadir}/epiphany/branding.conf %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %files %defattr(-,root,root) +%doc COPYING %{_datadir}/epiphany/default-bookmarks.rdf +%{_datadir}/epiphany/branding.conf %changelog diff --git a/epiphany-branding.changes b/epiphany-branding.changes new file mode 100644 index 0000000..1d3fbcf --- /dev/null +++ b/epiphany-branding.changes @@ -0,0 +1,51 @@ +------------------------------------------------------------------- +Fri Jan 15 03:58:43 CET 2010 - vuntz@opensuse.org + +- Merge openSUSE and SLED branding packaging, and generate the + packages from the same sources. +- Change version to 11.3. +- Add COPYING file. +- Add branding.conf.in: with a recent epiphany, we can change the + user agent with a simple file. +- Add BuildRequires on lsb-release and openSUSE-release to get the + version of the distribution, to put in the user agent. + +------------------------------------------------------------------- +Wed Aug 26 12:53:54 CEST 2009 - mls@suse.de + +- make patch0 usage consistent + +------------------------------------------------------------------- +Thu Aug 13 14:55:52 CEST 2009 - vuntz@novell.com + +- Respin opensuse-bookmarks.patch to apply to latest epiphany. + +------------------------------------------------------------------- +Mon Aug 3 23:10:28 CEST 2009 - vuntz@novell.com + +- Update for epiphany webkit change: the user agent isn't set here + anymore (it's set in gconf2-branding). +- Bump version to 11.2. + +------------------------------------------------------------------- +Tue Nov 4 13:48:43 CET 2008 - vuntz@novell.com + +- Bump version to 11.1. Part of bnc#440849. + +------------------------------------------------------------------- +Mon Oct 6 15:56:53 CEST 2008 - sbrabec@suse.cz + +- Conflict with other branding providers (FATE#304881). + +------------------------------------------------------------------- +Thu Sep 11 02:18:59 CEST 2008 - vuntz@novell.com + +- Add more openSUSE bookmarks. +- Clean up spec file. + +------------------------------------------------------------------- +Tue Jul 29 16:00:03 CEST 2008 - vuntz@novell.com + +- New package. +- Add openSUSE documentation bookmark. (fate#305003) + diff --git a/epiphany-branding.spec.in b/epiphany-branding.spec.in new file mode 100644 index 0000000..d2ebb48 --- /dev/null +++ b/epiphany-branding.spec.in @@ -0,0 +1,83 @@ +# +# spec file for package epiphany-branding-openSUSE (Version 11.3) +# +# Copyright (c) 2009 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 +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + +%define build_openSUSE 0 +%define build_SLED 0 + +Name: epiphany-branding-%{branding_name} +License: GPL v2 or later +Version: 11.3 +Release: 1 +Summary: %{branding_name} branding of epiphany +Group: Productivity/Networking/Web/Browsers +Source0: COPYING +Source1: branding.conf.in +# PATCH-FEATURE-OPENSUSE opensuse-bookmarks.patch vuntz@novell.com -- Add openSUSE bookmarks +Patch0: opensuse-bookmarks.patch +# PATCH-FEATURE-SLED sled-bookmarks.patch vuntz@novell.com -- Add SLED bookmarks +Patch1: sled-bookmarks.patch +BuildRequires: epiphany +# To be in sync with upstream defaults, do branding as a patch for upstream file. +# WARNING: As this package conflicts with epiphany-branding-%{branding_name}, you cannot +# reuse build root. You have to build in a clean build root every time! +BuildRequires: epiphany-branding-upstream +%if 0%{suse_version} > 1110 +BuildRequires: lsb-release +%else +BuildRequires: lsb +%endif +BuildRequires: %{branding_name}-release +%define distro_version %(lsb_release -r -s) +%define epiphany_version %(rpm -q --qf '%%{version}-%%{release}' epiphany) +Provides: epiphany-branding = %{epiphany_version} +Conflicts: otherproviders(epiphany-branding) +Supplements: packageand(epiphany:branding-%{branding_name}) +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch + +%description +This package provides %{branding_name} Look and Feel for Epiphany. + +%prep +cp -a %{_datadir}/epiphany/default-bookmarks.rdf . +%if %build_openSUSE +%patch0 +%endif +%if %build_SLED +%patch1 +%endif +cp -a %{SOURCE0} . + +%build +sed "s,@distroversion@,%{distro_version},g;s,@pkgversion@,%{epiphany_version},g" %{SOURCE1} > branding.conf + +%install +# custom bookmarks +install -D -m0644 default-bookmarks.rdf %{buildroot}%{_datadir}/epiphany/default-bookmarks.rdf +# user agent +install -D -m0644 branding.conf %{buildroot}%{_datadir}/epiphany/branding.conf + +%clean +rm -rf %{buildroot} + +%files +%defattr(-,root,root) +%doc COPYING +%{_datadir}/epiphany/default-bookmarks.rdf +%{_datadir}/epiphany/branding.conf + +%changelog diff --git a/pre_checkin.sh b/pre_checkin.sh new file mode 100644 index 0000000..4ffacbe --- /dev/null +++ b/pre_checkin.sh @@ -0,0 +1,16 @@ +#!/bin/sh + +if ! test -f epiphany-branding.spec.in ; then + exit +fi + +for variant in openSUSE SLED ; do + cp epiphany-branding.spec.in epiphany-branding-${variant}.spec + cp epiphany-branding.changes epiphany-branding-${variant}.changes + sed -i "s/%{branding_name}/${variant}/g" epiphany-branding-${variant}.spec + sed -i "s/\(%define *build_${variant} *\)0/\11/" epiphany-branding-${variant}.spec + sed -i " + /^Name: *epiphany-branding-${variant}/i \ +# Do not edit this auto generated file! Edit epiphany-branding.spec.in. +" epiphany-branding-${variant}.spec +done diff --git a/sled-bookmarks.patch b/sled-bookmarks.patch new file mode 100644 index 0000000..3ec981f --- /dev/null +++ b/sled-bookmarks.patch @@ -0,0 +1,21 @@ +--- default-bookmarks.rdf.old 2008-07-30 03:43:13.000000000 +0200 ++++ default-bookmarks.rdf 2008-07-30 03:43:24.000000000 +0200 +@@ -6,6 +6,7 @@ + + + ++ + + + +@@ -16,4 +17,8 @@ + + http://www.google.com/search?q=%s&ie=UTF-8&oe=UTF-8 + +- +\ Pas de fin de ligne à la fin du fichier. ++ ++ Novell Documentation ++ http://www.novell.com/documentation/ ++ ++ From 210f7090701dfdc291b8e4165b7d70f7d26bb6dd9b6abc6d372ec9c9cf361daa Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Sat, 16 Jan 2010 02:16:15 +0000 Subject: [PATCH 2/7] Accepting request 29778 from home:vuntz:branches:GNOME:Factory Copy from home:vuntz:branches:GNOME:Factory/epiphany-branding-openSUSE via accept of submit request 29778 revision 2. Request was accepted with message: ok OBS-URL: https://build.opensuse.org/request/show/29778 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/epiphany-branding-openSUSE?expand=0&rev=16 --- epiphany-branding-SLED.changes | 4 ++-- epiphany-branding-SLED.spec | 6 +++--- epiphany-branding-openSUSE.changes | 4 ++-- epiphany-branding-openSUSE.spec | 4 ++-- epiphany-branding.changes | 4 ++-- epiphany-branding.spec.in | 6 +++--- pre_checkin.sh | 18 ++++++++++-------- 7 files changed, 24 insertions(+), 22 deletions(-) diff --git a/epiphany-branding-SLED.changes b/epiphany-branding-SLED.changes index 1d3fbcf..36ba7b2 100644 --- a/epiphany-branding-SLED.changes +++ b/epiphany-branding-SLED.changes @@ -7,8 +7,8 @@ Fri Jan 15 03:58:43 CET 2010 - vuntz@opensuse.org - Add COPYING file. - Add branding.conf.in: with a recent epiphany, we can change the user agent with a simple file. -- Add BuildRequires on lsb-release and openSUSE-release to get the - version of the distribution, to put in the user agent. +- Add BuildRequires on lsb-release and distribution-release to get + the version of the distribution, to put in the user agent. ------------------------------------------------------------------- Wed Aug 26 12:53:54 CEST 2009 - mls@suse.de diff --git a/epiphany-branding-SLED.spec b/epiphany-branding-SLED.spec index c8e1976..686240f 100644 --- a/epiphany-branding-SLED.spec +++ b/epiphany-branding-SLED.spec @@ -1,5 +1,5 @@ # -# spec file for package epiphany-branding-openSUSE (Version 11.3) +# spec file for package epiphany-branding-SLED (Version 11.3) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -31,17 +31,17 @@ Source1: branding.conf.in Patch0: opensuse-bookmarks.patch # PATCH-FEATURE-SLED sled-bookmarks.patch vuntz@novell.com -- Add SLED bookmarks Patch1: sled-bookmarks.patch -BuildRequires: epiphany # To be in sync with upstream defaults, do branding as a patch for upstream file. # WARNING: As this package conflicts with epiphany-branding-SLED, you cannot # reuse build root. You have to build in a clean build root every time! BuildRequires: epiphany-branding-upstream +BuildRequires: epiphany %if 0%{suse_version} > 1110 BuildRequires: lsb-release %else BuildRequires: lsb %endif -BuildRequires: SLED-release +BuildRequires: distribution-release %define distro_version %(lsb_release -r -s) %define epiphany_version %(rpm -q --qf '%%{version}-%%{release}' epiphany) Provides: epiphany-branding = %{epiphany_version} diff --git a/epiphany-branding-openSUSE.changes b/epiphany-branding-openSUSE.changes index 1d3fbcf..36ba7b2 100644 --- a/epiphany-branding-openSUSE.changes +++ b/epiphany-branding-openSUSE.changes @@ -7,8 +7,8 @@ Fri Jan 15 03:58:43 CET 2010 - vuntz@opensuse.org - Add COPYING file. - Add branding.conf.in: with a recent epiphany, we can change the user agent with a simple file. -- Add BuildRequires on lsb-release and openSUSE-release to get the - version of the distribution, to put in the user agent. +- Add BuildRequires on lsb-release and distribution-release to get + the version of the distribution, to put in the user agent. ------------------------------------------------------------------- Wed Aug 26 12:53:54 CEST 2009 - mls@suse.de diff --git a/epiphany-branding-openSUSE.spec b/epiphany-branding-openSUSE.spec index 68b0a43..9ad1eaf 100644 --- a/epiphany-branding-openSUSE.spec +++ b/epiphany-branding-openSUSE.spec @@ -31,17 +31,17 @@ Source1: branding.conf.in Patch0: opensuse-bookmarks.patch # PATCH-FEATURE-SLED sled-bookmarks.patch vuntz@novell.com -- Add SLED bookmarks Patch1: sled-bookmarks.patch -BuildRequires: epiphany # To be in sync with upstream defaults, do branding as a patch for upstream file. # WARNING: As this package conflicts with epiphany-branding-openSUSE, you cannot # reuse build root. You have to build in a clean build root every time! BuildRequires: epiphany-branding-upstream +BuildRequires: epiphany %if 0%{suse_version} > 1110 BuildRequires: lsb-release %else BuildRequires: lsb %endif -BuildRequires: openSUSE-release +BuildRequires: distribution-release %define distro_version %(lsb_release -r -s) %define epiphany_version %(rpm -q --qf '%%{version}-%%{release}' epiphany) Provides: epiphany-branding = %{epiphany_version} diff --git a/epiphany-branding.changes b/epiphany-branding.changes index 1d3fbcf..36ba7b2 100644 --- a/epiphany-branding.changes +++ b/epiphany-branding.changes @@ -7,8 +7,8 @@ Fri Jan 15 03:58:43 CET 2010 - vuntz@opensuse.org - Add COPYING file. - Add branding.conf.in: with a recent epiphany, we can change the user agent with a simple file. -- Add BuildRequires on lsb-release and openSUSE-release to get the - version of the distribution, to put in the user agent. +- Add BuildRequires on lsb-release and distribution-release to get + the version of the distribution, to put in the user agent. ------------------------------------------------------------------- Wed Aug 26 12:53:54 CEST 2009 - mls@suse.de diff --git a/epiphany-branding.spec.in b/epiphany-branding.spec.in index d2ebb48..5c21b15 100644 --- a/epiphany-branding.spec.in +++ b/epiphany-branding.spec.in @@ -1,5 +1,5 @@ # -# spec file for package epiphany-branding-openSUSE (Version 11.3) +# spec file for package epiphany-branding-%{branding_name} (Version 11.3) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -30,17 +30,17 @@ Source1: branding.conf.in Patch0: opensuse-bookmarks.patch # PATCH-FEATURE-SLED sled-bookmarks.patch vuntz@novell.com -- Add SLED bookmarks Patch1: sled-bookmarks.patch -BuildRequires: epiphany # To be in sync with upstream defaults, do branding as a patch for upstream file. # WARNING: As this package conflicts with epiphany-branding-%{branding_name}, you cannot # reuse build root. You have to build in a clean build root every time! BuildRequires: epiphany-branding-upstream +BuildRequires: epiphany %if 0%{suse_version} > 1110 BuildRequires: lsb-release %else BuildRequires: lsb %endif -BuildRequires: %{branding_name}-release +BuildRequires: distribution-release %define distro_version %(lsb_release -r -s) %define epiphany_version %(rpm -q --qf '%%{version}-%%{release}' epiphany) Provides: epiphany-branding = %{epiphany_version} diff --git a/pre_checkin.sh b/pre_checkin.sh index 4ffacbe..8271b43 100644 --- a/pre_checkin.sh +++ b/pre_checkin.sh @@ -1,16 +1,18 @@ #!/bin/sh -if ! test -f epiphany-branding.spec.in ; then +NAME=epiphany + +if ! test -f ${NAME}-branding.spec.in ; then exit fi for variant in openSUSE SLED ; do - cp epiphany-branding.spec.in epiphany-branding-${variant}.spec - cp epiphany-branding.changes epiphany-branding-${variant}.changes - sed -i "s/%{branding_name}/${variant}/g" epiphany-branding-${variant}.spec - sed -i "s/\(%define *build_${variant} *\)0/\11/" epiphany-branding-${variant}.spec + cp ${NAME}-branding.spec.in ${NAME}-branding-${variant}.spec + cp ${NAME}-branding.changes ${NAME}-branding-${variant}.changes + sed -i "s/%{branding_name}/${variant}/g" ${NAME}-branding-${variant}.spec + sed -i "s/\(%define *build_${variant} *\)0/\11/" ${NAME}-branding-${variant}.spec sed -i " - /^Name: *epiphany-branding-${variant}/i \ -# Do not edit this auto generated file! Edit epiphany-branding.spec.in. -" epiphany-branding-${variant}.spec + /^Name: *${NAME}-branding-${variant}/i \ +# Do not edit this auto generated file! Edit ${NAME}-branding.spec.in. +" ${NAME}-branding-${variant}.spec done From 92062d33cd375b350e5e00a0eb8cd7e80ff8cb9cf07fa1bca563e86ec3c84366 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Sat, 16 Jan 2010 16:24:25 +0000 Subject: [PATCH 3/7] Accepting request 29817 from home:vuntz:branches:GNOME:Factory Copy from home:vuntz:branches:GNOME:Factory/epiphany-branding-openSUSE via accept of submit request 29817 revision 3. Request was accepted with message: Forwarding to openSUSE:Factory OBS-URL: https://build.opensuse.org/request/show/29817 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/epiphany-branding-openSUSE?expand=0&rev=17 --- epiphany-branding-SLED.changes | 4 ++-- epiphany-branding-SLED.spec | 2 +- epiphany-branding-openSUSE.changes | 4 ++-- epiphany-branding-openSUSE.spec | 2 +- epiphany-branding.changes | 4 ++-- epiphany-branding.spec.in | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/epiphany-branding-SLED.changes b/epiphany-branding-SLED.changes index 36ba7b2..4dfdb60 100644 --- a/epiphany-branding-SLED.changes +++ b/epiphany-branding-SLED.changes @@ -7,8 +7,8 @@ Fri Jan 15 03:58:43 CET 2010 - vuntz@opensuse.org - Add COPYING file. - Add branding.conf.in: with a recent epiphany, we can change the user agent with a simple file. -- Add BuildRequires on lsb-release and distribution-release to get - the version of the distribution, to put in the user agent. +- Add BuildRequires on lsb-release and suse-release to get the + version of the distribution, to put in the user agent. ------------------------------------------------------------------- Wed Aug 26 12:53:54 CEST 2009 - mls@suse.de diff --git a/epiphany-branding-SLED.spec b/epiphany-branding-SLED.spec index 686240f..69dc79f 100644 --- a/epiphany-branding-SLED.spec +++ b/epiphany-branding-SLED.spec @@ -41,7 +41,7 @@ BuildRequires: lsb-release %else BuildRequires: lsb %endif -BuildRequires: distribution-release +BuildRequires: suse-release %define distro_version %(lsb_release -r -s) %define epiphany_version %(rpm -q --qf '%%{version}-%%{release}' epiphany) Provides: epiphany-branding = %{epiphany_version} diff --git a/epiphany-branding-openSUSE.changes b/epiphany-branding-openSUSE.changes index 36ba7b2..4dfdb60 100644 --- a/epiphany-branding-openSUSE.changes +++ b/epiphany-branding-openSUSE.changes @@ -7,8 +7,8 @@ Fri Jan 15 03:58:43 CET 2010 - vuntz@opensuse.org - Add COPYING file. - Add branding.conf.in: with a recent epiphany, we can change the user agent with a simple file. -- Add BuildRequires on lsb-release and distribution-release to get - the version of the distribution, to put in the user agent. +- Add BuildRequires on lsb-release and suse-release to get the + version of the distribution, to put in the user agent. ------------------------------------------------------------------- Wed Aug 26 12:53:54 CEST 2009 - mls@suse.de diff --git a/epiphany-branding-openSUSE.spec b/epiphany-branding-openSUSE.spec index 9ad1eaf..e25692b 100644 --- a/epiphany-branding-openSUSE.spec +++ b/epiphany-branding-openSUSE.spec @@ -41,7 +41,7 @@ BuildRequires: lsb-release %else BuildRequires: lsb %endif -BuildRequires: distribution-release +BuildRequires: suse-release %define distro_version %(lsb_release -r -s) %define epiphany_version %(rpm -q --qf '%%{version}-%%{release}' epiphany) Provides: epiphany-branding = %{epiphany_version} diff --git a/epiphany-branding.changes b/epiphany-branding.changes index 36ba7b2..4dfdb60 100644 --- a/epiphany-branding.changes +++ b/epiphany-branding.changes @@ -7,8 +7,8 @@ Fri Jan 15 03:58:43 CET 2010 - vuntz@opensuse.org - Add COPYING file. - Add branding.conf.in: with a recent epiphany, we can change the user agent with a simple file. -- Add BuildRequires on lsb-release and distribution-release to get - the version of the distribution, to put in the user agent. +- Add BuildRequires on lsb-release and suse-release to get the + version of the distribution, to put in the user agent. ------------------------------------------------------------------- Wed Aug 26 12:53:54 CEST 2009 - mls@suse.de diff --git a/epiphany-branding.spec.in b/epiphany-branding.spec.in index 5c21b15..c8c0687 100644 --- a/epiphany-branding.spec.in +++ b/epiphany-branding.spec.in @@ -40,7 +40,7 @@ BuildRequires: lsb-release %else BuildRequires: lsb %endif -BuildRequires: distribution-release +BuildRequires: suse-release %define distro_version %(lsb_release -r -s) %define epiphany_version %(rpm -q --qf '%%{version}-%%{release}' epiphany) Provides: epiphany-branding = %{epiphany_version} From 7c2ec0be6bed0c49599dd496c14db338fe5e012e585664a43de9d0b95cb0619a Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Mon, 18 Jan 2010 16:41:16 +0000 Subject: [PATCH 4/7] checked in (request 29818) OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/epiphany-branding-openSUSE?expand=0&rev=18 --- COPYING | 340 ----------------------------- branding.conf.in | 4 - epiphany-branding-SLED.changes | 51 ----- epiphany-branding-SLED.spec | 84 ------- epiphany-branding-openSUSE.changes | 12 - epiphany-branding-openSUSE.spec | 52 ++--- epiphany-branding.changes | 51 ----- epiphany-branding.spec.in | 83 ------- pre_checkin.sh | 18 -- sled-bookmarks.patch | 21 -- 10 files changed, 16 insertions(+), 700 deletions(-) delete mode 100644 COPYING delete mode 100644 branding.conf.in delete mode 100644 epiphany-branding-SLED.changes delete mode 100644 epiphany-branding-SLED.spec delete mode 100644 epiphany-branding.changes delete mode 100644 epiphany-branding.spec.in delete mode 100644 pre_checkin.sh delete mode 100644 sled-bookmarks.patch diff --git a/COPYING b/COPYING deleted file mode 100644 index 927f7f2..0000000 --- a/COPYING +++ /dev/null @@ -1,340 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) 19yy - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) 19yy name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - , 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General -Public License instead of this License. diff --git a/branding.conf.in b/branding.conf.in deleted file mode 100644 index af81743..0000000 --- a/branding.conf.in +++ /dev/null @@ -1,4 +0,0 @@ -[User Agent] -Vendor=SUSE -VendorSub=@distroversion@ -VendorComment=@pkgversion@ diff --git a/epiphany-branding-SLED.changes b/epiphany-branding-SLED.changes deleted file mode 100644 index 4dfdb60..0000000 --- a/epiphany-branding-SLED.changes +++ /dev/null @@ -1,51 +0,0 @@ -------------------------------------------------------------------- -Fri Jan 15 03:58:43 CET 2010 - vuntz@opensuse.org - -- Merge openSUSE and SLED branding packaging, and generate the - packages from the same sources. -- Change version to 11.3. -- Add COPYING file. -- Add branding.conf.in: with a recent epiphany, we can change the - user agent with a simple file. -- Add BuildRequires on lsb-release and suse-release to get the - version of the distribution, to put in the user agent. - -------------------------------------------------------------------- -Wed Aug 26 12:53:54 CEST 2009 - mls@suse.de - -- make patch0 usage consistent - -------------------------------------------------------------------- -Thu Aug 13 14:55:52 CEST 2009 - vuntz@novell.com - -- Respin opensuse-bookmarks.patch to apply to latest epiphany. - -------------------------------------------------------------------- -Mon Aug 3 23:10:28 CEST 2009 - vuntz@novell.com - -- Update for epiphany webkit change: the user agent isn't set here - anymore (it's set in gconf2-branding). -- Bump version to 11.2. - -------------------------------------------------------------------- -Tue Nov 4 13:48:43 CET 2008 - vuntz@novell.com - -- Bump version to 11.1. Part of bnc#440849. - -------------------------------------------------------------------- -Mon Oct 6 15:56:53 CEST 2008 - sbrabec@suse.cz - -- Conflict with other branding providers (FATE#304881). - -------------------------------------------------------------------- -Thu Sep 11 02:18:59 CEST 2008 - vuntz@novell.com - -- Add more openSUSE bookmarks. -- Clean up spec file. - -------------------------------------------------------------------- -Tue Jul 29 16:00:03 CEST 2008 - vuntz@novell.com - -- New package. -- Add openSUSE documentation bookmark. (fate#305003) - diff --git a/epiphany-branding-SLED.spec b/epiphany-branding-SLED.spec deleted file mode 100644 index 69dc79f..0000000 --- a/epiphany-branding-SLED.spec +++ /dev/null @@ -1,84 +0,0 @@ -# -# spec file for package epiphany-branding-SLED (Version 11.3) -# -# Copyright (c) 2009 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 -# upon. The license for this file, and modifications and additions to the -# file, is the same license as for the pristine package itself (unless the -# license for the pristine package is not an Open Source License, in which -# case the license is the MIT License). An "Open Source License" is a -# license that conforms to the Open Source Definition (Version 1.9) -# published by the Open Source Initiative. - -# Please submit bugfixes or comments via http://bugs.opensuse.org/ -# - -%define build_openSUSE 0 -%define build_SLED 1 - -# Do not edit this auto generated file! Edit epiphany-branding.spec.in. -Name: epiphany-branding-SLED -License: GPL v2 or later -Version: 11.3 -Release: 1 -Summary: SLED branding of epiphany -Group: Productivity/Networking/Web/Browsers -Source0: COPYING -Source1: branding.conf.in -# PATCH-FEATURE-OPENSUSE opensuse-bookmarks.patch vuntz@novell.com -- Add openSUSE bookmarks -Patch0: opensuse-bookmarks.patch -# PATCH-FEATURE-SLED sled-bookmarks.patch vuntz@novell.com -- Add SLED bookmarks -Patch1: sled-bookmarks.patch -# To be in sync with upstream defaults, do branding as a patch for upstream file. -# WARNING: As this package conflicts with epiphany-branding-SLED, you cannot -# reuse build root. You have to build in a clean build root every time! -BuildRequires: epiphany-branding-upstream -BuildRequires: epiphany -%if 0%{suse_version} > 1110 -BuildRequires: lsb-release -%else -BuildRequires: lsb -%endif -BuildRequires: suse-release -%define distro_version %(lsb_release -r -s) -%define epiphany_version %(rpm -q --qf '%%{version}-%%{release}' epiphany) -Provides: epiphany-branding = %{epiphany_version} -Conflicts: otherproviders(epiphany-branding) -Supplements: packageand(epiphany:branding-SLED) -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildArch: noarch - -%description -This package provides SLED Look and Feel for Epiphany. - -%prep -cp -a %{_datadir}/epiphany/default-bookmarks.rdf . -%if %build_openSUSE -%patch0 -%endif -%if %build_SLED -%patch1 -%endif -cp -a %{SOURCE0} . - -%build -sed "s,@distroversion@,%{distro_version},g;s,@pkgversion@,%{epiphany_version},g" %{SOURCE1} > branding.conf - -%install -# custom bookmarks -install -D -m0644 default-bookmarks.rdf %{buildroot}%{_datadir}/epiphany/default-bookmarks.rdf -# user agent -install -D -m0644 branding.conf %{buildroot}%{_datadir}/epiphany/branding.conf - -%clean -rm -rf %{buildroot} - -%files -%defattr(-,root,root) -%doc COPYING -%{_datadir}/epiphany/default-bookmarks.rdf -%{_datadir}/epiphany/branding.conf - -%changelog diff --git a/epiphany-branding-openSUSE.changes b/epiphany-branding-openSUSE.changes index 4dfdb60..5c09449 100644 --- a/epiphany-branding-openSUSE.changes +++ b/epiphany-branding-openSUSE.changes @@ -1,15 +1,3 @@ -------------------------------------------------------------------- -Fri Jan 15 03:58:43 CET 2010 - vuntz@opensuse.org - -- Merge openSUSE and SLED branding packaging, and generate the - packages from the same sources. -- Change version to 11.3. -- Add COPYING file. -- Add branding.conf.in: with a recent epiphany, we can change the - user agent with a simple file. -- Add BuildRequires on lsb-release and suse-release to get the - version of the distribution, to put in the user agent. - ------------------------------------------------------------------- Wed Aug 26 12:53:54 CEST 2009 - mls@suse.de diff --git a/epiphany-branding-openSUSE.spec b/epiphany-branding-openSUSE.spec index e25692b..a2453c4 100644 --- a/epiphany-branding-openSUSE.spec +++ b/epiphany-branding-openSUSE.spec @@ -1,5 +1,5 @@ # -# spec file for package epiphany-branding-openSUSE (Version 11.3) +# spec file for package epiphany-branding-openSUSE (Version 11.2) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -15,70 +15,50 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -%define build_openSUSE 1 -%define build_SLED 0 +# norootforbuild + -# Do not edit this auto generated file! Edit epiphany-branding.spec.in. Name: epiphany-branding-openSUSE License: GPL v2 or later -Version: 11.3 -Release: 1 +Version: 11.2 +Release: 3 Summary: openSUSE branding of epiphany Group: Productivity/Networking/Web/Browsers -Source0: COPYING -Source1: branding.conf.in # PATCH-FEATURE-OPENSUSE opensuse-bookmarks.patch vuntz@novell.com -- Add openSUSE bookmarks Patch0: opensuse-bookmarks.patch -# PATCH-FEATURE-SLED sled-bookmarks.patch vuntz@novell.com -- Add SLED bookmarks -Patch1: sled-bookmarks.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-build +Provides: epiphany-branding = 2.27.4 +Conflicts: otherproviders(epiphany-branding) +Supplements: packageand(epiphany:branding-openSUSE) +BuildArch: noarch # To be in sync with upstream defaults, do branding as a patch for upstream file. # WARNING: As this package conflicts with epiphany-branding-openSUSE, you cannot # reuse build root. You have to build in a clean build root every time! BuildRequires: epiphany-branding-upstream +# For directory ownership: BuildRequires: epiphany -%if 0%{suse_version} > 1110 -BuildRequires: lsb-release -%else -BuildRequires: lsb -%endif -BuildRequires: suse-release -%define distro_version %(lsb_release -r -s) -%define epiphany_version %(rpm -q --qf '%%{version}-%%{release}' epiphany) -Provides: epiphany-branding = %{epiphany_version} -Conflicts: otherproviders(epiphany-branding) -Supplements: packageand(epiphany:branding-openSUSE) -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildArch: noarch %description This package provides openSUSE Look and Feel for Epiphany. + + %prep cp -a %{_datadir}/epiphany/default-bookmarks.rdf . -%if %build_openSUSE %patch0 -%endif -%if %build_SLED -%patch1 -%endif -cp -a %{SOURCE0} . %build -sed "s,@distroversion@,%{distro_version},g;s,@pkgversion@,%{epiphany_version},g" %{SOURCE1} > branding.conf %install +install -d $RPM_BUILD_ROOT/%{_datadir}/epiphany # custom bookmarks -install -D -m0644 default-bookmarks.rdf %{buildroot}%{_datadir}/epiphany/default-bookmarks.rdf -# user agent -install -D -m0644 branding.conf %{buildroot}%{_datadir}/epiphany/branding.conf +install -m0644 default-bookmarks.rdf $RPM_BUILD_ROOT/%{_datadir}/epiphany %clean -rm -rf %{buildroot} +rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) -%doc COPYING %{_datadir}/epiphany/default-bookmarks.rdf -%{_datadir}/epiphany/branding.conf %changelog diff --git a/epiphany-branding.changes b/epiphany-branding.changes deleted file mode 100644 index 4dfdb60..0000000 --- a/epiphany-branding.changes +++ /dev/null @@ -1,51 +0,0 @@ -------------------------------------------------------------------- -Fri Jan 15 03:58:43 CET 2010 - vuntz@opensuse.org - -- Merge openSUSE and SLED branding packaging, and generate the - packages from the same sources. -- Change version to 11.3. -- Add COPYING file. -- Add branding.conf.in: with a recent epiphany, we can change the - user agent with a simple file. -- Add BuildRequires on lsb-release and suse-release to get the - version of the distribution, to put in the user agent. - -------------------------------------------------------------------- -Wed Aug 26 12:53:54 CEST 2009 - mls@suse.de - -- make patch0 usage consistent - -------------------------------------------------------------------- -Thu Aug 13 14:55:52 CEST 2009 - vuntz@novell.com - -- Respin opensuse-bookmarks.patch to apply to latest epiphany. - -------------------------------------------------------------------- -Mon Aug 3 23:10:28 CEST 2009 - vuntz@novell.com - -- Update for epiphany webkit change: the user agent isn't set here - anymore (it's set in gconf2-branding). -- Bump version to 11.2. - -------------------------------------------------------------------- -Tue Nov 4 13:48:43 CET 2008 - vuntz@novell.com - -- Bump version to 11.1. Part of bnc#440849. - -------------------------------------------------------------------- -Mon Oct 6 15:56:53 CEST 2008 - sbrabec@suse.cz - -- Conflict with other branding providers (FATE#304881). - -------------------------------------------------------------------- -Thu Sep 11 02:18:59 CEST 2008 - vuntz@novell.com - -- Add more openSUSE bookmarks. -- Clean up spec file. - -------------------------------------------------------------------- -Tue Jul 29 16:00:03 CEST 2008 - vuntz@novell.com - -- New package. -- Add openSUSE documentation bookmark. (fate#305003) - diff --git a/epiphany-branding.spec.in b/epiphany-branding.spec.in deleted file mode 100644 index c8c0687..0000000 --- a/epiphany-branding.spec.in +++ /dev/null @@ -1,83 +0,0 @@ -# -# spec file for package epiphany-branding-%{branding_name} (Version 11.3) -# -# Copyright (c) 2009 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 -# upon. The license for this file, and modifications and additions to the -# file, is the same license as for the pristine package itself (unless the -# license for the pristine package is not an Open Source License, in which -# case the license is the MIT License). An "Open Source License" is a -# license that conforms to the Open Source Definition (Version 1.9) -# published by the Open Source Initiative. - -# Please submit bugfixes or comments via http://bugs.opensuse.org/ -# - -%define build_openSUSE 0 -%define build_SLED 0 - -Name: epiphany-branding-%{branding_name} -License: GPL v2 or later -Version: 11.3 -Release: 1 -Summary: %{branding_name} branding of epiphany -Group: Productivity/Networking/Web/Browsers -Source0: COPYING -Source1: branding.conf.in -# PATCH-FEATURE-OPENSUSE opensuse-bookmarks.patch vuntz@novell.com -- Add openSUSE bookmarks -Patch0: opensuse-bookmarks.patch -# PATCH-FEATURE-SLED sled-bookmarks.patch vuntz@novell.com -- Add SLED bookmarks -Patch1: sled-bookmarks.patch -# To be in sync with upstream defaults, do branding as a patch for upstream file. -# WARNING: As this package conflicts with epiphany-branding-%{branding_name}, you cannot -# reuse build root. You have to build in a clean build root every time! -BuildRequires: epiphany-branding-upstream -BuildRequires: epiphany -%if 0%{suse_version} > 1110 -BuildRequires: lsb-release -%else -BuildRequires: lsb -%endif -BuildRequires: suse-release -%define distro_version %(lsb_release -r -s) -%define epiphany_version %(rpm -q --qf '%%{version}-%%{release}' epiphany) -Provides: epiphany-branding = %{epiphany_version} -Conflicts: otherproviders(epiphany-branding) -Supplements: packageand(epiphany:branding-%{branding_name}) -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildArch: noarch - -%description -This package provides %{branding_name} Look and Feel for Epiphany. - -%prep -cp -a %{_datadir}/epiphany/default-bookmarks.rdf . -%if %build_openSUSE -%patch0 -%endif -%if %build_SLED -%patch1 -%endif -cp -a %{SOURCE0} . - -%build -sed "s,@distroversion@,%{distro_version},g;s,@pkgversion@,%{epiphany_version},g" %{SOURCE1} > branding.conf - -%install -# custom bookmarks -install -D -m0644 default-bookmarks.rdf %{buildroot}%{_datadir}/epiphany/default-bookmarks.rdf -# user agent -install -D -m0644 branding.conf %{buildroot}%{_datadir}/epiphany/branding.conf - -%clean -rm -rf %{buildroot} - -%files -%defattr(-,root,root) -%doc COPYING -%{_datadir}/epiphany/default-bookmarks.rdf -%{_datadir}/epiphany/branding.conf - -%changelog diff --git a/pre_checkin.sh b/pre_checkin.sh deleted file mode 100644 index 8271b43..0000000 --- a/pre_checkin.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh - -NAME=epiphany - -if ! test -f ${NAME}-branding.spec.in ; then - exit -fi - -for variant in openSUSE SLED ; do - cp ${NAME}-branding.spec.in ${NAME}-branding-${variant}.spec - cp ${NAME}-branding.changes ${NAME}-branding-${variant}.changes - sed -i "s/%{branding_name}/${variant}/g" ${NAME}-branding-${variant}.spec - sed -i "s/\(%define *build_${variant} *\)0/\11/" ${NAME}-branding-${variant}.spec - sed -i " - /^Name: *${NAME}-branding-${variant}/i \ -# Do not edit this auto generated file! Edit ${NAME}-branding.spec.in. -" ${NAME}-branding-${variant}.spec -done diff --git a/sled-bookmarks.patch b/sled-bookmarks.patch deleted file mode 100644 index 3ec981f..0000000 --- a/sled-bookmarks.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- default-bookmarks.rdf.old 2008-07-30 03:43:13.000000000 +0200 -+++ default-bookmarks.rdf 2008-07-30 03:43:24.000000000 +0200 -@@ -6,6 +6,7 @@ - - - -+ - - - -@@ -16,4 +17,8 @@ - - http://www.google.com/search?q=%s&ie=UTF-8&oe=UTF-8 - -- -\ Pas de fin de ligne à la fin du fichier. -+ -+ Novell Documentation -+ http://www.novell.com/documentation/ -+ -+ From 1d71fd778ae39579c19c7f8ae67ef4c4d92176921f94ed1944bba2893ca950f4 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Fri, 19 Feb 2010 15:28:44 +0000 Subject: [PATCH 5/7] converted link to branch OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/epiphany-branding-openSUSE?expand=0&rev=19 --- COPYING | 340 +++++++++++++++++++++++++++++ branding.conf.in | 4 + epiphany-branding-SLED.changes | 51 +++++ epiphany-branding-SLED.spec | 85 ++++++++ epiphany-branding-openSUSE.changes | 12 + epiphany-branding-openSUSE.spec | 55 +++-- epiphany-branding.changes | 51 +++++ epiphany-branding.spec.in | 83 +++++++ pre_checkin.sh | 18 ++ sled-bookmarks.patch | 21 ++ 10 files changed, 703 insertions(+), 17 deletions(-) create mode 100644 COPYING create mode 100644 branding.conf.in create mode 100644 epiphany-branding-SLED.changes create mode 100644 epiphany-branding-SLED.spec create mode 100644 epiphany-branding.changes create mode 100644 epiphany-branding.spec.in create mode 100644 pre_checkin.sh create mode 100644 sled-bookmarks.patch diff --git a/COPYING b/COPYING new file mode 100644 index 0000000..927f7f2 --- /dev/null +++ b/COPYING @@ -0,0 +1,340 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) 19yy + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) 19yy name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. diff --git a/branding.conf.in b/branding.conf.in new file mode 100644 index 0000000..af81743 --- /dev/null +++ b/branding.conf.in @@ -0,0 +1,4 @@ +[User Agent] +Vendor=SUSE +VendorSub=@distroversion@ +VendorComment=@pkgversion@ diff --git a/epiphany-branding-SLED.changes b/epiphany-branding-SLED.changes new file mode 100644 index 0000000..4dfdb60 --- /dev/null +++ b/epiphany-branding-SLED.changes @@ -0,0 +1,51 @@ +------------------------------------------------------------------- +Fri Jan 15 03:58:43 CET 2010 - vuntz@opensuse.org + +- Merge openSUSE and SLED branding packaging, and generate the + packages from the same sources. +- Change version to 11.3. +- Add COPYING file. +- Add branding.conf.in: with a recent epiphany, we can change the + user agent with a simple file. +- Add BuildRequires on lsb-release and suse-release to get the + version of the distribution, to put in the user agent. + +------------------------------------------------------------------- +Wed Aug 26 12:53:54 CEST 2009 - mls@suse.de + +- make patch0 usage consistent + +------------------------------------------------------------------- +Thu Aug 13 14:55:52 CEST 2009 - vuntz@novell.com + +- Respin opensuse-bookmarks.patch to apply to latest epiphany. + +------------------------------------------------------------------- +Mon Aug 3 23:10:28 CEST 2009 - vuntz@novell.com + +- Update for epiphany webkit change: the user agent isn't set here + anymore (it's set in gconf2-branding). +- Bump version to 11.2. + +------------------------------------------------------------------- +Tue Nov 4 13:48:43 CET 2008 - vuntz@novell.com + +- Bump version to 11.1. Part of bnc#440849. + +------------------------------------------------------------------- +Mon Oct 6 15:56:53 CEST 2008 - sbrabec@suse.cz + +- Conflict with other branding providers (FATE#304881). + +------------------------------------------------------------------- +Thu Sep 11 02:18:59 CEST 2008 - vuntz@novell.com + +- Add more openSUSE bookmarks. +- Clean up spec file. + +------------------------------------------------------------------- +Tue Jul 29 16:00:03 CEST 2008 - vuntz@novell.com + +- New package. +- Add openSUSE documentation bookmark. (fate#305003) + diff --git a/epiphany-branding-SLED.spec b/epiphany-branding-SLED.spec new file mode 100644 index 0000000..459c607 --- /dev/null +++ b/epiphany-branding-SLED.spec @@ -0,0 +1,85 @@ +# +# spec file for package epiphany-branding-SLED (Version 11.3) +# +# Copyright (c) 2010 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 +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + + +%define build_openSUSE 0 +%define build_SLED 1 +# Do not edit this auto generated file! Edit epiphany-branding.spec.in. + +Name: epiphany-branding-SLED +License: GPLv2+ +Version: 11.3 +Release: 1 +Summary: SLED branding of epiphany +Group: Productivity/Networking/Web/Browsers +Source0: COPYING +Source1: branding.conf.in +# PATCH-FEATURE-OPENSUSE opensuse-bookmarks.patch vuntz@novell.com -- Add openSUSE bookmarks +Patch0: opensuse-bookmarks.patch +# PATCH-FEATURE-SLED sled-bookmarks.patch vuntz@novell.com -- Add SLED bookmarks +Patch1: sled-bookmarks.patch +# To be in sync with upstream defaults, do branding as a patch for upstream file. +# WARNING: As this package conflicts with epiphany-branding-SLED, you cannot +# reuse build root. You have to build in a clean build root every time! +BuildRequires: epiphany-branding-upstream +BuildRequires: epiphany +%if 0%{suse_version} > 1110 +BuildRequires: lsb-release +%else +BuildRequires: lsb +%endif +BuildRequires: suse-release +%define distro_version %(lsb_release -r -s) +%define epiphany_version %(rpm -q --qf '%%{version}-%%{release}' epiphany) +Provides: epiphany-branding = %{epiphany_version} +Conflicts: otherproviders(epiphany-branding) +Supplements: packageand(epiphany:branding-SLED) +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch + +%description +This package provides SLED Look and Feel for Epiphany. + +%prep +cp -a %{_datadir}/epiphany/default-bookmarks.rdf . +%if %build_openSUSE +%patch0 +%endif +%if %build_SLED +%patch1 +%endif +cp -a %{SOURCE0} . + +%build +sed "s,@distroversion@,%{distro_version},g;s,@pkgversion@,%{epiphany_version},g" %{SOURCE1} > branding.conf + +%install +# custom bookmarks +install -D -m0644 default-bookmarks.rdf %{buildroot}%{_datadir}/epiphany/default-bookmarks.rdf +# user agent +install -D -m0644 branding.conf %{buildroot}%{_datadir}/epiphany/branding.conf + +%clean +rm -rf %{buildroot} + +%files +%defattr(-,root,root) +%doc COPYING +%{_datadir}/epiphany/default-bookmarks.rdf +%{_datadir}/epiphany/branding.conf + +%changelog diff --git a/epiphany-branding-openSUSE.changes b/epiphany-branding-openSUSE.changes index 5c09449..4dfdb60 100644 --- a/epiphany-branding-openSUSE.changes +++ b/epiphany-branding-openSUSE.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Fri Jan 15 03:58:43 CET 2010 - vuntz@opensuse.org + +- Merge openSUSE and SLED branding packaging, and generate the + packages from the same sources. +- Change version to 11.3. +- Add COPYING file. +- Add branding.conf.in: with a recent epiphany, we can change the + user agent with a simple file. +- Add BuildRequires on lsb-release and suse-release to get the + version of the distribution, to put in the user agent. + ------------------------------------------------------------------- Wed Aug 26 12:53:54 CEST 2009 - mls@suse.de diff --git a/epiphany-branding-openSUSE.spec b/epiphany-branding-openSUSE.spec index a2453c4..62f96b4 100644 --- a/epiphany-branding-openSUSE.spec +++ b/epiphany-branding-openSUSE.spec @@ -1,7 +1,7 @@ # -# spec file for package epiphany-branding-openSUSE (Version 11.2) +# spec file for package epiphany-branding-openSUSE (Version 11.3) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 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,50 +15,71 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild +%define build_openSUSE 1 +%define build_SLED 0 +# Do not edit this auto generated file! Edit epiphany-branding.spec.in. Name: epiphany-branding-openSUSE -License: GPL v2 or later -Version: 11.2 -Release: 3 +License: GPLv2+ +Version: 11.3 +Release: 1 Summary: openSUSE branding of epiphany Group: Productivity/Networking/Web/Browsers +Source0: COPYING +Source1: branding.conf.in # PATCH-FEATURE-OPENSUSE opensuse-bookmarks.patch vuntz@novell.com -- Add openSUSE bookmarks Patch0: opensuse-bookmarks.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Provides: epiphany-branding = 2.27.4 -Conflicts: otherproviders(epiphany-branding) -Supplements: packageand(epiphany:branding-openSUSE) -BuildArch: noarch +# PATCH-FEATURE-SLED sled-bookmarks.patch vuntz@novell.com -- Add SLED bookmarks +Patch1: sled-bookmarks.patch # To be in sync with upstream defaults, do branding as a patch for upstream file. # WARNING: As this package conflicts with epiphany-branding-openSUSE, you cannot # reuse build root. You have to build in a clean build root every time! BuildRequires: epiphany-branding-upstream -# For directory ownership: BuildRequires: epiphany +%if 0%{suse_version} > 1110 +BuildRequires: lsb-release +%else +BuildRequires: lsb +%endif +BuildRequires: suse-release +%define distro_version %(lsb_release -r -s) +%define epiphany_version %(rpm -q --qf '%%{version}-%%{release}' epiphany) +Provides: epiphany-branding = %{epiphany_version} +Conflicts: otherproviders(epiphany-branding) +Supplements: packageand(epiphany:branding-openSUSE) +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch %description This package provides openSUSE Look and Feel for Epiphany. - - %prep cp -a %{_datadir}/epiphany/default-bookmarks.rdf . +%if %build_openSUSE %patch0 +%endif +%if %build_SLED +%patch1 +%endif +cp -a %{SOURCE0} . %build +sed "s,@distroversion@,%{distro_version},g;s,@pkgversion@,%{epiphany_version},g" %{SOURCE1} > branding.conf %install -install -d $RPM_BUILD_ROOT/%{_datadir}/epiphany # custom bookmarks -install -m0644 default-bookmarks.rdf $RPM_BUILD_ROOT/%{_datadir}/epiphany +install -D -m0644 default-bookmarks.rdf %{buildroot}%{_datadir}/epiphany/default-bookmarks.rdf +# user agent +install -D -m0644 branding.conf %{buildroot}%{_datadir}/epiphany/branding.conf %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %files %defattr(-,root,root) +%doc COPYING %{_datadir}/epiphany/default-bookmarks.rdf +%{_datadir}/epiphany/branding.conf %changelog diff --git a/epiphany-branding.changes b/epiphany-branding.changes new file mode 100644 index 0000000..4dfdb60 --- /dev/null +++ b/epiphany-branding.changes @@ -0,0 +1,51 @@ +------------------------------------------------------------------- +Fri Jan 15 03:58:43 CET 2010 - vuntz@opensuse.org + +- Merge openSUSE and SLED branding packaging, and generate the + packages from the same sources. +- Change version to 11.3. +- Add COPYING file. +- Add branding.conf.in: with a recent epiphany, we can change the + user agent with a simple file. +- Add BuildRequires on lsb-release and suse-release to get the + version of the distribution, to put in the user agent. + +------------------------------------------------------------------- +Wed Aug 26 12:53:54 CEST 2009 - mls@suse.de + +- make patch0 usage consistent + +------------------------------------------------------------------- +Thu Aug 13 14:55:52 CEST 2009 - vuntz@novell.com + +- Respin opensuse-bookmarks.patch to apply to latest epiphany. + +------------------------------------------------------------------- +Mon Aug 3 23:10:28 CEST 2009 - vuntz@novell.com + +- Update for epiphany webkit change: the user agent isn't set here + anymore (it's set in gconf2-branding). +- Bump version to 11.2. + +------------------------------------------------------------------- +Tue Nov 4 13:48:43 CET 2008 - vuntz@novell.com + +- Bump version to 11.1. Part of bnc#440849. + +------------------------------------------------------------------- +Mon Oct 6 15:56:53 CEST 2008 - sbrabec@suse.cz + +- Conflict with other branding providers (FATE#304881). + +------------------------------------------------------------------- +Thu Sep 11 02:18:59 CEST 2008 - vuntz@novell.com + +- Add more openSUSE bookmarks. +- Clean up spec file. + +------------------------------------------------------------------- +Tue Jul 29 16:00:03 CEST 2008 - vuntz@novell.com + +- New package. +- Add openSUSE documentation bookmark. (fate#305003) + diff --git a/epiphany-branding.spec.in b/epiphany-branding.spec.in new file mode 100644 index 0000000..c8c0687 --- /dev/null +++ b/epiphany-branding.spec.in @@ -0,0 +1,83 @@ +# +# spec file for package epiphany-branding-%{branding_name} (Version 11.3) +# +# Copyright (c) 2009 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 +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + +%define build_openSUSE 0 +%define build_SLED 0 + +Name: epiphany-branding-%{branding_name} +License: GPL v2 or later +Version: 11.3 +Release: 1 +Summary: %{branding_name} branding of epiphany +Group: Productivity/Networking/Web/Browsers +Source0: COPYING +Source1: branding.conf.in +# PATCH-FEATURE-OPENSUSE opensuse-bookmarks.patch vuntz@novell.com -- Add openSUSE bookmarks +Patch0: opensuse-bookmarks.patch +# PATCH-FEATURE-SLED sled-bookmarks.patch vuntz@novell.com -- Add SLED bookmarks +Patch1: sled-bookmarks.patch +# To be in sync with upstream defaults, do branding as a patch for upstream file. +# WARNING: As this package conflicts with epiphany-branding-%{branding_name}, you cannot +# reuse build root. You have to build in a clean build root every time! +BuildRequires: epiphany-branding-upstream +BuildRequires: epiphany +%if 0%{suse_version} > 1110 +BuildRequires: lsb-release +%else +BuildRequires: lsb +%endif +BuildRequires: suse-release +%define distro_version %(lsb_release -r -s) +%define epiphany_version %(rpm -q --qf '%%{version}-%%{release}' epiphany) +Provides: epiphany-branding = %{epiphany_version} +Conflicts: otherproviders(epiphany-branding) +Supplements: packageand(epiphany:branding-%{branding_name}) +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch + +%description +This package provides %{branding_name} Look and Feel for Epiphany. + +%prep +cp -a %{_datadir}/epiphany/default-bookmarks.rdf . +%if %build_openSUSE +%patch0 +%endif +%if %build_SLED +%patch1 +%endif +cp -a %{SOURCE0} . + +%build +sed "s,@distroversion@,%{distro_version},g;s,@pkgversion@,%{epiphany_version},g" %{SOURCE1} > branding.conf + +%install +# custom bookmarks +install -D -m0644 default-bookmarks.rdf %{buildroot}%{_datadir}/epiphany/default-bookmarks.rdf +# user agent +install -D -m0644 branding.conf %{buildroot}%{_datadir}/epiphany/branding.conf + +%clean +rm -rf %{buildroot} + +%files +%defattr(-,root,root) +%doc COPYING +%{_datadir}/epiphany/default-bookmarks.rdf +%{_datadir}/epiphany/branding.conf + +%changelog diff --git a/pre_checkin.sh b/pre_checkin.sh new file mode 100644 index 0000000..8271b43 --- /dev/null +++ b/pre_checkin.sh @@ -0,0 +1,18 @@ +#!/bin/sh + +NAME=epiphany + +if ! test -f ${NAME}-branding.spec.in ; then + exit +fi + +for variant in openSUSE SLED ; do + cp ${NAME}-branding.spec.in ${NAME}-branding-${variant}.spec + cp ${NAME}-branding.changes ${NAME}-branding-${variant}.changes + sed -i "s/%{branding_name}/${variant}/g" ${NAME}-branding-${variant}.spec + sed -i "s/\(%define *build_${variant} *\)0/\11/" ${NAME}-branding-${variant}.spec + sed -i " + /^Name: *${NAME}-branding-${variant}/i \ +# Do not edit this auto generated file! Edit ${NAME}-branding.spec.in. +" ${NAME}-branding-${variant}.spec +done diff --git a/sled-bookmarks.patch b/sled-bookmarks.patch new file mode 100644 index 0000000..3ec981f --- /dev/null +++ b/sled-bookmarks.patch @@ -0,0 +1,21 @@ +--- default-bookmarks.rdf.old 2008-07-30 03:43:13.000000000 +0200 ++++ default-bookmarks.rdf 2008-07-30 03:43:24.000000000 +0200 +@@ -6,6 +6,7 @@ + + + ++ + + + +@@ -16,4 +17,8 @@ + + http://www.google.com/search?q=%s&ie=UTF-8&oe=UTF-8 + +- +\ Pas de fin de ligne à la fin du fichier. ++ ++ Novell Documentation ++ http://www.novell.com/documentation/ ++ ++ From 384a9fef5efde3af4ef7521e6ed1dd3ba2f606042f42447a429ad2751358fc70 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 11 Oct 2010 08:09:17 +0000 Subject: [PATCH 6/7] Accepting request 50069 from home:vuntz:branches:GNOME:Factory thanks OBS-URL: https://build.opensuse.org/request/show/50069 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/epiphany-branding-openSUSE?expand=0&rev=20 --- epiphany-branding-SLED.changes | 5 +++++ epiphany-branding-SLED.spec | 4 ++-- epiphany-branding-openSUSE.changes | 5 +++++ epiphany-branding-openSUSE.spec | 4 ++-- epiphany-branding.changes | 5 +++++ epiphany-branding.spec.in | 7 ++++--- ready | 0 7 files changed, 23 insertions(+), 7 deletions(-) delete mode 100644 ready diff --git a/epiphany-branding-SLED.changes b/epiphany-branding-SLED.changes index 4dfdb60..372d2b6 100644 --- a/epiphany-branding-SLED.changes +++ b/epiphany-branding-SLED.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Oct 8 11:42:42 CEST 2010 - vuntz@opensuse.org + +- Bump version to 11.4. + ------------------------------------------------------------------- Fri Jan 15 03:58:43 CET 2010 - vuntz@opensuse.org diff --git a/epiphany-branding-SLED.spec b/epiphany-branding-SLED.spec index 459c607..394164a 100644 --- a/epiphany-branding-SLED.spec +++ b/epiphany-branding-SLED.spec @@ -18,11 +18,11 @@ %define build_openSUSE 0 %define build_SLED 1 -# Do not edit this auto generated file! Edit epiphany-branding.spec.in. +# Do not edit this auto generated file! Edit epiphany-branding.spec.in. Name: epiphany-branding-SLED License: GPLv2+ -Version: 11.3 +Version: 11.4 Release: 1 Summary: SLED branding of epiphany Group: Productivity/Networking/Web/Browsers diff --git a/epiphany-branding-openSUSE.changes b/epiphany-branding-openSUSE.changes index 4dfdb60..372d2b6 100644 --- a/epiphany-branding-openSUSE.changes +++ b/epiphany-branding-openSUSE.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Oct 8 11:42:42 CEST 2010 - vuntz@opensuse.org + +- Bump version to 11.4. + ------------------------------------------------------------------- Fri Jan 15 03:58:43 CET 2010 - vuntz@opensuse.org diff --git a/epiphany-branding-openSUSE.spec b/epiphany-branding-openSUSE.spec index 62f96b4..a6f17e9 100644 --- a/epiphany-branding-openSUSE.spec +++ b/epiphany-branding-openSUSE.spec @@ -18,11 +18,11 @@ %define build_openSUSE 1 %define build_SLED 0 -# Do not edit this auto generated file! Edit epiphany-branding.spec.in. +# Do not edit this auto generated file! Edit epiphany-branding.spec.in. Name: epiphany-branding-openSUSE License: GPLv2+ -Version: 11.3 +Version: 11.4 Release: 1 Summary: openSUSE branding of epiphany Group: Productivity/Networking/Web/Browsers diff --git a/epiphany-branding.changes b/epiphany-branding.changes index 4dfdb60..372d2b6 100644 --- a/epiphany-branding.changes +++ b/epiphany-branding.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Oct 8 11:42:42 CEST 2010 - vuntz@opensuse.org + +- Bump version to 11.4. + ------------------------------------------------------------------- Fri Jan 15 03:58:43 CET 2010 - vuntz@opensuse.org diff --git a/epiphany-branding.spec.in b/epiphany-branding.spec.in index c8c0687..8e3de88 100644 --- a/epiphany-branding.spec.in +++ b/epiphany-branding.spec.in @@ -1,7 +1,7 @@ # # spec file for package epiphany-branding-%{branding_name} (Version 11.3) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 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,12 +15,13 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %define build_openSUSE 0 %define build_SLED 0 Name: epiphany-branding-%{branding_name} -License: GPL v2 or later -Version: 11.3 +License: GPLv2+ +Version: 11.4 Release: 1 Summary: %{branding_name} branding of epiphany Group: Productivity/Networking/Web/Browsers diff --git a/ready b/ready deleted file mode 100644 index 473a0f4..0000000 From 4b719bb20f6bdd01251d71e56d4d34be73272007a3df077e398eecd53287dce0 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Fri, 15 Oct 2010 15:18:24 +0000 Subject: [PATCH 7/7] Accepting request 50662 from GNOME:Factory checked in (request 50662) OBS-URL: https://build.opensuse.org/request/show/50662 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/epiphany-branding-openSUSE?expand=0&rev=21 --- epiphany-branding-SLED.spec | 3 ++- epiphany-branding-openSUSE.spec | 3 ++- epiphany-branding.changes => epiphany-branding.changes.in | 0 pre_checkin.sh | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) rename epiphany-branding.changes => epiphany-branding.changes.in (100%) diff --git a/epiphany-branding-SLED.spec b/epiphany-branding-SLED.spec index 394164a..eee9159 100644 --- a/epiphany-branding-SLED.spec +++ b/epiphany-branding-SLED.spec @@ -1,5 +1,5 @@ # -# spec file for package epiphany-branding-SLED (Version 11.3) +# spec file for package epiphany-branding-SLED (Version 11.4) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,6 +20,7 @@ %define build_SLED 1 # Do not edit this auto generated file! Edit epiphany-branding.spec.in. + Name: epiphany-branding-SLED License: GPLv2+ Version: 11.4 diff --git a/epiphany-branding-openSUSE.spec b/epiphany-branding-openSUSE.spec index a6f17e9..f5ce885 100644 --- a/epiphany-branding-openSUSE.spec +++ b/epiphany-branding-openSUSE.spec @@ -1,5 +1,5 @@ # -# spec file for package epiphany-branding-openSUSE (Version 11.3) +# spec file for package epiphany-branding-openSUSE (Version 11.4) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,6 +20,7 @@ %define build_SLED 0 # Do not edit this auto generated file! Edit epiphany-branding.spec.in. + Name: epiphany-branding-openSUSE License: GPLv2+ Version: 11.4 diff --git a/epiphany-branding.changes b/epiphany-branding.changes.in similarity index 100% rename from epiphany-branding.changes rename to epiphany-branding.changes.in diff --git a/pre_checkin.sh b/pre_checkin.sh index 8271b43..d17fe1d 100644 --- a/pre_checkin.sh +++ b/pre_checkin.sh @@ -8,7 +8,7 @@ fi for variant in openSUSE SLED ; do cp ${NAME}-branding.spec.in ${NAME}-branding-${variant}.spec - cp ${NAME}-branding.changes ${NAME}-branding-${variant}.changes + cp ${NAME}-branding.changes.in ${NAME}-branding-${variant}.changes sed -i "s/%{branding_name}/${variant}/g" ${NAME}-branding-${variant}.spec sed -i "s/\(%define *build_${variant} *\)0/\11/" ${NAME}-branding-${variant}.spec sed -i "