Bouncer Login

Revision History

Revision 0.4 2005-06-01 StuartEllis

Managing Software with yum
		Next

Managing Software with `yum`

Stuart Ellis

Revision History!

Revision 0.4

2005-06-01

StuartEllis

Initial import into CVS.

@@ -23,61 +23,61 @@

Publish to official project page.

1.1. Purpose
1.2. Audience
1.3. Using This Document
1.4. Additional Resources

2.1. About Packages
2.2. About Repositories
2.3. About Dependencies
2.4. Understanding Package Names

4. Managing Software with yum

4.1. Installing New Software with yum
4.2. Updating Software with yum
4.! 3. Removing Software with yum!

5. Searching for Packages with yum

5.1. Searching by Package Name and Attributes
5.2. Advanced Searches
5.3. Understanding Matches

6. Updating Your System with yum

6.1. Automatically Updating Your System

7.1. Adding a Repository as a Package Source
7.2. Manually Authorizing Package Sources
7.3. Understanding Repository Compatibility

8. Maintaining yum

8.1. Disabling or Removing Package Sources
8.2. Clearing the yum Caches

10. Using yum with a Proxy Server

Index

1. Introduction

1.1. Purpose

1.1. Purpose
1.2. Audience
1.3. Using This Document
1.4. Additional Resources

2.1. About Packages
2.2. About Repositories!
2.3. About Dependencies
2.4. Understanding Package Names

4. Managing Software with yum

4.1. Installing New Software with yum
4.2. Updating Software with yum
4.3. Removing Software with yum

5. Searching for Pack! ages w yum

5.1. Searching by Package Name and Attributes
5.2. Advanced Searches
5.3. Understanding Matches

6. Updating Your System with yum

6.1. Automatically Updating Your System

7.1. Adding a Repository as a Package Source
7.2. Manually Authorizing Package Sources
7.3. Understanding Repository Compatibility

8. Maintaining yum

8.1. Disabling or Removing Package Sources
8.2. Clearing the yum Caches

10. Using yum with a Proxy Server

1. Introduction

1.1. Purpose

This document presents basic concepts of software management on Fedora systems. It outlines the major functions of - yum, the recommended software management tool + yum, the recommended software management tool for Fedora. -

1.2. Audience

This document is intended for Fedora users of all levels of experience. -

1.3. Using This Document

- This document is a reference for using yum. +

1.3. Using This Document

+ This document is a reference for using yum. You may wish to read some or all of the sections, depending upon your needs and level of experience. If you are a new user, read the Section 2, “Software Management Concepts” - before using yum for the first time. + before using yum for the first time. Experienced Linux users should start with - Section 4, “Managing Software with yum”. -

Previous Versions of Fedora

+ Section 4, “Managing Software with yum”. +

	Previous Versions of Fedora
	This document describes the configuration of - `yum` on Fedora 4 systems. You must + `yum` on Fedora 4 systems. You must perform the additional step described in Section 7.2, “Manually Authorizing Package Sources” to enable - `yum` on Fedora 3. + `yum` on Fedora 3.

Most of the examples in this document use the package - tsclient, which is included with Fedora Core. The - tsclient package provides an application + tsclient, which is included with Fedora Core. The + tsclient package provides an application for remote desktop access. If you install it successfully you may start the application by choosing - Applications->Internet->Terminal - Server Client. To use the examples, + Applications->Internet->Terminal + Server Client. To use the examples, substitute the name of the relevant package for - tsclient. The example commands for Fedora - package groups use the MySQL Database + tsclient. The example commands for Fedora + package groups use the MySQL Database group. -

Avoid Logging in with the Root Account

	Avoid Logging in with the Root Account
	You do not need to log in with the - `root` account in + `root` account in order to manage your Fedora system. All of the commands shown in this tutorial that require - `root` access will + `root` access will prompt you for the - `root` password. The - example terminal commands use `su - -c` to provide this facility. -

1.4. Additional Resources

- The yum utility has features and options not - discussed in this document. Read the man - pages for yum(8) and - yum.conf(5) to learn more, using the + root password. The + example terminal commands use su + -c to provide this facility. +

1.4. Additional Resources

+ The yum utility has features and options not + discussed in this document. Read the man + pages for yum(8) and + yum.conf(5) to learn more, using the following commands:

-man yum
-man yum.conf
-

- Other useful yum resources on the Internet +man yum +man yum.conf +

+ Other useful yum resources on the Internet include:

Project web site Index: ln-legalnotice.php =================================================================== RCS file: /cvs/fedora/web/html/docs/yum/ln-legalnotice.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ln-legalnotice.php 16 Aug 2005 21:30:52 -0000 1.2 +++ ln-legalnotice.php 16 Aug 2005 22:41:32 -0000 1.3 @@ -22,7 +22,7 @@
Garrett LeSage created the admonition graphics (note, tip, important, caution, and warning). - Tommy Reynolds <Tommy.Reynolds at MegaCoder.com> created the callout graphics. + Tommy Reynolds <Tommy.Reynolds at MegaCoder.com> created the callout graphics. They all may be freely redistributed with documentation produced for the Fedora Project.
Index: sn-acknowledgements.php =================================================================== RCS file: /cvs/fedora/web/html/docs/yum/sn-acknowledgements.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sn-acknowledgements.php 16 Aug 2005 21:30:52 -0000 1.2 +++ sn-acknowledgements.php 16 Aug 2005 22:41:32 -0000 1.3 @@ -7,10 +7,10 @@ ?> -
11. Acknowledgements
Prev Next
11. Acknowledgements
+
11. Acknowledgements
Prev Next
11. Acknowledgements
Paul Frields edited this document. Timothy Murphy reviewed the beta release. -
Prev Next
10. Using yum with a Proxy Server Home Index
+
Prev Up Next
10. Using yum with a Proxy Server Home Index
-
4. Managing Software with yum
Prev Next
4. Managing Software with yum
- Use the yum utility to modify the software on +
4. Managing Software with yum
Prev Next
4. Managing Software with yum
+ Use the yum utility to modify the software on your system in three ways:

@@ -19,26 +19,26 @@ To remove unwanted software from your system

- To use yum, specify a function and one or more + To use yum, specify a function and one or more packages or package groups. Each section below gives some examples.
- For each operation, yum downloads the latest + For each operation, yum downloads the latest package information from the configured repositories. If your - system uses a slow network connection yum may + system uses a slow network connection yum may require several seconds to download the repository indexes and the header files for each package.
- The yum utility searches these data files to + The yum utility searches these data files to determine the best set of actions to produce the required result, and displays the transaction for you to approve. The transaction may include the installation, update, or removal of additional packages, in order to resolve software dependencies.
This is an example of the transaction for installing - tsclient: + tsclient:
-============================================================================= +============================================================================= Package Arch Version Repository Size ============================================================================= Installing: @@ -52,127 +52,127 @@ Update 0 Package(s) Remove 0 Package(s) Total download size: 355 k -Is this ok [y/N]:-
Example 1. Format of yum Transaction Reports
+Is this ok [y/N]: +
Example 1. Format of yum Transaction Reports
Review the list of changes, and then press - y + y to accept and begin the process. If you press - N + N or - Enter - , yum does not download or change any packages. -
Package Versions
- The yum utility only displays and uses the + Enter + , yum does not download or change any packages. +
Package Versions
+ The yum utility only displays and uses the newest version of each package, unless you specify an older version.
- The yum utility imports the repository public - key if it is not already installed on the rpm + The yum utility imports the repository public + key if it is not already installed on the rpm keyring.
This is an example of the public key import:
-warning: rpmts_HdrFromFdno: Header V3 DSA signature: NOKEY, key ID 4f2a6fd2 +warning: rpmts_HdrFromFdno: Header V3 DSA signature: NOKEY, key ID 4f2a6fd2 public key not available for tsclient-0.132-6.i386.rpm Retrieving GPG key from file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora Importing GPG key 0x4F2A6FD2 "Fedora Project <fedora at redhat.com>" -Is this ok [y/N]:-
Example 2. Format of yum Public Key Import
+Is this ok [y/N]: +
Example 2. Format of yum Public Key Import
Check the public key, and then press - y + y to import the key and authorize the key for use. If you press - N + N or - Enter - , yum stops without installing any packages. -
Downloads are Cached
- The yum utility keeps downloaded data files + Enter + , yum stops without installing any packages. +
Downloads are Cached
+ The yum utility keeps downloaded data files and packages for reuse. You may copy packages from the repository cache directories under - /var/cache/yum/, and use them elsewhere if + /var/cache/yum/, and use them elsewhere if you wish. If you remove a package from the cache, you do not affect the copy of the software installed on your system. -
4.1. Installing New Software with yum
- To install the package tsclient, enter the +
4.1. Installing New Software with yum
+ To install the package tsclient, enter the command:
-su -c 'yum install tsclient' +su -c 'yum install tsclient'
Enter the password for the - root account when + root account when prompted.
- To install the package group MySQL - Database, enter the command: + To install the package group MySQL + Database, enter the command:
-su -c 'yum groupinstall "MySQL Database"' +su -c 'yum groupinstall "MySQL Database"'
Enter the password for the - root account when + root account when prompted. -
New Services Require Activation
+
New Services Require Activation
When you install a service, Fedora does not activate or start it. To configure a new service to run on bootup, choose - Desktop->System - Settings->Server Settings->Services, or use the - chkconfig and service + Desktop->System + Settings->Server Settings->Services, or use the + chkconfig and service command-line utilities. -
4.2. Updating Software with yum
- To update the tsclient package to the +
4.2. Updating Software with yum
+ To update the tsclient package to the latest version, type:
-su -c 'yum update tsclient' +su -c 'yum update tsclient'
Enter the password for the - root account when + root account when prompted. -
New Software Versions Require Reloading
+
New Software Versions Require Reloading
If a piece of software is in use when you update it, the old version remains active until the application or service is restarted. Kernel updates take effect when you reboot the system.
To update all of the packages in the package group - MySQL Database, enter the command: + MySQL Database, enter the command:
-su -c 'yum groupupdate "MySQL Database"' +su -c 'yum groupupdate "MySQL Database"'
Enter the password for the - root account when + root account when prompted. -
Updating the Entire System
+
Updating the Entire System
To update all of the packages on your Fedora system, use the commands described in - Section 6, “Updating Your System with yum”. -
4.3. Removing Software with yum
- To remove software, yum examines your system + Section 6, “Updating Your System with yum”. +
4.3. Removing Software with yum
+ To remove software, yum examines your system for both the specified software, and any software which claims it as a dependency. The transaction to remove the software deletes both the software and the dependencies.
- To remove the tsclient package from your + To remove the tsclient package from your system, use the command:
-su -c 'yum remove tsclient' +su -c 'yum remove tsclient'
Enter the password for the - root account when + root account when prompted.
To remove all of the packages in the package group - MySQL Database, enter the command: + MySQL Database, enter the command:
-su -c 'yum groupremove "MySQL Database"' +su -c 'yum groupremove "MySQL Database"'
Enter the password for the - root account when + root account when prompted. -
Data and Configuration File Retention
+
Data and Configuration File Retention
The removal process leaves user data in place but may remove configuration files in some cases. If a package removal does not include the configuration file, and you reinstall the package later, it may reuse the old configuration file. -
Prev Next
3. Software Management Tools in Fedora Core Home 5. Searching for Packages with yum
+
Prev Up Next
3. Software Management Tools in Fedora Core Home 5. Searching for Packages with yum
-
5. Searching for Packages with yum
Prev Next
5. Searching for Packages with yum
- Use the search features of yum to find software +
5. Searching for Packages with yum
Prev Next
5. Searching for Packages with yum
+ Use the search features of yum to find software that is available from the configured repositories, or already installed on your system. Searches automatically include both installed and available packages. @@ -16,15 +16,15 @@ The format of the results depends upon the option. If the query produces no information, there are no packages matching the criteria. -
5.1. Searching by Package Name and Attributes
+
5.1. Searching by Package Name and Attributes
To search for a specific package by name, use the - list function. To search for the package - tsclient, use the command: + list function. To search for the package + tsclient, use the command:
-su -c 'yum list tsclient' +su -c 'yum list tsclient'
Enter the password for the - root account when + root account when prompted.
To make your queries more precise, specify packages with a name @@ -32,74 +32,74 @@ architecture. To search for version 0.132 of the application, use the command:
-su -c 'yum list tsclient-0.132' -
Valid Package Attributes
+su -c 'yum list tsclient-0.132' +
Valid Package Attributes
Refer to Section 2.4, “Understanding Package Names” for information on package name formats and the attributes that they include. -
5.2. Advanced Searches
+
5.2. Advanced Searches
If you do not know the name of the package, use the - search or provides options. + search or provides options. Alternatively, use wild cards or regular expressions with any - yum search option to broaden the search + yum search option to broaden the search critieria.
- The search option checks the names, + The search option checks the names, descriptions, summaries and listed package maintainers of all of the available packages to find those that match. For example, to search for all packages that relate to PalmPilots, type:
-su -c 'yum search PalmPilot' +su -c 'yum search PalmPilot'
Enter the password for the - root account when + root account when prompted.
- The provides function checks both the files + The provides function checks both the files included in the packages and the functions that the software - provides. This option requires yum to + provides. This option requires yum to download and read much larger index files than with the - search option. + search option.
To search for all packages that include files called - libneon, type: + libneon, type:
-su -c 'yum provides libneon' +su -c 'yum provides libneon'
To search for all packages that either provide a MTA (Mail Transport Agent) service, or include files with - mta in their name: + mta in their name:
-su -c 'yum provides MTA' +su -c 'yum provides MTA'
For each command, at the prompt enter the password for the - root account. + root account.
Use the standard wildcard characters to run any search option - with a partial word or name: ? to represent any - one character, and * to mean zero or more - characters. Always add the escape character (\) + with a partial word or name: ? to represent any + one character, and * to mean zero or more + characters. Always add the escape character (\) before wildcards.
- To list all packages with names that begin with - tsc, type: + To list all packages with names that begin with + tsc, type:
-su -c 'yum list tsc\*' -
Regular Expressions
+su -c 'yum list tsc\*' +
Regular Expressions
Use Perl or Python regular expressions to carry out more complex queries. -
5.3. Understanding Matches
- Searches with yum show all of the packages +
5.3. Understanding Matches
+ Searches with yum show all of the packages that match your criteria. Packages must meet the terms of the search exactly to be considered matches, unless you use wildcards or a regular expression.
- For example, a search query for shadowutils - or shadow-util would not produce the - package shadow-utils. This package would + For example, a search query for shadowutils + or shadow-util would not produce the + package shadow-utils. This package would match and be shown if the query was - shadow-util\?, or - shadow\*. -
Prev Next
4. Managing Software with yum Home 6. Updating Your System with yum
+ shadow-util\?, or + shadow\*. +
Prev Up Next
4. Managing Software with yum Home 6. Updating Your System with yum
-
2. Software Management Concepts
Prev Next
2. Software Management Concepts
2.1. About Packages
+
2. Software Management Concepts
Prev Next
2. Software Management Concepts
2.1. About Packages
Fedora software and documentation is supplied in the form of - files called RPM packages. Each package + files called RPM packages. Each package is a compressed archive containing product information, program files, icons, documentation and management scripts. Management applications use these files to safely locate, install, update @@ -19,15 +19,15 @@
Packages also include a digital signature to prove their source. Software management utilities verify this digital signature by - using a GPG public key. The - yum and rpm utilities - share a common keyring that stores all of + using a GPG public key. The + yum and rpm utilities + share a common keyring that stores all of the public keys for approved package sources. The system administrator configures these approved package sources. -
2.2. About Repositories
- A repository is a prepared directory or +
2.2. About Repositories
+ A repository is a prepared directory or web site that contains software packages and index files. - Software management utilities such as yum + Software management utilities such as yum automatically locate and obtain the correct RPM packages from these repositories. This method frees you from having to manually find and install new applications or updates. You may @@ -42,12 +42,12 @@ Updated versions of Fedora Core software
A large selection of additional software, known as Fedora Extras -
Previous Versions of Fedora
+
Previous Versions of Fedora
Fedora 4 automatically supports all three repositories. You must manually configure Fedora 3 systems to use Fedora Extras, as noted in Section 7, “Using Other Software Repositories”. -
All Fedora Packages are Open Source Software
+
All Fedora Packages are Open Source Software
All of the software provided by the Fedora Project is open source software. You may download and install software from the Fedora Project network of repositories on as many systems as desired. @@ -56,68 +56,68 @@ their Fedora compatible packages. To learn how to configure your Fedora system to use third-party repositories, read Section 7, “Using Other Software Repositories”. -
- You may also use the package groups +
+ You may also use the package groups provided by the Fedora repositories to manage related packages as sets. Some third-party repositories add packages to these groups, or provide their packages as additional groups. -
Available Package Groups
+
Available Package Groups
To view a list of all of the available package groups for your - Fedora system, run the command su -c 'yum - grouplist'. + Fedora system, run the command su -c 'yum + grouplist'.
Use repositories to ensure that you always receive current versions of software. If several versions of the same package are available, your management utility automatically selects the latest version. -
Installing Software not from a Repository
+
Installing Software not from a Repository
Install software using manual methods only when you are confident there is no repository which can currently provide it. You may have to manage that software with manual methods, instead of with Fedora software management utilities.
- The yum commands shown in this document use + The yum commands shown in this document use repositories as package sources. Refer to Section 9, “Manually Installing Software” for details of - using yum to install software from a + using yum to install software from a package file. -
2.3. About Dependencies
+
2.3. About Dependencies
Some of the files installed on a Fedora distribution are - libraries which may provide functions to + libraries which may provide functions to multiple applications. When an application requires a specific library, the package which contains that library is a - dependency. To properly install a + dependency. To properly install a package, Fedora must first satisfy its dependencies. The dependency information for a RPM package is stored within the RPM file.
- The yum utility uses package dependency data + The yum utility uses package dependency data to ensure that all of requirements for an application are met during installation. It automatically installs the packages for any dependencies not already present on your system. If a new application has requirements that conflict with existing - software, yum aborts without making any + software, yum aborts without making any changes to your system. -
2.4. Understanding Package Names
+
2.4. Understanding Package Names
Each package file has a long name that indicates several key pieces of information. This is the full name of the - tsclient package supplied with Fedora Core: + tsclient package supplied with Fedora Core:
-tsclient-0.132-6.i386.rpm +tsclient-0.132-6.i386.rpm
Management utilities commonly refer to packages with one of three formats:
- Package name: tsclient + Package name: tsclient
Package name with version and release numbers: - tsclient-0.132-6 + tsclient-0.132-6
Package name with hardware architecture: - tsclient.i386 + tsclient.i386
- For clarity, yum lists packages in the format - name.architecture. Repositories also + For clarity, yum lists packages in the format + name.architecture. Repositories also commonly store packages in separate directories by architecture. In each case, the hardware architecture specified for the package is the minimum type of machine @@ -143,35 +143,35 @@
Some software may be optimized for particular types of Intel-compatible machine. Separate packages may be provided for - i386, i586, - i686 and x86_64 computers. A + i386, i586, + i686 and x86_64 computers. A machine with at least an Intel Pentium, VIA C3 or compatible CPU - may use i586 packages. Computers with an Intel + may use i586 packages. Computers with an Intel Pentium Pro and above, or a current model of AMD chip, may use - i686 packages. + i686 packages.
- Use the short name of the package for yum - commands. This causes yum to automatically + Use the short name of the package for yum + commands. This causes yum to automatically select the most recent package in the repositories that matches the hardware architecture of your computer.
Specify a package with other name formats to override the - default behavior and force yum to use the + default behavior and force yum to use the package that matches that version or architecture. Only override - yum when you know that the default package + yum when you know that the default package selection has a bug or other fault that makes it unsuitable for installation. -
Package Names
+
Package Names
You may use any of the following formats to specify a package - in a yum operation: - name, - name.architecture, - name-version, - name-version-release, - name-version-release.architecture, + in a yum operation: + name, + name.architecture, + name-version, + name-version-release, + name-version-release.architecture, and - epoch:name-version-release.architecture. -
Prev Next
Software Management with yum Home 3. Software Management Tools in Fedora Core
+ epoch:name-version-release.architecture. +
Prev Up Next
Managing Software with yum Home 3. Software Management Tools in Fedora Core
-
3. Software Management Tools in Fedora Core
Prev Next
3. Software Management Tools in Fedora Core
- The yum utility is a complete software +
3. Software Management Tools in Fedora Core
Prev Next
3. Software Management Tools in Fedora Core
+ The yum utility is a complete software management system. Fedora Core also includes other several other - applications that can supplement yum. + applications that can supplement yum.
- On your desktop is an Alert Icon that + On your desktop is an Alert Icon that keeps you informed about package updates. Until your system is updated the icon appears as a red circle with a flashing exclamation mark. The Alert Icon is part of the - up2date application, which enables you + up2date application, which enables you to easily install system updates.
Fedora Core also includes - system-config-packages. To run this - application from the graphical interface, select Desktop->System - Settings->Add/Remove - Applications. Unlike - up2date and yum, - system-config-packages installs + system-config-packages. To run this + application from the graphical interface, select Desktop->System + Settings->Add/Remove + Applications. Unlike + up2date and yum, + system-config-packages installs software packages from your Fedora Core installation discs only, and does not use repositories. This application is used on systems that do not have a network connection.
- The rpm command-line utility has many functions + The rpm command-line utility has many functions for working with individual RPM packages. You may use it to manually install and remove packages from your system. If you - install software with the rpm utility, you must + install software with the rpm utility, you must manually check and install any dependencies. For this reason, - yum is the recommended method for installing + yum is the recommended method for installing software. -
Current Package Versions
- The up2date and - yum utilities ensure that you have the most +
Current Package Versions
+ The up2date and + yum utilities ensure that you have the most recent version of software packages. Other methods do not guarantee that the packages are current. -
Prev Next
2. Software Management Concepts Home 4. Managing Software with yum
+
Prev Up Next
2. Software Management Concepts Home 4. Managing Software with yum
-
6. Updating Your System with yum
Prev Next
6. Updating Your System with yum
- Use the update option to upgrade all of your +
6. Updating Your System with yum
Prev Next
6. Updating Your System with yum
+ Use the update option to upgrade all of your Fedora system software to the latest version with one operation.
To perform a full system update, type this command:
-su -c 'yum update' +su -c 'yum update'
At the prompt, enter the - root password. -
6.1. Automatically Updating Your System
- The yum package supplied with Fedora Core includes + root password. +
6.1. Automatically Updating Your System
+ The yum package supplied with Fedora Core includes scripts to perform full system updates every day. To activate automatic daily updates, enter this command:
-su -c '/sbin/chkconfig --level 345 yum on; /sbin/service yum start' +su -c '/sbin/chkconfig --level 345 yum on; /sbin/service yum start'
At the prompt, enter the password for the - root account. -
How Daily Updates are Run
- There is no separate yum service that runs + root account. +
How Daily Updates are Run
+ There is no separate yum service that runs on your system. The command given above enables the control - script /etc/rc.d/init.d/yum. This control + script /etc/rc.d/init.d/yum. This control script activates the script - /etc/cron.daily/yum.cron, which causes - the cron service to perform the system + /etc/cron.daily/yum.cron, which causes + the cron service to perform the system update automatically each day. -
Prev Next
5. Searching for Packages with yum Home 7. Using Other Software Repositories
+
Prev Up Next
5. Searching for Packages with yum Home 7. Using Other Software Repositories
-
7. Using Other Software Repositories
Prev Next
7. Using Other Software Repositories
+
7. Using Other Software Repositories
Prev Next
7. Using Other Software Repositories
Fedora systems automatically use the Fedora Project repositories. These include Fedora Extras, the default source of packages for software that is not included with Fedora Core. -
Fedora Extras Repositories for Previous Versions of Fedora Core
+
Fedora Extras Repositories for Previous Versions of Fedora Core
You must manually configure Fedora 3 systems to use Fedora Extras, using the instructions at http://fedora.redhat.com/projects/extras/. For @@ -23,70 +23,70 @@ repository. Members of the community also maintain repositories to provide packages for Fedora systems. Third-party repositories provide information on their web sites. -
7.1. Adding a Repository as a Package Source
+
7.1. Adding a Repository as a Package Source
To add an extra repository, place a definition file in the - /etc/yum.repos.d/ directory on your system. + /etc/yum.repos.d/ directory on your system. Package providers make the definition files for their repositories available on their web sites. -
- + - + <% i = i + 1 Index: index.psp =================================================================== RCS file: /cvs/fedora/extras-buildsys/www/index.psp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- index.psp 4 Aug 2005 20:27:12 -0000 1.6 +++ index.psp 6 Aug 2005 16:25:05 -0000 1.7 @@ -62,17 +62,14 @@ import os source = os.path.basename(source) # endif - - joblink = job_link(job['uid']) - username = job['username'].replace('@', ' ') %> - + - + <% i = i + 1 Index: indiv.psp =================================================================== RCS file: /cvs/fedora/extras-buildsys/www/indiv.psp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- indiv.psp 4 Aug 2005 21:12:47 -0000 1.6 +++ indiv.psp 6 Aug 2005 16:25:05 -0000 1.7 @@ -151,11 +151,9 @@ import os source = os.path.basename(source) # endif - - joblink = job_link(job['uid']) %> - + Index: job.psp =================================================================== RCS file: /cvs/fedora/extras-buildsys/www/job.psp,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- job.psp 5 Aug 2005 16:42:22 -0000 1.7 +++ job.psp 6 Aug 2005 16:25:05 -0000 1.8 @@ -49,7 +49,7 @@
Definition File Extension
+
Definition File Extension
The names of repository definition files end with - .repo. + .repo.
- You must have root + You must have root access to add a file to the definitions directory. To copy the - definition file example.repo, type this + definition file example.repo, type this command:
-su -c 'cp example.repo /etc/yum.repos.d/' +su -c 'cp example.repo /etc/yum.repos.d/'
At the prompt, enter the password for the - root account. + root account.
The configuration file for each repository should include a - gpgkey setting. This setting specifies the + gpgkey setting. This setting specifies the location of a public key that verifies the packages provided by that repository. This public key is automatically imported the first time that you install software from the repository. If the configuration file provided does not include this setting, refer to Section 7.2, “Manually Authorizing Package Sources”. -
Repositories and up2date Channels
- Starting with Fedora 4, yum repositories are - automatically used as up2date +
Repositories and up2date Channels
+ Starting with Fedora 4, yum repositories are + automatically used as up2date channels. On Fedora 3 and earlier systems, you must manually - configure up2date to use these + configure up2date to use these channels. To do so, edit the - /etc/sysconfig/rhn/sources file. -
7.2. Manually Authorizing Package Sources
- To manually add a public key to your rpm - keyring, use the import feature of the - rpm utility. To import the file - GPG-PUB-KEY.asc, type the following + /etc/sysconfig/rhn/sources file. +
7.2. Manually Authorizing Package Sources
+ To manually add a public key to your rpm + keyring, use the import feature of the + rpm utility. To import the file + GPG-PUB-KEY.asc, type the following command:
-su -c 'rpm --import GPG-PUB-KEY.asc' +su -c 'rpm --import GPG-PUB-KEY.asc'
At the prompt, enter the password for the - root account. + root account.
You may also import public keys directly from a web site. For - example, to import the file GPG-PUB-KEY.asc - on the web site www.therepository.com + example, to import the file GPG-PUB-KEY.asc + on the web site www.therepository.com use this command:
-su -c 'rpm --import http://www.therepository.com/GPG-PUB-KEY.asc' +su -c 'rpm --import http://www.therepository.com/GPG-PUB-KEY.asc'
At the prompt, enter the - root password. + root password.
You must manually import all public keys on Fedora 3 and earlier systems. This includes the Fedora public key. To import the Fedora public key on Fedora 3, type this command:
-su -c 'rpm --import /usr/share/rhn/RPM-GPG-KEY-fedora' +su -c 'rpm --import /usr/share/rhn/RPM-GPG-KEY-fedora'
At the prompt, enter the - root password. -
7.3. Understanding Repository Compatibility
+ root password. +
7.3. Understanding Repository Compatibility
The Fedora Extras repository provides packages which are built to the same standards as Fedora Core packages. Third-party packages should be compatible with these Fedora Project packages, unless the provider @@ -99,23 +99,23 @@ third-party repositories may also include alternative packages for software provided by Fedora Project repositories that are not compatible with other Fedora packages. -
From fedora-extras-commits at redhat.com Thu Aug 4 06:53:23 2005 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Thu, 4 Aug 2005 02:53:23 -0400 Subject: extras-buildsys ChangeLog,1.85,1.86 Message-ID: <200508040653.j746rNj1002506@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2489 Modified Files: ChangeLog Log Message: changelog Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.85 retrieving revision 1.86 diff -u -r1.85 -r1.86 --- ChangeLog 3 Aug 2005 04:36:58 -0000 1.85 +++ ChangeLog 4 Aug 2005 06:53:21 -0000 1.86 @@ -1,3 +1,6 @@ +2005-08-04 Seth Vidal + * add in success and failed pages for www report + 2005-08-02 Dan Williams Patch from Josh Boyer From fedora-extras-commits at redhat.com Thu Aug 4 07:13:05 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Thu, 4 Aug 2005 03:13:05 -0400 Subject: owners owners.list,1.48,1.49 Message-ID: <200508040713.j747D5Hb003766@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3749 Modified Files: owners.list Log Message: * Add highlight; Jochen Schmitt's package Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- owners.list 3 Aug 2005 19:52:56 -0000 1.48 +++ owners.list 4 Aug 2005 07:13:03 -0000 1.49 @@ -281,6 +281,7 @@ Fedora Extras|hercules|Hercules S/370, ESA/390, and z/Architecture emulator|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|Hermes|HERMES pixel format conversion library|thomas at apestaart.org|extras-qa at fedoraproject.org| Fedora Extras|hfsplusutils|Tools for reading Macintosh HFS+ volumes|dwmw2 at redhat.com|extras-qa at fedoraproject.org| +Fedora Extras|highlight|Universal source code to formatted text converter|jochen at herr-schmitt.de|extras-qa at fedoraproject.org| Fedora Extras|hping2|A software to do TCP/IP stack auditing and much more|kuko at maarmas.com|extras-qa at fedoraproject.org| Fedora Extras|htb-util|Another tool to make your life easier with HTB|mihai at xcyb.org|extras-qa at fedoraproject.org| Fedora Extras|htmltmpl|Templating engine for separation of code and HTML|ville.skytta at iki.fi|extras-qa at fedoraproject.org| From oliver at linux-kernel.at Thu Aug 4 07:13:48 2005 From: oliver at linux-kernel.at (Oliver Falk) Date: Thu, 04 Aug 2005 09:13:48 +0200 Subject: APPROVED: highlight Message-ID: <42F1C02C.2070705@linux-kernel.at> highlight: Universal source code to formatted text converter A utility that converts sourcecode to HTML, XHTML, RTF, LaTeX, TeX, XSL-FO, XML or ANSI escape sequences with syntax highlighting. It supports several programming and markup languages. Language descriptions are configurable and support regular expressions. The utility offers indentation and reformatting capabilities. It is easily possible to create new language definitions and colour themes. Maintainer: Jochen Schmitt Reviewer: Oliver Falk From fedora-extras-commits at redhat.com Thu Aug 4 07:23:03 2005 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Thu, 4 Aug 2005 03:23:03 -0400 Subject: mock mock.py,1.24,1.25 mock.spec,1.12,1.13 Message-ID: <200508040723.j747N3iY003813@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/fedora/mock In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3794 Modified Files: mock.py mock.spec Log Message: mock.spec: url updates mock.py: fix for rh bug: 163576 Thanks To Adrian Reber Index: mock.py =================================================================== RCS file: /cvs/fedora/mock/mock.py,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- mock.py 26 Jul 2005 20:36:41 -0000 1.24 +++ mock.py 4 Aug 2005 07:23:01 -0000 1.25 @@ -311,7 +311,7 @@ srpmfn = os.path.basename(srpm_in) # run with --nodeps b/c of the check above we know we have our build # deps satisfied. - cmd = "%s -c 'rpmbuild --rebuild --target %s --nodeps %s' %s" % ( + cmd = "cd /;%s -c 'rpmbuild --rebuild --target %s --nodeps %s' %s" % ( self.config['runuser'], self.target_arch, srpm_in, self.config['chrootuser']) Index: mock.spec =================================================================== RCS file: /cvs/fedora/mock/mock.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- mock.spec 26 Jul 2005 20:17:29 -0000 1.12 +++ mock.spec 4 Aug 2005 07:23:01 -0000 1.13 @@ -4,8 +4,8 @@ Release: 1 License: GPL Group: Development/Tools -Source: http://linux.duke.edu/~skvidal/mock/%{name}-%{version}.tar.gz -URL: http://linux.duke.edu/~skvidal/mock/ +Source: http://fedoraproject.org/projects/mock/releases/%{name}-%{version}.tar.gz +URL: http://fedoraproject.org/wiki/Projects/Mock BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: python, yum >= 2.2.1 Requires(pre): shadow-utils From fedora-extras-commits at redhat.com Thu Aug 4 07:52:59 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Thu, 4 Aug 2005 03:52:59 -0400 Subject: rpms/unison/FC-3 sources, 1.2, 1.3 unison.spec, 1.6, 1.7 unison-fix.patch, 1.1, NONE Message-ID: <200508040752.j747qxqC003874@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/unison/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3855 Modified Files: sources unison.spec Removed Files: unison-fix.patch Log Message: new version 2.12.0 Index: sources =================================================================== RCS file: /cvs/extras/rpms/unison/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 12 Feb 2005 00:16:24 -0000 1.2 +++ sources 4 Aug 2005 07:52:57 -0000 1.3 @@ -1 +1 @@ -a93cf03d4221ab6bab8b758b0325a9d5 unison-2.10.2.tar.gz +c2b818e77e95951b5db0b95272e385a2 unison-2.12.0.tar.gz Index: unison.spec =================================================================== RCS file: /cvs/extras/rpms/unison/FC-3/unison.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- unison.spec 16 May 2005 18:31:06 -0000 1.6 +++ unison.spec 4 Aug 2005 07:52:57 -0000 1.7 @@ -1,14 +1,14 @@ Name: unison -Version: 2.10.2 -Release: 4 +Version: 2.12.0 +Release: 1%{?dist} + Summary: File-synchronization tool Group: Applications/File License: GPL URL: http://www.cis.upenn.edu/~bcpierce/unison -Source: http://www.cis.upenn.edu/~bcpierce/unison/download/beta-test/unison-2.10.2/unison-2.10.2.tar.gz +Source: http://www.cis.upenn.edu/~bcpierce/unison/download/releases/stable/unison-2.12.0.tar.gz Source1: unison.png -Patch0: unison-fix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ocaml >= 3.08, lablgtk >= 2.4.0, tetex-latex BuildRequires: desktop-file-utils @@ -24,11 +24,9 @@ %prep %setup -q -%patch0 -p1 %build -make %{?_smp_mflags} NATIVE=true UISTYLE=gtk2 -#(cd doc; make) +make NATIVE=true UISTYLE=gtk2 %install rm -rf $RPM_BUILD_ROOT @@ -70,9 +68,21 @@ %{_datadir}/pixmaps/* %changelog -* Mon May 16 2005 Gerard Milmeister - 2.10.2-4 +* Sun Jul 31 2005 Gerard Milmeister - 2.12.0-0 +- New Version 2.12.0 + +* Fri May 27 2005 Toshio Kuratomi - 2.10.2-7 +- Bump and rebuild with new ocaml and new lablgtk + +* Sun May 22 2005 Jeremy Katz - 2.10.2-6 +- rebuild on all arches + +* Mon May 16 2005 Gerard Milmeister - 2.10.2-5 - Patch: http://groups.yahoo.com/group/unison-users/message/3200 +* Fri Apr 7 2005 Michael Schwendt +- rebuilt + * Thu Feb 24 2005 Michael Schwendt - 0:2.10.2-2 - BR gtk2-devel - Added NEWS and README docs --- unison-fix.patch DELETED --- From fedora-extras-commits at redhat.com Thu Aug 4 07:53:25 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Thu, 4 Aug 2005 03:53:25 -0400 Subject: common tobuild,1.2189,1.2190 Message-ID: <200508040753.j747rPt4003936@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3919 Modified Files: tobuild Log Message: request build of rpms/unison/FC-3 unison-2_12_0-1_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2189 retrieving revision 1.2190 diff -u -r1.2189 -r1.2190 --- tobuild 3 Aug 2005 19:42:43 -0000 1.2189 +++ tobuild 4 Aug 2005 07:53:23 -0000 1.2190 @@ -25,3 +25,4 @@ markmc rpms/sabayon/devel sabayon-2_11_90-1 devel ausil rpms/kphone/FC-3 kphone-4_2-1_fc3 fc3 anvil rpms/galeon/FC-4 galeon-1_3_21-12_fc4 fc4 +gemi rpms/unison/FC-3 unison-2_12_0-1_fc3 fc3 From fedora-extras-commits at redhat.com Thu Aug 4 08:28:25 2005 From: fedora-extras-commits at redhat.com (Karsten Wade (kwade)) Date: Thu, 4 Aug 2005 04:28:25 -0400 Subject: web/html index.php,1.12,1.13 Message-ID: <200508040828.j748SPpC005689@cvs-int.fedora.redhat.com> Author: kwade Update of /cvs/fedora/web/html In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5671/html Modified Files: index.php Log Message: Highlighting LWCE presence and cross-linking to canonical Wiki page on the subject. Index: index.php =================================================================== RCS file: /cvs/fedora/web/html/index.php,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- index.php 14 Jun 2005 17:00:45 -0000 1.12 +++ index.php 4 Aug 2005 08:28:23 -0000 1.13 @@ -26,6 +26,32 @@
+
Fedora Project at LinuxWorld San Francisco 2005
+ +
+Join us at LinuxWorld this August 8 to 11 at the Fedora Project booth. +Your Fedora hosts are bringing the roadshow to San Francisco, and have +some great thrills in store. +
+ +
+Some of your Fedora friends plan to give short, booth-side presentations +on subjects such as Fedora Directory Server, kickstart, Java, SELinux, +and an update on the Fedora Foundation. +
+ +
+Don't forget to come to the Fedora Project Birds of a Feather (BOF) +session from 5:30 to 7 pm on Tuesday 9 August. +
+ +
+For more information, refer to +http://www.fedoraproject.org/wiki/LinuxWorldSF2005. +
+ +
+
Fedora Core 4 Available!

Fedora Core 4 is now available From fedora-extras-commits at redhat.com Thu Aug 4 10:48:33 2005 From: fedora-extras-commits at redhat.com (Colin Charles (byte)) Date: Thu, 4 Aug 2005 06:48:33 -0400 Subject: rpms/gaim-guifications/FC-4 .cvsignore, 1.2, 1.3 gaim-guifications.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200508041048.j74AmXrc010153@cvs-int.fedora.redhat.com> Author: byte Update of /cvs/extras/rpms/gaim-guifications/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10126 Modified Files: .cvsignore gaim-guifications.spec sources Log Message: Bump to new upstream release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gaim-guifications/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 27 Jun 2005 05:32:11 -0000 1.2 +++ .cvsignore 4 Aug 2005 10:48:31 -0000 1.3 @@ -1 +1 @@ -guifications-2.10.tar.bz2 +guifications-2.12.tar.bz2 Index: gaim-guifications.spec =================================================================== RCS file: /cvs/extras/rpms/gaim-guifications/FC-4/gaim-guifications.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gaim-guifications.spec 28 Jun 2005 01:20:43 -0000 1.2 +++ gaim-guifications.spec 4 Aug 2005 10:48:31 -0000 1.3 @@ -12,8 +12,8 @@ Summary: Guifications Plugin for Gaim Name: gaim-guifications -Version: 2.10 -Release: 4%{?dist} +Version: 2.12 +Release: 1%{?dist} License: GPL Group: Applications/Internet Url: http://guifications.sourceforge.net/Guifications/ @@ -53,6 +53,9 @@ %{_datadir}/pixmaps/gaim/guifications %changelog +* Thu Aug 4 2005 Colin Charles 2.12-1 +- bump to new upstream release + * Tue Jun 28 2005 Colin Charles 2.10-4 - remove redundant CFLAGS in %configure (Ralf) Index: sources =================================================================== RCS file: /cvs/extras/rpms/gaim-guifications/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 27 Jun 2005 05:32:11 -0000 1.2 +++ sources 4 Aug 2005 10:48:31 -0000 1.3 @@ -1 +1 @@ -df22e7f44722ecd9cf12876c83032d60 guifications-2.10.tar.bz2 +c6437efe487a2c3675361c53fdf376bb guifications-2.12.tar.bz2 From fedora-extras-commits at redhat.com Thu Aug 4 10:49:48 2005 From: fedora-extras-commits at redhat.com (Colin Charles (byte)) Date: Thu, 4 Aug 2005 06:49:48 -0400 Subject: rpms/gaim-guifications/devel .cvsignore, 1.2, 1.3 gaim-guifications.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200508041049.j74Anmh6010217@cvs-int.fedora.redhat.com> Author: byte Update of /cvs/extras/rpms/gaim-guifications/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10192 Modified Files: .cvsignore gaim-guifications.spec sources Log Message: Bump to new upstream release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gaim-guifications/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 27 Jun 2005 05:32:11 -0000 1.2 +++ .cvsignore 4 Aug 2005 10:49:46 -0000 1.3 @@ -1 +1 @@ -guifications-2.10.tar.bz2 +guifications-2.12.tar.bz2 Index: gaim-guifications.spec =================================================================== RCS file: /cvs/extras/rpms/gaim-guifications/devel/gaim-guifications.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gaim-guifications.spec 28 Jun 2005 01:20:43 -0000 1.2 +++ gaim-guifications.spec 4 Aug 2005 10:49:46 -0000 1.3 @@ -12,8 +12,8 @@ Summary: Guifications Plugin for Gaim Name: gaim-guifications -Version: 2.10 -Release: 4%{?dist} +Version: 2.12 +Release: 1%{?dist} License: GPL Group: Applications/Internet Url: http://guifications.sourceforge.net/Guifications/ @@ -53,6 +53,9 @@ %{_datadir}/pixmaps/gaim/guifications %changelog +* Thu Aug 4 2005 Colin Charles 2.12-1 +- bump to new upstream release + * Tue Jun 28 2005 Colin Charles 2.10-4 - remove redundant CFLAGS in %configure (Ralf) Index: sources =================================================================== RCS file: /cvs/extras/rpms/gaim-guifications/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 27 Jun 2005 05:32:11 -0000 1.2 +++ sources 4 Aug 2005 10:49:46 -0000 1.3 @@ -1 +1 @@ -df22e7f44722ecd9cf12876c83032d60 guifications-2.10.tar.bz2 +c6437efe487a2c3675361c53fdf376bb guifications-2.12.tar.bz2 From fedora-extras-commits at redhat.com Thu Aug 4 11:38:21 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 4 Aug 2005 07:38:21 -0400 Subject: extras-buildsys/server BuildMaster.py,1.26,1.27 Message-ID: <200508041138.j74BcLGD011744@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11727/server Modified Files: BuildMaster.py Log Message: Remove some code that wasn't supposed to be there Index: BuildMaster.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/BuildMaster.py,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- BuildMaster.py 2 Aug 2005 04:10:32 -0000 1.26 +++ BuildMaster.py 4 Aug 2005 11:38:19 -0000 1.27 @@ -189,24 +189,6 @@ self.curs.execute('DELETE FROM archjobs WHERE parent_uid=%d' % uid) self.dbcx.commit() - curs.execute('CREATE TABLE jobs (' \ - 'uid INTEGER PRIMARY KEY, ' \ - 'username VARCHAR(20), ' \ - 'package VARCHAR(50), ' \ - 'cvs_tag VARCHAR(255), ' \ - 'target VARCHAR(20), ' \ - 'buildreq VARCHAR(75), ' \ - 'starttime BIGINT, ' \ - 'endtime BIGINT, ' \ - 'status VARCHAR(15), ' \ - 'result VARCHAR(15), ' \ - 'epoch VARCHAR(4), ' \ - 'version VARCHAR(25), ' \ - 'release VARCHAR(25), ' \ - 'archlist VARCHAR(75), ' \ - 'result_msg TEXT' \ - ')') - # Now requeue the job try: repo = self.repos[row['target']] From fedora-extras-commits at redhat.com Thu Aug 4 11:45:38 2005 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Thu, 4 Aug 2005 07:45:38 -0400 Subject: rpms/uim/devel uim.spec,1.16,1.17 Message-ID: <200508041146.j74Bk8qS011861@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/uim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11844 Modified Files: uim.spec Log Message: * Thu Aug 4 2005 Akira TAGOH - 0.4.7.1-2.fc5 - removed Requires: Canna-devel from uim-canna. this is no longer needed since 0.4.6-4. (Warren Togami, #165088) Index: uim.spec =================================================================== RCS file: /cvs/extras/rpms/uim/devel/uim.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- uim.spec 3 Aug 2005 01:46:55 -0000 1.16 +++ uim.spec 4 Aug 2005 11:45:35 -0000 1.17 @@ -5,7 +5,7 @@ Summary: A multilingual input method library Name: uim Version: 0.4.7.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL/BSD Group: System Environment/Libraries URL: http://uim.freedesktop.org/ @@ -54,7 +54,7 @@ %package canna Summary: Canna support for Uim Group: System Environment/Libraries -Requires: Canna Canna-devel +Requires: Canna Requires: uim = %{version}-%{release} Requires(post): gtk2 Requires(postun): gtk2 @@ -288,6 +288,10 @@ %{_datadir}/uim/skk*.scm %changelog +* Thu Aug 4 2005 Akira TAGOH - 0.4.7.1-2.fc5 +- removed Requires: Canna-devel from uim-canna. this is no longer needed + since 0.4.6-4. (Warren Togami, #165088) + * Wed Aug 3 2005 Akira TAGOH - 0.4.7.1-1.fc5 - New upstream release. From fedora-extras-commits at redhat.com Thu Aug 4 11:47:09 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 4 Aug 2005 07:47:09 -0400 Subject: extras-buildsys/server PackageJob.py,1.16,1.17 Message-ID: <200508041147.j74BldSa011948@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11907/server Modified Files: PackageJob.py Log Message: 2005-08-04 Dan Williams * server/PackageJob.py - Clean up job files when the job is done. We now only keep logs and 1 SRPM in 'server_work_dir', the RPMs get copied to the repo and then deleted from server_work_dir Index: PackageJob.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/PackageJob.py,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- PackageJob.py 2 Aug 2005 04:10:32 -0000 1.16 +++ PackageJob.py 4 Aug 2005 11:47:07 -0000 1.17 @@ -130,7 +130,7 @@ self.repo = repo self.no_cvs = config_opts['use_srpm_not_cvs'] self.cvs_tag = cvs_tag - self.stage_dir = None + self.result_dir = None self.srpm_path = None self.srpm_http_path = None self.repofiles = {} @@ -256,17 +256,6 @@ return (build_arches, pkg_arches, allowed_arches) - - def _make_stage_dir(self, rootdir): - # The dir will look like this: - # /devel/95-foo-1.1.0-23 - pkgsubdir = '%d-%s-%s-%s' % (self.uid, self.name, self.ver, self.release) - stage_dir = os.path.join(rootdir, self.target, pkgsubdir) - if os.path.exists(stage_dir): - shutil.rmtree(stage_dir, ignore_errors=True) - os.makedirs(stage_dir) - return stage_dir - def _stage_initialize(self): self._set_cur_stage('checkout_wait') self.bm.queue_checkout_wait(self) @@ -356,6 +345,16 @@ self._set_cur_stage('prep') return False + def _make_stage_dir(self, rootdir): + # The dir will look like this: + # /devel/95-foo-1.1.0-23 + pkgsubdir = '%d-%s-%s-%s' % (self.uid, self.name, self.ver, self.release) + stage_dir = os.path.join(rootdir, self.target, pkgsubdir) + if os.path.exists(stage_dir): + shutil.rmtree(stage_dir, ignore_errors=True) + os.makedirs(stage_dir) + return stage_dir + def _stage_prep(self): # In SRPM-only mode, cvs_tag is path to the SRPM to build @@ -381,24 +380,17 @@ """ % (self.cvs_tag, pkg_arches, allowed_arches) raise PrepError(msg) - self.stage_dir = self._make_stage_dir(config_opts['server_work_dir']) + self.result_dir = self._make_stage_dir(config_opts['server_work_dir']) for arch in self.archjobs.keys(): - thisdir = os.path.join(self.stage_dir, arch) + thisdir = os.path.join(self.result_dir, arch) if not os.path.exists(thisdir): os.makedirs(thisdir) - # Copy the SRPM to the final package product dir - srpm = os.path.basename(self.srpm_path) - srpm_in_dir = os.path.join(self.stage_dir, srpm) - if os.path.exists(srpm_in_dir): - os.unlink(srpm_in_dir) - shutil.copy(self.srpm_path, self.stage_dir) - - # Must also copy SRPM to where the build client can get it over HTTP + # Copy SRPM to where the builder can access it http_pkg_path = self._make_stage_dir(self.http_dir) - self.srpm_http_path = os.path.join(http_pkg_path, srpm) + self.srpm_http_path = os.path.join(http_pkg_path, os.path.basename(self.srpm_path)) shutil.copy(self.srpm_path, self.srpm_http_path) - self.srpm_path = srpm_in_dir + self.srpm_path = None # Remove CVS checkout and make_srpm dirs if not self.no_cvs: @@ -532,14 +524,41 @@ return True def get_stage_dir(self): - return self.stage_dir + return self.result_dir def _stage_failed(self, msg=None): self.result = 'failed' self._set_cur_stage('failed', msg) self.endtime = time.time() + self._cleanup_job_files() self.bm.notify_job_done(self) - + + def _cleanup_job_files(self): + srpm_file = os.path.join(self.result_dir, os.path.basename(self.srpm_http_path)) + + # Delete any RPMs in the arch dirs + for job in self.archjobs.values(): + if not job: + continue + for f in job.get_files(): + if not f.endswith(".rpm"): + continue + src_file = os.path.join(self.result_dir, job.arch, f) + if src_file.endswith(".src.rpm"): + # Keep an SRPM. We prefer built SRPMs from builders over + # the original SRPM. + if not os.path.exists(srpm_file): + shutil.copy(src_file, srpm_file) + else: + os.remove(src_file) + + # If there were no builder-built SRPMs, keep the original around + if not os.path.exists(srpm_file): + shutil.copy(self.srpm_http_path, srpm_file) + + # Delete the SRPM in the server's HTTP dir + shutil.rmtree(os.path.dirname(self.srpm_http_path), ignore_errors=True) + def _stage_add_to_repo(self): # Create a list of files that the repo should copy to # the repo dir @@ -549,7 +568,7 @@ for f in job.get_files(): if not f.endswith(".rpm"): continue - src_file = os.path.join(self.stage_dir, job.arch, f) + src_file = os.path.join(self.result_dir, job.arch, f) verrel = "%s-%s" % (self.ver, self.release) if f.endswith(".src.rpm"): dst_path = os.path.join(config_opts['repo_dir'], self.target, self.name, verrel, "SRPM") @@ -577,6 +596,8 @@ self.result = 'success' self._set_cur_stage('needsign', resultstring) + self._cleanup_job_files() + log_url = make_job_log_url(self.target, self.uid, self.name, self.ver, self.release) resultstring = resultstring + "\n Build logs may be found at %s\n" % (log_url) self.email_result(self.username, resultstring) From fedora-extras-commits at redhat.com Thu Aug 4 11:47:09 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 4 Aug 2005 07:47:09 -0400 Subject: extras-buildsys ChangeLog,1.86,1.87 Message-ID: <200508041147.j74Bldew011949@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11907 Modified Files: ChangeLog Log Message: 2005-08-04 Dan Williams * server/PackageJob.py - Clean up job files when the job is done. We now only keep logs and 1 SRPM in 'server_work_dir', the RPMs get copied to the repo and then deleted from server_work_dir Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.86 retrieving revision 1.87 diff -u -r1.86 -r1.87 --- ChangeLog 4 Aug 2005 06:53:21 -0000 1.86 +++ ChangeLog 4 Aug 2005 11:47:06 -0000 1.87 @@ -1,3 +1,10 @@ +2005-08-04 Dan Williams + + * server/PackageJob.py + - Clean up job files when the job is done. We now only + keep logs and 1 SRPM in 'server_work_dir', the RPMs + get copied to the repo and then deleted from server_work_dir + 2005-08-04 Seth Vidal * add in success and failed pages for www report From fedora-extras-commits at redhat.com Thu Aug 4 11:48:50 2005 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Thu, 4 Aug 2005 07:48:50 -0400 Subject: rpms/uim/FC-3 uim.spec,1.6,1.7 Message-ID: <200508041148.j74BmoBO011992@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/uim/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11975 Modified Files: uim.spec Log Message: * Thu Aug 4 2005 Akira TAGOH - 0.4.7.1-2.fc3 - removed Requires: Canna-devel from uim-canna. this is no longer needed since 0.4.6-4. (Warren Togami, #165088) Index: uim.spec =================================================================== RCS file: /cvs/extras/rpms/uim/FC-3/uim.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- uim.spec 3 Aug 2005 01:59:07 -0000 1.6 +++ uim.spec 4 Aug 2005 11:48:48 -0000 1.7 @@ -5,7 +5,7 @@ Summary: A multilingual input method library Name: uim Version: 0.4.7.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL/BSD Group: System Environment/Libraries URL: http://uim.freedesktop.org/ @@ -54,7 +54,7 @@ %package canna Summary: Canna support for Uim Group: System Environment/Libraries -Requires: Canna Canna-devel +Requires: Canna Requires: uim = %{version}-%{release} Requires(post): gtk2 Requires(postun): gtk2 @@ -288,6 +288,10 @@ %{_datadir}/uim/skk*.scm %changelog +* Thu Aug 4 2005 Akira TAGOH - 0.4.7.1-2.fc3 +- removed Requires: Canna-devel from uim-canna. this is no longer needed + since 0.4.6-4. (Warren Togami, #165088) + * Wed Aug 3 2005 Akira TAGOH - 0.4.7.1-1.fc3 - New upstream release. From fedora-extras-commits at redhat.com Thu Aug 4 11:50:30 2005 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Thu, 4 Aug 2005 07:50:30 -0400 Subject: rpms/uim/FC-4 uim.spec,1.13,1.14 Message-ID: <200508041150.j74BoU3a012069@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/uim/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12052 Modified Files: uim.spec Log Message: * Thu Aug 4 2005 Akira TAGOH - 0.4.7.1-2.fc4 - removed Requires: Canna-devel from uim-canna. this is no longer needed since 0.4.6-4. (Warren Togami, #165088) Index: uim.spec =================================================================== RCS file: /cvs/extras/rpms/uim/FC-4/uim.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- uim.spec 3 Aug 2005 02:15:22 -0000 1.13 +++ uim.spec 4 Aug 2005 11:50:28 -0000 1.14 @@ -5,7 +5,7 @@ Summary: A multilingual input method library Name: uim Version: 0.4.7.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL/BSD Group: System Environment/Libraries URL: http://uim.freedesktop.org/ @@ -54,7 +54,7 @@ %package canna Summary: Canna support for Uim Group: System Environment/Libraries -Requires: Canna Canna-devel +Requires: Canna Requires: uim = %{version}-%{release} Requires(post): gtk2 Requires(postun): gtk2 @@ -288,6 +288,10 @@ %{_datadir}/uim/skk*.scm %changelog +* Thu Aug 4 2005 Akira TAGOH - 0.4.7.1-2.fc4 +- removed Requires: Canna-devel from uim-canna. this is no longer needed + since 0.4.6-4. (Warren Togami, #165088) + * Wed Aug 3 2005 Akira TAGOH - 0.4.7.1-1.fc4 - New upstream release. From fedora-extras-commits at redhat.com Thu Aug 4 12:05:44 2005 From: fedora-extras-commits at redhat.com (Colin Charles (byte)) Date: Thu, 4 Aug 2005 08:05:44 -0400 Subject: rpms/MagicPoint/FC-4 MagicPoint.spec,1.1,1.2 Message-ID: <200508041206.j74C6Ewe013277@cvs-int.fedora.redhat.com> Author: byte Update of /cvs/extras/rpms/MagicPoint/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13260 Modified Files: MagicPoint.spec Log Message: * Thu Aug 4 2005 Colin Charles - 1.11b-2 - Removed Patch12 to fix undefined operation - Bump spec to somewhat match work from Rui Miguel Silva Seabra - Remove requirement on VFlib2, seeing that we disable it in configure Index: MagicPoint.spec =================================================================== RCS file: /cvs/extras/rpms/MagicPoint/FC-4/MagicPoint.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- MagicPoint.spec 27 Jun 2005 05:48:40 -0000 1.1 +++ MagicPoint.spec 4 Aug 2005 12:05:42 -0000 1.2 @@ -3,26 +3,30 @@ %define x11datadir %{x11dir}/lib %define x11mandir %{x11dir}/man -Summary: X based presentation software. -Name: MagicPoint -Version: 1.11b -Release: 2 -License: BSD -Group: Applications/Productivity -URL: http://www.mew.org/mgp -Source: ftp://ftp.mew.org/pub/MagicPoint/magicpoint-%{version}.tar.gz -Patch1: magicpoint-1.08a-redhat.patch -Patch2: magicpoint-1.09a-rpath.patch -Patch3: magicpoint-1.11a-fix-gcc-warnings.patch -Patch6: magicpoint-1.10a-longline.patch -Patch10: magicpoint-1.10a-fix-usleep.patch -Patch11: magicpoint-1.10a-fix-gcc34.patch -Patch12: magicpoint-1.11b-fix-undefined-operation.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-root -BuildPrereq: freetype-devel VFlib2-devel -BuildRequires: fontconfig-devel xorg-x11-devel libungif-devel libpng-devel libmng-devel -Requires: VFlib2 >= 2.25.6-8 VFlib2-conf-ja >= 2.25.6-8 +Name: MagicPoint +Version: 1.11b +Release: 2%{?dist} +Summary: X based presentation software + +Group: Applications/Productivity +License: BSD +URL: http://www.mew.org/mgp +Source0: ftp://ftp.mew.org/pub/MagicPoint/magicpoint-%{version}.tar.gz + +Patch1: magicpoint-1.08a-redhat.patch +Patch2: magicpoint-1.09a-rpath.patch +Patch3: magicpoint-1.11a-fix-gcc-warnings.patch +Patch6: magicpoint-1.10a-longline.patch +Patch10: magicpoint-1.10a-fix-usleep.patch +Patch11: magicpoint-1.10a-fix-gcc34.patch + +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildPrereq: freetype-devel +BuildRequires: fontconfig-devel xorg-x11-devel libungif-devel libpng-devel libmng-devel imlib-devel autoconf automake libtool byacc flex +#Requires: VFlib2 >= 2.25.6-8 VFlib2-conf-ja >= 2.25.6-8 +Requires: imlib Obsoletes: mgp,magicpoint +Provides: mgp,magicpoint %description MagicPoint is an X11 based presentation tool. MagicPoint's @@ -37,13 +41,12 @@ %patch6 -p1 -b .longline %patch10 -p1 -b .usleep %patch11 -p1 -b .gcc34 -%patch12 -p1 -b .undef-op %build CFLAGS=-I/usr/include/freetype1/freetype autoconf cp /usr/share/libtool/config.{sub,guess} . -%configure --prefix=/usr/X11R6 --enable-gif +%configure --prefix=/usr/X11R6 --enable-gif --disable-vflib --enable-imlib xmkmf -a make rm -rf $RPM_BUILD_DIR/magicpoint-%{version}/sample/.cvsignore @@ -51,22 +54,24 @@ %install [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT make install install.man DESTDIR=$RPM_BUILD_ROOT +strip `file $RPM_BUILD_ROOT/%{x11bindir}/* | grep ELF | cut -d : -f 1` %clean [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT %files -%defattr(-,root,root) -%doc COPYRIGHT README SYNTAX USAGE -%doc sample +%defattr(755,root,root,755) %{x11bindir}/* +%defattr(644,root,root,755) +%doc COPYRIGHT README SYNTAX USAGE sample %{x11datadir}/X11/mgp %{x11mandir}/*/* %changelog -* Thu Nov 11 2004 Akira TAGOH - 1.11b-2 -- magicpoint-1.11b-fix-undefined-operation.patch: applied to fix a gcc warning. - (#137527) +* Thu Aug 4 2005 Colin Charles - 1.11b-2 +- Removed Patch12 to fix undefined operation +- Bump spec to somewhat match work from Rui Miguel Silva Seabra +- Remove requirement on VFlib2, seeing that we disable it in configure * Mon Sep 27 2004 Akira TAGOH - 1.11b-1 - New upstream release. From fedora-extras-commits at redhat.com Thu Aug 4 12:15:41 2005 From: fedora-extras-commits at redhat.com (Colin Charles (byte)) Date: Thu, 4 Aug 2005 08:15:41 -0400 Subject: rpms/MagicPoint/devel MagicPoint.spec,1.1,1.2 Message-ID: <200508041215.j74CFfaN013381@cvs-int.fedora.redhat.com> Author: byte Update of /cvs/extras/rpms/MagicPoint/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13364 Modified Files: MagicPoint.spec Log Message: sync w/FC-4 Index: MagicPoint.spec =================================================================== RCS file: /cvs/extras/rpms/MagicPoint/devel/MagicPoint.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- MagicPoint.spec 27 Jun 2005 05:48:40 -0000 1.1 +++ MagicPoint.spec 4 Aug 2005 12:15:39 -0000 1.2 @@ -3,26 +3,30 @@ %define x11datadir %{x11dir}/lib %define x11mandir %{x11dir}/man -Summary: X based presentation software. -Name: MagicPoint -Version: 1.11b -Release: 2 -License: BSD -Group: Applications/Productivity -URL: http://www.mew.org/mgp -Source: ftp://ftp.mew.org/pub/MagicPoint/magicpoint-%{version}.tar.gz -Patch1: magicpoint-1.08a-redhat.patch -Patch2: magicpoint-1.09a-rpath.patch -Patch3: magicpoint-1.11a-fix-gcc-warnings.patch -Patch6: magicpoint-1.10a-longline.patch -Patch10: magicpoint-1.10a-fix-usleep.patch -Patch11: magicpoint-1.10a-fix-gcc34.patch -Patch12: magicpoint-1.11b-fix-undefined-operation.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-root -BuildPrereq: freetype-devel VFlib2-devel -BuildRequires: fontconfig-devel xorg-x11-devel libungif-devel libpng-devel libmng-devel -Requires: VFlib2 >= 2.25.6-8 VFlib2-conf-ja >= 2.25.6-8 +Name: MagicPoint +Version: 1.11b +Release: 2%{?dist} +Summary: X based presentation software + +Group: Applications/Productivity +License: BSD +URL: http://www.mew.org/mgp +Source0: ftp://ftp.mew.org/pub/MagicPoint/magicpoint-%{version}.tar.gz + +Patch1: magicpoint-1.08a-redhat.patch +Patch2: magicpoint-1.09a-rpath.patch +Patch3: magicpoint-1.11a-fix-gcc-warnings.patch +Patch6: magicpoint-1.10a-longline.patch +Patch10: magicpoint-1.10a-fix-usleep.patch +Patch11: magicpoint-1.10a-fix-gcc34.patch + +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildPrereq: freetype-devel +BuildRequires: fontconfig-devel xorg-x11-devel libungif-devel libpng-devel libmng-devel imlib-devel autoconf automake libtool byacc flex +#Requires: VFlib2 >= 2.25.6-8 VFlib2-conf-ja >= 2.25.6-8 +Requires: imlib Obsoletes: mgp,magicpoint +Provides: mgp,magicpoint %description MagicPoint is an X11 based presentation tool. MagicPoint's @@ -37,13 +41,12 @@ %patch6 -p1 -b .longline %patch10 -p1 -b .usleep %patch11 -p1 -b .gcc34 -%patch12 -p1 -b .undef-op %build CFLAGS=-I/usr/include/freetype1/freetype autoconf cp /usr/share/libtool/config.{sub,guess} . -%configure --prefix=/usr/X11R6 --enable-gif +%configure --prefix=/usr/X11R6 --enable-gif --disable-vflib --enable-imlib xmkmf -a make rm -rf $RPM_BUILD_DIR/magicpoint-%{version}/sample/.cvsignore @@ -51,22 +54,24 @@ %install [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT make install install.man DESTDIR=$RPM_BUILD_ROOT +strip `file $RPM_BUILD_ROOT/%{x11bindir}/* | grep ELF | cut -d : -f 1` %clean [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT %files -%defattr(-,root,root) -%doc COPYRIGHT README SYNTAX USAGE -%doc sample +%defattr(755,root,root,755) %{x11bindir}/* +%defattr(644,root,root,755) +%doc COPYRIGHT README SYNTAX USAGE sample %{x11datadir}/X11/mgp %{x11mandir}/*/* %changelog -* Thu Nov 11 2004 Akira TAGOH - 1.11b-2 -- magicpoint-1.11b-fix-undefined-operation.patch: applied to fix a gcc warning. - (#137527) +* Thu Aug 4 2005 Colin Charles - 1.11b-2 +- Removed Patch12 to fix undefined operation +- Bump spec to somewhat match work from Rui Miguel Silva Seabra +- Remove requirement on VFlib2, seeing that we disable it in configure * Mon Sep 27 2004 Akira TAGOH - 1.11b-1 - New upstream release. From fedora-extras-commits at redhat.com Thu Aug 4 12:33:02 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Thu, 4 Aug 2005 08:33:02 -0400 Subject: rpms/source-highlight/FC-4 .cvsignore, 1.4, 1.5 source-highlight.spec, 1.8, 1.9 sources, 1.4, 1.5 Message-ID: <200508041233.j74CX2nW013467@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/source-highlight/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13446 Modified Files: .cvsignore source-highlight.spec sources Log Message: * Wed Aug 03 2005 Adrian Reber - 2.1.1-1 - updated to 2.1.1 (fixes #164861) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/source-highlight/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 22 Jun 2005 18:36:32 -0000 1.4 +++ .cvsignore 4 Aug 2005 12:33:00 -0000 1.5 @@ -1 +1,2 @@ -source-highlight-2.0.tar.gz +source-highlight-2.1.1.tar.gz +source-highlight-2.1.1.tar.gz.sig Index: source-highlight.spec =================================================================== RCS file: /cvs/extras/rpms/source-highlight/FC-4/source-highlight.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- source-highlight.spec 22 Jun 2005 18:45:52 -0000 1.8 +++ source-highlight.spec 4 Aug 2005 12:33:00 -0000 1.9 @@ -1,10 +1,11 @@ Summary: Produces a document with syntax highlighting Name: source-highlight -Version: 2.0 +Version: 2.1.1 Release: 1%{?dist} Group: Development/Tools License: GPL -Source: ftp://ftp.gnu.org/gnu/src-highlite/source-highlight-2.0.tar.gz +Source0: ftp://ftp.gnu.org/gnu/src-highlite/source-highlight-2.1.1.tar.gz +Source1: ftp://ftp.gnu.org/gnu/src-highlite/source-highlight-2.1.1.tar.gz.sig URL: http://www.gnu.org/software/src-highlite/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: bison, flex, boost-devel @@ -21,7 +22,6 @@ %prep %setup -q -%{__sed} -i 's/\r//' doc/xhtml.css %build %configure @@ -32,6 +32,7 @@ make install DESTDIR=$RPM_BUILD_ROOT mv $RPM_BUILD_ROOT%{_datadir}/doc/ docs +%{__sed} -i 's/\r//' docs/source-highlight/xhtml.css %clean rm -rf $RPM_BUILD_ROOT @@ -58,6 +59,12 @@ %{_infodir}/source-highlight.info* %changelog +* Wed Aug 03 2005 Adrian Reber - 2.1.1-1 +- updated to 2.1.1 (fixes #164861) + +* Mon Aug 01 2005 Adrian Reber - 2.1-1 +- updated to 2.1 + * Sun Jun 19 2005 Adrian Reber - 2.0-1 - updated to 2.0 - added boost-devel, help2man to BR Index: sources =================================================================== RCS file: /cvs/extras/rpms/source-highlight/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 22 Jun 2005 18:36:32 -0000 1.4 +++ sources 4 Aug 2005 12:33:00 -0000 1.5 @@ -1 +1,2 @@ -7501da9ee6f5eba1c9bc9adac9baae18 source-highlight-2.0.tar.gz +b31e7a52a91a8fb8093934b54b4f317a source-highlight-2.1.1.tar.gz +79622b9b9fe571b812e1d5bfc504ac81 source-highlight-2.1.1.tar.gz.sig From dennis at dgilmore.net Thu Aug 4 11:25:50 2005 From: dennis at dgilmore.net (Dennis Gilmore) Date: Thu, 4 Aug 2005 06:25:50 -0500 Subject: APPROVED: kompose Message-ID: <200508040625.57546.dennis@dgilmore.net> Package: kompose Kompos? currently allows a fullscreen view of all your virtual desktops where every window is represented by a scaled screenshot of it's own. The Composite extension is used if available from the X server. Reviewer: Dennis Gilmore Maintainer: -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 189 bytes Desc: not available URL: From fedora-extras-commits at redhat.com Thu Aug 4 13:10:06 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Thu, 4 Aug 2005 09:10:06 -0400 Subject: rpms/source-highlight/FC-3 .cvsignore, 1.2, 1.3 source-highlight.spec, 1.3, 1.4 sources, 1.2, 1.3 Message-ID: <200508041310.j74DA6rH014746@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/source-highlight/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14725 Modified Files: .cvsignore source-highlight.spec sources Log Message: * Wed Aug 03 2005 Adrian Reber - 2.1.1-1 - updated to 2.1.1 (fixes #164861) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/source-highlight/FC-3/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 05:21:35 -0000 1.2 +++ .cvsignore 4 Aug 2005 13:10:04 -0000 1.3 @@ -1 +1,2 @@ -source-highlight-1.9.tar.gz +source-highlight-2.1.1.tar.gz +source-highlight-2.1.1.tar.gz.sig Index: source-highlight.spec =================================================================== RCS file: /cvs/extras/rpms/source-highlight/FC-3/source-highlight.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- source-highlight.spec 10 Dec 2004 22:03:11 -0000 1.3 +++ source-highlight.spec 4 Aug 2005 13:10:04 -0000 1.4 @@ -1,28 +1,24 @@ -Summary: Produces a document with syntax highlighting -Name: source-highlight -Version: 1.9 -Release: 2 -Epoch: 0 -Group: Development/Tools -License: GPL -Source: ftp://ftp.gnu.org/gnu/src-highlite/%{name}-%{version}.tar.gz -URL: http://www.gnu.org/software/src-highlite/ -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: bison, flex +Summary: Produces a document with syntax highlighting +Name: source-highlight +Version: 2.1.1 +Release: 1%{?dist} +Group: Development/Tools +License: GPL +Source0: ftp://ftp.gnu.org/gnu/src-highlite/source-highlight-2.1.1.tar.gz +Source1: ftp://ftp.gnu.org/gnu/src-highlite/source-highlight-2.1.1.tar.gz.sig +URL: http://www.gnu.org/software/src-highlite/ +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: bison, flex, boost-devel +BuildRequires: help2man +Requires(post): /sbin/install-info +Requires(postun): /sbin/install-info %description -This program, given a source file, produces a document with syntax +This program, given a source file, produces a document with syntax highlighting. At the moment this package can handle : -* Java -* C/C++ -* Prolog -* Perl -* Php3 new -as source languages, and HTML as output format. -NOTICE: now the name of the program is source-highlight: there are no two -separate programs, namely java2html and cpp2html, anymore. However there -are two shell scripts with the same name in order to facilitate the -migration (however their use is not advised). +Java, Javascript, C/C++, Prolog, Perl, Php3, Python, Flex, ChangeLog, Ruby, +Lua, Caml, Sml and Log as source languages, and HTML, XHTML and ANSI color +escape sequences as output format. %prep %setup -q @@ -35,22 +31,53 @@ rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT -rm -fr $RPM_BUILD_ROOT%{_datadir}/doc/ +mv $RPM_BUILD_ROOT%{_datadir}/doc/ docs +%{__sed} -i 's/\r//' docs/source-highlight/xhtml.css %clean rm -rf $RPM_BUILD_ROOT +%post +/sbin/install-info %{_infodir}/source-highlight.info \ + %{_infodir}/dir 2>/dev/null || : + +%preun +if [ $1 -eq 0 ]; then + /sbin/install-info --delete %{_infodir}/source-highlight.info \ + %{_infodir}/dir 2>/dev/null || : +fi + %files %defattr (-,root,root) +%doc docs/source-highlight/* %{_bindir}/cpp2html %{_bindir}/java2html %{_bindir}/source-highlight -%{_bindir}/source-highlight-cgi %{_bindir}/src-hilite-lesspipe.sh %{_datadir}/%{name} %{_mandir}/man1/* +%{_infodir}/source-highlight.info* %changelog +* Wed Aug 03 2005 Adrian Reber - 2.1.1-1 +- updated to 2.1.1 (fixes #164861) + +* Mon Aug 01 2005 Adrian Reber - 2.1-1 +- updated to 2.1 + +* Sun Jun 19 2005 Adrian Reber - 2.0-1 +- updated to 2.0 +- added boost-devel, help2man to BR +- included info file + +* Wed May 11 2005 Adrian Reber - 1.11-1 +- updated to 1.11 +- included the documentation +- optimised the %%descritpion + +* Fri Apr 7 2005 Michael Schwendt +- rebuilt + * Tue Jun 22 2004 Adrian Reber - 0:1.9-0.fdr.2 - added the Epoch: 0 Index: sources =================================================================== RCS file: /cvs/extras/rpms/source-highlight/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 05:21:35 -0000 1.2 +++ sources 4 Aug 2005 13:10:04 -0000 1.3 @@ -1 +1,2 @@ -88e1ecd5c4c37104ed98c0674f630656 source-highlight-1.9.tar.gz +b31e7a52a91a8fb8093934b54b4f317a source-highlight-2.1.1.tar.gz +79622b9b9fe571b812e1d5bfc504ac81 source-highlight-2.1.1.tar.gz.sig From rc040203 at freenet.de Thu Aug 4 14:29:44 2005 From: rc040203 at freenet.de (Ralf Corsepius) Date: Thu, 04 Aug 2005 16:29:44 +0200 Subject: rpms/MagicPoint/FC-4 MagicPoint.spec,1.1,1.2 In-Reply-To: <200508041206.j74C6Ewe013277@cvs-int.fedora.redhat.com> References: <200508041206.j74C6Ewe013277@cvs-int.fedora.redhat.com> Message-ID: <1123165785.4364.101.camel@mccallum.corsepiu.local> On Thu, 2005-08-04 at 08:05 -0400, Colin Charles wrote: > Author: byte > > Update of /cvs/extras/rpms/MagicPoint/FC-4 > In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13260 > > Modified Files: > MagicPoint.spec > Log Message: > * Thu Aug 4 2005 Colin Charles - 1.11b-2 Did this spec file ever see a review? > Index: MagicPoint.spec > =================================================================== > RCS file: /cvs/extras/rpms/MagicPoint/FC-4/MagicPoint.spec,v > retrieving revision 1.1 > retrieving revision 1.2 > diff -u -r1.1 -r1.2 > --- MagicPoint.spec 27 Jun 2005 05:48:40 -0000 1.1 > +++ MagicPoint.spec 4 Aug 2005 12:05:42 -0000 1.2 > +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) > +BuildPrereq: freetype-devel BuildPrereq: is an anachronism. Please use BuildRequires, instead. > +BuildRequires: fontconfig-devel xorg-x11-devel libungif-devel libpng-devel libmng-devel imlib-devel autoconf automake libtool byacc flex > +#Requires: VFlib2 >= 2.25.6-8 VFlib2-conf-ja >= 2.25.6-8 > +Requires: imlib > Obsoletes: mgp,magicpoint > +Provides: mgp,magicpoint > > %description > MagicPoint is an X11 based presentation tool. MagicPoint's > @@ -37,13 +41,12 @@ > %patch6 -p1 -b .longline > %patch10 -p1 -b .usleep > %patch11 -p1 -b .gcc34 > -%patch12 -p1 -b .undef-op > > %build > CFLAGS=-I/usr/include/freetype1/freetype This should be CPPFLAGS, unless the configure script is really broken. > autoconf > cp /usr/share/libtool/config.{sub,guess} . Well, ... sometimes I feel sooo tired ... ;) > -%configure --prefix=/usr/X11R6 --enable-gif > +%configure --prefix=/usr/X11R6 --enable-gif --disable-vflib --enable-imlib > xmkmf -a > make > rm -rf $RPM_BUILD_DIR/magicpoint-%{version}/sample/.cvsignore > @@ -51,22 +54,24 @@ > %install > [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && This "test" is superfluous. It only makes some sense in spec files not containing a reasonable BuildRoot. > rm -rf $RPM_BUILD_ROOT > make install install.man DESTDIR=$RPM_BUILD_ROOT > +strip `file $RPM_BUILD_ROOT/%{x11bindir}/* | grep ELF | cut -d : -f 1` This strip should be removed. It prevents debuginfo-rpms. > %clean > [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && See above. Ralf From steve at silug.org Thu Aug 4 14:53:20 2005 From: steve at silug.org (Steven Pritchard) Date: Thu, 4 Aug 2005 09:53:20 -0500 Subject: APPROVED: perl-BerkeleyDB Message-ID: <20050804145320.GA29111@osiris.silug.org> BerkeleyDB is a module that allows Perl programs to make use of the facilities provided by Berkeley DB. Berkeley DB is a C library that provides a consistent interface to a number of database formats. BerkeleyDB provides an interface to all four of the database types (hash, btree, queue and recno) currently supported by Berkeley DB. Reviewer: Paul Howarth Maintainer: Steven Pritchard Steve -- Steven Pritchard - K&S Pritchard Enterprises, Inc. Email: steve at kspei.com http://www.kspei.com/ Phone: (618)398-3000 Mobile: (618)567-7320 -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 189 bytes Desc: not available URL: From fedora-extras-commits at redhat.com Thu Aug 4 14:56:37 2005 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Thu, 4 Aug 2005 10:56:37 -0400 Subject: bouncer_r CREDITS, 1.2, 1.3 ChangeLog, 1.7, 1.8 INSTALL, 1.6, 1.7 README, 1.3, 1.4 TODO, 1.2, 1.3 Message-ID: <200508041456.j74EubYY016214@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/fedora/bouncer_r In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16189 Modified Files: CREDITS ChangeLog INSTALL README TODO Log Message: 2005-08-04 Luke Macken * Fix path typo in INSTALL Index: ChangeLog =================================================================== RCS file: /cvs/fedora/bouncer_r/ChangeLog,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- ChangeLog 2 Aug 2005 11:50:28 -0000 1.7 +++ ChangeLog 4 Aug 2005 14:56:35 -0000 1.8 @@ -1,3 +1,7 @@ +2005-08-04 Luke Macken + + * Fix path typo in INSTALL + 2005-08-02 David T. Farning * LICENSE: added License @@ -8,7 +12,7 @@ * php/index.php: Pull bouncer intro from mozilla * php/index.php: Modify bouncer intro to fit Fedora. -2005-08-02 Luke Macken +2005-08-02 Luke Macken * Documentation additions/cleanups. Index: INSTALL =================================================================== RCS file: /cvs/fedora/bouncer_r/INSTALL,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- INSTALL 2 Aug 2005 16:32:35 -0000 1.6 +++ INSTALL 4 Aug 2005 14:56:35 -0000 1.7 @@ -44,10 +44,11 @@ $ cd /var/www $ ln -s /your/checkout/of/bouncer_r/ fedora.redhat.com/bouncer_r - c. Rename bouncer_r/php/config.php.cvs to bouncer_r/php/config.php. - Edit bouncer_r/php/config.php to match your local environment. - Do NOT commit bouncer_r/php/config.php to cvs because it contains - your mysql information. + c. Rename bouncer_r/php/cfg/config.php.cvs to + bouncer_r/php/cfg/config.php. Edit bouncer_r/php/config.php to + match your local environment. Do NOT commit + bouncer_r/php/config.php to cvs because it contains your mysql + information. d. Rename bouncer_r/python/sentry.conf.cvs to bouncer_r/python/sentry.conf. Edit bouncer_r/python/sentry.conf From fedora-extras-commits at redhat.com Thu Aug 4 14:57:39 2005 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Thu, 4 Aug 2005 10:57:39 -0400 Subject: bouncer_r CREDITS, 1.3, 1.4 INSTALL, 1.7, 1.8 README, 1.4, 1.5 TODO, 1.3, 1.4 Message-ID: <200508041458.j74EwAJq016243@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/fedora/bouncer_r In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16220 Modified Files: CREDITS INSTALL README TODO Log Message: More typo fixes Index: CREDITS =================================================================== RCS file: /cvs/fedora/bouncer_r/CREDITS,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- CREDITS 4 Aug 2005 14:56:35 -0000 1.3 +++ CREDITS 4 Aug 2005 14:57:35 -0000 1.4 @@ -1,6 +1,3 @@ -$Id$ - - bouncer_r - Credits ==================== Index: INSTALL =================================================================== RCS file: /cvs/fedora/bouncer_r/INSTALL,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- INSTALL 4 Aug 2005 14:56:35 -0000 1.7 +++ INSTALL 4 Aug 2005 14:57:35 -0000 1.8 @@ -1,5 +1,3 @@ -$Id$ - Setting up a Test Environment ============================= Index: README =================================================================== RCS file: /cvs/fedora/bouncer_r/README,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- README 4 Aug 2005 14:56:35 -0000 1.4 +++ README 4 Aug 2005 14:57:35 -0000 1.5 @@ -1,5 +1,3 @@ -$Id$ - Bouncer_r - A mirror/distribution manager designed for the Fedora Project. = What is it? Index: TODO =================================================================== RCS file: /cvs/fedora/bouncer_r/TODO,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- TODO 4 Aug 2005 14:56:35 -0000 1.3 +++ TODO 4 Aug 2005 14:57:35 -0000 1.4 @@ -1,6 +1,3 @@ -$Id$ - - bouncer_r - Todo ==================== From fedora-extras-commits at redhat.com Thu Aug 4 15:35:47 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Thu, 4 Aug 2005 11:35:47 -0400 Subject: rpms/torcs/FC-3 TORCS-1.2.3-64bit.patch, NONE, 1.1 torcs.spec, 1.4, 1.5 Message-ID: <200508041535.j74FZl4E017684@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/torcs/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17651/FC-3 Modified Files: torcs.spec Added Files: TORCS-1.2.3-64bit.patch Log Message: Backport devel fixes to FC-3 and FC-4. TORCS-1.2.3-64bit.patch: --- NEW FILE TORCS-1.2.3-64bit.patch --- --- torcs-1.2.3/src/modules/graphic/ssggraph/grmain.cpp.64bit 2005-05-26 10:37:04.000000000 -0400 +++ torcs-1.2.3/src/modules/graphic/ssggraph/grmain.cpp 2005-05-26 10:37:44.000000000 -0400 @@ -156,7 +156,7 @@ static void grSplitScreen(void *vp) { - int p = (int)vp; + long p = (long)vp; switch (p) { case GR_SPLIT_ADD: @@ -198,19 +198,19 @@ static void grSetZoom(void *vp) { - grGetcurrentScreen()->setZoom((int)vp); + grGetcurrentScreen()->setZoom((int)(long)vp); } static void grSelectCamera(void *vp) { - grGetcurrentScreen()->selectCamera((int)vp); + grGetcurrentScreen()->selectCamera((int)(long)vp); } static void grSelectBoard(void *vp) { - grGetcurrentScreen()->selectBoard((int)vp); + grGetcurrentScreen()->selectBoard((int)(long)vp); } static void --- torcs-1.2.3/src/libs/tgfclient/guiscrollist.cpp.64bit 2005-05-26 10:29:52.000000000 -0400 +++ torcs-1.2.3/src/libs/tgfclient/guiscrollist.cpp 2005-05-26 10:30:50.000000000 -0400 @@ -45,7 +45,7 @@ tGfuiObject *object; tGfuiScrollList *scrollist; - object = gfuiGetObject(GfuiScreen, (int)(sinfo->userData)); + object = gfuiGetObject(GfuiScreen, (int)(long)(sinfo->userData)); if (object == NULL) { return; } Index: torcs.spec =================================================================== RCS file: /cvs/extras/rpms/torcs/FC-3/torcs.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- torcs.spec 10 Feb 2005 00:04:29 -0000 1.4 +++ torcs.spec 4 Aug 2005 15:35:45 -0000 1.5 @@ -3,7 +3,7 @@ Summary: The Open Racing Car Simulator Name: torcs Version: 1.2.3 -Release: 1 +Release: 5%{?dist} License: GPL Group: Amusements/Games URL: http://torcs.org/ @@ -11,24 +11,24 @@ Source1: http://dl.sf.net/torcs/TORCS-%{version}-src-robots-base.tgz Source2: http://dl.sf.net/torcs/TORCS-%{version}-src-robots-berniw.tgz Source3: http://dl.sf.net/torcs/TORCS-%{version}-src-robots-bt.tgz +Source4: http://dl.sf.net/torcs/TORCS-%{version}-src-robots-olethros.tgz +Patch0: TORCS-1.2.3-64bit.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -Requires: torcs-data -%{?_without_xorg:BuildRequires: XFree86-devel, XFree86-Mesa-libGLU, XFree86-Mesa-libGL} -%{!?_without_xorg:BuildRequires: xorg-x11-devel, xorg-x11-Mesa-libGLU, xorg-x11-Mesa-libGL} -BuildRequires: gcc-c++, plib-devel >= 1.8.3, freeglut-devel +Requires: torcs-data, torcs-data-cars-extra +BuildRequires: xorg-x11-devel, freeglut-devel, plib-devel >= 1.8.3 BuildRequires: libpng-devel, libjpeg-devel, zlib-devel BuildRequires: desktop-file-utils %description TORCS is a 3D racing cars simulator using OpenGL. The goal is to have programmed robots drivers racing against each others. You can also drive -yourself with either a wheel, keyboard or mouse. +yourself with either a wheel, keyboard or mouse. %package robots Summary: The Open Racing Car Simulator robots Group: Amusements/Games -Requires: %{name} +Requires: %{name} = %{version} %description robots TORCS is a 3D racing cars simulator using OpenGL. The goal is to have @@ -39,7 +39,8 @@ %prep -%setup -a 1 -a 2 -a 3 +%setup -a 1 -a 2 -a 3 -a 4 +%patch0 -p1 -b .64bit # Put the drivers back where they belong %{__mv} %{name}-%{version}/src/drivers/* src/drivers/ @@ -61,7 +62,7 @@ Name=TORCS Comment=The Open Racing Car Simulator Exec=torcs -Icon=torcs.png +Icon=%{name}.png Terminal=false Type=Application Encoding=UTF-8 @@ -74,7 +75,7 @@ %{name}.desktop # We need this for proper automatic stripping to take place (still in 1.2.3) -find %{buildroot}%{_libdir}/%{name} -name '*.so' | xargs %{__chmod} +x +find %{buildroot}%{_libdir}/%{name}/ -name '*.so' | xargs %{__chmod} +x %clean @@ -85,35 +86,88 @@ %defattr(-, root, root, 0755) %doc CHANGELOG.html COPYING README.linux TODO.html %{_bindir}/* -%dir %{_libdir}/%{name} -%dir %{_libdir}/%{name}/drivers -%{_libdir}/%{name}/drivers/human -%{_libdir}/%{name}/lib -%{_libdir}/%{name}/modules +%dir %{_libdir}/%{name}/ +%dir %{_libdir}/%{name}/drivers/ +# From main +%{_libdir}/%{name}/drivers/human/ +# From robots-base +%{_libdir}/%{name}/drivers/cylos1/ +%{_libdir}/%{name}/drivers/damned/ +%{_libdir}/%{name}/drivers/inferno/ +%{_libdir}/%{name}/drivers/inferno2/ +%{_libdir}/%{name}/drivers/lliaw/ +%{_libdir}/%{name}/drivers/tanhoj/ +%{_libdir}/%{name}/drivers/tita/ +%{_libdir}/%{name}/lib/ +%{_libdir}/%{name}/modules/ %{_libdir}/%{name}/setup_linux.sh %{_libdir}/%{name}/*-bin %{_datadir}/applications/%{desktop_vendor}-%{name}.desktop -%dir %{_datadir}/games/%{name} -%{_datadir}/games/%{name}/config -%dir %{_datadir}/games/%{name}/drivers -%{_datadir}/games/%{name}/drivers/human -%{_datadir}/games/%{name}/results -%{_datadir}/games/%{name}/telemetry +%dir %{_datadir}/games/%{name}/ +%{_datadir}/games/%{name}/config/ +%dir %{_datadir}/games/%{name}/drivers/ +# From main +%{_datadir}/games/%{name}/drivers/human/ +# From robots-base +%{_datadir}/games/%{name}/drivers/cylos1/ +%{_datadir}/games/%{name}/drivers/damned/ +%{_datadir}/games/%{name}/drivers/inferno/ +%{_datadir}/games/%{name}/drivers/inferno2/ +%{_datadir}/games/%{name}/drivers/lliaw/ +%{_datadir}/games/%{name}/drivers/tanhoj/ +%{_datadir}/games/%{name}/drivers/tita/ +%{_datadir}/games/%{name}/results/ +%{_datadir}/games/%{name}/telemetry/ %{_datadir}/pixmaps/%{name}.png %files robots %defattr(-, root, root, 0755) -%dir %{_libdir}/%{name} -%{_libdir}/%{name}/drivers -# Easier this way, since we package them all-minus-one in ;-) -%exclude %{_libdir}/%{name}/drivers/human -%dir %{_datadir}/games/%{name} -%{_datadir}/games/%{name}/drivers -%exclude %{_datadir}/games/%{name}/drivers/human +%dir %{_libdir}/%{name}/ +%dir %{_libdir}/%{name}/drivers/ +# From robots-berniw +%{_libdir}/%{name}/drivers/berniw/ +%{_libdir}/%{name}/drivers/berniw2/ +%{_libdir}/%{name}/drivers/berniw3/ +%{_libdir}/%{name}/drivers/sparkle/ +# From robots-bt +%{_libdir}/%{name}/drivers/bt/ +# From robots-olethros +%{_libdir}/%{name}/drivers/olethros/ +%dir %{_datadir}/games/%{name}/ +%dir %{_datadir}/games/%{name}/drivers/ +# From robots-berniw +%{_datadir}/games/%{name}/drivers/berniw/ +%{_datadir}/games/%{name}/drivers/berniw2/ +%{_datadir}/games/%{name}/drivers/berniw3/ +%{_datadir}/games/%{name}/drivers/sparkle/ +# From robots-bt +%{_datadir}/games/%{name}/drivers/bt/ +# From robots-olethros +%{_datadir}/games/%{name}/drivers/olethros/ %changelog +* Wed Aug 3 2005 Matthias Saou 1.2.3-5 +- Move base robots from the sub-package to the main one to have the default + quick race work. Hopefully this will change in later versions if the game + checks which drivers are available before starting the default quick race. +- Add torcs-data-cars-extra requirement for the same reason as above : Without, + none of the drivers of the default quick race have a car and the game exits. +- Add olethros robots. +- Change %%files section to explicitly list all robots since the above change + moved many of them to the main package, not just "human". +- Renamed 64bit patch to TORCS-1.2.3-64bit.patch. + +* Thu May 26 2005 Jeremy Katz - 1.2.3-4 +- fix build on 64bit arches + +* Sun May 22 2005 Jeremy Katz - 1.2.3-3 +- rebuild on all arches + +* Fri Apr 7 2005 Michael Schwendt 1.2.3-2 +- rebuilt + * Mon Feb 7 2005 Matthias Saou 1.2.3-1 - Update to 1.2.3. - Remove billy and K1999 robot packages (no longer upstream). From fedora-extras-commits at redhat.com Thu Aug 4 15:35:48 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Thu, 4 Aug 2005 11:35:48 -0400 Subject: rpms/torcs/FC-4 TORCS-1.2.3-64bit.patch, NONE, 1.1 torcs.spec, 1.8, 1.9 torcs-64bit.patch, 1.1, NONE Message-ID: <200508041535.j74FZmX9017692@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/torcs/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17651/FC-4 Modified Files: torcs.spec Added Files: TORCS-1.2.3-64bit.patch Removed Files: torcs-64bit.patch Log Message: Backport devel fixes to FC-3 and FC-4. TORCS-1.2.3-64bit.patch: --- NEW FILE TORCS-1.2.3-64bit.patch --- --- torcs-1.2.3/src/modules/graphic/ssggraph/grmain.cpp.64bit 2005-05-26 10:37:04.000000000 -0400 +++ torcs-1.2.3/src/modules/graphic/ssggraph/grmain.cpp 2005-05-26 10:37:44.000000000 -0400 @@ -156,7 +156,7 @@ static void grSplitScreen(void *vp) { - int p = (int)vp; + long p = (long)vp; switch (p) { case GR_SPLIT_ADD: @@ -198,19 +198,19 @@ static void grSetZoom(void *vp) { - grGetcurrentScreen()->setZoom((int)vp); + grGetcurrentScreen()->setZoom((int)(long)vp); } static void grSelectCamera(void *vp) { - grGetcurrentScreen()->selectCamera((int)vp); + grGetcurrentScreen()->selectCamera((int)(long)vp); } static void grSelectBoard(void *vp) { - grGetcurrentScreen()->selectBoard((int)vp); + grGetcurrentScreen()->selectBoard((int)(long)vp); } static void --- torcs-1.2.3/src/libs/tgfclient/guiscrollist.cpp.64bit 2005-05-26 10:29:52.000000000 -0400 +++ torcs-1.2.3/src/libs/tgfclient/guiscrollist.cpp 2005-05-26 10:30:50.000000000 -0400 @@ -45,7 +45,7 @@ tGfuiObject *object; tGfuiScrollList *scrollist; - object = gfuiGetObject(GfuiScreen, (int)(sinfo->userData)); + object = gfuiGetObject(GfuiScreen, (int)(long)(sinfo->userData)); if (object == NULL) { return; } Index: torcs.spec =================================================================== RCS file: /cvs/extras/rpms/torcs/FC-4/torcs.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- torcs.spec 26 May 2005 15:19:57 -0000 1.8 +++ torcs.spec 4 Aug 2005 15:35:46 -0000 1.9 @@ -3,8 +3,7 @@ Summary: The Open Racing Car Simulator Name: torcs Version: 1.2.3 -Release: 4 - +Release: 5%{?dist} License: GPL Group: Amusements/Games URL: http://torcs.org/ @@ -12,12 +11,11 @@ Source1: http://dl.sf.net/torcs/TORCS-%{version}-src-robots-base.tgz Source2: http://dl.sf.net/torcs/TORCS-%{version}-src-robots-berniw.tgz Source3: http://dl.sf.net/torcs/TORCS-%{version}-src-robots-bt.tgz -Patch0: torcs-64bit.patch +Source4: http://dl.sf.net/torcs/TORCS-%{version}-src-robots-olethros.tgz +Patch0: TORCS-1.2.3-64bit.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -Requires: torcs-data -%{?_without_xorg:BuildRequires: XFree86-devel, XFree86-Mesa-libGLU, XFree86-Mesa-libGL} -%{!?_without_xorg:BuildRequires: xorg-x11-devel, xorg-x11-Mesa-libGLU, xorg-x11-Mesa-libGL} -BuildRequires: gcc-c++, plib-devel >= 1.8.3, freeglut-devel +Requires: torcs-data, torcs-data-cars-extra +BuildRequires: xorg-x11-devel, freeglut-devel, plib-devel >= 1.8.3 BuildRequires: libpng-devel, libjpeg-devel, zlib-devel BuildRequires: desktop-file-utils @@ -30,7 +28,7 @@ %package robots Summary: The Open Racing Car Simulator robots Group: Amusements/Games -Requires: %{name} +Requires: %{name} = %{version} %description robots TORCS is a 3D racing cars simulator using OpenGL. The goal is to have @@ -41,12 +39,11 @@ %prep -%setup -a 1 -a 2 -a 3 +%setup -a 1 -a 2 -a 3 -a 4 +%patch0 -p1 -b .64bit # Put the drivers back where they belong %{__mv} %{name}-%{version}/src/drivers/* src/drivers/ -%patch0 -p1 -b .64bit - %build %configure @@ -65,7 +62,7 @@ Name=TORCS Comment=The Open Racing Car Simulator Exec=torcs -Icon=torcs.png +Icon=%{name}.png Terminal=false Type=Application Encoding=UTF-8 @@ -78,7 +75,7 @@ %{name}.desktop # We need this for proper automatic stripping to take place (still in 1.2.3) -find %{buildroot}%{_libdir}/%{name} -name '*.so' | xargs %{__chmod} +x +find %{buildroot}%{_libdir}/%{name}/ -name '*.so' | xargs %{__chmod} +x %clean @@ -89,42 +86,86 @@ %defattr(-, root, root, 0755) %doc CHANGELOG.html COPYING README.linux TODO.html %{_bindir}/* -%dir %{_libdir}/%{name} -%dir %{_libdir}/%{name}/drivers -%{_libdir}/%{name}/drivers/human -%{_libdir}/%{name}/lib -%{_libdir}/%{name}/modules +%dir %{_libdir}/%{name}/ +%dir %{_libdir}/%{name}/drivers/ +# From main +%{_libdir}/%{name}/drivers/human/ +# From robots-base +%{_libdir}/%{name}/drivers/cylos1/ +%{_libdir}/%{name}/drivers/damned/ +%{_libdir}/%{name}/drivers/inferno/ +%{_libdir}/%{name}/drivers/inferno2/ +%{_libdir}/%{name}/drivers/lliaw/ +%{_libdir}/%{name}/drivers/tanhoj/ +%{_libdir}/%{name}/drivers/tita/ +%{_libdir}/%{name}/lib/ +%{_libdir}/%{name}/modules/ %{_libdir}/%{name}/setup_linux.sh %{_libdir}/%{name}/*-bin %{_datadir}/applications/%{desktop_vendor}-%{name}.desktop -%dir %{_datadir}/games/%{name} -%{_datadir}/games/%{name}/config -%dir %{_datadir}/games/%{name}/drivers -%{_datadir}/games/%{name}/drivers/human -%{_datadir}/games/%{name}/results -%{_datadir}/games/%{name}/telemetry +%dir %{_datadir}/games/%{name}/ +%{_datadir}/games/%{name}/config/ +%dir %{_datadir}/games/%{name}/drivers/ +# From main +%{_datadir}/games/%{name}/drivers/human/ +# From robots-base +%{_datadir}/games/%{name}/drivers/cylos1/ +%{_datadir}/games/%{name}/drivers/damned/ +%{_datadir}/games/%{name}/drivers/inferno/ +%{_datadir}/games/%{name}/drivers/inferno2/ +%{_datadir}/games/%{name}/drivers/lliaw/ +%{_datadir}/games/%{name}/drivers/tanhoj/ +%{_datadir}/games/%{name}/drivers/tita/ +%{_datadir}/games/%{name}/results/ +%{_datadir}/games/%{name}/telemetry/ %{_datadir}/pixmaps/%{name}.png %files robots %defattr(-, root, root, 0755) -%dir %{_libdir}/%{name} -%{_libdir}/%{name}/drivers -# Easier this way, since we package them all-minus-one in ;-) -%exclude %{_libdir}/%{name}/drivers/human -%dir %{_datadir}/games/%{name} -%{_datadir}/games/%{name}/drivers -%exclude %{_datadir}/games/%{name}/drivers/human +%dir %{_libdir}/%{name}/ +%dir %{_libdir}/%{name}/drivers/ +# From robots-berniw +%{_libdir}/%{name}/drivers/berniw/ +%{_libdir}/%{name}/drivers/berniw2/ +%{_libdir}/%{name}/drivers/berniw3/ +%{_libdir}/%{name}/drivers/sparkle/ +# From robots-bt +%{_libdir}/%{name}/drivers/bt/ +# From robots-olethros +%{_libdir}/%{name}/drivers/olethros/ +%dir %{_datadir}/games/%{name}/ +%dir %{_datadir}/games/%{name}/drivers/ +# From robots-berniw +%{_datadir}/games/%{name}/drivers/berniw/ +%{_datadir}/games/%{name}/drivers/berniw2/ +%{_datadir}/games/%{name}/drivers/berniw3/ +%{_datadir}/games/%{name}/drivers/sparkle/ +# From robots-bt +%{_datadir}/games/%{name}/drivers/bt/ +# From robots-olethros +%{_datadir}/games/%{name}/drivers/olethros/ %changelog +* Wed Aug 3 2005 Matthias Saou 1.2.3-5 +- Move base robots from the sub-package to the main one to have the default + quick race work. Hopefully this will change in later versions if the game + checks which drivers are available before starting the default quick race. +- Add torcs-data-cars-extra requirement for the same reason as above : Without, + none of the drivers of the default quick race have a car and the game exits. +- Add olethros robots. +- Change %%files section to explicitly list all robots since the above change + moved many of them to the main package, not just "human". +- Renamed 64bit patch to TORCS-1.2.3-64bit.patch. + * Thu May 26 2005 Jeremy Katz - 1.2.3-4 - fix build on 64bit arches * Sun May 22 2005 Jeremy Katz - 1.2.3-3 - rebuild on all arches -* Fri Apr 7 2005 Michael Schwendt +* Fri Apr 7 2005 Michael Schwendt 1.2.3-2 - rebuilt * Mon Feb 7 2005 Matthias Saou 1.2.3-1 --- torcs-64bit.patch DELETED --- From fedora-extras-commits at redhat.com Thu Aug 4 15:37:12 2005 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Thu, 4 Aug 2005 11:37:12 -0400 Subject: rpms/highlight - New directory Message-ID: <200508041537.j74FbCKE017799@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/highlight In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17779/highlight Log Message: Directory /cvs/extras/rpms/highlight added to the repository From fedora-extras-commits at redhat.com Thu Aug 4 15:37:12 2005 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Thu, 4 Aug 2005 11:37:12 -0400 Subject: rpms/highlight/devel - New directory Message-ID: <200508041537.j74FbCLU017804@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/highlight/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17779/highlight/devel Log Message: Directory /cvs/extras/rpms/highlight/devel added to the repository From fedora-extras-commits at redhat.com Thu Aug 4 15:37:34 2005 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Thu, 4 Aug 2005 11:37:34 -0400 Subject: rpms/highlight Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200508041537.j74FbYbJ017851@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/highlight In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17824 Added Files: Makefile import.log Log Message: Setup of module highlight --- NEW FILE Makefile --- # Top level Makefile for module highlight all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Thu Aug 4 15:37:34 2005 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Thu, 4 Aug 2005 11:37:34 -0400 Subject: rpms/highlight/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200508041537.j74FbYCY017854@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/highlight/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17824/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module highlight --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Thu Aug 4 15:38:32 2005 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Thu, 4 Aug 2005 11:38:32 -0400 Subject: rpms/highlight import.log,1.1,1.2 Message-ID: <200508041538.j74FcW1p017969@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/highlight In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17936 Modified Files: import.log Log Message: auto-import highlight-2.4.1-3 on branch devel from highlight-2.4.1-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/highlight/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 4 Aug 2005 15:37:32 -0000 1.1 +++ import.log 4 Aug 2005 15:38:30 -0000 1.2 @@ -0,0 +1 @@ +highlight-2_4_1-3:HEAD:highlight-2.4.1-3.src.rpm:1123169900 From fedora-extras-commits at redhat.com Thu Aug 4 15:38:32 2005 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Thu, 4 Aug 2005 11:38:32 -0400 Subject: rpms/highlight/devel highlight-2.4-makefile.patch, NONE, 1.1 highlight-2.4-rpmoptflags.patch, NONE, 1.1 highlight.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200508041538.j74FcW1u017980@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/highlight/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17936/devel Modified Files: .cvsignore sources Added Files: highlight-2.4-makefile.patch highlight-2.4-rpmoptflags.patch highlight.spec Log Message: auto-import highlight-2.4.1-3 on branch devel from highlight-2.4.1-3.src.rpm highlight-2.4-makefile.patch: --- NEW FILE highlight-2.4-makefile.patch --- --- highlight-2.4-1/makefile.org 2005-07-19 11:27:46.000000000 +0200 +++ highlight-2.4-1/makefile 2005-07-24 22:24:39.000000000 +0200 @@ -7,7 +7,7 @@ data_dir = ${DESTDIR}/usr/share/highlight/ # Location where the highlight binary will be installed: -bin_dir = ${DESTDIR}/usr/local/bin/ +bin_dir = ${DESTDIR}/usr/bin/ # Location where the highlight man page will be installed: man_dir = ${DESTDIR}/usr/share/man/man1/ @@ -16,7 +16,7 @@ doc_dir = ${DESTDIR}/usr/share/doc/highlight/ # Location where the highlight examples will be installed: -examples_dir = ${doc_dir}examples/ +examples_dir = $(DESTDIR)/${doc_dir}examples/ # Commands: @@ -40,12 +40,6 @@ @echo "Binary directory: ${bin_dir}" @echo - ${MKDIR} ${doc_dir} - ${MKDIR} ${examples_dir} \ - ${examples_dir}cgi \ - ${examples_dir}cgi/perl \ - ${examples_dir}cgi/php \ - ${examples_dir}swig ${MKDIR} ${data_dir} \ ${data_dir}themes \ ${data_dir}langDefs \ @@ -60,18 +54,6 @@ ${INSTALL_DATA} ./indentSchemes/*.indent ${data_dir}indentSchemes/ ${INSTALL_DATA} ./helpmsg/*.help ${data_dir}helpmsg/ ${INSTALL_DATA} ./man/highlight.1.gz ${man_dir} - ${INSTALL_DATA} ./AUTHORS ${doc_dir} - ${INSTALL_DATA} ./README ${doc_dir} - ${INSTALL_DATA} ./README_DE ${doc_dir} - ${INSTALL_DATA} ./README_INDENT ${doc_dir} - ${INSTALL_DATA} ./ChangeLog ${doc_dir} - ${INSTALL_DATA} ./COPYING ${doc_dir} - ${INSTALL_DATA} ./INSTALL ${doc_dir} - ${INSTALL_DATA} ./examples/cgi/php/* ${examples_dir}cgi/php - ${INSTALL_DATA} ./examples/swig/*.py ./examples/swig/*.pl ${examples_dir}swig - ${INSTALL_DATA} ./examples/swig/*.i ./examples/swig/makefile ${examples_dir}swig - ${INSTALL_DATA} ./examples/swig/README_SWIG ${doc_dir} - ${INSTALL_PROGRAM} ./examples/cgi/perl/highlight.cgi ${examples_dir}cgi/perl ${INSTALL_PROGRAM} ./highlight/highlight ${bin_dir} @echo highlight-2.4-rpmoptflags.patch: --- NEW FILE highlight-2.4-rpmoptflags.patch --- --- highlight-2.4-1/highlight/makefile.BAD 2005-08-03 10:44:08.000000000 -0500 +++ highlight-2.4-1/highlight/makefile 2005-08-03 10:44:36.000000000 -0500 @@ -15,7 +15,7 @@ CXX=c++ -CFLAGS := -O2 -Wall -pedantic -DHL_DATA_DIR=\"${HL_DATA_DIR}\" +CFLAGS := $(RPM_OPT_FLAGS) -DHL_DATA_DIR=\"${HL_DATA_DIR}\" LDFLAGS = -L/usr/lib -s --- NEW FILE highlight.spec --- Name: highlight Summary: Universal source code to formatted text converter Version: 2.4.1 Release: 3%{?dist} Group: Development/Tools License: GPL URL: http://www.andre-simon.de/ Source0: http://www.andre-simon.de/zip/%{name}-2.4-1.tar.bz2 Patch1: highlight-2.4-makefile.patch Patch2: highlight-2.4-rpmoptflags.patch Buildroot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n) %description A utility that converts sourcecode to HTML, XHTML, RTF, LaTeX, TeX, XSL-FO, XML or ANSI escape sequences with syntax highlighting. It supports several programming and markup languages. Language descriptions are configurable and support regular expressions. The utility offers indentation and reformatting capabilities. It is easily possible to create new language definitions and colour themes. %prep %setup -q -n %{name}-2.4-1 %patch1 -p1 %patch2 -p1 %build make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT%{_docdir}/highlight %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %{_bindir}/highlight %{_datadir}/highlight/ %{_mandir}/man1/highlight.1.gz %doc ChangeLog AUTHORS README* COPYING TODO examples// %changelog * Wed Aug 3 2005 Jochen Schmitt 2.4.1-3 - Remove leading 'A' from summary line * Wed Aug 3 2005 Jochen Schmitt 2.4.1-2 - Add rpmoptflags patch from Tom Callaway * Wed Aug 3 2005 Jochen Schmitt 2.4.1-1 - Change versioning schema - Add suggested changes from Oliver * Sun Jul 24 2005 Jochen Schmitt 2.4-1 - Initial build Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/highlight/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 4 Aug 2005 15:37:32 -0000 1.1 +++ .cvsignore 4 Aug 2005 15:38:30 -0000 1.2 @@ -0,0 +1 @@ +highlight-2.4-1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/highlight/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 4 Aug 2005 15:37:32 -0000 1.1 +++ sources 4 Aug 2005 15:38:30 -0000 1.2 @@ -0,0 +1 @@ +70066f7c4c0970fb84b0d84835d2f25f highlight-2.4-1.tar.bz2 From fedora-extras-commits at redhat.com Thu Aug 4 15:40:54 2005 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Thu, 4 Aug 2005 11:40:54 -0400 Subject: rpms/pdftk/FC-4 pdftk.spec,1.1,1.2 Message-ID: <200508041540.j74FesDP018049@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/pdftk/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18032 Modified Files: pdftk.spec Log Message: Description: %{?dist} added in pdftk.spec. Index: pdftk.spec =================================================================== RCS file: /cvs/extras/rpms/pdftk/FC-4/pdftk.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- pdftk.spec 3 Aug 2005 17:51:01 -0000 1.1 +++ pdftk.spec 4 Aug 2005 15:40:52 -0000 1.2 @@ -1,7 +1,7 @@ Summary: The PDF Tool Kit Name: pdftk Version: 1.12 -Release: 3 +Release: 3%{?dist} License: GPL URL: http://www.accesspdf.com/pdftk/ Source0: http://www.pdfhacks.com/pdftk/%{name}-%{version}.tar.bz2 From fedora-extras-commits at redhat.com Thu Aug 4 15:42:28 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Thu, 4 Aug 2005 11:42:28 -0400 Subject: rpms/highlight/devel highlight.spec,1.1,1.2 Message-ID: <200508041542.j74FgSkx018112@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/highlight/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18093 Modified Files: highlight.spec Log Message: Fix the spaces vs. tabs I mentioned, .gz man page extension in case it doesn't get compressed and an unneeded double slash. Index: highlight.spec =================================================================== RCS file: /cvs/extras/rpms/highlight/devel/highlight.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- highlight.spec 4 Aug 2005 15:38:30 -0000 1.1 +++ highlight.spec 4 Aug 2005 15:42:26 -0000 1.2 @@ -1,17 +1,17 @@ -Name: highlight -Summary: Universal source code to formatted text converter -Version: 2.4.1 -Release: 3%{?dist} +Name: highlight +Summary: Universal source code to formatted text converter +Version: 2.4.1 +Release: 3%{?dist} -Group: Development/Tools -License: GPL +Group: Development/Tools +License: GPL -URL: http://www.andre-simon.de/ +URL: http://www.andre-simon.de/ Source0: http://www.andre-simon.de/zip/%{name}-2.4-1.tar.bz2 Patch1: highlight-2.4-makefile.patch Patch2: highlight-2.4-rpmoptflags.patch -Buildroot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n) +Buildroot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n) %description A utility that converts sourcecode to HTML, XHTML, RTF, LaTeX, TeX, @@ -44,9 +44,9 @@ %{_bindir}/highlight %{_datadir}/highlight/ -%{_mandir}/man1/highlight.1.gz +%{_mandir}/man1/highlight.1* -%doc ChangeLog AUTHORS README* COPYING TODO examples// +%doc ChangeLog AUTHORS README* COPYING TODO examples/ %changelog * Wed Aug 3 2005 Jochen Schmitt 2.4.1-3 From thias at spam.spam.spam.spam.spam.spam.spam.egg.and.spam.freshrpms.net Thu Aug 4 15:45:33 2005 From: thias at spam.spam.spam.spam.spam.spam.spam.egg.and.spam.freshrpms.net (Matthias Saou) Date: Thu, 4 Aug 2005 17:45:33 +0200 Subject: rpms/highlight/devel highlight.spec,1.1,1.2 In-Reply-To: <200508041542.j74FgSkx018112@cvs-int.fedora.redhat.com> References: <200508041542.j74FgSkx018112@cvs-int.fedora.redhat.com> Message-ID: <20050804174533.788b8be6@python2> Matthias Saou wrote : > Log Message: > Fix the spaces vs. tabs I mentioned, .gz man page extension in case > it doesn't get compressed and an unneeded double slash. I hope you don't mind these minor cosmetic changes. If you do, please let me know. Matthias -- Clean custom Red Hat Linux rpm packages : http://freshrpms.net/ Fedora Core release 4 (Stentz) - Linux kernel 2.6.12-1.1398_FC4 Load : 0.89 0.57 0.40 From fedora-extras-commits at redhat.com Thu Aug 4 15:47:18 2005 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Thu, 4 Aug 2005 11:47:18 -0400 Subject: owners owners.list,1.49,1.50 Message-ID: <200508041547.j74FlIpD018154@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18137 Modified Files: owners.list Log Message: Description: Add new component highlight. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- owners.list 4 Aug 2005 07:13:03 -0000 1.49 +++ owners.list 4 Aug 2005 15:47:16 -0000 1.50 @@ -281,7 +281,7 @@ Fedora Extras|hercules|Hercules S/370, ESA/390, and z/Architecture emulator|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|Hermes|HERMES pixel format conversion library|thomas at apestaart.org|extras-qa at fedoraproject.org| Fedora Extras|hfsplusutils|Tools for reading Macintosh HFS+ volumes|dwmw2 at redhat.com|extras-qa at fedoraproject.org| -Fedora Extras|highlight|Universal source code to formatted text converter|jochen at herr-schmitt.de|extras-qa at fedoraproject.org| +Fedora Extras|highlight|Universal source code to formatted text converter|Jochen at herr-schmitt.de|extras-qa at fedoraproject.org| Fedora Extras|hping2|A software to do TCP/IP stack auditing and much more|kuko at maarmas.com|extras-qa at fedoraproject.org| Fedora Extras|htb-util|Another tool to make your life easier with HTB|mihai at xcyb.org|extras-qa at fedoraproject.org| Fedora Extras|htmltmpl|Templating engine for separation of code and HTML|ville.skytta at iki.fi|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Thu Aug 4 15:58:52 2005 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Thu, 4 Aug 2005 11:58:52 -0400 Subject: rpms/perl-Mail-SPF-Query - New directory Message-ID: <200508041558.j74FwqbX018306@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Mail-SPF-Query In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18282/perl-Mail-SPF-Query Log Message: Directory /cvs/extras/rpms/perl-Mail-SPF-Query added to the repository From fedora-extras-commits at redhat.com Thu Aug 4 15:58:53 2005 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Thu, 4 Aug 2005 11:58:53 -0400 Subject: rpms/perl-Mail-SPF-Query/devel - New directory Message-ID: <200508041558.j74FwrGY018311@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Mail-SPF-Query/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18282/perl-Mail-SPF-Query/devel Log Message: Directory /cvs/extras/rpms/perl-Mail-SPF-Query/devel added to the repository From fedora-extras-commits at redhat.com Thu Aug 4 15:59:13 2005 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Thu, 4 Aug 2005 11:59:13 -0400 Subject: rpms/perl-Mail-SPF-Query Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200508041559.j74FxDLr018354@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Mail-SPF-Query In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18327 Added Files: Makefile import.log Log Message: Setup of module perl-Mail-SPF-Query --- NEW FILE Makefile --- # Top level Makefile for module perl-Mail-SPF-Query all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Thu Aug 4 15:59:13 2005 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Thu, 4 Aug 2005 11:59:13 -0400 Subject: rpms/perl-Mail-SPF-Query/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200508041559.j74FxDZq018359@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Mail-SPF-Query/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18327/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Mail-SPF-Query --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Thu Aug 4 16:00:00 2005 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Thu, 4 Aug 2005 12:00:00 -0400 Subject: rpms/perl-Mail-SPF-Query import.log,1.1,1.2 Message-ID: <200508041600.j74G0ULc018455@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Mail-SPF-Query In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18401 Modified Files: import.log Log Message: auto-import perl-Mail-SPF-Query-1.997-4 on branch devel from perl-Mail-SPF-Query-1.997-4.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Mail-SPF-Query/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 4 Aug 2005 15:59:11 -0000 1.1 +++ import.log 4 Aug 2005 15:59:58 -0000 1.2 @@ -0,0 +1 @@ +perl-Mail-SPF-Query-1_997-4:HEAD:perl-Mail-SPF-Query-1.997-4.src.rpm:1123171188 From fedora-extras-commits at redhat.com Thu Aug 4 16:00:00 2005 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Thu, 4 Aug 2005 12:00:00 -0400 Subject: rpms/perl-Mail-SPF-Query/devel MSQ-fallback.patch, NONE, 1.1 perl-Mail-SPF-Query.spec, NONE, 1.1 use-sys-hostname.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200508041600.j74G00Ex018437@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Mail-SPF-Query/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18401/devel Modified Files: .cvsignore sources Added Files: MSQ-fallback.patch perl-Mail-SPF-Query.spec use-sys-hostname.patch Log Message: auto-import perl-Mail-SPF-Query-1.997-4 on branch devel from perl-Mail-SPF-Query-1.997-4.src.rpm MSQ-fallback.patch: --- NEW FILE MSQ-fallback.patch --- --- Mail-SPF-Query-1.997/Query.pm 2004-04-26 07:02:17.000000000 +0100 +++ Mail-SPF-Query-1.997/Query.pm 2004-06-29 13:45:26.624665341 +0100 @@ -1727,6 +1727,17 @@ @txt = $query->myquery($current_domain, "TXT", "char_str_list"); $query->debuglog(" DirectiveSet->new(): TXT query on $current_domain returned error=$query->{error}, last_dns_error=$query->{last_dns_error}"); + # check for non-SPF TXT records + my $spf_flag = 0; + foreach (@txt) { + if (/^v=spf1\s/) { + $spf_flag = 1; + last; + } + } + if (! $spf_flag) { + @txt = (); + } if ($query->{error} || $query->{last_dns_error} eq 'NXDOMAIN' || ! @txt) { # try the fallbacks. $query->debuglog(" DirectiveSet->new(): will try fallbacks."); --- NEW FILE perl-Mail-SPF-Query.spec --- %{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)} Name: perl-Mail-SPF-Query Version: 1.997 Release: 4%{?dist} Summary: Mail::SPF::Query Perl module License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Mail-SPF-Query/ Source0: http://www.cpan.org/modules/by-module/Mail/Mail-SPF-Query-1.997.tar.gz # From Paul Howarth Patch0: MSQ-fallback.patch Patch1: use-sys-hostname.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Requires: perl(Net::DNS) >= 0.46, perl(Net::CIDR::Lite) >= 0.15 %{?_with_check:BuildRequires: perl(Test::Pod::Coverage)} %{?_with_check:BuildRequires: perl(Net::DNS) >= 0.46} %{?_with_check:BuildRequires: perl(Net::CIDR::Lite) >= 0.15} %description The SPF protocol relies on sender domains to publish a DNS whitelist of their designated outbound mailers. Given an envelope sender, Mail::SPF::Query determines the legitimacy of an SMTP client IP. %prep %setup -q -n Mail-SPF-Query-%{version} %patch0 -p1 %patch1 -p1 %build %{__perl} Makefile.PL INSTALLDIRS=vendor %{__perl} -pi -e 's/^\tLD_RUN_PATH=[^\s]+\s*/\t/' Makefile make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null \; chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* # Don't include the spfd and spfquery scripts in _bindir. rm -f $RPM_BUILD_ROOT%{_bindir}/spfd $RPM_BUILD_ROOT%{_bindir}/spfquery # Does a lot of external DNS lookups. %check || : %{?_with_check:make test} %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README sample spfd spfquery %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Mon Aug 01 2005 Steven Pritchard 1.997-4 - Add some BuildRequires (suggested by Paul Howarth) * Thu Jul 21 2005 Steven Pritchard 1.997-3 - Force use of Sys::Hostname (instead of Sys::Hostname::Long) * Mon Jul 18 2005 Steven Pritchard 1.997-2 - Include MSQ-fallback.patch from Paul Howarth - Run make test when built with --with check - Include the spfd and spfquery scripts as %%doc * Fri Jul 15 2005 Steven Pritchard 1.997-1 - Specfile autogenerated. use-sys-hostname.patch: --- NEW FILE use-sys-hostname.patch --- --- Mail-SPF-Query-1.997.orig/Query.pm 2005-07-21 15:24:38.000000000 -0500 +++ Mail-SPF-Query-1.997/Query.pm 2005-07-21 15:25:32.000000000 -0500 @@ -325,8 +325,7 @@ if (not $query->{myhostname}) { use Sys::Hostname; - eval { require Sys::Hostname::Long }; - $query->{myhostname} = $@ ? hostname() : Sys::Hostname::Long::hostname_long(); + $query->{myhostname} = hostname(); } $query->{myhostname} ||= "localhost"; Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Mail-SPF-Query/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 4 Aug 2005 15:59:11 -0000 1.1 +++ .cvsignore 4 Aug 2005 15:59:58 -0000 1.2 @@ -0,0 +1 @@ +Mail-SPF-Query-1.997.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Mail-SPF-Query/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 4 Aug 2005 15:59:11 -0000 1.1 +++ sources 4 Aug 2005 15:59:58 -0000 1.2 @@ -0,0 +1 @@ +9e110d00520e0fe174c25c0734a8baf6 Mail-SPF-Query-1.997.tar.gz From fedora-extras-commits at redhat.com Thu Aug 4 16:00:59 2005 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Thu, 4 Aug 2005 12:00:59 -0400 Subject: owners owners.list,1.50,1.51 Message-ID: <200508041600.j74G0xFG018507@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18490 Modified Files: owners.list Log Message: Add perl-Mail-SPF-Query. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- owners.list 4 Aug 2005 15:47:16 -0000 1.50 +++ owners.list 4 Aug 2005 16:00:57 -0000 1.51 @@ -572,6 +572,7 @@ Fedora Extras|perl-Lingua-EN-Inflect-Number|Force number of words to singular or plural|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Mail-Alias|For bugs related to the perl-Mail-Alias component|anvil at livna.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Mail-Sendmail|Simple platform independent mailer for Perl|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Mail-SPF-Query|Mail::SPF::Query determines the legitimacy of an SMTP client IP|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-MailTools|MailTools module for Perl|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-MIME-Lite|MIME-Lite - low-calorie MIME generator|thm at duke.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-MIME-tools|Modules for parsing and creating MIME entities in Perl|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From steve at silug.org Thu Aug 4 16:03:29 2005 From: steve at silug.org (Steven Pritchard) Date: Thu, 4 Aug 2005 11:03:29 -0500 Subject: APPROVED: perl-Mail-SPF-Query Message-ID: <20050804160329.GA31422@osiris.silug.org> The SPF protocol relies on sender domains to publish a DNS whitelist of their designated outbound mailers. Given an envelope sender, Mail::SPF::Query determines the legitimacy of an SMTP client IP. Reviewer: Paul Howarth Maintainer: Steven Pritchard Steve -- Steven Pritchard - K&S Pritchard Enterprises, Inc. Email: steve at kspei.com http://www.kspei.com/ Phone: (618)398-3000 Mobile: (618)567-7320 -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 189 bytes Desc: not available URL: From byte at aeon.com.my Thu Aug 4 16:08:50 2005 From: byte at aeon.com.my (Colin Charles) Date: Fri, 05 Aug 2005 02:08:50 +1000 Subject: rpms/MagicPoint/FC-4 MagicPoint.spec,1.1,1.2 In-Reply-To: <1123165785.4364.101.camel@mccallum.corsepiu.local> References: <200508041206.j74C6Ewe013277@cvs-int.fedora.redhat.com> <1123165785.4364.101.camel@mccallum.corsepiu.local> Message-ID: <1123171730.5149.40.camel@potter.soho.bytebot.net> On Thu, 2005-08-04 at 16:29 +0200, Ralf Corsepius wrote: > Did this spec file ever see a review? Yes it did actually (on extras-list) (and it was already a package in FC Core/Extras before, fwiw) > > Index: MagicPoint.spec > > =================================================================== > > RCS file: /cvs/extras/rpms/MagicPoint/FC-4/MagicPoint.spec,v > > retrieving revision 1.1 > > retrieving revision 1.2 > > diff -u -r1.1 -r1.2 > > --- MagicPoint.spec 27 Jun 2005 05:48:40 -0000 1.1 > > +++ MagicPoint.spec 4 Aug 2005 12:05:42 -0000 1.2 > > > +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) > > +BuildPrereq: freetype-devel > BuildPrereq: is an anachronism. Please use BuildRequires, instead. This has been in the spec file since before Extras entry (i.e. was in Akira's Core package) And if you start going to -extras-commits-list, this is not the first example of said anachronism FWIW, this is now changed to BuildRequires > > +BuildRequires: fontconfig-devel xorg-x11-devel libungif-devel libpng-devel libmng-devel imlib-devel autoconf automake libtool byacc flex > > +#Requires: VFlib2 >= 2.25.6-8 VFlib2-conf-ja >= 2.25.6-8 > > +Requires: imlib > > Obsoletes: mgp,magicpoint > > +Provides: mgp,magicpoint > > > > %description > > MagicPoint is an X11 based presentation tool. MagicPoint's > > @@ -37,13 +41,12 @@ > > %patch6 -p1 -b .longline > > %patch10 -p1 -b .usleep > > %patch11 -p1 -b .gcc34 > > -%patch12 -p1 -b .undef-op > > > > %build > > CFLAGS=-I/usr/include/freetype1/freetype > This should be CPPFLAGS, unless the configure script is really broken. Again, also from the old spec; changed to CPPFLAGS > > autoconf > > cp /usr/share/libtool/config.{sub,guess} . > Well, ... sometimes I feel sooo tired ... ;) Uh huh, nothing changed here > > -%configure --prefix=/usr/X11R6 --enable-gif > > +%configure --prefix=/usr/X11R6 --enable-gif --disable-vflib --enable-imlib > > xmkmf -a > > make > > rm -rf $RPM_BUILD_DIR/magicpoint-%{version}/sample/.cvsignore > > @@ -51,22 +54,24 @@ > > %install > > [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && > This "test" is superfluous. It only makes some sense in spec files not > containing a reasonable BuildRoot. Again, from the older spec file; removed > > rm -rf $RPM_BUILD_ROOT > > make install install.man DESTDIR=$RPM_BUILD_ROOT > > +strip `file $RPM_BUILD_ROOT/%{x11bindir}/* | grep ELF | cut -d : -f 1` > This strip should be removed. It prevents debuginfo-rpms. Debuginfo rpms have been created with it too, however removed > > %clean > > [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && > See above. See above. Thanks for being sharp -- Colin Charles, http://www.bytebot.net/ From bugs.michael at gmx.net Thu Aug 4 16:50:10 2005 From: bugs.michael at gmx.net (Michael Schwendt) Date: Thu, 4 Aug 2005 18:50:10 +0200 Subject: rpms/MagicPoint/FC-4 MagicPoint.spec,1.1,1.2 In-Reply-To: <1123171730.5149.40.camel@potter.soho.bytebot.net> References: <200508041206.j74C6Ewe013277@cvs-int.fedora.redhat.com> <1123165785.4364.101.camel@mccallum.corsepiu.local> <1123171730.5149.40.camel@potter.soho.bytebot.net> Message-ID: <20050804185010.41458f51.bugs.michael@gmx.net> On Fri, 05 Aug 2005 02:08:50 +1000, Colin Charles wrote: > > > rm -rf $RPM_BUILD_ROOT > > > make install install.man DESTDIR=$RPM_BUILD_ROOT > > > +strip `file $RPM_BUILD_ROOT/%{x11bindir}/* | grep ELF | cut -d : -f 1` > > This strip should be removed. It prevents debuginfo-rpms. > > Debuginfo rpms have been created with it too, however removed The important detail is the content of the debuginfo rpms, not the creation of debuginfo rpms. From fedora-extras-commits at redhat.com Thu Aug 4 17:08:21 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Thu, 4 Aug 2005 13:08:21 -0400 Subject: rpms/kompose - New directory Message-ID: <200508041708.j74H8LXh021110@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/kompose In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21089/kompose Log Message: Directory /cvs/extras/rpms/kompose added to the repository From fedora-extras-commits at redhat.com Thu Aug 4 17:08:23 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Thu, 4 Aug 2005 13:08:23 -0400 Subject: rpms/kompose/devel - New directory Message-ID: <200508041708.j74H8Nes021118@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/kompose/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21089/kompose/devel Log Message: Directory /cvs/extras/rpms/kompose/devel added to the repository From fedora-extras-commits at redhat.com Thu Aug 4 17:08:46 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Thu, 4 Aug 2005 13:08:46 -0400 Subject: rpms/kompose/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200508041708.j74H8kcI021168@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/kompose/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21134/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module kompose --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Thu Aug 4 17:08:45 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Thu, 4 Aug 2005 13:08:45 -0400 Subject: rpms/kompose Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200508041708.j74H8jOw021162@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/kompose In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21134 Added Files: Makefile import.log Log Message: Setup of module kompose --- NEW FILE Makefile --- # Top level Makefile for module kompose all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Thu Aug 4 17:09:38 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Thu, 4 Aug 2005 13:09:38 -0400 Subject: rpms/kompose/devel kompose.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200508041709.j74H9es8021236@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/kompose/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21201/devel Modified Files: .cvsignore sources Added Files: kompose.spec Log Message: auto-import kompose-0.5.3-3 on branch devel from kompose-0.5.3-3.src.rpm --- NEW FILE kompose.spec --- Name: kompose Summary: Provides a full screen view of all open windows Version: 0.5.3 Release: 3%{?dist} License: GPL Group: User Interface/X Url: http://kompose.berlios.de Source: http://download.berlios.de/kompose/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: kdelibs-devel >= 3.2, imlib2-devel Requires: kdebase %description Kompos? currently allows a fullscreen view of all your virtual desktops where every window is represented by a scaled screenshot of it's own. The Composite extension is used if available from the X server. %prep %setup -q %build unset QTDIR || : ; . /etc/profile.d/qt.sh export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include %configure --disable-rpath make %{?_smp_mflags} %install %makeinstall desktop-file-install --vendor=fedora \ --add-category=Qt \ --add-category=KDE \ --add-category=Utility \ --add-category=X-Fedora \ --delete-original --dir %{buildroot}%{_datadir}/applications \ $RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/kompose.desktop install -D src/hi32-app-kompose.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/kompose.png #Fix doc link ln -sf ../common $RPM_BUILD_ROOT%{_defaultdocdir}/HTML/en/%{name} ## File lists # locale's %find_lang %{name} || touch %{name}.lang # HTML HTML_DIR=$(kde-config --expandvars --install html) if [ -d $RPM_BUILD_ROOT$HTML_DIR ]; then for lang_dir in $RPM_BUILD_ROOT$HTML_DIR/* ; do lang=$(basename $lang_dir) echo "%lang($lang) %doc $HTML_DIR/$lang/*" >> %{name}.lang done fi %clean rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root) %doc AUTHORS COPYING README %{_bindir}/kompose %{_datadir}/applications/fedora-kompose.desktop %{_datadir}/apps/kompose/ %{_datadir}/pixmaps/kompose.png %changelog * Mon Jul 25 2005 - Orion Poplawski 0.5.3-3 - Requires kdebase - Fix doc symlink. * Fri Jul 22 2005 - Orion Poplawski 0.5.3-2 - More spec cleanup * Fri Jul 22 2005 - Orion Poplawski 0.5.3-1 - Update to 0.5.3 - Cleanup spec file * Tue Jul 05 2005 - Orion Poplawski 0.5.2-0.beta1 - Initial Fedora Extras package Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kompose/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 4 Aug 2005 17:08:44 -0000 1.1 +++ .cvsignore 4 Aug 2005 17:09:36 -0000 1.2 @@ -0,0 +1 @@ +kompose-0.5.3.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/kompose/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 4 Aug 2005 17:08:44 -0000 1.1 +++ sources 4 Aug 2005 17:09:36 -0000 1.2 @@ -0,0 +1 @@ +d0605f3651ed3f2eca9b961266669d30 kompose-0.5.3.tar.bz2 From fedora-extras-commits at redhat.com Thu Aug 4 17:09:38 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Thu, 4 Aug 2005 13:09:38 -0400 Subject: rpms/kompose import.log,1.1,1.2 Message-ID: <200508041709.j74H9evZ021237@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/kompose In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21201 Modified Files: import.log Log Message: auto-import kompose-0.5.3-3 on branch devel from kompose-0.5.3-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/kompose/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 4 Aug 2005 17:08:43 -0000 1.1 +++ import.log 4 Aug 2005 17:09:36 -0000 1.2 @@ -0,0 +1 @@ +kompose-0_5_3-3:HEAD:kompose-0.5.3-3.src.rpm:1123175356 From fedora-extras-commits at redhat.com Thu Aug 4 17:24:32 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Thu, 4 Aug 2005 13:24:32 -0400 Subject: rpms/grip/devel grip-3.2.0-id3.c.patch,NONE,1.1 grip.spec,1.5,1.6 Message-ID: <200508041724.j74HOW5F021431@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/grip/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21411 Modified Files: grip.spec Added Files: grip-3.2.0-id3.c.patch Log Message: added patch for buffer overflow in id3.c (#160671) grip-3.2.0-id3.c.patch: --- NEW FILE grip-3.2.0-id3.c.patch --- diff -Nur grip-3.2.0-orig/src/id3.c grip-3.2.0/src/id3.c --- grip-3.2.0-orig/src/id3.c 2004-04-15 20:20:31.000000000 +0200 +++ grip-3.2.0/src/id3.c 2005-08-04 02:27:15.000000000 +0200 @@ -251,7 +251,7 @@ if ( frames[ i ] ) { char *c_data = NULL; - char gen[ 5 ] = "( )"; + char gen[ 6 ] = "( )"; char trk[ 4 ] = " "; switch( frameids[ i ] ) { Index: grip.spec =================================================================== RCS file: /cvs/extras/rpms/grip/devel/grip.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- grip.spec 7 Jul 2005 08:54:59 -0000 1.5 +++ grip.spec 4 Aug 2005 17:24:30 -0000 1.6 @@ -1,7 +1,7 @@ Summary: Front-end for CD rippers and Ogg Vorbis encoders Name: grip Version: 3.2.0 -Release: 5%{?dist} +Release: 6%{?dist} Epoch: 1 License: GPL Group: Applications/Multimedia @@ -9,6 +9,7 @@ Source1: grip.1 Patch1: grip-3.2.0-default.patch Patch2: grip-cell-renderer.patch +Patch3: grip-3.2.0-id3.c.patch URL: http://www.nostatic.org/grip/ Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: vorbis-tools @@ -27,6 +28,7 @@ %setup -q %patch1 -p1 -b .rh-default-encoder %patch2 -p1 -b .cell-renderer +%patch3 -p1 -b .id3 %build %configure @@ -75,6 +77,9 @@ %{_mandir}/man1/* %changelog +* Thu Aug 04 2005 Adrian Reber - 1:3.2.0-6 +- added patch for buffer overflow in id3.c (#160671) + * Thu Jul 07 2005 Adrian Reber - 1:3.2.0-5 - added patch to fix cell renderer problem (BZ #162324) - wrote and added a man page From fedora-extras-commits at redhat.com Thu Aug 4 17:34:28 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Thu, 4 Aug 2005 13:34:28 -0400 Subject: rpms/grip/FC-4 grip-3.2.0-id3.c.patch,NONE,1.1 grip.spec,1.5,1.6 Message-ID: <200508041734.j74HYS66021579@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/grip/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21555 Modified Files: grip.spec Added Files: grip-3.2.0-id3.c.patch Log Message: added patch for buffer overflow in id3.c (#160671) grip-3.2.0-id3.c.patch: --- NEW FILE grip-3.2.0-id3.c.patch --- diff -Nur grip-3.2.0-orig/src/id3.c grip-3.2.0/src/id3.c --- grip-3.2.0-orig/src/id3.c 2004-04-15 20:20:31.000000000 +0200 +++ grip-3.2.0/src/id3.c 2005-08-04 02:27:15.000000000 +0200 @@ -251,7 +251,7 @@ if ( frames[ i ] ) { char *c_data = NULL; - char gen[ 5 ] = "( )"; + char gen[ 6 ] = "( )"; char trk[ 4 ] = " "; switch( frameids[ i ] ) { Index: grip.spec =================================================================== RCS file: /cvs/extras/rpms/grip/FC-4/grip.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- grip.spec 7 Jul 2005 10:00:48 -0000 1.5 +++ grip.spec 4 Aug 2005 17:34:26 -0000 1.6 @@ -1,7 +1,7 @@ Summary: Front-end for CD rippers and Ogg Vorbis encoders Name: grip Version: 3.2.0 -Release: 5%{?dist} +Release: 6%{?dist} Epoch: 1 License: GPL Group: Applications/Multimedia @@ -9,6 +9,7 @@ Source1: grip.1 Patch1: grip-3.2.0-default.patch Patch2: grip-cell-renderer.patch +Patch3: grip-3.2.0-id3.c.patch URL: http://www.nostatic.org/grip/ Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: vorbis-tools @@ -27,6 +28,7 @@ %setup -q %patch1 -p1 -b .rh-default-encoder %patch2 -p1 -b .cell-renderer +%patch3 -p1 -b .id3 %build %configure @@ -75,6 +77,9 @@ %{_mandir}/man1/* %changelog +* Thu Aug 04 2005 Adrian Reber - 1:3.2.0-6 +- added patch for buffer overflow in id3.c (#160671) + * Thu Jul 07 2005 Adrian Reber - 1:3.2.0-5 - added patch to fix cell renderer problem (BZ #162324) - wrote and added a man page From fedora-extras-commits at redhat.com Thu Aug 4 17:34:59 2005 From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith)) Date: Thu, 4 Aug 2005 13:34:59 -0400 Subject: owners owners.list,1.51,1.52 Message-ID: <200508041734.j74HYxmo021650@cvs-int.fedora.redhat.com> Author: sopwith Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21633 Modified Files: owners.list Log Message: Remove Package Review to stop frustrating dkl! Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- owners.list 4 Aug 2005 16:00:57 -0000 1.51 +++ owners.list 4 Aug 2005 17:34:57 -0000 1.52 @@ -499,7 +499,6 @@ Fedora Extras|ots|A text summarizer|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|p0f|Versatile passive OS fingerprinting tool|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|p7zip|Very high compression ratio file archiver|matthias at rpmforge.net|extras-qa at fedoraproject.org| -Fedora Extras|Package Review|Choose this to request QA on a new package|dkl at redhat.com|dkl at redhat.com| Fedora Extras|pam_abl|A Pluggable Authentication Module (PAM) for auto blacklisting|ad+rh-bugzilla at uni-x.org|extras-qa at fedoraproject.org| Fedora Extras|pam_mount|A PAM module that can mount volumes for a user session|redhat at flyn.org|extras-qa at fedoraproject.org| Fedora Extras|pam_mysql| PAM module for auth UNIX users using MySQL data base|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Thu Aug 4 18:10:11 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Thu, 4 Aug 2005 14:10:11 -0400 Subject: rpms/djvulibre/FC-4 .cvsignore, 1.4, 1.5 djvulibre.spec, 1.8, 1.9 sources, 1.4, 1.5 Message-ID: <200508041810.j74IAB6o023023@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/djvulibre/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22973/FC-4 Modified Files: .cvsignore djvulibre.spec sources Log Message: Update to 3.5.15 which fixes some build issues on FC-4, and fix the remaining. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/djvulibre/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 9 Nov 2004 02:45:25 -0000 1.4 +++ .cvsignore 4 Aug 2005 18:10:09 -0000 1.5 @@ -1 +1 @@ -djvulibre-3.5.14.tar.gz +djvulibre-3.5.15.tar.gz Index: djvulibre.spec =================================================================== RCS file: /cvs/extras/rpms/djvulibre/FC-4/djvulibre.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- djvulibre.spec 6 Apr 2005 22:11:36 -0000 1.8 +++ djvulibre.spec 4 Aug 2005 18:10:09 -0000 1.9 @@ -1,15 +1,14 @@ Summary: DjVu viewers, encoders and utilities Name: djvulibre -Version: 3.5.14 -Release: 5 - +Version: 3.5.15 +Release: 1%{?dist} License: GPL Group: Applications/Publishing -URL: http://djvu.sourceforge.net/ +URL: http://djvulibre.djvuzone.org/ Source: http://dl.sf.net/djvu/djvulibre-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -BuildRequires: XFree86-devel, qt-devel, libjpeg-devel -BuildRequires: libstdc++-devel, gcc-c++, mozilla +BuildRequires: xorg-x11-devel, qt-devel, libjpeg-devel, libtiff-devel +BuildRequires: mozilla, redhat-menus # Provide these here, they're so small, it's not worth splitting them out Provides: mozilla-djvulibre = %{version}-%{release} Provides: djvulibre-devel = %{version}-%{release} @@ -42,13 +41,19 @@ %install %{__rm} -rf %{buildroot} %makeinstall -%{__mkdir_p} %{buildroot}%{_libdir}/mozilla/plugins -%{__ln_s} ../../netscape/plugins/nsdejavu.so \ - %{buildroot}%{_libdir}/mozilla/plugins/ +# Move plugin from the netscape directory to the main mozilla one +%{__mkdir_p} %{buildroot}%{_libdir}/mozilla/plugins/ +%{__mv} %{buildroot}%{_libdir}/netscape/plugins/nsdejavu.so \ + %{buildroot}%{_libdir}/mozilla/plugins/nsdejavu.so -# Fix for the libs to get stripped correctly (debuginfo) +# Fix for the libs to get stripped correctly (still required in 3.5.15) find %{buildroot}%{_libdir} -name '*.so*' | xargs %{__chmod} +x +# Move menu entry pixmap to new location +%{__mkdir_p} %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/ +%{__mv} %{buildroot}%{_datadir}/pixmaps/djvu.png \ + %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/djvu.png + %clean %{__rm} -rf %{buildroot} @@ -56,35 +61,49 @@ %post /sbin/ldconfig +gtk-update-icon-cache -q -f %{_datadir}/icons/hicolor || : update-desktop-database /usr/share/applications || : %postun /sbin/ldconfig +gtk-update-icon-cache -q -f %{_datadir}/icons/hicolor || : update-desktop-database /usr/share/applications || : %files %defattr(-, root, root, 0755) -%doc README COPYRIGHT COPYING NEWS TODO doc +%doc README COPYRIGHT COPYING NEWS TODO doc/ %{_bindir}/* -%{_includedir}/libdjvu/ -%exclude %{_libdir}/*.la -%{_libdir}/*.so* -%{_libdir}/*/plugins/*.so +%{_libdir}/*.so.* +%{_libdir}/mozilla/plugins/nsdejavu.so %{_datadir}/application-registry/djvu.applications %{_datadir}/applications/djview.desktop +%{_datadir}/icons/hicolor/??x??/apps/djvu.png %{_datadir}/icons/hicolor/??x??/mimetypes/djvu.png -%{_datadir}/mime-info/djvu.* -%{_datadir}/mimelnk/image/x-djvu.desktop %{_datadir}/djvu/ -%{_datadir}/pixmaps/djvu.png +%{_datadir}/mime-info/djvu.* %{_mandir}/man1/* %lang(ja) %{_mandir}/ja/man1/* +#files devel +#defattr(-, root, root, 0755) +%{_includedir}/libdjvu/ +%exclude %{_libdir}/*.la +%{_libdir}/*.so + %changelog -* Fri Apr 7 2005 Michael Schwendt -- rebuilt +* Thu Aug 4 2005 Matthias Saou 3.5.15-1 +- Update to 3.5.15. +- Move desktop icon to datadir/icons/hicolor. +- Add gtk-update-icon-cache calls for the new icon. +- Move browser plugin from netscape to mozilla directory instead of symlinking. +- Clean build requirements and add libtiff-devel. +- Add redhat-menus build req since it owns /etc/xdg/menus/applications.menu, + which the configure script checks to install the desktop file. + +* Tue May 3 2005 David Woodhouse 3.5.14-6 +- Remove files that were installed only for older KDE versions. * Mon Feb 14 2005 David Woodhouse 3.5.14-4 - Include %%{_datadir}/mimelnk/image/x-djvu.desktop Index: sources =================================================================== RCS file: /cvs/extras/rpms/djvulibre/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 9 Nov 2004 02:45:25 -0000 1.4 +++ sources 4 Aug 2005 18:10:09 -0000 1.5 @@ -1 +1 @@ -a9b60d0c47d6b98e321100d329c7f3b3 djvulibre-3.5.14.tar.gz +4a4c5a36799e73bd93afc4fa5d69b315 djvulibre-3.5.15.tar.gz From fedora-extras-commits at redhat.com Thu Aug 4 18:10:12 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Thu, 4 Aug 2005 14:10:12 -0400 Subject: rpms/djvulibre/devel .cvsignore, 1.4, 1.5 djvulibre.spec, 1.8, 1.9 sources, 1.4, 1.5 Message-ID: <200508041810.j74IACxK023031@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/djvulibre/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22973/devel Modified Files: .cvsignore djvulibre.spec sources Log Message: Update to 3.5.15 which fixes some build issues on FC-4, and fix the remaining. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/djvulibre/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 9 Nov 2004 02:45:25 -0000 1.4 +++ .cvsignore 4 Aug 2005 18:10:10 -0000 1.5 @@ -1 +1 @@ -djvulibre-3.5.14.tar.gz +djvulibre-3.5.15.tar.gz Index: djvulibre.spec =================================================================== RCS file: /cvs/extras/rpms/djvulibre/devel/djvulibre.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- djvulibre.spec 6 Apr 2005 22:11:36 -0000 1.8 +++ djvulibre.spec 4 Aug 2005 18:10:10 -0000 1.9 @@ -1,15 +1,14 @@ Summary: DjVu viewers, encoders and utilities Name: djvulibre -Version: 3.5.14 -Release: 5 - +Version: 3.5.15 +Release: 1%{?dist} License: GPL Group: Applications/Publishing -URL: http://djvu.sourceforge.net/ +URL: http://djvulibre.djvuzone.org/ Source: http://dl.sf.net/djvu/djvulibre-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -BuildRequires: XFree86-devel, qt-devel, libjpeg-devel -BuildRequires: libstdc++-devel, gcc-c++, mozilla +BuildRequires: xorg-x11-devel, qt-devel, libjpeg-devel, libtiff-devel +BuildRequires: mozilla, redhat-menus # Provide these here, they're so small, it's not worth splitting them out Provides: mozilla-djvulibre = %{version}-%{release} Provides: djvulibre-devel = %{version}-%{release} @@ -42,13 +41,19 @@ %install %{__rm} -rf %{buildroot} %makeinstall -%{__mkdir_p} %{buildroot}%{_libdir}/mozilla/plugins -%{__ln_s} ../../netscape/plugins/nsdejavu.so \ - %{buildroot}%{_libdir}/mozilla/plugins/ +# Move plugin from the netscape directory to the main mozilla one +%{__mkdir_p} %{buildroot}%{_libdir}/mozilla/plugins/ +%{__mv} %{buildroot}%{_libdir}/netscape/plugins/nsdejavu.so \ + %{buildroot}%{_libdir}/mozilla/plugins/nsdejavu.so -# Fix for the libs to get stripped correctly (debuginfo) +# Fix for the libs to get stripped correctly (still required in 3.5.15) find %{buildroot}%{_libdir} -name '*.so*' | xargs %{__chmod} +x +# Move menu entry pixmap to new location +%{__mkdir_p} %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/ +%{__mv} %{buildroot}%{_datadir}/pixmaps/djvu.png \ + %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/djvu.png + %clean %{__rm} -rf %{buildroot} @@ -56,35 +61,49 @@ %post /sbin/ldconfig +gtk-update-icon-cache -q -f %{_datadir}/icons/hicolor || : update-desktop-database /usr/share/applications || : %postun /sbin/ldconfig +gtk-update-icon-cache -q -f %{_datadir}/icons/hicolor || : update-desktop-database /usr/share/applications || : %files %defattr(-, root, root, 0755) -%doc README COPYRIGHT COPYING NEWS TODO doc +%doc README COPYRIGHT COPYING NEWS TODO doc/ %{_bindir}/* -%{_includedir}/libdjvu/ -%exclude %{_libdir}/*.la -%{_libdir}/*.so* -%{_libdir}/*/plugins/*.so +%{_libdir}/*.so.* +%{_libdir}/mozilla/plugins/nsdejavu.so %{_datadir}/application-registry/djvu.applications %{_datadir}/applications/djview.desktop +%{_datadir}/icons/hicolor/??x??/apps/djvu.png %{_datadir}/icons/hicolor/??x??/mimetypes/djvu.png -%{_datadir}/mime-info/djvu.* -%{_datadir}/mimelnk/image/x-djvu.desktop %{_datadir}/djvu/ -%{_datadir}/pixmaps/djvu.png +%{_datadir}/mime-info/djvu.* %{_mandir}/man1/* %lang(ja) %{_mandir}/ja/man1/* +#files devel +#defattr(-, root, root, 0755) +%{_includedir}/libdjvu/ +%exclude %{_libdir}/*.la +%{_libdir}/*.so + %changelog -* Fri Apr 7 2005 Michael Schwendt -- rebuilt +* Thu Aug 4 2005 Matthias Saou 3.5.15-1 +- Update to 3.5.15. +- Move desktop icon to datadir/icons/hicolor. +- Add gtk-update-icon-cache calls for the new icon. +- Move browser plugin from netscape to mozilla directory instead of symlinking. +- Clean build requirements and add libtiff-devel. +- Add redhat-menus build req since it owns /etc/xdg/menus/applications.menu, + which the configure script checks to install the desktop file. + +* Tue May 3 2005 David Woodhouse 3.5.14-6 +- Remove files that were installed only for older KDE versions. * Mon Feb 14 2005 David Woodhouse 3.5.14-4 - Include %%{_datadir}/mimelnk/image/x-djvu.desktop Index: sources =================================================================== RCS file: /cvs/extras/rpms/djvulibre/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 9 Nov 2004 02:45:25 -0000 1.4 +++ sources 4 Aug 2005 18:10:10 -0000 1.5 @@ -1 +1 @@ -a9b60d0c47d6b98e321100d329c7f3b3 djvulibre-3.5.14.tar.gz +4a4c5a36799e73bd93afc4fa5d69b315 djvulibre-3.5.15.tar.gz From fedora-extras-commits at redhat.com Thu Aug 4 18:19:45 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Thu, 4 Aug 2005 14:19:45 -0400 Subject: rpms/djvulibre/FC-4 djvulibre.spec,1.9,1.10 Message-ID: <200508041819.j74IJj4I023075@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/djvulibre/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23046/FC-4 Modified Files: djvulibre.spec Log Message: Remove _smp_mflags and add OPTS= (#156208). Index: djvulibre.spec =================================================================== RCS file: /cvs/extras/rpms/djvulibre/FC-4/djvulibre.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- djvulibre.spec 4 Aug 2005 18:10:09 -0000 1.9 +++ djvulibre.spec 4 Aug 2005 18:19:43 -0000 1.10 @@ -35,7 +35,8 @@ %build %configure -%{__make} %{?_smp_mflags} +# In 3.5.14 %{?_smp_mflags} broke the build +%{__make} OPTS="%{optflags}" %install @@ -101,6 +102,7 @@ - Clean build requirements and add libtiff-devel. - Add redhat-menus build req since it owns /etc/xdg/menus/applications.menu, which the configure script checks to install the desktop file. +- Add OPTS to the make line (#156208 - Michael Schwendt). * Tue May 3 2005 David Woodhouse 3.5.14-6 - Remove files that were installed only for older KDE versions. From fedora-extras-commits at redhat.com Thu Aug 4 18:19:45 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Thu, 4 Aug 2005 14:19:45 -0400 Subject: rpms/djvulibre/devel djvulibre.spec,1.9,1.10 Message-ID: <200508041819.j74IJjRN023079@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/djvulibre/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23046/devel Modified Files: djvulibre.spec Log Message: Remove _smp_mflags and add OPTS= (#156208). Index: djvulibre.spec =================================================================== RCS file: /cvs/extras/rpms/djvulibre/devel/djvulibre.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- djvulibre.spec 4 Aug 2005 18:10:10 -0000 1.9 +++ djvulibre.spec 4 Aug 2005 18:19:43 -0000 1.10 @@ -35,7 +35,8 @@ %build %configure -%{__make} %{?_smp_mflags} +# In 3.5.14 %{?_smp_mflags} broke the build +%{__make} OPTS="%{optflags}" %install @@ -101,6 +102,7 @@ - Clean build requirements and add libtiff-devel. - Add redhat-menus build req since it owns /etc/xdg/menus/applications.menu, which the configure script checks to install the desktop file. +- Add OPTS to the make line (#156208 - Michael Schwendt). * Tue May 3 2005 David Woodhouse 3.5.14-6 - Remove files that were installed only for older KDE versions. From fedora-extras-commits at redhat.com Thu Aug 4 19:38:55 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Thu, 4 Aug 2005 15:38:55 -0400 Subject: rpms/djvulibre/devel djvulibre-3.5.15-gcc401.patch, NONE, 1.1 djvulibre.spec, 1.10, 1.11 Message-ID: <200508041938.j74JctqL024501@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/djvulibre/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24481 Modified Files: djvulibre.spec Added Files: djvulibre-3.5.15-gcc401.patch Log Message: Fixes for gcc 4.0.1 and mimetypes files install. djvulibre-3.5.15-gcc401.patch: --- NEW FILE djvulibre-3.5.15-gcc401.patch --- =================================================================== RCS file: /cvsroot/djvu/djvulibre-3.5/libdjvu/GString.h,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- djvulibre-3.5/libdjvu/GString.h 2004/08/06 15:11:29 1.19 +++ djvulibre-3.5/libdjvu/GString.h 2005/07/22 15:28:07 1.20 @@ -138,6 +138,10 @@ # endif #endif +class GBaseString; +class GUTF8String; +class GNativeString; + // Internal string representation. class GStringRep : public GPEnabled { @@ -433,8 +437,6 @@ virtual unsigned long getValidUCS4(const char *&source) const; }; -class GUTF8String; -class GNativeString; /** General purpose character string. Each dirivied instance of class #GBaseString# represents a Index: djvulibre.spec =================================================================== RCS file: /cvs/extras/rpms/djvulibre/devel/djvulibre.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- djvulibre.spec 4 Aug 2005 18:19:43 -0000 1.10 +++ djvulibre.spec 4 Aug 2005 19:38:52 -0000 1.11 @@ -1,14 +1,15 @@ Summary: DjVu viewers, encoders and utilities Name: djvulibre Version: 3.5.15 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Applications/Publishing URL: http://djvulibre.djvuzone.org/ Source: http://dl.sf.net/djvu/djvulibre-%{version}.tar.gz +Patch0: djvulibre-3.5.15-gcc401.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: xorg-x11-devel, qt-devel, libjpeg-devel, libtiff-devel -BuildRequires: mozilla, redhat-menus +BuildRequires: mozilla, redhat-menus, hicolor-icon-theme # Provide these here, they're so small, it's not worth splitting them out Provides: mozilla-djvulibre = %{version}-%{release} Provides: djvulibre-devel = %{version}-%{release} @@ -31,6 +32,7 @@ %prep %setup +%patch0 -p1 -b .gcc401 %build @@ -94,6 +96,11 @@ %changelog +* Thu Aug 4 2005 Matthias Saou 3.5.15-2 +- Include djvulibre-3.5.15-gcc401.patch to fix compilation with gcc 4.0.1. +- Add hicolor-icon-theme build req for /usr/share/icons/hicolor/48x48/mimetypes + to exist. + * Thu Aug 4 2005 Matthias Saou 3.5.15-1 - Update to 3.5.15. - Move desktop icon to datadir/icons/hicolor. From fedora-extras-commits at redhat.com Thu Aug 4 19:53:21 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Thu, 4 Aug 2005 15:53:21 -0400 Subject: rpms/djvulibre/FC-4 djvulibre-3.5.15-gcc401.patch, NONE, 1.1 djvulibre.spec, 1.10, 1.11 Message-ID: <200508041953.j74JrLfB024603@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/djvulibre/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24583 Modified Files: djvulibre.spec Added Files: djvulibre-3.5.15-gcc401.patch Log Message: Fixes for gcc 4.0.1 and mimetypes files install. djvulibre-3.5.15-gcc401.patch: --- NEW FILE djvulibre-3.5.15-gcc401.patch --- =================================================================== RCS file: /cvsroot/djvu/djvulibre-3.5/libdjvu/GString.h,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- djvulibre-3.5/libdjvu/GString.h 2004/08/06 15:11:29 1.19 +++ djvulibre-3.5/libdjvu/GString.h 2005/07/22 15:28:07 1.20 @@ -138,6 +138,10 @@ # endif #endif +class GBaseString; +class GUTF8String; +class GNativeString; + // Internal string representation. class GStringRep : public GPEnabled { @@ -433,8 +437,6 @@ virtual unsigned long getValidUCS4(const char *&source) const; }; -class GUTF8String; -class GNativeString; /** General purpose character string. Each dirivied instance of class #GBaseString# represents a Index: djvulibre.spec =================================================================== RCS file: /cvs/extras/rpms/djvulibre/FC-4/djvulibre.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- djvulibre.spec 4 Aug 2005 18:19:43 -0000 1.10 +++ djvulibre.spec 4 Aug 2005 19:53:19 -0000 1.11 @@ -1,14 +1,15 @@ Summary: DjVu viewers, encoders and utilities Name: djvulibre Version: 3.5.15 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Applications/Publishing URL: http://djvulibre.djvuzone.org/ Source: http://dl.sf.net/djvu/djvulibre-%{version}.tar.gz +Patch0: djvulibre-3.5.15-gcc401.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: xorg-x11-devel, qt-devel, libjpeg-devel, libtiff-devel -BuildRequires: mozilla, redhat-menus +BuildRequires: mozilla, redhat-menus, hicolor-icon-theme # Provide these here, they're so small, it's not worth splitting them out Provides: mozilla-djvulibre = %{version}-%{release} Provides: djvulibre-devel = %{version}-%{release} @@ -31,6 +32,7 @@ %prep %setup +%patch0 -p1 -b .gcc401 %build @@ -94,6 +96,11 @@ %changelog +* Thu Aug 4 2005 Matthias Saou 3.5.15-2 +- Include djvulibre-3.5.15-gcc401.patch to fix compilation with gcc 4.0.1. +- Add hicolor-icon-theme build req for /usr/share/icons/hicolor/48x48/mimetypes + to exist. + * Thu Aug 4 2005 Matthias Saou 3.5.15-1 - Update to 3.5.15. - Move desktop icon to datadir/icons/hicolor. From fedora-extras-commits at redhat.com Thu Aug 4 20:24:08 2005 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Thu, 4 Aug 2005 16:24:08 -0400 Subject: extras-buildsys README,1.9,1.10 Message-ID: <200508042024.j74KO8LC025934@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25909 Modified Files: README Log Message: fix url for mock Index: README =================================================================== RCS file: /cvs/fedora/extras-buildsys/README,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- README 15 Jul 2005 01:23:15 -0000 1.9 +++ README 4 Aug 2005 20:24:06 -0000 1.10 @@ -4,7 +4,7 @@ - Python 2.3 or 2.4 - pyOpenSSL - sqlite python bindings - - mock (http://linux.duke.edu/~skvidal/mock/) + - mock (http://fedoraproject.org/wiki/Projects/Mock/) - createrepo Getting Started From fedora-extras-commits at redhat.com Thu Aug 4 20:27:14 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 4 Aug 2005 16:27:14 -0400 Subject: extras-buildsys/client client.py,1.22,1.23 Message-ID: <200508042027.j74KREU2026246@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/client In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26158/client Modified Files: client.py Log Message: 2005-08-04 Dan Williams * Attempts to reduce network bandwidth usage between client & server - for listing jobs, 'status' item in the arg list is now a list itself which is combined using OR. - New 'orderby' arg for listing jobs - Fixes for both of the above in the web interface, the client, and the server * Small fixes to the web interface to display 'result' as well as 'status' Index: client.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/client/client.py,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- client.py 3 Aug 2005 04:36:58 -0000 1.22 +++ client.py 4 Aug 2005 20:27:11 -0000 1.23 @@ -125,6 +125,8 @@ print "Error: invalid option '%s'" % arg return else: + if cmd == 'status': + arg = [arg] query_args[cmd] = arg cmd = '' From fedora-extras-commits at redhat.com Thu Aug 4 20:27:13 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 4 Aug 2005 16:27:13 -0400 Subject: extras-buildsys ChangeLog,1.87,1.88 Message-ID: <200508042027.j74KRDdM026236@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26158 Modified Files: ChangeLog Log Message: 2005-08-04 Dan Williams * Attempts to reduce network bandwidth usage between client & server - for listing jobs, 'status' item in the arg list is now a list itself which is combined using OR. - New 'orderby' arg for listing jobs - Fixes for both of the above in the web interface, the client, and the server * Small fixes to the web interface to display 'result' as well as 'status' Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.87 retrieving revision 1.88 diff -u -r1.87 -r1.88 --- ChangeLog 4 Aug 2005 11:47:06 -0000 1.87 +++ ChangeLog 4 Aug 2005 20:27:11 -0000 1.88 @@ -1,5 +1,16 @@ 2005-08-04 Dan Williams + * Attempts to reduce network bandwidth usage between client & server + - for listing jobs, 'status' item in the arg list is now a list itself + which is combined using OR. + - New 'orderby' arg for listing jobs + - Fixes for both of the above in the web interface, the client, + and the server + + * Small fixes to the web interface to display 'result' as well as 'status' + +2005-08-04 Dan Williams + * server/PackageJob.py - Clean up job files when the job is done. We now only keep logs and 1 SRPM in 'server_work_dir', the RPMs From fedora-extras-commits at redhat.com Thu Aug 4 20:27:14 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 4 Aug 2005 16:27:14 -0400 Subject: extras-buildsys/server PackageJob.py, 1.17, 1.18 UserInterface.py, 1.39, 1.40 Message-ID: <200508042027.j74KREHH026254@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26158/server Modified Files: PackageJob.py UserInterface.py Log Message: 2005-08-04 Dan Williams * Attempts to reduce network bandwidth usage between client & server - for listing jobs, 'status' item in the arg list is now a list itself which is combined using OR. - New 'orderby' arg for listing jobs - Fixes for both of the above in the web interface, the client, and the server * Small fixes to the web interface to display 'result' as well as 'status' Index: PackageJob.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/PackageJob.py,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- PackageJob.py 4 Aug 2005 11:47:07 -0000 1.17 +++ PackageJob.py 4 Aug 2005 20:27:12 -0000 1.18 @@ -549,8 +549,7 @@ # the original SRPM. if not os.path.exists(srpm_file): shutil.copy(src_file, srpm_file) - else: - os.remove(src_file) + os.remove(src_file) # If there were no builder-built SRPMs, keep the original around if not os.path.exists(srpm_file): Index: UserInterface.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/UserInterface.py,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- UserInterface.py 3 Aug 2005 04:32:40 -0000 1.39 +++ UserInterface.py 4 Aug 2005 20:27:12 -0000 1.40 @@ -71,6 +71,11 @@ return False return True +def validate_orderby(order): + safe_list = ['username', 'status', 'result', 'uid', 'target', 'starttime', 'endtime', 'package'] + if order in safe_list: + return True + return False class InvalidTargetError(exceptions.Exception): pass @@ -224,11 +229,19 @@ return (-1, "Error: Invalid email address.", []) if args_dict.has_key('status') and args_dict['status']: - status = args_dict['status'] - if PackageJob.is_package_job_stage_valid(status): - sql_args.append('status="%s"' % status) - else: + status_list = args_dict['status'] + if not len(status_list): return (-1, "Error: Invalid job status.", []) + status_sql = '' + for status in status_list: + if not PackageJob.is_package_job_stage_valid(status): + return (-1, "Error: Invalid job status.", []) + if len(status_sql) > 0: + status_sql = status_sql + ' OR status="%s"' % status + else: + status_sql = 'status="%s"' % status + status_sql = '(' + status_sql + ')' + sql_args.append(status_sql) if args_dict.has_key('result') and args_dict['result']: result = args_dict['result'] @@ -273,7 +286,23 @@ sql = sql + " AND " i = i + 1 + # Result list order + if args_dict.has_key('orderby') and args_dict['orderby']: + orderby_list = args_dict['orderby'] + if not len(orderby_list): + return (-1, "Error: Invalid result order.", []) + orderby_sql = '' + for order in orderby_list: + if not validate_orderby(order): + return (-1, "Error: Invalid result order.", []) + if len(orderby_sql) > 0: + orderby_sql = orderby_sql + ', %s' % order + else: + orderby_sql = order + sql = sql + " ORDER BY %s" % orderby_sql + # Deal with max # records + # MUST BE LAST ON SQL if args_dict.has_key('maxrows') and args_dict['maxrows']: if not validate_uid(args_dict['maxrows']): return (-1, "Error: Invalid max rows number.", []) From fedora-extras-commits at redhat.com Thu Aug 4 20:27:15 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 4 Aug 2005 16:27:15 -0400 Subject: extras-buildsys/www builders.psp, 1.4, 1.5 failed.psp, 1.1, 1.2 index.psp, 1.5, 1.6 indiv.psp, 1.4, 1.5 job.psp, 1.4, 1.5 success.psp, 1.1, 1.2 Message-ID: <200508042027.j74KRFG2026263@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/www In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26158/www Modified Files: builders.psp failed.psp index.psp indiv.psp job.psp success.psp Log Message: 2005-08-04 Dan Williams * Attempts to reduce network bandwidth usage between client & server - for listing jobs, 'status' item in the arg list is now a list itself which is combined using OR. - New 'orderby' arg for listing jobs - Fixes for both of the above in the web interface, the client, and the server * Small fixes to the web interface to display 'result' as well as 'status' Index: builders.psp =================================================================== RCS file: /cvs/fedora/extras-buildsys/www/builders.psp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- builders.psp 29 Jul 2005 06:55:56 -0000 1.4 +++ builders.psp 4 Aug 2005 20:27:12 -0000 1.5 @@ -13,7 +13,7 @@ import socket, xmlrpclib args = {} -args['status'] = 'building' +args['status'] = ['building'] try: (e, msg, jobs) = server.list_jobs(args) (e, msg, builders) = server.list_builders() Index: failed.psp =================================================================== RCS file: /cvs/fedora/extras-buildsys/www/failed.psp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- failed.psp 4 Aug 2005 06:51:25 -0000 1.1 +++ failed.psp 4 Aug 2005 20:27:12 -0000 1.2 @@ -9,7 +9,10 @@ import socket, xmlrpclib try: args = {} - args['status'] = 'failed' + # Don't show finished/failed jobs, just ones packagers + # haven't cleared yet. + args['status'] = ['failed'] + args['result'] = 'failed' args['maxrows'] = 100 (e, msg, these_jobs) = server.list_jobs(args) except socket.error, e: @@ -81,7 +84,7 @@ if i == 1: %>
- + <% # endif Index: index.psp =================================================================== RCS file: /cvs/fedora/extras-buildsys/www/index.psp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- index.psp 29 Jul 2005 05:25:23 -0000 1.5 +++ index.psp 4 Aug 2005 20:27:12 -0000 1.6 @@ -9,11 +9,10 @@ import socket, xmlrpclib try: args = {} - args['status'] = 'waiting' + args['status'] = ['waiting', 'building'] args['maxrows'] = 30 - (e, msg, waiting_jobs) = server.list_jobs(args) - args['status'] = 'building' - (e, msg, building_jobs) = server.list_jobs(args) + args['orderby'] = ['status', 'uid'] + (e, msg, jobs) = server.list_jobs(args) except socket.error, e: msg = str(e) %> @@ -50,36 +49,7 @@ <% i = 1 - for job in building_jobs: - top = '' - if i == 1: - top = '-top' - col_mod = '' - if int(i / 2.0) == (i / 2.0): - col_mod = '-alt' - - source = job['source'] - if '/' in source: - import os - source = os.path.basename(source) - # endif - - joblink = job_link(job['uid']) - username = job['username'].replace('@', ' ') -%> - - - - - - - - -<% - i = i + 1 - # endfor - - for job in waiting_jobs: + for job in jobs: top = '' if i == 1: top = '-top' @@ -112,7 +82,7 @@ if i == 1: %> - + <% # endif Index: indiv.psp =================================================================== RCS file: /cvs/fedora/extras-buildsys/www/indiv.psp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- indiv.psp 2 Aug 2005 04:10:33 -0000 1.4 +++ indiv.psp 4 Aug 2005 20:27:12 -0000 1.5 @@ -23,7 +23,10 @@ if form.has_key('status') and form['status']: cur_status = str(form['status']) if cur_status != 'ALL': - args['status'] = cur_status + if cur_status == 'failed' or cur_status == 'success': + args['result'] = cur_status + else: + args['status'] = [cur_status] cur_target = '' if form.has_key('target') and form['target']: cur_target = str(form['target']) @@ -53,7 +56,7 @@ # default cutoff is 1 day cutoff_time = 86400 - status_list = ['ALL', 'waiting', 'building', 'addtorepo', 'needsign', 'failed', 'finished'] + status_list = ['ALL', 'waiting', 'building', 'add_to_repo', 'needsign', 'failed', 'success'] %> @@ -143,7 +146,7 @@ - + <% Index: job.psp =================================================================== RCS file: /cvs/fedora/extras-buildsys/www/job.psp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- job.psp 29 Jul 2005 05:27:16 -0000 1.4 +++ job.psp 4 Aug 2005 20:27:12 -0000 1.5 @@ -88,11 +88,9 @@ From fedora-extras-commits at redhat.com Thu Aug 4 21:12:44 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 4 Aug 2005 17:12:44 -0400 Subject: extras-buildsys/server UserInterface.py,1.40,1.41 Message-ID: <200508042113.j74LDE07030615@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30502/server Modified Files: UserInterface.py Log Message: 2005-08-04 Dan Williams * server/UserInterface.py - Accept asc/desc ordering in addition to field order. You now do e.x.: args['orderby'] = ['package asc', 'endtime desc'] * www/indiv.psp - Stick in-progress jobs at the top of the list * www/template/head.psp - Keep user's email address through the success/failed pages Index: UserInterface.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/UserInterface.py,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- UserInterface.py 4 Aug 2005 20:27:12 -0000 1.40 +++ UserInterface.py 4 Aug 2005 21:12:42 -0000 1.41 @@ -293,12 +293,22 @@ return (-1, "Error: Invalid result order.", []) orderby_sql = '' for order in orderby_list: - if not validate_orderby(order): - return (-1, "Error: Invalid result order.", []) + direction = '' + try: + field, direction = order.split() + direction = direction.upper() + if direction != 'ASC' and direction != "DESC": + return (-1, "Error: Invalid result order '%s'." % order, []) + except ValueError: + field = order + if not validate_orderby(field): + return (-1, "Error: Invalid result order field '%s'." % field, []) if len(orderby_sql) > 0: - orderby_sql = orderby_sql + ', %s' % order + orderby_sql = orderby_sql + ', %s' % field else: - orderby_sql = order + orderby_sql = field + if len(direction) > 0: + orderby_sql = orderby_sql + ' %s' % direction sql = sql + " ORDER BY %s" % orderby_sql # Deal with max # records From fedora-extras-commits at redhat.com Thu Aug 4 21:12:44 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 4 Aug 2005 17:12:44 -0400 Subject: extras-buildsys ChangeLog,1.88,1.89 Message-ID: <200508042113.j74LDE7F030612@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30502 Modified Files: ChangeLog Log Message: 2005-08-04 Dan Williams * server/UserInterface.py - Accept asc/desc ordering in addition to field order. You now do e.x.: args['orderby'] = ['package asc', 'endtime desc'] * www/indiv.psp - Stick in-progress jobs at the top of the list * www/template/head.psp - Keep user's email address through the success/failed pages Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.88 retrieving revision 1.89 diff -u -r1.88 -r1.89 --- ChangeLog 4 Aug 2005 20:27:11 -0000 1.88 +++ ChangeLog 4 Aug 2005 21:12:42 -0000 1.89 @@ -1,5 +1,17 @@ 2005-08-04 Dan Williams + * server/UserInterface.py + - Accept asc/desc ordering in addition to field order. You now + do e.x.: args['orderby'] = ['package asc', 'endtime desc'] + + * www/indiv.psp + - Stick in-progress jobs at the top of the list + + * www/template/head.psp + - Keep user's email address through the success/failed pages + +2005-08-04 Dan Williams + * Attempts to reduce network bandwidth usage between client & server - for listing jobs, 'status' item in the arg list is now a list itself which is combined using OR. From fedora-extras-commits at redhat.com Thu Aug 4 21:12:50 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 4 Aug 2005 17:12:50 -0400 Subject: extras-buildsys/www failed.psp, 1.2, 1.3 indiv.psp, 1.5, 1.6 success.psp, 1.2, 1.3 Message-ID: <200508042113.j74LDKru030620@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/www In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30502/www Modified Files: failed.psp indiv.psp success.psp Log Message: 2005-08-04 Dan Williams * server/UserInterface.py - Accept asc/desc ordering in addition to field order. You now do e.x.: args['orderby'] = ['package asc', 'endtime desc'] * www/indiv.psp - Stick in-progress jobs at the top of the list * www/template/head.psp - Keep user's email address through the success/failed pages Index: failed.psp =================================================================== RCS file: /cvs/fedora/extras-buildsys/www/failed.psp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- failed.psp 4 Aug 2005 20:27:12 -0000 1.2 +++ failed.psp 4 Aug 2005 21:12:47 -0000 1.3 @@ -13,6 +13,7 @@ # haven't cleared yet. args['status'] = ['failed'] args['result'] = 'failed' + args['orderby'] = ['endtime desc'] args['maxrows'] = 100 (e, msg, these_jobs) = server.list_jobs(args) except socket.error, e: Index: indiv.psp =================================================================== RCS file: /cvs/fedora/extras-buildsys/www/indiv.psp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- indiv.psp 4 Aug 2005 20:27:12 -0000 1.5 +++ indiv.psp 4 Aug 2005 21:12:47 -0000 1.6 @@ -32,6 +32,8 @@ cur_target = str(form['target']) if cur_target != 'ALL': args['target'] = cur_target + + args['orderby'] = ['endtime desc'] try: (e, msg, jobs) = server.list_jobs(args) targets = server.targets() @@ -121,6 +123,16 @@ <% + # Stick in-progress jobs at the top + inprog_jobs = [] + finished_jobs = [] + for job in jobs: + if job['result'] == 'in-progress': + inprog_jobs.append(job) + else: + finished_jobs.append(job) + jobs = inprog_jobs + finished_jobs + i = 1 for job in jobs: # Don't show finished jobs older than 1 day Index: success.psp =================================================================== RCS file: /cvs/fedora/extras-buildsys/www/success.psp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- success.psp 4 Aug 2005 20:27:12 -0000 1.2 +++ success.psp 4 Aug 2005 21:12:47 -0000 1.3 @@ -10,13 +10,10 @@ try: # show any jobs that have successfully built args = {} - args['result'] = 'success' + args['status'] = ['add_to_repo', 'needsign', 'repodone'] + args['orderby'] = ['endtime desc'] args['maxrows'] = 100 - (e, msg, some_jobs) = server.list_jobs(args) - args['status'] = ['add_to_repo'] - args['maxrows'] = 100 - (e, msg, other_jobs) = server.list_jobs(args) - these_jobs = other_jobs + some_jobs + (e, msg, jobs) = server.list_jobs(args) except socket.error, e: msg = str(e) %> @@ -53,7 +50,7 @@ <% i = 1 - for job in these_jobs: + for job in jobs: top = '' if i == 1: top = '-top' From fedora-extras-commits at redhat.com Thu Aug 4 21:12:50 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 4 Aug 2005 17:12:50 -0400 Subject: extras-buildsys/www/css style.css,1.5,1.6 Message-ID: <200508042113.j74LDKvt030623@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/www/css In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30502/www/css Modified Files: style.css Log Message: 2005-08-04 Dan Williams * server/UserInterface.py - Accept asc/desc ordering in addition to field order. You now do e.x.: args['orderby'] = ['package asc', 'endtime desc'] * www/indiv.psp - Stick in-progress jobs at the top of the list * www/template/head.psp - Keep user's email address through the success/failed pages Index: style.css =================================================================== RCS file: /cvs/fedora/extras-buildsys/www/css/style.css,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- style.css 4 Aug 2005 20:27:13 -0000 1.5 +++ style.css 4 Aug 2005 21:12:48 -0000 1.6 @@ -183,6 +183,12 @@ padding: 4px; } +font.status-waiting { + color: #00aaaa; + font-weight: bold; + font-size: 12px; +} + font.status-failed { color: #aa0000; font-weight: bold; From tcallawa at redhat.com Thu Aug 4 21:18:38 2005 From: tcallawa at redhat.com (Tom 'spot' Callaway) Date: Thu, 04 Aug 2005 16:18:38 -0500 Subject: APPROVAL: stripesnoop Message-ID: <1123190318.2613.42.camel@localhost.localdomain> stripesnoop: Stripe Snoop is a suite of research tools that captures, modifies, validates, generates, analyzes, and shares data from magstripe cards. Numerous readers are supported to gather this information. In addition to simply displaying the raw characters that are encoded on the card, Stripe Snoop has a database of known card formats. It uses this to give you more detailed information about the card. Reviewer: Chris Grau Maintainer: Tom 'spot' Callaway ~spot -- Tom "spot" Callaway: Red Hat Senior Sales Engineer || GPG ID: 93054260 Fedora Extras Steering Committee Member (RPM Standards and Practices) Aurora Linux Project Leader: http://auroralinux.org Lemurs, llamas, and sparcs, oh my! From fedora-extras-commits at redhat.com Thu Aug 4 21:51:52 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 4 Aug 2005 17:51:52 -0400 Subject: rpms/stripesnoop/devel stripesnoop-1.5-asmio.patch, NONE, 1.1 stripesnoop.spec, 1.1, 1.2 Message-ID: <200508042151.j74LpqcZ031337@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/stripesnoop/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31281/devel Modified Files: stripesnoop.spec Added Files: stripesnoop-1.5-asmio.patch Log Message: Use asm/io.h to compile on ppc stripesnoop-1.5-asmio.patch: --- NEW FILE stripesnoop-1.5-asmio.patch --- --- stripesnoop-1.5/ss.cpp.BAD 2005-08-04 16:46:51.000000000 -0500 +++ stripesnoop-1.5/ss.cpp 2005-08-04 16:46:57.000000000 -0500 @@ -61,7 +61,7 @@ #endif #ifdef LINUX - #include + #include #include #define Inp32 inb #endif Index: stripesnoop.spec =================================================================== RCS file: /cvs/extras/rpms/stripesnoop/devel/stripesnoop.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- stripesnoop.spec 4 Aug 2005 21:11:59 -0000 1.1 +++ stripesnoop.spec 4 Aug 2005 21:51:50 -0000 1.2 @@ -1,6 +1,6 @@ Name: stripesnoop Version: 1.5 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Applications/System Summary: Magnetic Stripe Reader @@ -9,6 +9,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch0: stripesnoop-1.5-rpmoptflags.patch Patch1: stripesnoop-1.5-deflinux.patch +Patch2: stripesnoop-1.5-asmio.patch %description Stripe Snoop is a suite of research tools that captures, modifies, validates, @@ -30,6 +31,7 @@ %setup -q -c %{name}-%{version} %patch0 -p1 %patch1 -p1 +%patch2 -p1 chmod -x cards.txt ChangeLog.txt COPYING.txt README.txt visa-pre.txt \ hardware/* samples/* @@ -58,6 +60,9 @@ %{_includedir}/%{name} %changelog +* Thu Aug 4 2005 Tom "spot" Callaway 1.5-3 +- use asm/io.h to enable ppc to build + * Thu Aug 4 2005 Tom "spot" Callaway 1.5-2 - fix devel requires typo From fedora-extras-commits at redhat.com Thu Aug 4 21:51:47 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 4 Aug 2005 17:51:47 -0400 Subject: rpms/stripesnoop/FC-3 stripesnoop-1.5-asmio.patch, NONE, 1.1 stripesnoop.spec, 1.1, 1.2 Message-ID: <200508042152.j74LqHN7031340@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/stripesnoop/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31281/FC-3 Modified Files: stripesnoop.spec Added Files: stripesnoop-1.5-asmio.patch Log Message: Use asm/io.h to compile on ppc stripesnoop-1.5-asmio.patch: --- NEW FILE stripesnoop-1.5-asmio.patch --- --- stripesnoop-1.5/ss.cpp.BAD 2005-08-04 16:46:51.000000000 -0500 +++ stripesnoop-1.5/ss.cpp 2005-08-04 16:46:57.000000000 -0500 @@ -61,7 +61,7 @@ #endif #ifdef LINUX - #include + #include #include #define Inp32 inb #endif Index: stripesnoop.spec =================================================================== RCS file: /cvs/extras/rpms/stripesnoop/FC-3/stripesnoop.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- stripesnoop.spec 4 Aug 2005 21:11:59 -0000 1.1 +++ stripesnoop.spec 4 Aug 2005 21:51:44 -0000 1.2 @@ -1,6 +1,6 @@ Name: stripesnoop Version: 1.5 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Applications/System Summary: Magnetic Stripe Reader @@ -9,6 +9,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch0: stripesnoop-1.5-rpmoptflags.patch Patch1: stripesnoop-1.5-deflinux.patch +Patch2: stripesnoop-1.5-asmio.patch %description Stripe Snoop is a suite of research tools that captures, modifies, validates, @@ -30,6 +31,7 @@ %setup -q -c %{name}-%{version} %patch0 -p1 %patch1 -p1 +%patch2 -p1 chmod -x cards.txt ChangeLog.txt COPYING.txt README.txt visa-pre.txt \ hardware/* samples/* @@ -58,6 +60,9 @@ %{_includedir}/%{name} %changelog +* Thu Aug 4 2005 Tom "spot" Callaway 1.5-3 +- use asm/io.h to enable ppc to build + * Thu Aug 4 2005 Tom "spot" Callaway 1.5-2 - fix devel requires typo From fedora-extras-commits at redhat.com Thu Aug 4 21:51:47 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 4 Aug 2005 17:51:47 -0400 Subject: rpms/stripesnoop/FC-4 stripesnoop-1.5-asmio.patch, NONE, 1.1 stripesnoop.spec, 1.1, 1.2 Message-ID: <200508042152.j74LqHBb031343@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/stripesnoop/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31281/FC-4 Modified Files: stripesnoop.spec Added Files: stripesnoop-1.5-asmio.patch Log Message: Use asm/io.h to compile on ppc stripesnoop-1.5-asmio.patch: --- NEW FILE stripesnoop-1.5-asmio.patch --- --- stripesnoop-1.5/ss.cpp.BAD 2005-08-04 16:46:51.000000000 -0500 +++ stripesnoop-1.5/ss.cpp 2005-08-04 16:46:57.000000000 -0500 @@ -61,7 +61,7 @@ #endif #ifdef LINUX - #include + #include #include #define Inp32 inb #endif Index: stripesnoop.spec =================================================================== RCS file: /cvs/extras/rpms/stripesnoop/FC-4/stripesnoop.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- stripesnoop.spec 4 Aug 2005 21:11:59 -0000 1.1 +++ stripesnoop.spec 4 Aug 2005 21:51:45 -0000 1.2 @@ -1,6 +1,6 @@ Name: stripesnoop Version: 1.5 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Applications/System Summary: Magnetic Stripe Reader @@ -9,6 +9,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch0: stripesnoop-1.5-rpmoptflags.patch Patch1: stripesnoop-1.5-deflinux.patch +Patch2: stripesnoop-1.5-asmio.patch %description Stripe Snoop is a suite of research tools that captures, modifies, validates, @@ -30,6 +31,7 @@ %setup -q -c %{name}-%{version} %patch0 -p1 %patch1 -p1 +%patch2 -p1 chmod -x cards.txt ChangeLog.txt COPYING.txt README.txt visa-pre.txt \ hardware/* samples/* @@ -58,6 +60,9 @@ %{_includedir}/%{name} %changelog +* Thu Aug 4 2005 Tom "spot" Callaway 1.5-3 +- use asm/io.h to enable ppc to build + * Thu Aug 4 2005 Tom "spot" Callaway 1.5-2 - fix devel requires typo From fedora-extras-commits at redhat.com Thu Aug 4 22:29:33 2005 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Thu, 4 Aug 2005 18:29:33 -0400 Subject: rpms/gnumeric/devel gnumeric.spec,1.4,1.5 Message-ID: <200508042229.j74MTXYY032703@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/gnumeric/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32686 Modified Files: gnumeric.spec Log Message: remove unnescesarry buildrequires Index: gnumeric.spec =================================================================== RCS file: /cvs/extras/rpms/gnumeric/devel/gnumeric.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- gnumeric.spec 4 Jul 2005 08:42:06 -0000 1.4 +++ gnumeric.spec 4 Aug 2005 22:29:31 -0000 1.5 @@ -28,8 +28,6 @@ BuildRequires: intltool scrollkeeper gettext BuildRequires: libgnomedb-devel >= 1.0.4 BuildRequires: pango-devel >= 1.4.0 -BuildRequires: gtk2-devel >= 2.2.0 -BuildRequires: libart_lgpl-devel >= 2.3.0 BuildRequires: pygtk2-devel >= 2.6.0 Patch0: gnumeric-1.4.1-desktop.patch Patch1: gnumeric-1.4.1-excelcrash.patch @@ -143,6 +141,11 @@ %dir %{_libdir}/gnumeric/%{gnumeric_version} %changelog +* Fri Aug 5 2005 Hans de Goede 1.4.3-5 +- gtk2-devel and libart_lgpl-devel where not getting sucked in because + of a bug in another package this has been fixed now so the buildrequires + have been removed again. + * Mon Jul 4 2005 Hans de Goede 1.4.3-4 - For some reason gtk2-devel no longer gets sucked in by our other buildrequires so explicitly add it. From fedora-extras-commits at redhat.com Thu Aug 4 22:30:48 2005 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Thu, 4 Aug 2005 18:30:48 -0400 Subject: rpms/gnumeric/devel gnumeric.spec,1.5,1.6 Message-ID: <200508042230.j74MUmam032726@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/gnumeric/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32709 Modified Files: gnumeric.spec Log Message: remove unnescesarry buildrequires Index: gnumeric.spec =================================================================== RCS file: /cvs/extras/rpms/gnumeric/devel/gnumeric.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- gnumeric.spec 4 Aug 2005 22:29:31 -0000 1.5 +++ gnumeric.spec 4 Aug 2005 22:30:45 -0000 1.6 @@ -4,7 +4,7 @@ Summary: A spreadsheet program for GNOME. Name: gnumeric Version: 1.4.3 -Release: 4 +Release: 5 Epoch: 1 License: GPL Group: Applications/Productivity From fedora-extras-commits at redhat.com Fri Aug 5 02:30:30 2005 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Thu, 4 Aug 2005 22:30:30 -0400 Subject: rpms/exo/FC-4 exo-0.3.0-x86_64-build.patch, NONE, 1.1 exo.spec, 1.4, 1.5 Message-ID: <200508050230.j752UUtC006458@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/exo/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6436 Modified Files: exo.spec Added Files: exo-0.3.0-x86_64-build.patch Log Message: Forward port changes from devel branch and build exo-0.3.0-x86_64-build.patch: --- NEW FILE exo-0.3.0-x86_64-build.patch --- diff -Nur exo-0.3.0.orig/python/Makefile.in exo-0.3.0/python/Makefile.in --- exo-0.3.0.orig/python/Makefile.in 2005-03-13 11:40:09.000000000 -0700 +++ exo-0.3.0/python/Makefile.in 2005-06-02 21:28:00.000000000 -0600 @@ -261,8 +261,8 @@ defsdir = $(datadir)/pygtk/2.0/defs/exo-$(LIBEXO_VERSION_API) defs_DATA = exo.defs -pyexodir = $(pythondir) -pyexo_PYTHON = pyexo.py +pyexodir = $(pyexecdir) +pyexo_PYTHON = pyexo.py exomoduledir = $(pyexecdir)/exo-$(LIBEXO_VERSION_API)/exo exomodule_PYTHON = __init__.py exobindingsdir = $(pyexecdir)/exo-$(LIBEXO_VERSION_API) Index: exo.spec =================================================================== RCS file: /cvs/extras/rpms/exo/FC-4/exo.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- exo.spec 30 May 2005 19:13:30 -0000 1.4 +++ exo.spec 5 Aug 2005 02:30:28 -0000 1.5 @@ -1,10 +1,13 @@ +%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} + Summary: Application library for the Xfce desktop environment Name: exo Version: 0.3.0 -Release: 4 +Release: 9%{?dist} License: LGPL URL: http://libexo.os-cillation.com/ Source0: http://download.berlios.de/xfce-goodies/exo-0.3.0.tar.bz2 +Patch0: exo-0.3.0-x86_64-build.patch Group: Development/Libraries Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: libxfcegui4 >= 4.2.0 @@ -14,6 +17,7 @@ BuildRequires: gtk-doc BuildRequires: pygtk2-devel BuildRequires: gettext +BuildRequires: python-devel %description Extension library for Xfce, targeted at application development. @@ -30,6 +34,8 @@ %prep %setup -q +%patch0 -p1 -b x86_64-build + %build %configure --enable-gtk-doc make %{?_smp_mflags} @@ -60,10 +66,27 @@ %{_libdir}/lib*.so %{_libdir}/lib*a %{_libdir}/pkgconfig/*.pc -%{_libdir}/python*/site-packages %{_datadir}/pygtk/*/defs/exo-*/ +%{python_sitearch}/exo-* +%{python_sitearch}/pyexo.* %changelog +* Fri Aug 4 2005 Kevin Fenzi - 0.3.0-9.fc4 +- Forward port changes from devel branch and build + +* Mon Jun 20 2005 Kevin Fenzi - 0.3.0-8.fc4 +- Add patch to make x86_64 package build + +* Thu Jun 2 2005 Kevin Fenzi - 0.3.0-7.fc4 +- Change python_sitelib to python_sitearch + +* Tue May 31 2005 Kevin Fenzi - 0.3.0-6 +- Add python_sitelib to build on x86_64 +- Add dist to release + +* Tue May 31 2005 Kevin Fenzi - 0.3.0-5 +- Add python-devel buildrequires + * Mon May 30 2005 Kevin Fenzi - 0.3.0-4 - Fixed exo gtk-doc directory not being included in devel - Changed pygtk defs dir From fedora-extras-commits at redhat.com Fri Aug 5 02:48:13 2005 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Thu, 4 Aug 2005 22:48:13 -0400 Subject: rpms/Terminal/devel Terminal.spec,1.3,1.4 Message-ID: <200508050248.j752mDNu006630@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/Terminal/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6613 Modified Files: Terminal.spec Log Message: Add dist tag Index: Terminal.spec =================================================================== RCS file: /cvs/extras/rpms/Terminal/devel/Terminal.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Terminal.spec 30 May 2005 18:38:03 -0000 1.3 +++ Terminal.spec 5 Aug 2005 02:48:11 -0000 1.4 @@ -1,7 +1,7 @@ Summary: X Terminal Emulator Name: Terminal Version: 0.2.4 -Release: 3 +Release: 4%{?dist} License: GPL URL: http://terminal.os-cillation.com/ Source0: http://download.berlios.de/xfce-goodies/Terminal-0.2.4.tar.bz2 @@ -48,6 +48,9 @@ %{_libexecdir}/TerminalHelp %changelog +* Thu Aug 4 2005 Kevin Fenzi - 0.2.4-4.fc5 +- Add dist tag + * Mon May 30 2005 Kevin Fenzi - 0.2.4-3 - Removed incorrect Requires - Changed the description text From fedora-extras-commits at redhat.com Fri Aug 5 02:49:43 2005 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Thu, 4 Aug 2005 22:49:43 -0400 Subject: rpms/Terminal/FC-4 Terminal.spec,1.3,1.4 Message-ID: <200508050249.j752nhVB006703@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/Terminal/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6686 Modified Files: Terminal.spec Log Message: Add dist tag Index: Terminal.spec =================================================================== RCS file: /cvs/extras/rpms/Terminal/FC-4/Terminal.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Terminal.spec 30 May 2005 18:38:03 -0000 1.3 +++ Terminal.spec 5 Aug 2005 02:49:41 -0000 1.4 @@ -1,7 +1,7 @@ Summary: X Terminal Emulator Name: Terminal Version: 0.2.4 -Release: 3 +Release: 4%{?dist} License: GPL URL: http://terminal.os-cillation.com/ Source0: http://download.berlios.de/xfce-goodies/Terminal-0.2.4.tar.bz2 @@ -48,6 +48,9 @@ %{_libexecdir}/TerminalHelp %changelog +* Thu Aug 4 2005 Kevin Fenzi - 0.2.4-4.fc4 +- Added Dist tag + * Mon May 30 2005 Kevin Fenzi - 0.2.4-3 - Removed incorrect Requires - Changed the description text From fedora-extras-commits at redhat.com Fri Aug 5 02:54:20 2005 From: fedora-extras-commits at redhat.com (Alexander Dalloz (adalloz)) Date: Thu, 4 Aug 2005 22:54:20 -0400 Subject: rpms/keychain - New directory Message-ID: <200508050254.j752sKHW006818@cvs-int.fedora.redhat.com> Author: adalloz Update of /cvs/extras/rpms/keychain In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6798/keychain Log Message: Directory /cvs/extras/rpms/keychain added to the repository From fedora-extras-commits at redhat.com Fri Aug 5 02:54:20 2005 From: fedora-extras-commits at redhat.com (Alexander Dalloz (adalloz)) Date: Thu, 4 Aug 2005 22:54:20 -0400 Subject: rpms/keychain/devel - New directory Message-ID: <200508050254.j752sKPV006823@cvs-int.fedora.redhat.com> Author: adalloz Update of /cvs/extras/rpms/keychain/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6798/keychain/devel Log Message: Directory /cvs/extras/rpms/keychain/devel added to the repository From fedora-extras-commits at redhat.com Fri Aug 5 02:54:44 2005 From: fedora-extras-commits at redhat.com (Alexander Dalloz (adalloz)) Date: Thu, 4 Aug 2005 22:54:44 -0400 Subject: rpms/keychain Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200508050254.j752siA6006874@cvs-int.fedora.redhat.com> Author: adalloz Update of /cvs/extras/rpms/keychain In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6843 Added Files: Makefile import.log Log Message: Setup of module keychain --- NEW FILE Makefile --- # Top level Makefile for module keychain all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Fri Aug 5 02:54:44 2005 From: fedora-extras-commits at redhat.com (Alexander Dalloz (adalloz)) Date: Thu, 4 Aug 2005 22:54:44 -0400 Subject: rpms/keychain/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200508050254.j752siwI006879@cvs-int.fedora.redhat.com> Author: adalloz Update of /cvs/extras/rpms/keychain/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6843/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module keychain --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Fri Aug 5 02:55:44 2005 From: fedora-extras-commits at redhat.com (Alexander Dalloz (adalloz)) Date: Thu, 4 Aug 2005 22:55:44 -0400 Subject: rpms/keychain import.log,1.1,1.2 Message-ID: <200508050255.j752ti8g006962@cvs-int.fedora.redhat.com> Author: adalloz Update of /cvs/extras/rpms/keychain In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6927 Modified Files: import.log Log Message: auto-import keychain-2.5.5-1 on branch devel from keychain-2.5.5-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/keychain/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 5 Aug 2005 02:54:42 -0000 1.1 +++ import.log 5 Aug 2005 02:55:42 -0000 1.2 @@ -0,0 +1 @@ +keychain-2_5_5-1:HEAD:keychain-2.5.5-1.src.rpm:1123210531 From fedora-extras-commits at redhat.com Fri Aug 5 02:55:45 2005 From: fedora-extras-commits at redhat.com (Alexander Dalloz (adalloz)) Date: Thu, 4 Aug 2005 22:55:45 -0400 Subject: rpms/keychain/devel README.Fedora, NONE, 1.1 keychain-manpage.patch, NONE, 1.1 keychain.csh, NONE, 1.1 keychain.sh, NONE, 1.1 keychain.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200508050255.j752tjfQ006967@cvs-int.fedora.redhat.com> Author: adalloz Update of /cvs/extras/rpms/keychain/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6927/devel Modified Files: .cvsignore sources Added Files: README.Fedora keychain-manpage.patch keychain.csh keychain.sh keychain.spec Log Message: auto-import keychain-2.5.5-1 on branch devel from keychain-2.5.5-1.src.rpm --- NEW FILE README.Fedora --- README.Fedora - keychain opt-in keychain is a manager for both ssh-agent and gpg-agent. It allows your shells and cron jobs to share a single ssh-agent or gpg-agent process. keychain typically runs from the login shell environment setting, i.e. ~/.bash_profile when using bash or ~/.login when running a tcsh shell. It's general usage and different options are documented in keychain(1). Installed from Fedora Extras keychain can be easily activated by simply touching an empty ~/.keychainrc file when using either bash, sh, ksh, csh or tcsh. zsh shell users will have to add a `/etc/profile.d/keychain.sh' call to their ~/.zlogin file. This will let the user's shell invoke a default setup of keychain where it loads all user's ssh keys from ~/.ssh/ to an ssh-agent process. gpg keys are not loaded by default as the necessary gpg-agent is not part of the Fedora Core gnupg package, but provided by the additional gnupg2 package of Fedora Extras. The default setup starts keychain in quiet mode, so only messages are printed out in case of warnings, errors or if interactivity is required. To override the default settings with which keychain is activated when the shell environment finds a ~/.keychainrc, the user can customize following variables by setting them inside the ~/.keychainrc. KCHOPTS="" This variable takes options for keychain like "--nocolor" or "--noask". Please see the keychain manpage for a full list. SSHKEYS="" Instead of loading all keys the user can list those keys to be loaded by their file names. The key list has to be space separated. GPGKEYS="" gpg keys to be loaded by keychain have to be specified by their key ID. The user can get a full list of keys and IDs in his secret keyring by running `gpg --list-secret-keys'. GPGKEYS defines a single key ID or a space separated list of key IDs. Please be aware that you still need to source the keychain file with the ssh-agent environment variables along with the crontab entry when you want to make use of ssh public key auth or of gpg signing through cron jobs, because cron uses a non-interactive shell and has a limited environment set. Note: This opt-in is not part of keychain, which is originally written by Daniel Robbins , but added to the Fedora Extras package of keychain to allow Fedora users an overall ease of use. keychain-manpage.patch: --- NEW FILE keychain-manpage.patch --- diff -Naru keychain-2.5.0.orig/keychain.1 keychain-2.5.0/keychain.1 --- keychain-2.5.0.orig/keychain.1 2005-01-08 04:02:36.000000000 +0200 +++ keychain-2.5.0/keychain.1 2005-01-08 13:49:25.542402807 +0200 @@ -291,9 +291,11 @@ .SH "EXAMPLES" .IX Header "EXAMPLES" This snippet would work in .bash_profile (for bash) or .zlogin (for -zsh) to load two ssh keys and one gpg key: +zsh) to load two ssh keys (id_rsa and id_dsa) and one gpg key (key ID +0123ABCD): .PP .Vb 5 +\& which keychain &>/dev/null && \e \& keychain id_rsa id_dsa 0123ABCD \& [[ -f $HOME/.keychain/$HOSTNAME-sh ]] && \e \& source $HOME/.keychain/$HOSTNAME-sh @@ -305,6 +307,7 @@ \&.profile: .PP .Vb 6 +\& which keychain >/dev/null 2>/dev/null && \e \& keychain id_rsa id_dsa 0123ABCD \& host=`uname -n` \& [ -f $HOME/.keychain/$host-sh ] && \e @@ -316,6 +319,7 @@ This snippet would work in .login for tcsh: .PP .Vb 7 +\& which keychain >& /dev/null && \e \& keychain id_rsa id_dsa 0123ABCD \& if (-f $HOME/.keychain/$HOST-csh) then \& source $HOME/.keychain/$HOST-csh @@ -328,6 +332,7 @@ This snippet would work in .login for csh: .PP .Vb 8 +\& which keychain >& /dev/null && \e \& keychain id_rsa id_dsa 0123ABCD \& host=`uname -n` \& if (-f $HOME/.keychain/$host-csh) then diff -Naru keychain-2.5.0.orig/keychain.pod keychain-2.5.0/keychain.pod --- keychain-2.5.0.orig/keychain.pod 2005-01-08 04:02:36.000000000 +0200 +++ keychain-2.5.0/keychain.pod 2005-01-08 13:49:44.002694389 +0200 @@ -193,8 +193,10 @@ =head1 EXAMPLES This snippet would work in .bash_profile (for bash) or .zlogin (for -zsh) to load two ssh keys and one gpg key: +zsh) to load two ssh keys (id_rsa and id_dsa) and one gpg key (key ID +0123ABCD): + which keychain &>/dev/null && \ keychain id_rsa id_dsa 0123ABCD [[ -f $HOME/.keychain/$HOSTNAME-sh ]] && \ source $HOME/.keychain/$HOSTNAME-sh @@ -204,6 +206,7 @@ For other Bourne-compatible shells such as sh, you can use this in .profile: + which keychain >/dev/null 2>/dev/null && \ keychain id_rsa id_dsa 0123ABCD host=`uname -n` [ -f $HOME/.keychain/$host-sh ] && \ @@ -213,6 +216,7 @@ This snippet would work in .login for tcsh: + which keychain >& /dev/null && \ keychain id_rsa id_dsa 0123ABCD if (-f $HOME/.keychain/$HOST-csh) then source $HOME/.keychain/$HOST-csh @@ -223,6 +227,7 @@ This snippet would work in .login for csh: + which keychain >& /dev/null && \ keychain id_rsa id_dsa 0123ABCD host=`uname -n` if (-f $HOME/.keychain/$host-csh) then --- NEW FILE keychain.csh --- # /etc/profile.d/keychain.csh - calling keychain the Fedora way # read in user's keychain settings or use defaults running keychain if (-f $HOME/.keychainrc) then eval `grep -v '^[:blank:]*#' $HOME/.keychainrc | \ sed 's|$[^=]*$=$[^=]*$|set \1 = \2|g' | sed 's|$|;|'` if (! $?KCHOPTS) then set KCHOPTS = "--quiet" endif if (! $?SSHKEYS) then set SSHKEYS = `grep -l -e '[DRS]S[AH] PRIVATE KEY' $HOME/.ssh/*` endif if (! $?GPGKEYS ) then set GPGKEYS = "" endif keychain $KCHOPTS $SSHKEYS $GPGKEYS set HOST = `uname -n` if (-f $HOME/.keychain/$HOST-csh) then source $HOME/.keychain/$HOST-csh endif if (-f $HOME/.keychain/$HOST-csh-gpg) then source $HOME/.keychain/$HOST-csh-gpg endif endif --- NEW FILE keychain.sh --- # /etc/profile.d/keychain.sh - calling keychain the Fedora way # read in user's keychain settings or use defaults running keychain if [ -f $HOME/.keychainrc ]; then source $HOME/.keychainrc [ -n "$KCHOPTS" ] || KCHOPTS="--quiet" [ -n "$SSHKEYS" ] || SSHKEYS=`grep -l -e '[DRS]S[AH] PRIVATE KEY' \ $HOME/.ssh/*` [ -n "$GPGKEYS" ] || GPGKEYS="" keychain $KCHOPTS $SSHKEYS $GPGKEYS HOST=`uname -n` [ -f $HOME/.keychain/$HOST-sh ] && \ . $HOME/.keychain/$HOST-sh [ -f $HOME/.keychain/$HOST-sh-gpg ] && \ . $HOME/.keychain/$HOST-sh-gpg fi --- NEW FILE keychain.spec --- Name: keychain Summary: Agent manager for OpenSSH, ssh.com, Sun SSH, and GnuPG Version: 2.5.5 Release: 1 License: GPL Group: Applications/Internet URL: http://www.gentoo.org/proj/en/keychain/ Source0: http://dev.gentoo.org/~agriffis/keychain/%{name}-%{version}.tar.bz2 Source1: keychain.sh Source2: keychain.csh Source3: README.Fedora Patch0: keychain-manpage.patch BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description Keychain is a manager for OpenSSH, ssh.com, Sun SSH and GnuPG agents. It acts as a front-end to the agents, allowing you to easily have one long-running agent process per system, rather than per login session. This dramatically reduces the number of times you need to enter your passphrase from once per new login session to once every time your local machine is rebooted. %prep %setup -q %patch0 -p1 sed -i -e 's|/usr/ucb:||' keychain %install rm -rf %{buildroot} mkdir -p %{buildroot}%{_bindir} mkdir -p %{buildroot}%{_sysconfdir}/profile.d mkdir -p %{buildroot}%{_mandir}/man1 install -m 755 keychain %{buildroot}%{_bindir}/keychain install -m 755 %{SOURCE1} %{buildroot}%{_sysconfdir}/profile.d/keychain.sh install -m 755 %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d/keychain.csh install -m 644 keychain.1 %{buildroot}%{_mandir}/man1 install -m 644 %{SOURCE3} README.Fedora %clean rm -rf %{buildroot} %files %defattr(-,root,root) %doc COPYING ChangeLog README README.Fedora %doc %{_mandir}/man1/keychain.1.gz %{_bindir}/keychain %config(noreplace) %{_sysconfdir}/profile.d/keychain.sh %config(noreplace) %{_sysconfdir}/profile.d/keychain.csh %changelog * Fri Aug 05 2005 Alexander Dalloz - 2.5.5-1 - Updated to new upstream version - Removed keychain.pod from %%doc. * Wed Jul 27 2005 Alexander Dalloz - 2.5.4.1-2 - Added manpage patch and %%prep removal of non existing path (thanks Ville Skytt??) - Added opt-in mechanism through profile.d scripts for all login shells Fedora ships. * Sun Jul 10 2005 Alexander Dalloz - 2.5.4.1-1 - Initial build, based on upstream .spec by Aron Griffis. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/keychain/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 5 Aug 2005 02:54:42 -0000 1.1 +++ .cvsignore 5 Aug 2005 02:55:43 -0000 1.2 @@ -0,0 +1 @@ +keychain-2.5.5.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/keychain/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 5 Aug 2005 02:54:42 -0000 1.1 +++ sources 5 Aug 2005 02:55:43 -0000 1.2 @@ -0,0 +1 @@ +3afa5ce32a5c57e43caac82db3396aac keychain-2.5.5.tar.bz2 From fedora-extras-commits at redhat.com Fri Aug 5 03:34:04 2005 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Thu, 4 Aug 2005 23:34:04 -0400 Subject: rpms/kphone/devel kphone.spec,1.17,1.18 Message-ID: <200508050334.j753Y4iL008247@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/kphone/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8230 Modified Files: kphone.spec Log Message: remove STUN patch as it seems to be causing segfaults Index: kphone.spec =================================================================== RCS file: /cvs/extras/rpms/kphone/devel/kphone.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- kphone.spec 23 Jul 2005 09:00:22 -0000 1.17 +++ kphone.spec 5 Aug 2005 03:34:02 -0000 1.18 @@ -1,6 +1,6 @@ Name: kphone Version: 4.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A SIP (Session Initiation Protocol) user agent for Linux Group: Applications/Communications @@ -24,10 +24,8 @@ %prep %setup -q -n kphone -#%patch -p1 -b .iso %patch1 -p1 -b .endian %patch2 -p1 -b .strip -%patch3 -p1 -b .stun-init %build [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh @@ -60,6 +58,9 @@ %{_datadir}/pixmaps/*.png %changelog +* Thu Aug 04 2005 Dennis Gilmore 4.2-2%{?dist} +- Remove STUN patch as it causes Segfaults on call. Will reapply when fixed. + * Sat Jul 23 2005 Ignacio Vazquez-Abrams 4.2-1 - Upstream update - Add STUN patch from Stefan Becker (#163322) From rc040203 at freenet.de Fri Aug 5 03:34:54 2005 From: rc040203 at freenet.de (Ralf Corsepius) Date: Fri, 05 Aug 2005 05:34:54 +0200 Subject: rpms/keychain/devel README.Fedora, NONE, 1.1 keychain-manpage.patch, NONE, 1.1 keychain.csh, NONE, 1.1 keychain.sh, NONE, 1.1 keychain.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 In-Reply-To: <200508050255.j752tjfQ006967@cvs-int.fedora.redhat.com> References: <200508050255.j752tjfQ006967@cvs-int.fedora.redhat.com> Message-ID: <1123212894.4364.164.camel@mccallum.corsepiu.local> On Thu, 2005-08-04 at 22:55 -0400, Alexander Dalloz wrote: > --- NEW FILE keychain.sh --- > # /etc/profile.d/keychain.sh - calling keychain the Fedora way > # read in user's keychain settings or use defaults running keychain > > if [ -f $HOME/.keychainrc ]; then > ... > [ -f $HOME/.keychain/$HOST-sh ] && \ > . $HOME/.keychain/$HOST-sh > [ -f $HOME/.keychain/$HOST-sh-gpg ] && \ > . $HOME/.keychain/$HOST-sh-gpg Shouldn't these "test -f"'s be "test -r"'s? I am not sure. What is supposed to happen if one of these files is a symlink or "chmod -r"'ed? > --- NEW FILE keychain.spec --- ... > %files > %defattr(-,root,root) > %doc COPYING ChangeLog README README.Fedora > %doc %{_mandir}/man1/keychain.1.gz This %doc is redundant, files below %mandir automatically are %doc'ed > %changelog > ... > * Wed Jul 27 2005 Alexander Dalloz - 2.5.4.1-2 > - Added manpage patch and %%prep removal of non existing path > (thanks Ville Skytt) AFAICT, Ville's last name ist Skytt? ;) Ralf From fedora-extras-commits at redhat.com Fri Aug 5 03:35:03 2005 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Thu, 4 Aug 2005 23:35:03 -0400 Subject: rpms/kphone/FC-4 kphone.spec,1.17,1.18 Message-ID: <200508050335.j753Z3AJ008308@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/kphone/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8291 Modified Files: kphone.spec Log Message: remove STUN patch as it seems to be causing segfaults Index: kphone.spec =================================================================== RCS file: /cvs/extras/rpms/kphone/FC-4/kphone.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- kphone.spec 23 Jul 2005 09:00:17 -0000 1.17 +++ kphone.spec 5 Aug 2005 03:35:00 -0000 1.18 @@ -1,6 +1,6 @@ Name: kphone Version: 4.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A SIP (Session Initiation Protocol) user agent for Linux Group: Applications/Communications @@ -24,10 +24,8 @@ %prep %setup -q -n kphone -#%patch -p1 -b .iso %patch1 -p1 -b .endian %patch2 -p1 -b .strip -%patch3 -p1 -b .stun-init %build [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh @@ -60,6 +58,9 @@ %{_datadir}/pixmaps/*.png %changelog +* Thu Aug 04 2005 Dennis Gilmore 4.2-2%{?dist} +- Remove STUN patch as it causes Segfaults on call. Will reapply when fixed. + * Sat Jul 23 2005 Ignacio Vazquez-Abrams 4.2-1 - Upstream update - Add STUN patch from Stefan Becker (#163322) From fedora-extras-commits at redhat.com Fri Aug 5 03:35:39 2005 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Thu, 4 Aug 2005 23:35:39 -0400 Subject: rpms/kphone/FC-3 kphone.spec,1.13,1.14 Message-ID: <200508050335.j753ZdN9008369@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/kphone/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8352 Modified Files: kphone.spec Log Message: remove STUN patch as it seems to be causing segfaults Index: kphone.spec =================================================================== RCS file: /cvs/extras/rpms/kphone/FC-3/kphone.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- kphone.spec 23 Jul 2005 09:00:16 -0000 1.13 +++ kphone.spec 5 Aug 2005 03:35:37 -0000 1.14 @@ -1,6 +1,6 @@ Name: kphone Version: 4.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A SIP (Session Initiation Protocol) user agent for Linux Group: Applications/Communications @@ -24,10 +24,8 @@ %prep %setup -q -n kphone -#%patch -p1 -b .iso %patch1 -p1 -b .endian %patch2 -p1 -b .strip -%patch3 -p1 -b .stun-init %build [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh @@ -60,6 +58,9 @@ %{_datadir}/pixmaps/*.png %changelog +* Thu Aug 04 2005 Dennis Gilmore 4.2-2%{?dist} +- Remove STUN patch as it causes Segfaults on call. Will reapply when fixed. + * Sat Jul 23 2005 Ignacio Vazquez-Abrams 4.2-1 - Upstream update - Add STUN patch from Stefan Becker (#163322) @@ -67,9 +68,12 @@ * Fri May 20 2005 Ignacio Vazquez-Abrams 4.1.1-1 - Upstream update -* Mon May 9 2005 Ignacio Vazquez-Abrams 4.1.0-12 +* Mon May 9 2005 Ignacio Vazquez-Abrams 4.1.0-13 - Patch to prevent stripping of binary (#157261) +* Thu Apr 7 2005 Michael Schwendt +- rebuilt + * Sat Mar 26 2005 Ignacio Vazquez-Abrams 4.1.0-11 - Added Network category to desktop entry From alex at dalloz.de Fri Aug 5 03:49:22 2005 From: alex at dalloz.de (Alexander Dalloz) Date: Fri, 05 Aug 2005 05:49:22 +0200 Subject: rpms/keychain/devel README.Fedora, NONE, 1.1 keychain-manpage.patch, NONE, 1.1 keychain.csh, NONE, 1.1 keychain.sh, NONE, 1.1 keychain.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 In-Reply-To: <1123212894.4364.164.camel@mccallum.corsepiu.local> References: <200508050255.j752tjfQ006967@cvs-int.fedora.redhat.com> <1123212894.4364.164.camel@mccallum.corsepiu.local> Message-ID: <1123213762.6344.77.camel@serendipity.dogma.lan> Am Fr, den 05.08.2005 schrieb Ralf Corsepius um 5:34: > On Thu, 2005-08-04 at 22:55 -0400, Alexander Dalloz wrote: > > > --- NEW FILE keychain.sh --- > > # /etc/profile.d/keychain.sh - calling keychain the Fedora way > > # read in user's keychain settings or use defaults running keychain > > > > if [ -f $HOME/.keychainrc ]; then > > ... > > [ -f $HOME/.keychain/$HOST-sh ] && \ > > . $HOME/.keychain/$HOST-sh > > [ -f $HOME/.keychain/$HOST-sh-gpg ] && \ > > . $HOME/.keychain/$HOST-sh-gpg > Shouldn't these "test -f"'s be "test -r"'s? I am not sure. > > What is supposed to happen if one of these files is a symlink or "chmod > -r"'ed? These files below ~/.keychain/ are automatically created by keychain itself. I don't see the real world scenario where someone needs to change something with it. If the files aren't readable the call would print out warning messages, a "test -r" would just be silent and do nothing then. A symlink wouldn't be a problem anyway. > > --- NEW FILE keychain.spec --- > ... > > %files > > %defattr(-,root,root) > > %doc COPYING ChangeLog README README.Fedora > > %doc %{_mandir}/man1/keychain.1.gz > This %doc is redundant, files below %mandir automatically are %doc'ed Thanks for that hint. I'll change that. > > %changelog > > ... > > * Wed Jul 27 2005 Alexander Dalloz - 2.5.4.1-2 > > - Added manpage patch and %%prep removal of non existing path > > (thanks Ville Skytt) > AFAICT, Ville's last name ist Skytt? ;) Right. So I have it in my spec file, locally and as it appears in http://cvs.fedora.redhat.com/viewcvs/rpms/keychain/devel/keychain.spec?root=extras&rev=1.1&view=markup Don't know why the mail has eaten this "umlaut a". > Ralf Alexander -- 1024D/866ED681 2005-07-11 Alexander Dalloz (Fedora Project) Key fingerprint = CD40 0A91 7814 C1E4 5940 8E0E 1FD5 C316 866E D681 -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 189 bytes Desc: Dies ist ein digital signierter Nachrichtenteil URL: From chris at chrisgrau.com Fri Aug 5 05:31:31 2005 From: chris at chrisgrau.com (Chris Grau) Date: Thu, 4 Aug 2005 22:31:31 -0700 Subject: APPROVED: frotz Message-ID: <20050805053131.GB15799@chrisgrau.com> frotz: Frotz is an interpreter for Infocom games and other Z-machine games. It complies with standard 1.0 of Graham Nelson's specification. Free Z-machine game file downloads, as well as more information about Infocom, Z-machine games, and interactive fiction can be found at the Interactive Fiction Archive, http://mirror.ifarchive.org/. Reviewer: Tom 'spot' Callaway Maintainer: Chris Grau From fedora-extras-commits at redhat.com Fri Aug 5 05:41:27 2005 From: fedora-extras-commits at redhat.com (Christopher Grau (cgrau)) Date: Fri, 5 Aug 2005 01:41:27 -0400 Subject: rpms/frotz - New directory Message-ID: <200508050541.j755fRLZ010905@cvs-int.fedora.redhat.com> Author: cgrau Update of /cvs/extras/rpms/frotz In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10881/frotz Log Message: Directory /cvs/extras/rpms/frotz added to the repository From fedora-extras-commits at redhat.com Fri Aug 5 05:41:27 2005 From: fedora-extras-commits at redhat.com (Christopher Grau (cgrau)) Date: Fri, 5 Aug 2005 01:41:27 -0400 Subject: rpms/frotz/devel - New directory Message-ID: <200508050541.j755fR8U010910@cvs-int.fedora.redhat.com> Author: cgrau Update of /cvs/extras/rpms/frotz/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10881/frotz/devel Log Message: Directory /cvs/extras/rpms/frotz/devel added to the repository From fedora-extras-commits at redhat.com Fri Aug 5 05:41:35 2005 From: fedora-extras-commits at redhat.com (Christopher Grau (cgrau)) Date: Fri, 5 Aug 2005 01:41:35 -0400 Subject: rpms/frotz Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200508050541.j755fZqs010953@cvs-int.fedora.redhat.com> Author: cgrau Update of /cvs/extras/rpms/frotz In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10926 Added Files: Makefile import.log Log Message: Setup of module frotz --- NEW FILE Makefile --- # Top level Makefile for module frotz all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Fri Aug 5 05:41:35 2005 From: fedora-extras-commits at redhat.com (Christopher Grau (cgrau)) Date: Fri, 5 Aug 2005 01:41:35 -0400 Subject: rpms/frotz/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200508050541.j755fZo7010958@cvs-int.fedora.redhat.com> Author: cgrau Update of /cvs/extras/rpms/frotz/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10926/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module frotz --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Fri Aug 5 05:42:00 2005 From: fedora-extras-commits at redhat.com (Christopher Grau (cgrau)) Date: Fri, 5 Aug 2005 01:42:00 -0400 Subject: rpms/frotz import.log,1.1,1.2 Message-ID: <200508050542.j755gUwA011041@cvs-int.fedora.redhat.com> Author: cgrau Update of /cvs/extras/rpms/frotz In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11000 Modified Files: import.log Log Message: auto-import frotz-2.43-3.fc4.cdg on branch devel from frotz-2.43-3.fc4.cdg.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/frotz/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 5 Aug 2005 05:41:33 -0000 1.1 +++ import.log 5 Aug 2005 05:41:57 -0000 1.2 @@ -0,0 +1 @@ +frotz-2_43-3_fc4_cdg:HEAD:frotz-2.43-3.fc4.cdg.src.rpm:1123220514 From fedora-extras-commits at redhat.com Fri Aug 5 05:42:00 2005 From: fedora-extras-commits at redhat.com (Christopher Grau (cgrau)) Date: Fri, 5 Aug 2005 01:42:00 -0400 Subject: rpms/frotz/devel frotz-2.43-Makefile.patch, NONE, 1.1 frotz-2.43-conf.patch, NONE, 1.1 frotz.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200508050542.j755g0dG011036@cvs-int.fedora.redhat.com> Author: cgrau Update of /cvs/extras/rpms/frotz/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11000/devel Modified Files: .cvsignore sources Added Files: frotz-2.43-Makefile.patch frotz-2.43-conf.patch frotz.spec Log Message: auto-import frotz-2.43-3.fc4.cdg on branch devel from frotz-2.43-3.fc4.cdg.src.rpm frotz-2.43-Makefile.patch: --- NEW FILE frotz-2.43-Makefile.patch --- --- ./Makefile 2002-10-27 17:21:52.000000000 -0800 +++ ./Makefile.fedora 2005-07-19 06:46:20.000000000 -0700 @@ -7,25 +7,25 @@ # Define your optimization flags. Most compilers understand -O and -O2, # Standard (note: Solaris on UltraSparc using gcc 2.8.x might not like this.) # -OPTS = -O2 +OPTS = @@OPTS@@ # Pentium with gcc 2.7.0 or better #OPTS = -O2 -fomit-frame-pointer -malign-functions=2 -malign-loops=2 \ #-malign-jumps=2 # Define where you want Frotz installed. Usually this is /usr/local -PREFIX = /usr/local +PREFIX = /usr MAN_PREFIX = $(PREFIX) #MAN_PREFIX = /usr/local/share -CONFIG_DIR = $(PREFIX)/etc -#CONFIG_DIR = /etc +#CONFIG_DIR = $(PREFIX)/etc +CONFIG_DIR = /etc # Define where you want Frotz to look for frotz.conf. # -CONFIG_DIR = /usr/local/etc -#CONFIG_DIR = /etc +#CONFIG_DIR = /usr/local/etc +CONFIG_DIR = /etc #CONFIG_DIR = /usr/pkg/etc #CONFIG_DIR = @@ -73,15 +73,15 @@ # curses library won't work, comment out the first option and uncomment # the second. # -CURSES = -lcurses -#CURSES = -lncurses +#CURSES = -lcurses +CURSES = -lncurses # Uncomment this if your need to use ncurses instead of the # vendor-supplied curses library. This just tells the compile process # which header to include, so don't worry if ncurses is all you have # (like on Linux). You'll be fine. # -#CURSES_DEF = -DUSE_NCURSES_H +CURSES_DEF = -DUSE_NCURSES_H # Uncomment this if you're compiling Unix Frotz on a machine that lacks # the memmove(3) system call. If you don't know what this means, leave it frotz-2.43-conf.patch: --- NEW FILE frotz-2.43-conf.patch --- Set up this example configuration file to be used as the default configuration in /etc. --- ./doc/frotz.conf-big 2000-10-28 10:43:07.000000000 -0700 +++ ./doc/frotz.conf-big.conf 2005-07-19 06:41:39.000000000 -0700 @@ -10,47 +10,47 @@ # These options control some basic characteristics of Frotz. # Use color text (default "yes" if supported) -color yes +#color yes # Set foreground color (default "white" if in color mode) -foreground white +#foreground white # Set background color (default "blue" if in color mode) -background blue +#background blue # Set error-reporting mode (default "once") -errormode once +#errormode once # Set path to search for game files (no default) -zcode_path /usr/local/games/zcode +#zcode_path /usr/local/games/zcode # Use plain ASCII only (default "no") -ascii no +#ascii no # Turn sound on or off (default "on") -sound on +#sound on ############################################ # These are some less-commonly used options. # Set random number seed (default comes from the Unix epoch) -randseed 1234 +#randseed 1234 # Set number of undo slots (default 500) -undo_slots 500 +#undo_slots 500 # Set Tandy bit (default "no") -tandy no +#tandy no # Alter piracy opcode (default "no") -piracy no +#piracy no # Use Quetzal save format (default "yes") -quetzal yes +#quetzal yes # Expand abbreviations (default "no") -expand_abb no +#expand_abb no ######################################################################### @@ -60,38 +60,38 @@ # Force color mode (default "no") # Useful for use with supposedly current flavors of Unix that still don't # understand what the "xterm-color" terminal type is. -force_color no +#force_color no # Set screen height (default is detected height) -screen_height 24 +#screen_height 24 # Set screen width (default is detected screen width) -screen_width 80 +#screen_width 80 # Set script width (default is screen width) -script_width 80 +#script_width 80 # Set context lines (default "0") -context_lines 0 +#context_lines 0 # Set left margin (default "0") -left_margin 0 +#left_margin 0 # Set right margin (default "0") -right_margin 0 +#right_margin 0 ############################################################# # These options are mainly useful for debugging and cheating. # Watch attribute setting (default "no") -attrib_set no +#attrib_set no # Watch attribute testing (default "no") -attrib_test no +#attrib_test no # Watch object movement (default "no") -obj_move no +#obj_move no # Watch object locating (default "no") -obj_loc no +#obj_loc no --- NEW FILE frotz.spec --- Name: frotz Version: 2.43 Release: 3%{?dist} Summary: Interpreter for Infocom and other Z-machine games Group: Amusements/Games License: GPL URL: http://www.cs.csubak.edu/~dgriffi/proj/frotz/ Source0: http://www.cs.csubak.edu/~dgriffi/proj/frotz/files/frotz-2.43.tar.gz Patch1: frotz-2.43-Makefile.patch Patch2: frotz-2.43-conf.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ncurses-devel %description Frotz is an interpreter for Infocom games and other Z-machine games. It complies with standard 1.0 of Graham Nelson's specification. Free Z-machine game file downloads, as well as more information about Infocom, Z-machine games, and interactive fiction can be found at the Interactive Fiction Archive, http://mirror.ifarchive.org/. %prep %setup -q %patch1 -p1 %patch2 -p1 %build sed -i -e "s/@@OPTS@@/$RPM_OPT_FLAGS/" Makefile make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT install -d -m0755 $RPM_BUILD_ROOT/%{_bindir} install -d -m0755 $RPM_BUILD_ROOT/%{_sysconfdir} install -d -m0755 $RPM_BUILD_ROOT/%{_mandir}/man6 install -m0755 frotz $RPM_BUILD_ROOT/%{_bindir} install -m0644 doc/frotz.6 $RPM_BUILD_ROOT/%{_mandir}/man6 install -m0644 doc/frotz.conf-big $RPM_BUILD_ROOT/%{_sysconfdir}/frotz.conf %clean rm -rf $RPM_BUILD_ROOT %files %defattr (-,root,root,-) %doc AUTHORS BUGS ChangeLog COPYING DUMB HOW_TO_PLAY README SPEECH TODO %doc doc/frotz.conf* %{_bindir}/frotz %{_mandir}/man6/frotz.6* %config(noreplace) %{_sysconfdir}/frotz.conf %changelog * Tue Jul 19 2005 Chris Grau 2.43-3 - Changed sed command to edit Makefile in place (Michael Schwendt). - Removed compression of the man page (Michael Schwendt). * Tue Jul 19 2005 Chris Grau 2.43-2 - Split up patch files. - Added a pointer to the IF archive to the %%description. * Thu Jul 07 2005 Chris Grau 2.43-1 - Initial build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/frotz/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 5 Aug 2005 05:41:33 -0000 1.1 +++ .cvsignore 5 Aug 2005 05:41:58 -0000 1.2 @@ -0,0 +1 @@ +frotz-2.43.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/frotz/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 5 Aug 2005 05:41:33 -0000 1.1 +++ sources 5 Aug 2005 05:41:58 -0000 1.2 @@ -0,0 +1 @@ +efe51879e012b92bb8d5f4a82e982677 frotz-2.43.tar.gz From ivazquez at ivazquez.net Fri Aug 5 06:18:54 2005 From: ivazquez at ivazquez.net (Ignacio Vazquez-Abrams) Date: Fri, 05 Aug 2005 02:18:54 -0400 Subject: rpms/kphone/devel kphone.spec,1.17,1.18 In-Reply-To: <200508050334.j753Y4iL008247@cvs-int.fedora.redhat.com> References: <200508050334.j753Y4iL008247@cvs-int.fedora.redhat.com> Message-ID: <1123222734.12131.61.camel@ignacio.lan> On Thu, 2005-08-04 at 23:34 -0400, Dennis Gilmore wrote: > Author: ausil > > Update of /cvs/extras/rpms/kphone/devel > In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8230 > > Modified Files: > kphone.spec > Log Message: > remove STUN patch as it seems to be causing segfaults In that case you may want to reopen #163322. -- Ignacio Vazquez-Abrams http://fedora.ivazquez.net/ gpg --keyserver hkp://subkeys.pgp.net --recv-key 38028b72 -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 189 bytes Desc: This is a digitally signed message part URL: From ville.skytta at iki.fi Fri Aug 5 07:01:44 2005 From: ville.skytta at iki.fi (Ville =?ISO-8859-1?Q?Skytt=E4?=) Date: Fri, 05 Aug 2005 10:01:44 +0300 Subject: rpms/keychain/devel README.Fedora, NONE, 1.1 keychain-manpage.patch, NONE, 1.1 keychain.csh, NONE, 1.1 keychain.sh, NONE, 1.1 keychain.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 In-Reply-To: <1123213762.6344.77.camel@serendipity.dogma.lan> References: <200508050255.j752tjfQ006967@cvs-int.fedora.redhat.com> <1123212894.4364.164.camel@mccallum.corsepiu.local> <1123213762.6344.77.camel@serendipity.dogma.lan> Message-ID: <1123225304.12477.47.camel@localhost.localdomain> On Fri, 2005-08-05 at 05:49 +0200, Alexander Dalloz wrote: > Am Fr, den 05.08.2005 schrieb Ralf Corsepius um 5:34: > > > > What is supposed to happen if one of these files is a symlink or "chmod > > -r"'ed? > > These files below ~/.keychain/ are automatically created by keychain > itself. I don't see the real world scenario where someone needs to > change something with it. Agreed. Upstream documentation uses "-f" too. > > > %changelog > > > ... > > > * Wed Jul 27 2005 Alexander Dalloz - 2.5.4.1-2 > > > - Added manpage patch and %%prep removal of non existing path > > > (thanks Ville Skytt) > > AFAICT, Ville's last name ist Skytt? ;) > > Right. So I have it in my spec file, locally and as it appears in > > http://cvs.fedora.redhat.com/viewcvs/rpms/keychain/devel/keychain.spec?root=extras&rev=1.1&view=markup > > Don't know why the mail has eaten this "umlaut a". Yeah, that issue is present in all commit messages. The bug is either in the script that generates the messages or the thing that sends them. I see the content type of the automatic messages seems to be always "Content-Type: TEXT/PLAIN; charset=US-ASCII" which probably explains why non-ASCII doesn't make it through. From paul at city-fan.org Fri Aug 5 07:39:53 2005 From: paul at city-fan.org (Paul Howarth) Date: Fri, 05 Aug 2005 08:39:53 +0100 Subject: rpms/keychain/devel README.Fedora, NONE, 1.1 keychain-manpage.patch, NONE, 1.1 keychain.csh, NONE, 1.1 keychain.sh, NONE, 1.1 keychain.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 In-Reply-To: <1123225304.12477.47.camel@localhost.localdomain> References: <200508050255.j752tjfQ006967@cvs-int.fedora.redhat.com> <1123212894.4364.164.camel@mccallum.corsepiu.local> <1123213762.6344.77.camel@serendipity.dogma.lan> <1123225304.12477.47.camel@localhost.localdomain> Message-ID: <1123227594.2851.573.camel@laurel.intra.city-fan.org> On Fri, 2005-08-05 at 10:01 +0300, Ville Skytt? wrote: > On Fri, 2005-08-05 at 05:49 +0200, Alexander Dalloz wrote: > > Don't know why the mail has eaten this "umlaut a". > > Yeah, that issue is present in all commit messages. The bug is either > in the script that generates the messages or the thing that sends them. > I see the content type of the automatic messages seems to be always > "Content-Type: TEXT/PLAIN; charset=US-ASCII" which probably explains why > non-ASCII doesn't make it through. http://bugzilla.redhat.com/163229 Paul. -- Paul Howarth From oliver at linux-kernel.at Fri Aug 5 07:53:03 2005 From: oliver at linux-kernel.at (Oliver Falk) Date: Fri, 05 Aug 2005 09:53:03 +0200 Subject: Request for review: scanssh (WAS: Re: scanssh) In-Reply-To: <1072.213.13.91.139.1123184290.squirrel@webmail.lsd.di.uminho.pt> References: <1072.213.13.91.139.1123184290.squirrel@webmail.lsd.di.uminho.pt> Message-ID: <42F31ADF.5090201@linux-kernel.at> Hi all! Hi Jose! On 08/04/2005 09:38 PM, Jose Pedro Oliveira wrote: > Are you still planning in submitting scanssh for review? > I don't mind helping review it ;) Here we go Jose... :-) Summary: fast SSH server and open proxy scanner Description: ScanSSH supports scanning a list of addresses and networks for open proxies, SSH protocol servers, Web and SMTP servers. Where possible ScanSSH, displays the version number of the running services. ScanSSH protocol scanner supports random selection of IP addresses from large network ranges and is useful for gathering statistics on the deployment of SSH protocol servers in a company or the Internet as whole. SRPM and Spec, as usual: http://filelister.linux-kernel.at/mod_perl?current=/packages/FC_EXTRAS_APPROVAL/scanssh Please have a look at it. I intend to put it on FE-3/-4/-devel. Best, Oliver From fedora-extras-commits at redhat.com Fri Aug 5 08:10:26 2005 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Fri, 5 Aug 2005 04:10:26 -0400 Subject: mock/docs - New directory Message-ID: <200508050810.j758AQPW015030@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/fedora/mock/docs In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15016/docs Log Message: Directory /cvs/fedora/mock/docs added to the repository From fedora-extras-commits at redhat.com Fri Aug 5 08:11:26 2005 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Fri, 5 Aug 2005 04:11:26 -0400 Subject: mock Makefile,1.5,1.6 Message-ID: <200508050811.j758BwLi015055@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/fedora/mock In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15038 Modified Files: Makefile Log Message: added makefile for docs subdir Index: Makefile =================================================================== RCS file: /cvs/fedora/mock/Makefile,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- Makefile 26 Jul 2005 20:12:16 -0000 1.5 +++ Makefile 5 Aug 2005 08:11:17 -0000 1.6 @@ -1,4 +1,4 @@ -SUBDIRS = etc src +SUBDIRS = etc src docs PKGNAME = mock VERSION=$(shell awk '/Version:/ { print $$2 }' ${PKGNAME}.spec) From fedora-extras-commits at redhat.com Fri Aug 5 08:12:50 2005 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Fri, 5 Aug 2005 04:12:50 -0400 Subject: mock/docs Makefile,NONE,1.1 mock.1,NONE,1.1 Message-ID: <200508050812.j758Coir015093@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/fedora/mock/docs In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15071 Added Files: Makefile mock.1 Log Message: mock man page from Jeff Sheltren Makefile for docs dir --- NEW FILE Makefile --- all: echo "Nothing to do" clean: rm -f *.pyc *.pyo *~ install: mkdir -p $(DESTDIR)/usr/share/man/man{1} install -m 644 mock.1 $(DESTDIR)/usr/share/man/man1/mock.1 --- NEW FILE mock.1 --- .TH "mock" "1" "0.4" "Seth Vidal" "" .SH "NAME" .LP mock \- build a SRPM in a chroot .SH "SYNTAX" .LP mock [\-r CHROOT] [\-\-no\-clean] [\-\-arch=ARCH] [\-\-debug] [\-\-resultdir=RESULTDIR] [\-\-statedir=STATEDIR] [\-\-uniqueext=UNIQUEEXT] \fIfilename\fR .SH "DESCRIPTION" .LP Mock is a simple chroot/rpm building program. It doesnt do anything terribly fancy other than build a single srpm at a time in a chroot. .SH "OPTIONS" .LP .TP \fB\-r\fR \fICHROOT\fP Uses specified chroot configuration as defined in /etc/mock/<\fIchroot\fP>.cfg If none specified, uses the chroot linked to by /etc/mock/default.cfg .TP \fB\-\-no\-clean\fR Do not clean chroot before building package. .TP \fB\-\-arch=\fR\fIARCH\fP Specify target build arch. .TP \fB\-\-debug\fR Output copious debugging information. .TP \fB\-\-resultdir=\fR\fIRESULTDIR\fP Path to store resulting files (RPMs and build logs) .TP \fB\-\-help\fR Show usage information and exit. .TP \fB\-\-version\fR Show version number and exit. .TP .SH "FILES" .LP \fI/etc/mock/\fP .SH "EXAMPLES" .LP To rebuild test.src.rpm under the default chroot: .LP mock /path/to/test.src.rpm .LP To specify a different chroot (which must be defined in /etc/mock): .LP mock \-r fedora\-4\-i386\-core /path/to/test.src.rpm .SH "AUTHORS" .LP Seth Vidal .SH "SEE ALSO" .LP yum(8) rpmbuild(8) http://fedoraproject.org/wiki/Projects/Mock From fedora-extras-commits at redhat.com Fri Aug 5 09:33:33 2005 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Fri, 5 Aug 2005 05:33:33 -0400 Subject: rpms/svgalib - New directory Message-ID: <200508050933.j759XXQX016671@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/svgalib In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16651/svgalib Log Message: Directory /cvs/extras/rpms/svgalib added to the repository From fedora-extras-commits at redhat.com Fri Aug 5 09:33:33 2005 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Fri, 5 Aug 2005 05:33:33 -0400 Subject: rpms/svgalib/devel - New directory Message-ID: <200508050933.j759XX09016676@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/svgalib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16651/svgalib/devel Log Message: Directory /cvs/extras/rpms/svgalib/devel added to the repository From fedora-extras-commits at redhat.com Fri Aug 5 09:34:14 2005 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Fri, 5 Aug 2005 05:34:14 -0400 Subject: rpms/svgalib Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200508050934.j759YEnn016729@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/svgalib In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16698 Added Files: Makefile import.log Log Message: Setup of module svgalib --- NEW FILE Makefile --- # Top level Makefile for module svgalib all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Fri Aug 5 09:34:14 2005 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Fri, 5 Aug 2005 05:34:14 -0400 Subject: rpms/svgalib/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200508050934.j759YEG9016734@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/svgalib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16698/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module svgalib --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Fri Aug 5 09:37:42 2005 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Fri, 5 Aug 2005 05:37:42 -0400 Subject: rpms/svgalib import.log,1.1,1.2 Message-ID: <200508050937.j759bgDj016847@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/svgalib In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16807 Modified Files: import.log Log Message: auto-import svgalib-1.9.21-2 on branch devel from svgalib-1.9.21-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/svgalib/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 5 Aug 2005 09:34:11 -0000 1.1 +++ import.log 5 Aug 2005 09:37:40 -0000 1.2 @@ -0,0 +1 @@ +svgalib-1_9_21-2:HEAD:svgalib-1.9.21-2.src.rpm:1123234663 From fedora-extras-commits at redhat.com Fri Aug 5 09:37:42 2005 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Fri, 5 Aug 2005 05:37:42 -0400 Subject: rpms/svgalib/devel svgalib-1.4.3-fhs.patch, NONE, 1.1 svgalib-1.9.21-cfg.patch, NONE, 1.1 svgalib-1.9.21-demos.patch, NONE, 1.1 svgalib-1.9.21-makefiles.patch, NONE, 1.1 svgalib-1.9.21-wip.patch, NONE, 1.1 svgalib-1.9.21-wip2.patch, NONE, 1.1 svgalib-1.9.21-x86_64.patch, NONE, 1.1 svgalib-1.9.22.diff, NONE, 1.1 svgalib-todo, NONE, 1.1 svgalib.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200508050937.j759bgne016855@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/svgalib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16807/devel Modified Files: .cvsignore sources Added Files: svgalib-1.4.3-fhs.patch svgalib-1.9.21-cfg.patch svgalib-1.9.21-demos.patch svgalib-1.9.21-makefiles.patch svgalib-1.9.21-wip.patch svgalib-1.9.21-wip2.patch svgalib-1.9.21-x86_64.patch svgalib-1.9.22.diff svgalib-todo svgalib.spec Log Message: auto-import svgalib-1.9.21-2 on branch devel from svgalib-1.9.21-2.src.rpm svgalib-1.4.3-fhs.patch: --- NEW FILE svgalib-1.4.3-fhs.patch --- --- svgalib-1.4.3/doc/man1/savetextmode.1.debian 2004-07-16 17:36:23.000000000 +0200 +++ svgalib-1.4.3/doc/man1/savetextmode.1 2004-07-16 17:33:02.000000000 +0200 @@ -10,7 +10,11 @@ .SH DESCRIPTION These are simple scripts to save the SVGA register state when in textmode to the files -.IR /tmp/fontdata " and " /tmp/textregs +.IR /etc/vga/fontdata " and " /etc/vga/textregs +.RI ( $HOME/.vga/fontdata " and " $HOME/.vga/textregs +if directory +.I /etc/vga +is not writeable) or to restore it from these files. The actual utilities used are @@ -40,9 +44,13 @@ will understand. .SH FILES -.I /tmp/fontdata +.I /etc/vga/fontdata +or +.I $HOME/.vga/fontdata .br -.I /tmp/textregs +.I /etc/vga/textregs +or +.I $HOME/.vga/textregs .SH SEE ALSO --- svgalib-1.4.3/doc/man1/svgakeymap.1.debian 2004-07-16 17:36:23.000000000 +0200 +++ svgalib-1.4.3/doc/man1/svgakeymap.1 2004-07-16 17:33:02.000000000 +0200 @@ -9,7 +9,7 @@ Generates a keymap conversion file for .BR svgalib (7) from two keytable definitions. Keytables are searched for in -.I /usr/lib/kbd/keytables +.I /lib/kbd/keymaps and are automatically filtered through .BR gzip (1) if necessary. @@ -22,7 +22,7 @@ or piped in any creative manner you wish. .SH FILES -.I /usr/lib/kbd/keytables/*.map[.gz] +.I /lib/kbd/keymaps/*/*/*.map[.gz] .RS The system keytable files used by .BR loadkeys "(1)." --- svgalib-1.4.3/doc/README.keymap.debian 2004-07-16 17:36:23.000000000 +0200 +++ svgalib-1.4.3/doc/README.keymap 2004-07-16 17:33:02.000000000 +0200 @@ -83,7 +83,7 @@ equivalents in the layout expected by the program. A program called svgakeymap is provided to generate these maps from the -keytable files in /usr/lib/kbd/keytables; you must have perl for it to work. +keytable files in /lib/kbd/keymaps; you must have perl for it to work. Creating a keymap file with svgakeymap is easy; to make a map to convert scancodes from a US Dvorak keyboard to a US QWERTY keyboard as for our example above: --- svgalib-1.4.3/utils/runx.debian 2004-07-16 17:36:24.000000000 +0200 +++ svgalib-1.4.3/utils/runx 2004-07-16 17:33:02.000000000 +0200 @@ -5,8 +5,8 @@ # running X, and 'textmode' after. This will restore the textmode registers # and the VGA palette in addition to the VGA font. -echo Saving font in /tmp/fontdata -restorefont -w /tmp/fontdata +echo Saving font in $HOME/.fontdata +restorefont -w $HOME/.fontdata startx -echo Restoring font from /tmp/fontdata -restorefont -r /tmp/fontdata +echo Restoring font from $HOME/.fontdata +restorefont -r $HOME/.fontdata --- svgalib-1.4.3/utils/savetextmode.debian 2004-07-16 17:36:24.000000000 +0200 +++ svgalib-1.4.3/utils/savetextmode 2004-07-16 17:33:02.000000000 +0200 @@ -1,4 +1,14 @@ #!/bin/sh -rm -f /etc/vga/textregs /etc/vga/fontdata -restoretextmode -w /etc/vga/textregs -restorefont -w /etc/vga/fontdata +dir=/etc/vga +if [ ! -w "$dir" ]; then + dir="$HOME/.vga" + mkdir -p -m 700 "$dir" +fi +if [ -f /etc/textregs -o -f /etc/fontdata ]; then + echo >&2 "WARNING: the textregs and fontdata files have moved in this" + echo >&2 " release from /etc to /etc/vga; please remove or rename" + echo >&2 " your old versions." +fi +rm -f "$dir/textregs" "$dir/fontdata" +restoretextmode -w "$dir/textregs" +restorefont -w "$dir/fontdata" --- svgalib-1.4.3/utils/svgakeymap.debian 2004-07-16 17:36:24.000000000 +0200 +++ svgalib-1.4.3/utils/svgakeymap 2004-07-16 17:33:02.000000000 +0200 @@ -7,16 +7,16 @@ # svgakeymap [physical_map [program_map]] > output.keymap # # The conversion map is output to stdout; you may wish to redirect it. -# Keymaps are searched for in /usr/lib/kbd/keytables and are automatically +# Keymaps are searched for in /lib/kbd/keymaps and are automatically # filtered through gzip if necessary. # # Read the file README.keymap from the svgalib distribution for more info. -$ktd = "/usr/lib/kbd/keytables/"; +$ktd = "/lib/kbd/keymaps/"; if(scalar(@ARGV) > 0) { $inmap = $ARGV[0]; } else { - $inmap = "us"; + $inmap = "i386/qwerty/us"; } if(scalar(@ARGV) > 1) { $outmap = $ARGV[1]; @@ -34,7 +34,7 @@ unless(-e $bob) { # Tack a .gz on it - $bob .= ".map"; + $bob .= ".kmap"; #print "$bob\n"; unless(-e $bob) { --- svgalib-1.4.3/utils/textmode.debian 2004-07-16 17:36:24.000000000 +0200 +++ svgalib-1.4.3/utils/textmode 2004-07-16 17:33:02.000000000 +0200 @@ -1,4 +1,18 @@ #!/bin/sh -restoretextmode -r /etc/vga/textregs -restorefont -r /etc/vga/fontdata + +dir=/etc/vga +[ -w "$dir" ] || dir="$HOME/.vga" + +if [ -f "$dir/textregs" -o -f "$dir/fontdata" ]; then + restoretextmode -r "$dir/textregs" + restorefont -r "$dir/fontdata" +elif [ -f /etc/textregs -o -f /etc/fontdata ]; then + echo >&2 "WARNING: the textregs and fontdata files have moved in this" + echo >&2 " release from /etc to /etc/vga; please remove or rename" + echo >&2 " your old versions." + echo "Using old location for data files." + restoretextmode -r /etc/textregs + restorefont -r /etc/fontdata +fi + restorepalette svgalib-1.9.21-cfg.patch: --- NEW FILE svgalib-1.9.21-cfg.patch --- --- svgalib-1.9.21/src/config/libvga.config.cfg 2005-08-03 14:29:49.000000000 +0200 +++ svgalib-1.9.21/src/config/libvga.config 2005-08-03 14:32:43.000000000 +0200 @@ -11,7 +11,7 @@ Helper /dev/svga -# NoHelper # Disable use of the helper-kernelmodule (/dev/svga) and +NoHelper # Disable use of the helper-kernelmodule (/dev/svga) and # fallback to old ioperm/iopl and /dev/mem use. # If you have two vga cards with the same pci vendor id, svgalib will try @@ -43,14 +43,14 @@ # mouse MouseMan # Logitech MouseMan # mouse Spaceball # Spacetec Spaceball # mouse IntelliMouse # Microsoft IntelliMouse or Logitech MouseMan+ on serial port -# mouse IMPS2 # Microsoft IntelliMouse or Logitech MouseMan+ on PS/2 port +mouse IMPS2 # Microsoft IntelliMouse or Logitech MouseMan+ on PS/2 port # mouse pnp # plug'n'pray # mouse WacomGraphire # Wacom Graphire tablet/mouse # mouse DRMOUSE4DS # Digital Research double-wheeled mouse # mouse ExplorerPS2 # Microsoft Intellimouse Explorer PS/2 # mouse none # None -mouse unconfigured +# mouse unconfigured # (DEBIAN NOTE: the mouse used to default to microsoft, but this was changed # to fix bug #13458. If your mouse used to work fine, you can simply change @@ -129,6 +129,7 @@ # want to specify a different device for svgalib to use # mdev /dev/ttyS0 # mouse is at /dev/ttyS0 +mdev /dev/input/mice # Some multiprotocol mice will need one of the following: @@ -421,7 +422,7 @@ # Clockchip ICD2061A # The only one supported right now -# VesaText # Helps the VESA driver with text mode restoration +VesaText # Helps the VESA driver with text mode restoration # problems. # VesaSave 14 # changing value might help text mode restoring svgalib-1.9.21-demos.patch: --- NEW FILE svgalib-1.9.21-demos.patch --- --- svgalib-1.9.21/demos/testgl.c.demos 2002-04-03 09:31:14.000000000 +0200 +++ svgalib-1.9.21/demos/testgl.c 2005-07-01 20:51:55.000000000 +0200 @@ -184,7 +184,7 @@ if (!vga_hasmode(VGAMODE)) { printf("Mode not available.\n"); - exit(-1); + return -1; } VIRTUAL = 0; /* No virtual screen. */ if (vga_getmodeinfo(VGAMODE)->colors == 16 || @@ -224,5 +224,5 @@ if (VIRTUAL) gl_freecontext(backscreen); vga_setmode(TEXT); - exit(0); + return 0; } --- svgalib-1.9.21/demos/vgatweak.c.demos 2000-08-06 12:20:02.000000000 +0200 +++ svgalib-1.9.21/demos/vgatweak.c 2005-07-01 20:51:55.000000000 +0200 @@ -124,7 +124,7 @@ testmode(mode); else { printf("Error: Video mode not supported by driver\n"); - exit(-1); + return -1; } return 0; --- svgalib-1.9.21/demos/linearfork.c.demos 2000-01-06 13:12:36.000000000 +0100 +++ svgalib-1.9.21/demos/linearfork.c 2005-07-01 20:51:55.000000000 +0200 @@ -82,7 +82,7 @@ if (!vga_hasmode(vgamode)) { printf("Mode not available.\n"); - exit(1); + return 1; } vga_setmode(vgamode); vga_setlinearaddressing(); @@ -95,7 +95,7 @@ /* purposes. */ if (keyboard_init()) { printf("Could not initialize keyboard.\n"); - exit(1); + return 1; } /* Translate to 4 keypad cursor keys, and unify enter key. */ keyboard_translatekeys(TRANSLATE_CURSORKEYS | TRANSLATE_KEYPADENTER | @@ -161,5 +161,5 @@ keyboard_close(); /* Don't forget this! */ vga_setmode(TEXT); - exit(0); + return 0; } --- svgalib-1.9.21/demos/bg_test.c.demos 2000-01-06 13:12:36.000000000 +0100 +++ svgalib-1.9.21/demos/bg_test.c 2005-07-01 20:51:55.000000000 +0200 @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include --- svgalib-1.9.21/demos/accel.c.demos 2002-04-03 09:30:23.000000000 +0200 +++ svgalib-1.9.21/demos/accel.c 2005-07-01 20:51:55.000000000 +0200 @@ -97,7 +97,7 @@ if (accelfuncs == 0) { printf("No acceleration supported.\n"); - exit(0); + return 1; } printf("Accelflags: 0x%08X\n", accelfuncs); @@ -292,7 +292,7 @@ ); } vga_setmode(TEXT); - exit(-1); + return 0; } --- svgalib-1.9.21/demos/vgatest.c.demos 2005-01-27 11:34:16.000000000 +0100 +++ svgalib-1.9.21/demos/vgatest.c 2005-07-01 20:51:55.000000000 +0200 @@ -275,7 +275,7 @@ if (mode < 1 || mode > GLASTMODE) { printf("Error: Mode number out of range \n"); - exit(-1); + return -1; } } if (vga_hasmode(mode)) { @@ -285,7 +285,7 @@ } } else { printf("Error: Video mode not supported by driver\n"); - exit(-1); + return -1; } vga_setmode(TEXT); --- svgalib-1.9.21/demos/printftest.c.demos 2000-01-06 13:12:36.000000000 +0100 +++ svgalib-1.9.21/demos/printftest.c 2005-07-01 20:51:55.000000000 +0200 @@ -44,7 +44,7 @@ if (!vga_hasmode(vgamode)) { printf("Mode not available.\n"); - exit(1); + return 1; } vga_setmode(vgamode); @@ -68,5 +68,5 @@ vga_setmode(TEXT); - exit(retval); + return retval; } --- svgalib-1.9.21/demos/fun.c.demos 2002-07-20 18:33:54.000000000 +0200 +++ svgalib-1.9.21/demos/fun.c 2005-07-01 20:51:55.000000000 +0200 @@ -13,6 +13,7 @@ #include #include #include +#include #include #include --- svgalib-1.9.21/demos/bankspeed.c.demos 2002-04-03 09:31:22.000000000 +0200 +++ svgalib-1.9.21/demos/bankspeed.c 2005-07-01 20:51:55.000000000 +0200 @@ -125,7 +125,7 @@ if (!vga_hasmode(VGAMODE)) { printf("Mode not available.\n"); - exit(-1); + return -1; } VIRTUAL = 0; /* No virtual screen. */ if (vga_getmodeinfo(VGAMODE)->colors == 16 || @@ -165,5 +165,5 @@ t2=clock(); printf("total:%1.2f sec\n",(1.0*t2-t1)/CLOCKS_PER_SEC); vga_setmode(TEXT); - exit(0); + return 0; } --- svgalib-1.9.21/demos/eventtest.c.demos 2000-01-06 13:12:36.000000000 +0100 +++ svgalib-1.9.21/demos/eventtest.c 2005-07-01 20:51:55.000000000 +0200 @@ -3,6 +3,7 @@ #include #include #include +#include #include #include #include @@ -254,5 +255,5 @@ keyboard_close(); /* Don't forget this! */ #endif vga_setmode(TEXT); - exit(0); + return 0; } --- svgalib-1.9.21/demos/svidtune.c.demos 2000-01-06 13:12:36.000000000 +0100 +++ svgalib-1.9.21/demos/svidtune.c 2005-07-01 20:51:55.000000000 +0200 @@ -48,7 +48,7 @@ if (!vga_hasmode(vgamode)) { printf("Mode not available.\n"); - exit(1); + return 1; } vga_setmode(vgamode); @@ -176,5 +176,5 @@ vga_setmode(TEXT); - exit(retval); + return retval; } --- svgalib-1.9.21/demos/keytest.c.demos 2000-01-06 13:12:36.000000000 +0100 +++ svgalib-1.9.21/demos/keytest.c 2005-07-01 20:51:55.000000000 +0200 @@ -38,7 +38,7 @@ if (!vga_hasmode(vgamode)) { printf("Mode not available.\n"); - exit(1); + return 1; } printf("\nWARNING: This program will set the keyboard to RAW mode.\n" "The keyboard routines in svgalib have not been tested\n" @@ -61,7 +61,7 @@ /* purposes. */ if (keyboard_init()) { printf("Could not initialize keyboard.\n"); - exit(1); + return 1; } /* Translate to 4 keypad cursor keys, and unify enter key. */ keyboard_translatekeys(TRANSLATE_CURSORKEYS | TRANSLATE_KEYPADENTER | @@ -126,5 +126,5 @@ keyboard_close(); /* Don't forget this! */ vga_setmode(TEXT); - exit(0); + return 0; } --- svgalib-1.9.21/demos/scrolltest.c.demos 2000-01-12 21:03:39.000000000 +0100 +++ svgalib-1.9.21/demos/scrolltest.c 2005-07-01 20:51:55.000000000 +0200 @@ -304,5 +304,5 @@ demo3(); vga_setmode(TEXT); - exit(0); + return 0; } --- svgalib-1.9.21/demos/forktest.c.demos 2000-01-06 13:12:36.000000000 +0100 +++ svgalib-1.9.21/demos/forktest.c 2005-07-01 20:51:55.000000000 +0200 @@ -82,7 +82,7 @@ if (!vga_hasmode(vgamode)) { printf("Mode not available.\n"); - exit(1); + return 1; } vga_setmode(vgamode); gl_setcontextvga(vgamode); @@ -94,7 +94,7 @@ /* purposes. */ if (keyboard_init()) { printf("Could not initialize keyboard.\n"); - exit(1); + return 1; } /* Translate to 4 keypad cursor keys, and unify enter key. */ keyboard_translatekeys(TRANSLATE_CURSORKEYS | TRANSLATE_KEYPADENTER | @@ -160,5 +160,5 @@ keyboard_close(); /* Don't forget this! */ vga_setmode(TEXT); - exit(0); + return 0; } --- svgalib-1.9.21/demos/mjoytest.c.demos 2000-01-06 13:12:36.000000000 +0100 +++ svgalib-1.9.21/demos/mjoytest.c 2005-07-01 20:51:55.000000000 +0200 @@ -196,7 +196,7 @@ if (!vga_hasmode(vgamode)) { printf("Mode not available.\n"); - exit(-1); + return -1; } puts("In the demo, press\n" @@ -286,6 +286,6 @@ printf("Shutting down.\n"); vga_setmode(TEXT); - exit(0); + return 0; } --- svgalib-1.9.21/demos/speedtest.c.demos 2000-01-06 13:12:36.000000000 +0100 +++ svgalib-1.9.21/demos/speedtest.c 2005-07-01 20:51:55.000000000 +0200 @@ -1,4 +1,3 @@ - #include #include #include @@ -308,5 +307,5 @@ speed(); vga_setmode(TEXT); - exit(0); + return 0; } --- svgalib-1.9.21/demos/linearspeed.c.demos 2003-11-07 10:26:02.000000000 +0100 +++ svgalib-1.9.21/demos/linearspeed.c 2005-07-01 20:51:55.000000000 +0200 @@ -418,5 +418,5 @@ if(!fast)sysmem_speed(); vga_setmode(TEXT); - exit(0); + return 0; } --- svgalib-1.9.21/demos/testlinear.c.demos 2004-09-16 19:56:12.000000000 +0200 +++ svgalib-1.9.21/demos/testlinear.c 2005-07-01 20:51:55.000000000 +0200 @@ -11,7 +11,7 @@ #include #include #include -#include "../src/libvga.h" +#include "libvga.h" #define USE_LINEAR_ADDRESSING @@ -66,7 +66,7 @@ if (!(argc == 2 && strcmp(argv[1], "--force") == 0)) if (!(vga_getmodeinfo(vga_getdefaultmode())->flags & CAPABLE_LINEAR)) { printf("Linear addressing not supported for this chipset.\n"); - exit(1); + return 1; } vga_init(); vga_setmode(vga_getdefaultmode()); @@ -75,7 +75,7 @@ if (vga_setlinearaddressing() == -1) { vga_setmode(TEXT); printf("Could not set linear addressing.\n"); - exit(-1); + return -1; } #endif --- svgalib-1.9.21/demos/Makefile.demos 2004-11-16 08:59:52.000000000 +0100 +++ svgalib-1.9.21/demos/Makefile 2005-07-01 20:59:09.000000000 +0200 @@ -4,19 +4,15 @@ # This file is a part of SVGAlib. #---------------------------------------------------------------------- -include ../Makefile.cfg - -srcdir = .. -VPATH = $(srcdir)/demos - #---------------------------------------------------------------------- -# Compiler Section (overrides Makefile.cfg) +# Compiler Section #---------------------------------------------------------------------- -CFLAGS = $(WARN) $(OPTIMIZE) -I$(srcdir)/include -I$(srcdir)/gl $(DEBFLAGS) -ifeq (a.out, $(TARGET_FORMAT)) - CFLAGS += -DSVGA_AOUT -endif +CC = gcc +CFLAGS = -Wall -Wstrict-prototypes +CFLAGS += -fomit-frame-pointer -O2 -fno-strength-reduce -pipe -g +LDFLAGS = -s +LIBS = -lvgagl -lvga -lm #---------------------------------------------------------------------- # Rules Section @@ -25,51 +21,12 @@ PROGS = fun testgl speedtest mousetest vgatest scrolltest testlinear \ keytest testaccel accel forktest eventtest spin bg_test printftest \ joytest mjoytest bankspeed lineart linearspeed addmodetest \ - svidtune linearfork cursor vgatweak buildcsr - -# Determine what library (static or shared) we will be linking programs with -ifdef INSTALLSHAREDLIB - LIBS = -lvgagl -lvga -endif -ifndef LIBS - LIBS = ../staticlib/libvgagl.a ../staticlib/libvga.a -lm - LVGADEP = $(LIBS) -endif + svidtune linearfork cursor vgatweak all: $(PROGS) -.PHONY: all clean cleanbin dep - -$(PROGS): $(LVGADEP) - .c: $(CC) $(CFLAGS) $(LDFLAGS) -o $* $*.c $(LIBS) -rwpage: rwpage.pp - $(PC) -Rintel rwpage.pp - -testaccel: testaccel.c - $(CC) $(CFLAGS) $(LDFLAGS) -o testaccel testaccel.c $(LIBS) -lm - -accel: accel.c - $(CC) $(CFLAGS) $(LDFLAGS) -o accel accel.c $(LIBS) -lm - -linearspeed: linearspeed.c memset.o - $(CC) $(CFLAGS) $(LDFLAGS) -o linearspeed linearspeed.c memset.o $(LIBS) - -buildcsr: mkcur.o - $(CC) -o buildcsr $(LDFLAGS) mkcur.o -lvgagl -lvga - -clean: cleanbin - rm -f .depend *.o *~ *.bak core - -cleanbin: - rm -f $(PROGS) rwpage - -# -# No dependencies required here. -# - -dep: -.depend: - +clean: + rm -f $(PROGS) --- svgalib-1.9.21/demos/mousetest.c.demos 2000-01-06 13:12:36.000000000 +0100 +++ svgalib-1.9.21/demos/mousetest.c 2005-07-01 20:51:55.000000000 +0200 @@ -34,7 +34,7 @@ if (!vga_hasmode(vgamode)) { printf("Mode not available.\n"); - exit(-1); + return -1; } #ifndef MANUALLY_SETUP_MOUSE /* Enable automatic mouse setup at mode set. */ @@ -72,7 +72,7 @@ /* To be able to test fake mouse events... */ if (keyboard_init()) { printf("Could not initialize keyboard.\n"); - exit(1); + return 1; } /* Set the range for the wheel */ @@ -136,5 +136,5 @@ #endif vga_setmode(TEXT); - exit(0); + return 0; } svgalib-1.9.21-makefiles.patch: --- NEW FILE svgalib-1.9.21-makefiles.patch --- --- svgalib-1.9.21/utils/Makefile.makefiles 2005-03-18 11:59:49.000000000 +0100 +++ svgalib-1.9.21/utils/Makefile 2005-07-08 21:16:12.000000000 +0200 @@ -35,7 +35,6 @@ .o: $(CC) $(CFLAGS) $(LDFLAGS) -o $* $*.o $(LIBS) - chmod 4755 $* all: $(UTILPROGS) .PHONY: all clean cleanbin dep --- svgalib-1.9.21/Makefile.makefiles 2005-03-18 14:49:10.000000000 +0100 +++ svgalib-1.9.21/Makefile 2005-07-08 21:16:12.000000000 +0200 @@ -78,10 +78,6 @@ installheaders: @echo Installing header files in $(includedir). - @if [ -f /usr/include/vga.h ]; then \ - rm -f /usr/include/vga.h /usr/include/vgagl.h; \ - echo Old header files in /usr/include removed.; \ - fi @mkdir -p $(includedir) @cp $(SRCDIR)/src/vga.h $(includedir)/vga.h @chmod a+r $(includedir)/vga.h @@ -95,33 +91,19 @@ @chmod a+r $(includedir)/vgakeyboard.h installsharedlib: $(SHAREDLIBS) $(SVGALIBSHAREDSTUBS) - @if [ -f /usr/lib/libvga.sa ]; then \ - rm -f /usr/lib/libvga.sa /usr/lib/libvgagl.sa; \ - echo Old stubs in /usr/lib removed.; \ - fi -ifndef KEEPSHAREDLIBS - @echo "Removing shared library images (old & current)..." - @for i in $(OBSOLETELDIRS); do \ - rm -f `echo $(OBSOLETESHAREDIMAGES) | sed s?/lib/?$$i?g`; \ - done -endif @echo Installing shared library image as \ $(addprefix $(sharedlibdir)/,$(notdir $(SHAREDLIBS))). @for foo in $(notdir $(SHAREDLIBS)); do \ $(INSTALL_SHLIB) sharedlib/$$foo $(sharedlibdir)/$$foo; \ - (cd $(sharedlibdir); \ - ln -sf $$foo `echo $$foo | sed 's/\.so\..*/.so/'` ); \ + cp -d sharedlib/`echo $$foo | sed 's/\.so\..*/.so/'` $(sharedlibdir); \ + cp -d sharedlib/`echo $$foo | sed 's/\.so\..*/.so/'`.$(MAJOR_VER) $(sharedlibdir); \ done - @./fixldsoconf - @ldconfig installstaticlib: static @echo Installing static libraries in $(libdir). @mkdir -p $(libdir) - @rm -f /usr/lib/libvga.a @$(INSTALL_DATA) staticlib/libvga.a $(libdir)/libvga.a @chmod a+r $(libdir)/libvga.a - @rm -f /usr/lib/libvgagl.a @$(INSTALL_DATA) staticlib/libvgagl.a $(libdir)/libvgagl.a @chmod a+r $(libdir)/libvgagl.a @@ -130,14 +112,6 @@ echo No $(bindir) directory, creating it.; \ mkdir -p $(bindir); \ fi - @if [ -f /usr/bin/restorefont ]; then \ - echo Removing old utilities in /usr/bin.; \ - for x in $(UTILS); do rm -f /usr/bin/$$x; done; \ - fi - @if [ -f /usr/bin/convfont ]; then \ - echo Removing inappropriate utilities in /usr/bin.; \ - rm -f /usr/bin/convfont /usr/bin/setmclk; \ - fi @echo Installing textmode utilities in $(bindir): @echo "restorefont: Save/restore textmode font." @$(INSTALL_PROGRAM) utils/restorefont $(bindir) @@ -152,8 +126,10 @@ @echo "savetextmode: Script that saves textmode information used by 'textmode'." @$(INSTALL_SCRIPT) utils/savetextmode $(bindir) ifeq ($(LRMI),lrmi) - @echo "mode3: Restore textmode by setting VESA mode 3." + @echo "mode3: Restore textmode by setting VESA mode 3." @$(INSTALL_PROGRAM) lrmi-0.6m/mode3 $(bindir) + @echo "vga_reset: Restore textmode by resetting graphic board." + @cp lrmi-0.6m/vga_reset $(bindir) endif @echo "Installing keymap utilities in $(bindir):" @echo "svgakeymap: Perl script that generates scancode conversion maps." @@ -222,34 +198,6 @@ @echo demos/ and threedkit/. uninstall: - @echo "Removing textmode utilities..." - @for i in $(OBSOLETEBDIRS); do \ - for prog in $(UTILS); do \ - rm -f $$i$$prog ; \ - done ; \ - done - @echo "Removing shared library stubs (old & current)..." - @for i in $(OBSOLETELDIRS); do \ - rm -f `echo /lib/libvga.so.$(VERSION) /lib/libvgagl.so.$(VERSION) \ - $(OBSOLETELIBLINKS) /lib/libvga.sa /lib/libvgagl.sa \ - | sed s?/lib/?$$i?g`; \ - done -ifndef KEEPSHAREDLIBS - @echo "Removing shared library images (old & current)..." - @for i in $(OBSOLETELDIRS); do \ - rm -f `echo $(OBSOLETESHAREDIMAGES) | sed s?/lib/?$$i?g`; \ - done -endif - @echo "Removing static libraries..." - @for i in $(OBSOLETELDIRS); do \ - rm -f `echo /lib/libvga.a /lib/libvgagl.a | sed s?/lib/?$$i?g`; \ - done - @echo "Removing header files..." - @for i in $(OBSOLETEHDIRS); do \ - rm -f `echo $(OBSOLETEHEADERS) | sed s?/inc/?$$i?g`; \ - done - (cd doc; $(MAKE) -f $(SRCDIR)/doc/Makefile SRCDIR="$(SRCDIR)" uninstall) - SHAREDDIRS0 = sharedlib/mouse sharedlib/keyboard sharedlib/ramdac \ sharedlib/clockchip sharedlib/joystick \ @@ -335,7 +283,6 @@ distclean: (cd $(SRCDIR)/doc; $(MAKE) clean) - (cd $(SRCDIR)/doc; $(MAKE) ../0-README) (cd $(SRCDIR)/src; $(MAKE) clean) (cd $(SRCDIR)/gl; $(MAKE) clean) (cd $(SRCDIR)/utils; $(MAKE) clean) --- svgalib-1.9.21/threeDKit/Makefile.makefiles 2004-09-16 19:54:17.000000000 +0200 +++ svgalib-1.9.21/threeDKit/Makefile 2005-07-08 21:16:12.000000000 +0200 @@ -14,7 +14,7 @@ # Compiler Section (overrides Makefile.cfg) #---------------------------------------------------------------------- -INCLUDES += -I$(srcdir)/src +INCLUDES += -I$(srcdir)/src -I$(srcdir)/gl #---------------------------------------------------------------------- # Rules Section @@ -58,7 +58,7 @@ $(sharedlibdir)/lib3dkit.so.$(VERSION): lib3dkit.so.$(VERSION) $(INSTALL_SHLIB) $< $(sharedlibdir)/$< (cd $(sharedlibdir); ln -sf lib3dkit.so.$(VERSION) `echo lib3dkit.so.$(VERSION) | sed 's/\.so\..*/.so/'` ) - ldconfig + (cd $(sharedlibdir); ln -sf lib3dkit.so.$(VERSION) `echo lib3dkit.so.$(VERSION) | sed 's/\.so\..*/.so/'`.$(MAJOR_VER) ) install: $(sharedlibdir)/lib3dkit.so.$(VERSION) installheaders --- svgalib-1.9.21/src/Makefile.makefiles 2005-02-03 12:31:43.000000000 +0100 +++ svgalib-1.9.21/src/Makefile 2005-07-08 21:16:12.000000000 +0200 @@ -448,13 +445,16 @@ libvga.so.$(VERSION): $(ALLOBJS) $(CC) -shared -Wl,-soname,libvga.so.$(MAJOR_VER) \ -Xlinker --retain-symbols-file -Xlinker ../src/exports \ - -Wl,-Bsymbolic -o libvga.so.$(VERSION) $(ALLOBJS) -lm + -Wl,-Bsymbolic -o libvga.so.$(VERSION) $(ALLOBJS) $(SHLIBLIBS) -lm + ln -sf libvga.so.$(VERSION) libvga.so + ln -sf libvga.so.$(VERSION) libvga.so.$(MAJOR_VER) $(sharedlibdir)/libvga.so.$(VERSION): libvga.so.$(VERSION) $(INSTALL_SHLIB) $< $(sharedlibdir)/$< - ldconfig install: $(sharedlibdir)/libvga.so.$(VERSION) + cp -df sharedlib/libvga.so $(sharedlibdir)/ + cp -df sharedlib/libvga.so.$(MAJOR_VER) $(sharedlibdir)/ endif @@ -471,9 +471,11 @@ vga.o: vga.c $(CC) $(CFLAGS) $(VGA_DEFINES) -c -o $@ $< -#lrmi must NOT be compiled as -fPIC +# XXX: Upstream used this so it may break, disabled to close an RC +# lrmi must NOT be compiled as -fPIC lrmi.o: lrmi.c - $(CC) $(CFLAGS:-fPIC=) -c -o $@ $< + $(CC) $(CFLAGS) -c -o $@ $< +# $(CC) $(CFLAGS:-fPIC=) -c -o $@ $< $(RAMDAC): %.o: %.c $(CC) $(CFLAGS) $(RAMDAC_DEFINES) -c -o $@ $< --- svgalib-1.9.21/gl/Makefile.makefiles 1999-07-18 10:14:45.000000000 +0200 +++ svgalib-1.9.21/gl/Makefile 2005-07-08 21:43:10.000000000 +0200 @@ -28,9 +28,12 @@ all: libvgagl.a .PHONY: all clean dep +libvgagl.so: libvgagl.so.$(VERSION) libvgagl.so.$(VERSION): $(MODULES) - $(CC) -s -shared -Wl,-soname,libvgagl.so.$(MAJOR_VER) -o libvgagl.so.$(VERSION) \ - $(MODULES) + $(CC) -shared -Wl,-soname,libvgagl.so.$(MAJOR_VER) -o libvgagl.so.$(VERSION) \ + $(MODULES) $(SHLIBLIBS) -L$(srcdir)/sharedlib -lvga + ln -sf libvgagl.so.$(VERSION) libvgagl.so + ln -sf libvgagl.so.$(VERSION) libvgagl.so.$(MAJOR_VER) libvgagl.a: $(MODULES) rm -f libvgagl.a @@ -63,7 +66,7 @@ $(CC) $(INCLUDES) -MM $(patsubst %.o,$(srcdir)/gl/%.c,$(MODULES)) >>.depend.gl clean: - rm -f .depend.gl *.bak *.o *~ libvgagl.a libvgagl.so.$(VERSION) + rm -f .depend.gl *.bak *.o *~ libvgagl.a libvgagl.so* # # include a dependency file if one exists svgalib-1.9.21-wip.patch: --- NEW FILE svgalib-1.9.21-wip.patch --- Only in svgalib-1.9.21: debugfiles.list Only in svgalib-1.9.21: debugsources.list Only in svgalib-1.9.21: sharedlib diff -urBbw svgalib-1.9.21.orig/src/drivers/fbdev.c svgalib-1.9.21/src/drivers/fbdev.c --- svgalib-1.9.21.orig/src/drivers/fbdev.c 2005-07-30 15:22:24.000000000 +0200 +++ svgalib-1.9.21/src/drivers/fbdev.c 2005-07-30 09:16:04.000000000 +0200 @@ -139,16 +139,18 @@ static void fbdev_setpage(int page) { - static int oldpage = 0; - - if (page != oldpage) + if (fbdev_vgamode) + { + __svgalib_vga_driverspecs.__svgalib_setpage(page); + } + else { mmap(BANKED_POINTER, __svgalib_banked_mem_size, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_FIXED, fbdev_fd, page << 16); - oldpage = page; + fbdev_banked_pointer_emulated = 1; } } @@ -239,8 +241,10 @@ { struct fb_var_screeninfo info; - if (!__svgalib_fbdev_novga && IS_IN_STANDARD_VGA_DRIVER(mode)) + if (IS_IN_STANDARD_VGA_DRIVER(mode)) { + if (__svgalib_fbdev_novga) + return 1; if (__svgalib_vga_driverspecs.setmode(mode, prv_mode)) return 1; if (fbdev_banked_pointer_emulated) @@ -288,8 +292,13 @@ struct fb_var_screeninfo info; unsigned g, bpp; - if (!__svgalib_fbdev_novga && IS_IN_STANDARD_VGA_DRIVER(mode)) + if (IS_IN_STANDARD_VGA_DRIVER(mode)) + { + if (__svgalib_fbdev_novga) + return 0; + else return __svgalib_vga_driverspecs.modeavailable(mode); + } if (fbdev_screeninfo(&info, mode)) return 0; @@ -356,7 +365,7 @@ struct fb_var_screeninfo info; int maxpixels = fbdev_memory; - if (!__svgalib_fbdev_novga && IS_IN_STANDARD_VGA_DRIVER(mode)) + if (IS_IN_STANDARD_VGA_DRIVER(mode)) return __svgalib_vga_driverspecs.getmodeinfo(mode, modeinfo); if (modeinfo->bytesperpixel) Only in svgalib-1.9.21/src/drivers: fbdev.c.wip Only in svgalib-1.9.21/src: svgalib_helper.h diff -urBbw svgalib-1.9.21.orig/src/vga.c svgalib-1.9.21/src/vga.c --- svgalib-1.9.21.orig/src/vga.c 2005-07-30 15:22:24.000000000 +0200 +++ svgalib-1.9.21/src/vga.c 2005-07-30 15:18:46.000000000 +0200 @@ -471,8 +471,13 @@ static unsigned long graph_buf_size = 0; static unsigned char *graph_buf = NULL; /* saves graphics data during flip */ -static unsigned char *font_buf1=NULL; /* saved font data - plane 2 */ -static unsigned char *font_buf2=NULL; /* saved font data - plane 3 */ +/* The format of the fontdata seems to differ between banked and LFB access, + so we save both in case emulatepage gets set between saving and restoring. + This can happen when using runinbackground in nohelper secure mode. */ +static unsigned char *font_buf1_banked=NULL; /* saved font data - plane 2 */ +static unsigned char *font_buf2_banked=NULL; /* saved font data - plane 3 */ +static unsigned char *font_buf1_linear=NULL; /* saved font data - plane 2 */ +static unsigned char *font_buf2_linear=NULL; /* saved font data - plane 3 */ static unsigned char *text_buf1=NULL; /* saved text data - plane 0 */ static unsigned char *text_buf2=NULL; /* saved text data - plane 1 */ @@ -859,8 +864,49 @@ static void __svgalib_giveup_perm(void) { - if (CHIPSET != FBDEV) + if (CHIPSET != FBDEV) { __svgalib_linear_mem_phys_addr = __svgalib_linear_mem_base; + /* Try get a pure handle to the LFB which can safely be left open + at all times, this will only work with 2.6 kernels. + This could be done in helper mode too, but we don't know the + real pci ID there, only the helper module id. Also this + is not usefull in helpermode since mem_fd must always be left + open in helpermode. */ + if (__svgalib_nohelper) { + unsigned int bus, device, fn; + char buf[256]; + FILE *f; + int i, fd; + + bus=(__svgalib_pci_card_found_at&0xff00)>>8; + device=(__svgalib_pci_card_found_at&0xf8)>>3; + fn=__svgalib_pci_card_found_at&0x07; + snprintf(buf, 256, "/sys/bus/pci/devices/0000:%02u:%02x.%u/resource", + bus, device, fn); + + f = fopen(buf, "r"); + if (f) { + for (i=0; fgets(buf, 256, f); i++) { + if (strtoul(buf, NULL, 16) == __svgalib_linear_mem_base) { + snprintf(buf, 256, + "/sys/bus/pci/devices/0000:%02u:%02x.%u/resource%i", + bus, device, fn, i); + fd = open(buf, O_RDWR); + if (fd != -1) { + __svgalib_linear_mem_fd = fd; + __svgalib_linear_mem_base = 0; +#ifdef DEBUG + fprintf(stderr, "svgalib: debug: Opened: %s as LFB\n", + buf); +#endif + } + break; + } + } + fclose(f); + } + } + } /* mmap graphics memory */ map_mem(); @@ -902,7 +948,7 @@ static void slowcpy(unsigned char *dest, unsigned char *src, unsigned bytes) { - if(dest==NULL || src==NULL || (int)dest==-1 || (int)src==-1) return; + if(dest==NULL || src==NULL || (long)dest==-1L || (long)src==-1L) return; while (bytes > 0) { *(uint32_t *)dest = *(uint32_t *)src; dest+=4; @@ -1649,16 +1695,30 @@ save_text(); /* Allocate space for textmode font. */ - font_buf1 = malloc(FONT_SIZE * 2); - font_buf2 = font_buf1 + FONT_SIZE; + if (!__svgalib_emulatepage) + { + font_buf1_banked = malloc(FONT_SIZE * 2); + font_buf2_banked = font_buf1_banked + FONT_SIZE; + } + if (LINEAR_POINTER) + { + font_buf1_linear = malloc(FONT_SIZE * 2); + font_buf2_linear = font_buf1_linear + FONT_SIZE; + } /* save font data in plane 2 */ __svgalib_outgra(0x04,0x02); - slowcpy(font_buf1, GM, FONT_SIZE); + if (!__svgalib_emulatepage) + slowcpy(font_buf1_banked, GM, FONT_SIZE); + if (LINEAR_POINTER) + slowcpy(font_buf1_linear, LINEAR_POINTER, FONT_SIZE); /* save font data in plane 3 */ __svgalib_outgra(0x04,0x03); - slowcpy(font_buf2, GM, FONT_SIZE); + if (!__svgalib_emulatepage) + slowcpy(font_buf2_banked, GM, FONT_SIZE); + if (LINEAR_POINTER) + slowcpy(font_buf2_linear, LINEAR_POINTER, FONT_SIZE); #endif } initialized = 1; @@ -1907,11 +1967,17 @@ /* restore font data in plane 2 - necessary for all VGA's */ __svgalib_outseq(0x02,0x04); - slowcpy(GM, font_buf1, FONT_SIZE); + if (__svgalib_emulatepage) + slowcpy(LINEAR_POINTER, font_buf1_linear, FONT_SIZE); + else + slowcpy(GM, font_buf1_banked, FONT_SIZE); /* restore font data in plane 3 - necessary for Trident VGA's */ __svgalib_outseq(0x02,0x08); - slowcpy(GM, font_buf2, FONT_SIZE); + if (__svgalib_emulatepage) + slowcpy(LINEAR_POINTER, font_buf2_linear, FONT_SIZE); + else + slowcpy(GM, font_buf2_banked, FONT_SIZE); fontloadingcomplete(); #endif /* change register adresses if monochrome text mode */ @@ -1935,11 +2001,17 @@ __svgalib_outgra(4,2); __svgalib_outgra(5,0); __svgalib_outgra(6,0); - slowcpy(GM, font_buf1, FONT_SIZE); + if (__svgalib_emulatepage) + slowcpy(LINEAR_POINTER, font_buf1_linear, FONT_SIZE); + else + slowcpy(GM, font_buf1_banked, FONT_SIZE); __svgalib_outseq(2,2); slowcpy(GM, text_buf2, FONT_SIZE); __svgalib_outseq(2,1); - slowcpy(GM, font_buf1, FONT_SIZE); + if (__svgalib_emulatepage) + slowcpy(LINEAR_POINTER, font_buf1_linear, FONT_SIZE); + else + slowcpy(GM, font_buf1_banked, FONT_SIZE); __svgalib_outseq(0,1); __svgalib_outseq(2,3); __svgalib_outseq(4,3); @@ -1993,11 +2065,17 @@ __svgalib_outgra(4,2); __svgalib_outgra(5,0); __svgalib_outgra(6,0); - slowcpy(font_buf1, GM, FONT_SIZE); + if (__svgalib_emulatepage) + slowcpy(font_buf1_linear, LINEAR_POINTER, FONT_SIZE); + else + slowcpy(font_buf1_banked, GM, FONT_SIZE); __svgalib_outgra(4,1); slowcpy(text_buf2, GM, FONT_SIZE); __svgalib_outseq(4,0); - slowcpy(font_buf1, GM, FONT_SIZE); + if (__svgalib_emulatepage) + slowcpy(font_buf1_linear, LINEAR_POINTER, FONT_SIZE); + else + slowcpy(font_buf1_banked, GM, FONT_SIZE); __svgalib_outseq(0,1); __svgalib_outseq(2,3); __svgalib_outseq(4,3); @@ -2078,7 +2156,7 @@ mouse_mode = mode; } if (__svgalib_emulatepage && (modeinfo->flags & CAPABLE_LINEAR) && - !(modeinfo->flags & IS_LINEAR)) { + !(modeinfo->flags & LINEAR_USE)) { __svgalib_driverspecs->linear(LINEAR_ENABLE, 0); __svgalib_modeinfo_linearset |= IS_LINEAR; } @@ -2097,6 +2175,12 @@ void vga_gettextfont(void *font) { unsigned int getsize; + unsigned char *font_buf1; + + if (__svgalib_emulatepage) + font_buf1 = font_buf1_linear; + else + font_buf1 = font_buf1_banked; /* robert at debian.org, May, 26th 2002: check for valid font_buf buffer */ if (!font_buf1) { @@ -2115,6 +2199,15 @@ void vga_puttextfont(void *font) { unsigned int putsize; + unsigned char *font_buf1, *font_buf2; + + if (__svgalib_emulatepage) { + font_buf1 = font_buf1_linear; + font_buf2 = font_buf2_linear; + } else { + font_buf1 = font_buf1_banked; + font_buf2 = font_buf2_banked; + } /* robert at debian.org, May, 26th 2002: check for valid font_buf buffer */ if (!font_buf1 || !font_buf2) { @@ -2236,7 +2328,7 @@ modeinfo = vga_getmodeinfo(mode); if (__svgalib_emulatepage && (mode!=G320x200x256) && - !(modeinfo->flags & (CAPABLE_LINEAR|IS_LINEAR))) + !(modeinfo->flags & (CAPABLE_LINEAR|LINEAR_USE))) return 0; return 1; @@ -3603,6 +3695,7 @@ break; #else fprintf(stderr,"svgalib: Warning: VESA support not enabled!\n"); + break; #endif case 57: /* Vesa save bitmap */ #ifdef INCLUDE_VESA_DRIVER @@ -3915,21 +4008,51 @@ __svgalib_come_from_background = va_arg(params, void *); break; default: - if (__svgalib_nohelper && __svgalib_nohelper_secure && stat) { + if ( ( stat && __svgalib_runinbackground) || + (!stat && !__svgalib_runinbackground) ) + break; /* nothing todo */ + if (stat) { + if (__svgalib_readpage != __svgalib_writepage) { + fprintf(stderr, + "svgalib: Warning runinbackground does not support seperate\n" + "read- and writepages, ignoring runinbackground request.\n"); + break; + } + if (__svgalib_mem_fd == -1) { + vga_modeinfo *modeinfo = vga_getmodeinfo(CM); + /* we don't have /dev/mem available so we can't do runinbackground + with the real banked mem, see if we do have an fd for the LFB + and if it is ok to switch to emulating pages. */ + if ((__svgalib_linear_mem_fd != -1) && ( (CM == TEXT) || ( + ( (modeinfo->flags & CAPABLE_LINEAR) || + (modeinfo->flags & LINEAR_USE) ) && + (!STDVGAMODE(CM) || (CM == G320x200x256)) ))) { + /* only do this if we are not already emulating pages */ + if (!__svgalib_emulatepage) + { + __svgalib_emulatepage=1; + __svgalib_setrdpage=NULL; + __svgalib_setwrpage=NULL; + if (CM != TEXT) { + (*__svgalib_setpage)(vga_page_offset); + if ((modeinfo->flags & CAPABLE_LINEAR) && + !(modeinfo->flags & LINEAR_USE)) { + __svgalib_driverspecs->linear(LINEAR_ENABLE, 0); + __svgalib_modeinfo_linearset |= IS_LINEAR; + } + } + map_banked(MAP_FIXED); + } + } else { fprintf(stderr, "svgalib: Warning runinbackground not supported in nohelper mode, ignoring\n" " runinbackground request. Program should check vga_runinbackground_version\n" " before calling vga_runinbackground\n"); break; } - if (stat && (__svgalib_readpage != __svgalib_writepage)) { - fprintf(stderr, - "svgalib: Warning runinbackground does not support seperate " - "read- and writepages, ignoring\n" - " runinbackground request.\n"); - break; } - if (!stat) + } + else /* if (stat) */ __svgalib_waitvtactive(); __svgalib_runinbackground = stat; @@ -3939,11 +4062,11 @@ /* Program can check, if it is safe to in background. */ int vga_runinbackground_version(void) { - /* we need to read the configfile here to get the correct value - for __svgalib_nohelper and __svgalib_nohelper_secure */ - readconfigfile(); + /* getchipset opens, maps and perhaps closes the LFB, + we need an open LFB to be able to runinbackground */ + __svgalib_getchipset(); - if (__svgalib_nohelper && __svgalib_nohelper_secure) + if (__svgalib_linear_mem_fd == -1) return 0; return 3; Only in svgalib-1.9.21/src: vga.c.wip Only in svgalib-1.9.21/src: vga.c~ diff -urBbw svgalib-1.9.21.orig/src/vgapci.c svgalib-1.9.21/src/vgapci.c --- svgalib-1.9.21.orig/src/vgapci.c 2005-07-30 15:22:24.000000000 +0200 +++ svgalib-1.9.21/src/vgapci.c 2005-07-30 09:16:04.000000000 +0200 @@ -10,6 +10,7 @@ int __svgalib_pci_helper_idev=0; int __svgalib_pci_nohelper_idev=0; +int __svgalib_pci_card_found_at=0; static void proc_pci_read_config(int device, unsigned int *buf, int size) { @@ -57,6 +58,7 @@ if(((conf[0]&0xffff)==vendor)&& (((conf[2]>>16)&0xffff)==0x0300)) { /* VGA Class */ proc_pci_read_config(device,conf,16); + __svgalib_pci_card_found_at = device; return device; } } Only in svgalib-1.9.21/src: vgapci.c.wip diff -urBbw svgalib-1.9.21.orig/src/vgapci.h svgalib-1.9.21/src/vgapci.h --- svgalib-1.9.21.orig/src/vgapci.h 2005-07-30 15:22:24.000000000 +0200 +++ svgalib-1.9.21/src/vgapci.h 2005-07-30 09:16:04.000000000 +0200 @@ -1,6 +1,7 @@ extern int __svgalib_pci_find_vendor_vga_pos(unsigned int vendor, unsigned int *conf); extern int __svgalib_pci_helper_idev; extern int __svgalib_pci_nohelper_idev; +extern int __svgalib_pci_card_found_at; extern void __svgalib_pci_write_config_dword(int pos, int address, unsigned int data); extern unsigned int __svgalib_pci_read_config_dword(int pos, int address); extern unsigned long __svgalib_pci_read_aperture_len(int pos, int address); Only in svgalib-1.9.21/src: vgapci.h.wip Only in svgalib-1.9.21/threeDKit: 3dinit.o Only in svgalib-1.9.21/threeDKit: 3dkit.o Only in svgalib-1.9.21/threeDKit: lib3dkit.so.1.9.22 Only in svgalib-1.9.21/threeDKit: quickmath.o Only in svgalib-1.9.21/threeDKit: swtriangle.o Only in svgalib-1.9.21/threeDKit: triangl.o Only in svgalib-1.9.21/threeDKit: triangle.o Only in svgalib-1.9.21/threeDKit: wrapsurf.o Only in svgalib-1.9.21/threeDKit: wtriangle.o Only in svgalib-1.9.21/utils: .depend Only in svgalib-1.9.21/utils: convfont Only in svgalib-1.9.21/utils: convfont.o Only in svgalib-1.9.21/utils: dumpreg Only in svgalib-1.9.21/utils: dumpreg.o Only in svgalib-1.9.21/utils: gtfcalc Only in svgalib-1.9.21/utils: restorefont Only in svgalib-1.9.21/utils: restorefont.o Only in svgalib-1.9.21/utils: restorepalette Only in svgalib-1.9.21/utils: restorepalette.o Only in svgalib-1.9.21/utils: restoretextmode Only in svgalib-1.9.21/utils: restoretextmode.o svgalib-1.9.21-wip2.patch: --- NEW FILE svgalib-1.9.21-wip2.patch --- Only in svgalib-1.9.21: debugfiles.list Only in svgalib-1.9.21: debugsources.list diff -urbBw svgalib-1.9.21.orig/demos/accel.c svgalib-1.9.21/demos/accel.c --- svgalib-1.9.21.orig/demos/accel.c 2005-07-30 15:22:24.000000000 +0200 +++ svgalib-1.9.21/demos/accel.c 2005-08-03 13:22:23.000000000 +0200 @@ -924,7 +924,8 @@ void QixDemo(int rop, char *txt) { int current = 0, dx1, dy1, dx2, dy2, i, cols = 1, cx1, cx2, cy1, cy2; int startclock, diffclock; - unsigned long pixels = 0, numlines = 0; + unsigned long pixels = 0; + unsigned int numlines = 0; struct { unsigned short x1; unsigned short y1; diff -urbBw svgalib-1.9.21.orig/demos/memset.c svgalib-1.9.21/demos/memset.c --- svgalib-1.9.21.orig/demos/memset.c 2002-07-20 18:58:13.000000000 +0200 +++ svgalib-1.9.21/demos/memset.c 2005-08-03 13:22:23.000000000 +0200 @@ -26,7 +26,7 @@ #undef memset -#define op_t unsigned long int +#define op_t unsigned int #define OPSIZ 4 Only in svgalib-1.9.21/demos: memset.c.wip2 diff -urbBw svgalib-1.9.21.orig/demos/spin.c svgalib-1.9.21/demos/spin.c --- svgalib-1.9.21.orig/demos/spin.c 2000-01-06 13:12:36.000000000 +0100 +++ svgalib-1.9.21/demos/spin.c 2005-08-03 13:22:23.000000000 +0200 @@ -78,9 +78,9 @@ #define HORIZONTAL 0 -typedef unsigned int WORD; +typedef unsigned short WORD; typedef unsigned char BYTE; -typedef unsigned long DWORD; +typedef unsigned int DWORD; typedef struct { float x, y, z; Only in svgalib-1.9.21/demos: spin.c.wip2 diff -urbBw svgalib-1.9.21.orig/gl/driver.c svgalib-1.9.21/gl/driver.c --- svgalib-1.9.21.orig/gl/driver.c 2000-04-18 11:45:18.000000000 +0200 +++ svgalib-1.9.21/gl/driver.c 2005-08-03 13:22:23.000000000 +0200 @@ -1135,7 +1135,7 @@ { char *vp; ASSIGNVP32(x1, y, vp); - __memsetlong(vp, c, x2 - x1 + 1); + __memset4(vp, c, x2 - x1 + 1); } void __svgalib_driver32p_hline(int x1, int y, int x2, int c) @@ -1148,11 +1148,11 @@ SETWRITEPAGED(vp, rvp, chunksize, page); l = (x2 - x1 + 1) * 4; if (l <= chunksize) - __memsetlong(rvp, c, l / 4); + __memset4(rvp, c, l / 4); else { - __memsetlong(rvp, c, chunksize / 4); + __memset4(rvp, c, chunksize / 4); vga_setpage(page + 1); - __memsetlong(VBUF, c, (l - chunksize) / 4); + __memset4(VBUF, c, (l - chunksize) / 4); } } @@ -1162,7 +1162,7 @@ int i; ASSIGNVP32(x, y, vp); for (i = 0; i < h; i++) { - __memsetlong(vp, c, w); + __memset4(vp, c, w); vp += BYTEWIDTH; } } @@ -1183,15 +1183,15 @@ vga_setpage(page); vp &= 0xffff; } else { /* page break within line */ - __memsetlong(VBUF + vp, c, (0x10000 - vp) / 4); + __memset4(VBUF + vp, c, (0x10000 - vp) / 4); page++; vga_setpage(page); - __memsetlong(VBUF, c, ((vp + w * 4) & 0xffff) / 4); + __memset4(VBUF, c, ((vp + w * 4) & 0xffff) / 4); vp = (vp + BYTEWIDTH) & 0xffff; continue; } }; - __memsetlong(VBUF + vp, c, w); + __memset4(VBUF + vp, c, w); vp += BYTEWIDTH; } } Only in svgalib-1.9.21/gl: driver.c.wip2 diff -urbBw svgalib-1.9.21.orig/gl/inlstring.h svgalib-1.9.21/gl/inlstring.h --- svgalib-1.9.21.orig/gl/inlstring.h 2005-04-17 09:07:19.000000000 +0200 +++ svgalib-1.9.21/gl/inlstring.h 2005-08-03 13:22:23.000000000 +0200 @@ -11,9 +11,8 @@ #define __memsetb(dst,c,n) memset((dst),(c),(n)) #define __memset(dst,c,n) memset((dst),(c),(n)) -static inline void *__memsetlong(void *s, long c, size_t count) { - long *p=s; - int i; +static inline void *__memset4(void *s, int c, size_t count) { + int i, *p=s; for(i=0;i>8); \ *((unsigned char *) (vp + 2)) = (c>>16); -#define insert_pixel_4 *((unsigned long *) vp) = c; +#define insert_pixel_4 *((unsigned int *) vp) = c; bytesperrow = BYTEWIDTH; @@ -301,7 +301,7 @@ *((unsigned char *) (vp + fp + 1)) = (c>>8); \ *((unsigned char *) (vp + fp + 2)) = (c>>16); -#define insert_pixel_4 *((unsigned long *) (vp + fp)) = c; +#define insert_pixel_4 *((unsigned int *) (vp + fp)) = c; if (MODETYPE == CONTEXT_PAGED) { Only in svgalib-1.9.21/gl: line.c.wip2 Only in svgalib-1.9.21: sharedlib diff -urbBw svgalib-1.9.21.orig/src/clockchip/clockchip.h svgalib-1.9.21/src/clockchip/clockchip.h --- svgalib-1.9.21.orig/src/clockchip/clockchip.h 1997-06-22 17:46:22.000000000 +0200 +++ svgalib-1.9.21/src/clockchip/clockchip.h 2005-08-03 13:22:23.000000000 +0200 @@ -25,7 +25,7 @@ void (*DAC_restoreState) (const unsigned char *regs); void (*DAC_initializeState) (unsigned char *regs, int bpp, int colormode, int pixelclock); - long TextFrequency; + int TextFrequency; int DAC_stateSize; } ClockChipMethods; Only in svgalib-1.9.21/src/clockchip: clockchip.h.wip2 diff -urbBw svgalib-1.9.21.orig/src/clockchip/icd2061a.c svgalib-1.9.21/src/clockchip/icd2061a.c --- svgalib-1.9.21.orig/src/clockchip/icd2061a.c 2004-09-10 13:12:14.000000000 +0200 +++ svgalib-1.9.21/src/clockchip/icd2061a.c 2005-08-03 13:22:23.000000000 +0200 @@ -43,7 +43,7 @@ {50.0, 51.0, 53.2, 58.5, 60.7, 64.4, 66.8, 73.5, 75.6, 80.9, 83.2, 91.5, 100.0, 120.0, 120.0000001}; -static long I2061A_SelectClock(long frequency) +static int I2061A_SelectClock(int frequency) /* in KHz */ { unsigned int m; @@ -99,10 +99,10 @@ } } } - return ((((((long) besti << 7) | (bestp - 3)) << 3) | bestm) << 7) | (bestq - 2); + return ((((((int) besti << 7) | (bestp - 3)) << 3) | bestm) << 7) | (bestq - 2); } -static int I2061A_GetClock(long dwv) +static int I2061A_GetClock(int dwv) { int clock_q = (dwv & 0x7f) + 2; int clock_m = (dwv >> 7) & 7; @@ -117,7 +117,7 @@ #define wrt_clk_bit(v) port_out_r(MIS_W, v), (void)port_in(crtcaddr), (void)port_in(crtcaddr) /* ATTENTION: This assumes CRTC registers and S3 registers to be UNLOCKED! */ [...2055 lines suppressed...] int dir; - long X; + int X; - long nz; - long g0, g1h = 0, g1l = 0; + int nz; + int g0, g1h = 0, g1l = 0; #ifdef INTERP - long c0; - long c_y; + int c0; + int c_y; #endif #ifdef WRAP - long X0, Y0; + int X0, Y0; int bf = tri->bf; - long xd_y, yd_y; + int xd_y, yd_y; #endif dir = 1; @@ -197,11 +197,11 @@ if (y2 == y0) return; - g0 = ((long) (x2 - x0) << SHLB) / (y2 - y0); + g0 = ((int) (x2 - x0) << SHLB) / (y2 - y0); if (y1 != y0) - g1h = ((long) (x1 - x0) << SHLB) / (y1 - y0); + g1h = ((int) (x1 - x0) << SHLB) / (y1 - y0); if (y2 != y1) - g1l = ((long) (x2 - x1) << SHLB) / (y2 - y1); + g1l = ((int) (x2 - x1) << SHLB) / (y2 - y1); dir = dir & 1; Only in svgalib-1.9.21/threeDKit: tri.c.wip2 diff -urbBw svgalib-1.9.21.orig/threeDKit/triangl.c svgalib-1.9.21/threeDKit/triangl.c --- svgalib-1.9.21.orig/threeDKit/triangl.c 1997-10-03 20:34:37.000000000 +0200 +++ svgalib-1.9.21/threeDKit/triangl.c 2005-08-03 13:22:23.000000000 +0200 @@ -146,33 +146,33 @@ static int px1, px2, py; -static long c; +static int c; #ifdef INTERP -static long c_x; +static int c_x; #endif #ifdef WRAP -static long xd, xd_x, yd, yd_x; +static int xd, xd_x, yd, yd_x; static unsigned char *dat; #endif -static long dx0, dy0; +static int dx0, dy0; #if defined(WRAP) && defined(INTERP) /* this must only occur once */ -long color_lookup[TRIANGLE_COLOR_LOOKUP_TABLE_SIZE]; -static long *_color_lookup; +int color_lookup[TRIANGLE_COLOR_LOOKUP_TABLE_SIZE]; +static int *_color_lookup; -void gl_trisetcolorlookup (int i, long c) +void gl_trisetcolorlookup (int i, int c) { if(i < TRIANGLE_COLOR_LOOKUP_TABLE_SIZE) color_lookup[i] = c; } -long gl_trigetcolorlookup (int i) +int gl_trigetcolorlookup (int i) { if(i < TRIANGLE_COLOR_LOOKUP_TABLE_SIZE) return color_lookup[i]; @@ -189,8 +189,8 @@ #else -extern long color_lookup[TRIANGLE_COLOR_LOOKUP_TABLE_SIZE]; -static long *_color_lookup; +extern int color_lookup[TRIANGLE_COLOR_LOOKUP_TABLE_SIZE]; +static int *_color_lookup; extern void (*tri_drawpoint) (int, int, int); static void (*_tri_drawpoint) (int, int, int); Only in svgalib-1.9.21/threeDKit: triangl.c.wip2 Only in svgalib-1.9.21/threeDKit: triangl.o diff -urbBw svgalib-1.9.21.orig/threeDKit/triangle.h svgalib-1.9.21/threeDKit/triangle.h --- svgalib-1.9.21.orig/threeDKit/triangle.h 1997-06-05 23:52:43.000000000 +0200 +++ svgalib-1.9.21/threeDKit/triangle.h 2005-08-03 13:22:23.000000000 +0200 @@ -23,7 +23,7 @@ void gl_striangle (int x0, int y0, int x1, int y1, int x2, int y2, int color, int bf); -void gl_trisetcolorlookup (int i, long c); -long gl_trigetcolorlookup (int i); +void gl_trisetcolorlookup (int i, int c); +int gl_trigetcolorlookup (int i); void gl_trisetdrawpoint (void (setpixelfunc) (int, int, int)); Only in svgalib-1.9.21/threeDKit: triangle.h.wip2 Only in svgalib-1.9.21/threeDKit: triangle.o diff -urbBw svgalib-1.9.21.orig/threeDKit/trisetpixel.c svgalib-1.9.21/threeDKit/trisetpixel.c --- svgalib-1.9.21.orig/threeDKit/trisetpixel.c 1997-10-03 20:34:41.000000000 +0200 +++ svgalib-1.9.21/threeDKit/trisetpixel.c 2005-08-03 13:22:23.000000000 +0200 @@ -219,7 +219,7 @@ unsigned short offst; int pg; declarevp; - long vp = 0; + int vp = 0; if (__clip) { if (y < __clipy1 || y > __clipy2) return; @@ -275,7 +275,7 @@ unsigned short offst; int pg; declarevp; - long vp = 0; + int vp = 0; if (__clip) { if (y < __clipy1 || y > __clipy2) return; Only in svgalib-1.9.21/threeDKit: trisetpixel.c.wip2 diff -urbBw svgalib-1.9.21.orig/threeDKit/wrapdemo.c svgalib-1.9.21/threeDKit/wrapdemo.c --- svgalib-1.9.21.orig/threeDKit/wrapdemo.c 2005-07-30 15:22:24.000000000 +0200 +++ svgalib-1.9.21/threeDKit/wrapdemo.c 2005-08-03 13:22:23.000000000 +0200 @@ -105,7 +105,7 @@ void xchgxy (TD_Surface * surf) { int j; - long t; + int t; for (j = 0; j < surf->l * surf->w; j++) { t = surf->point[j].x; @@ -169,7 +169,7 @@ /* These two are scale factors for the screen: */ /* xscale is now calculated so that the maximum volume (-2^15 to 2^15 or -2^31 to 2^31) will just fit inside the screen width at this distance: */ - ellip_demo->xscale = (long) ellip_demo->distance * EL_screen_width / (32768 * 2); + ellip_demo->xscale = (int) ellip_demo->distance * EL_screen_width / (32768 * 2); ellip_demo->yscale = (float) ellip_demo->xscale * EL_SCREEN_ASPECT * EL_screen_height / EL_screen_width; /*to get display aspect square */ Only in svgalib-1.9.21/threeDKit: wrapdemo.c.wip2 diff -urbBw svgalib-1.9.21.orig/threeDKit/wrapsurf.c svgalib-1.9.21/threeDKit/wrapsurf.c --- svgalib-1.9.21.orig/threeDKit/wrapsurf.c 1997-10-03 20:34:52.000000000 +0200 +++ svgalib-1.9.21/threeDKit/wrapsurf.c 2005-08-03 13:22:23.000000000 +0200 @@ -90,15 +90,15 @@ int, int, int, int, int, TD_tridata *) = s->draw_wtriangle; int mesh; - long d1, d2, d3, d4, d; - long x1, y1, c1; - long x2, y2, c2; - long x3, y3, c3; - long x4, y4, c4; - long u1, v1; - long u2, v2; - long u3, v3; - long u4, v4; + int d1, d2, d3, d4, d; + int x1, y1, c1; + int x2, y2, c2; + int x3, y3, c3; + int x4, y4, c4; + int u1, v1; + int u2, v2; + int u3, v3; + int u4, v4; int furthest, clockwise = 0; TD_tridata tri; Only in svgalib-1.9.21/threeDKit: wrapsurf.c.wip2 Only in svgalib-1.9.21/threeDKit: wrapsurf.o Only in svgalib-1.9.21/threeDKit: wtriangle.o Only in svgalib-1.9.21/utils: .depend Only in svgalib-1.9.21/utils: convfont Only in svgalib-1.9.21/utils: convfont.o Only in svgalib-1.9.21/utils: dumpreg Only in svgalib-1.9.21/utils: dumpreg.o Only in svgalib-1.9.21/utils: gtfcalc Only in svgalib-1.9.21/utils: restorefont Only in svgalib-1.9.21/utils: restorefont.o Only in svgalib-1.9.21/utils: restorepalette Only in svgalib-1.9.21/utils: restorepalette.o Only in svgalib-1.9.21/utils: restoretextmode Only in svgalib-1.9.21/utils: restoretextmode.o svgalib-1.9.21-x86_64.patch: --- NEW FILE svgalib-1.9.21-x86_64.patch --- --- svgalib-1.9.21/src/config/libvga.config.x86_64 2005-08-03 14:35:59.000000000 +0200 +++ svgalib-1.9.21/src/config/libvga.config 2005-08-03 14:35:59.000000000 +0200 @@ -347,35 +347,29 @@ # chipset VGA # Standard VGA # chipset EGA # EGA # chipset ET3000 # Tseng ET3000 -# chipset ET4000 # Tseng ET4000 # chipset Cirrus # Cirrus Logic GD542x/543x/544x -# chipset TVGA # Trident TVGA8900/9000 # chipset Oak # Oak Technologies 037/067/077 # chipset S3 # S3 chipsets # chipset GVGA6400 # Genoa 6400 # chipset ARK # ARK Logic # chipset ATI # old ATI VGA -# chipset Mach32 # ATI Mach32 # chipset ALI # ALI2301 # chipset Mach64 # ATI Mach64 - deprecated, use RAGE driver # chipset ET6000 # Tseng ET6000 # chipset APM # Alliance Technology AT 24/25/3D # chipset NV3 # nVidia Riva 128 -# chipset VESA # nicely behaved Vesa Bioses # chipset MX # MX86251 (some Voodoo Rush boards) # chipset PARADISE # WD90C31 # chipset RAGE # RagePro (and might work with some older mach64) # chipset BANSHEE # Banshee/V3. # chipset SIS # SiS 5597/6326/620/530 cards / integrated vga. # chipset I740 # Intel i740 based cards. -# chipset NEOMAGIC # chipset LAGUNA # Cirrus Logic Laguna series (546X) # chipset FBDEV # Use kernel fbdev, instead of direct hardware. # chipset G400 # Matrox Mystique/G100/G200/G400/G450 # chipset R128 # Ati Rage128 and Radeon # chipset SAVAGE # S3 chipsets Savage, Virge, and some Trio64 # chipset MILLENNIUM # Matrox Millennium and Millennium II -# chipset I810 # Intel i810/815 integrated video # chipset TRIDENT # Trident PCI and AGP chipsets # chipset RENDITION # Rendition V2100/V2200 # chipset G450C2 @@ -422,12 +416,6 @@ # Clockchip ICD2061A # The only one supported right now -VesaText # Helps the VESA driver with text mode restoration - # problems. - -# VesaSave 14 # changing value might help text mode restoring - # problems with VESA driver. Legal values: 0-15 - # NoVCControl # Disables svgalib's finding a new VC if run # from X, also disables svgalib restoring textmode when # switching VC's (bad). Good fo using dumpreg under X, @@ -439,9 +427,6 @@ # try enabling this. If it helps, please report to # me (matan at svgalib.org) -# NeoMagicLibretto100 # Enable if you have a NeoMagic card on a Toshiba - # Libretto 100, 110, etc - # FbdevNoVga # When this is set the FBDEV chipset drivers doesn't # (try to) use standardvga modes through the vga driver. # this means that no special rights other then access to svgalib-1.9.22.diff: --- NEW FILE svgalib-1.9.22.diff --- diff -X xclude -ubBwrN svgalib-1.9.21/Makefile svgalib-1.9.22/Makefile --- svgalib-1.9.21/Makefile 2005-03-18 15:49:10.000000000 +0200 +++ svgalib-1.9.22/Makefile 2005-05-10 15:53:08.000000000 +0300 @@ -213,7 +213,7 @@ lib3dkit-install: (cd threeDKit/; $(MAKE) install) -install: uninstall installheaders $(INSTALLSHAREDLIB) installconfig \ +install: installheaders $(INSTALLSHAREDLIB) installconfig \ $(INSTALLSTATICLIB) $(INSTALLUTILS) $(INSTALLMAN) $(INSTALLMODULE) $(INSTALLDEV) \ lib3dkit-install @echo diff -X xclude -ubBwrN svgalib-1.9.21/Makefile.cfg svgalib-1.9.22/Makefile.cfg --- svgalib-1.9.21/Makefile.cfg 2005-04-14 23:21:02.000000000 +0300 +++ svgalib-1.9.22/Makefile.cfg 2005-07-25 22:21:59.000000000 +0300 @@ -9,7 +9,7 @@ # to n means yes! MAJOR_VER = 1 -MINOR_VER = 9.21 +MINOR_VER = 9.22 VERSION = $(MAJOR_VER).$(MINOR_VER) #---------------------------------------------------------------------- @@ -74,8 +74,10 @@ # DEBUG_ACCEL = yes # DEBUG_KEYBOARD = yes -# uncomment this if you want to compile svgalib to work without kernel -# helper - this means that svgalib programs need to run as root. +# uncomment this if you want do not want to compile and install the svgalib +# kernel helper. - This means that svgalib programs need to run as root, you +# must also enable the NoHelper line in libvga.config. Or you can compile and +# install the svgalib kernel helper seperatly. # NO_HELPER = y # uncomment this if your compiler fails on compiling the assembler in diff -X xclude -ubBwrN svgalib-1.9.21/demos/bg_test.c svgalib-1.9.22/demos/bg_test.c --- svgalib-1.9.21/demos/bg_test.c 2000-01-06 14:12:36.000000000 +0200 +++ svgalib-1.9.22/demos/bg_test.c 2005-07-16 22:59:22.000000000 +0300 @@ -57,13 +57,13 @@ } vga_init(); printf("This is small test for background runin.\n"); - if (vga_runinbackground_version()==1) + if (vga_runinbackground_version()==1 || vga_runinbackground_version()>=3) { - printf("Background runin enabled. mode 1\n"); + printf("Background runin enabled. mode %d\n", vga_runinbackground_version()); } else { - printf("Svgalib is not mode 1 background capable.\n"); + printf("Svgalib is not background capable.\n"); printf("Test ended.\n"); return(0); } diff -X xclude -ubBwrN svgalib-1.9.21/demos/testgl.c svgalib-1.9.22/demos/testgl.c --- svgalib-1.9.21/demos/testgl.c 2002-04-03 10:31:14.000000000 +0300 +++ svgalib-1.9.22/demos/testgl.c 2005-07-27 14:46:06.000000000 +0300 @@ -173,7 +173,7 @@ { vga_init(); - if(argc==2) { + if(argc>=2) { timescale=atoi(argv[1]); if(timescale<1)timescale=1; } @@ -205,6 +205,8 @@ if (COLORS == 256) gl_setrgbpalette(); + if(argc==3)sleep(2); + test(); /* Now do the same with clipping enabled. */ diff -X xclude -ubBwrN svgalib-1.9.21/doc/Makefile svgalib-1.9.22/doc/Makefile --- svgalib-1.9.21/doc/Makefile 2002-12-19 23:44:33.000000000 +0200 +++ svgalib-1.9.22/doc/Makefile 2005-07-02 19:21:57.000000000 +0300 @@ -3,18 +3,21 @@ srcdir = .. VPATH = $(srcdir)/doc -SVGALIB1=man7/svgalib.7 man5/libvga.config.5 man7/svgalib.chips.7\ +SVGALIB1=man7/svgalib.7 man5/libvga.config.5 man5/libvga.et4000.5 \ + man5/svgalibrc.5 man7/svgalib.chips.7 \ man7/svgalib.et4000.7 man7/svgalib.mach32.7\ man6/mach32info.6 man3/vga_* man3/keyboard_* man3/mouse_* \ + man3/joystick_* man3/currentcontext.3 man3/graph_mem.3 \ man1/convfont.1 man1/dumpreg.1 man1/fix132x43.1 man1/restorefont.1 \ man1/restorepalette.1 man1/restoretextmode.1 man1/runx.1 man1/savetextmode.1 \ man1/setmclk.1 man1/textmode.1\ man1/svgakeymap.1 \ + man6/joytest.6 man6/mjoytest.6 man6/printftest.6 man6/svidtune.6 \ man6/eventtest.6 man6/forktest.6 man6/fun.6 man6/keytest.6\ man6/mousetest.6 man6/speedtest.6 man6/spin.6\ man6/testaccel.6 man6/threed.6 man6/vgatest.6 man6/accel.6\ man6/bg_test.6 man6/scrolltest.6 man6/testlinear.6\ - man8/mode3.8 man6/lineart.6 + man7/svgalib.faq.7 man8/mode3.8 man8/vga_reset.8 man6/lineart.6 VGAGL1=man7/vgagl.7 $(shell ls man3/gl_* | grep -v tri ) man6/testgl.6 @@ -23,25 +26,20 @@ SVGALIB=$(subst man,$(srcdir)/doc/man,$(SVGALIB1)) VGAGL=$(subst man,$(srcdir)/doc/man,$(VGAGL1)) THREED=$(subst man,$(srcdir)/doc/man,$(THREED1)) -MANPAGES=$(shell cd $(srcdir)/doc; find man? -type f -print) -UNCOMANPAGES=$(subst .gz, , $(MANPAGES)) +COMPMANPAGES=$(shell cd $(srcdir)/doc; find man? -name "*.gz" -type f -print) .PHONY: clean ascii dvi ps install gunzip gzip gunzip: - for dir in man?; do\ - echo gunzipping manpages in $$dir;\ - for file in $$dir/*; do \ - gunzip $$file; \ - done; \ + echo gunzipping manpages + for i in $(COMPMANPAGES); do\ + gunzip $$i; \ done gzip: - for dir in man?; do\ - echo gzipping manpages in $$dir;\ - for file in $$dir/*; do \ - gzip $$file; \ - done; \ + echo gzipping manpages + for i in $(SVGALIB1) $(VGAGL1) $(THREED1); do\ + gzip $$i; \ done ../0-README: man7/svgalib.7 @@ -68,18 +66,10 @@ install: gzip mkdir -p $(mandir)/man1 $(mandir)/man3 $(mandir)/man5 \ $(mandir)/man6 $(mandir)/man7 $(mandir)/man8 - $(INSTALL_DATA) $(srcdir)/doc/man1/* $(mandir)/man1 - $(INSTALL_DATA) $(srcdir)/doc/man3/* $(mandir)/man3 - $(INSTALL_DATA) $(srcdir)/doc/man5/* $(mandir)/man5 - $(INSTALL_DATA) $(srcdir)/doc/man6/* $(mandir)/man6 - $(INSTALL_DATA) $(srcdir)/doc/man7/* $(mandir)/man7 - $(INSTALL_DATA) $(srcdir)/doc/man8/* $(mandir)/man8 - for dir in man? ; do \ - echo gunzipping manpages in $$dir;\ - for file in $$dir/*; do \ - gunzip $$file; \ - done; \ + for i in $(COMPMANPAGES); do\ + $(INSTALL_DATA) $(srcdir)/doc/$$i $(mandir)/$$i; \ done + make gunzip ifdef MAKEWHATIS @echo "Rebuilding the whatis database (this is slow!)" @echo "You can comment this out in Makefile.cfg!" @@ -88,10 +78,10 @@ uninstall: @echo Removing all svgalib man pages. - @for dir in $(mandir) /usr/man /usr/local/man; do \ + @for dir in $(mandir) ; do \ if [ -d $$dir ]; then \ cd $$dir; \ - rm -f $(MANPAGES) $(UNCOMANPAGES); \ + rm -f $(COMPMANPAGES) $(UNCOMANPAGES); \ fi; \ done;\ diff -X xclude -ubBwrN svgalib-1.9.21/doc/man8/vga_reset.8 svgalib-1.9.22/doc/man8/vga_reset.8 --- svgalib-1.9.21/doc/man8/vga_reset.8 1970-01-01 02:00:00.000000000 +0200 +++ svgalib-1.9.22/doc/man8/vga_reset.8 2005-07-02 18:47:49.000000000 +0300 @@ -0,0 +1,17 @@ +.TH vga_reset 8 2004-01-26 "Svgalib (>= 1.4.0)" "Svgalib User Manual" +.SH NAME +vga_reset \- reset video graphic board +.SH SYNOPSIS +.B vga_reset +.SH DESCRIPTION +Call real mode c000:0003, which should be the video card's initialization +routine. Should work in some cases when mode3 fails to restore text mode. +.SH BUGS +Using this program is unsafe, and might (depending on the bios) result in +a video card in a state that requires a hard reset to restore to normal, +or even a hung computer. +.SH SEE ALSO +.BR mode3 (8). +.SH AUTHOR +This manual page was written by Guillem Jover . + diff -X xclude -ubBwrN svgalib-1.9.21/gl/grlib.c svgalib-1.9.22/gl/grlib.c --- svgalib-1.9.21/gl/grlib.c 2002-04-19 11:15:31.000000000 +0300 +++ svgalib-1.9.22/gl/grlib.c 2005-07-27 14:48:42.000000000 +0300 @@ -3,6 +3,7 @@ [...6677 lines suppressed...] } #endif /* TESTING */ diff -X xclude -ubBwrN svgalib-1.9.21/utils/restorefont.c svgalib-1.9.22/utils/restorefont.c --- svgalib-1.9.21/utils/restorefont.c 1997-12-04 23:48:32.000000000 +0200 +++ svgalib-1.9.22/utils/restorefont.c 2005-07-02 18:41:30.000000000 +0300 @@ -4,6 +4,7 @@ #include #include #include +#include "../src/libvga.h" /* * Note: Observe that when writing the font to a file, the file to write is @@ -11,11 +12,11 @@ * given up). This means that there is no major security hole lurking here. */ -void main(int argc, char *argv[]) +int main(int argc, char *argv[]) { FILE *f; unsigned char *font; - size_t font_size = 0x2000; /* buffer size in 1.2.11 and before */ + size_t font_size = FONT_SIZE; /* buffer size in 1.2.11 and before */ int can_set = 0; struct stat statbuf; @@ -24,23 +25,23 @@ printf("Syntax: restorefont option filename\n"); printf(" -r filename Restore VGA font from file.\n"); printf(" -w filename Write current VGA font to file.\n"); - exit(0); + return 0; } if (argv[1][0] != '-') { printf("Must specify -r or -w.\n"); - exit(1); + return 1; } switch (argv[1][1]) { case 'r': case 'w': if (argc != 3) { printf("Must specify filename.\n"); - exit(1); + return 1; } break; default: printf("Invalid option. Must specify -r or -w.\n"); - exit(1); + return 1; } vga_disabledriverreport(); vga_setchipset(VGA); /* avoid SVGA detection */ @@ -52,6 +53,9 @@ can_set = 1; /* Query the preferred data size: */ font_size = vga_ext_set(VGA_EXT_FONT_SIZE, 0); + if (font_size < FONT_SIZE) { + font_size = FONT_SIZE; + } } } @@ -71,7 +75,7 @@ perror("restorefont"); ex_no_errno: vga_setmode(TEXT); - exit(1); + return 1; } if (fstat(fileno(f), &statbuf)) goto error; @@ -113,5 +117,5 @@ break; } vga_setmode(TEXT); - exit(0); + return 0; } diff -X xclude -ubBwrN svgalib-1.9.21/utils/restorepalette.c svgalib-1.9.22/utils/restorepalette.c --- svgalib-1.9.21/utils/restorepalette.c 2002-02-20 14:24:53.000000000 +0200 +++ svgalib-1.9.22/utils/restorepalette.c 2005-07-10 22:26:49.000000000 +0300 @@ -105,7 +105,7 @@ } } -void +int main (int argc, char *argv[]) { int i; @@ -117,6 +117,7 @@ if (vga_getcurrentchipset () != EGA) { /* Restore textmode/16-color mode palette */ + if (vga_getcurrentchipset() != FBDEV) for (i = 0; i < 16; i++) { port_in (IS1_RC); @@ -132,9 +133,11 @@ vga_setpalette (i, default_red[i], default_green[i], default_blue[i]); + if (vga_getcurrentchipset() != FBDEV) { port_in (IS1_RC); delay (); port_out (0x20, ATT_IW); /* enable display */ } - exit (0); + } + return 0; } diff -X xclude -ubBwrN svgalib-1.9.21/utils/restoretextmode.c svgalib-1.9.22/utils/restoretextmode.c --- svgalib-1.9.21/utils/restoretextmode.c 1996-12-18 01:12:28.000000000 +0200 +++ svgalib-1.9.22/utils/restoretextmode.c 2005-07-02 18:41:30.000000000 +0300 @@ -14,7 +14,7 @@ unsigned char regs[MAX_REGS]; -void +int main (int argc, char *argv[]) { vga_init (); @@ -24,12 +24,12 @@ printf ("Syntax: restoretextmode option filename\n"); printf (" -r filename Restore registers from file.\n"); printf (" -w filename Write registers to file.\n"); - exit (0); + return 0; } if (argv[1][0] != '-') { printf ("Must specify -r or -w.\n"); - exit (1); + return 1; } switch (argv[1][1]) { @@ -38,12 +38,12 @@ if (argc != 3) { printf ("Must specify filename.\n"); - exit (1); + return 1; } break; default: printf ("Invalid option. Must specify -r or -w.\n"); - exit (1); + return 1; } if (argv[1][1] == 'r') { @@ -53,14 +53,14 @@ { error: perror ("restoretextmode"); - exit (1); + return 1; } if (1 != fread (regs, MAX_REGS, 1, f)) { if (errno) goto error; puts ("restoretextmode: input file corrupted."); - exit (1); + return 1; } fclose (f); } @@ -86,5 +86,5 @@ if (fclose (f)) goto error; } - exit (0); + return 0; } diff -X xclude -ubBwrN svgalib-1.9.21/utils/setmclk.c svgalib-1.9.22/utils/setmclk.c --- svgalib-1.9.21/utils/setmclk.c 2004-09-10 17:35:45.000000000 +0300 +++ svgalib-1.9.22/utils/setmclk.c 2005-07-02 18:41:30.000000000 +0300 @@ -51,7 +51,7 @@ printf ("Not a Cirrus.\n"); printf ("Continue anyway (y/n)?\n"); if (getchar () != 'y') - exit (-1); + return -1; } /* Unlock extended registers. */ @@ -85,5 +85,5 @@ OUTB (0x3c5, NEW_MCLK); printf ("New MCLK value: %02x\n", NEW_MCLK); - exit (0); + return 0; } --- NEW FILE svgalib-todo --- wip: -don't allow any vga modes (not even 320x200x256, mode 5) with fbdev and fbdev_novga, it barfs in vgaclear.c because of outb instructions. If the framebuffer can handle it, it will still be available as mode 146. -use /sys/bus/pci for linear fd. -when mem_fd == -1 (nohelper, secure) and linear_fd != -1 and trying to set runinbackground and CM can handle emulatepage set emulatepage instead of refusing to runinbackground. wip2: -fix a cut and paste error in fbdev.c which caused fbdev_set_virtual_height to not do anything, leaving yres_virtual at yres . -add fbdev_put_vscreeninfo, which tries to put the vscreen info three times before giving up: 1st with yres_virtual as calculated by fbdev_set_virtual_height 2nd with yres_virtual set to 2x yres 3th with yres_virtual set to yres This is needed because even with the max of 8192 in fbdev_set_virtual_height fbdev still doesn't like the yres_virtuals we calculate for all modes, with this 3 attempts approach much more modes are available. -update fbdev_getmodeinfo to calculate maxpixels based on the yres_virtual which actually succeeded. -check all uses of long, replace most with int because: -most of the times a 32 bit variable is enough (it works on i386 where a long is 32 bit doesn't it), 64 bit is a waste of memory and slower. -sometimes a long ptr is used to walk past MMIO mapped 32 bits registers, which causes it to walk in steps of 64 bits, skipping a reg each time, which is a plain bug. This also goes for other use of long ptrs to point to 32 bits data (memsetlong, memcpylong) . -change modeline for 640x480 at 72Hz in timing.c to Xorg's builtin default modeline for 640x480 at 72Hz, the old one makes my monitor go into powersaving mode. -restore textmode and return an error code if chipset_setregs fails in vga_setmode. -use the same checks done in vga_runinbackground, in vga_runinbackgroundversion to determine if runinbackground is ok. -add fbdev_novga docs to libvga.config todo: -check mode 5 (320x200x256, vgadriver, 146 works fine) and 145 (400x300 modeX) with radeon. -VESA on x86_64 ?! cleanups: -clean up makefiles, use TOPDIR everywhere, set include paths so that compilation of utils, gl threeDkit will work without install libvga first -check init return value in setchip xxx. -This has inspired me to get rid of the unneeded GM pointer in svgalib, GM (in drivers sometimes still called __svgalib_graph_mem) always points to BANKED_POINTER after a setmode, and no code checks for it not being set (which is ok, progs should call setmode before drawingfuncs) so tomorrow I'm going through the entire source and replace it all with BANKED_POINTER. Which imho is a better name, and makes things less confusing, why have 2 ptrs for the same thing? -vga_setchipsetandfeatures should do same sanitychecks as vga_setchipset -move come from background call to above forbidvtrelease=0 -add chipset range check to disable_chipset, setchipset -get_perm in vga_fork is bullshit, because done already is 1 so it will do nothing! Same goes for __vga_map; -ioperm is not needed when doing iopl, what does iopl(value lower then 3) do? -ioperm does nog get inherited by fork, iopl does. -vga_set_LRMI_callbacks is done in a zillion places -move only do this once readconfig var to readconfig func. -move only do this once vars for map_mmio and map_mem to the funcs. -__svgalib_flipaway may be made static -__svgalib_runinbackground may be made static -map_mem may be made static -__svgalib_savemem may be removed -don't open /dev/mem in drivers instead use mem_fd -do we need to make sure fd's 0,1,2, are going somewhere in vga_init, or can this be delayed till open_mem? -Remove release_acquire debug stuff -properly check mmap, fork execv and other return values. -make map_vgaxxxio static strangeness: -inconsistent use of __svgalib_secondary in flip_away vs flip_back -vga_flip vs console switches --- NEW FILE svgalib.spec --- Name: svgalib Version: 1.9.21 Release: 2 Summary: Low-level fullscreen SVGA graphics library Group: System Environment/Libraries License: Public Domain URL: http://www.svgalib.org/ Source0: http://www.arava.co.il/matan/svgalib/svgalib-%{version}.tar.gz Source1: svgalib-todo Patch0: svgalib-1.9.22.diff Patch1: svgalib-1.9.21-makefiles.patch Patch2: svgalib-1.4.3-fhs.patch Patch3: svgalib-1.9.21-demos.patch Patch4: svgalib-1.9.21-wip.patch Patch5: svgalib-1.9.21-wip2.patch Patch6: svgalib-1.9.21-cfg.patch Patch7: svgalib-1.9.21-x86_64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Provides: libvga = %{version}-%{release} %description The svgalib package provides the SVGAlib low-level graphics library for Linux. SVGAlib is a library which allows applications to use full screen graphics on a variety of hardware platforms. Some games and utilities use SVGAlib for their graphics. For details on supported chipsets, see man 7 svgalib (when svgalib is installed). %package devel Summary: Development tools for the SVGAlib graphics library Group: Development/Libraries Requires: %{name} = %{version}-%{release} Provides: libvga-devel = %{version}-%{release} %description devel The svgalib-devel package contains the libraries and header files needed to build programs which will use the SVGAlib low-level graphics library. %prep %setup -q %patch0 -p1 %patch1 -p1 -b .makefiles %patch2 -p1 -b .fhs %patch3 -p1 %patch4 -p1 -b .wip %patch5 -p1 -b .wip2 %patch6 -p1 -b .defaultcfg %ifnarch %{ix86} %patch7 -p1 -b .x86_64 %endif #the testlinear demo needs svgalib's internal libvga header, so copy it to the #demo dir cp src/libvga.h demos %build #%{?_smp_mflags} doesn't work on x86_64 chances are it will fail on #some i386 machines too. make OPTIMIZE="-Wno-pointer-sign $RPM_OPT_FLAGS" LDFLAGS= \ prefix=%{_prefix} \ NO_HELPER=y \ INCLUDE_ET4000_DRIVER=y \ INCLUDE_OAK_DRIVER=y \ INCLUDE_MACH32_DRIVER=y \ INCLUDE_ET3000_DRIVER=y \ INCLUDE_GVGA6400_DRIVER=y \ INCLUDE_ATI_DRIVER=y \ INCLUDE_G450C2_DRIVER=y \ INCLUDE_ET4000_DRIVER_TEST=y \ INCLUDE_FBDEV_DRIVER_TEST=y \ INCLUDE_VESA_DRIVER_TEST=y \ shared cd utils make OPTIMIZE="-Wno-pointer-sign $RPM_OPT_FLAGS" LDFLAGS= \ prefix=%{_prefix} cd .. cd threeDKit make OPTIMIZE="-Wno-pointer-sign $RPM_OPT_FLAGS" LDFLAGS= \ prefix=%{_prefix} lib3dkit.so.1.9.22 cd .. %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/etc/vga mkdir -p $RPM_BUILD_ROOT/%{_libdir} make \ TOPDIR=$RPM_BUILD_ROOT \ prefix=$RPM_BUILD_ROOT/%{_prefix} \ mandir=$RPM_BUILD_ROOT/%{_mandir} \ sharedlibdir=$RPM_BUILD_ROOT/%{_libdir} \ NO_HELPER=y \ MANFORMAT=compressed \ "INSTALL_PROGRAM=install -p -m 755" \ "INSTALL_SCRIPT=install -p -m 755" \ "INSTALL_SHLIB=install -p -m 755" \ "INSTALL_DATA=install -p -m 644" \ install #for %ghost touch $RPM_BUILD_ROOT/etc/vga/fontdata touch $RPM_BUILD_ROOT/etc/vga/textregs %clean rm -fr $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc doc/CHANGES doc/README.joystick doc/README.keymap lrmi-0.6m/README %doc doc/README.multi-monitor doc/README.vesa doc/TODO doc/dual-head-howto %dir %{_sysconfdir}/vga/ %config(noreplace) %{_sysconfdir}/vga/dvorak-us.keymap %config(noreplace) %{_sysconfdir}/vga/libvga.config %config(noreplace) %{_sysconfdir}/vga/libvga.et4000 %config(noreplace) %{_sysconfdir}/vga/null.keymap %ghost %{_sysconfdir}/vga/fontdata %ghost %{_sysconfdir}/vga/textregs %{_bindir}/* %{_libdir}/*.so.* %{_mandir}/man[^3]/* %files devel %defattr(-,root,root,-) %doc demos doc/DESIGN doc/Driver-programming-HOWTO doc/README.patching %{_includedir}/* %{_libdir}/*.so %{_mandir}/man3/* %changelog * Wed Aug 3 2005 Hans de Goede 1.9.21-2 - I've been working with upstream to get most patches intergrated, so most patches are gone now. - Reviewed and fixed the entire source tree for 64 bit cleanness. - While working with upstream I've been busy fixing some bugs and improving security in nohelper mode. From now on /dev/mem gets closed immediatly after getchipset (vga_init) has been called. Lots of work has been done to keep all functionality and api & abi compatibility intact, even while /dev/mem is no longer available. This does however mean that in nohelper mode runinbackground and emulated paging (ppc or secondary card) are only available on 2.6 kernels now. - Made nohelper mode configurable from the configfile, if the user wants he can build the kernel module from the svgalib-srcs and use this with the RPM packaged libs, all this has not been released by upstream yet. The merged part of all this is in patch 0, patch 4 and 5 contain work which still needs to be merged. - Patch6: set some sane default in the configfile. - Patch7: remove options not available on non-i386 from the configfile when building for non-i386. * Fri Jul 1 2005 Hans de Goede 1.9.21-1 - Yet another attempt at getting svgalib into Fedora Extras (formerly .us). - Upstream has reintroduced suid root use in 1.9.20 as an alternative to the helper-kernel-module. This allows us to build a sane (kernel module free) package of the 1.9 (devel) versions. The 1.4 (stable) versions haven't seen an update in ages and don't support most modern cards -> Update to the latest upstream devel release 1.9.21 . - Split the Debian patches in some sane parts, redo against 1.9.21 where nescesarry. - Don't patch Makefile.cfg instead just pass the nescesarry options to make in %%build and %%install. - Reintroduce %%_smp_mflags, this seems to work fine with 1.9.21 . * Tue Jul 27 2004 Hans de Goede 0:1.4.5-0.fdr.6 - Removed unnescesarry and wrong Requires(%post,%postun) - Fixed ExclusiveArch - Removed the Packager tag - Removed %%_smp_mflags, this doesn't work - Modified patch2 so that only the real manpages and not the patch backups get gzipped and installed, renamed patch to svgalib-1.4.3-man to reflect this change. - Removed 0-INSTALL from docs - Don't use README.* this also puts patch backups in the docs - Moved README.patches from svgalib to svgalib-devel - Removed unnescesarry creation of dirs in %%install, the Makefile creates most for us. - Removed %%preun removing /etc/vga/fontdate and /etc/vga/textregs, instead made them owned by svgalib using %%ghost - Made files in /etc/vga %%config(noreplace) * Fri Jul 16 2004 Hans de Goede 0:1.4.5-0.fdr.5 - new RPM on base of the original RH 6.2 SRPM, all the patches from the latest debian pkg, and parts from the first fedora releases by Andreas. * Tue Sep 02 2003 Andreas Bierfert 0:1.4.5-0.fdr.4 - Added severn compile fix provided by Michael Schwendt (#444 #6) * Sat Aug 30 2003 Andreas Bierfert 0:1.4.3-0.fdr.3 - Fixed stuff from #444 #4 :) * Sun Jul 13 2003 Andreas Bierfert (awjb) 0:1.4.3-0.fdr.2 - Fixed minor rpmlint warnings * Tue Jul 01 2003 Andreas Bierfert (awjb) 0:1.4.3-0.fdr.1 - Initial RPM release. * Thu Feb 3 2000 Bill Nottingham - handle compressed man pages * Tue Jan 18 2000 Bill Nottingham - update to 1.4.1 final * Wed Dec 08 1999 Michael Maher - built pre release of 1.4.1 * Mon Sep 13 1999 Bill Nottingham - strip binaries * Fri Aug 27 1999 Bill Nottingham - update to 1.4.0, sort out patches * Sun May 16 1999 Jeff Johnson - don't remove old binaries (not from BUILD_ROOT!) during install (#2735). * Wed Mar 31 1999 Preston Brown - moved temporary svgalib files to /var/lib/svgalib * Sun Mar 21 1999 Cristian Gafton - auto rebuild in the new build environment (release 2) * Sun Aug 23 1998 Jeff Johnson - verify dumpreg is not setuid (problem #760) - specfile fiddles * Thu Jul 30 1998 Cristian Gafton - upgraded to 1.3.0 - security patch * Thu May 07 1998 Prospector System - translations modified for de, fr, tr * Thu Apr 30 1998 Cristian Gafton - devel package moved to Development/Libraries * Mon Apr 06 1998 Erik Troan - updated to svgalib 1.2.13 - uses a build root * Mon Nov 3 1997 Michael Fulbright - removed Mach64 from configuration, as the driver does not work * Tue Oct 14 1997 Donnie Barnes - spec file cleanups Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/svgalib/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 5 Aug 2005 09:34:12 -0000 1.1 +++ .cvsignore 5 Aug 2005 09:37:40 -0000 1.2 @@ -0,0 +1 @@ +svgalib-1.9.21.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/svgalib/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 5 Aug 2005 09:34:12 -0000 1.1 +++ sources 5 Aug 2005 09:37:40 -0000 1.2 @@ -0,0 +1 @@ +1bd8892ee38481051e4b4d85008c86be svgalib-1.9.21.tar.gz From ville.skytta at iki.fi Fri Aug 5 09:38:41 2005 From: ville.skytta at iki.fi (Ville =?ISO-8859-1?Q?Skytt=E4?=) Date: Fri, 05 Aug 2005 12:38:41 +0300 Subject: APPROVED: keychain Message-ID: <1123234721.23575.21.camel@localhost.localdomain> Keychain is a manager for OpenSSH, ssh.com, Sun SSH and GnuPG agents. It acts as a front-end to the agents, allowing you to easily have one long-running agent process per system, rather than per login session. This dramatically reduces the number of times you need to enter your passphrase from once per new login session to once every time your local machine is rebooted. Maintainer: Alexander Dalloz Reviewer: Ville Skytt? From fedora-extras-commits at redhat.com Fri Aug 5 09:44:04 2005 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Fri, 5 Aug 2005 05:44:04 -0400 Subject: owners owners.list,1.52,1.53 Message-ID: <200508050944.j759i44b016940@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16923 Modified Files: owners.list Log Message: Add svgalib component Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- owners.list 4 Aug 2005 17:34:57 -0000 1.52 +++ owners.list 5 Aug 2005 09:44:02 -0000 1.53 @@ -777,6 +777,7 @@ Fedora Extras|straw|GNOME desktop news aggregator|colin at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|suck|Suck - download news from remote NNTP server|Jochen at herr-schmitt.de|extras-qa at fedoraproject.org| Fedora Extras|supertux|SuperTux is a jump'n run like game similar to Mario Bros|pmatilai at laiskiainen.org|extras-qa at fedoraproject.org| +Fedora Extras|svgalib|Low-level fullscreen SVGA graphics library|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org| Fedora Extras|swatch|A tool for actively monitoring log files|jpo at di.uminho.pt|extras-qa at fedoraproject.org| Fedora Extras|sword|Free Bible Software Project|mpeters at mac.com|extras-qa at fedoraproject.org| Fedora Extras|sylpheed-claws|The bleeding edge branch of Sylpheed|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| From bugs.michael at gmx.net Fri Aug 5 11:30:13 2005 From: bugs.michael at gmx.net (Michael Schwendt) Date: Fri, 5 Aug 2005 13:30:13 +0200 Subject: rpms/stripesnoop/devel stripesnoop-1.5-deflinux.patch, NONE, 1.1 stripesnoop-1.5-rpmoptflags.patch, NONE, 1.1 stripesnoop.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 In-Reply-To: <200508042112.j74LCWMv030500@cvs-int.fedora.redhat.com> References: <200508042112.j74LCWMv030500@cvs-int.fedora.redhat.com> Message-ID: <20050805133013.66b6c039.bugs.michael@gmx.net> On Thu, 4 Aug 2005 17:12:01 -0400, Tom Callaway wrote: > Author: spot > > Update of /cvs/extras/rpms/stripesnoop/devel > %package devel > Summary: Headers for stripesnoop > Requires: %{name} = %{version}-%{release} > Group: Development/System > %files devel > %defattr(-,root,root,-) > %{_includedir}/%{name} What's the purpose of shipping C/C++ declarations without any library or object files to link against? Then the -devel package includes a file "dl-iin.csv" which is accessed from parser.cpp by one of the built binaries. It won't find the file, however, since the path is local and %_includedir, where the file is packaged, is not. $ grep csv * parser.h:#define AAMVADATABASE "dl-iin.csv" $ grep AAMV * cards.txt:AAMVA Compliant North American Driver's License ChangeLog.txt: AAMVA Compliant North American Driver's License parser.cpp://Checks for AAMVA Driver's License parser.cpp: card.setName("AAMVA Compliant North American Driver's License"); parser.cpp: if( (fin=fopen(AAMVADATABASE,"r")) == NULL) { parser.cpp: printf("Error: aamva(): Cannot open \"%s\"\n",AAMVADATABASE); parser.h:#define AAMVADATABASE "dl-iin.csv" From ville.skytta at iki.fi Fri Aug 5 11:56:21 2005 From: ville.skytta at iki.fi (Ville =?ISO-8859-1?Q?Skytt=E4?=) Date: Fri, 05 Aug 2005 14:56:21 +0300 Subject: NOT APPROVED: keychain In-Reply-To: <1123234721.23575.21.camel@localhost.localdomain> References: <1123234721.23575.21.camel@localhost.localdomain> Message-ID: <1123242981.23575.49.camel@localhost.localdomain> Reporting this here because there's no Bugzilla component for keychain yet: I noticed a problem with the opt-in mechanism in the keychain package. When a user who has done the opt-in and has such a ssh-agent running runs "sudo -s", a new keychain/ssh-agent appears to be executed as root, but using the original user's keys. This does not happen if I use the old way of stuffing the commands from the man page to ~/.bash_profile. Plain "su" or "su -" seem to behave as expected, no matter if the ~/.keychainrc or ~/.bash_profile way is being used. This looks like a serious issue which needs to be addressed before distributing the package, so I take back my approval. I have no time to debug it further right now. On a related cosmetic note, /etc/profile.d/keychain.sh mixes the "source" and "." ways to source stuff, it'd be better to stick with one of them. From fedora-extras-commits at redhat.com Fri Aug 5 12:36:15 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Fri, 5 Aug 2005 08:36:15 -0400 Subject: rpms/libapreq2/FC-4 libapreq2.spec,1.2,1.3 Message-ID: <200508051236.j75CaFe2021117@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/libapreq2/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21088/FC-4 Modified Files: libapreq2.spec Log Message: * Fri Aug 5 2005 Ville Skytt?? - 2.06-2 - Include *.tag files in -devel docs, thanks to Bojan Smojver. - Remove *.la instead of using %exclude. Index: libapreq2.spec =================================================================== RCS file: /cvs/extras/rpms/libapreq2/FC-4/libapreq2.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- libapreq2.spec 21 Jul 2005 06:46:02 -0000 1.2 +++ libapreq2.spec 5 Aug 2005 12:36:13 -0000 1.3 @@ -2,7 +2,7 @@ Name: libapreq2 Version: 2.06 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Apache HTTP request library Group: System Environment/Libraries @@ -54,6 +54,17 @@ %prep %setup -q -n %{name}-%{version}-dev +aprver=$(apr-config --version) +apuver=$(apu-config --version) +%{__perl} -pi -e \ + "s|.*?|%{_docdir}/%{name}-devel-%{version}/|" \ + docs/apreq2.tag +%{__perl} -pi -e \ + "s|.*?|%{_docdir}/apr-devel-$aprver/html/|" \ + docs/apr.tag +%{__perl} -pi -e \ + "s|.*?|%{_docdir}/apr-util-devel-$apuver/html/|" \ + docs/apu.tag %patch0 ./buildconf @@ -76,6 +87,7 @@ cp -pR docs/html __docs ; rm __docs/installdox find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type f -name '*.bs' -a -size 0 -exec rm -f {} ';' +find $RPM_BUILD_ROOT -type f -name '*.la' -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* @@ -103,16 +115,14 @@ %config(noreplace) %{_sysconfdir}/httpd/conf.d/apreq.conf %{_libdir}/libapreq2.so.* %{_libdir}/httpd/modules/mod_apreq2.so -%exclude %{_libdir}/httpd/modules/mod_apreq2.la %files devel %defattr(-,root,root,-) -%doc STATUS __docs/* +%doc STATUS __docs/* docs/*.tag %{_bindir}/apreq2-config %{_includedir}/apreq2/ %{_includedir}/httpd/apreq2/ %{_libdir}/libapreq2.so -%exclude %{_libdir}/libapreq2.la %files -n perl-%{name} %defattr(-,root,root,-) @@ -124,6 +134,10 @@ %changelog +* Fri Aug 5 2005 Ville Skytt?? - 2.06-2 +- Include *.tag files in -devel docs, thanks to Bojan Smojver. +- Remove *.la instead of using %%exclude. + * Thu Jul 21 2005 Ville Skytt?? - 2.06-1 - 2.06. From fedora-extras-commits at redhat.com Fri Aug 5 12:36:15 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Fri, 5 Aug 2005 08:36:15 -0400 Subject: rpms/libapreq2/devel libapreq2.spec,1.2,1.3 Message-ID: <200508051236.j75CaFCE021123@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/libapreq2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21088/devel Modified Files: libapreq2.spec Log Message: * Fri Aug 5 2005 Ville Skytt?? - 2.06-2 - Include *.tag files in -devel docs, thanks to Bojan Smojver. - Remove *.la instead of using %exclude. Index: libapreq2.spec =================================================================== RCS file: /cvs/extras/rpms/libapreq2/devel/libapreq2.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- libapreq2.spec 21 Jul 2005 06:46:02 -0000 1.2 +++ libapreq2.spec 5 Aug 2005 12:36:13 -0000 1.3 @@ -2,7 +2,7 @@ Name: libapreq2 Version: 2.06 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Apache HTTP request library Group: System Environment/Libraries @@ -54,6 +54,17 @@ %prep %setup -q -n %{name}-%{version}-dev +aprver=$(apr-config --version) +apuver=$(apu-config --version) +%{__perl} -pi -e \ + "s|.*?|%{_docdir}/%{name}-devel-%{version}/|" \ + docs/apreq2.tag +%{__perl} -pi -e \ + "s|.*?|%{_docdir}/apr-devel-$aprver/html/|" \ + docs/apr.tag +%{__perl} -pi -e \ + "s|.*?|%{_docdir}/apr-util-devel-$apuver/html/|" \ + docs/apu.tag %patch0 ./buildconf @@ -76,6 +87,7 @@ cp -pR docs/html __docs ; rm __docs/installdox find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type f -name '*.bs' -a -size 0 -exec rm -f {} ';' +find $RPM_BUILD_ROOT -type f -name '*.la' -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* @@ -103,16 +115,14 @@ %config(noreplace) %{_sysconfdir}/httpd/conf.d/apreq.conf %{_libdir}/libapreq2.so.* %{_libdir}/httpd/modules/mod_apreq2.so -%exclude %{_libdir}/httpd/modules/mod_apreq2.la %files devel %defattr(-,root,root,-) -%doc STATUS __docs/* +%doc STATUS __docs/* docs/*.tag %{_bindir}/apreq2-config %{_includedir}/apreq2/ %{_includedir}/httpd/apreq2/ %{_libdir}/libapreq2.so -%exclude %{_libdir}/libapreq2.la %files -n perl-%{name} %defattr(-,root,root,-) @@ -124,6 +134,10 @@ %changelog +* Fri Aug 5 2005 Ville Skytt?? - 2.06-2 +- Include *.tag files in -devel docs, thanks to Bojan Smojver. +- Remove *.la instead of using %%exclude. + * Thu Jul 21 2005 Ville Skytt?? - 2.06-1 - 2.06. From fedora-extras-commits at redhat.com Fri Aug 5 13:20:38 2005 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 5 Aug 2005 09:20:38 -0400 Subject: rpms/cone/devel cone-0.65.tar.bz2.sig, NONE, 1.1 .cvsignore, 1.4, 1.5 cone.spec, 1.10, 1.11 sources, 1.4, 1.5 cone-0.64.tar.bz2.sig, 1.1, NONE Message-ID: <200508051320.j75DKciU022631@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/cone/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22609 Modified Files: .cvsignore cone.spec sources Added Files: cone-0.65.tar.bz2.sig Removed Files: cone-0.64.tar.bz2.sig Log Message: Update to 0.65. --- NEW FILE cone-0.65.tar.bz2.sig --- ?? Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cone/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 4 Mar 2005 00:15:58 -0000 1.4 +++ .cvsignore 5 Aug 2005 13:20:36 -0000 1.5 @@ -1 +1 @@ -cone-0.64.tar.bz2 +cone-0.65.tar.bz2 Index: cone.spec =================================================================== RCS file: /cvs/extras/rpms/cone/devel/cone.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- cone.spec 29 Jun 2005 18:01:33 -0000 1.10 +++ cone.spec 5 Aug 2005 13:20:36 -0000 1.11 @@ -2,8 +2,8 @@ Summary: CONE mail reader Name: cone -Version: 0.64 -Release: 5%{?dist} +Version: 0.65 +Release: 1%{?dist} URL: http://www.courier-mta.org/cone/ Source0: http://dl.sf.net/sourceforge/courier/%{name}-%{version}.tar.bz2 @@ -98,6 +98,9 @@ %doc cone/html %changelog +* Thu Aug 04 2005 Steven Pritchard 0.65-1 +- Update to 0.65 + * Thu Jun 2 2005 Michael Schwendt 0.64-5 - disable explicit gcc-c++/libstdc++-devel BR and bump for another rebuild attempt Index: sources =================================================================== RCS file: /cvs/extras/rpms/cone/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 4 Mar 2005 00:15:58 -0000 1.4 +++ sources 5 Aug 2005 13:20:36 -0000 1.5 @@ -1 +1 @@ -0375a938da6347e42afd76135f334a6d cone-0.64.tar.bz2 +73ac17422c2dcf7a0a864b99fe786092 cone-0.65.tar.bz2 --- cone-0.64.tar.bz2.sig DELETED --- From fedora-extras-commits at redhat.com Fri Aug 5 15:01:24 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 5 Aug 2005 11:01:24 -0400 Subject: rpms/gtk-qt-engine/FC-4 gtk-qt-engine.spec,1.5,1.6 Message-ID: <200508051502.j75F2HnS025411@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gtk-qt-engine/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25382 Modified Files: gtk-qt-engine.spec Log Message: sync w/-devel branch, add %{?dist} Index: gtk-qt-engine.spec =================================================================== RCS file: /cvs/extras/rpms/gtk-qt-engine/FC-4/gtk-qt-engine.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- gtk-qt-engine.spec 6 Apr 2005 22:11:39 -0000 1.5 +++ gtk-qt-engine.spec 5 Aug 2005 15:01:21 -0000 1.6 @@ -1,46 +1,46 @@ # $Id$ -Summary: Allow GTK to use Qt widget styles -Name: gtk-qt-engine -Group: User Interface/Desktops -Version: 0.41 -Release: 6%{?dist_tag} +%define real_ver 0.6 + +Summary: A project allowing GTK to use Qt widget styles. +Name: gtk-qt-engine +Group: User Interface/Desktops +Version: 0.60%{?dist} +Release: 1 License: GPL -Source: http://www.freedesktop.org/Software/gtk-qt/gtk-qt-engine-0.41.tar.bz2 -Patch0: %{name}-x86_64.patch -URL: http://www.freedesktop.org/Software/gtk-qt -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +Source: http://www.freedesktop.org/~davidsansome/gtk-qt-engine-0.6.tar.bz2 +URL: http://www.freedesktop.org/Software/gtk-qt +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +# Not sure if we need this anymore -- Rex +Patch0: gtk-qt-engine-x86_64.patch BuildRequires: gtk2-devel >= 2.2 -BuildRequires: qt-devel >= 1:3.1 # workaround for stock qt-devel's missing deps BuildRequires: libpng-devel libmng-devel libjpeg-devel -%define qt_ver %(rpm -q --qf '%%{version}' qt-devel | cut -d. -f1,2) + +BuildRequires: qt-devel >= 1:3.3 +%define qt_ver %(rpm -q --qf '%%{version}' qt-devel ) Requires: qt >= 1:%{qt_ver} -BuildRequires: kdelibs-devel >= 6:3.1 -%define kdelibs_ver %(rpm -q --qf '%%{version}' kdelibs-devel | cut -d. -f1,2 ) +BuildRequires: kdelibs-devel >= 6:3.3 +%define kdelibs_ver %(rpm -q --qf '%%{version}' kdelibs-devel ) Requires: kdelibs >= 6:%{kdelibs_ver} - -# workarounds for missing deps in stock qt-devel/kdelibs-devel -BuildRequires: libpng-devel libmng-devel libjpeg-devel - -# 0.41 tarball runs autoheader for some reason -- Rex -BuildRequires: autoconf +## For KDE Control center (??) +## Not strictly required, leave out for now. -- Rex +#Requires: kdebase %description The GTK-Qt Theme Engine is a project allowing GTK to use Qt widget styles. -It behaves like a normal GTK theme engine, but calls functions from Qt -instead of doing the drawing itself. +It behaves like a normal GTK theme engine, but calls functions from Qt +instead of doing the drawing itself. %prep -%setup -q -%ifarch x86_64 -%patch0 -%endif +%setup -q -n %{name}-%{real_ver} + %build unset QTDIR || : ; . /etc/profile.d/qt.sh @@ -48,9 +48,9 @@ %configure \ --disable-rpath \ %{?debug: --enable-debug --enable-warnings } \ - %{!?debug: --disable-dependency-tracking --disable-debug --disable-warnings --enable-final } + %{!?debug: --disable-debug --disable-warnings } -make %{?_smp_mflags} QTDIR=$QTDIR +make %{?_smp_mflags} %install @@ -59,7 +59,7 @@ make install%{!?debug_package:-strip} DESTDIR=$RPM_BUILD_ROOT ## Unpackaged files -rm -rf $RPM_BUILD_ROOT%{_prefix}/lib/menu +rm -rf $RPM_BUILD_ROOT%{_libdir}/menu %clean @@ -70,12 +70,18 @@ %defattr(-,root,root) %doc AUTHORS ChangeLog README %{_datadir}/themes/Qt +%{_datadir}/gtk-qt-engine +%{_datadir}/applications/*.desktop +%{_datadir}/applnk/Settings/*/*.desktop %{_libdir}/gtk-2.0/*/engines/* -%{_libdir}/kde3/kcm_kcmgtk.[ls][ao] -%{_datadir}/applnk/Settings/LookNFeel/kcmgtk.desktop +%{_libdir}/kde3/kcm_*.* + +%changelog +* Wed Apr 8 2005 Rex Dieter 0.60-1 +- cleanup for Extras +- 0.6 (#153976) -%changelog * Fri Apr 7 2005 Michael Schwendt - rebuilt From fedora-extras-commits at redhat.com Fri Aug 5 15:08:22 2005 From: fedora-extras-commits at redhat.com (Joost van der Sluis (joost)) Date: Fri, 5 Aug 2005 11:08:22 -0400 Subject: rpms/fpc - New directory Message-ID: <200508051508.j75F8MEh025571@cvs-int.fedora.redhat.com> Author: joost Update of /cvs/extras/rpms/fpc In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25547/fpc Log Message: Directory /cvs/extras/rpms/fpc added to the repository From fedora-extras-commits at redhat.com Fri Aug 5 15:08:23 2005 From: fedora-extras-commits at redhat.com (Joost van der Sluis (joost)) Date: Fri, 5 Aug 2005 11:08:23 -0400 Subject: rpms/fpc/devel - New directory Message-ID: <200508051508.j75F8Nmc025576@cvs-int.fedora.redhat.com> Author: joost Update of /cvs/extras/rpms/fpc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25547/fpc/devel Log Message: Directory /cvs/extras/rpms/fpc/devel added to the repository From fedora-extras-commits at redhat.com Fri Aug 5 15:08:43 2005 From: fedora-extras-commits at redhat.com (Joost van der Sluis (joost)) Date: Fri, 5 Aug 2005 11:08:43 -0400 Subject: rpms/fpc Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200508051508.j75F8hEq025619@cvs-int.fedora.redhat.com> Author: joost Update of /cvs/extras/rpms/fpc In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25592 Added Files: Makefile import.log Log Message: Setup of module fpc --- NEW FILE Makefile --- # Top level Makefile for module fpc all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Fri Aug 5 15:08:44 2005 From: fedora-extras-commits at redhat.com (Joost van der Sluis (joost)) Date: Fri, 5 Aug 2005 11:08:44 -0400 Subject: rpms/fpc/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200508051508.j75F8iaq025624@cvs-int.fedora.redhat.com> Author: joost Update of /cvs/extras/rpms/fpc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25592/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module fpc --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Fri Aug 5 15:10:38 2005 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Fri, 5 Aug 2005 11:10:38 -0400 Subject: rpms/octave-forge/FC-4 octave-forge.spec,1.15,1.16 Message-ID: <200508051510.j75FAcX3025675@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/octave-forge/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25658 Modified Files: octave-forge.spec Log Message: Rebuild for new version of ginac. Index: octave-forge.spec =================================================================== RCS file: /cvs/extras/rpms/octave-forge/FC-4/octave-forge.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- octave-forge.spec 3 Aug 2005 20:16:49 -0000 1.15 +++ octave-forge.spec 5 Aug 2005 15:10:36 -0000 1.16 @@ -1,6 +1,6 @@ Name: octave-forge Version: 2005.06.13 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Contributed functions for octave Group: Applications/Engineering @@ -24,7 +24,7 @@ %define octave_ep %(rpm -q --qf '%%{epoch}' octave) %define octave_ver %(rpm -q --qf '%%{version}' octave) Requires: octave = %{octave_ep}:%{octave_ver} ImageMagick -BuildRequires: octave-devel tetex gcc-gfortran GiNaC-devel +BuildRequires: octave-devel tetex gcc-gfortran ginac-devel BuildRequires: xorg-x11-devel libjpeg-devel libpng-devel pcre-devel BuildRequires: ncurses-devel libtermcap-devel gsl-devel qhull-devel @@ -73,6 +73,9 @@ %changelog +* Fri Aug 05 2005 Quentin Spencer 2005.06.13-8 +- Rebuild for new version of ginac. + * Wed Aug 03 2005 Quentin Spencer 2005.06.13-7 - Remove BuildRequires that are now required by octave-devel. From fedora-extras-commits at redhat.com Fri Aug 5 15:12:57 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 5 Aug 2005 11:12:57 -0400 Subject: rpms/gtk-qt-engine/FC-4 sources,1.2,1.3 Message-ID: <200508051512.j75FCvtr025757@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gtk-qt-engine/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25738 Modified Files: sources Log Message: src -> 0.6 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gtk-qt-engine/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 04:31:25 -0000 1.2 +++ sources 5 Aug 2005 15:12:55 -0000 1.3 @@ -1 +1 @@ -d6f9fcfb6aa8a0445c81ea893144591d gtk-qt-engine-0.41.tar.bz2 +9c02c95a6e8d304b1f2801429759e1c0 gtk-qt-engine-0.6.tar.bz2 From fedora-extras-commits at redhat.com Fri Aug 5 15:13:08 2005 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Fri, 5 Aug 2005 11:13:08 -0400 Subject: rpms/octave-forge/FC-3 octave-forge.spec,1.13,1.14 Message-ID: <200508051513.j75FD9Zu025783@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/octave-forge/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25764 Modified Files: octave-forge.spec Log Message: Rebuild for new version of ginac. Index: octave-forge.spec =================================================================== RCS file: /cvs/extras/rpms/octave-forge/FC-3/octave-forge.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- octave-forge.spec 22 Jun 2005 15:28:49 -0000 1.13 +++ octave-forge.spec 5 Aug 2005 15:13:06 -0000 1.14 @@ -1,6 +1,6 @@ Name: octave-forge Version: 2004.11.16 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Contributed functions for octave Group: Applications/Engineering @@ -24,7 +24,7 @@ %define octave_ep %(rpm -q --qf '%%{epoch}' octave) %define octave_ver %(rpm -q --qf '%%{version}' octave) Requires: octave = %{octave_ep}:%{octave_ver} ImageMagick -BuildRequires: octave octave-devel tetex gcc-g77 GiNaC-devel readline-devel +BuildRequires: octave octave-devel tetex gcc-g77 ginac-devel readline-devel BuildRequires: xorg-x11-devel libjpeg-devel libpng-devel zlib-devel BuildRequires: ncurses-devel libtermcap-devel gsl-devel qhull-devel @@ -76,6 +76,9 @@ %changelog +* Fri Aug 05 2005 Quentin Spencer 2005.11.16-9 +- Rebuild for new version of ginac. + * Wed Jun 22 2005 Quentin Spencer 2005.11.16-8 - Corrected instructions on creating patched source tarball. - Remove explicit BuildRequires for c++ compiler and libs From fedora-extras-commits at redhat.com Fri Aug 5 15:13:26 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 5 Aug 2005 11:13:26 -0400 Subject: rpms/gtk-qt-engine/FC-4 .cvsignore,1.2,1.3 Message-ID: <200508051513.j75FDQwN025808@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gtk-qt-engine/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25789 Modified Files: .cvsignore Log Message: src -> 0.6 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gtk-qt-engine/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:31:25 -0000 1.2 +++ .cvsignore 5 Aug 2005 15:13:23 -0000 1.3 @@ -1 +1 @@ -gtk-qt-engine-0.41.tar.bz2 +gtk-qt-engine-0.6.tar.bz2 From fedora-extras-commits at redhat.com Fri Aug 5 15:14:11 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 5 Aug 2005 11:14:11 -0400 Subject: rpms/gtk-qt-engine/devel gtk-qt-engine.spec,1.11,1.12 Message-ID: <200508051514.j75FEBPp025879@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gtk-qt-engine/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25848 Modified Files: gtk-qt-engine.spec Log Message: add %{?dist}, it's ok here too Index: gtk-qt-engine.spec =================================================================== RCS file: /cvs/extras/rpms/gtk-qt-engine/devel/gtk-qt-engine.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- gtk-qt-engine.spec 3 Aug 2005 19:18:15 -0000 1.11 +++ gtk-qt-engine.spec 5 Aug 2005 15:14:09 -0000 1.12 @@ -6,7 +6,7 @@ Name: gtk-qt-engine Group: User Interface/Desktops Version: 0.60 -Release: 1 +Release: 1%{?dist} License: GPL Source: http://www.freedesktop.org/~davidsansome/gtk-qt-engine-0.6.tar.bz2 From fedora-extras-commits at redhat.com Fri Aug 5 15:15:39 2005 From: fedora-extras-commits at redhat.com (Joost van der Sluis (joost)) Date: Fri, 5 Aug 2005 11:15:39 -0400 Subject: rpms/fpc import.log,1.1,1.2 Message-ID: <200508051515.j75FFdMB025939@cvs-int.fedora.redhat.com> Author: joost Update of /cvs/extras/rpms/fpc In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25908 Modified Files: import.log Log Message: auto-import fpc-2.0.0-1 on branch devel from fpc-2.0.0-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/fpc/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 5 Aug 2005 15:08:41 -0000 1.1 +++ import.log 5 Aug 2005 15:15:37 -0000 1.2 @@ -0,0 +1 @@ +fpc-2_0_0-1:HEAD:fpc-2.0.0-1.src.rpm:1123254749 From fedora-extras-commits at redhat.com Fri Aug 5 15:15:39 2005 From: fedora-extras-commits at redhat.com (Joost van der Sluis (joost)) Date: Fri, 5 Aug 2005 11:15:39 -0400 Subject: rpms/fpc/devel fpc.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200508051515.j75FFdob025946@cvs-int.fedora.redhat.com> Author: joost Update of /cvs/extras/rpms/fpc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25908/devel Modified Files: .cvsignore sources Added Files: fpc.spec Log Message: auto-import fpc-2.0.0-1 on branch devel from fpc-2.0.0-1.src.rpm --- NEW FILE fpc.spec --- Name: fpc Version: 2.0.0 Release: 1 Summary: Free Pascal Compiler Group: Development/Languages License: GPL and modified LGPL URL: http://www.freepascal.org/ Source0: ftp://ftp.freepascal.org/pub/fpc/dist/source-%{version}/%{name}-%{version}.source.tar.gz Source1: http://www.cnoc.nl/fpc/%{name}-%{version}.compiler.bin.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: gpm, glibc, ncurses, binutils BuildRequires: tetex, tetex-latex, tetex-fonts, binutils, gpm-devel, glibc-devel %description Freepascal is a free 32/64bit Pascal Compiler. It comes with a run-time library fully compatible with Turbo Pascal 7.0 and nearly Delphi compatible. Some extensions are added to the language, like function overloading. Shared libraries can be linked. This package contains commandline compiler and utils. Provided units are the runtime library (RTL), free component library (FCL) and bindings for among others gtk1, gtk2, ncurses, zlib, mysql, postgres and ibase. %package doc Summary: Free Pascal Compiler - documentation and examples Group: Development/Languages %description doc The fpc-doc package contains the documentation (in pdf format) and examples of Freepascal. %package src Summary: Free Pascal Compiler - sources Group: Development/Languages %description src The fpc-src package contains the sources of Freepascal, for documentation or automatical-code generation purposes. %ifarch ppc %define ppcname ppcppc %else %ifarch x86_64 %define ppcname ppcx64 %else %define ppcname ppc386 %endif %endif %prep %setup -q -a1 -n %{name} %build # The source-files: mkdir -p fpcsrc cp -a rtl fpcsrc cp -a fcl fpcsrc cp -a packages fpcsrc rm -rf fpcsrc/packages/extra/amunits rm -rf fpcsrc/packages/extra/winunits find fpcsrc -name .cvsignore -exec rm '{}' ';' STARTPP=`pwd`/startcompiler/%{ppcname} NEWPP=`pwd`/compiler/%{ppcname} NEWFPDOC=`pwd`/utils/fpdoc/fpdoc DATA2INC=`pwd`/utils/data2inc make compiler_cycle FPC=${STARTPP} make rtl_clean rtl_smart FPC=${NEWPP} make packages_base_smart FPC=${NEWPP} make fcl_smart FPC=${NEWPP} make fv_smart FPC=${NEWPP} make packages_extra_smart FPC=${NEWPP} make ide_all FPC=${NEWPP} make utils_all FPC=${NEWPP} DATA2INC=${DATA2INC} export save_size=40000 export pool_size=1250000 make -C docs pdf FPC=${NEWPP} FPDOC=${NEWFPDOC} # disable the debuginfo package %define debug_package %{nil} %define __spec_install_post /usr/lib/rpm/brp-compress %install rm -rf %{buildroot} FPCMAKE=`pwd`/utils/fpcm/fpcmake NEWPP=`pwd`/compiler/%{ppcname} INSTALLOPTS="FPC=${NEWPP} FPCMAKE=${FPCMAKE} \ INSTALL_PREFIX=%{buildroot}%{_prefix} \ INSTALL_LIBDIR=%{buildroot}%{_libdir} \ INSTALL_BASEDIR=%{buildroot}%{_libdir}/%{name}/%{version} \ CODPATH=%{buildroot}%{_libdir}/%{name}/lexyacc \ INSTALL_DOCDIR=%{buildroot}%{_defaultdocdir}/%{name}-%{version} \ INSTALL_BINDIR=%{buildroot}%{_bindir} INSTALL_EXAMPLEDIR=%{buildroot}%{_defaultdocdir}/%{name}-%{version}/examples" make compiler_distinstall ${INSTALLOPTS} make rtl_distinstall ${INSTALLOPTS} make packages_distinstall ${INSTALLOPTS} make fcl_distinstall ${INSTALLOPTS} make fv_distinstall ${INSTALLOPTS} make ide_distinstall ${INSTALLOPTS} make utils_distinstall ${INSTALLOPTS} make doc_install ${INSTALLOPTS} make -C docs pdfinstall ${INSTALLOPTS} make man_install ${INSTALLOPTS} INSTALL_MANDIR=%{buildroot}%{_mandir} # create link ln -sf ../%{_lib}/%{name}/%{version}/%{ppcname} %{buildroot}%{_bindir}/%{ppcname} # Include the COPYING-information in the documentation cp -a compiler/COPYING %{buildroot}%{_defaultdocdir}/%{name}-%{version}/COPYING cp -a rtl/COPYING %{buildroot}%{_defaultdocdir}/%{name}-%{version}/COPYING.rtl cp -a fcl/COPYING %{buildroot}%{_defaultdocdir}/%{name}-%{version}/COPYING.fcl cp -a rtl/COPYING.FPC %{buildroot}%{_defaultdocdir}/%{name}-%{version}/COPYING.FPC # The source-files: mkdir -p %{buildroot}%{_datadir}/fpcsrc cp -a fpcsrc/* %{buildroot}%{_datadir}/fpcsrc/ # Workaround: # newer rpm versions do not allow garbage # delete lexyacc rm -rf %{buildroot}%{_libdir}/%{name}/lexyacc %clean rm -rf %{buildroot} %post # Create a version independent config %{_libdir}/%{name}/%{version}/samplecfg %{_libdir}/%{name}/%{version} > /dev/null %files %defattr(-,root,root,-) %{_bindir}/* %{_libdir}/%{name} %doc %{_defaultdocdir}/%{name}-%{version}/NEWS %doc %{_defaultdocdir}/%{name}-%{version}/README %doc %{_defaultdocdir}/%{name}-%{version}/readme.ide %doc %{_defaultdocdir}/%{name}-%{version}/faq* %doc %{_defaultdocdir}/%{name}-%{version}/COPYING* %{_mandir}/*/* %files doc %defattr(-,root,root,-) %doc %{_defaultdocdir}/%{name}-%{version}/*.pdf %doc %{_defaultdocdir}/%{name}-%{version}/examples %files src %defattr(-,root,root,-) %{_datadir}/fpcsrc %changelog * Fri Aug 5 2005 Joost van der Sluis 2.0.0-1 - Removed gpm-devel requirement - Fixed a type in the -src description * Tue Jul 28 2005 Joost van der Sluis 2.0.0-1 - Added some requirements - Added COPYING-info to %%doc * Tue Jun 28 2005 Joost van der Sluis 2.0.0-0.6 - Only rtl, fcl and packages are added to src-subpackage - Silenced post-script - disabled the debuginfo-package * Sat Jun 5 2005 Joost van der Sluis 2.0.0-0.5 - Added doc-subpackage - Added src-subpackage * Fri Jun 3 2005 Joost van der Sluis 2.0.0-0.4 - New fix for lib64 on x86_64 - small patches from Jens Petersen * Thu May 26 2005 Joost van der Sluis 2.0.0-0.3 - replaced 'lib' and 'lib64' by %%{_lib} * Tue May 24 2005 Joost van der Sluis 2.0.0-0.2 - Fixed for lib64 on x86_64 - Changed summary, description and license - Removed examples from installation - Make clean removed from clean-section - Clean-up - replaced $RPM_BUILD_ROOT by %%{buildroot} * Mon May 23 2005 Joost van der Sluis 2.0.0-0.1 - Initial build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fpc/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 5 Aug 2005 15:08:41 -0000 1.1 +++ .cvsignore 5 Aug 2005 15:15:37 -0000 1.2 @@ -0,0 +1,2 @@ +fpc-2.0.0.compiler.bin.tar.gz +fpc-2.0.0.source.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/fpc/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 5 Aug 2005 15:08:41 -0000 1.1 +++ sources 5 Aug 2005 15:15:37 -0000 1.2 @@ -0,0 +1,2 @@ +db9a94a468bdc5f1067f2803818f5b2b fpc-2.0.0.compiler.bin.tar.gz +3f9c64d0146a3631f6963fd7477776d1 fpc-2.0.0.source.tar.gz From fedora-extras-commits at redhat.com Fri Aug 5 15:18:26 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 5 Aug 2005 11:18:26 -0400 Subject: rpms/gtk-qt-engine/devel gtk-qt-engine.spec,1.12,1.13 Message-ID: <200508051518.j75FIQ5K026000@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gtk-qt-engine/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25983 Modified Files: gtk-qt-engine.spec Log Message: * Fri Aug 5 2005 Rex Dieter 0.60-2 - respin (2nd attempt at make plague) Index: gtk-qt-engine.spec =================================================================== RCS file: /cvs/extras/rpms/gtk-qt-engine/devel/gtk-qt-engine.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- gtk-qt-engine.spec 5 Aug 2005 15:14:09 -0000 1.12 +++ gtk-qt-engine.spec 5 Aug 2005 15:18:24 -0000 1.13 @@ -6,7 +6,7 @@ Name: gtk-qt-engine Group: User Interface/Desktops Version: 0.60 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Source: http://www.freedesktop.org/~davidsansome/gtk-qt-engine-0.6.tar.bz2 @@ -78,6 +78,9 @@ %changelog +* Fri Aug 5 2005 Rex Dieter 0.60-2 +- respin (2nd attempt at make plague) + * Wed Apr 8 2005 Rex Dieter 0.60-1 - cleanup for Extras - 0.6 (#153976) From fedora-extras-commits at redhat.com Fri Aug 5 15:39:25 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 5 Aug 2005 11:39:25 -0400 Subject: rpms/gtk-qt-engine/devel gtk-qt-engine.spec,1.13,1.14 Message-ID: <200508051539.j75FdPa7026085@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gtk-qt-engine/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26068 Modified Files: gtk-qt-engine.spec Log Message: * Fri Aug 5 2005 Rex Dieter 0.60-3 - drop bogus BR: libjpeg-devel libmng-devel - x86_64 patch (and BR: autoconf automake17) Index: gtk-qt-engine.spec =================================================================== RCS file: /cvs/extras/rpms/gtk-qt-engine/devel/gtk-qt-engine.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- gtk-qt-engine.spec 5 Aug 2005 15:18:24 -0000 1.13 +++ gtk-qt-engine.spec 5 Aug 2005 15:39:23 -0000 1.14 @@ -6,19 +6,20 @@ Name: gtk-qt-engine Group: User Interface/Desktops Version: 0.60 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Source: http://www.freedesktop.org/~davidsansome/gtk-qt-engine-0.6.tar.bz2 URL: http://www.freedesktop.org/Software/gtk-qt BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -# Not sure if we need this anymore -- Rex +# fix x86_64 build, requires auto-tools Patch0: gtk-qt-engine-x86_64.patch +BuildRequires: autoconf, automake17 BuildRequires: gtk2-devel >= 2.2 # workaround for stock qt-devel's missing deps -BuildRequires: libpng-devel libmng-devel libjpeg-devel +BuildRequires: libpng-devel BuildRequires: qt-devel >= 1:3.3 %define qt_ver %(rpm -q --qf '%%{version}' qt-devel ) @@ -41,6 +42,10 @@ %prep %setup -q -n %{name}-%{real_ver} +%patch0 -p0 -b .x86_64 + +make -f admin/Makefile.common + %build unset QTDIR || : ; . /etc/profile.d/qt.sh @@ -78,6 +83,10 @@ %changelog +* Fri Aug 5 2005 Rex Dieter 0.60-3 +- drop bogus BR: libjpeg-devel libmng-devel +- x86_64 patch (and BR: autoconf automake17) + * Fri Aug 5 2005 Rex Dieter 0.60-2 - respin (2nd attempt at make plague) From fedora-extras-commits at redhat.com Fri Aug 5 15:51:57 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 5 Aug 2005 11:51:57 -0400 Subject: rpms/gtk-qt-engine/FC-4 gtk-qt-engine.spec,1.6,1.7 Message-ID: <200508051551.j75Fpvap026170@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gtk-qt-engine/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26153 Modified Files: gtk-qt-engine.spec Log Message: * Fri Aug 5 2005 Rex Dieter 0.60-3 - drop bogus BR: libjpeg-devel libmng-devel - x86_64 patch (and BR: autoconf automake17) Index: gtk-qt-engine.spec =================================================================== RCS file: /cvs/extras/rpms/gtk-qt-engine/FC-4/gtk-qt-engine.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- gtk-qt-engine.spec 5 Aug 2005 15:01:21 -0000 1.6 +++ gtk-qt-engine.spec 5 Aug 2005 15:51:55 -0000 1.7 @@ -5,20 +5,21 @@ Summary: A project allowing GTK to use Qt widget styles. Name: gtk-qt-engine Group: User Interface/Desktops -Version: 0.60%{?dist} -Release: 1 +Version: 0.60 +Release: 3%{?dist} License: GPL Source: http://www.freedesktop.org/~davidsansome/gtk-qt-engine-0.6.tar.bz2 URL: http://www.freedesktop.org/Software/gtk-qt BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -# Not sure if we need this anymore -- Rex +# fix x86_64 build, requires auto-tools Patch0: gtk-qt-engine-x86_64.patch +BuildRequires: autoconf, automake17 BuildRequires: gtk2-devel >= 2.2 # workaround for stock qt-devel's missing deps -BuildRequires: libpng-devel libmng-devel libjpeg-devel +BuildRequires: libpng-devel BuildRequires: qt-devel >= 1:3.3 %define qt_ver %(rpm -q --qf '%%{version}' qt-devel ) @@ -41,6 +42,10 @@ %prep %setup -q -n %{name}-%{real_ver} +%patch0 -p0 -b .x86_64 + +make -f admin/Makefile.common + %build unset QTDIR || : ; . /etc/profile.d/qt.sh @@ -78,6 +83,13 @@ %changelog +* Fri Aug 5 2005 Rex Dieter 0.60-3 +- drop bogus BR: libjpeg-devel libmng-devel +- x86_64 patch (and BR: autoconf automake17) + +* Fri Aug 5 2005 Rex Dieter 0.60-2 +- respin (2nd attempt at make plague) + * Wed Apr 8 2005 Rex Dieter 0.60-1 - cleanup for Extras - 0.6 (#153976) From fedora-extras-commits at redhat.com Fri Aug 5 15:55:00 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 5 Aug 2005 11:55:00 -0400 Subject: rpms/gtk-qt-engine/FC-3 .cvsignore, 1.2, 1.3 gtk-qt-engine.spec, 1.3, 1.4 sources, 1.2, 1.3 Message-ID: <200508051555.j75Ft02p026246@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gtk-qt-engine/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26225 Modified Files: .cvsignore gtk-qt-engine.spec sources Log Message: sync w/-devel branch Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gtk-qt-engine/FC-3/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:31:25 -0000 1.2 +++ .cvsignore 5 Aug 2005 15:54:58 -0000 1.3 @@ -1 +1 @@ -gtk-qt-engine-0.41.tar.bz2 +gtk-qt-engine-0.6.tar.bz2 Index: gtk-qt-engine.spec =================================================================== RCS file: /cvs/extras/rpms/gtk-qt-engine/FC-3/gtk-qt-engine.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gtk-qt-engine.spec 12 Feb 2005 17:01:20 -0000 1.3 +++ gtk-qt-engine.spec 5 Aug 2005 15:54:58 -0000 1.4 @@ -1,31 +1,35 @@ # $Id$ -Summary: a project allowing GTK to use Qt widget styles. +%define real_ver 0.6 + +Summary: A project allowing GTK to use Qt widget styles. Name: gtk-qt-engine Group: User Interface/Desktops -Version: 0.41 -Release: 5%{?dist_tag} +Version: 0.60 +Release: 3%{?dist} + License: GPL -Source: http://www.freedesktop.org/Software/gtk-qt/gtk-qt-engine-0.41.tar.bz2 -Patch0: %{name}-x86_64.patch +Source: http://www.freedesktop.org/~davidsansome/gtk-qt-engine-0.6.tar.bz2 URL: http://www.freedesktop.org/Software/gtk-qt -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +# fix x86_64 build, requires auto-tools +Patch0: gtk-qt-engine-x86_64.patch +BuildRequires: autoconf, automake17 BuildRequires: gtk2-devel >= 2.2 -BuildRequires: qt-devel >= 1:3.1 # workaround for stock qt-devel's missing deps -BuildRequires: libpng-devel libmng-devel libjpeg-devel -%define qt_ver %(rpm -q --qf '%%{version}' qt-devel | cut -d. -f1,2) +BuildRequires: libpng-devel + +BuildRequires: qt-devel >= 1:3.3 +%define qt_ver %(rpm -q --qf '%%{version}' qt-devel ) Requires: qt >= 1:%{qt_ver} -BuildRequires: kdelibs-devel >= 6:3.1 -%define kdelibs_ver %(rpm -q --qf '%%{version}' kdelibs-devel | cut -d. -f1,2 ) +BuildRequires: kdelibs-devel >= 6:3.3 +%define kdelibs_ver %(rpm -q --qf '%%{version}' kdelibs-devel ) Requires: kdelibs >= 6:%{kdelibs_ver} - -# workarounds for missing deps in stock qt-devel/kdelibs-devel -BuildRequires: libpng-devel libmng-devel libjpeg-devel - -# 0.41 tarball runs autoheader for some reason -- Rex -BuildRequires: autoconf +## For KDE Control center (??) +## Not strictly required, leave out for now. -- Rex +#Requires: kdebase %description @@ -36,10 +40,12 @@ %prep -%setup -q -%ifarch x86_64 -%patch0 -%endif +%setup -q -n %{name}-%{real_ver} + +%patch0 -p0 -b .x86_64 + +make -f admin/Makefile.common + %build unset QTDIR || : ; . /etc/profile.d/qt.sh @@ -47,9 +53,9 @@ %configure \ --disable-rpath \ %{?debug: --enable-debug --enable-warnings } \ - %{!?debug: --disable-dependency-tracking --disable-debug --disable-warnings --enable-final } + %{!?debug: --disable-debug --disable-warnings } -make %{?_smp_mflags} QTDIR=$QTDIR +make %{?_smp_mflags} %install @@ -58,7 +64,7 @@ make install%{!?debug_package:-strip} DESTDIR=$RPM_BUILD_ROOT ## Unpackaged files -rm -rf $RPM_BUILD_ROOT%{_prefix}/lib/menu +rm -rf $RPM_BUILD_ROOT%{_libdir}/menu %clean @@ -69,12 +75,28 @@ %defattr(-,root,root) %doc AUTHORS ChangeLog README %{_datadir}/themes/Qt +%{_datadir}/gtk-qt-engine +%{_datadir}/applications/*.desktop +%{_datadir}/applnk/Settings/*/*.desktop %{_libdir}/gtk-2.0/*/engines/* -%{_libdir}/kde3/kcm_kcmgtk.[ls][ao] -%{_datadir}/applnk/Settings/LookNFeel/kcmgtk.desktop +%{_libdir}/kde3/kcm_*.* %changelog +* Fri Aug 5 2005 Rex Dieter 0.60-3 +- drop bogus BR: libjpeg-devel libmng-devel +- x86_64 patch (and BR: autoconf automake17) + +* Fri Aug 5 2005 Rex Dieter 0.60-2 +- respin (2nd attempt at make plague) + +* Wed Apr 8 2005 Rex Dieter 0.60-1 +- cleanup for Extras +- 0.6 (#153976) + +* Fri Apr 7 2005 Michael Schwendt +- rebuilt + * Sat Feb 12 2005 Thorsten Leemhuis 0.41-5 - Add patch to fix compile-error on x86_64; Patch was found in a suse srpm Index: sources =================================================================== RCS file: /cvs/extras/rpms/gtk-qt-engine/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 04:31:25 -0000 1.2 +++ sources 5 Aug 2005 15:54:58 -0000 1.3 @@ -1 +1 @@ -d6f9fcfb6aa8a0445c81ea893144591d gtk-qt-engine-0.41.tar.bz2 +9c02c95a6e8d304b1f2801429759e1c0 gtk-qt-engine-0.6.tar.bz2 From fedora-extras-commits at redhat.com Fri Aug 5 16:06:31 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 5 Aug 2005 12:06:31 -0400 Subject: rpms/mathml-fonts/devel find_symbol_font.sh, 1.1, 1.2 mathml-fonts.spec, 1.6, 1.7 Message-ID: <200508051607.j75G74pN027453@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/mathml-fonts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27434 Modified Files: find_symbol_font.sh mathml-fonts.spec Log Message: respin Index: mathml-fonts.spec =================================================================== RCS file: /cvs/extras/rpms/mathml-fonts/devel/mathml-fonts.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- mathml-fonts.spec 3 Aug 2005 19:32:31 -0000 1.6 +++ mathml-fonts.spec 5 Aug 2005 16:06:29 -0000 1.7 @@ -6,7 +6,7 @@ Summary: Mathematical symbol fonts Name: mathml-fonts Version: 1.0 -Release: 16 +Release: 17 URL: http://www.mozilla.org/projects/mathml/fonts/ License: Distributable @@ -122,7 +122,7 @@ %changelog -* Wed Aug 3 2005 Rex Dieter 1.0-16 +* Wed Aug 3 2005 Rex Dieter 1.0-17 - update for acroread7 (and SY_____.PFB) (bug #133709) - include/use find_symbol_font.sh helper script - readd %%postun From fedora-extras-commits at redhat.com Fri Aug 5 16:20:23 2005 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Fri, 5 Aug 2005 12:20:23 -0400 Subject: rpms/svgalib/devel svgalib-1.9.21-ppc.patch, NONE, 1.1 svgalib.spec, 1.1, 1.2 Message-ID: <200508051620.j75GKNqS027534@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/svgalib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27514 Modified Files: svgalib.spec Added Files: svgalib-1.9.21-ppc.patch Log Message: Fix PPC compilation svgalib-1.9.21-ppc.patch: --- NEW FILE svgalib-1.9.21-ppc.patch --- diff -ur svgalib-1.9.21.orig/src/drivers/mach32.c svgalib-1.9.21/src/drivers/mach32.c --- svgalib-1.9.21.orig/src/drivers/mach32.c 2005-08-05 18:17:09.000000000 +0200 +++ svgalib-1.9.21/src/drivers/mach32.c 2005-08-05 18:16:26.000000000 +0200 @@ -150,7 +150,11 @@ #include #include #include +#ifdef PPC +#include +#else #include +#endif #include "mach32.h" #include "8514a.h" Only in svgalib-1.9.21/src/drivers: mach32.c~ diff -ur svgalib-1.9.21.orig/src/vga.c svgalib-1.9.21/src/vga.c --- svgalib-1.9.21.orig/src/vga.c 2005-08-05 18:17:09.000000000 +0200 +++ svgalib-1.9.21/src/vga.c 2005-08-05 18:15:38.000000000 +0200 @@ -28,7 +28,11 @@ #include #include #include +#ifdef PPC +#include +#else #include +#endif #ifdef INCLUDE_VESA_DRIVER #include Only in svgalib-1.9.21/src: vga.c~ diff -ur svgalib-1.9.21.orig/src/vga_helper.c svgalib-1.9.21/src/vga_helper.c --- svgalib-1.9.21.orig/src/vga_helper.c 2005-08-05 18:17:09.000000000 +0200 +++ svgalib-1.9.21/src/vga_helper.c 2005-08-05 18:16:10.000000000 +0200 @@ -1,4 +1,8 @@ +#ifdef PPC +#include +#else #include +#endif #include #include "svgalib_helper.h" #include "libvga.h" Only in svgalib-1.9.21/src: vga_helper.c~ diff -ur svgalib-1.9.21.orig/utils/fix132x43.c svgalib-1.9.21/utils/fix132x43.c --- svgalib-1.9.21.orig/utils/fix132x43.c 2005-08-05 18:17:09.000000000 +0200 +++ svgalib-1.9.21/utils/fix132x43.c 2005-08-05 18:16:39.000000000 +0200 @@ -47,7 +47,11 @@ #include #include #include +#ifdef PPC +#include +#else #include "sys/io.h" /* For port I/O macros. */ +#endif #define OUTB(a,d) outb(d,a) static void fixfont (int); Only in svgalib-1.9.21/utils: fix132x43.c~ diff -ur svgalib-1.9.21.orig/utils/setmclk.c svgalib-1.9.21/utils/setmclk.c --- svgalib-1.9.21.orig/utils/setmclk.c 2005-08-05 18:17:09.000000000 +0200 +++ svgalib-1.9.21/utils/setmclk.c 2005-08-05 18:16:34.000000000 +0200 @@ -39,7 +39,11 @@ #include #include #include +#ifdef PPC +#include +#else #include /* For port I/O macros. */ +#endif #define OUTB(a,d) outb(d,a) int Only in svgalib-1.9.21/utils: setmclk.c~ Index: svgalib.spec =================================================================== RCS file: /cvs/extras/rpms/svgalib/devel/svgalib.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- svgalib.spec 5 Aug 2005 09:37:40 -0000 1.1 +++ svgalib.spec 5 Aug 2005 16:20:21 -0000 1.2 @@ -1,6 +1,6 @@ Name: svgalib Version: 1.9.21 -Release: 2 +Release: 3 Summary: Low-level fullscreen SVGA graphics library Group: System Environment/Libraries @@ -16,6 +16,7 @@ Patch5: svgalib-1.9.21-wip2.patch Patch6: svgalib-1.9.21-cfg.patch Patch7: svgalib-1.9.21-x86_64.patch +Patch8: svgalib-1.9.21-ppc.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Provides: libvga = %{version}-%{release} @@ -49,6 +50,7 @@ %ifnarch %{ix86} %patch7 -p1 -b .x86_64 %endif +%patch8 -p1 -b .ppc #the testlinear demo needs svgalib's internal libvga header, so copy it to the #demo dir cp src/libvga.h demos @@ -129,6 +131,9 @@ %{_mandir}/man3/* %changelog +* Fri Aug 5 2005 Hans de Goede 1.9.21-3 +- Add patch 7 to fix compilation on ppc + * Wed Aug 3 2005 Hans de Goede 1.9.21-2 - I've been working with upstream to get most patches intergrated, so most patches are gone now. From fedora-extras-commits at redhat.com Fri Aug 5 16:24:09 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Fri, 5 Aug 2005 12:24:09 -0400 Subject: extras-buildsys/client client.py,1.23,1.24 Message-ID: <200508051624.j75GOexe027669@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/client In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27588/client Modified Files: client.py Log Message: 2005-08-05 Dan Williams * builder/builder.py - (_mock_done): hand-wavy attempt to ensure the mock child process is always reaped * client/client.py - (enqueue, enqueue_srpm): Print out returned job UID - (detail_job): remove bogus email argument * server/BuildMaster.py - (create_job_request): new function to consolidate job request creation - (enqueue, enqueue_srpm): consolidate to one enqueue() function since the database really makes no distinction between CVS and SRPM jobs - (_start_new_jobs): return UID to requester when we become aware of it * server/UserInterface.py - (_wait_for_uid): new function, waits max 3 seconds for the BuildMaster to return the new job's UID - (enqueue, enqueue_srpm): use create_job_request(), and wait for the job's UID to be returned from the BuildMaster, which we then pass back to the client - (detail_job): remove bogus email argument - (_kill_job): warn user if the job is no longer building or waiting to be added to the repo. We can't kill jobs if they are no longer building. * www/job.psp - detail_job()'s email argument got removed, remove it here to Index: client.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/client/client.py,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- client.py 4 Aug 2005 20:27:11 -0000 1.23 +++ client.py 5 Aug 2005 16:24:07 -0000 1.24 @@ -61,13 +61,17 @@ target = args[2] use_ssl = config.get('Server', 'use_ssl') if use_ssl.lower() == 'true': - (e, msg,) = server.enqueue(package, tag, target) + (e, msg, uid) = server.enqueue(package, tag, target) else: - (e, msg) = server.enqueue(email, package, tag, target) + (e, msg, uid) = server.enqueue(email, package, tag, target) if e == -1: print "Server returned an error: %s" % msg + return + + if uid != -1: + print "Package %s enqueued. Job ID: %d." % (package, uid) else: - print "Package %s enqueued." % package + print "Package %s enqueued. (However, no Job ID was provided in the time required)" % package def enqueue_srpm(server, email, args): @@ -80,13 +84,17 @@ target = args[2] use_ssl = config.get('Server', 'use_ssl') if use_ssl.lower() == 'true': - (e, msg) = server.enqueue_srpm(package, srpm, target) + (e, msg, uid) = server.enqueue_srpm(package, srpm, target) else: - (e, msg) = server.enqueue_srpm(email, package, srpm, target) + (e, msg, uid) = server.enqueue_srpm(email, package, srpm, target) if e == -1: print "Server returned an error: %s" % msg + return + + if uid != -1: + print "Package %s enqueued. Job ID: %d." % (package, uid) else: - print "Package %s enqueued." % package + print "Package %s enqueued. (However, no Job ID was provided in the time required)" % package def requeue_job(server, email, uid): @@ -154,12 +162,12 @@ except IOError: pass -def detail_job(server, email, jobid): +def detail_job(server, jobid): """ Get a single job's details """ try: - (err, msg, jobrec) = server.detail_job(email, jobid) + (err, msg, jobrec) = server.detail_job(jobid) except socket.error, e: print "Error connecting to build server: '%s'" % e return @@ -369,7 +377,7 @@ elif cmd == 'list': list_jobs(server, sys.argv[2:]) elif cmd == 'detail': - detail_job(server, email, sys.argv[2]) + detail_job(server, sys.argv[2]) elif cmd == 'kill': if len(sys.argv) < 3: print "Error: need a job UID to kill" From fedora-extras-commits at redhat.com Fri Aug 5 16:24:08 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Fri, 5 Aug 2005 12:24:08 -0400 Subject: extras-buildsys ChangeLog,1.89,1.90 Message-ID: <200508051624.j75GOduS027666@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27588 Modified Files: ChangeLog Log Message: 2005-08-05 Dan Williams * builder/builder.py - (_mock_done): hand-wavy attempt to ensure the mock child process is always reaped * client/client.py - (enqueue, enqueue_srpm): Print out returned job UID - (detail_job): remove bogus email argument * server/BuildMaster.py - (create_job_request): new function to consolidate job request creation - (enqueue, enqueue_srpm): consolidate to one enqueue() function since the database really makes no distinction between CVS and SRPM jobs - (_start_new_jobs): return UID to requester when we become aware of it * server/UserInterface.py - (_wait_for_uid): new function, waits max 3 seconds for the BuildMaster to return the new job's UID - (enqueue, enqueue_srpm): use create_job_request(), and wait for the job's UID to be returned from the BuildMaster, which we then pass back to the client - (detail_job): remove bogus email argument - (_kill_job): warn user if the job is no longer building or waiting to be added to the repo. We can't kill jobs if they are no longer building. * www/job.psp - detail_job()'s email argument got removed, remove it here to Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.89 retrieving revision 1.90 diff -u -r1.89 -r1.90 --- ChangeLog 4 Aug 2005 21:12:42 -0000 1.89 +++ ChangeLog 5 Aug 2005 16:24:06 -0000 1.90 @@ -1,3 +1,32 @@ +2005-08-05 Dan Williams + + * builder/builder.py + - (_mock_done): hand-wavy attempt to ensure the mock child process + is always reaped + + * client/client.py + - (enqueue, enqueue_srpm): Print out returned job UID + - (detail_job): remove bogus email argument + + * server/BuildMaster.py + - (create_job_request): new function to consolidate job request creation + - (enqueue, enqueue_srpm): consolidate to one enqueue() function since + the database really makes no distinction between CVS and SRPM jobs + - (_start_new_jobs): return UID to requester when we become aware of it + + * server/UserInterface.py + - (_wait_for_uid): new function, waits max 3 seconds for the BuildMaster + to return the new job's UID + - (enqueue, enqueue_srpm): use create_job_request(), and wait for the + job's UID to be returned from the BuildMaster, which we then pass + back to the client + - (detail_job): remove bogus email argument + - (_kill_job): warn user if the job is no longer building or waiting to + be added to the repo. We can't kill jobs if they are no longer building. + + * www/job.psp + - detail_job()'s email argument got removed, remove it here to + 2005-08-04 Dan Williams * server/UserInterface.py From fedora-extras-commits at redhat.com Fri Aug 5 16:24:09 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Fri, 5 Aug 2005 12:24:09 -0400 Subject: extras-buildsys/builder builder.py,1.27,1.28 Message-ID: <200508051624.j75GOevn027670@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/builder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27588/builder Modified Files: builder.py Log Message: 2005-08-05 Dan Williams * builder/builder.py - (_mock_done): hand-wavy attempt to ensure the mock child process is always reaped * client/client.py - (enqueue, enqueue_srpm): Print out returned job UID - (detail_job): remove bogus email argument * server/BuildMaster.py - (create_job_request): new function to consolidate job request creation - (enqueue, enqueue_srpm): consolidate to one enqueue() function since the database really makes no distinction between CVS and SRPM jobs - (_start_new_jobs): return UID to requester when we become aware of it * server/UserInterface.py - (_wait_for_uid): new function, waits max 3 seconds for the BuildMaster to return the new job's UID - (enqueue, enqueue_srpm): use create_job_request(), and wait for the job's UID to be returned from the BuildMaster, which we then pass back to the client - (detail_job): remove bogus email argument - (_kill_job): warn user if the job is no longer building or waiting to be added to the repo. We can't kill jobs if they are no longer building. * www/job.psp - detail_job()'s email argument got removed, remove it here to Index: builder.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/builder/builder.py,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- builder.py 1 Aug 2005 17:26:46 -0000 1.27 +++ builder.py 5 Aug 2005 16:24:07 -0000 1.28 @@ -298,6 +298,10 @@ os.fsync(self._log_fd.fileno()) def _mock_done(self): + # Ensure child mock is reaped + if self._pobj: + self._pobj.poll() + self._files = self._find_files() self.log("\n\n-----------------------\n\n") if self._status == 'done': From fedora-extras-commits at redhat.com Fri Aug 5 16:24:15 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Fri, 5 Aug 2005 12:24:15 -0400 Subject: extras-buildsys/server BuildMaster.py, 1.27, 1.28 UserInterface.py, 1.41, 1.42 Message-ID: <200508051624.j75GOj2f027676@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27588/server Modified Files: BuildMaster.py UserInterface.py Log Message: 2005-08-05 Dan Williams * builder/builder.py - (_mock_done): hand-wavy attempt to ensure the mock child process is always reaped * client/client.py - (enqueue, enqueue_srpm): Print out returned job UID - (detail_job): remove bogus email argument * server/BuildMaster.py - (create_job_request): new function to consolidate job request creation - (enqueue, enqueue_srpm): consolidate to one enqueue() function since the database really makes no distinction between CVS and SRPM jobs - (_start_new_jobs): return UID to requester when we become aware of it * server/UserInterface.py - (_wait_for_uid): new function, waits max 3 seconds for the BuildMaster to return the new job's UID - (enqueue, enqueue_srpm): use create_job_request(), and wait for the job's UID to be returned from the BuildMaster, which we then pass back to the client - (detail_job): remove bogus email argument - (_kill_job): warn user if the job is no longer building or waiting to be added to the repo. We can't kill jobs if they are no longer building. * www/job.psp - detail_job()'s email argument got removed, remove it here to Index: BuildMaster.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/BuildMaster.py,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- BuildMaster.py 4 Aug 2005 11:38:19 -0000 1.27 +++ BuildMaster.py 5 Aug 2005 16:24:12 -0000 1.28 @@ -206,31 +206,21 @@ for repo in self.repos.values(): repo.stop() - def _job_desc_template(self, email, package, target, buildreq, time): - """ Fill in fields common to both SRPM and CVS jobs """ - - job_desc = {} - job_desc['email'] = email - job_desc['package'] = package - job_desc['target'] = target - job_desc['buildreq'] = buildreq - job_desc['time'] = time - return job_desc - - def enqueue(self, email, package, cvs_tag, target, buildreq, time): - job_desc = self._job_desc_template(email, package, target, buildreq, time) - job_desc['cvs_tag'] = cvs_tag + def create_job_request(self, email, package, source, target, buildreq, time): + req = {} + req['email'] = email + req['package'] = package + req['target'] = target + req['buildreq'] = buildreq + req['time'] = time + req['source'] = source + req['uid_avail'] = False + req['uid'] = -1 + return req + def enqueue(self, req): self._new_queue_lock.acquire() - self._new_queue.append(job_desc) - self._new_queue_lock.release() - - def enqueue_srpm(self, email, package, srpm_path, target, buildreq, time): - job_desc = self._job_desc_template(email, package, target, buildreq, time) - job_desc['srpm_path'] = srpm_path - - self._new_queue_lock.acquire() - self._new_queue.append(job_desc) + self._new_queue.append(req) self._new_queue_lock.release() def queue_job_status_update(self, uid, attrdict): @@ -362,18 +352,10 @@ self._new_queue_lock.acquire() for item in self._new_queue: - if item.has_key('cvs_tag'): - locator = item['cvs_tag'] - elif item.has_key('srpm_path'): - locator = item['srpm_path'] - else: - print "Error: '%s' incorrect job type, needs to either be cvs_tag or srpm_path" % item['package'] - continue - self.curs.execute('INSERT INTO jobs (uid, username, package,' \ ' cvs_tag, target, buildreq, starttime, endtime, status, result)' \ ' VALUES (NULL, "%s", "%s", "%s", "%s", "%s", %d, 0, "%s", "")' \ - % (item['email'], item['package'], locator, item['target'], \ + % (item['email'], item['package'], item['source'], item['target'], \ item['buildreq'], item['time'], 'initialize')) self.dbcx.commit() @@ -381,7 +363,7 @@ self.curs.execute('SELECT uid FROM jobs WHERE username="%s" AND' \ ' package="%s" AND cvs_tag="%s" AND target="%s" AND' \ ' buildreq="%s" AND starttime=%d AND status="initialize"' \ - % (item['email'], item['package'], locator, item['target'], \ + % (item['email'], item['package'], item['source'], item['target'], \ item['buildreq'], item['time'])) self.dbcx.commit() @@ -391,10 +373,13 @@ row = data[len(data) - 1] repo = self.repos[item['target']] job = PackageJob.PackageJob(row['uid'], item['email'], item['package'], - locator, repo, self, self.hostname) + item['source'], repo, self, self.hostname) print "%s (%s): Starting tag '%s' on target '%s'" % (row['uid'], \ - item['package'], locator, item['target']) + item['package'], item['source'], item['target']) + + item['uid'] = row['uid'] + item['uid_avail'] = True self._building_jobs_lock.acquire() self._building_jobs[row['uid']] = job Index: UserInterface.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/UserInterface.py,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- UserInterface.py 4 Aug 2005 21:12:42 -0000 1.41 +++ UserInterface.py 5 Aug 2005 16:24:13 -0000 1.42 @@ -117,6 +117,17 @@ self._builder_manager = builder_manager self._bm = build_master + def _wait_for_uid(self, req): + """ Wait a bit to see if the UID comes back to us """ + starttime = time.time() + while req['uid_avail'] == False: + time.sleep(0.2) + # Wait at most 3 seconds for the uid to come back + if time.time() > starttime + 3: + break + + uid = int(req['uid']) + return uid def enqueue(self, email, package, cvs_tag, target, buildreq=None): """ Accept a job to build and stuff it into the job database """ @@ -144,8 +155,10 @@ return (-1, "This build server does not support the target %s." % target) else: print "Request to enqueue '%s' tag '%s' for target '%s' (user '%s')" % (package, cvs_tag, real_target, email) - self._bm.enqueue(email, package, cvs_tag, real_target, buildreq, time.time()) - return (0, "Success: package has been queued.") + req = self._bm.create_job_request(email, package, cvs_tag, real_target, buildreq, time.time()) + self._bm.enqueue(req) + uid = self._wait_for_uid(req) + return (0, "Success: package has been queued.", uid) def enqueue_srpm(self, email, package, srpm_file, target, buildreq=None): """ Accept a job to build from SRPM file and stuff it into the job database """ @@ -180,8 +193,10 @@ return (-1, "This build server does not support the target %s." % target) else: print "Request to enqueue '%s' file '%s' for target '%s' (user '%s')" % (package, srpm_file, real_target, email) - self._bm.enqueue_srpm(email, package, srpm_file, real_target, buildreq, time.time()) - return (0, "Success: package has been queued.") + req = self._bm.create_job_request(email, package, srpm_file, real_target, buildreq, time.time()) + self._bm.enqueue(req) + uid = self._wait_for_uid(req) + return (0, "Success: package has been queued.", uid) def requeue(self, uid): uid = validate_uid(uid) @@ -540,8 +555,12 @@ return (-1, "Insufficient privileges.") jobid = int(jobid) job = self._bm.get_job(jobid) - if job and not user.job_admin and user.email != job.username: - return (-1, "Insufficient privileges.") + if job: + # Only the job owner and job_admins can kill jobs + if user.email != job.username and not user.job_admin: + return (-1, "Insufficient privileges.") + else: + return (-1, "Job %s is not currently building and therefore cannot be killed." % jobid) return self._kill_job(user.email, job, jobid) @@ -550,7 +569,7 @@ return UserInterface.list_jobs(self, args_dict) - def detail_job(self, email, jobid): + def detail_job(self, jobid): user = AuthedXMLRPCServer.get_authinfo() return UserInterface.detail_job(self, jobid) From fedora-extras-commits at redhat.com Fri Aug 5 16:24:15 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Fri, 5 Aug 2005 12:24:15 -0400 Subject: extras-buildsys/www job.psp,1.5,1.6 Message-ID: <200508051624.j75GOjbm027679@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/www In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27588/www Modified Files: job.psp Log Message: 2005-08-05 Dan Williams * builder/builder.py - (_mock_done): hand-wavy attempt to ensure the mock child process is always reaped * client/client.py - (enqueue, enqueue_srpm): Print out returned job UID - (detail_job): remove bogus email argument * server/BuildMaster.py - (create_job_request): new function to consolidate job request creation - (enqueue, enqueue_srpm): consolidate to one enqueue() function since the database really makes no distinction between CVS and SRPM jobs - (_start_new_jobs): return UID to requester when we become aware of it * server/UserInterface.py - (_wait_for_uid): new function, waits max 3 seconds for the BuildMaster to return the new job's UID - (enqueue, enqueue_srpm): use create_job_request(), and wait for the job's UID to be returned from the BuildMaster, which we then pass back to the client - (detail_job): remove bogus email argument - (_kill_job): warn user if the job is no longer building or waiting to be added to the repo. We can't kill jobs if they are no longer building. * www/job.psp - detail_job()'s email argument got removed, remove it here to Index: job.psp =================================================================== RCS file: /cvs/fedora/extras-buildsys/www/job.psp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- job.psp 4 Aug 2005 20:27:12 -0000 1.5 +++ job.psp 5 Aug 2005 16:24:13 -0000 1.6 @@ -20,7 +20,7 @@ import socket, xmlrpclib try: - (e, msg, job) = server.detail_job('', uid) + (e, msg, job) = server.detail_job(uid) except socket.error, e: msg = str(e) %> From fedora-extras-commits at redhat.com Fri Aug 5 16:41:17 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 5 Aug 2005 12:41:17 -0400 Subject: rpms/mathml-fonts/FC-4 find_symbol_font.sh, 1.1, 1.2 mathml-fonts.spec, 1.6, 1.7 Message-ID: <200508051641.j75GfHJl027787@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/mathml-fonts/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27768 Modified Files: find_symbol_font.sh mathml-fonts.spec Log Message: sync w/-devel branch Index: mathml-fonts.spec =================================================================== RCS file: /cvs/extras/rpms/mathml-fonts/FC-4/mathml-fonts.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- mathml-fonts.spec 3 Aug 2005 20:18:14 -0000 1.6 +++ mathml-fonts.spec 5 Aug 2005 16:41:14 -0000 1.7 @@ -6,7 +6,7 @@ Summary: Mathematical symbol fonts Name: mathml-fonts Version: 1.0 -Release: 16%{?dist} +Release: 17 URL: http://www.mozilla.org/projects/mathml/fonts/ License: Distributable @@ -122,7 +122,7 @@ %changelog -* Wed Aug 3 2005 Rex Dieter 1.0-16 +* Wed Aug 3 2005 Rex Dieter 1.0-17 - update for acroread7 (and SY_____.PFB) (bug #133709) - include/use find_symbol_font.sh helper script - readd %%postun From fedora-extras-commits at redhat.com Fri Aug 5 16:42:24 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Fri, 5 Aug 2005 12:42:24 -0400 Subject: extras-buildsys/www job.psp,1.6,1.7 Message-ID: <200508051642.j75GgOBD027854@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/www In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27833/www Modified Files: job.psp Log Message: Small fixes to add build start/end times and clean up archjob display Index: job.psp =================================================================== RCS file: /cvs/fedora/extras-buildsys/www/job.psp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- job.psp 5 Aug 2005 16:24:13 -0000 1.6 +++ job.psp 5 Aug 2005 16:42:22 -0000 1.7 @@ -51,11 +51,12 @@ + <% if job['endtime'] != 0: total_time = (int(job['endtime']) - int(job['starttime'])) / 60 %> - + <% # endif if job.has_key('log_url') and job['log_url'] and len(job['log_url']): @@ -80,13 +81,13 @@
Incompatible Repositories
- If you use incompatible repositories yum +
Incompatible Repositories
+ If you use incompatible repositories yum operations may fail.
Packages built for one version of Fedora are usually not compatible with other versions of Fedora. The web site of the provider should specifically state which versions of Fedora they support. -
Old Versions of yum and Current Repositories
+
Old Versions of yum and Current Repositories
The data format for repository indexes changed with version - 2.1 of yum. This was the version supplied + 2.1 of yum. This was the version supplied with Fedora 3. Repository providers should specify the versions of Fedora that they support. To confirm that an unlabeled repository is compatible with current versions of - yum, check that it has a sub-directory - called repodata/. -
Prev Next
6. Updating Your System with yum Home 8. Maintaining yum
+ yum, check that it has a sub-directory + called repodata/. +
Prev Up Next
6. Updating Your System with yum Home 8. Maintaining yum
-
9. Manually Installing Software
Prev Next
9. Manually Installing Software
- Use repositories and the standard yum commands +
9. Manually Installing Software
Prev Next
9. Manually Installing Software
+ Use repositories and the standard yum commands to install new software, unless the software is only available as - a package. In these cases, use the localinstall + a package. In these cases, use the localinstall function to install the software from the package file. The - localinstall function does not connect to any + localinstall function does not connect to any repository. -
+ + + +
Public Key is Required
+
Public Key is Required
Ensure that the public key for the package source has been imported before you install a package without a repository. Refer to Section 7.2, “Manually Authorizing Package Sources”.
Enter this command to install the package - tsclient-0.132-4.i386.rpm: + tsclient-0.132-4.i386.rpm:
-su -c 'yum localinstall tsclient-0.132-4.i386.rpm' +su -c 'yum localinstall tsclient-0.132-4.i386.rpm'
At the prompt, enter the - root password. -
Meeting Dependencies
+ root password. +
Meeting Dependencies
You must ensure that all of the dependencies are already - installed on your system, because yum cannot + installed on your system, because yum cannot download additional packages to complete the installation when - performing a localinstall operation. -
Prev Next
8. Maintaining yum Home 10. Using yum with a Proxy Server
+ performing a localinstall operation. +
Prev Up Next
8. Maintaining yum Home 10. Using yum with a Proxy Server
-
8. Maintaining yum
Prev Next
8. Maintaining yum
- The yum system does not require any routine - maintenance. To ensure that yum operations are +
8. Maintaining yum
Prev Next
8. Maintaining yum
+ The yum system does not require any routine + maintenance. To ensure that yum operations are carried out at optimal speed, disable or remove repository definitions which you no longer require. You may also clear the - files from the yum caches in order to recover + files from the yum caches in order to recover disk space. -
8.1. Disabling or Removing Package Sources
- Set enable=0 in a definition file to prevent - yum from using that repository. The - yum utility ignores any definition file with +
8.1. Disabling or Removing Package Sources
+ Set enable=0 in a definition file to prevent + yum from using that repository. The + yum utility ignores any definition file with this setting.
To completely remove access to a repository:
Delete the relevant file from - /etc/yum.repos.d/. + /etc/yum.repos.d/.
Delete the cache directory from - /var/cache/yum/. -
8.2. Clearing the yum Caches
- By default, yum retains the packages and + /var/cache/yum/. +
8.2. Clearing the yum Caches
+ By default, yum retains the packages and package data files that it downloads, so they may be reused in future operations without being downloaded again. To purge the package data files, use this command:
-su -c 'yum clean headers' +su -c 'yum clean headers'
Run this command to remove all of the packages held in the caches:
-su -c 'yum clean packages' +su -c 'yum clean packages'
When using these commands, at the prompt, enter the password for - the root account. + the root account.
Purging cached files causes those files to downloaded again the next time that they are required. This increases the amount of time required to complete the operation. -
Prev Next
7. Using Other Software Repositories Home 9. Manually Installing Software
+
Prev Up Next
7. Using Other Software Repositories Home 9. Manually Installing Software
-
10. Using yum with a Proxy Server
Prev Next
10. Using yum with a Proxy Server
+
10. Using yum with a Proxy Server
Prev Next
10. Using yum with a Proxy Server
You may access repositories through standard web proxy servers. If your system is connected to the Internet through a web proxy server, specify the proxy server details in - /etc/yum.conf. The proxy + /etc/yum.conf. The proxy setting must specify the proxy server as a complete URL, including the TCP port number. If your proxy server requires a username and - password, specify these by adding proxy_username - and proxy_password settings. + password, specify these by adding proxy_username + and proxy_password settings.
- The settings below enable yum to use the proxy + The settings below enable yum to use the proxy server - mycache.mydomain.com, + mycache.mydomain.com, connecting to port 3128, with the username - yum-user and the - password qwerty. + yum-user and the + password qwerty.
-# The proxy server - proxy server:port number +# The proxy server - proxy server:port number proxy=http://mycache.mydomain.com:3128 # The account details for yum connections proxy_username=yum-user -proxy_password=qwerty-
Example 3. Configuration File Settings for Using A Proxy Server
'; + if (!empty($actions)) { + echo "\n".''; + } + $sort=$_GET['sort']; + $order=get_order(); + $count=0; + foreach ($headers as $col=>$title) + { + if ( !empty($sort) && !empty($order) ) + { + if ($col==$sort && $order=='ASC') + { + $a_class=' class="sort-asc current-sort" '; + } + elseif ($col==$sort && $order=='DESC') + { + $a_class=' class="sort-desc current-sort" '; + } + else + { + $a_class=null; + } + } + if ($sortable&&$count>0) + { + $qs = array(); + foreach ($_GET as $qn=>$qv) { $qs[$qn] = $qv; } // existing query string variables + $qs['sort'] = $col; // add/replace sort to query string + $qs['order'] = $order; // add/replace order by to query string + foreach ($qs as $qn=>$qv) { $querystring[] = $qn.'='.$qv; } // existing query string variables + echo "\n".''; + unset($qs); + unset($querystring); + } + elseif ($count>0) + { + echo "\n".''; + } + $count++; + } + echo "\n".''; +} + +/** + * Show table data. + * @param array $row table row, assoc + * @param array $headers column name => column title (for knowing which ones to display) + * @param array $actions actions array + * @param string $type type of table, determines first column, which could be an input + * @param array|string $selected selected items; if type is checkbox, array otherwise string with one val + */ +function show_row($row,$headers,$type,$actions,$num=null,$selected=null) +{ + $indexes=array_keys($headers); + $idname = $indexes[0]; + $tr_class=($num%2)?' class="row1" ':' class="row2" '; + echo "\n".''; + foreach ($actions as $action=>$title) { + echo "\n".''; + } + foreach ($indexes as $index) + { + $row[$index]=clean_out($row[$index]); + if ($index!=$idname) { + echo ($type=='simple')?"\n".'':"\n".''; + } + } + echo "\n".''; +} + +/** + * Determine current sort order. + */ +function get_order() +{ + return ($_GET['order']=='ASC')?'DESC':'ASC'; +} + +/** + * Determine whether or not list is currently sorted. + * @param string $method which http method to check for sort information + * @return mixed cleaned orderby clause based on saved sort information or null if no orderby is set in the defined method + */ +function get_orderby($method='get') +{ + if ( $method=='get' && !empty($_GET['sort']) && !empty($_GET['order']) ) + { + $sort=clean_in($_GET['sort']); + $order=clean_in($_GET['order']); + return " ORDER BY $sort $order "; + } + elseif ( $method=='post' && !empty($_POST['sort']) && !empty($_POST['order']) ) + { + $sort=clean_in($_POST['sort']); + $order=clean_in($_POST['order']); + return " ORDER BY $sort $order "; + } + elseif ( $method=='session' && !empty($_SESSION['sort']) && !empty($_SESSION['order']) ) + { + $sort=clean_in($_SESSION['sort']); + $order=clean_in($_SESSION['order']); + return " ORDER BY $sort $order "; + } + else return null; +} + +/** + * Parses $_POST for ids, shows edit forms for each id with populated data. + * + * name will be used to retrieve an _array_ from $_POST of the same name + * the form will be an include, with $posts[col_name] as the default for all values + * try to keep your query simple (no crazy sorting, etc.) -- we're talking one record at a time here anyway + * + * Example: + * + * list_edit_ids('course_id','../forms/course.php','SELECT * FROM fic_courses','1'); + * + * @param string $name name of id field + * @param string $form path to form to be used to items + * @param string $q_front front half of query + * @param string $q_where where statement + * @param array $dates array of date field names, so they can be fixed for forms + * @param array $datetimes array of datetime field names, so they can be fixed for forms + */ +function list_edit_ids($name,$form,$q_front,$q_where='1',$dates=null,$datetimes=null) +{ + if ( !empty($_SESSION[$name]) && is_array($_SESSION[$name]) ) + { + $ids=implode(',',$_SESSION[$name]); + $orderby=get_orderby('session'); + $query=$q_front.' WHERE '.$q_where." AND $name IN($ids) ".$orderby; + $records=db_get($query); + form_start($name); + foreach ($records as $record) + { + echo "\n".''; + $record=form_array_fix_dates($dates,$datetimes,2,$record); + foreach ($record as $key=>$val) + { + $posts[$key]=clean_out($val); + } + include($form); + echo "\n".''; + form_submit('submit', '', 'button1'); + echo "\n".''; + echo "\n".''; + } + form_end(); + } + else + { + echo 'You must select a record. Go back.'; + } +} + +/** + * Process a submitted list_edit_ids form. + * @param array $name array of primary ids posted from the form, these are vital to the WHERE clause of the UPDATE statements. + * @param string $table name of table being affected + */ +function list_update_ids($name,$table) +{ + $keys=array_keys($_POST[$name]); + foreach ($keys as $index) + { + foreach ($_POST as $key=>$val) + { + if ($key!='submit') + { + $posts[$index][$key]=$val[$index]; + } + } + } + foreach ($posts as $dataset) + { + $query=db_makeupdate($dataset,$table," WHERE $name='".$dataset[$name]."' "); + db_query($query); + } +} +?> From fedora-extras-commits at redhat.com Tue Aug 2 00:09:45 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Mon, 1 Aug 2005 20:09:45 -0400 Subject: bouncer_r/php/lib forms.php,1.2,1.3 Message-ID: <200508020009.j7209jYK021298@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/php/lib In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21281/php/lib Added Files: forms.php Log Message: cvs cleanup for fedora initial commit Index: forms.php =================================================================== RCS file: forms.php diff -N forms.php --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ forms.php 2 Aug 2005 00:09:43 -0000 1.3 @@ -0,0 +1,661 @@ + $val) + { + $str[$key] =& clean_out($val, $slashes); + } + } + else + { + if ($slashes) + $str =& trim(htmlentities(stripslashes($str))); + else + $str =& trim(htmlentities($str)); + } + + return $str; +} + +/** + * Cleans a string or an array of strings for DB input. + * @param mixed $str dirty + * @param bool $single_quote add single quotes around the string, optional + * @param bool $decode run html_entity_decode(), optional + * @return mixed $ret slashes added, if necessary + */ +function clean_in($str, $single_quotes=FALSE, $decode=FALSE) +{ + if (is_array($str)) + { + foreach ($str as $key => $val) + { + $str[$key] =& clean_in($val, $single_quotes); + } + } + else + { + if (get_magic_quotes_gpc() === 1) + { + $str =& trim($str); + } + else + { + $str =& addslashes(trim($str)); + } + if ($single_quotes) { + $str = "'" . $str . "'"; + } + if ($decode) { + html_entity_decode($str); + } + } + return $str; +} + +/** + * Get calendar days in array format. + * @param int $month numeric representation of month (optional) default is empty, accepted range value is 1-12 inclusive, this affects the total number of days in given month + * @param int $year the year (optional) default is empty, this affects the total number of days in given month + * @return array $days days from 1->[28-31] (zero-filled) + */ +function array_days($month='',$year='') +{ + $days = Array(); + $num = 1; + + // get total number of days of a particular month if given a month and year + if (!empty($month) && !empty($year) && is_numeric($month) + && is_numeric($year) && $month > 0 && $month < 13) + { + $days_inmonth = (int) date("t", strtotime($year."-".$month."-01")); + } + else + $days_inmonth = 31; + + while ($num <= $days_inmonth) + { + // zero-fill + if ($num < 10) $num = "0$num"; + else $num = "$num"; + $days[$num] = $num; + $num++; + } + return $days; +} + +/** + * Get calendar months in array format. + * @return array $months months from 01-12 (zero-filled) + */ +function array_months() +{ + $months=array( + '01' => 'Jan', + '02' => 'Feb', + '03' => 'Mar', + '04' => 'Apr', + '05' => 'May', + '06' => 'Jun', + '07' => 'Jul', + '08' => 'Aug', + '09' => 'Sep', + '10' => 'Oct', + '11' => 'Nov', + '12' => 'Dec', + ); + return $months; +} + +/** + * Get calendar years in array format. + * @param int $num number of years to display (optional) default is 5, negative numbers change direction of array + * @param int $year starting year (optional) default is this year + * @return array $years years + */ +function array_years($num=5,$year='') +{ + $years=Array(); + $year=($year==null)?date('Y'):$year; + if ($num>0) + { + while ($num > 0) + { + $years[$year] = $year; + $year--; + $num--; + } + } + elseif ($num<0) + { + while ($num < 0) + { + $years[$year] = $year; + $year++; + $num++; + } + } + return $years; +} + +/** + * Get calendar hours in array format. + * @return array $hours hours (zero-filled) + */ +function array_hours() +{ + $hours=array( + '07' => '7 am', + '08' => '8 am', + '09' => '9 am', + '10' => '10 am', + '11' => '11 am', + '12' => '12 pm', + '13' => '1 pm', + '14' => '2 pm', + '15' => '3 pm', + '16' => '4 pm', + '17' => '5 pm', + '18' => '6 pm', + '19' => '7 pm', + '20' => '8 pm', + '21' => '9 pm', + '22' => '10 pm', + ); + return $hours; +} + +/** + * Get array of minutes. + * @param int $interval interval between minutes (optional) default is 15 + * @return array $minutes minutes (zero-filled) + */ +function array_minutes($interval=15) +{ + $minutes=array(); + $count=$interval; + for ($i=0;$i<60;$i+=$interval) + { + $tmp=($i<10)?'0'.$i:$i; + $minutes[$tmp]=$tmp; + } + return $minutes; +} + +/** + * Get array of states. + * @return array $states states (abbr=>fullname) + */ +function array_states() +{ + $states=array ( + 'AL' => 'Alabama', + 'AK' => 'Alaska', + 'AS' => 'American Samoa', + 'AZ' => 'Arizona', + 'AR' => 'Arkansas', + 'CA' => 'California', + 'CO' => 'Colorado', + 'CT' => 'Connecticut', + 'DE' => 'Delaware', + 'DC' => 'District of Columbia', + 'FM' => 'Federated States of Micronesia', + 'FL' => 'Florida', + 'GA' => 'Georgia', + 'GU' => 'Guam', + 'HI' => 'Hawaii', + 'ID' => 'Idaho', + 'IL' => 'Illinois', + 'IN' => 'Indiana', + 'IA' => 'Iowa', + 'KS' => 'Kansas', + 'KY' => 'Kentucky', + 'LA' => 'Louisiana', + 'ME' => 'Maine', + 'MH' => 'Marshall Islands', + 'MD' => 'Maryland', + 'MA' => 'Massachusetts', + 'MI' => 'Michigan', + 'MN' => 'Minnesota', + 'MS' => 'Mississippi', + 'MO' => 'Missouri', + 'MT' => 'Montana', + 'NE' => 'Nebraska', + 'NV' => 'Nevada', + 'NH' => 'New Hampshire', + 'NJ' => 'New Jersey', + 'NM' => 'New Mexico', + 'NY' => 'New York', + 'NC' => 'North Carolina', + 'ND' => 'North Dakota', + 'MP' => 'Northern Mariana Islands', + 'OH' => 'Ohio', + 'OK' => 'Oklahoma', + 'OR' => 'Oregon', + 'PW' => 'Palau', + 'PA' => 'Pennsylvania', + 'PR' => 'Puerto Rico', + 'RI' => 'Rhode Island', + 'SC' => 'South Carolina', + 'SD' => 'South Dakota', + 'TN' => 'Tennessee', + 'TX' => 'Texas', + 'UT' => 'Utah', + 'VT' => 'Vermont', + 'VI' => 'Virgin Islands', + 'VA' => 'Virginia', + 'WA' => 'Washington', + 'WV' => 'West Virginia', + 'WI' => 'Wisconsin', + 'WY' => 'Wyoming' + ); + return $states; +} + +/** + * Writes the beginning form tag. + * @param string $name form name + * @param string $class class name + * @param string $method method (post or get) + * @param string $action action + */ +function form_start($name='form', $class=null, $method='post', $action=null, $extra=null) +{ + $query_string = (empty($_SERVER['QUERY_STRING'])) ? '' : '?'.htmlentities($_SERVER['QUERY_STRING']); + $action = (empty($action)) ? $_SERVER['PHP_SELF'].$query_string : $action; + echo "\n"; + echo ""; +} + +/** + * Writes the ending form tag. + */ +function form_end() +{ + echo "\n".''; +} + +/** + * Writes a form input label. + * @param string $text label text + * @param string $for id of corresponding field + * @param string $class class css class of label + * @param string $extra any extra parameters (optional) + */ +function form_label($text=null, $for=null, $class=null, $extra=null) +{ + if ($extra) {$extra = ' '.$extra;} + echo "\n"; + echo '$text"; +} + +/** + * Writes a text input. + * @param string $name name of field + * @param string $id id of field, must be unique per page + * @param string $css css class + * @param string $value value + * @param int $size size of field + * @param int $maxlength maxlength of field + * @param string $extra any extra parameters (optional) + */ +function form_text($name, $id=null, $class=null, $value=null, $size='30', $maxlength='100', $extra=null) +{ + if ($extra) {$extra = ' '.$extra;} + echo '"; +} + +/** + * Writes a password input. + * @param string $name name of field + * @param string $id id of field, must be unique per page + * @param string $css css class + * @param int $size size of field (optional) default is 30 + * @param int $maxlength maxlength of field (optional) + * @param string $extra any extra parameters (optional) + */ +function form_password($name, $id=null, $class=null, $size='30', $maxlength='100', $extra=null) +{ + if ($extra) {$extra = ' '.$extra; } + echo "\n"; + echo ""; +} + +/** + * Writes a checkbox input. + * @param string $name name of field + * @param string $id id of field, must be unique per page + * @param string $class css class + * @param string $value value + * @param bool $checked checked? + * @param string $extra any extra parameters (optional) + */ +function form_checkbox($name, $id=null, $class=null, $value=null, $checked=0, $extra=null) +{ + if ($extra) {$extra = ' '.$extra;} + if ($checked == 1) + { + echo "\n"; + echo ""; + } + else + { + echo "\n"; + echo ""; + } +} + +/** + * Writes a radio input. + * @param string $name name of field + * @param string $id id of field, must be unique per page + * @param string $class css class + * @param string $value value + * @param bool $checked checked? + * @param string $extra any extra parameters (optional) + */ +function form_radio($name, $id=null, $class=null, $value=null, $checked=0, $extra=null) +{ + if ($extra) { $extra = ' '.$extra; } + if ($checked == 1) + { + echo "\n"; + echo ""; + } + else + { + echo "\n"; + echo ""; + } +} + +/** + * Writes a submit input. + * @param string $id the id attribute + * @param string $name name name of field + * @param string $class css class + * @param string $value value (button text) + * @param string $extra any extra parameters (optional) + */ +function form_submit($name, $id=null, $class=null, $value='Submit', $extra=null) +{ + if ($extra) {$extra = ' '.$extra;} + echo "\n"; + echo ""; +} + +/** + * Writes a reset input. + * @param string $name name of field + * @param string $class css class + * @param string $value value (button text) + * @param string $extra any extra parameters (optional) + */ +function form_reset($name, $class=null, $value='Reset', $extra=null) +{ + if ($extra) {$extra = ' '.$extra;} + echo "\n"; + echo ""; +} + +/** + * Writes a hidden field. + * @param string $name name of field + * @param string $value value + * @param string $extra any extra parameters (optional) + */ +function form_hidden($name, $value=null, $extra=null) +{ + if ($extra) {$extra = ' '.$extra;} + echo "\n"; + echo ""; +} + +/** + * Writes a select list with options. + * @param string $name name of field + * @param string $id id of field, must be unique per page + * @param string $class css class + * @param array $options possible options, usually pulled from db, or array_* funcs + * @param string $selected if the value matches, it is selected + * + * Multiple selects based on sets come out of a database as val,val,val + * so the explode was intended to create the instance of an array based + * on the string regardless of whether or not it has val,val,val. + * + * @param string $extra any extra parameters (optional) + */ +function form_select($name, $id=null, $class=null, $options=null, $selected=null, $extra=null) +{ + if ($extra) {$extra = ' '.$extra;} + if (!empty($selected)) + { + $selected = explode(',',$selected); + foreach ($selected as $key=>$val) {$selected[$key]=trim($val);} + } + echo "\n"; + echo "'; +} + +/** + * Writes a textarea + * @param string $name name of field + * @param string $id id of field, must be unique per page + * @param string $class css class + * @param int $rows number of rows (height) + * @param int $cols number of cols (width) + * @param string $value value of field + * @param string $extra any extra parameters + */ +function form_textarea($name, $id=null, $class=null, $rows='6', $cols='50', $value=null, $extra=null) +{ + if ($extra) {$extra = ' '.$extra;} + echo "\n"; + echo "$value"; +} + +/** + * Fix dates for form display, or proper db entry + * @param array $dates array of date field names + * @param array $datetimes array of datetime field names + * @param int $way 1 is done after a post, 2 is done when selecting for forms + * @param array $orig for way 2, the array we need to add the separated date values to (usually $posts) + * @return mixed null, or the original array modified to have separated date values for the forms + */ +function form_array_fix_dates($dates,$datetimes,$way=1,$orig='') +{ + if($way==1) + { + if (is_array($dates)) + { + foreach ($dates as $date) + { + $_POST[$date]=form_array_get_date($date); + } + } + if (is_array($datetimes)) + { + foreach ($datetimes as $datetime) + { + $_POST[$datetime]=form_array_get_datetime($datetime); + } + } + } + elseif ($way==2) + { + if (is_array($dates)) + { + foreach ($dates as $date) + { + list(${date.'_year'},${date.'_month'},${date.'_day'})=explode('-',$orig[$date]); + $orig[$date.'_year']=${date.'_year'}; + $orig[$date.'_month']=${date.'_month'}; + $orig[$date.'_day']=${date.'_day'}; + } + } + if (is_array($datetimes)) + { + foreach ($datetimes as $datetime) + { + $buf=explode(' ',$orig[$datetime]); + $date=explode('-',$buf[0]); + $time=explode(':',$buf[1]); + $orig[$datetime.'_year']=$date[0]; + $orig[$datetime.'_month']=$date[1]; + $orig[$datetime.'_day']=$date[2]; + $orig[$datetime.'_hour']=$time[0]; + $orig[$datetime.'_minute']=$time[1]; + } + } + return $orig; + } +} + +/** + * Get put a date back together after a POST. + * @param string $field name of post index of date field + * @param int $key index of form array that the field value belongs to + * @return array $date repaired date, as an array that corresponds to the form + */ +function form_array_get_date($field) +{ + $keys=array_keys($_POST[$field.'_year']); + foreach ($keys as $key) + { + $date[$key]=$_POST[$field.'_year'][$key].'-'.$_POST[$field.'_month'][$key].'-'.$_POST[$field.'_day'][$key]; + } + return $date; +} + +/** + * Get put a datetime back together after a POST. + * @param string $field name of post index of datetime field + * @param int $key index of form array that the field value belongs to + * @return array $datetime repaired datetime, as an array that corresponds to the form + */ +function form_array_get_datetime($field) +{ + $keys=array_keys($_POST[$field.'_year']); + foreach ($keys as $key) + { + $datetime[$key]=$_POST[$field.'_year'][$key].'-'.$_POST[$field.'_month'][$key].'-'.$_POST[$field.'_day'][$key].' '.$_POST[$field.'_hour'][$key].':'.$_POST[$field.'_minute'][$key]; + } + return $datetime; +} + +/** + * Validates email addresses + * @param string $email + * @returns bool + */ +function is_email_address($email) +{ + return preg_match("/^ *[0-9a-zA-Z]+[-_\.0-9a-zA-Z]*@([0-9a-zA-Z]+[-\.0-9a-zA-Z]+)+\.[a-zA-Z]+ *$/", $email); +} + +/** + * Validates phone number + * @param string $phone + * @returns bool + */ +function is_phone_number($phone) +{ + return preg_match("/^ *((1[- \.]?(($[0-9]{3}$)|([0-9]{3}))[- \.]?)|(((($[0-9]{3}$)|([0-9]{3}))[- \.]?)?))[0-9]{3}[- \.]?[0-9]{4} *$/", $phone); +} + +/** + * Returns http:// and the string if the string does not begin with http:// + * @param string $url + * @returns string + */ +function url_out($url) +{ + return (preg_match("#^http://#", $url)) ? trim($url) : 'http://'.trim($url); +} + +/** + * Take a db_get result and return an array of options. + * @param array $data db_get result + * @param string $val_col column containing the value for each option + * @param string $name_col column containing the text + * @return array $options array of options ($val=>$text) + */ +function db_get_to_options($data,$val_col,$name_col) +{ + $options=array(); + foreach ($data as $row) + { + $options[$row[$val_col]]=$row[$name_col]; + } + return $options; +} +?> From fedora-extras-commits at redhat.com Tue Aug 2 00:10:21 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Mon, 1 Aug 2005 20:10:21 -0400 Subject: bouncer_r/php/inc site.inc,NONE,1.1 Message-ID: <200508020010.j720ALgO021320@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/php/inc In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21304/php/inc Added Files: site.inc Log Message: cvs cleanup for fedora initial commit --- NEW FILE site.inc --- From fedora-extras-commits at redhat.com Tue Aug 2 00:10:42 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Mon, 1 Aug 2005 20:10:42 -0400 Subject: bouncer_r/php/inc utils.inc,NONE,1.1 Message-ID: <200508020010.j720AgYp021342@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/php/inc In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21326/php/inc Added Files: utils.inc Log Message: cvs cleanup for fedora initial commit --- NEW FILE utils.inc --- = 1024 * 1024 * 1024) { $amt = round(($bytes / (1024 * 1024 * 1024)) * 10) / 10 . "G"; } elseif ($bytes >= 1024 * 1024) { $amt = round(($bytes / (1024 * 1024)) * 10) / 10 . "M"; } elseif ($bytes >= 1024) { $amt = round(($bytes / 1024) * 10) / 10 . "K"; } else { $amt = $bytes; } return $amt; } /* determine the path for an object */ function mappath($file) { if (substr($file,0,1)=="/"){ $file = substr($file,1); } if (strlen($_SERVER["SCRIPT_NAME"])==0) { $currentpath = dirname($_ENV["SCRIPT_NAME"]); } else { $currentpath = dirname($_SERVER["SCRIPT_NAME"]); } if($currentpath=="/") $path = "./"; else $path = str_repeat("../", substr_count($currentpath, "/")); return $path.$file; } /* figure out the absolute filesystem path */ function basepath() { return realpath(dirname(__File__)."/".mappath("/")); } /* determines the page's level automagically */ function determine_level() { if (strlen($_SERVER['REQUEST_URI'])==0) { $uri_info['complete_path']=$_ENV['REQUEST_URI']; $uri_path=explode("/",rtrim($_ENV['REQUEST_URI'],"/")); } else { $uri_info['complete_path']=$_SERVER['REQUEST_URI']; $uri_path=explode("/",rtrim($_SERVER['REQUEST_URI'],"/")); } $uri_info['depth']=sizeof($uri_path)-1; $uri_info['path']=$uri_path; $uri_info['parent']=$uri_path[sizeof($uri_path)-2]; array_pop($uri_path); array_push($uri_path,""); $uri_info['parent_path']=implode("/",$uri_path); return $uri_info; } /* a function that is a bit more aggressive than htmlentities */ function encode_everything($string){ $encoded = ""; for ($n=0;$n From fedora-extras-commits at redhat.com Tue Aug 2 00:32:39 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Mon, 1 Aug 2005 20:32:39 -0400 Subject: bouncer_r/php/inc widgets.inc,NONE,1.1 Message-ID: <200508020032.j720Wdlx021386@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/php/inc In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21370/php/inc Added Files: widgets.inc Log Message: cvs cleanup for fedora initial commit --- NEW FILE widgets.inc --- "; foreach($node as $item) { // Display item as selected if it is the correct or intended URI if ($item['uri'] == $page_level['complete_path'] || $item['uri'] == $options['selected_uri']) { $selected = TRUE; $selected_begin = ''; $selected_end = ''; } else { $selected = FALSE; $selected_begin = ''; $selected_end = ''; } /* add the current item to the navigation */ $output.="\n".str_repeat("\t",$current_level+4). ''.$selected_begin.''.key($node).''.$selected_end; if ( $item['sub']!="" && ($selected || ereg("^".$item['uri'],$page_level['parent_path']))) { $output.=side_nav_traverse($item['sub'],$page_level,$current_level+1,$nav_id,$options); } $output.=''; next($node); } $output.="\n".str_repeat("\t",$current_level+3).''; return $output; } function side_nav_list($nav_list,$nav_id="",$options="") { $page_level=determine_level(); $output=side_nav_traverse($nav_list,$page_level,0,$nav_id,$options); return $output; } /* return the HTML output for the site navigation */ function side_nav($options="") { global $nav_list; $output='Site Navigation:'; $output.=side_nav_list($nav_list,"fedora-side-nav",$options); return $output; } function docs_nav($prev,$next,$home="./") { $docs_nav=''; if ($prev) $docs_nav.='Prev'; $docs_nav.='Home'; if ($next) $docs_nav.='Next'; $docs_nav.=''; return $docs_nav; } ?> From fedora-extras-commits at redhat.com Tue Aug 2 00:33:10 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Mon, 1 Aug 2005 20:33:10 -0400 Subject: bouncer_r/php/img header-fedora_logo.png, NONE, 1.1 header-download.png, NONE, 1.1 header-faq.png, NONE, 1.1 header-projects.png, NONE, 1.1 down.gif, 1.2, 1.3 corner-tl.png, NONE, 1.1 up.gif, 1.2, 1.3 favicon.ico, NONE, 1.1 corner-br.png, NONE, 1.1 corner-bl.png, NONE, 1.1 corner-tr.png, NONE, 1.1 Message-ID: <200508020033.j720XA8h021418@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/php/img In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21392/php/img Added Files: header-fedora_logo.png header-download.png header-faq.png header-projects.png down.gif corner-tl.png up.gif favicon.ico corner-br.png corner-bl.png corner-tr.png Log Message: cvs cleanup for fedora initial commit --- NEW FILE favicon.ico --- From fedora-extras-commits at redhat.com Tue Aug 2 00:33:33 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Mon, 1 Aug 2005 20:33:33 -0400 Subject: bouncer_r/php/css content.css, NONE, 1.1 screen.css, 1.2, 1.3 layout.css, 1.1, 1.2 Message-ID: <200508020033.j720XXu2021444@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/php/css In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21424/php/css Modified Files: layout.css Added Files: content.css screen.css Log Message: cvs cleanup for fedora initial commit --- NEW FILE content.css --- h1, h2, h3, h4, h5, h6 { margin: 1em 0 0.2em 0; border-bottom: 1px solid #ccc; font-family: arial, verdana, sans-serif; } li h1, li h2, li h3, li h4, li h5, li h6 { border: none; } h1 { font-size: 160%; font-weight: normal; } h2 { font-size: 150%; font-weight: normal; } h3 { font-size: 120%; } h4 { font-size: 100%; } h5 { font-size: 90%; } h6 { font-size: 90%; border: 0; } /* Navigation */ :link { color: #039; } :visited { color: #636; } :link:hover, :visited:hover { color: #333; } :link:active, :link:active { color: #000; } Index: screen.css =================================================================== RCS file: screen.css diff -N screen.css --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ screen.css 2 Aug 2005 00:33:31 -0000 1.3 @@ -0,0 +1,120 @@ +/* nav */ +ul#nav li a { + font-weight:bold; +} +ul#nav li ul li a { + font-weight:normal; +} +.logout { + color:#f00; +} + +/* forms */ +.label-login{ + display: inline; + float: left; + width: 6em; + padding-right: 1ex; + text-align: left; +} +.label-small { + display: inline; + float: left; + width: 8em; + padding-right: 1ex; + text-align:right; +} +.label-medium{ + display: inline; + float: left; + width: 14em; + padding-right: 1ex; + text-align:right; +} +.label-large{ + display: inline; + float: left; + width: 20em; + padding-right: 1ex; + text-align:right; +} +.button1 { + background-color:#9c9; + cursor:pointer; +} +.button1:hover { + background-color:#fff; + border:inset 2px #999; +} + +/* lists */ +.list { + margin-top:.5em; +} +.list td { + padding:.2em; + text-align:left; +} +.list td label { + border-bottom:1px dashed #999; + font-weight:normal; +} +.list th { + background:#eee; + border:1px solid #000; + font-weight:bold; + padding:0; +} +.list th a { + display:block; + padding:.2em 1.2em .2em .2em; + text-align:left; +} +.list th a:hover { + background-color:#fff; +} +.row1 { + background:#ddd; +} +.row2 { + background:#ccc; +} +.row1:hover, .row2:hover { + background-color:#fff; +} +.sort-desc { + background:#ccf url(../img/up.gif) no-repeat right; +} +.sort-asc { + background:#ccf url(../img/down.gif) no-repeat right; +} + +/* stats table */ +.stats tbody th { + background:#eee; + border:1px solid #000; + padding:.5em; + text-align:right; +} +.stats thead th { + background:#eee; + border:1px solid #000; + padding:.5em; + text-align:center; +} +.stats tbody tr td { + padding:.5em; +} +.stats thead th.total { + background:#9c9; + border:1px solid #000; +} +.stats tbody th.total { + background:#9c9; + border:1px solid #000; + text-align:right; +} +.stats tbody td.total { + background:#cfc; + font-weight:bold; +} Index: layout.css =================================================================== RCS file: /cvs/fedora/bouncer_r/php/css/layout.css,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- layout.css 1 Aug 2005 20:39:19 -0000 1.1 +++ layout.css 2 Aug 2005 00:33:31 -0000 1.2 @@ -195,14 +195,14 @@ border-bottom: 1px solid #34548f; } #fedora-side-nav ul li a { - padding-left: 18px; + padding-left: 12px; color: #a7b2c9; } #fedora-side-nav ul li a:hover { background-color: #46659e; } #fedora-side-nav ul ul li a { - padding-left: 36px; + padding-left: 18px; } #fedora-side-nav strong a { font-weight: normal; From fedora-extras-commits at redhat.com Tue Aug 2 00:34:22 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Mon, 1 Aug 2005 20:34:22 -0400 Subject: bouncer_r/php/cfg init.php,1.2,1.3 Message-ID: <200508020034.j720YMa4021467@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/php/cfg In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21450/php/cfg Added Files: init.php Log Message: cvs cleanup for fedora initial commit Index: init.php =================================================================== RCS file: init.php diff -N init.php --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ init.php 2 Aug 2005 00:34:20 -0000 1.3 @@ -0,0 +1,18 @@ + From fedora-extras-commits at redhat.com Tue Aug 2 00:48:49 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Mon, 1 Aug 2005 20:48:49 -0400 Subject: bouncer_r/php/cfg admin_init.php,1.2,1.3 Message-ID: <200508020048.j720mnZo021508@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/php/cfg In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21491/php/cfg Added Files: admin_init.php Log Message: cvs cleanup for fedora initial commit Index: admin_init.php =================================================================== RCS file: admin_init.php diff -N admin_init.php --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ admin_init.php 2 Aug 2005 00:48:47 -0000 1.3 @@ -0,0 +1,15 @@ + From fedora-extras-commits at redhat.com Tue Aug 2 00:49:06 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Mon, 1 Aug 2005 20:49:06 -0400 Subject: bouncer_r/php/admin/mirrors index.php,1.1,1.2 Message-ID: <200508020049.j720n6Cr021531@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/php/admin/mirrors In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21514/php/admin/mirrors Modified Files: index.php Log Message: cvs cleanup for fedora initial commit Index: index.php =================================================================== RCS file: /cvs/fedora/bouncer_r/php/admin/mirrors/index.php,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- index.php 1 Aug 2005 20:37:39 -0000 1.1 +++ index.php 2 Aug 2005 00:49:04 -0000 1.2 @@ -115,11 +115,11 @@ show_list($mirrors,$headers,'radio',$actions); form_end(); -echo 'Add a Mirror'; -form_start(); -include_once(INC.'/forms/mirror.php'); -form_submit('add-submit','','button1','Add Mirror'); -form_end(); +//echo 'Add a Mirror'; +//form_start(); +//include_once(INC.'/forms/mirror.php'); +//form_submit('add-submit','','button1','Add Mirror'); +//form_end(); $template->displayFooter('$Date$'); ?> From fedora-extras-commits at redhat.com Tue Aug 2 00:52:15 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Mon, 1 Aug 2005 20:52:15 -0400 Subject: bouncer_r/scripts split,NONE,1.1 Message-ID: <200508020052.j720qFqK021559@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/scripts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21543/scripts Added Files: split Log Message: move database split script to scripts dir --- NEW FILE split --- #!/usr/bin/env perl # # split -- split a file into pieces # # Rich Lafferty # Sat Mar 6 22:27:28 EST 1999 # # Perl Power Tools -- http://language.perl.com/ppt/ # $^W = 1; # -w use strict; use Getopt::Std; use File::Basename; my $me = basename($0); ## get_count expands byte/linecount 'k' and 'm' and checks sanity sub get_count { my $count = shift; return undef unless $count =~ /^\d+[KkMm]?$/; # sane? if ($count =~ /[Kk]$/) { $count =~ s/[Kk]//g; $count *= 1024; } elsif ($count =~ /[Mm]$/) { $count =~ s/[Mm]//g; $count *= 1024 * 1024; } return $count; } # nextfile creates the next file for output, and returns the # typeglob of the filehandle. This is the part to hack if your OS's # filenames are broken (8.3, for example, or RISC/OS's `.' path # separator. sub nextfile { no strict 'vars'; package nextfile; my $prefix = shift; if (! fileno(FH)) { $curext = "aaa"; # initialize on first call } else { close FH or die "$me: Can't close $curname: $!\n"; if ($curext eq "zzz") { die "$me: can only create 17576 files\n" } else { $curext++ } } # MS-DOS: $curname = "$prefix." . $curext; $curname = $prefix . $curext; open (FH, ">$curname") or die "$me: Can't open $curname: $!\n"; binmode(FH); return (*FH, $curname); } ## clue explains usage. sub clue { print <= $count. # There's gotta be something more elegant than this, too. if (length($chunk)) { $fh = nextfile ($prefix); print $fh $chunk; } } ## Split on patterns. elsif ($opt{p} and (! $opt{b}) and (! $opt{l}) and (! $opt{"?"})) { my $regex = $opt{p}; my $fh = nextfile ($prefix); while () { $fh = nextfile ($prefix) if /$regex/; print $fh $_; } } ## Line operations. elsif ((! $opt{p}) and (! $opt{b}) and (! $opt{"?"})) { # default is -l 1000 (NOT 1k!) my $fh; my $fn=""; my $count = (defined $opt{l} ? get_count($opt{l}) : 1000); my $line = 0; unless ($count) { die qq($me: "$opt{l}" is invalid number of lines.\n) } while () { if ($line % $count == 0){ print $fn ."\n"; system("mysql --user=\"rtklib\" --password=\"denmark88\" --database=\"rtklib\" --host=\"mysql-r.sourceforge.net\" rtklib < $fn"); ($fh,$fn) = nextfile ($prefix) } print $fh $_; $line++; } system("mysql --user=\"rtklib\" --password=\"denmark88\" --database=\"rtklib\" --host=\"mysql-r.sourceforge.net\" rtklib < $fn"); } else { clue }; # (Thanks to Abigail for the pod template.) =pod =head1 NAME split - split a file into pieces =head1 SYNOPSIS split [C<-b> byte_count[k|m]] [C<-l> line_count] [C<-p> pattern] [file [name]] =head1 DESCRIPTION The B utility reads the given I (or standard input if no file is specified) and breaks it up into files of 1000 lines each. =head1 OPTIONS B accepts the following options: =over 4 =item -b byte_count[k|m] Create smaller files I bytes in length. If ``k'' is appended to the number, the file is split into I kilobyte pieces. If ``m'' is appended to the number, the file is split into I megabyte pieces. =item -l line_count[k|m] Create smaller files I lines in length. ``k'' and ``m'' operate as with B<-b>. =item -p pattern The file is split whenever an input line matches I, which is interpreted as a Perl regular expression. The matching line will be the first line of the next output file. This option is incompatible with the B<-b> and B<-l> options. =item -? Short usage summary. =back If additional arguments are specified, the first is used as the name of the input file which is to be split. If a second additional argument is specified, it is used as a I for the names of the files into which the file is split. In this case, each file into which the file is split is named by the I followed by a lexically ordered suffix in the range of ``aaa-zzz''. If the name argument is not specified, the file is split into lexically ordered files named in the range of ``xaaa-xzzz''. =head1 BUGS B can only create 17576 files. =head1 SEE ALSO perlre(1) =head1 AUTHOR The Perl implementation of B was written by Rich Lafferty, I. =head1 COPYRIGHT and LICENSE This program is free and open software. You may use, copy, modify, distribute and sell this program (and any modified variants) in any way you wish, provided you do not restrict others to do the same. =cut From fedora-extras-commits at redhat.com Tue Aug 2 00:52:34 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Mon, 1 Aug 2005 20:52:34 -0400 Subject: bouncer_r/sql split,1.1,NONE Message-ID: <200508020052.j720qYLk021580@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/sql In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21565/sql Removed Files: split Log Message: move database split script to scripts dir --- split DELETED --- From fedora-extras-commits at redhat.com Tue Aug 2 00:58:18 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 1 Aug 2005 20:58:18 -0400 Subject: extras-buildsys ChangeLog,1.82,1.83 Message-ID: <200508020058.j720wIvA021633@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21591 Modified Files: ChangeLog Log Message: 2005-08-01 Dan Williams * common/AuthedXMLRPCServer.py common/SSLConnection.py server/Builder.py - Simulate socket timeouts with select() Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.82 retrieving revision 1.83 diff -u -r1.82 -r1.83 --- ChangeLog 29 Jul 2005 06:04:31 -0000 1.82 +++ ChangeLog 2 Aug 2005 00:58:16 -0000 1.83 @@ -1,3 +1,10 @@ +2005-08-01 Dan Williams + + * common/AuthedXMLRPCServer.py + common/SSLConnection.py + server/Builder.py + - Simulate socket timeouts with select() + 2005-07-29 Dan Williams * server/BuilderManager.py From fedora-extras-commits at redhat.com Tue Aug 2 00:58:18 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 1 Aug 2005 20:58:18 -0400 Subject: extras-buildsys/server Builder.py,1.8,1.9 Message-ID: <200508020058.j720wIm6021639@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21591/server Modified Files: Builder.py Log Message: 2005-08-01 Dan Williams * common/AuthedXMLRPCServer.py common/SSLConnection.py server/Builder.py - Simulate socket timeouts with select() Index: Builder.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/Builder.py,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- Builder.py 20 Jul 2005 20:50:07 -0000 1.8 +++ Builder.py 2 Aug 2005 00:58:16 -0000 1.9 @@ -124,7 +124,7 @@ self._server_lock.acquire() try: jobid = self._server.start(target, arch, srpm_url) - except (socket.error, OpenSSL.SSL.SysCallError, xmlrpclib.ProtocolError): + except (socket.error, socket.timeout, OpenSSL.SSL.SysCallError, xmlrpclib.ProtocolError): jobid = 0 self._server_lock.release() builder_xmlrpc_lock.release() @@ -146,7 +146,7 @@ self._server_lock.acquire() try: (jobid, status) = self._server.get_cur_job() - except (socket.error, OpenSSL.SSL.SysCallError, xmlrpclib.ProtocolError): + except (socket.error, socket.timeout, OpenSSL.SSL.SysCallError, xmlrpclib.ProtocolError): self._unavail_count = self._unavail_count + 1 else: self._unavail_count = 0 From fedora-extras-commits at redhat.com Tue Aug 2 00:58:18 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 1 Aug 2005 20:58:18 -0400 Subject: extras-buildsys/common AuthedXMLRPCServer.py, 1.5, 1.6 SSLConnection.py, 1.2, 1.3 Message-ID: <200508020058.j720wIHg021646@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21591/common Modified Files: AuthedXMLRPCServer.py SSLConnection.py Log Message: 2005-08-01 Dan Williams * common/AuthedXMLRPCServer.py common/SSLConnection.py server/Builder.py - Simulate socket timeouts with select() Index: AuthedXMLRPCServer.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/AuthedXMLRPCServer.py,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- AuthedXMLRPCServer.py 21 Jul 2005 17:18:07 -0000 1.5 +++ AuthedXMLRPCServer.py 2 Aug 2005 00:58:16 -0000 1.6 @@ -58,7 +58,10 @@ def do_POST(self): authinfo = self.server.get_authinfo(self.request, self.client_address) _add_authinfo(authinfo) - SimpleXMLRPCServer.SimpleXMLRPCRequestHandler.do_POST(self) + try: + SimpleXMLRPCServer.SimpleXMLRPCRequestHandler.do_POST(self) + except socket.timeout: + pass _del_authinfo() Index: SSLConnection.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/SSLConnection.py,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- SSLConnection.py 13 Jul 2005 15:21:05 -0000 1.2 +++ SSLConnection.py 2 Aug 2005 00:58:16 -0000 1.3 @@ -5,13 +5,11 @@ # Copyright (c) 2002 Red Hat, Inc. # # Author: Mihai Ibanescu - -# $Id$ +# Modifications by Dan Williams from OpenSSL import SSL, crypto -import socket -import os, string +import os, string, time, socket, select class SSLConnection: @@ -19,6 +17,9 @@ This whole class exists just to filter out a parameter passed in to the shutdown() method in SimpleXMLRPC.doPOST() """ + + DEFAULT_TIMEOUT = 10 + def __init__(self, conn): """ Connection is not yet a new-style class, @@ -68,13 +69,39 @@ self.__dict__["conn"].close() self.__dict__["closed"] = True self.__dict__["close_refcount"] = self.__dict__["close_refcount"] - 1 - def recv(self, bufsize): - ret = None - try: - ret = self.__dict__["conn"].recv(bufsize) - except SSL.ZeroReturnError: - pass - return ret + def sendall(self, data, flags=0): + while True: + # Use select() to simulate a socket timeout without setting the socket + # to non-blocking mode + (read, write, error) = select.select([], [self.__dict__["conn"]], [], self.DEFAULT_TIMEOUT) + if self.__dict__["conn"] in write: + try: + return self.__dict__["conn"].sendall(data, flags) + except SSL.SysCallError, e: + if e[0] == 32: # Broken Pipe + self.close() + else: + raise socket.error(e) + else: + raise socket.timeout + if self.__dict__["conn"] in error: + raise socket.error + return None + def recv(self, bufsize, flags=0): + while True: + # Use select() to simulate a socket timeout without setting the socket + # to non-blocking mode + (read, write, error) = select.select([self.__dict__["conn"]], [], [], self.DEFAULT_TIMEOUT) + if self.__dict__["conn"] in read: + try: + return self.__dict__["conn"].recv(bufsize, flags) + except SSL.ZeroReturnError: + return None + else: + raise socket.timeout + if self.__dict__["conn"] in error: + raise socket.error + return None class PlgFileObject(socket._fileobject): def close(self): From fedora-extras-commits at redhat.com Tue Aug 2 01:21:47 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Mon, 1 Aug 2005 21:21:47 -0400 Subject: rpms/scim-anthy/FC-4 scim-anthy.spec,1.17,1.18 Message-ID: <200508020121.j721Lluu022837@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim-anthy/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22820 Modified Files: scim-anthy.spec Log Message: remove update-xinput-scim Index: scim-anthy.spec =================================================================== RCS file: /cvs/extras/rpms/scim-anthy/FC-4/scim-anthy.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- scim-anthy.spec 31 Jul 2005 06:53:50 -0000 1.17 +++ scim-anthy.spec 2 Aug 2005 01:21:44 -0000 1.18 @@ -1,6 +1,6 @@ Name: scim-anthy Version: 0.5.3 -Release: 3%{?dist} +Release: 3.1%{?dist} Summary: SCIM IMEngine for anthy for Japanese input Group: System Environment/Libraries @@ -9,11 +9,8 @@ Source0: http://sourceforge.jp/projects/scim-imengine/files/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Provides: scim-ja_JP Requires: anthy BuildRequires: scim-devel anthy-devel -# for alternatives in install scripts -PreReq: %{_sysconfdir}/X11/xinit/xinput.d/scim, %{_libdir}/scim-1.0/update-xinput-scim %description Scim-anthy is a SCIM IMEngine module for anthy to support Japanese input. @@ -41,14 +38,6 @@ rm -rf $RPM_BUILD_ROOT -%post -%{_libdir}/scim-1.0/update-xinput-scim install ja_JP - - -%postun -%{_libdir}/scim-1.0/update-xinput-scim remove ja_JP - - %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING NEWS README TODO @@ -57,6 +46,9 @@ %changelog +* Tue Aug 2 2005 Ryo Dairiki - 0.5.3-3.1 +- remove update-xinput-scim settings + * Sat Jul 30 2005 Ryo Dairiki - 0.5.3-3 - modify to use update-xinput-scim script From fedora-extras-commits at redhat.com Tue Aug 2 01:22:19 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Mon, 1 Aug 2005 21:22:19 -0400 Subject: rpms/scim-anthy/FC-3 scim-anthy.spec,1.10,1.11 Message-ID: <200508020122.j721MJWk022860@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim-anthy/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22843 Modified Files: scim-anthy.spec Log Message: remove update-xinput-scim Index: scim-anthy.spec =================================================================== RCS file: /cvs/extras/rpms/scim-anthy/FC-3/scim-anthy.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- scim-anthy.spec 1 Aug 2005 05:06:17 -0000 1.10 +++ scim-anthy.spec 2 Aug 2005 01:22:17 -0000 1.11 @@ -1,6 +1,6 @@ Name: scim-anthy Version: 0.5.3 -Release: 3%{?dist} +Release: 3.1%{?dist} Summary: SCIM IMEngine for anthy for Japanese input Group: System Environment/Libraries @@ -9,11 +9,8 @@ Source0: http://sourceforge.jp/projects/scim-imengine/files/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Provides: scim-ja_JP Requires: anthy BuildRequires: scim-devel anthy-devel -# for alternatives in install scripts -PreReq: %{_sysconfdir}/X11/xinit/xinput.d/scim, %{_libdir}/scim-1.0/update-xinput-scim %description Scim-anthy is a SCIM IMEngine module for anthy to support Japanese input. @@ -41,14 +38,6 @@ rm -rf $RPM_BUILD_ROOT -%post -%{_libdir}/scim-1.0/update-xinput-scim install ja_JP - - -%postun -%{_libdir}/scim-1.0/update-xinput-scim remove ja_JP - - %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING NEWS README TODO @@ -57,6 +46,9 @@ %changelog +* Tue Aug 2 2005 Ryo Dairiki - 0.5.3-3.1 +- remove update-xinput-scim settings + * Sat Jul 30 2005 Ryo Dairiki - 0.5.3-3 - modify to use update-xinput-scim script @@ -65,10 +57,9 @@ - count scim-ja_JP providers before removing xinput.d alternative * Fri Jul 29 2005 Ryo Dairiki -- add xinput.d alternatives setup in %%post and %%po -stun +- add xinput.d alternatives setup in %%post and %%postun - provide scim-ja_JP and only uninstall xinput.d-ja_JP alternative if - no other scim-ja_JP left + no scim-ja_JP left * Fri Jul 29 2005 Jens Petersen - 0.5.3-1 - update to 0.5.3 release From fedora-extras-commits at redhat.com Tue Aug 2 02:02:54 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Mon, 1 Aug 2005 22:02:54 -0400 Subject: bouncer_r README,NONE,1.1 Message-ID: <200508020202.j7222sUQ024069@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24053 Added Files: README Log Message: cvs cleanup for fedora initial commit --- NEW FILE README --- Bouncer_r is a Mirror/Distribution manager designed for the Fedora Project. Please see INSTALL for instructions on setting up a local testing environment. From fedora-extras-commits at redhat.com Tue Aug 2 02:39:17 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Mon, 1 Aug 2005 22:39:17 -0400 Subject: rpms/scim/FC-3 xinput-scim,1.3,1.4 Message-ID: <200508020239.j722dHxr024201@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24184 Modified Files: xinput-scim Log Message: sync with FC-4 Index: xinput-scim =================================================================== RCS file: /cvs/extras/rpms/scim/FC-3/xinput-scim,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- xinput-scim 29 Jul 2005 23:30:44 -0000 1.3 +++ xinput-scim 2 Aug 2005 02:39:15 -0000 1.4 @@ -2,4 +2,3 @@ XIM_PROGRAM=scim XIM_ARGS="-d" GTK_IM_MODULE=scim -QT_IM_MODULE=scim From fedora-extras-commits at redhat.com Tue Aug 2 02:52:48 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Mon, 1 Aug 2005 22:52:48 -0400 Subject: bouncer_r INSTALL,NONE,1.1 Message-ID: <200508020252.j722qmp8024278@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24262 Added Files: INSTALL Log Message: cvs cleanup for fedora initial commit --- NEW FILE INSTALL --- Setting up a Test Environment Last Updated: 08/01/2005 dfarning Bouncer_r is intended to to be as close to mainline bouncer and mainline fedora.redhat.com as possible. 1. Install fedora.redhat.com web site from cvs.fedora.redhat.com. The main website is required so bouncer_r can access the cascading syle sheets and images. a. Go to https://admin.fedora.redhat.com/accounts/ and follow the instructions for getting access to fedoracvs. b. Check out the web module on cvs.fedora.redhat.com. c. Install the httpd and php RPMs on your system if you don't have them already. d. There is a dir in web called config/. Copy httpd.conf to /etc/httpd/conf/httpd.conf and php.ini to /etc/php.ini. e. Create a symlink from /var/www/fedora.redhat.com/ to the html/ dir of your project-web checkout: cd /var/www ln -s /your/co/of/project-web/html/ fedora.redhat.com f. Create a symlink from /var/www/include/ to the include/ dir in your project-web checkout: ln -s /your/co/of/project-web/include . g. Start httpd, and you should be good to go. If not, email tfox at redhat.com. 2. Install bouncer_r from cvs.fedora.redhat.com. a. Done in step one. b. Check out the bouncer_r module on cvs.fedora.redhat.com. c. Done in step one. d. Done in step one. e. Create a symlink from /var/www/fedora.redhat.com/bouncer_r to the / dir of your bouncer_r checkout: cd /var/www ln -s /your/co/of/bouncer_r/ fedora.redhat.com/bouncer_r f. Rename bouncer_r/php/config.php.cvs to bouncer_r/php/config.php. Edit bouncer_r/php/config.php to match your local environment. Do NOT commit bouncer_r/php/config.php to cvs because it contains your mysql information. g. Rename bouncer_r/python/sentry.conf.cvs to bouncer_r/python/sentry.conf. Edit bouncer_r/python/sentry.conf to match your local environment. Do NOT commit bouncer_r/python/config.php to cvs because it contains your mysql information. h. Install the external python modules found at http://wiki.osuosl.org/display/Bouncer/Sentry+2+Setup i. Via a browser goto to your local copy of fedora.redhat.com/bouncer_r. Introduction to bouncer_r should work. If not, contact dfarning at sbcglobal.net 3. Set up MySQL database. a. Database must be setup for bouncer_r auth to work correctly. b. TODO: 4. TODO: LIVE Update ask luke;) If you get a permission denied error after this, you probably don't have read permissions to the html/ and include/ dirs in your CVS checkout. From fedora-extras-commits at redhat.com Tue Aug 2 03:09:04 2005 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Mon, 1 Aug 2005 23:09:04 -0400 Subject: fedora-security/audit fc4,1.34,1.35 Message-ID: <200508020309.j72394Gn025482@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25465 Modified Files: fc4 Log Message: Add Network Manager CVE id Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- fc4 31 Jul 2005 15:58:12 -0000 1.34 +++ fc4 2 Aug 2005 03:09:02 -0000 1.35 @@ -3,7 +3,7 @@ ** are items that need attention -****-**** ** backport (NetworkManager) [since FEDORA-2005-680] +2005-2410 backport (NetworkManager) [since FEDORA-2005-680] 2005-2395 ** firefox 2005-2370 version (kdenetwork, fixed 3.4.2) [since FEDORA-2005-670] was backport since FEDORA-2005-624 2005-2369 version (kdenetwork, fixed 3.4.2) [since FEDORA-2005-670] was backport since FEDORA-2005-624 From fedora-extras-commits at redhat.com Tue Aug 2 03:50:49 2005 From: fedora-extras-commits at redhat.com (Ed Hill (edhill)) Date: Mon, 1 Aug 2005 23:50:49 -0400 Subject: rpms/opendap/FC-3 opendap.spec,1.2,1.3 Message-ID: <200508020350.j723onXk025598@cvs-int.fedora.redhat.com> Author: edhill Update of /cvs/extras/rpms/opendap/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25581 Modified Files: opendap.spec Log Message: try to fix x86_64 build Index: opendap.spec =================================================================== RCS file: /cvs/extras/rpms/opendap/FC-3/opendap.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- opendap.spec 1 Aug 2005 00:24:13 -0000 1.2 +++ opendap.spec 2 Aug 2005 03:50:47 -0000 1.3 @@ -1,6 +1,6 @@ Name: opendap Version: 3.4.4 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Open-source Project for a Network Data Access Protocol Group: Applications/Engineering License: LGPL @@ -77,6 +77,7 @@ mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name} mkdir -p $RPM_BUILD_ROOT/%{_bindir} mkdir -p $RPM_BUILD_ROOT/%{_includedir}/opendap +mkdir -p $RPM_BUILD_ROOT/%{_libdir} install -m644 etc/*.pm $RPM_BUILD_ROOT/%{perl_vendorlib}/ install -m644 etc/jgofs_objects_readme $RPM_BUILD_ROOT/%{_datadir}/%{name} @@ -146,6 +147,9 @@ %{perl_vendorlib}/*.pm %changelog +* Mon Aug 1 2005 3.4.4-7 +- try to fix x86_64 build + * Sun Jul 31 2005 Ed Hill 3.4.4-6 - bump version and try to build From fedora-extras-commits at redhat.com Tue Aug 2 03:54:34 2005 From: fedora-extras-commits at redhat.com (Ed Hill (edhill)) Date: Mon, 1 Aug 2005 23:54:34 -0400 Subject: rpms/opendap/FC-3 opendap.spec,1.3,1.4 Message-ID: <200508020354.j723sYV9025705@cvs-int.fedora.redhat.com> Author: edhill Update of /cvs/extras/rpms/opendap/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25688 Modified Files: opendap.spec Log Message: bump for build Index: opendap.spec =================================================================== RCS file: /cvs/extras/rpms/opendap/FC-3/opendap.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- opendap.spec 2 Aug 2005 03:50:47 -0000 1.3 +++ opendap.spec 2 Aug 2005 03:54:32 -0000 1.4 @@ -1,6 +1,6 @@ Name: opendap Version: 3.4.4 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Open-source Project for a Network Data Access Protocol Group: Applications/Engineering License: LGPL From fedora-extras-commits at redhat.com Tue Aug 2 04:10:34 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Tue, 2 Aug 2005 00:10:34 -0400 Subject: extras-buildsys/client client.py,1.20,1.21 Message-ID: <200508020410.j724AYCE027090@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/client In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27005/client Modified Files: client.py Log Message: 2005-08-01 Dan Williams * Implement 'finished' state, allow users to move failed/needsign jobs to the 'finished' state * Random cleanups of database access code to make it more readable * Simplify user permissions * server/PackageJob.py - Each state/stage now has a private method called "_stage_" that gets called when the job is in that stage. This simplifies the job's process routine quite a bit - Jobs now record a 'result', either 'success', 'failed', or 'killed' Index: client.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/client/client.py,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- client.py 29 Jul 2005 07:16:05 -0000 1.20 +++ client.py 2 Aug 2005 04:10:32 -0000 1.21 @@ -100,7 +100,8 @@ def validate_arg(arg): - if arg == 'email' or arg == 'status' or arg == 'uid' or arg == 'uid_gt' or arg == 'uid_lt': + args = ['email', 'status', 'result', 'uid', 'uid_gt', 'uid_lt'] + if arg in args: return True return False @@ -144,7 +145,7 @@ else: for job in jobs: try: - print "%d: %s (%s) %s %s" % (job['uid'], job['package'], job['source'], job['username'], job['status']) + print "%d: %s (%s) %s %s/%s" % (job['uid'], job['package'], job['source'], job['username'], job['status'], job['result']) for archjob in job['archjobs']: print "\t%s(%s): %s %s/%s" % (archjob['builder_addr'], archjob['arch'], archjob['jobid'], archjob['status'], archjob['builder_status']) print '' @@ -249,6 +250,18 @@ print "Error connecting to build server: '%s'" % e +def finish(server, args): + uid_list = [] + for uid in args: + uid_list.append(int(uid)) + + try: + (e, msg) = server.finish(uid_list) + except socket.error, e: + print "Error connecting to build server: '%s'" % e + + print msg + def getXMLRPCServerProxy(use_ssl): """ Return an XMLRPC server proxy object, either one that uses SSL with certificates @@ -365,6 +378,8 @@ pause(server, False) elif cmd == 'is_paused': is_paused(server) + elif cmd == 'finish': + finish(server, sys.argv[2:]) else: print "Unknown command." sys.exit(1) From fedora-extras-commits at redhat.com Tue Aug 2 04:10:34 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Tue, 2 Aug 2005 00:10:34 -0400 Subject: extras-buildsys/server BuildMaster.py, 1.25, 1.26 PackageJob.py, 1.15, 1.16 User.py, 1.5, 1.6 UserInterface.py, 1.37, 1.38 Message-ID: <200508020410.j724AYYJ027100@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27005/server Modified Files: BuildMaster.py PackageJob.py User.py UserInterface.py Log Message: 2005-08-01 Dan Williams * Implement 'finished' state, allow users to move failed/needsign jobs to the 'finished' state * Random cleanups of database access code to make it more readable * Simplify user permissions * server/PackageJob.py - Each state/stage now has a private method called "_stage_" that gets called when the job is in that stage. This simplifies the job's process routine quite a bit - Jobs now record a 'result', either 'success', 'failed', or 'killed' Index: BuildMaster.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/BuildMaster.py,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- BuildMaster.py 29 Jul 2005 06:05:37 -0000 1.25 +++ BuildMaster.py 2 Aug 2005 04:10:32 -0000 1.26 @@ -50,6 +50,7 @@ 'starttime BIGINT, ' \ 'endtime BIGINT, ' \ 'status VARCHAR(15), ' \ + 'result VARCHAR(15), ' \ 'epoch VARCHAR(4), ' \ 'version VARCHAR(25), ' \ 'release VARCHAR(25), ' \ @@ -146,7 +147,7 @@ def _requeue_interrupted_jobs(self): """ Restart interrupted jobs from our db. """ - self.curs.execute('SELECT uid FROM jobs WHERE (status!="needsign" AND status!="failed" AND status!="killed") ORDER BY uid') + self.curs.execute('SELECT uid FROM jobs WHERE (status!="needsign" AND status!="failed" AND status!="finished") ORDER BY uid') self.dbcx.commit() uids = self.curs.fetchall() @@ -154,7 +155,7 @@ return for item in uids: - self.requeue_job(item[0]) + self.requeue_job(item['uid']) def requeue_job(self, uid): self._restart_queue_lock.acquire() @@ -183,19 +184,37 @@ return for row in jobs: - uid = row[0] + uid = row['uid'] # Kill any archjobs that are left around self.curs.execute('DELETE FROM archjobs WHERE parent_uid=%d' % uid) self.dbcx.commit() + curs.execute('CREATE TABLE jobs (' \ + 'uid INTEGER PRIMARY KEY, ' \ + 'username VARCHAR(20), ' \ + 'package VARCHAR(50), ' \ + 'cvs_tag VARCHAR(255), ' \ + 'target VARCHAR(20), ' \ + 'buildreq VARCHAR(75), ' \ + 'starttime BIGINT, ' \ + 'endtime BIGINT, ' \ + 'status VARCHAR(15), ' \ + 'result VARCHAR(15), ' \ + 'epoch VARCHAR(4), ' \ + 'version VARCHAR(25), ' \ + 'release VARCHAR(25), ' \ + 'archlist VARCHAR(75), ' \ + 'result_msg TEXT' \ + ')') + # Now requeue the job try: - repo = self.repos[row[4]] + repo = self.repos[row['target']] except KeyError: - print "%s (%s): Target '%s' not found." % (uid, row[2], row[4]) + print "%s (%s): Target '%s' not found." % (uid, row['package'], row['target']) else: - job = PackageJob.PackageJob(uid, row[1], row[2], row[3], repo, self, self.hostname) - print "%s (%s): Restarting '%s' on target '%s'" % (uid, row[2], row[3], row[4]) + job = PackageJob.PackageJob(uid, row['username'], row['package'], row['cvs_tag'], repo, self, self.hostname) + print "%s (%s): Restarting '%s' on target '%s'" % (uid, row['package'], row['cvs_tag'], row['target']) self._building_jobs_lock.acquire() self._building_jobs[uid] = job self._building_jobs_lock.release() @@ -311,6 +330,8 @@ if attrdict.has_key('result_msg'): import urllib sql = sql + ', result_msg="%s"' % (urllib.quote(attrdict['result_msg'])) + if attrdict.has_key('result'): + sql = sql + ', result="%s"' % attrdict['result'] sql = 'UPDATE jobs SET ' + sql + ' WHERE uid=%d' % uid try: @@ -368,8 +389,8 @@ continue self.curs.execute('INSERT INTO jobs (uid, username, package,' \ - ' cvs_tag, target, buildreq, starttime, endtime, status)' \ - ' VALUES (NULL, "%s", "%s", "%s", "%s", "%s", %d, 0, "%s")' \ + ' cvs_tag, target, buildreq, starttime, endtime, status, result)' \ + ' VALUES (NULL, "%s", "%s", "%s", "%s", "%s", %d, 0, "%s", "")' \ % (item['email'], item['package'], locator, item['target'], \ item['buildreq'], item['time'], 'initialize')) self.dbcx.commit() Index: PackageJob.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/PackageJob.py,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- PackageJob.py 26 Jul 2005 17:47:24 -0000 1.15 +++ PackageJob.py 2 Aug 2005 04:10:32 -0000 1.16 @@ -87,15 +87,19 @@ def is_package_job_stage_valid(stage): - """ - Validate a job stage. - """ - - stages = ['initialize', 'checkout_wait', 'checkout_wait_done', 'checkout', 'make_srpm', 'prep', 'waiting', 'building', 'finished', 'addtorepo', 'repodone', 'needsign', 'failed', 'killed'] + """ Validate a job stage """ + stages = ['initialize', 'checkout_wait', 'checkout_wait_done', 'checkout', 'make_srpm', 'prep', 'waiting', 'building', 'build_done', 'add_to_repo', 'repodone', 'needsign', 'failed', 'finished'] if stage in stages: return True return False +def is_package_job_result_valid(result): + """ Validate a job result """ + results = ['failed', 'success', 'killed', 'in-progress'] + if result in results: + return True + return False + def make_job_log_url(target, uid, name, ver, release): if target and uid and name and ver and release: return "%s/%s/%s-%s-%s-%s/" % (config_opts['log_url'], target, uid, name, ver, release) @@ -109,6 +113,7 @@ def __init__(self, uid, username, package, cvs_tag, repo, buildmaster, hostname): self.curstage = '' + self.result = 'in-progress' self.bm = buildmaster self.uid = uid self.package = package @@ -135,7 +140,7 @@ first_stage = 'initialize' if self.no_cvs == True: - first_stage = 'make_srpm' + first_stage = 'prep' pjc = PackageJobController(self, first_stage, 'waiting') pjc.start() @@ -151,6 +156,8 @@ if oldstage != stage: attrdict = {} attrdict['status'] = copy.copy(stage) + if self.result: + attrdict['result'] = copy.copy(self.result) if self.name and self.epoch and self.ver and self.release: attrdict['epoch'] = self.epoch attrdict['version'] = self.ver @@ -260,12 +267,23 @@ os.makedirs(stage_dir) return stage_dir + def _stage_initialize(self): + self._set_cur_stage('checkout_wait') + self.bm.queue_checkout_wait(self) + return True + + def _stage_checkout_wait(self): + return True + def checkout_wait_done_callback(self): self._set_cur_stage('checkout_wait_done') self.wake() - def _checkout(self): + def _stage_checkout_wait_done(self): self._set_cur_stage('checkout') + return False + + def _stage_checkout(self): err_msg = None # Create the temporary checkout directory @@ -297,10 +315,10 @@ if err_msg: raise PrepError(err_msg) - - def _make_srpm(self): self._set_cur_stage('make_srpm') + return False + def _stage_make_srpm(self): # Map our target (self.target) to the CVS target alias, since CVS may have # different target names that we expose cvs_target_map = config_opts['cvs_target_map'] @@ -335,8 +353,10 @@ self.srpm_path = srpmpath - def _prep(self): self._set_cur_stage('prep') + return False + + def _stage_prep(self): # In SRPM-only mode, cvs_tag is path to the SRPM to build if self.no_cvs: @@ -385,6 +405,8 @@ shutil.rmtree(self.checkout_tmpdir, ignore_errors=True) self._request_arch_jobs() + self._set_cur_stage('waiting') + return False def _request_one_arch_job(self, arch, orphaned): # Construct SPRM URL @@ -430,7 +452,7 @@ self._archjobs_lock.release() def is_done(self): - if self.curstage == 'needsign' or self.curstage == 'failed' or self.curstage == 'killed': + if self.curstage == 'needsign' or self.curstage == 'failed' or self.curstage == 'finished': return True return False @@ -438,7 +460,8 @@ # Kill any building jobs resultstring = "%s (%s): Build on target %s was killed by %s." % (self.uid, self.name, self.target, username) - self._set_cur_stage('killed', resultstring) + self.result = 'killed' + self._set_cur_stage('finished', resultstring) self.email_result(self.username, resultstring) self._archjobs_lock.acquire() @@ -455,36 +478,22 @@ self._event.set() def process(self): - # Advance to next stage based on current stage + if self.is_done(): + return + try: - wait = False - if self.curstage == 'initialize': - self.bm.queue_checkout_wait(self) - self._set_cur_stage('checkout_wait') - elif self.curstage == 'checkout_wait': - wait = True - elif self.curstage == 'checkout_wait_done': - self._checkout() - elif self.curstage == 'checkout': - self._make_srpm() - elif self.curstage == 'make_srpm': - self._prep() - self._set_cur_stage('waiting') - # When prep is done, the first thread ends - elif self.curstage == 'building': - wait = self._monitor() - elif self.curstage == 'finished': - self._add_to_repo() - elif self.curstage == 'addtorepo': - wait = True - elif self.curstage == 'repodone': - self._succeeded() + func = getattr(self, "_stage_%s" % self.curstage) + if func(): + # Wait to be woken up when long-running operations complete + while not self._event.isSet(): + self._event.wait() + self._event.clear() except PrepError, e: if not self.no_cvs: shutil.rmtree(self.checkout_tmpdir, ignore_errors=True) subj = 'Prep Error (Job %s): %s on %s' % (self.uid, self.cvs_tag, self.target) self.email_result(self.username, resultstring=e.args, subject=subj) - self._failed(e.args) + self._stage_failed(e.args) except BuildError, e: subj = 'Build Error (Job %s): %s on %s' % (self.uid, self.cvs_tag, self.target) log_url = make_job_log_url(self.target, self.uid, self.name, self.ver, self.release) @@ -498,17 +507,9 @@ if job: job.die() self._archjobs_lock.release() - self._failed(e.msg) - else: - # Wait to be woken up when long-running operations complete - if wait: - while not self._event.isSet(): - self._event.wait() - self._event.clear() - - def _monitor(self): - self._set_cur_stage('building') + self._stage_failed(e.msg) + def _stage_building(self): # Count failed and completed jobs completed_jobs = 0 self._archjobs_lock.acquire() @@ -525,7 +526,7 @@ self._archjobs_lock.release() if completed_jobs == len(self.archjobs): - self._set_cur_stage('finished') + self._set_cur_stage('add_to_repo') return False # Don't want to wait return True @@ -533,14 +534,13 @@ def get_stage_dir(self): return self.stage_dir - def _failed(self, msg=None): + def _stage_failed(self, msg=None): + self.result = 'failed' self._set_cur_stage('failed', msg) self.endtime = time.time() self.bm.notify_job_done(self) - def _add_to_repo(self): - self._set_cur_stage('addtorepo') - + def _stage_add_to_repo(self): # Create a list of files that the repo should copy to # the repo dir for job in self.archjobs.values(): @@ -566,13 +566,15 @@ self.repo.request_copy(self) self.endtime = time.time() + return True def repo_add_callback(self): self._set_cur_stage('repodone') self.wake() - def _succeeded(self): + def _stage_repodone(self): resultstring = " %s (%s): Build on target %s succeeded." % (self.uid, self.name, self.target) + self.result = 'success' self._set_cur_stage('needsign', resultstring) log_url = make_job_log_url(self.target, self.uid, self.name, self.ver, self.release) Index: User.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/User.py,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- User.py 22 Jul 2005 21:35:27 -0000 1.5 +++ User.py 2 Aug 2005 04:10:32 -0000 1.6 @@ -29,8 +29,8 @@ self.email = email self.guest = guest self.own_jobs = False - self.kill_any_job = False - self.modify_users = False + self.job_admin = False + self.user_admin = False self.server_admin = False @@ -63,9 +63,12 @@ create = True if create: - curs.execute('CREATE TABLE users (email VARCHAR(50), ' \ - 'own_jobs BOOLEAN, kill_any_job BOOLEAN, ' \ - 'modify_users BOOLEAN, server_admin BOOLEAN)') + curs.execute('CREATE TABLE users (' \ + 'email VARCHAR(50), ' \ + 'own_jobs BOOLEAN, ' \ + 'job_admin BOOLEAN, ' \ + 'user_admin BOOLEAN, ' \ + 'server_admin BOOLEAN)') dbcx.commit() @@ -75,15 +78,14 @@ (dbcx, curs) = get_userdb_dbcx() user = None - curs.execute('SELECT email, own_jobs, kill_any_job, modify_users, ' \ - 'server_admin FROM users WHERE email="%s"' % email) + curs.execute('SELECT * FROM users WHERE email="%s"' % email) dbcx.commit() item = curs.fetchone() if item: user = User(email, False) user.own_jobs = item['own_jobs'] - user.kill_any_job = item['kill_any_job'] - user.modify_users = item['modify_users'] + user.job_admin = item['job_admin'] + user.user_admin = item['user_admin'] user.server_admin = item['server_admin'] else: if config_opts['guest_allowed']: Index: UserInterface.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/UserInterface.py,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- UserInterface.py 30 Jul 2005 15:05:19 -0000 1.37 +++ UserInterface.py 2 Aug 2005 04:10:32 -0000 1.38 @@ -183,7 +183,7 @@ if not uid: return (-1, "Error: Invalid job UID.") - sql = 'SELECT uid, username, status FROM jobs WHERE uid=%d' % uid + sql = 'SELECT uid, username, status, result FROM jobs WHERE uid=%d' % uid # Run the query for the job try: @@ -196,7 +196,7 @@ return (-1, "Error: Invalid job UID.") # Ensure the job failed or was killed - if job[2] != 'failed' and job[2] != 'killed': + if job['result'] != 'failed' and job['result'] != 'killed': return (-1, "Error: Job %d must be either 'failed' or 'killed' to requeue." % uid) self._bm.requeue_job(uid) @@ -214,7 +214,7 @@ def list_jobs(self, args_dict): """ Query job information and return it to the user """ - sql = 'SELECT uid, username, package, cvs_tag, target, starttime, endtime, status FROM jobs WHERE ' + sql = 'SELECT uid, username, package, cvs_tag, target, starttime, endtime, status, result FROM jobs WHERE ' sql_args = [] if args_dict.has_key('email') and args_dict['email']: @@ -230,6 +230,13 @@ else: return (-1, "Error: Invalid job status.", []) + if args_dict.has_key('result') and args_dict['result']: + result = args_dict['result'] + if PackageJob.is_package_job_result_valid(result): + sql_args.append('result="%s"' % result) + else: + return (-1, "Error: Invalid job result.", []) + if args_dict.has_key('uid') and args_dict['uid']: uid = validate_uid(args_dict['uid']) if uid == None: @@ -282,14 +289,15 @@ jobs = [] for row in data: jobrec = {} - jobrec['uid'] = row[0] - jobrec['username'] = row[1] - jobrec['package'] = row[2] - jobrec['source'] = row[3] - jobrec['target'] = row[4] - jobrec['starttime'] = row[5] - jobrec['endtime'] = row[6] - jobrec['status'] = row[7] + jobrec['uid'] = row['uid'] + jobrec['username'] = row['username'] + jobrec['package'] = row['package'] + jobrec['source'] = row['cvs_tag'] + jobrec['target'] = row['target'] + jobrec['starttime'] = row['starttime'] + jobrec['endtime'] = row['endtime'] + jobrec['status'] = row['status'] + jobrec['result'] = row['result'] jobrec['archjobs'] = [] jobs.append(copy.deepcopy(jobrec)) @@ -308,14 +316,14 @@ data = curs.fetchall() for row in data: ajrec = {} - ajrec['jobid'] = row[0] - ajrec['parent_uid'] = row[1] - ajrec['starttime'] = row[2] - ajrec['endtime'] = row[3] - ajrec['arch'] = row[4] - ajrec['builder_addr'] = row[5] - ajrec['status'] = row[6] - ajrec['builder_status'] = row[7] + ajrec['jobid'] = row['jobid'] + ajrec['parent_uid'] = row['parent_uid'] + ajrec['starttime'] = row['starttime'] + ajrec['endtime'] = row['endtime'] + ajrec['arch'] = row['arch'] + ajrec['builder_addr'] = row['builder_addr'] + ajrec['status'] = row['status'] + ajrec['builder_status'] = row['builder_status'] for job in jobs: if job['uid'] == ajrec['parent_uid']: job['archjobs'].append(copy.deepcopy(ajrec)) @@ -346,23 +354,23 @@ if not job: return (-1, "Error: Invalid job UID.", {}) jobrec = {} - jobrec['uid'] = job[0] - jobrec['username'] = job[1] - jobrec['package'] = job[2] - jobrec['source'] = job[3] - jobrec['target'] = job[4] - jobrec['starttime'] = job[5] - jobrec['endtime'] = job[6] - jobrec['status'] = job[7] - if job[8] and job[9] and job[10]: - jobrec['epoch'] = job[8] - jobrec['version'] = job[9] - jobrec['release'] = job[10] + jobrec['uid'] = job['uid'] + jobrec['username'] = job['username'] + jobrec['package'] = job['package'] + jobrec['source'] = job['cvs_tag'] + jobrec['target'] = job['target'] + jobrec['starttime'] = job['starttime'] + jobrec['endtime'] = job['endtime'] + jobrec['status'] = job['status'] + if job['epoch'] and job['version'] and job['release']: + jobrec['epoch'] = job['epoch'] + jobrec['version'] = job['version'] + jobrec['release'] = job['release'] log_url = PackageJob.make_job_log_url(jobrec['target'], str(uid), jobrec['package'], jobrec['version'], jobrec['release']) if log_url and len(log_url): jobrec['log_url'] = log_url - if job[12]: - jobrec['result_msg'] = job[12] + if job['result_msg']: + jobrec['result_msg'] = job['result_msg'] jobrec['archjobs'] = [] # Get all archjobs for this job @@ -372,14 +380,14 @@ data = curs.fetchall() for row in data: ajrec = {} - ajrec['jobid'] = row[0] - ajrec['parent_uid'] = row[1] - ajrec['starttime'] = row[2] - ajrec['endtime'] = row[3] - ajrec['arch'] = row[4] - ajrec['builder_addr'] = row[5] - ajrec['status'] = row[6] - ajrec['builder_status'] = row[7] + ajrec['jobid'] = row['jobid'] + ajrec['parent_uid'] = row['parent_uid'] + ajrec['starttime'] = row['starttime'] + ajrec['endtime'] = row['endtime'] + ajrec['arch'] = row['arch'] + ajrec['builder_addr'] = row['builder_addr'] + ajrec['status'] = row['status'] + ajrec['builder_status'] = row['builder_status'] jobrec['archjobs'].append(ajrec) del curs @@ -417,6 +425,28 @@ def is_paused(self): return self._bm.is_paused() + def finish(self, uid_list): + uids = '' + for uid in uid_list: + uid = validate_uid(uid) + if not uid: + continue + if len(uids) == 0: + uids = uids + "uid=%d" % uid + else: + uids = uids + " OR uid=%d" % uid + + if len(uids): + sql = 'UPDATE jobs SET status="finished" WHERE %s' % uids + + try: + dbcx, curs = get_dbcx() + except sqlite.DatabaseError, e: + return (-1, "Unable to access job database.") + curs.execute(sql) + dbcx.commit() + return (0, "Success.") + class UserInterfaceSSLAuth(UserInterface): """ @@ -458,7 +488,7 @@ return (-1, "Error: Invalid job UID.") # Ensure matching usernames - if job[1] != user.email and not user.server_admin: + if job['username'] != user.email and not user.job_admin: return (-1, "Error: You are not the original submitter for Job %d." % uid) return UserInterface.requeue(self, uid) @@ -471,7 +501,7 @@ return (-1, "Insufficient privileges.") jobid = int(jobid) job = self._bm.get_job(jobid) - if job and not user.kill_any_job and user.email != job.username: + if job and not user.job_admin and user.email != job.username: return (-1, "Insufficient privileges.") return self._kill_job(user.email, job, jobid) @@ -510,6 +540,52 @@ return UserInterface.pause(self, paused) + def finish(self, uid_list): + user = AuthedXMLRPCServer.get_authinfo() + if not user or not user.own_jobs: + return (-1, "Insufficient privileges.") + + uids = '' + for uid in uid_list: + uid = validate_uid(uid) + if not uid: + return (-1, "Error: Invalid job UID.") + if len(uids) == 0: + uids = uids + "uid=%d" % uid + else: + uids = uids + " OR uid=%d" % uid + + sql = 'SELECT uid, username, status FROM jobs WHERE %s' % uids + + try: + dbcx, curs = get_dbcx() + except sqlite.DatabaseError, e: + return (-1, "Unable to access job database.") + curs.execute(sql) + data = curs.fetchall() + + # Ensure that the user can actually finish the jobs they requested + final_uid_list = [] + for row in data: + uid = row['uid'] + username = row['username'] + status = row['status'] + + if status != 'needsign' and status != 'failed': + return (-1, "Error: Job %d must be either 'needsign' or 'failed' to finish it." % uid) + + # Marking 'needsign' jobs as finished requires admin privs + if status == 'needsign' and not user.job_admin: + return (-1, "Insufficient privileges to finish job %d." % uid) + # 'failed' jobs can only be finished by the job owner or a job_admin user + if status == 'failed' and user != user.email and not user.job_admin: + return (-1, "Insufficient privileges to finish job %d." % uid) + + final_uid_list.append(uid) + + return UserInterface.finish(self, final_uid_list) + + class UserInterfaceNoAuth(UserInterface): """ Allow all operations, NULL authentication From fedora-extras-commits at redhat.com Tue Aug 2 04:10:35 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Tue, 2 Aug 2005 00:10:35 -0400 Subject: extras-buildsys/www indiv.psp,1.3,1.4 Message-ID: <200508020410.j724AZSX027114@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/www In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27005/www Modified Files: indiv.psp Log Message: 2005-08-01 Dan Williams * Implement 'finished' state, allow users to move failed/needsign jobs to the 'finished' state * Random cleanups of database access code to make it more readable * Simplify user permissions * server/PackageJob.py - Each state/stage now has a private method called "_stage_" that gets called when the job is in that stage. This simplifies the job's process routine quite a bit - Jobs now record a 'result', either 'success', 'failed', or 'killed' Index: indiv.psp =================================================================== RCS file: /cvs/fedora/extras-buildsys/www/indiv.psp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- indiv.psp 23 Jul 2005 00:55:31 -0000 1.3 +++ indiv.psp 2 Aug 2005 04:10:33 -0000 1.4 @@ -53,7 +53,7 @@ # default cutoff is 1 day cutoff_time = 86400 - status_list = ['ALL', 'waiting', 'building', 'addtorepo', 'needsign', 'failed', 'killed'] + status_list = ['ALL', 'waiting', 'building', 'addtorepo', 'needsign', 'failed', 'finished'] %> From fedora-extras-commits at redhat.com Tue Aug 2 04:10:35 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Tue, 2 Aug 2005 00:10:35 -0400 Subject: extras-buildsys/utils user-manager.py,1.1,1.2 Message-ID: <200508020410.j724AZIV027108@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/utils In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27005/utils Modified Files: user-manager.py Log Message: 2005-08-01 Dan Williams * Implement 'finished' state, allow users to move failed/needsign jobs to the 'finished' state * Random cleanups of database access code to make it more readable * Simplify user permissions * server/PackageJob.py - Each state/stage now has a private method called "_stage_" that gets called when the job is in that stage. This simplifies the job's process routine quite a bit - Jobs now record a 'result', either 'success', 'failed', or 'killed' Index: user-manager.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/utils/user-manager.py,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- user-manager.py 14 Jun 2005 01:16:31 -0000 1.1 +++ user-manager.py 2 Aug 2005 04:10:33 -0000 1.2 @@ -25,9 +25,9 @@ print "Usage:\n" print " %s \n\n" % prog print " Commands:" - print " add [own_jobs] [kill_any_job] [modify_users] [server_admin]" + print " add [own_jobs] [job_admin] [user_admin] [server_admin]" print " del " - print " mod [+/-own_jobs] [+/-kill_any_job] [+/-modify_users] [+/-server_admin]" + print " mod [+/-own_jobs] [+/-job_admin] [+/-user_admin] [+/-server_admin]" print " find " @@ -51,8 +51,8 @@ if create: self.curs.execute('CREATE TABLE users (email VARCHAR(50), ' \ - 'own_jobs BOOLEAN, kill_any_job BOOLEAN, ' \ - 'modify_users BOOLEAN, server_admin BOOLEAN)') + 'own_jobs BOOLEAN, job_admin BOOLEAN, ' \ + 'user_admin BOOLEAN, server_admin BOOLEAN)') self.dbcx.commit() def __del__(self): @@ -82,24 +82,24 @@ raise UserManagerException("User %s already exists." % email) own_jobs = 0 - kill_any_job = 0 - modify_users = 0 + job_admin = 0 + user_admin = 0 server_admin = 0 for arg in args[1:]: if arg == 'own_jobs': own_jobs = 1 - elif arg == 'kill_any_job': - kill_any_job = 1 - elif arg == 'modify_users': - modify_users = 1 + elif arg == 'job_admin': + job_admin = 1 + elif arg == 'user_admin': + user_admin = 1 elif arg == 'server_admin': server_admin = 1 else: raise UserManagerException("The user privilege '%s' is unknown." % arg) - self.curs.execute('INSERT INTO users (email, own_jobs, kill_any_job,' \ - ' modify_users, server_admin) VALUES ("%s", %d, %d, %d, %d)' \ - % (email, own_jobs, kill_any_job, modify_users, server_admin)) + self.curs.execute('INSERT INTO users (email, own_jobs, job_admin,' \ + ' user_admin, server_admin) VALUES ("%s", %d, %d, %d, %d)' \ + % (email, own_jobs, job_admin, user_admin, server_admin)) self.dbcx.commit() print "User %s added." % email @@ -144,8 +144,8 @@ raise UserManagerException("User %s doesn't exist." % email) own_jobs = item['own_jobs'] - kill_any_job = item['kill_any_job'] - modify_users = item['modify_users'] + job_admin = item['job_admin'] + user_admin = item['user_admin'] server_admin = item['server_admin'] for opt in args[1:]: if opt[0] != '+' and opt[0] != '-': @@ -153,20 +153,20 @@ priv = opt[1:] if priv == 'own_jobs': own_jobs = self._cap_to_num(opt[0]) - elif priv == 'kill_any_job': - kill_any_job = self._cap_to_num(opt[0]) - elif priv == 'modify_users': - modify_users = self._cap_to_num(opt[0]) + elif priv == 'job_admin': + job_admin = self._cap_to_num(opt[0]) + elif priv == 'user_admin': + user_admin = self._cap_to_num(opt[0]) elif priv == 'server_admin': server_admin = self._cap_to_num(opt[0]) else: raise UserManagerException("The privilege '%s' is unknown." % privilege) - self.curs.execute('UPDATE users SET own_jobs=%d, kill_any_job=%d, modify_users=%d, server_admin=%d' \ - ' WHERE email="%s"' % (own_jobs, kill_any_job, modify_users, server_admin, email)) + self.curs.execute('UPDATE users SET own_jobs=%d, job_admin=%d, user_admin=%d, server_admin=%d' \ + ' WHERE email="%s"' % (own_jobs, job_admin, user_admin, server_admin, email)) self.dbcx.commit() - print "User privileges updated: own_jobs=%d, kill_any_job=%d, modify_users=%d, server_admin=%d" % ( - own_jobs, kill_any_job, modify_users, server_admin) + print "User privileges updated: own_jobs=%d, job_admin=%d, user_admin=%d, server_admin=%d" % ( + own_jobs, job_admin, user_admin, server_admin) def find_user(self, args): if len(args) < 1: @@ -184,8 +184,8 @@ for row in data: string = "%s" % row['email'] + " " * (40 - len(row['email'])) string = string + "own_jobs:%d " % row['own_jobs'] - string = string + "kill_any_job:%d " % row['kill_any_job'] - string = string + "modify_users:%d " % row['modify_users'] + string = string + "job_admin:%d " % row['job_admin'] + string = string + "user_admin:%d " % row['user_admin'] string = string + "server_admin:%d " % row['server_admin'] print string print "" From fedora-extras-commits at redhat.com Tue Aug 2 04:10:28 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Tue, 2 Aug 2005 00:10:28 -0400 Subject: extras-buildsys ChangeLog,1.83,1.84 Message-ID: <200508020410.j724AwHt027121@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27005 Modified Files: ChangeLog Log Message: 2005-08-01 Dan Williams * Implement 'finished' state, allow users to move failed/needsign jobs to the 'finished' state * Random cleanups of database access code to make it more readable * Simplify user permissions * server/PackageJob.py - Each state/stage now has a private method called "_stage_" that gets called when the job is in that stage. This simplifies the job's process routine quite a bit - Jobs now record a 'result', either 'success', 'failed', or 'killed' Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.83 retrieving revision 1.84 diff -u -r1.83 -r1.84 --- ChangeLog 2 Aug 2005 00:58:16 -0000 1.83 +++ ChangeLog 2 Aug 2005 04:10:26 -0000 1.84 @@ -1,5 +1,20 @@ 2005-08-01 Dan Williams + * Implement 'finished' state, allow users to move failed/needsign jobs + to the 'finished' state + + * Random cleanups of database access code to make it more readable + + * Simplify user permissions + + * server/PackageJob.py + - Each state/stage now has a private method called "_stage_" + that gets called when the job is in that stage. This simplifies + the job's process routine quite a bit + - Jobs now record a 'result', either 'success', 'failed', or 'killed' + +2005-08-01 Dan Williams + * common/AuthedXMLRPCServer.py common/SSLConnection.py server/Builder.py From fedora-extras-commits at redhat.com Tue Aug 2 04:10:28 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Tue, 2 Aug 2005 00:10:28 -0400 Subject: extras-buildsys/builder CONFIG.py,1.8,1.9 Message-ID: <200508020410.j724AxF8027124@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/builder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27005/builder Modified Files: CONFIG.py Log Message: 2005-08-01 Dan Williams * Implement 'finished' state, allow users to move failed/needsign jobs to the 'finished' state * Random cleanups of database access code to make it more readable * Simplify user permissions * server/PackageJob.py - Each state/stage now has a private method called "_stage_" that gets called when the job is in that stage. This simplifies the job's process routine quite a bit - Jobs now record a 'result', either 'success', 'failed', or 'killed' Index: CONFIG.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/builder/CONFIG.py,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- CONFIG.py 28 Jul 2005 21:43:33 -0000 1.8 +++ CONFIG.py 2 Aug 2005 04:10:26 -0000 1.9 @@ -50,8 +50,8 @@ # Where to keep SRPMs to build and the finished products # and logs. # WARNING: this directory is world-readable via HTTP! -config_opts['builder_work_dir'] = "/srv/plague_builder" +config_opts['builder_work_dir'] = "/tmp/builder_work" # User to drop privilege level to since we can't run mock as root, # but we have to run the HTTP server as root so it can chroot -config_opts['builder_user'] = "plague-builder" +config_opts['builder_user'] = "builder" From fedora-extras-commits at redhat.com Tue Aug 2 04:12:39 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Tue, 2 Aug 2005 00:12:39 -0400 Subject: bouncer_r/php/admin logout.php,1.2,1.3 Message-ID: <200508020412.j724Cdfr027152@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/php/admin In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27135/php/admin Added Files: logout.php Log Message: cvs cleanup for fedora initial commit Index: logout.php =================================================================== RCS file: logout.php diff -N logout.php --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ logout.php 2 Aug 2005 04:12:37 -0000 1.3 @@ -0,0 +1,13 @@ + From fedora-extras-commits at redhat.com Tue Aug 2 04:41:23 2005 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Tue, 2 Aug 2005 00:41:23 -0400 Subject: bouncer_r ChangeLog, 1.1, 1.2 INSTALL, 1.1, 1.2 README, 1.1, 1.2 index.html, 1.1, NONE Message-ID: <200508020441.j724fNcm027361@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/fedora/bouncer_r In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27340 Modified Files: ChangeLog INSTALL README Removed Files: index.html Log Message: * Tue Aug 02 2005 Luke Macken - Documentation additions/cleanups Index: ChangeLog =================================================================== RCS file: /cvs/fedora/bouncer_r/ChangeLog,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ChangeLog 1 Aug 2005 19:14:24 -0000 1.1 +++ ChangeLog 2 Aug 2005 04:41:21 -0000 1.2 @@ -1,3 +1,7 @@ +2005-08-02 Luke Macken + + * Documentation additions/cleanups. + 2005-08-01 David T. Farning - * Starting changelog. \ No newline at end of file + * Starting changelog. Index: INSTALL =================================================================== RCS file: /cvs/fedora/bouncer_r/INSTALL,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- INSTALL 2 Aug 2005 02:52:46 -0000 1.1 +++ INSTALL 2 Aug 2005 04:41:21 -0000 1.2 @@ -1,74 +1,75 @@ -Setting up a Test Environment +$Id$ -Last Updated: 08/01/2005 dfarning +Setting up a Test Environment +============================= Bouncer_r is intended to to be as close to mainline bouncer and mainline fedora.redhat.com as possible. -1. Install fedora.redhat.com web site from cvs.fedora.redhat.com. The main website -is required so bouncer_r can access the cascading syle sheets and images. - - a. Go to https://admin.fedora.redhat.com/accounts/ and follow the instructions - for getting access to fedoracvs. + 1. Install fedora.redhat.com web site from cvs.fedora.redhat.com. The + main website is required so bouncer_r can access the cascading syle + sheets and images. - b. Check out the web module on cvs.fedora.redhat.com. + a. Go to https://admin.fedora.redhat.com/accounts/ and follow the + instructions for getting access to fedoracvs. - c. Install the httpd and php RPMs on your system if you don't have - them already. + b. Check out the web module on cvs.fedora.redhat.com. - d. There is a dir in web called config/. Copy httpd.conf to - /etc/httpd/conf/httpd.conf and php.ini to /etc/php.ini. + c. Install the httpd and php RPMs on your system if you don't have + them already. - e. Create a symlink from /var/www/fedora.redhat.com/ to the html/ dir - of your project-web checkout: + d. There is a dir in web called config/. Copy httpd.conf to + /etc/httpd/conf/httpd.conf and php.ini to /etc/php.ini. - cd /var/www - ln -s /your/co/of/project-web/html/ fedora.redhat.com + e. Create a symlink from /var/www/fedora.redhat.com/ to the html/ + dir of your checkout of the web module: - f. Create a symlink from /var/www/include/ to the include/ dir in your - project-web checkout: + $ cd /var/www + $ ln -s /your/checkout/of/web/html/ fedora.redhat.com - ln -s /your/co/of/project-web/include . + f. Create a symlink from /var/www/include/ to the include/ dir in + your checkout of the web module from CVS: - g. Start httpd, and you should be good to go. If not, email - tfox at redhat.com. + $ ln -s /your/checkout/of/web/include . -2. Install bouncer_r from cvs.fedora.redhat.com. + g. Start httpd, and you should be good to go. - a. Done in step one. - - b. Check out the bouncer_r module on cvs.fedora.redhat.com. - - c. Done in step one. - - d. Done in step one. + 2. Install bouncer_r from cvs.fedora.redhat.com. - e. Create a symlink from /var/www/fedora.redhat.com/bouncer_r to the / dir - of your bouncer_r checkout: + a. Check out the bouncer_r module on cvs.fedora.redhat.com. - cd /var/www - ln -s /your/co/of/bouncer_r/ fedora.redhat.com/bouncer_r + b. Create a symlink from /var/www/fedora.redhat.com/bouncer_r to + the / dir of your bouncer_r checkout: - f. Rename bouncer_r/php/config.php.cvs to bouncer_r/php/config.php. Edit bouncer_r/php/config.php to match your local environment. Do NOT commit - bouncer_r/php/config.php to cvs because it contains your mysql information. + $ cd /var/www + $ ln -s /your/checkout/of/bouncer_r/ fedora.redhat.com/bouncer_r + c. Rename bouncer_r/php/config.php.cvs to bouncer_r/php/config.php. + Edit bouncer_r/php/config.php to match your local environment. + Do NOT commit bouncer_r/php/config.php to cvs because it contains + your mysql information. - g. Rename bouncer_r/python/sentry.conf.cvs to bouncer_r/python/sentry.conf. Edit bouncer_r/python/sentry.conf to match your local environment. Do NOT commit - bouncer_r/python/config.php to cvs because it contains your mysql information. + d. Rename bouncer_r/python/sentry.conf.cvs to + bouncer_r/python/sentry.conf. Edit bouncer_r/python/sentry.conf + to match your local environment. Do NOT commit + bouncer_r/python/config.php to cvs because it contains your mysql + information. - h. Install the external python modules found at http://wiki.osuosl.org/display/Bouncer/Sentry+2+Setup + e. Install the external python modules found at + http://wiki.osuosl.org/display/Bouncer/Sentry+2+Setup - i. Via a browser goto to your local copy of fedora.redhat.com/bouncer_r. - Introduction to bouncer_r should work. If not, contact dfarning at sbcglobal.net + f. Via a browser goto to your local copy of + fedora.redhat.com/bouncer_r. Introduction to bouncer_r should work. + If not, contact dfarning at sbcglobal.net -3. Set up MySQL database. + 3. Set up MySQL database. - a. Database must be setup for bouncer_r auth to work correctly. + a. Database must be setup for bouncer_r auth to work correctly. - b. TODO: + b. TODO: -4. TODO: LIVE Update ask luke;) + 4. TODO: LIVE Update ask luke;) -If you get a permission denied error after this, you probably don't -have read permissions to the html/ and include/ dirs in your CVS -checkout. +Note: If you get a permission denied error after this, you probably don't + have read permissions to the html/ and include/ dirs in your CVS + checkout. Index: README =================================================================== RCS file: /cvs/fedora/bouncer_r/README,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- README 2 Aug 2005 02:02:30 -0000 1.1 +++ README 2 Aug 2005 04:41:21 -0000 1.2 @@ -1,4 +1,22 @@ +Bouncer_r - A mirror/distribution manager designed for the Fedora Project. -Bouncer_r is a Mirror/Distribution manager designed for the Fedora Project. += What is it? + +Many software projects are mirrored worldwide. The mirror sites are required +to update their copy of a repository archive whenever the master server +updates the master copy. + +Bouncer_r helps administrators in keep an eye on mirror sites. It has a web +frontend which allows repository and mirror managers to easily interact with +the MySQL data store. In a concise graphic format, Bouncer_r shows each site's +status history over a given time period. It is easy to spot stale or dead +mirrors. + +Bouncer_ris a branch/fork of Bouncer. The mirror status page is derived Henk +Penning's mirmon. So, if you like the status page m3d or think it is useful +thank penning at cs.uu.nl. On the other hand the broken stuff is my fault so, +let me know at dfarning at sbcglobal.net + += How to I use it ? Please see INSTALL for instructions on setting up a local testing environment. --- index.html DELETED --- From steve at silug.org Mon Aug 1 23:39:14 2005 From: steve at silug.org (Steven Pritchard) Date: Mon, 1 Aug 2005 18:39:14 -0500 Subject: APPROVED: perl-Net-CIDR-Lite Message-ID: <20050801233914.GA4744@osiris.silug.org> Faster alternative to Net::CIDR when merging a large number of CIDR address ranges. Works for IPv4 and IPv6 addresses. Reviewer: Paul Howarth Maintainer: Steven Pritchard Steve -- Steven Pritchard - K&S Pritchard Enterprises, Inc. Email: steve at kspei.com http://www.kspei.com/ Phone: (618)398-3000 Mobile: (618)567-7320 -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 189 bytes Desc: not available URL: From fedora-extras-commits at redhat.com Tue Aug 2 05:04:04 2005 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Tue, 2 Aug 2005 01:04:04 -0400 Subject: bouncer_r INSTALL,1.2,1.3 Message-ID: <200508020504.j7254YfH028547@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/fedora/bouncer_r In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28522 Modified Files: INSTALL Log Message: typo. From fedora-extras-commits at redhat.com Tue Aug 2 05:09:58 2005 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Tue, 2 Aug 2005 01:09:58 -0400 Subject: bouncer_r INSTALL,1.3,1.4 Message-ID: <200508020509.j7259wbn028624@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/fedora/bouncer_r In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28610 Modified Files: INSTALL Log Message: Header typo From fedora-extras-commits at redhat.com Tue Aug 2 05:20:27 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Tue, 2 Aug 2005 01:20:27 -0400 Subject: bouncer_r/php index.php,1.5,1.6 Message-ID: <200508020520.j725KRgW028685@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/php In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28668/php Modified Files: index.php Log Message: Pull bouncer intro from mozilla --need to modify for fedora Index: index.php =================================================================== RCS file: /cvs/fedora/bouncer_r/php/index.php,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- index.php 2 Aug 2005 00:02:55 -0000 1.5 +++ index.php 2 Aug 2005 05:20:25 -0000 1.6 @@ -12,9 +12,193 @@ ?> -test paragraph - + Abstract +Bouncer uses MySQL to organize the Mozilla mirror network. Its primary responsibility is to know what mirrors are supposed to contain what files and periodically query their availability. Based on this knowledge, accumulated by a "sentry" script, Bouncer redirects simple user requests to appropriate mirrors based on a random seed that is affected by the mirror's relative bandwidth capabilities. +In short, Bouncer is a smarter way to use an extended mirror network to help users get what they need. +It contains three main pieces: + + Admin tools to manage the mirror network + Sentry; a daemon that queries mirrors for available files and updates their status in the Bouncer database + Bouncer; a singular file responsible for taking arguments and redirecting users to the appropriate location + + + History +Bouncer went live at 2pm, November 9th, 2004 and has been serving files since. It was originally developed as a backup plan, but was pushed to production when the demand for Firefox 1.0 overloaded the existing mirror network. Utilizing secondary mirrors through Bouncer helped keep downloads flowing in the wake of Mozilla's largest release to date. +Bouncer was originally developed at Oregon State University by Scott Kveton and Mike Morgan. The intent was to help the Mozilla community meet its growing demands. Additional development on Bouncer has continued into 2005. K Lars Lohn, a developer at the Oregon State University Open Source Lab, has made great contributions to the project by assisting with database improvements and the migration of Sentry from Perl to Python. He has helped make Sentry a multi-threaded daemon that will scale much better for an increased mirror network hosting a greater number of projects/files. + + Status +Bouncer 1.0 is currently directing users to the latest Firefox and Thunderbird releases through the mirror network. Bouncer 2.0 is nearing the final stages of development and should be deployed before Firefox 1.0.1 is released. + + Schedule + + November 9th, 2004 - Bouncer goes live as a Plan B for Firefox v1.0 release. + February 18th, 2005 - Tentative release date for Bouncer v2.0 in preparation for Firefox 1.0.1 release. + Spring, 2005 - Development of Bouncer v3.0, integration with build process. + + + Roadmap + + Bouncer 1.0 + + Basic administrative tools + + OS + Products + Regions + Mirrors + Users + File Locations + + + Sentry + + Basic Perl script to query all locations on all mirrors + Failed requests would be flagged and would be removed from rotation + + + Bouncer Script Parameters + + OS + Product + Language + + + Known Issues + + Languages; offered as a pass-thru but there was no support for it on the database side of things because it was added post-development + Versions; 1.0 offers only the latest releases + Sentry; only queries HTTP mirrors + Sentry; does not check MD5 sums + + + + +Bouncer 1.0 was a great start, but lacked some functionality due to time constraints. Since 1.0 we have had improved communications, and developed a solid plan to fix known issues and secure the overall application. +1.0 is a temporary solution to aid Mozilla in a time of growth. It will evolve with time and improve itself through the combined efforts of the community. + + + Bouncer 2.0 + + Administrative changes + + MD5, SHA1 key storage + Mirror contact information added + Mirror policy reviewed and updated + Versions + Languages + Improved database structure (denormalized a bit) + + + Sentry + + Converted to Python + Multi-threaded + Scalability improved + Actually downloads file and checks MD5, SHA1 + + + Bouncer + + Added optional Version parameter; defaults to latest version by date + Added full language support based on modified DB and admin capabilities + + + Development Model + + Integration with Mozilla CVS tree + Adoption of build process and other Mozilla standards + + + + +This first joint effort provides better overall security and granularity. It fixes Language and Version gaps and provides better assurance through improved file checking (MD5,SHA1). +Second priorities were improved statistical tools for generating trend reporting. That was not completed, but will be addressed in 3.0. + + Bouncer 3.0 + + Build Features + + Possible automation with build process to streamline releases + Queue of upcoming releases for build engineers to manage availability of binaries on mirror network + + + Improved reporting tools based on download counts and apache logs (stored in separate db) + UMO + + Possible integration with AUS, PFS, or other update services to leverage mirror network capabilities + Advanced signing for improved security + + + Download selector form based on database contents to let users choose what they want to download and where they can download it from + Updated mirrors page to give better recognition to mirror network contributors + Any other public tools to assist the community + + +The future of Bouncer depends on the development of UMO and what role people see it playing in relation to Mozilla's update service. It will continue to distribute binaries through the mirror network, but how it can better fit into Mozilla's workflow has yet to be determined. We are working on figuring out how it can help automate and combine builds, updates, etc. The best is yet to come. + + Bouncer Ideas + + Proactive mirroring + + It occurs to me (Chase) that if bouncer has a list of mirror sites and then checks the sites for new file additions as we add them to dmo, we are nearly to the point of closing the loop and just signaling to the mirror sites that a new file is available for d/l and for them to grab it. From here, we could do other sorts of neat things: + + Specify the exact set of files that have changed, to avoid having site-wide rsyncs that check the entire disk needlessly. + Schedule the initiation of the syncing so that the seed hosts aren't swamped by requests. + + + + + File Weighting + + Right now requests are equal regardless of how large the file is. + We should take into account how "heavy" a file is based on size when considering redirects somehow. + Will this present a larger problem? How important is this? Thoughts? + + + Filepath Exceptions + + Bouncer needs to be able to handle products and files that do not fit the common schema for building URLs. + + For example, if the OS is in the file name. + Or if there are no localization paths, etc. + + + Essentially it should allow us to specify a larger chunk of the URL based on an option. + + + + + Server Requirements + + v1.0 + + + Perl (sentry.pl) + + LWP (libwww-perl) + + + PHP 4.3.x + Apache (any version) + MySQL ~ 4.0 + + + v2.0 + + + PHP 4.3.x + Apache (any version) + MySQL ~ 4.0 + Python 2.3 + + mx.DateTime (http://www.egenix.com/files/python/eGenix-mx-Extensions.html#Download-mxBASE) + MySQLdb (http://sourceforge.net/projects/mysql-python) + Crypto (http://www.amk.ca/python/code/crypto) + cse utils (http://wiki.osuosl.org/display/howto/cse+utils) + + + From fedora-extras-commits at redhat.com Tue Aug 2 05:32:42 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Tue, 2 Aug 2005 01:32:42 -0400 Subject: bouncer_r ChangeLog,1.2,1.3 Message-ID: <200508020532.j725WgiQ028769@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28752 Modified Files: ChangeLog Log Message: Index: ChangeLog =================================================================== RCS file: /cvs/fedora/bouncer_r/ChangeLog,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ChangeLog 2 Aug 2005 04:41:21 -0000 1.2 +++ ChangeLog 2 Aug 2005 05:32:40 -0000 1.3 @@ -1,3 +1,7 @@ +2005-08-02 David T. Farning + + * php/index.php: Pull bouncer intro from mozilla + 2005-08-02 Luke Macken * Documentation additions/cleanups. From fedora-extras-commits at redhat.com Tue Aug 2 06:15:18 2005 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Tue, 2 Aug 2005 02:15:18 -0400 Subject: bouncer_r INSTALL,1.4,1.5 Message-ID: <200508020615.j726FIHM030025@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/fedora/bouncer_r In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30008 Modified Files: INSTALL Log Message: I give up ? From fedora-extras-commits at redhat.com Tue Aug 2 06:43:16 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Tue, 2 Aug 2005 02:43:16 -0400 Subject: bouncer_r/php index.php,1.6,1.7 Message-ID: <200508020643.j726hGFs030096@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/php In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30079/php Modified Files: index.php Log Message: modified intro to fit Fedora Index: index.php =================================================================== RCS file: /cvs/fedora/bouncer_r/php/index.php,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- index.php 2 Aug 2005 05:20:25 -0000 1.6 +++ index.php 2 Aug 2005 06:43:14 -0000 1.7 @@ -6,7 +6,6 @@ $template = new Page; - $template->displayHeader('Fedora Finder'); ?> @@ -15,6 +14,7 @@ Abstract Bouncer uses MySQL to organize the Mozilla mirror network. Its primary responsibility is to know what mirrors are supposed to contain what files and periodically query their availability. Based on this knowledge, accumulated by a "sentry" script, Bouncer redirects simple user requests to appropriate mirrors based on a random seed that is affected by the mirror's relative bandwidth capabilities. +Bouncer_r is a version of bouncer that is modified to handle the additional needs of a repository based linux distrobution. In short, Bouncer is a smarter way to use an extended mirror network to help users get what they need. It contains three main pieces: @@ -24,17 +24,21 @@ History -Bouncer went live at 2pm, November 9th, 2004 and has been serving files since. It was originally developed as a backup plan, but was pushed to production when the demand for Firefox 1.0 overloaded the existing mirror network. Utilizing secondary mirrors through Bouncer helped keep downloads flowing in the wake of Mozilla's largest release to date. -Bouncer was originally developed at Oregon State University by Scott Kveton and Mike Morgan. The intent was to help the Mozilla community meet its growing demands. Additional development on Bouncer has continued into 2005. K Lars Lohn, a developer at the Oregon State University Open Source Lab, has made great contributions to the project by assisting with database improvements and the migration of Sentry from Perl to Python. He has helped make Sentry a multi-threaded daemon that will scale much better for an increased mirror network hosting a greater number of projects/files. +Bouncer went live at Mozilla at 2pm, November 9th, 2004 and has been serving files since. It was originally developed as a backup plan, but was pushed to production when the demand for Firefox 1.0 overloaded the existing mirror network. Utilizing secondary mirrors through Bouncer helped keep downloads flowing in the wake of Mozilla's largest release to date. +Bouncer was originally developed at Oregon State University by Scott Kveton and Mike Morgan. The intent was to help the Mozilla community meet its growing demands. +Additional development on Bouncer has continued into 2005. K Lars Lohn, a developer at the Oregon State University Open Source Lab, has made great contributions to the project by assisting with database improvements and the migration of Sentry from Perl to Python. He has helped make Sentry a multi-threaded daemon that will scale much better for an increased mirror network hosting a greater number of projects/files. +Development of Bouncer_r started in June of 2005 by David Farning and Luke Maken. + Status -Bouncer 1.0 is currently directing users to the latest Firefox and Thunderbird releases through the mirror network. Bouncer 2.0 is nearing the final stages of development and should be deployed before Firefox 1.0.1 is released. +Bouncer 1.0 is currently directing users to the latest Firefox and Thunderbird releases through the mirror network. Bouncer 2.0 is nearing the final stages of development and should be deployed before Firefox 1.0.1 is released. Bouncer_r 2.0 is in the early development stage. Schedule November 9th, 2004 - Bouncer goes live as a Plan B for Firefox v1.0 release. February 18th, 2005 - Tentative release date for Bouncer v2.0 in preparation for Firefox 1.0.1 release. Spring, 2005 - Development of Bouncer v3.0, integration with build process. + August, 2005 - Tentative release date for Bouncer_r 2.0 in preparation for Fedora Core 5 release. Roadmap @@ -112,10 +116,43 @@ -This first joint effort provides better overall security and granularity. It fixes Language and Version gaps and provides better assurance through improved file checking (MD5,SHA1). -Second priorities were improved statistical tools for generating trend reporting. That was not completed, but will be addressed in 3.0. - Bouncer 3.0 + Bouncer_r 2.0 + + Administrative changes + + Added repository information + + Products + Versions + Architectures + + + Modified database structure to handle repoository metadata + Modified look and feel to match existing Fedora website throught use of cascading stype sheets + + + Sentry + + Monitors repoitory status information + Parses repomd files + + + Bouncer + + Not yet implemented + + + Development Model + + Integration with Fedora CVS tree + Intergation into Fedora infrastructure + + + + + + Bouncer 3.0 (mainline) Build Features @@ -135,9 +172,16 @@ Any other public tools to assist the community + Bouncer_r 3.0 + + Follow improvements in Bouncer mainline + Encapsulate bouncer_r modifacation and pass back to main line + + + The future of Bouncer depends on the development of UMO and what role people see it playing in relation to Mozilla's update service. It will continue to distribute binaries through the mirror network, but how it can better fit into Mozilla's workflow has yet to be determined. We are working on figuring out how it can help automate and combine builds, updates, etc. The best is yet to come. - Bouncer Ideas + Bouncer Ideas (mainline) Proactive mirroring @@ -169,6 +213,19 @@ + Bouncer_r Ideas + + Modify createrepo so that repomd contains inforamtion about ISOs + Data push system + + createrepo passes change of repo status information to sentry + sentry passes change of repo status to mirrors + mirror passes mirror updated information back to sentry + + + GeoIP interface to find 'close' mirror + + Server Requirements v1.0 From fedora-extras-commits at redhat.com Tue Aug 2 07:24:16 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Tue, 2 Aug 2005 03:24:16 -0400 Subject: bouncer_r ChangeLog,1.3,1.4 Message-ID: <200508020724.j727OGa6031309@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31292 Modified Files: ChangeLog Log Message: modified intro to fit Fedora Index: ChangeLog =================================================================== RCS file: /cvs/fedora/bouncer_r/ChangeLog,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ChangeLog 2 Aug 2005 05:32:40 -0000 1.3 +++ ChangeLog 2 Aug 2005 07:24:14 -0000 1.4 @@ -1,6 +1,7 @@ 2005-08-02 David T. Farning * php/index.php: Pull bouncer intro from mozilla + * php/index.php: Modify bouncer intro to fit Fedora. 2005-08-02 Luke Macken From fedora-extras-commits at redhat.com Tue Aug 2 07:25:00 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Tue, 2 Aug 2005 03:25:00 -0400 Subject: bouncer_r/php/cfg .cvsignore,1.1,1.2 Message-ID: <200508020725.j727P0dr031329@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/php/cfg In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31312/php/cfg Modified Files: .cvsignore Log Message: add config.php.sf to .cvsignore Index: .cvsignore =================================================================== RCS file: /cvs/fedora/bouncer_r/php/cfg/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 Aug 2005 20:53:47 -0000 1.1 +++ .cvsignore 2 Aug 2005 07:24:58 -0000 1.2 @@ -1 +1,2 @@ config.php +config.php.sf From fedora-extras-commits at redhat.com Tue Aug 2 07:55:09 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Tue, 2 Aug 2005 03:55:09 -0400 Subject: rpms/Inventor/devel Inventor-SoPath.diff,NONE,1.1 Message-ID: <200508020755.j727t9Dl031499@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/Inventor/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31472/devel Added Files: Inventor-SoPath.diff Log Message: gcc-4.0.1 fix Inventor-SoPath.diff: --- NEW FILE Inventor-SoPath.diff --- --- inventor.orig/lib/database/include/Inventor/SoPath.h 2001-09-25 02:45:33.000000000 +0200 +++ inventor/lib/database/include/Inventor/SoPath.h 2005-08-02 09:21:20.000000000 +0200 @@ -79,6 +79,7 @@ class SoPathList; class SoWriteAction; +class SoTempPath; class SoPath : public SoBase { From fedora-extras-commits at redhat.com Tue Aug 2 07:55:10 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Tue, 2 Aug 2005 03:55:10 -0400 Subject: rpms/Inventor/FC-3 Inventor-SoPath.diff,NONE,1.1 Message-ID: <200508020755.j727tAQs031506@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/Inventor/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31472/FC-3 Added Files: Inventor-SoPath.diff Log Message: gcc-4.0.1 fix Inventor-SoPath.diff: --- NEW FILE Inventor-SoPath.diff --- --- inventor.orig/lib/database/include/Inventor/SoPath.h 2001-09-25 02:45:33.000000000 +0200 +++ inventor/lib/database/include/Inventor/SoPath.h 2005-08-02 09:21:20.000000000 +0200 @@ -79,6 +79,7 @@ class SoPathList; class SoWriteAction; +class SoTempPath; class SoPath : public SoBase { From fedora-extras-commits at redhat.com Tue Aug 2 07:55:15 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Tue, 2 Aug 2005 03:55:15 -0400 Subject: rpms/Inventor/FC-4 Inventor-SoPath.diff,NONE,1.1 Message-ID: <200508020755.j727tFl5031528@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/Inventor/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31472/FC-4 Added Files: Inventor-SoPath.diff Log Message: gcc-4.0.1 fix Inventor-SoPath.diff: --- NEW FILE Inventor-SoPath.diff --- --- inventor.orig/lib/database/include/Inventor/SoPath.h 2001-09-25 02:45:33.000000000 +0200 +++ inventor/lib/database/include/Inventor/SoPath.h 2005-08-02 09:21:20.000000000 +0200 @@ -79,6 +79,7 @@ class SoPathList; class SoWriteAction; +class SoTempPath; class SoPath : public SoBase { From fedora-extras-commits at redhat.com Tue Aug 2 07:56:09 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Tue, 2 Aug 2005 03:56:09 -0400 Subject: rpms/scim-pinyin/FC-4 scim-pinyin.spec,1.5,1.6 Message-ID: <200508020756.j727u9dZ031556@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/scim-pinyin/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31538 Modified Files: scim-pinyin.spec Log Message: - remove the experimental update-xinput-scim stuff for now Index: scim-pinyin.spec =================================================================== RCS file: /cvs/extras/rpms/scim-pinyin/FC-4/scim-pinyin.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- scim-pinyin.spec 31 Jul 2005 01:42:58 -0000 1.5 +++ scim-pinyin.spec 2 Aug 2005 07:56:07 -0000 1.6 @@ -1,6 +1,6 @@ Name: scim-pinyin Version: 0.5.0 -Release: 4.1%{?dist} +Release: 4%{?dist} Summary: Smart Pinyin IMEngine for Smart Common Input Method platform License: GPL @@ -10,10 +10,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch1: scim-pinyin-0.5.0-setup-ambiguity-cast.patch -Provides: scim-zh_CN, scim-zh_TW BuildRequires: scim-devel, gtk2-devel -# for alternatives in install scripts -PreReq: %{_sysconfdir}/X11/xinit/xinput.d/scim, %{_libdir}/scim-1.0/update-xinput-scim %description @@ -45,16 +42,10 @@ %post /sbin/ldconfig -%{_libdir}/scim-1.0/update-xinput-scim install zh_CN -%{_libdir}/scim-1.0/update-xinput-scim install zh_TW - %postun /sbin/ldconfig -%{_libdir}/scim-1.0/update-xinput-scim remove zh_CN -%{_libdir}/scim-1.0/update-xinput-scim remove zh_TW - %files -f %{name}.lang %defattr(-,root,root,-) @@ -66,9 +57,6 @@ %changelog -* Sun Jul 31 2005 Ryo Dairiki -0.5.0-4.1 -- Modify to use update-xinput-scim script - * Wed Jul 27 2005 Ryo Dairiki -0.5.0-4 - Rebuild for scim-1.4.0 From fedora-extras-commits at redhat.com Tue Aug 2 07:56:44 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Tue, 2 Aug 2005 03:56:44 -0400 Subject: rpms/Inventor/devel Inventor.spec,1.12,1.13 Message-ID: <200508020756.j727ui2r031611@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/Inventor/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31567/devel Modified Files: Inventor.spec Log Message: Update. Index: Inventor.spec =================================================================== RCS file: /cvs/extras/rpms/Inventor/devel/Inventor.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- Inventor.spec 27 May 2005 07:37:43 -0000 1.12 +++ Inventor.spec 2 Aug 2005 07:56:42 -0000 1.13 @@ -6,7 +6,7 @@ Name: Inventor Version: 2.1.5 -Release: 11%{?dist} +Release: 12%{?dist} Summary: SGI Open Inventor (TM) @@ -30,6 +30,8 @@ Patch6: Inventor-decal.diff # Add pkgconfig support Patch7: Inventor-pkgconfig.diff +# Declare SoTempPath forward +Patch8: Inventor-SoPath.diff BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -93,7 +95,7 @@ SGI Open Inventor (TM) demos. %package data -Summary: SGI Open Inventor data +Summary: SGI Open Inventor (TM) data Group: Development/Data %description data @@ -112,13 +114,14 @@ %prep %setup -q -n inventor %patch0 -p1 -b .debian -%patch1 -p0 -b .gmake +%patch1 -p0 # %patch2 -p0 -b .orig -%patch3 -p0 -b .yacc -%patch4 -p0 -b .mandirs -%patch5 -p0 -b .iv -%patch6 -p0 -b .orig +%patch3 -p0 +%patch4 -p0 +%patch5 -p0 +%patch6 -p0 %patch7 -p0 +%patch8 -p1 grep -Rl __ia64 lib* | while read a; do \ sed -i -e 's,__ia64,__ia64__,g' \ @@ -295,6 +298,9 @@ %{_libdir}/Inventor/examples %changelog +* Tue Jul 02 2005 Ralf Corsepius - 2.1.5-12 +- Add SoTempPath fix. + * Sun May 22 2005 Ralf Corsepius - 2.1.5-9 - Increment release in an attempt to please build system. From fedora-extras-commits at redhat.com Tue Aug 2 07:56:44 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Tue, 2 Aug 2005 03:56:44 -0400 Subject: rpms/Inventor/FC-4 Inventor.spec,1.12,1.13 Message-ID: <200508020756.j727uikS031638@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/Inventor/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31567/FC-4 Modified Files: Inventor.spec Log Message: Update. Index: Inventor.spec =================================================================== RCS file: /cvs/extras/rpms/Inventor/FC-4/Inventor.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- Inventor.spec 27 May 2005 07:37:43 -0000 1.12 +++ Inventor.spec 2 Aug 2005 07:56:42 -0000 1.13 @@ -6,7 +6,7 @@ Name: Inventor Version: 2.1.5 -Release: 11%{?dist} +Release: 12%{?dist} Summary: SGI Open Inventor (TM) @@ -30,6 +30,8 @@ Patch6: Inventor-decal.diff # Add pkgconfig support Patch7: Inventor-pkgconfig.diff +# Declare SoTempPath forward +Patch8: Inventor-SoPath.diff BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -93,7 +95,7 @@ SGI Open Inventor (TM) demos. %package data -Summary: SGI Open Inventor data +Summary: SGI Open Inventor (TM) data Group: Development/Data %description data @@ -112,13 +114,14 @@ %prep %setup -q -n inventor %patch0 -p1 -b .debian -%patch1 -p0 -b .gmake +%patch1 -p0 # %patch2 -p0 -b .orig -%patch3 -p0 -b .yacc -%patch4 -p0 -b .mandirs -%patch5 -p0 -b .iv -%patch6 -p0 -b .orig +%patch3 -p0 +%patch4 -p0 +%patch5 -p0 +%patch6 -p0 %patch7 -p0 +%patch8 -p1 grep -Rl __ia64 lib* | while read a; do \ sed -i -e 's,__ia64,__ia64__,g' \ @@ -295,6 +298,9 @@ %{_libdir}/Inventor/examples %changelog +* Tue Jul 02 2005 Ralf Corsepius - 2.1.5-12 +- Add SoTempPath fix. + * Sun May 22 2005 Ralf Corsepius - 2.1.5-9 - Increment release in an attempt to please build system. From fedora-extras-commits at redhat.com Tue Aug 2 07:56:45 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Tue, 2 Aug 2005 03:56:45 -0400 Subject: rpms/Inventor/FC-3 Inventor.spec,1.7,1.8 Message-ID: <200508020756.j727ujfd031644@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/Inventor/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31567/FC-3 Modified Files: Inventor.spec Log Message: Update. Index: Inventor.spec =================================================================== RCS file: /cvs/extras/rpms/Inventor/FC-3/Inventor.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- Inventor.spec 27 May 2005 06:49:03 -0000 1.7 +++ Inventor.spec 2 Aug 2005 07:56:43 -0000 1.8 @@ -6,7 +6,7 @@ Name: Inventor Version: 2.1.5 -Release: 11%{?dist} +Release: 12%{?dist} Summary: SGI Open Inventor (TM) @@ -30,6 +30,8 @@ Patch6: Inventor-decal.diff # Add pkgconfig support Patch7: Inventor-pkgconfig.diff +# Declare SoTempPath forward +Patch8: Inventor-SoPath.diff BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -93,7 +95,7 @@ SGI Open Inventor (TM) demos. %package data -Summary: SGI Open Inventor data +Summary: SGI Open Inventor (TM) data Group: Development/Data %description data @@ -112,13 +114,14 @@ %prep %setup -q -n inventor %patch0 -p1 -b .debian -%patch1 -p0 -b .gmake +%patch1 -p0 # %patch2 -p0 -b .orig -%patch3 -p0 -b .yacc -%patch4 -p0 -b .mandirs -%patch5 -p0 -b .iv -%patch6 -p0 -b .orig +%patch3 -p0 +%patch4 -p0 +%patch5 -p0 +%patch6 -p0 %patch7 -p0 +%patch8 -p1 grep -Rl __ia64 lib* | while read a; do \ sed -i -e 's,__ia64,__ia64__,g' \ @@ -295,6 +298,9 @@ %{_libdir}/Inventor/examples %changelog +* Tue Jul 02 2005 Ralf Corsepius - 2.1.5-12 +- Add SoTempPath fix. + * Sun May 22 2005 Ralf Corsepius - 2.1.5-9 - Increment release in an attempt to please build system. From fedora-extras-commits at redhat.com Tue Aug 2 08:49:54 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Tue, 2 Aug 2005 04:49:54 -0400 Subject: bouncer_r/php/status index.php,1.1,1.2 Message-ID: <200508020849.j728nsM1001081@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/php/status In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1064/php/status Modified Files: index.php Log Message: Added short blurb describing repositories and mirrors Index: index.php =================================================================== RCS file: /cvs/fedora/bouncer_r/php/status/index.php,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- index.php 16 Jul 2005 13:30:56 -0000 1.1 +++ index.php 2 Aug 2005 08:49:52 -0000 1.2 @@ -5,16 +5,125 @@ include("site.inc"); $template = new Page; - - $template->displayHeader('Status'); ?> -test paragraph - + Overview +Sentry monitors the status of a number of different repositories including Fedore Core and Fedora Extras(products). + Repositories are split into releases (versions) and Architectures (archs). + Whenever createrepo is run a timestamp in repomd.xmp is updated. + Sentry polls the timestamp in repomd.xml to determine when a repo has changed. + Whenever a repo is detected to be changed it is added to a queue which updates the repoitory metadata. + + + Repositories +Repositories are divided up into products, versions, and archs. + The division is a simple tree structure. (It get more complex when you start to consider core3_update, core4_testing_4.91, ...) + + + Product - Fedora Core 1 + + Version - 1 + + Arch - i386 + Arch - ppc + + + + Version - 2 + + Arch - i386 + Arch - ppc + + + Version - devel + + Arch - i386 + Arch - x86_64 + + + + + + Product - Fedora Extras 1 + + Version - 2 + + Arch - i386 + Arch - ppc + + + + Version - 3 + + Arch - i386 + Arch - ppc + + + Version - devel + + Arch - i386 + Arch - x86_64 + + + + + +By spliting the Repositories up into these tuples (prod,ver,arch) the developers and mirror administrators have great deal of flexability. + The end user can be presented whith the simple downloads defined such as 'grab the latest Fedora Core for my arch' + + + Mirrors +Mirrors are divided up into regions and types. + Currently the region categories are countries and continents. + + + + North America + + US + Canada + Mexico + + + + Europe + + Denmark + Norway + France + + + + +A mirror administrator subscribes a mirror to various repos + + + Ibibilo + + Core,3,i386 + Core,4,ppc + Extra,4,i386 + + + + Kernel.org + + Core,devel,i386 + Core,devel,i86_64 + Core,devel,ppc + + + + +Having mirror administrators subscribe to specific repos allows maximum flexibility. + Small mirror may chose only to carry the latest,common arch repos while large mirrors can chose to carry all repos for historical purposes. + The end user does not need to be aware for the mirror system. + They can simply request 'the latest Fedora Core for my arch' bouncer_r will handle the mirror redirection behind the scene. + From fedora-extras-commits at redhat.com Tue Aug 2 08:50:49 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Tue, 2 Aug 2005 04:50:49 -0400 Subject: bouncer_r ChangeLog,1.4,1.5 Message-ID: <200508020850.j728onhx001105@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1088 Modified Files: ChangeLog Log Message: Added short blurb describing repositories and mirrors Index: ChangeLog =================================================================== RCS file: /cvs/fedora/bouncer_r/ChangeLog,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ChangeLog 2 Aug 2005 07:24:14 -0000 1.4 +++ ChangeLog 2 Aug 2005 08:50:46 -0000 1.5 @@ -1,5 +1,6 @@ 2005-08-02 David T. Farning + * php/status/index.php: Added short blurb describing repositories and mirrors * php/index.php: Pull bouncer intro from mozilla * php/index.php: Modify bouncer intro to fit Fedora. From fedora-extras-commits at redhat.com Tue Aug 2 09:13:30 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Tue, 2 Aug 2005 05:13:30 -0400 Subject: rpms/scim-tables/FC-4 scim-tables.spec,1.5,1.6 Message-ID: <200508020913.j729DU9i002387@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim-tables/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2365 Modified Files: scim-tables.spec Log Message: remove update-xinput-scim script Index: scim-tables.spec =================================================================== RCS file: /cvs/extras/rpms/scim-tables/FC-4/scim-tables.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- scim-tables.spec 31 Jul 2005 05:50:42 -0000 1.5 +++ scim-tables.spec 2 Aug 2005 09:13:28 -0000 1.6 @@ -1,6 +1,6 @@ Name: scim-tables Version: 0.5.1 -Release: 3.1%{?dist} +Release: 3.2%{?dist} Summary: SCIM Generic Table IMEngine License: GPL @@ -10,8 +10,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n) BuildRequires: scim-devel, gtk2-devel -# for alternatives in install scripts -PreReq: %{_sysconfdir}/X11/xinit/xinput.d/scim, %{_libdir}/scim-1.0/update-xinput-scim %description @@ -21,7 +19,6 @@ Summary: SCIM tables for Chinese Group: System Environment/Libraries Requires: scim-tables = %{version} -Provides: scim-zh_CN, scim-zh_TW %description zh This package includes table IM data files for Chinese. @@ -30,7 +27,6 @@ Summary: SCIM tables for Japanese Group: System Environment/Libraries Requires: scim-tables = %{version} -Provides: scim-ja_JP %description ja This package includes table IM data files for Japanese. @@ -39,7 +35,6 @@ Summary: SCIM tables for Korean Group: System Environment/Libraries Requires: scim-tables = %{version} -Provides: scim-ko_KR %description ko This package includes table IM data files for Korean. @@ -48,7 +43,6 @@ Summary: SCIM tables for some additional languages Group: System Environment/Libraries Requires: scim-tables = %{version} -Provides: scim-am_ET, scim-ar, scim-vi_VN, scim-ru_RU %description additional This package includes table IM data files for additional languages, @@ -83,42 +77,9 @@ /sbin/ldconfig -%post ja -%{_libdir}/scim-1.0/update-xinput-scim install ja_JP - -%post zh -%{_libdir}/scim-1.0/update-xinput-scim install zh_CN -%{_libdir}/scim-1.0/update-xinput-scim install zh_TW - -%post ko -%{_libdir}/scim-1.0/update-xinput-scim install ko_KR - -%post additional -%{_libdir}/scim-1.0/update-xinput-scim install am_ET -%{_libdir}/scim-1.0/update-xinput-scim install ar -%{_libdir}/scim-1.0/update-xinput-scim install vi_VN -%{_libdir}/scim-1.0/update-xinput-scim install ru_RU - - %postun /sbin/ldconfig -%postun ja -%{_libdir}/scim-1.0/update-xinput-scim remove ja_JP - -%postun zh -%{_libdir}/scim-1.0/update-xinput-scim remove zh_CN -%{_libdir}/scim-1.0/update-xinput-scim remove zh_TW - -%postun ko -%{_libdir}/scim-1.0/update-xinput-scim remove ko_KR - -%postun additional -%{_libdir}/scim-1.0/update-xinput-scim remove am_ET -%{_libdir}/scim-1.0/update-xinput-scim remove ar -%{_libdir}/scim-1.0/update-xinput-scim remove vi_VN -%{_libdir}/scim-1.0/update-xinput-scim remove ru_RU - %files -f %{name}.lang %defattr(-, root, root, -) @@ -198,6 +159,9 @@ %changelog +* Tue Aug 2 2005 Ryo Dairiki -0.5.1-3.2 +- Remove update-xinput-scim script + * Sun Jul 31 2005 Ryo Dairiki -0.5.1-3.1 - Modify to use update-xinput-scim script From fedora-extras-commits at redhat.com Tue Aug 2 09:14:31 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Tue, 2 Aug 2005 05:14:31 -0400 Subject: rpms/scim-tables/FC-3 scim-tables.spec,1.3,1.4 Message-ID: <200508020914.j729EVQw002450@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim-tables/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2433 Modified Files: scim-tables.spec Log Message: sync with FC-4 Index: scim-tables.spec =================================================================== RCS file: /cvs/extras/rpms/scim-tables/FC-3/scim-tables.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- scim-tables.spec 27 Jul 2005 08:08:02 -0000 1.3 +++ scim-tables.spec 2 Aug 2005 09:14:29 -0000 1.4 @@ -1,6 +1,6 @@ Name: scim-tables Version: 0.5.1 -Release: 3%{?dist} +Release: 3.2%{?dist} Summary: SCIM Generic Table IMEngine License: GPL @@ -10,6 +10,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n) BuildRequires: scim-devel, gtk2-devel + %description This package contains the Generic Table IMEngine for SCIM. @@ -158,6 +159,12 @@ %changelog +* Tue Aug 2 2005 Ryo Dairiki -0.5.1-3.2 +- Remove update-xinput-scim script + +* Sun Jul 31 2005 Ryo Dairiki -0.5.1-3.1 +- Modify to use update-xinput-scim script + * Wed Jul 27 2005 Ryo Dairiki -0.5.1-3 - Rebuild for scim-1.4.0 From fedora-extras-commits at redhat.com Tue Aug 2 09:36:02 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Tue, 2 Aug 2005 05:36:02 -0400 Subject: bouncer_r/php/status/mirrors/icons - New directory Message-ID: <200508020936.j729a2rq002643@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/php/status/mirrors/icons In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2629/php/status/mirrors/icons Log Message: Directory /cvs/fedora/bouncer_r/php/status/mirrors/icons added to the repository From fedora-extras-commits at redhat.com Tue Aug 2 09:37:46 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Tue, 2 Aug 2005 05:37:46 -0400 Subject: bouncer_r/php/status/mirrors/icons mirmon_f.gif, NONE, 1.1 mirmon_b.gif, NONE, 1.1 mirmon_s.gif, NONE, 1.1 bar.gif, NONE, 1.1 mirmon_z.gif, NONE, 1.1 Message-ID: <200508020937.j729bkQo002675@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/php/status/mirrors/icons In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2655/php/status/mirrors/icons Added Files: mirmon_f.gif mirmon_b.gif mirmon_s.gif bar.gif mirmon_z.gif Log Message: add mirmon icons for mirror status sample page From fedora-extras-commits at redhat.com Tue Aug 2 09:38:10 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Tue, 2 Aug 2005 05:38:10 -0400 Subject: bouncer_r/php/status/mirrors/icons mmb07.gif, NONE, 1.1 mmb05.gif, NONE, 1.1 mmb06.gif, NONE, 1.1 mmb03.gif, NONE, 1.1 mmb11.gif, NONE, 1.1 mmb10.gif, NONE, 1.1 mmb09.gif, NONE, 1.1 mmb01.gif, NONE, 1.1 mmb08.gif, NONE, 1.1 mmb12.gif, NONE, 1.1 mirmon.gif, NONE, 1.1 mmb04.gif, NONE, 1.1 mmb02.gif, NONE, 1.1 Message-ID: <200508020938.j729cA6P002709@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/php/status/mirrors/icons In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2681/php/status/mirrors/icons Added Files: mmb07.gif mmb05.gif mmb06.gif mmb03.gif mmb11.gif mmb10.gif mmb09.gif mmb01.gif mmb08.gif mmb12.gif mirmon.gif mmb04.gif mmb02.gif Log Message: add mirmon icons for mirror status sample page From fedora-extras-commits at redhat.com Tue Aug 2 09:38:37 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Tue, 2 Aug 2005 05:38:37 -0400 Subject: bouncer_r/php/status/mirrors/icons mmsf09.gif, NONE, 1.1 mmsf06.gif, NONE, 1.1 mmsb01.gif, NONE, 1.1 mmsf12.gif, NONE, 1.1 mmf07.gif, NONE, 1.1 mmf01.gif, NONE, 1.1 mmsbf03.gif, NONE, 1.1 mmsf03.gif, NONE, 1.1 mms03.gif, NONE, 1.1 mmb13.gif, NONE, 1.1 mmsb02.gif, NONE, 1.1 mmb14.gif, NONE, 1.1 mmsf10.gif, NONE, 1.1 mmsbf08.gif, NONE, 1.1 mms06.gif, NONE, 1.1 mmf11.gif, NONE, 1.1 mms09.gif, NONE, 1.1 mmz04.gif, NONE, 1.1 mmf13.gif, NONE, 1.1 mmsb07.gif, NONE, 1.1 mmsb10.gif, NONE, 1.1 mmf06.gif, NONE, 1.1 mmz06.gif, NONE, 1.1 mmsf07.gif, NONE, 1.1 mmsb09.gif, NONE, 1.1 mms08.gif, NONE, 1.1 mmsbf02.gif, NONE, 1.1 mms02.gif, NONE, 1.1 mmf10.gif, NONE, 1.1 mms10.gif, NONE, 1.1 mmz02.gif, NONE, 1.1 mms07.gif, NONE, 1.1 mms04.gif, NONE, 1.1 mmsf05.gif, NONE, 1.1 mms12.gif, NONE, 1.1 mmsb04.gif, NONE, 1.1 mmz12.gif, NONE, 1.1 mmsbf01.gif, NONE, 1.1 mmsf11.gif, NONE, 1.1 mmsf01.gif, NONE, 1.1 mmsb03.gif, NONE, 1.1 mmsb05.gif, NONE, 1.1 mmsbf11.gif, NONE, 1.1 mmsbf04.gif, NONE, 1.1 mmz09.gif, NONE, 1.1 mmz08.gif, NONE, 1.1 mmz03.gif, NONE, 1.1 mmsbf09.gif, NONE, 1.1 mm! f02.gif, NONE, 1.1 mms11.gif, NONE, 1.1 mmf03.gif, NONE, 1.1 mms01.gif, NONE, 1.1 mmsbf05.gif, NONE, 1.1 mmz13.gif, NONE, 1.1 mmsf08.gif, NONE, 1.1 mmsb14.gif, NONE, 1.1 mmsbf06.gif, NONE, 1.1 mmz10.gif, NONE, 1.1 mms05.gif, NONE, 1.1 mmf05.gif, NONE, 1.1 mmsb11.gif, NONE, 1.1 mmsb06.gif, NONE, 1.1 mmf12.gif, NONE, 1.1 mmz14.gif, NONE, 1.1 mmz07.gif, NONE, 1.1 mmsb08.gif, NONE, 1.1 mmsbf12.gif, NONE, 1.1 mmsbf07.gif, NONE, 1.1 mmsf14.gif, NONE, 1.1 mmf04.gif, NONE, 1.1 mms14.gif, NONE, 1.1 mmsb12.gif, NONE, 1.1 mmf08.gif, NONE, 1.1 mmsf13.gif, NONE, 1.1 mms13.gif, NONE, 1.1 mmsbf13.gif, NONE, 1.1 mmz11.gif, NONE, 1.1 mmz05.gif, NONE, 1.1 mmf09.gif, NONE, 1.1 mmsbf10.gif, NONE, 1.1 mmf14.gif, NONE, 1.1 mmz01.gif, NONE, 1.1 mmsf02.gif, NONE, 1.1 mmsf04.gif, NONE, 1.1 mmsb13.gif, NONE, 1.1 Message-ID: <200508020938.j729cbQW002815@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/php/status/mirrors/icons In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2715/php/status/mirrors/icons Added Files: mmsf09.gif mmsf06.gif mmsb01.gif mmsf12.gif mmf07.gif mmf01.gif mmsbf03.gif mmsf03.gif mms03.gif mmb13.gif mmsb02.gif mmb14.gif mmsf10.gif mmsbf08.gif mms06.gif mmf11.gif mms09.gif mmz04.gif mmf13.gif mmsb07.gif mmsb10.gif mmf06.gif mmz06.gif mmsf07.gif mmsb09.gif mms08.gif mmsbf02.gif mms02.gif mmf10.gif mms10.gif mmz02.gif mms07.gif mms04.gif mmsf05.gif mms12.gif mmsb04.gif mmz12.gif mmsbf01.gif mmsf11.gif mmsf01.gif mmsb03.gif mmsb05.gif mmsbf11.gif mmsbf04.gif mmz09.gif mmz08.gif mmz03.gif mmsbf09.gif mmf02.gif mms11.gif mmf03.gif mms01.gif mmsbf05.gif mmz13.gif mmsf08.gif mmsb14.gif mmsbf06.gif mmz10.gif mms05.gif mmf05.gif mmsb11.gif mmsb06.gif mmf12.gif mmz14.gif mmz07.gif mmsb08.gif mmsbf12.gif mmsbf07.gif mmsf14.gif mmf04.gif mms14.gif mmsb12.gif mmf08.gif mmsf13.gif mms13.gif mmsbf13.gif mmz11.gif mmz05.gif mmf09.gif mmsbf10.gif mmf14.gif mmz01.gif mmsf02.gif mmsf04.gif mmsb13.gif Log Message: add mirmon icons for mirror status sample page From fedora-extras-commits at redhat.com Tue Aug 2 09:39:31 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Tue, 2 Aug 2005 05:39:31 -0400 Subject: bouncer_r/php/status/mirrors index.php,1.1,1.2 Message-ID: <200508020939.j729dV6A002838@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/php/status/mirrors In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2821/php/status/mirrors Modified Files: index.php Log Message: Added short blurb describing mirror status page Index: index.php =================================================================== RCS file: /cvs/fedora/bouncer_r/php/status/mirrors/index.php,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- index.php 16 Jul 2005 13:31:53 -0000 1.1 +++ index.php 2 Aug 2005 09:39:29 -0000 1.2 @@ -12,9 +12,97 @@ ?> -test paragraph + Overview +This is where this whole project got started. A few months ago I (David) was looking around the apache site and found their mirror status page. + This started me working on a version of mirmon that kept track of repository information . + The initial m3d was born. + Luke Macken from Fedora suggested that I should replace the flat file data store with a database and provide a php web interface for mirror administrators. + He provided a like to bouncer. + + Example + Below is an example output mirror status page<\> + + + Status of Fedora Core mirrors +
Global Settings
+proxy_password=qwerty +
Example 3. Configuration File Settings for Using A Proxy Server
Global Settings
If you define a proxy server in - /etc/yum.conf, all + /etc/yum.conf, all users connect to the proxy server with those details when using - yum. + yum.
To enable proxy access for a specific user, add the lines in the example box below to the user's shell profile. For the default - bash shell, the profile is the file - ~/.bash_profile. The settings below enable - yum to use the proxy server - mycache.mydomain.com, + bash shell, the profile is the file + ~/.bash_profile. The settings below enable + yum to use the proxy server + mycache.mydomain.com, connecting to port 3128.
-# The Web proxy server used by this account +# The Web proxy server used by this account http_proxy="http://mycache.mydomain.com:3128" -export http_proxy+export http_proxy
Example 4. Profile Settings for Using a Proxy Server
If the proxy server requires a username and password, add these to the URL. To include the username - yum-user and the - password qwerty, add these settings: + yum-user and the + password qwerty, add these settings:
-# The Web proxy server, with the username and password for this account +# The Web proxy server, with the username and password for this account http_proxy="http://yum-user:qwerty at mycache.mydomain.com:3128" -export http_proxy-
Example 5. Profile Settings for a Secured Proxy Server
The http_proxy Environment Variable
- The http_proxy environment variable is also - used by curl and other utilities. Although - yum itself may use - http_proxy in either upper-case or - lower-case, curl requires the name of the +export http_proxy +
Example 5. Profile Settings for a Secured Proxy Server
The http_proxy Environment Variable
+ The http_proxy environment variable is also + used by curl and other utilities. Although + yum itself may use + http_proxy in either upper-case or + lower-case, curl requires the name of the variable to be in lower-case. -
Prev Next
9. Manually Installing Software Home 11. Acknowledgements
+
Prev Up Next
9. Manually Installing Software Home 11. Acknowledgements
Author: tibbs Update of /cvs/extras/rpms/denyhosts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5441 Modified Files: denyhosts.init denyhosts.spec Added Files: denyhosts-1.0.0-daemon-control.patch denyhosts.logrotate Removed Files: denyhosts-0.9.8-daemon-control.patch Log Message: * Tue Aug 16 2005 Jason L Tibbitts III - 1.0.0-1 - Fix condrestart - Actually install logrotate entry denyhosts-1.0.0-daemon-control.patch: --- NEW FILE denyhosts-1.0.0-daemon-control.patch --- --- daemon-control-dist.orig 2005-08-16 17:31:58.285358954 -0500 +++ daemon-control-dist 2005-08-16 17:33:00.510336919 -0500 @@ -7,7 +7,7 @@ DENYHOSTS_BIN = "/usr/bin/denyhosts.py" DENYHOSTS_LOCK = "/var/lock/subsys/denyhosts" -DENYHOSTS_CFG = "/usr/share/denyhosts/denyhosts.cfg" +DENYHOSTS_CFG = "/etc/denyhosts.conf" ############################################### @@ -104,7 +104,7 @@ try: option = sys.argv[1] - if option in ('start', 'restart'): + if option in ('start', 'restart', 'condrestart'): if '--config' not in args and '-c' not in args: args.append("--config=%s" % DENYHOSTS_CFG) --- NEW FILE denyhosts.logrotate --- /var/log/denyhosts { missingok notifempty size 100k create 0644 root root } Index: denyhosts.init =================================================================== RCS file: /cvs/extras/rpms/denyhosts/devel/denyhosts.init,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- denyhosts.init 16 Aug 2005 03:30:56 -0000 1.4 +++ denyhosts.init 16 Aug 2005 22:41:43 -0000 1.5 @@ -55,25 +55,17 @@ fi } +d_condrestart() { $CONTROL condrestart; RETVAL=$?; } +d_restart() { $CONTROL restart; RETVAL=$?; } +d_start() { $CONTROL start; RETVAL=$?; } +d_status() { $CONTROL status; RETVAL=$?; } +d_stop() { $CONTROL stop; RETVAL=$?; } -d_start() { $CONTROL start; RETVAL=$?; } -d_restart() { $CONTROL restart; RETVAL=$?; } -d_stop() { $CONTROL stop; RETVAL=$?; } -d_status() { $CONTROL status; RETVAL=$?; } - - -d_condrestart() { - # It's a layering violation to test the location of the - # lockfile, but the control script doesn't support condrestart - # yet - [ -f $LOCKFILE ] && d_restart -} - -start() { if [ $DAEMON = "yes" ]; then d_start; else c_start; fi } -stop() { if [ $DAEMON = "yes" ]; then d_stop; else c_stop; fi } -restart() { if [ $DAEMON = "yes" ]; then d_restart; else c_restart; fi } condrestart() { if [ $DAEMON = "yes" ]; then d_condrestart; else c_restart; fi } +restart() { if [ $DAEMON = "yes" ]; then d_restart; else c_restart; fi } +start() { if [ $DAEMON = "yes" ]; then d_start; else c_start; fi } status() { if [ $DAEMON = "yes" ]; then d_status; else c_status; fi } +stop() { if [ $DAEMON = "yes" ]; then d_stop; else c_stop; fi } case "$1" in start) Index: denyhosts.spec =================================================================== RCS file: /cvs/extras/rpms/denyhosts/devel/denyhosts.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- denyhosts.spec 16 Aug 2005 03:30:56 -0000 1.9 +++ denyhosts.spec 16 Aug 2005 22:41:43 -0000 1.10 @@ -1,6 +1,6 @@ Name: denyhosts Version: 1.0.0 -release: 0%{?dist} +release: 1%{?dist} Summary: A script to help thwart ssh server attacks Group: Applications/System @@ -15,7 +15,7 @@ Source6: README.fedora Patch0: denyhosts-1.0.0-config.patch Patch1: denyhosts-0.9.8-setup.patch -Patch2: denyhosts-0.9.8-daemon-control.patch +Patch2: denyhosts-1.0.0-daemon-control.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArchitectures: noarch @@ -52,6 +52,7 @@ install -d $RPM_BUILD_ROOT%{_initrddir} install -d $RPM_BUILD_ROOT%{_sysconfdir}/cron.d +install -d $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d install -d $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig install -d -m 700 $RPM_BUILD_ROOT%{_localstatedir}/lib/denyhosts @@ -63,6 +64,7 @@ install -p -m 755 %{SOURCE2} $RPM_BUILD_ROOT%{_initrddir}/denyhosts install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_localstatedir}/lib/denyhosts/allowed-hosts install -p -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/denyhosts +install -p -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/denyhosts touch $RPM_BUILD_ROOT%{_localstatedir}/log/denyhosts @@ -99,6 +101,7 @@ %doc README.fedora README.txt setup.py %config(noreplace) %{_sysconfdir}/denyhosts.conf %config(noreplace) %{_sysconfdir}/cron.d/denyhosts +%config(noreplace) %{_sysconfdir}/logrotate.d/denyhosts %config(noreplace) %{_sysconfdir}/sysconfig/denyhosts %config(noreplace) %{_localstatedir}/lib/denyhosts/allowed-hosts @@ -117,6 +120,10 @@ %{_bindir}/denyhosts-control %changelog +* Tue Aug 16 2005 Jason L Tibbitts III - 1.0.0-1 +- Fix condrestart +- Actually install logrotate entry + * Mon Aug 15 2005 Jason L Tibbitts III - 1.0.0-0 - Update to 1.0.0 - Add logrotate entry --- denyhosts-0.9.8-daemon-control.patch DELETED --- From fedora-extras-commits at redhat.com Tue Aug 16 22:44:12 2005 From: fedora-extras-commits at redhat.com (Karsten Wade (kwade)) Date: Tue, 16 Aug 2005 18:44:12 -0400 Subject: web/include navigation.inc,1.7,1.8 Message-ID: <200508162244.j7GMiCe2005505@cvs-int.fedora.redhat.com> Author: kwade Update of /cvs/fedora/web/include In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5488 Modified Files: navigation.inc Log Message: Highlighting this important area of Fedora that users are looking for, it is a peer with downloading et al. Index: navigation.inc =================================================================== RCS file: /cvs/fedora/web/include/navigation.inc,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- navigation.inc 12 Jul 2005 20:20:48 -0000 1.7 +++ navigation.inc 16 Aug 2005 22:44:10 -0000 1.8 @@ -15,14 +15,19 @@ //"Resellers"=>array("uri"=>""), //"Compatible / Additional Software"=>array("uri"=>"") )), - "Docs"=>array("uri"=>"/docs/","sub"=>array( + "Updating and Installing Software"=>array("uri"=>"/docs/yum/","sub"=>array( + "Updating Your System"=>array("uri"=>"/docs/yum/sn-updating-your-system.php"), + "Managing Software"=>array("uri"=>"/docs/yum/sn-managing-packages.php"), + "Using Software Repositories"=>array("uri"=>"/docs/yum/sn-using-repositories.php") + )), + "Documentation"=>array("uri"=>"/docs/","sub"=>array( "Release Notes"=>array("uri"=>"/docs/release-notes/"), "Installation Guide"=>array("uri"=>"/docs/fedora-install-guide-en/"), + //"Yum"=>array("uri"=>"/docs/yum/","sub"=>array( + "Managing Software With Yum"=>array("uri"=>"/docs/yum/"), "Jargon Buster"=>array("uri"=>"/docs/jargon-buster/"), - "SELinux FAQ"=>array("uri"=>"/docs/selinux-faq/"), - "Keeping Up to Date"=>array("uri"=>"/docs/updates/"), + "SELinux FAQ"=>array("uri"=>"/docs/selinux-faq/") //"Package List"=>array("uri"=>"/docs/package-list/"), - //"Installation Guide"=>array("uri"=>"/docs/install-guide/"), //"Tutorials"=>array("uri"=>"/docs/tutorials/") )), "Projects"=>array("uri"=>"/projects/","sub"=>array( From fedora-extras-commits at redhat.com Tue Aug 16 22:46:27 2005 From: fedora-extras-commits at redhat.com (Marc Maurer (uwog)) Date: Tue, 16 Aug 2005 18:46:27 -0400 Subject: rpms/abiword/devel .cvsignore, 1.6, 1.7 abiword.spec, 1.10, 1.11 sources, 1.6, 1.7 Message-ID: <200508162246.j7GMkR4A005556@cvs-int.fedora.redhat.com> Author: uwog Update of /cvs/extras/rpms/abiword/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5535 Modified Files: .cvsignore abiword.spec sources Log Message: Purely cosmetic cleanup Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/abiword/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 27 Jul 2005 23:46:58 -0000 1.6 +++ .cvsignore 16 Aug 2005 22:46:25 -0000 1.7 @@ -1 +1 @@ -abiword-2.2.9.tar.bz2 +abiword-2.3.4.tar.bz2 Index: abiword.spec =================================================================== RCS file: /cvs/extras/rpms/abiword/devel/abiword.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- abiword.spec 11 Aug 2005 21:40:26 -0000 1.10 +++ abiword.spec 16 Aug 2005 22:46:25 -0000 1.11 @@ -22,6 +22,8 @@ BuildRequires: libxml2-devel BuildRequires: desktop-file-utils >= %{desktop_file_utils_version} BuildRequires: fribidi-devel, enchant-devel +BuildRequires: libgnomeprint22-devel +BuildRequires: libgnomeprintui22-devel # some plugin build deps BuildRequires: ots-devel >= 0.4.2 @@ -34,8 +36,6 @@ # gnome build deps BuildRequires: libbonobo-devel BuildRequires: libbonoboui-devel -BuildRequires: libgnomeprint22-devel -BuildRequires: libgnomeprintui22-devel BuildRequires: libgnomeui-devel URL: http://www.abisource.com/ @@ -128,7 +128,7 @@ %{_datadir}/icons/*png %changelog -* Thu Aug 11 2005 Marc Maurer - 1:2.3.4-1 +* Thu Aug 17 2005 Marc Maurer - 1:2.3.4-1 - Update to 2.3.4 - Add link-grammar dependency Index: sources =================================================================== RCS file: /cvs/extras/rpms/abiword/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 27 Jul 2005 23:46:58 -0000 1.6 +++ sources 16 Aug 2005 22:46:25 -0000 1.7 @@ -1 +1 @@ -17fe5169f03643dd59c83af7cf1c448a abiword-2.2.9.tar.bz2 +b205d8bb5240fdcb126daf8a7a9e45c8 abiword-2.3.4.tar.bz2 From fedora-extras-commits at redhat.com Tue Aug 16 23:24:44 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Tue, 16 Aug 2005 19:24:44 -0400 Subject: rpms/gkrellm-aclock/devel gkrellm-aclock.spec,1.1,1.2 Message-ID: <200508162324.j7GNOi8R006864@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/gkrellm-aclock/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6847 Modified Files: gkrellm-aclock.spec Log Message: Rebuild against new libcairo. Index: gkrellm-aclock.spec =================================================================== RCS file: /cvs/extras/rpms/gkrellm-aclock/devel/gkrellm-aclock.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gkrellm-aclock.spec 13 Jul 2005 08:06:47 -0000 1.1 +++ gkrellm-aclock.spec 16 Aug 2005 23:24:42 -0000 1.2 @@ -3,7 +3,7 @@ Summary: Analog clock plugin for GKrellM Name: gkrellm-aclock Version: 0.3.3 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Applications/System URL: http://www.geocities.com/m_muthukumar/gkrellaclock.html @@ -41,6 +41,9 @@ %changelog +* Wed Aug 17 2005 Matthias Saou 0.3.3-2 +- Rebuild against new libcairo. + * Tue Jul 12 2005 Matthias Saou 0.3.3-1 - Initial RPM release, split out from my old gkrellm-plugins package. From fedora-extras-commits at redhat.com Tue Aug 16 23:28:37 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Tue, 16 Aug 2005 19:28:37 -0400 Subject: rpms/gqview/devel gqview.spec,1.6,1.7 Message-ID: <200508162328.j7GNSbV6006930@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/gqview/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6913 Modified Files: gqview.spec Log Message: Index: gqview.spec =================================================================== RCS file: /cvs/extras/rpms/gqview/devel/gqview.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- gqview.spec 14 May 2005 21:23:33 -0000 1.6 +++ gqview.spec 16 Aug 2005 23:28:35 -0000 1.7 @@ -1,7 +1,7 @@ Summary: Image browser and viewer Name: gqview Version: 2.0.1 -Release: 1 +Release: 2 License: GPL Group: User Interface/X Source: http://dl.sf.net/sourceforge/gqview/gqview-%{version}.tar.gz @@ -76,6 +76,9 @@ %changelog +* Wed Aug 17 2005 Michael Schwendt - 2.0.1-2 +- rebuilt + * Sat May 14 2005 Michael Schwendt 2.0.1-1 - update to 2.0.1 From fedora-extras-commits at redhat.com Tue Aug 16 23:29:12 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Tue, 16 Aug 2005 19:29:12 -0400 Subject: rpms/sylpheed/devel sylpheed.spec,1.21,1.22 Message-ID: <200508162329.j7GNTCMS006991@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/sylpheed/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6974 Modified Files: sylpheed.spec Log Message: Index: sylpheed.spec =================================================================== RCS file: /cvs/extras/rpms/sylpheed/devel/sylpheed.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- sylpheed.spec 3 Aug 2005 12:55:06 -0000 1.21 +++ sylpheed.spec 16 Aug 2005 23:29:10 -0000 1.22 @@ -5,7 +5,7 @@ Summary: GTK+ based, lightweight, and fast email client Name: sylpheed Version: 2.0.0 -Release: 1 +Release: 2 License: GPL URL: http://sylpheed.good-day.net/ Group: Applications/Internet @@ -81,6 +81,9 @@ %{_mandir}/man1 %changelog +* Wed Aug 17 2005 Michael Schwendt - 2.0.0-2 +- rebuilt + * Sat Jul 30 2005 Michael Schwendt - 2.0.0-1 - Update to 2.0.0. From fedora-extras-commits at redhat.com Tue Aug 16 23:33:07 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Tue, 16 Aug 2005 19:33:07 -0400 Subject: rpms/gai-pal/devel gai-pal.spec,1.9,1.10 Message-ID: <200508162333.j7GNX7mX007097@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/gai-pal/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7050/gai-pal/devel Modified Files: gai-pal.spec Log Message: Index: gai-pal.spec =================================================================== RCS file: /cvs/extras/rpms/gai-pal/devel/gai-pal.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- gai-pal.spec 9 May 2005 21:38:28 -0000 1.9 +++ gai-pal.spec 16 Aug 2005 23:33:05 -0000 1.10 @@ -3,7 +3,7 @@ Summary: GAI Pal applet Name: gai-pal Version: 0.7 -Release: 6 +Release: 7 Source0: %{name}-%{version}.tar.bz2 Patch0: gai-pal-0.7-xosd-empty-msg.patch Patch1: gai-pal-0.7-typo.patch @@ -48,6 +48,9 @@ %{_datadir}/pixmaps/* %changelog +* Wed Aug 17 2005 Michael Schwendt - 0.7-7 +- rebuilt + * Mon May 9 2005 Michael Schwendt - 0.7-6 - Create debuginfo package, disable stripping via patch. From fedora-extras-commits at redhat.com Tue Aug 16 23:33:07 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Tue, 16 Aug 2005 19:33:07 -0400 Subject: rpms/gai/devel gai.spec,1.16,1.17 Message-ID: <200508162333.j7GNX7QP007091@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/gai/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7050/gai/devel Modified Files: gai.spec Log Message: Index: gai.spec =================================================================== RCS file: /cvs/extras/rpms/gai/devel/gai.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- gai.spec 28 Jun 2005 16:10:59 -0000 1.16 +++ gai.spec 16 Aug 2005 23:33:04 -0000 1.17 @@ -1,6 +1,6 @@ Name: gai Version: 0.5.10 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Generic Applet Interface Group: User Interface/Desktops @@ -71,6 +71,9 @@ %{_libdir}/libgai.so %changelog +* Wed Aug 17 2005 Michael Schwendt - 0.5.10-4 +- rebuilt + * Tue Jun 28 2005 Michael Schwendt - remove work-around from 0.5.10-3 again, bug has been fixed From fedora-extras-commits at redhat.com Tue Aug 16 23:33:07 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Tue, 16 Aug 2005 19:33:07 -0400 Subject: rpms/gai-temp/devel gai-temp.spec,1.6,1.7 Message-ID: <200508162333.j7GNX7N2007103@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/gai-temp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7050/gai-temp/devel Modified Files: gai-temp.spec Log Message: Index: gai-temp.spec =================================================================== RCS file: /cvs/extras/rpms/gai-temp/devel/gai-temp.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- gai-temp.spec 5 Jul 2005 00:33:01 -0000 1.6 +++ gai-temp.spec 16 Aug 2005 23:33:05 -0000 1.7 @@ -3,7 +3,7 @@ Summary: GAI based applet that displays HDD and CPU temperature Name: gai-temp Version: 0.1.1 -Release: 2%{?dist} +Release: 3%{?dist} Source0: http://leidola.newcon.de/daten/gai-temp/%{name}-%{version}.tar.gz URL: http://leidola.newcon.de/projekte/gai-temp/gai-temp-en.html License: GPL @@ -43,6 +43,9 @@ %changelog +* Wed Aug 17 2005 Michael Schwendt - 0.1.1-3 +- rebuilt + * Tue Jun 28 2005 Michael Schwendt - remove work-around from 0.1.1-2 again, bug has been fixed From fedora-extras-commits at redhat.com Tue Aug 16 23:59:29 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Tue, 16 Aug 2005 19:59:29 -0400 Subject: rpms/freeciv/devel freeciv.spec,1.12,1.13 Message-ID: <200508162359.j7GNxTuS007299@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/freeciv/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7282 Modified Files: freeciv.spec Log Message: * Tue Aug 16 2005 Brian Pepple - 2.0.4-3 - Rebuild for cairo dep. Index: freeciv.spec =================================================================== RCS file: /cvs/extras/rpms/freeciv/devel/freeciv.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- freeciv.spec 29 Jul 2005 16:00:46 -0000 1.12 +++ freeciv.spec 16 Aug 2005 23:59:27 -0000 1.13 @@ -1,6 +1,6 @@ Name: freeciv Version: 2.0.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: The Freeciv multi-player strategy game Group: Amusements/Games @@ -91,6 +91,9 @@ %{_mandir}/man6/civclient.6.gz %changelog +* Tue Aug 16 2005 Brian Pepple - 2.0.4-3 +- Rebuild for cairo dep. + * Thu Jul 28 2005 Brian Pepple - 2.0.4-2 - Update to 2.0.4. - Use new stdsounds. From fedora-extras-commits at redhat.com Wed Aug 17 00:01:51 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Tue, 16 Aug 2005 20:01:51 -0400 Subject: rpms/freeciv/devel freeciv.spec,1.13,1.14 Message-ID: <200508170002.j7H02Sm0008546@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/freeciv/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8520 Modified Files: freeciv.spec Log Message: Bump release. Index: freeciv.spec =================================================================== RCS file: /cvs/extras/rpms/freeciv/devel/freeciv.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- freeciv.spec 16 Aug 2005 23:59:27 -0000 1.13 +++ freeciv.spec 17 Aug 2005 00:01:45 -0000 1.14 @@ -1,6 +1,6 @@ Name: freeciv Version: 2.0.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: The Freeciv multi-player strategy game Group: Amusements/Games @@ -91,7 +91,7 @@ %{_mandir}/man6/civclient.6.gz %changelog -* Tue Aug 16 2005 Brian Pepple - 2.0.4-3 +* Tue Aug 16 2005 Brian Pepple - 2.0.4-4 - Rebuild for cairo dep. * Thu Jul 28 2005 Brian Pepple - 2.0.4-2 From fedora-extras-commits at redhat.com Wed Aug 17 00:06:54 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Tue, 16 Aug 2005 20:06:54 -0400 Subject: rpms/contact-lookup-applet/devel contact-lookup-applet.spec, 1.10, 1.11 Message-ID: <200508170007.j7H07QjI008620@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/contact-lookup-applet/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8603 Modified Files: contact-lookup-applet.spec Log Message: * Tue Aug 16 2005 Brian Pepple - 0.13-3 - Rebuild for cairo dep. Index: contact-lookup-applet.spec =================================================================== RCS file: /cvs/extras/rpms/contact-lookup-applet/devel/contact-lookup-applet.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- contact-lookup-applet.spec 24 Jul 2005 22:06:58 -0000 1.10 +++ contact-lookup-applet.spec 17 Aug 2005 00:06:51 -0000 1.11 @@ -1,6 +1,6 @@ Name: contact-lookup-applet Version: 0.13 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Contact Lookup Applet Group: Applications/Communications @@ -44,6 +44,9 @@ %{_datadir}/lookup-applet/%{name}.glade %changelog +* Tue Aug 16 2005 Brian Pepple - 0.13-3 +- Rebuild for cairo dep. + * Sun Jul 24 2005 Brian Pepple - 0.13-2 - Update to 0.13. From fedora-extras-commits at redhat.com Wed Aug 17 00:12:14 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Tue, 16 Aug 2005 20:12:14 -0400 Subject: rpms/gossip/devel gossip.spec,1.5,1.6 Message-ID: <200508170012.j7H0CFns008722@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/gossip/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8703 Modified Files: gossip.spec Log Message: * Tue Aug 16 2005 Brian Pepple - 0.9-4 - Rebuild for cairo dep. Index: gossip.spec =================================================================== RCS file: /cvs/extras/rpms/gossip/devel/gossip.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- gossip.spec 14 Aug 2005 22:14:26 -0000 1.5 +++ gossip.spec 17 Aug 2005 00:12:12 -0000 1.6 @@ -2,7 +2,7 @@ Name: gossip Version: 0.9 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Gnome Jabber Client Group: Applications/Communications @@ -99,6 +99,9 @@ %changelog +* Tue Aug 16 2005 Brian Pepple - 0.9-4 +- Rebuild for cairo dep. + * Sun Aug 14 2005 Brian Pepple - 0.9-3 - Add aspell-devel BR, so spell-checking is enabled. From fedora-extras-commits at redhat.com Wed Aug 17 00:33:51 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Tue, 16 Aug 2005 20:33:51 -0400 Subject: rpms/abicheck/FC-3 abicheck-1.2-fortify-source-fc3.patch, NONE, 1.1 abicheck-1.2-ldlinux.patch, NONE, 1.1 abicheck-1.2-libgcc.patch, NONE, 1.1 abicheck.spec, 1.7, 1.8 abicheck.dbfile.FORTIFY_SOURCE, 1.1, NONE Message-ID: <200508170033.j7H0Xp3f008832@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/abicheck/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8806 Modified Files: abicheck.spec Added Files: abicheck-1.2-fortify-source-fc3.patch abicheck-1.2-ldlinux.patch abicheck-1.2-libgcc.patch Removed Files: abicheck.dbfile.FORTIFY_SOURCE Log Message: * Tue Aug 16 2005 Michael Schwendt - 1.2-3.2.fc3 - Patch abicheck to run dynamic linker directly instead of using ldd and receiving its intermixed lines. - Add libgcc symbols. - Add more _FORTIFY_SOURCE symbols. - Override symbol classification by default. abicheck-1.2-fortify-source-fc3.patch: --- NEW FILE abicheck-1.2-fortify-source-fc3.patch --- diff -Nur abicheck-1.2-orig/abicheck.pl abicheck-1.2/abicheck.pl --- abicheck-1.2-orig/abicheck.pl 2003-08-26 21:57:51.000000000 +0200 +++ abicheck-1.2/abicheck.pl 2005-08-17 02:13:04.000000000 +0200 @@ -3538,5 +3538,31 @@ libnsl.so.1:readColdStartFile libnsl.so.1:writeColdStartFile ); + + # + # These are _FORTIFY_SOURCE symbols. + # + push(@{$public}, qw( + libc.so.6:__chk_fail + libc.so.6:__fprintf_chk + libc.so.6:__gets_chk + libc.so.6:__memcpy_chk + libc.so.6:__memmove_chk + libc.so.6:__mempcpy_chk + libc.so.6:__memset_chk + libc.so.6:__printf_chk + libc.so.6:__snprintf_chk + libc.so.6:__sprintf_chk + libc.so.6:__stpcpy_chk + libc.so.6:__strcat_chk + libc.so.6:__strcpy_chk + libc.so.6:__strncat_chk + libc.so.6:__strncpy_chk + libc.so.6:__vfprintf_chk + libc.so.6:__vprintf_chk + libc.so.6:__vsnprintf_chk + libc.so.6:__vsprintf_chk + ) + ); } } abicheck-1.2-ldlinux.patch: --- NEW FILE abicheck-1.2-ldlinux.patch --- diff -Nur abicheck-1.2-orig/abicheck.pl abicheck-1.2/abicheck.pl --- abicheck-1.2-orig/abicheck.pl 2003-08-26 21:57:51.000000000 +0200 +++ abicheck-1.2/abicheck.pl 2005-08-16 22:49:06.000000000 +0200 @@ -496,7 +496,7 @@ if ( ! $pid ) { # child here, go run ldd -r with debug env: - exec_ldd($file); + exec_ldd($file,$file0); exit 1; } @@ -1241,7 +1241,7 @@ # will read command output. # sub exec_ldd { - my ($file) = @_; + my ($file,$file0) = @_; open(STDERR, ">&STDOUT"); # need to close stdin on linux for some suid programs e.g. chsh (!) @@ -1251,10 +1251,27 @@ $ENV{LD_LIBRARY_PATH} = $ld_path; } - # currently, no difference between OSs - $ENV{LD_DEBUG} = "files,bindings"; - exec 'ldd', '-r', $file; - exit 1; # exec failed + my $ldlinux = ''; + open(DLFIND,"ldd $file0 |") or die "open: ldd: $!"; + while () { + /ld-linux/ and /(\S+)/ and $ldlinux = $1; + } + close(DLFIND); + if ( $ldlinux =~ /^$/ ) { + # currently, no difference between OSs + $ENV{LD_DEBUG} = "files,bindings"; + exec 'ldd', '-r', $file; + exit 1; # exec failed + } + else { + $ENV{LD_DEBUG} = "files,bindings"; + $ENV{LD_VERBOSE} = "yes"; + $ENV{LD_WARN} = "yes"; + $ENV{LD_BIND_NOW} = "yes"; + $ENV{LD_TRACE_LOADED_OBJECTS} = "1"; + exec $ldlinux, $file0; + exit 1; # exec failed + } } # abicheck-1.2-libgcc.patch: --- NEW FILE abicheck-1.2-libgcc.patch --- diff -Nur abicheck-1.2-orig/abicheck.pl abicheck-1.2/abicheck.pl --- abicheck-1.2-orig/abicheck.pl 2003-08-26 21:57:51.000000000 +0200 +++ abicheck-1.2/abicheck.pl 2005-08-15 21:10:15.000000000 +0200 @@ -3498,6 +3498,19 @@ libc.so.6:__ctype_b_loc libc.so.6:__ctype_tolower_loc libc.so.6:__ctype_toupper_loc + + libgcc_s.so.1:__divdi3 + libgcc_s.so.1:__register_frame + libgcc_s.so.1:__frame_state_for + libgcc_s.so.1:__umoddi3 + libgcc_s.so.1:__udivdi3 + libgcc_s.so.1:__register_frame_table + libgcc_s.so.1:__deregister_frame_info + libgcc_s.so.1:__deregister_frame + libgcc_s.so.1:__cxa_finalize + libgcc_s.so.1:__moddi3 + libgcc_s.so.1:__register_frame_info_table + libgcc_s.so.1:__register_frame_info ); @{$private} = qw( Index: abicheck.spec =================================================================== RCS file: /cvs/extras/rpms/abicheck/FC-3/abicheck.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- abicheck.spec 13 Aug 2005 21:28:33 -0000 1.7 +++ abicheck.spec 17 Aug 2005 00:33:49 -0000 1.8 @@ -3,15 +3,17 @@ Summary: ABI checking tool Name: abicheck Version: 1.2 -Release: 3.1 +Release: 3.2.fc3 License: LGPL Group: Applications/File URL: http://abicheck.sourceforge.net/ Source0: http://dl.sf.net/abicheck/%{name}-%{version}.tar.gz -Source1: abicheck.dbfile.FORTIFY_SOURCE Patch0: abicheck-1.2-fc3.patch Patch1: abicheck-1.2-test-static.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot +Patch3: abicheck-1.2-libgcc.patch +Patch4: abicheck-1.2-fortify-source-fc3.patch +Patch5: abicheck-1.2-ldlinux.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n) Requires: binutils perl @@ -25,12 +27,14 @@ %setup -q %patch -p1 -b .fc3 %patch1 -p1 -b .test-static +%patch3 -p1 -b .libgcc +%patch4 -p1 -b .fortify-source-fc5 +%patch5 -p1 -b .ldlinux sed -i -e 's!/usr/lib/!%{_libdir}/!g' test/Makefile %build make -make test %install @@ -38,7 +42,10 @@ mkdir -p $RPM_BUILD_ROOT%{_bindir} $RPM_BUILD_ROOT%{_mandir}/man1 install -p -m 0755 abicheck $RPM_BUILD_ROOT%{_bindir} install -p -m 0644 abicheck.1 $RPM_BUILD_ROOT%{_mandir}/man1 -install -p -m 0644 %{SOURCE1} dbfile.FORTIFY_SOURCE + + +%check +make test %clean @@ -48,12 +55,18 @@ %files %defattr(-,root,root,-) %doc COPYING ChangeLog INTRO README -%doc dbfile.FORTIFY_SOURCE %{_bindir}/abicheck %{_mandir}/man1/abicheck.1* %changelog +* Tue Aug 16 2005 Michael Schwendt - 1.2-3.2.fc3 +- Patch abicheck to run dynamic linker directly instead of + using ldd and receiving its intermixed lines. +- Add libgcc symbols. +- Add more _FORTIFY_SOURCE symbols. +- Override symbol classification by default. + * Thu Aug 11 2005 Michael Schwendt - 1.2-3.1 - Add an override file in %%doc which can be specified with option -O to modify the symbol classification for binaries --- abicheck.dbfile.FORTIFY_SOURCE DELETED --- From fedora-extras-commits at redhat.com Wed Aug 17 00:34:24 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Tue, 16 Aug 2005 20:34:24 -0400 Subject: rpms/abicheck/FC-4 abicheck-1.2-fortify-source-fc3.patch, NONE, 1.1 abicheck-1.2-ldlinux.patch, NONE, 1.1 abicheck-1.2-libgcc.patch, NONE, 1.1 abicheck.spec, 1.12, 1.13 abicheck.dbfile.FORTIFY_SOURCE, 1.1, NONE Message-ID: <200508170034.j7H0YO7C008904@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/abicheck/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8878 Modified Files: abicheck.spec Added Files: abicheck-1.2-fortify-source-fc3.patch abicheck-1.2-ldlinux.patch abicheck-1.2-libgcc.patch Removed Files: abicheck.dbfile.FORTIFY_SOURCE Log Message: * Tue Aug 16 2005 Michael Schwendt - 1.2-6.2.fc4 - Patch abicheck to run dynamic linker directly instead of using ldd and receiving its intermixed lines. - Add libgcc symbols. - Add more _FORTIFY_SOURCE symbols. - Override symbol classification by default. abicheck-1.2-fortify-source-fc3.patch: --- NEW FILE abicheck-1.2-fortify-source-fc3.patch --- diff -Nur abicheck-1.2-orig/abicheck.pl abicheck-1.2/abicheck.pl --- abicheck-1.2-orig/abicheck.pl 2003-08-26 21:57:51.000000000 +0200 +++ abicheck-1.2/abicheck.pl 2005-08-17 02:13:04.000000000 +0200 @@ -3538,5 +3538,31 @@ libnsl.so.1:readColdStartFile libnsl.so.1:writeColdStartFile ); + + # + # These are _FORTIFY_SOURCE symbols. + # + push(@{$public}, qw( + libc.so.6:__chk_fail + libc.so.6:__fprintf_chk + libc.so.6:__gets_chk + libc.so.6:__memcpy_chk + libc.so.6:__memmove_chk + libc.so.6:__mempcpy_chk + libc.so.6:__memset_chk + libc.so.6:__printf_chk + libc.so.6:__snprintf_chk + libc.so.6:__sprintf_chk + libc.so.6:__stpcpy_chk + libc.so.6:__strcat_chk + libc.so.6:__strcpy_chk + libc.so.6:__strncat_chk + libc.so.6:__strncpy_chk + libc.so.6:__vfprintf_chk + libc.so.6:__vprintf_chk + libc.so.6:__vsnprintf_chk + libc.so.6:__vsprintf_chk + ) + ); } } abicheck-1.2-ldlinux.patch: --- NEW FILE abicheck-1.2-ldlinux.patch --- diff -Nur abicheck-1.2-orig/abicheck.pl abicheck-1.2/abicheck.pl --- abicheck-1.2-orig/abicheck.pl 2003-08-26 21:57:51.000000000 +0200 +++ abicheck-1.2/abicheck.pl 2005-08-16 22:49:06.000000000 +0200 @@ -496,7 +496,7 @@ if ( ! $pid ) { # child here, go run ldd -r with debug env: - exec_ldd($file); + exec_ldd($file,$file0); exit 1; } @@ -1241,7 +1241,7 @@ # will read command output. # sub exec_ldd { - my ($file) = @_; + my ($file,$file0) = @_; open(STDERR, ">&STDOUT"); # need to close stdin on linux for some suid programs e.g. chsh (!) @@ -1251,10 +1251,27 @@ $ENV{LD_LIBRARY_PATH} = $ld_path; } - # currently, no difference between OSs - $ENV{LD_DEBUG} = "files,bindings"; - exec 'ldd', '-r', $file; - exit 1; # exec failed + my $ldlinux = ''; + open(DLFIND,"ldd $file0 |") or die "open: ldd: $!"; + while () { + /ld-linux/ and /(\S+)/ and $ldlinux = $1; + } + close(DLFIND); + if ( $ldlinux =~ /^$/ ) { + # currently, no difference between OSs + $ENV{LD_DEBUG} = "files,bindings"; + exec 'ldd', '-r', $file; + exit 1; # exec failed + } + else { + $ENV{LD_DEBUG} = "files,bindings"; + $ENV{LD_VERBOSE} = "yes"; + $ENV{LD_WARN} = "yes"; + $ENV{LD_BIND_NOW} = "yes"; + $ENV{LD_TRACE_LOADED_OBJECTS} = "1"; + exec $ldlinux, $file0; + exit 1; # exec failed + } } # abicheck-1.2-libgcc.patch: --- NEW FILE abicheck-1.2-libgcc.patch --- diff -Nur abicheck-1.2-orig/abicheck.pl abicheck-1.2/abicheck.pl --- abicheck-1.2-orig/abicheck.pl 2003-08-26 21:57:51.000000000 +0200 +++ abicheck-1.2/abicheck.pl 2005-08-15 21:10:15.000000000 +0200 @@ -3498,6 +3498,19 @@ libc.so.6:__ctype_b_loc libc.so.6:__ctype_tolower_loc libc.so.6:__ctype_toupper_loc + + libgcc_s.so.1:__divdi3 + libgcc_s.so.1:__register_frame + libgcc_s.so.1:__frame_state_for + libgcc_s.so.1:__umoddi3 + libgcc_s.so.1:__udivdi3 + libgcc_s.so.1:__register_frame_table + libgcc_s.so.1:__deregister_frame_info + libgcc_s.so.1:__deregister_frame + libgcc_s.so.1:__cxa_finalize + libgcc_s.so.1:__moddi3 + libgcc_s.so.1:__register_frame_info_table + libgcc_s.so.1:__register_frame_info ); @{$private} = qw( Index: abicheck.spec =================================================================== RCS file: /cvs/extras/rpms/abicheck/FC-4/abicheck.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- abicheck.spec 13 Aug 2005 21:28:34 -0000 1.12 +++ abicheck.spec 17 Aug 2005 00:34:22 -0000 1.13 @@ -3,16 +3,18 @@ Summary: ABI checking tool Name: abicheck Version: 1.2 -Release: 6.1 +Release: 6.2.fc4 License: LGPL Group: Applications/File URL: http://abicheck.sourceforge.net/ Source0: http://dl.sf.net/abicheck/%{name}-%{version}.tar.gz -Source1: abicheck.dbfile.FORTIFY_SOURCE Patch0: abicheck-1.2-fc3.patch Patch1: abicheck-1.2-test-static.patch Patch2: abicheck-1.2-bindings-fc4.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot +Patch3: abicheck-1.2-libgcc.patch +Patch4: abicheck-1.2-fortify-source-fc3.patch +Patch5: abicheck-1.2-ldlinux.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n) Requires: binutils perl @@ -27,12 +29,14 @@ %patch -p1 -b .fc3 %patch1 -p1 -b .test-static %patch2 -p1 -b .bindings-fc4 +%patch3 -p1 -b .libgcc +%patch4 -p1 -b .fortify-source-fc5 +%patch5 -p1 -b .ldlinux sed -i -e 's!/usr/lib/!%{_libdir}/!g' test/Makefile %build make -make test %install @@ -40,7 +44,10 @@ mkdir -p $RPM_BUILD_ROOT%{_bindir} $RPM_BUILD_ROOT%{_mandir}/man1 install -p -m 0755 abicheck $RPM_BUILD_ROOT%{_bindir} install -p -m 0644 abicheck.1 $RPM_BUILD_ROOT%{_mandir}/man1 -install -p -m 0644 %{SOURCE1} dbfile.FORTIFY_SOURCE + + +%check +make test %clean @@ -50,12 +57,18 @@ %files %defattr(-,root,root,-) %doc COPYING ChangeLog INTRO README -%doc dbfile.FORTIFY_SOURCE %{_bindir}/abicheck %{_mandir}/man1/abicheck.1* %changelog +* Tue Aug 16 2005 Michael Schwendt - 1.2-6.2.fc4 +- Patch abicheck to run dynamic linker directly instead of + using ldd and receiving its intermixed lines. +- Add libgcc symbols. +- Add more _FORTIFY_SOURCE symbols. +- Override symbol classification by default. + * Thu Aug 11 2005 Michael Schwendt - 1.2-6.1 - Add an override file in %%doc which can be specified with option -O to modify the symbol classification for binaries --- abicheck.dbfile.FORTIFY_SOURCE DELETED --- From fedora-extras-commits at redhat.com Wed Aug 17 01:08:11 2005 From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs)) Date: Tue, 16 Aug 2005 21:08:11 -0400 Subject: common tobuild,1.2201,1.2202 Message-ID: <200508170108.j7H18BIu010232@cvs-int.fedora.redhat.com> Author: tibbs Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10215 Modified Files: tobuild Log Message: request build of rpms/denyhosts/devel denyhosts-1_0_0-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2201 retrieving revision 1.2202 diff -u -r1.2201 -r1.2202 --- tobuild 12 Aug 2005 00:18:09 -0000 1.2201 +++ tobuild 17 Aug 2005 01:07:50 -0000 1.2202 @@ -33,3 +33,4 @@ gemi rpms/plt-scheme/FC-4 plt-scheme-299_200-1_fc4 fc4 gemi rpms/plt-scheme/FC-3 plt-scheme-299_200-1_fc3 fc3 gemi rpms/plt-scheme/devel plt-scheme-299_200-1_fc5 devel +tibbs rpms/denyhosts/devel denyhosts-1_0_0-1_fc5 devel From fedora-extras-commits at redhat.com Wed Aug 17 01:09:41 2005 From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs)) Date: Tue, 16 Aug 2005 21:09:41 -0400 Subject: common tobuild,1.2202,1.2203 Message-ID: <200508170109.j7H19fli010279@cvs-int.fedora.redhat.com> Author: tibbs Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10262 Modified Files: tobuild Log Message: Oops, did make build instead of make plague. Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2202 retrieving revision 1.2203 diff -u -r1.2202 -r1.2203 --- tobuild 17 Aug 2005 01:07:50 -0000 1.2202 +++ tobuild 17 Aug 2005 01:09:39 -0000 1.2203 @@ -33,4 +33,3 @@ gemi rpms/plt-scheme/FC-4 plt-scheme-299_200-1_fc4 fc4 gemi rpms/plt-scheme/FC-3 plt-scheme-299_200-1_fc3 fc3 gemi rpms/plt-scheme/devel plt-scheme-299_200-1_fc5 devel -tibbs rpms/denyhosts/devel denyhosts-1_0_0-1_fc5 devel From fedora-extras-commits at redhat.com Wed Aug 17 05:11:16 2005 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Wed, 17 Aug 2005 01:11:16 -0400 Subject: mock mock.py,1.26,1.27 Message-ID: <200508170511.j7H5BGN1016475@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/fedora/mock In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16451 Modified Files: mock.py Log Message: --quiet flag and add a 'log' method for the primary class. Index: mock.py =================================================================== RCS file: /cvs/fedora/mock/mock.py,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- mock.py 4 Aug 2005 20:53:02 -0000 1.26 +++ mock.py 17 Aug 2005 05:11:13 -0000 1.27 @@ -35,6 +35,14 @@ print >> sys.stderr, msg +# result/exit codes +# 0 = yay! +# 1 = something happened - it's bad +# 30 = Yum emitted an error of some sort +# 40 = some error in the pkg we're building +# 10 = problem building the package +# 20 = error in the chroot of some kind + class Error(Exception): def __init__(self, msg): Exception.__init__(self) @@ -115,7 +123,12 @@ cfgout.write('statedir = %s\n' % self.statedir) cfgout.flush() cfgout.close() + + def log(self, msg): + if self.config['quiet']: return + print msg + def build_log(self, content): if type(content) is types.ListType: for line in content: @@ -183,13 +196,14 @@ sfo.write('%s\n' % curstate) sfo.close() self._state = curstate - print curstate + self.log(curstate) else: return self._state def prep(self): self.state("prep") - + self.log("This may take a while") + self._prep_install() if self.config['clean']: cmd = 'groupinstall %s' % self.config['buildgroup'] @@ -607,20 +621,22 @@ init - initialize the chroot, do not build anything""" parser = OptionParser(usage=usage, version=__VERSION__) parser.add_option("-r", action="store", type="string", dest="chroot", - default='default', - help="chroot name/config file name default: %default") + help="chroot name/config file name default: %default", + default='default') parser.add_option("--no-clean", action ="store_true", dest="dirty", - help="do not clean chroot before building") + help="do not clean chroot before building") parser.add_option("--arch", action ="store", dest="arch", - default=None, help="target build arch") + default=None, help="target build arch") parser.add_option("--debug", action ="store_true", dest="debug", - default=False, help="Output copious debugging information") + default=False, help="Output copious debugging information") parser.add_option("--resultdir", action="store", type="string", - default=None, help="path for resulting files to be put") + default=None, help="path for resulting files to be put") parser.add_option("--statedir", action="store", type="string", default=None, help="path for state dirresulting files to be put") parser.add_option("--uniqueext", action="store", type="string", default=None, help="Arbitrary, unique extension to append to buildroot directory name") + parser.add_option("--quiet", action ="store_true", dest="quiet", + default=False, help="quiet down output") return parser.parse_args() @@ -665,6 +681,7 @@ config_opts['chroothome'] = '/builddir' config_opts['clean'] = True config_opts['debug'] = False + config_opts['quiet'] = False config_opts['target_arch'] = 'i386' config_opts['files'] = {} config_opts['yum.conf'] = '' @@ -706,6 +723,7 @@ config_opts['clean'] = True config_opts['debug'] = options.debug + config_opts['quiet'] = options.quiet if options.resultdir: config_opts['resultdir'] = options.resultdir @@ -716,6 +734,7 @@ if options.uniqueext: config_opts['unique-ext'] = options.uniqueext + # do whatever we're here to do if args[0] == 'clean': # unset a --no-clean From fedora-extras-commits at redhat.com Wed Aug 17 05:17:47 2005 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Wed, 17 Aug 2005 01:17:47 -0400 Subject: extras-buildsys/utils extras-push, NONE, 1.1 extras-repobuild.py, NONE, 1.1 extras-sign-move.py, NONE, 1.1 extras-push.py, 1.1, NONE Message-ID: <200508170517.j7H5Hl6I016568@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/fedora/extras-buildsys/utils In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16549 Added Files: extras-push extras-repobuild.py extras-sign-move.py Removed Files: extras-push.py Log Message: - remove old extras-push.py - check in extras-push scripts - these are the current ones. They do not interact with the db or plague-server directly at all. --- NEW FILE extras-push --- #!/bin/bash if [ -z $1 ]; then echo "Need a dist" exit 1 fi ~/bin/extras-sign-move.py $1 && ~/bin/extras-repobuild.py $1 --- NEW FILE extras-repobuild.py --- #!/usr/bin/python -t # 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 Library 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. import os import sys import rpmUtils import shutil import string # get the path to where to look for the packages to be signed # make repo # make repoview # email to fedora-extras-list with the built packages list # sing, dance, romance treedir = '/rpmbuild/extras/tree/extras' cachedir = '/tmp/repomd-cache' compsname = 'comps.xml' archdict = {'3':['x86_64', 'i386'], 'development':['ppc','x86_64','i386'], '4':['ppc','x86_64', 'i386']} ts = rpmUtils.transaction.initReadOnlyTransaction() DEBUG = False def debugprint(msg): if DEBUG: print msg def main(dist): if not archdict.has_key(dist): print "No Distribution named %s found" % dist sys.exit(1) destdir = os.path.join(treedir, dist) print "Making Repository Metadata" # SRPM repo creation repodir = os.path.join(destdir, 'SRPMS') rpdata = os.path.join(repodir, 'repodata') debugprint('removing tree %s' % rpdata) if not DEBUG: if os.path.exists(rpdata): shutil.rmtree(rpdata) cmd = '/usr/bin/createrepo -c %s -q %s' % (cachedir, repodir) debugprint(cmd) if not DEBUG: result = os.system(cmd) cmd = '/usr/bin/repoview %s' % repodir debugprint(cmd) if not DEBUG: result = os.system(cmd) # arch repo creation for arch in archdict[dist]: repodir = os.path.join(destdir, arch) compspath = os.path.join(repodir, compsname) rpdata = os.path.join(repodir, 'repodata') debugprint('removing tree %s' % rpdata) if not DEBUG: if os.path.exists(rpdata): shutil.rmtree(rpdata) if os.path.exists(compspath): cmd = '/usr/bin/createrepo -c %s -q -g %s -x *debuginfo* %s' % (cachedir, compsname, repodir) else: cmd = '/usr/bin/createrepo -c %s -q -x *debuginfo* %s' % (cachedir, repodir) debugprint(cmd) if not DEBUG: result = os.system(cmd) cmd = '/usr/bin/repoview %s' % repodir debugprint(cmd) if not DEBUG: result = os.system(cmd) dbg_repodir = os.path.join(destdir, arch, 'debug') dbg_rpdata = os.path.join(dbg_repodir, 'repodata') debugprint('removing tree %s' % dbg_rpdata) if not DEBUG: if os.path.exists(dbg_rpdata): shutil.rmtree(dbg_rpdata) cmd = '/usr/bin/createrepo -c %s -q %s' % (cachedir, dbg_repodir) debugprint(cmd) if not DEBUG: result = os.system(cmd) cmd = '/usr/bin/repoview %s' % dbg_repodir debugprint(cmd) if not DEBUG: result = os.system(cmd) if __name__ == '__main__': me = os.getcwd() if len(sys.argv) < 2: print "Usage:\nextras-repobuild.py release\n\n" sys.exit(1) main(sys.argv[1]) os.chdir(me) --- NEW FILE extras-sign-move.py --- #!/usr/bin/python -t # 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 Library 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. import os import sys import rpmUtils import smtplib import shutil import string from email.MIMEText import MIMEText # get the path to where to look for the packages to be signed # get the list of stuff there (logs, md5sums, specs, rpms) # list the rpms and pause # sign the rpms # collect list of srpms and get package n-v-r from them # move pkgs into repo # email to fedora-extras-list with the built packages list stagesdir = '/rpmbuild/repodir' treedir = '/rpmbuild/extras/tree/extras' cachedir = '/tmp/repomd-cache' compsname = 'comps.xml' archdict = {'3':['x86_64', 'i386'], 'development':['ppc','x86_64','i386'], '4':['ppc','x86_64', 'i386'], '5':['ppc','x86_64', 'i386']} ts = rpmUtils.transaction.initReadOnlyTransaction() DEBUG = False def debugprint(msg): if DEBUG: print msg def find_files(path): """returns a dict of filetypes and paths to those files""" filedict = {} filedict['srpm'] = [] filedict['log'] = [] filedict['rpm'] = [] filedict['spec'] = [] filedict['md5sum'] = [] filedict['debuginfo'] = [] filedict['other'] = [] for root, dirs, files in os.walk(path): for file in files: # match the files to what list they should be in if file.endswith('.log'): which = 'log' elif file.endswith('.rpm'): if file.find('debuginfo') != -1: which = 'debuginfo' elif file.endswith('.src.rpm'): which = 'srpm' else: which = 'rpm' elif file.endswith('.spec'): which = 'spec' elif file.endswith('.md5sum'): which = 'md5sum' else: which = 'other' fullfile = os.path.join(root, file) filedict[which].append(fullfile) return filedict def naevr(pkg): """return nevra from the package srpm""" hdr = rpmUtils.miscutils.hdrFromPackage(ts, pkg) name = hdr['name'] ver = hdr['version'] rel = hdr['release'] arch = hdr['arch'] epoch = hdr['epoch'] if epoch is None: epoch = 0 return (name, arch, epoch, ver, rel) def email_list(pkglist, dist): """email extras list with the new package listing""" mail_from = 'buildsys at fedoraproject.org' mail_to = 'fedora-extras-list at redhat.com' uniqued = rpmUtils.miscutils.unique(pkglist) uniqued.sort() output = "\nPackages built and released for Fedora Extras %s: %s \n\n" % (dist, len(uniqued)) for pkg in uniqued: add = '%s\n' % (pkg) output = output + add end = """ For more information about the built packages please see the repository or the fedora Info Feed: http://fedoraproject.org/infofeed/ """ output = output + end msg = MIMEText(output) subject = 'Fedora Extras %s Package Build Report' % dist msg['Subject'] = subject msg['From'] = mail_from msg['To'] = mail_to s = smtplib.SMTP() s.connect() s.sendmail(mail_from, [mail_to], msg.as_string()) s.close() def sign_pkgs(filelist): """gpg sign all the rpms""" numfiles = len(filelist) if numfiles < 1: print "No packages to sign" return False while numfiles > 0: if numfiles > 256: files = filelist[:256] del filelist[:256] else: files = filelist filelist = [] foo = string.join(files) result = os.system('echo %s | xargs rpm --resign' % foo) if result != 0: return False numfiles = len(filelist) return True def main(dist): if not archdict.has_key(dist): print "No Distribution named %s found" % dist sys.exit(1) needsign = os.path.join(stagesdir, dist) files = find_files(needsign) rpms = files['rpm'] + files['srpm'] + files['debuginfo'] rpms.sort() for item in rpms: print ' %s' % os.path.basename(item) destdir = os.path.join(treedir, dist) if not os.path.exists(destdir): for arch in archdict[dist]: if not DEBUG: os.makedirs(destdir + '/' + arch + '/debug') if not DEBUG: os.makedirs(destdir + '/' + 'SRPMS') rpms = files['rpm'] + files['srpm'] + files['debuginfo'] if len(rpms) == 0: print 'nothing to sign' sys.exit(1) print "Signing Packages:" if not DEBUG: result = sign_pkgs(rpms) if not result: print "Error signing packages" sys.exit(2) infolist = [] for package in files['srpm']: (n,a,e,v,r) = naevr(package) infolist.append('%s-%s-%s' % (n,v,r)) pkg_fn = os.path.basename(package) srpmloc = os.path.join(destdir, 'SRPMS', pkg_fn) if os.path.exists(srpmloc): debugprint('Deleting %s' % srpmloc) if not DEBUG: os.unlink(srpmloc) debugprint('Moving %s to %s' % (package, srpmloc)) if not DEBUG: shutil.move(package, srpmloc) # go through each package and move it to the right arch location. # if it is a noarch package, copy2 it to all arch locations and unlink it # if it is a debuginfo package move it into the 'debug' dir for that arch print "Moving Packages into Place" for package in files['rpm'] + files['debuginfo']: pkg_fn = os.path.basename(package) (n,a,e,v,r) = naevr(package) if a == 'noarch': for arch in archdict[dist]: if package in files['debuginfo']: arch = '%s/debug' % arch rpmloc = os.path.join(destdir, arch, pkg_fn) debugprint("Copying %s to %s" % (package, rpmloc)) if not DEBUG: shutil.copy(package, rpmloc) if not DEBUG: os.unlink(package) continue elif a in ['i386', 'i486', 'i586', 'i686', 'athlon']: if package in files['debuginfo']: arch = 'i386/debug' else: arch = 'i386' elif a in ['x86_64', 'ia32e', 'amd64']: if package in files['debuginfo']: arch = 'x86_64/debug' else: arch = 'x86_64' elif a in ['ppc', 'ppc64', 'ppc32']: if package in files['debuginfo']: arch = 'ppc/debug' else: arch = 'ppc' else: print 'Unknown arch %s' % a continue rpmloc = os.path.join(destdir, arch, pkg_fn) debugprint('Moving %s to %s' % (package, rpmloc)) if not DEBUG: shutil.move(package, rpmloc) # email the list if not DEBUG: print "Emailing info" email_list(infolist, dist) # clean up the crap print "Cleaning Up" for file in files['log'] + files['md5sum'] + files['spec']: debugprint('removing %s' % file) if not DEBUG: os.unlink(file) # FIXME clean up empty dirs, too. if __name__ == '__main__': me = os.getcwd() if len(sys.argv) < 2: print "Usage:\nextras-sign-move.py release\n\n" sys.exit(1) main(sys.argv[1]) os.chdir(me) --- extras-push.py DELETED --- From fedora-extras-commits at redhat.com Wed Aug 17 05:33:20 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Wed, 17 Aug 2005 01:33:20 -0400 Subject: owners owners.list,1.86,1.87 Message-ID: <200508170533.j7H5XKs1016631@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16614 Modified Files: owners.list Log Message: Add perl-Text-Glob Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.86 retrieving revision 1.87 diff -u -r1.86 -r1.87 --- owners.list 16 Aug 2005 17:37:42 -0000 1.86 +++ owners.list 17 Aug 2005 05:33:18 -0000 1.87 @@ -636,6 +636,7 @@ Fedora Extras|perl-Test-Warn|Perl extension to test methods for warnings|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-TeX-Hyphen|Hyphenate words using TeX's patterns|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Text-Autoformat|Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Text-Glob|Perl module to match globbing patterns against text|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Text-Iconv|Perl interface to iconv() codeset conversion function|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Text-Kakasi|Kakasi library module for perl|tagoh at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Text-Reform|Manual text wrapping and reformatting|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Wed Aug 17 05:36:10 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Wed, 17 Aug 2005 01:36:10 -0400 Subject: owners owners.list,1.87,1.88 Message-ID: <200508170536.j7H5aAF7016654@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16637 Modified Files: owners.list Log Message: Add perl-File-Find-Rule Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.87 retrieving revision 1.88 diff -u -r1.87 -r1.88 --- owners.list 17 Aug 2005 05:33:18 -0000 1.87 +++ owners.list 17 Aug 2005 05:36:08 -0000 1.88 @@ -554,6 +554,7 @@ Fedora Extras|perl-ExtUtils-PkgConfig|Simplistic interface to pkg-config|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-ExtUtils-XSBuilder| Modules that parse C header files and create XS glue code|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-File-BOM|Utilities for reading Byte Order Marks|mpeters at mac.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-File-Find-Rule|Perl module implementing an alternative interface to File::Find|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-File-Tail|Perl extension for reading from continously updated files|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-FreezeThaw|Convert Perl structures to strings and back|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-GDGraph3d|3D graph generation package for Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Wed Aug 17 06:09:46 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Wed, 17 Aug 2005 02:09:46 -0400 Subject: rpms/OpenEXR/FC-3 OpenEXR.spec,1.6,1.7 Message-ID: <200508170609.j7H69kj8018178@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/OpenEXR/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18161/FC-3 Modified Files: OpenEXR.spec Log Message: Actually bump the release Index: OpenEXR.spec =================================================================== RCS file: /cvs/extras/rpms/OpenEXR/FC-3/OpenEXR.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- OpenEXR.spec 16 Aug 2005 16:16:55 -0000 1.6 +++ OpenEXR.spec 17 Aug 2005 06:09:44 -0000 1.7 @@ -1,6 +1,6 @@ Name: OpenEXR Version: 1.2.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A high dynamic-range (HDR) image file format Group: System Environment/Libraries @@ -70,11 +70,11 @@ - Added --disable-static to %%configure - Added .so links to -devel -* Wed May 18 2005 Ignacio Vazquez-Abrams 1.2.2-3.fc3 +* Wed May 18 2005 Ignacio Vazquez-Abrams 1.2.2-3 - Add zlib-devel to BR - Delete all .la files (#157652) -* Mon May 9 2005 Ignacio Vazquez-Abrams 1.2.2-2.fc3 +* Mon May 9 2005 Ignacio Vazquez-Abrams 1.2.2-2 - Add disttag * Sun May 8 2005 Ignacio Vazquez-Abrams 1.2.2-2 From fedora-extras-commits at redhat.com Wed Aug 17 07:38:54 2005 From: fedora-extras-commits at redhat.com (Karsten Wade (kwade)) Date: Wed, 17 Aug 2005 03:38:54 -0400 Subject: web/include navigation.inc,1.8,1.9 Message-ID: <200508170738.j7H7cshS019626@cvs-int.fedora.redhat.com> Author: kwade Update of /cvs/fedora/web/include In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19609 Modified Files: navigation.inc Log Message: Marginal improvement in how the navigation appears, may need to remove redudant links, Index: navigation.inc =================================================================== RCS file: /cvs/fedora/web/include/navigation.inc,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- navigation.inc 16 Aug 2005 22:44:10 -0000 1.8 +++ navigation.inc 17 Aug 2005 07:38:52 -0000 1.9 @@ -1,5 +1,5 @@ array("uri"=>"/docs/release-notes/"), "Installation Guide"=>array("uri"=>"/docs/fedora-install-guide-en/"), //"Yum"=>array("uri"=>"/docs/yum/","sub"=>array( - "Managing Software With Yum"=>array("uri"=>"/docs/yum/"), + "Managing Software With Yum"=>array("uri"=>"/docs/yum/index.php"), "Jargon Buster"=>array("uri"=>"/docs/jargon-buster/"), "SELinux FAQ"=>array("uri"=>"/docs/selinux-faq/") //"Package List"=>array("uri"=>"/docs/package-list/"), From fedora-extras-commits at redhat.com Wed Aug 17 07:41:44 2005 From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy)) Date: Wed, 17 Aug 2005 03:41:44 -0400 Subject: rpms/cproto - New directory Message-ID: <200508170741.j7H7fivT019700@cvs-int.fedora.redhat.com> Author: jnovy Update of /cvs/extras/rpms/cproto In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19680/cproto Log Message: Directory /cvs/extras/rpms/cproto added to the repository From fedora-extras-commits at redhat.com Wed Aug 17 07:41:45 2005 From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy)) Date: Wed, 17 Aug 2005 03:41:45 -0400 Subject: rpms/cproto/devel - New directory Message-ID: <200508170741.j7H7fjmC019705@cvs-int.fedora.redhat.com> Author: jnovy Update of /cvs/extras/rpms/cproto/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19680/cproto/devel Log Message: Directory /cvs/extras/rpms/cproto/devel added to the repository From fedora-extras-commits at redhat.com Wed Aug 17 07:42:20 2005 From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy)) Date: Wed, 17 Aug 2005 03:42:20 -0400 Subject: rpms/cproto Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200508170742.j7H7gKQq019756@cvs-int.fedora.redhat.com> Author: jnovy Update of /cvs/extras/rpms/cproto In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19727 Added Files: Makefile import.log Log Message: Setup of module cproto --- NEW FILE Makefile --- # Top level Makefile for module cproto all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Wed Aug 17 07:42:20 2005 From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy)) Date: Wed, 17 Aug 2005 03:42:20 -0400 Subject: rpms/cproto/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200508170742.j7H7gKa3019761@cvs-int.fedora.redhat.com> Author: jnovy Update of /cvs/extras/rpms/cproto/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19727/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module cproto --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Wed Aug 17 07:43:36 2005 From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy)) Date: Wed, 17 Aug 2005 03:43:36 -0400 Subject: rpms/cproto import.log,1.1,1.2 Message-ID: <200508170744.j7H7i6Ci019837@cvs-int.fedora.redhat.com> Author: jnovy Update of /cvs/extras/rpms/cproto In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19802 Modified Files: import.log Log Message: auto-import cproto-4.7c-7 on branch devel from cproto-4.7c-7.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/cproto/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 17 Aug 2005 07:42:18 -0000 1.1 +++ import.log 17 Aug 2005 07:43:33 -0000 1.2 @@ -0,0 +1 @@ +cproto-4_7c-7:HEAD:cproto-4.7c-7.src.rpm:1124264607 From fedora-extras-commits at redhat.com Wed Aug 17 07:43:36 2005 From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy)) Date: Wed, 17 Aug 2005 03:43:36 -0400 Subject: rpms/cproto/devel cproto.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200508170743.j7H7haZC019832@cvs-int.fedora.redhat.com> Author: jnovy Update of /cvs/extras/rpms/cproto/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19802/devel Modified Files: .cvsignore sources Added Files: cproto.spec Log Message: auto-import cproto-4.7c-7 on branch devel from cproto-4.7c-7.src.rpm --- NEW FILE cproto.spec --- Summary: Generates function prototypes and variable declarations from C code Name: cproto Version: 4.7c Release: 7 License: Public Domain Group: Development/Tools Source: ftp://invisible-island.net/cproto/cproto-4_7c.tgz URL: http://invisible-island.net/ BuildRequires: byacc, flex BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description Cproto generates function prototypes and variable declarations from C source code. Cproto can also convert function definitions between the old style and the ANSI C style. This conversion will overwrite the original files, however, so be sure to make a backup copy of your original files in case something goes wrong. Cproto uses a Yacc generated parser, so it should not be confused by complex function definitions as much as other prototype generators. %prep %setup -q -n cproto-4_7c %build export CPP="/lib/cpp" export CPPFLAGS="-DOPT_LINTLIBRARY $RPM_OPT_FLAGS" export CFLAGS="-DOPT_LINTLIBRARY $RPM_OPT_FLAGS" %configure make %install rm -rf $RPM_BUILD_ROOT %makeinstall mandir=$RPM_BUILD_ROOT/%{_mandir}/man1 %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) %doc CHANGES README %{_prefix}/bin/cproto %{_mandir}/man1/cproto.* %changelog * Sat Aug 13 2005 Jindrich Novy 4.7c-7 - prepare for Fedora Extras inclusion (#165811) * Fri Mar 4 2005 Jindrich Novy 4.7c-6 - rebuilt with gcc4 * Thu Feb 10 2005 Jindrich Novy 4.7c-5 - remove -D_FORTIFY_SOURCE=2 from CFLAGS, present in RPM_OPT_FLAGS * Wed Feb 9 2005 Jindrich Novy 4.7c-4 - add RPM_OPT_FLAGS to CFLAGS - convert Copyright to License - rebuild with -D_FORTIFY_SOURCE=2 * Thu Oct 14 2004 Jindrich Novy 4.7c-3 - define OPT_LINTLIBRARY to enable type definitions output and other cproto features disabled otherwise * Tue Jun 15 2004 Elliot Lee - rebuilt * Tue May 4 2004 Bill Nottingham 4.7c-1 - update to 4.7c (#54814) * Fri Feb 13 2004 Elliot Lee - rebuilt * Wed Jun 04 2003 Elliot Lee - rebuilt * Thu May 22 2003 Bill Nottingham 4.6-16 - fix build with new bison * Wed Jan 22 2003 Tim Powers - rebuilt * Thu Dec 12 2002 Tim Powers 4.6-14 - rebuild on all arches * Fri Jun 21 2002 Tim Powers - automated rebuild * Mon Jun 17 2002 Bill Nottingham 4.6-12 - don't strip it * Thu May 23 2002 Tim Powers - automated rebuild * Wed Jan 09 2002 Tim Powers - automated rebuild * Mon Aug 13 2001 Bill Nottingham - predefine __builtin_va_list (#46246, original patch from ) * Tue Jun 12 2001 Bill Nottingham - actually *apply* the 4.6.1 patch. Fixes #35654, at least. * Fri Dec 01 2000 Bill Nottingham - rebuild because of broken fileutils * Mon Oct 13 2000 Bill Nottingham - use /lib/cpp, not gcc -E, again (#20535) * Wed Jul 12 2000 Prospector - automatic rebuild * Tue Jun 6 2000 Bill Nottingham - rebuild against glibc-2.2, FHS stuff * Tue Feb 1 2000 Bill Nottingham - use /lib/cpp, not gcc -E (#8612) * Sun Mar 21 1999 Cristian Gafton - auto rebuild in the new build environment (release 2) * Mon Mar 15 1999 Jeff Johnson - update to 4.6.1 (#1516). - use %configure * Fri Dec 18 1998 Bill Nottingham - build for 6.0 * Sat Aug 15 1998 Jeff Johnson - build root * Mon Apr 27 1998 Prospector System - translations modified for de, fr, tr * Thu Jul 10 1997 Erik Troan - built against glibc Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cproto/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 17 Aug 2005 07:42:18 -0000 1.1 +++ .cvsignore 17 Aug 2005 07:43:34 -0000 1.2 @@ -0,0 +1 @@ +cproto-4_7c.tgz Index: sources =================================================================== RCS file: /cvs/extras/rpms/cproto/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 17 Aug 2005 07:42:18 -0000 1.1 +++ sources 17 Aug 2005 07:43:34 -0000 1.2 @@ -0,0 +1 @@ +c7fb8586a4b402e830d1310f3aadef91 cproto-4_7c.tgz From fedora-extras-commits at redhat.com Wed Aug 17 07:54:43 2005 From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy)) Date: Wed, 17 Aug 2005 03:54:43 -0400 Subject: common tobuild,1.2203,1.2204 Message-ID: <200508170754.j7H7shwm019981@cvs-int.fedora.redhat.com> Author: jnovy Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19964 Modified Files: tobuild Log Message: request build of rpms/cproto/devel cproto-4_7c-7 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2203 retrieving revision 1.2204 diff -u -r1.2203 -r1.2204 --- tobuild 17 Aug 2005 01:09:39 -0000 1.2203 +++ tobuild 17 Aug 2005 07:54:41 -0000 1.2204 @@ -33,3 +33,4 @@ gemi rpms/plt-scheme/FC-4 plt-scheme-299_200-1_fc4 fc4 gemi rpms/plt-scheme/FC-3 plt-scheme-299_200-1_fc3 fc3 gemi rpms/plt-scheme/devel plt-scheme-299_200-1_fc5 devel +jnovy rpms/cproto/devel cproto-4_7c-7 devel From fedora-extras-commits at redhat.com Wed Aug 17 08:13:35 2005 From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik)) Date: Wed, 17 Aug 2005 04:13:35 -0400 Subject: owners owners.list,1.88,1.89 Message-ID: <200508170814.j7H8E51Q021777@cvs-int.fedora.redhat.com> Author: gajownik Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21760 Modified Files: owners.list Log Message: Add athcool component. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.88 retrieving revision 1.89 diff -u -r1.88 -r1.89 --- owners.list 17 Aug 2005 05:36:08 -0000 1.88 +++ owners.list 17 Aug 2005 08:13:33 -0000 1.89 @@ -34,6 +34,7 @@ Fedora Extras|aqhbci-qt-tools|Setup wizard and debugger for the HBCI backend for the Aqbanking library|notting at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|arc|Arc archiver|Nicolas.Mailhot at laPoste.net|extras-qa at fedoraproject.org| Fedora Extras|aterm|Aterm (Afterstep XVT) - a VT102 emulator for the X window system|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| +Fedora Extras|athcool|Enables/disables Powersaving mode for AMD processors|gajownik at gmail.com|extras-qa at fedoraproject.org| Fedora Extras|atitvout|ATI Rage/Radeon TV Out configuration program|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|audacity|A multitrack audio editor|gemi at bluewin.ch|extras-qa at fedoraproject.org| Fedora Extras|autossh|Utility to autorestart SSH tunnels|kaboom at oobleck.net|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Wed Aug 17 08:51:44 2005 From: fedora-extras-commits at redhat.com (Joost van der Sluis (joost)) Date: Wed, 17 Aug 2005 04:51:44 -0400 Subject: common tobuild,1.2204,1.2205 Message-ID: <200508170851.j7H8piHJ022106@cvs-int.fedora.redhat.com> Author: joost Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22087 Modified Files: tobuild Log Message: request build of rpms/fpc/FC-3 fpc-2_0_0-1 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2204 retrieving revision 1.2205 diff -u -r1.2204 -r1.2205 --- tobuild 17 Aug 2005 07:54:41 -0000 1.2204 +++ tobuild 17 Aug 2005 08:51:42 -0000 1.2205 @@ -34,3 +34,4 @@ gemi rpms/plt-scheme/FC-3 plt-scheme-299_200-1_fc3 fc3 gemi rpms/plt-scheme/devel plt-scheme-299_200-1_fc5 devel jnovy rpms/cproto/devel cproto-4_7c-7 devel +joost rpms/fpc/FC-3 fpc-2_0_0-1 fc3 From fedora-extras-commits at redhat.com Wed Aug 17 09:09:00 2005 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Wed, 17 Aug 2005 05:09:00 -0400 Subject: rpms/uim/devel .cvsignore, 1.8, 1.9 sources, 1.7, 1.8 uim.spec, 1.17, 1.18 Message-ID: <200508170909.j7H9905V023358@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/uim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23337 Modified Files: .cvsignore sources uim.spec Log Message: * Wed Aug 17 2005 Akira TAGOH - 0.4.8-1.fc5 - New upstream release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/uim/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 3 Aug 2005 01:46:55 -0000 1.8 +++ .cvsignore 17 Aug 2005 09:08:58 -0000 1.9 @@ -7,3 +7,4 @@ uim-0.4.6.tar.gz uim-0.4.7.tar.gz uim-0.4.7.1.tar.gz +uim-0.4.8.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/uim/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 3 Aug 2005 01:46:55 -0000 1.7 +++ sources 17 Aug 2005 09:08:58 -0000 1.8 @@ -1 +1 @@ -88c18b8fffa3a67401c932ac925a6d30 uim-0.4.7.1.tar.gz +f3e48b6ded979d029db9c342a0aa809a uim-0.4.8.tar.gz Index: uim.spec =================================================================== RCS file: /cvs/extras/rpms/uim/devel/uim.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- uim.spec 4 Aug 2005 11:45:35 -0000 1.17 +++ uim.spec 17 Aug 2005 09:08:58 -0000 1.18 @@ -4,8 +4,8 @@ Summary: A multilingual input method library Name: uim -Version: 0.4.7.1 -Release: 2%{?dist} +Version: 0.4.8 +Release: 1%{?dist} License: GPL/BSD Group: System Environment/Libraries URL: http://uim.freedesktop.org/ @@ -288,6 +288,9 @@ %{_datadir}/uim/skk*.scm %changelog +* Wed Aug 17 2005 Akira TAGOH - 0.4.8-1.fc5 +- New upstream release. + * Thu Aug 4 2005 Akira TAGOH - 0.4.7.1-2.fc5 - removed Requires: Canna-devel from uim-canna. this is no longer needed since 0.4.6-4. (Warren Togami, #165088) From fedora-extras-commits at redhat.com Wed Aug 17 09:48:41 2005 From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau)) Date: Wed, 17 Aug 2005 05:48:41 -0400 Subject: rpms/yumex import.log,1.2,1.3 Message-ID: <200508170949.j7H9nB4K023490@cvs-int.fedora.redhat.com> Author: timlau Update of /cvs/extras/rpms/yumex In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23456 Modified Files: import.log Log Message: auto-import yumex-0.42-1.0 on branch devel from yumex-0.42-1.0.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/yumex/import.log,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- import.log 21 Jun 2005 15:51:11 -0000 1.2 +++ import.log 17 Aug 2005 09:48:39 -0000 1.3 @@ -1 +1,2 @@ yumex-0_40-5_0:HEAD:yumex-0.40-5.0.src.rpm:1119369039 +yumex-0_42-1_0:HEAD:yumex-0.42-1.0.src.rpm:1124272104 From fedora-extras-commits at redhat.com Wed Aug 17 09:48:42 2005 From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau)) Date: Wed, 17 Aug 2005 05:48:42 -0400 Subject: rpms/yumex/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 yumex.spec, 1.2, 1.3 Message-ID: <200508170949.j7H9nCcc023495@cvs-int.fedora.redhat.com> Author: timlau Update of /cvs/extras/rpms/yumex/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23456/devel Modified Files: .cvsignore sources yumex.spec Log Message: auto-import yumex-0.42-1.0 on branch devel from yumex-0.42-1.0.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/yumex/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 21 Jun 2005 15:51:12 -0000 1.2 +++ .cvsignore 17 Aug 2005 09:48:39 -0000 1.3 @@ -1 +1 @@ -yumex-0.40-5.tar.gz +yumex-0.42-1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/yumex/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 21 Jun 2005 15:51:12 -0000 1.2 +++ sources 17 Aug 2005 09:48:39 -0000 1.3 @@ -1 +1 @@ -f81eeccd5c4b1e70515c10f2883dfc4b yumex-0.40-5.tar.gz +8df6733cf79c6c375341e29d7a37d6ba yumex-0.42-1.tar.gz Index: yumex.spec =================================================================== RCS file: /cvs/extras/rpms/yumex/devel/yumex.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- yumex.spec 22 Jun 2005 02:36:31 -0000 1.2 +++ yumex.spec 17 Aug 2005 09:48:39 -0000 1.3 @@ -1,8 +1,8 @@ -%define build_v 5 +%define build_v 1 Name: yumex -Version: 0.40 -Release: 5.1%{?dist} +Version: 0.42 +Release: 1.0%{?dist} Summary: Yum Extender graphical package management tool Group: Applications/System @@ -19,8 +19,7 @@ Requires: yum >= 2.3.2 Requires: pygtk2 Requires: usermode -# below not needed in FC4 -#Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") +Requires: pygtk2-libglade %description Graphical User Interface for Yum. @@ -68,6 +67,10 @@ %{_datadir}/applications/fedora-%{name}.desktop %changelog +* Wed Aug 17 2005 Tim Lauridsen - 0.42-1.0 +- Release 0.42 +- Added Requires: pygtk2-libglade (Bugzilla 163439) +- A lot of changes and new features, check Changelog for details. * Tue Jun 21 2005 Michael A. Peters - 0.40-5.1 - removed unnecessary [ "$RPM_BUILD_ROOT" != "/" ] checks - commented out python-abi check - automatic in fc4 From fedora-extras-commits at redhat.com Wed Aug 17 10:12:31 2005 From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau)) Date: Wed, 17 Aug 2005 06:12:31 -0400 Subject: rpms/yumex import.log,1.3,1.4 Message-ID: <200508171012.j7HACVjE024802@cvs-int.fedora.redhat.com> Author: timlau Update of /cvs/extras/rpms/yumex In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24771 Modified Files: import.log Log Message: auto-import yumex-0.42-1.0 on branch FC-4 from yumex-0.42-1.0.src.rpm imported release 0.43 Index: import.log =================================================================== RCS file: /cvs/extras/rpms/yumex/import.log,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- import.log 17 Aug 2005 09:48:39 -0000 1.3 +++ import.log 17 Aug 2005 10:12:29 -0000 1.4 @@ -1,2 +1,3 @@ yumex-0_40-5_0:HEAD:yumex-0.40-5.0.src.rpm:1119369039 yumex-0_42-1_0:HEAD:yumex-0.42-1.0.src.rpm:1124272104 +yumex-0_42-1_0:FC-4:yumex-0.42-1.0.src.rpm:1124273539 From fedora-extras-commits at redhat.com Wed Aug 17 10:12:32 2005 From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau)) Date: Wed, 17 Aug 2005 06:12:32 -0400 Subject: rpms/yumex/FC-4 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 yumex.spec, 1.2, 1.3 Message-ID: <200508171012.j7HACWE3024810@cvs-int.fedora.redhat.com> Author: timlau Update of /cvs/extras/rpms/yumex/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24771/FC-4 Modified Files: .cvsignore sources yumex.spec Log Message: auto-import yumex-0.42-1.0 on branch FC-4 from yumex-0.42-1.0.src.rpm imported release 0.43 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/yumex/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 21 Jun 2005 15:51:12 -0000 1.2 +++ .cvsignore 17 Aug 2005 10:12:29 -0000 1.3 @@ -1 +1 @@ -yumex-0.40-5.tar.gz +yumex-0.42-1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/yumex/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 21 Jun 2005 15:51:12 -0000 1.2 +++ sources 17 Aug 2005 10:12:29 -0000 1.3 @@ -1 +1 @@ -f81eeccd5c4b1e70515c10f2883dfc4b yumex-0.40-5.tar.gz +8df6733cf79c6c375341e29d7a37d6ba yumex-0.42-1.tar.gz Index: yumex.spec =================================================================== RCS file: /cvs/extras/rpms/yumex/FC-4/yumex.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- yumex.spec 22 Jun 2005 02:36:31 -0000 1.2 +++ yumex.spec 17 Aug 2005 10:12:29 -0000 1.3 @@ -1,8 +1,8 @@ -%define build_v 5 +%define build_v 1 Name: yumex -Version: 0.40 -Release: 5.1%{?dist} +Version: 0.42 +Release: 1.0%{?dist} Summary: Yum Extender graphical package management tool Group: Applications/System @@ -19,8 +19,7 @@ Requires: yum >= 2.3.2 Requires: pygtk2 Requires: usermode -# below not needed in FC4 -#Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") +Requires: pygtk2-libglade %description Graphical User Interface for Yum. @@ -68,6 +67,10 @@ %{_datadir}/applications/fedora-%{name}.desktop %changelog +* Wed Aug 17 2005 Tim Lauridsen - 0.42-1.0 +- Release 0.42 +- Added Requires: pygtk2-libglade (Bugzilla 163439) +- A lot of changes and new features, check Changelog for details. * Tue Jun 21 2005 Michael A. Peters - 0.40-5.1 - removed unnecessary [ "$RPM_BUILD_ROOT" != "/" ] checks - commented out python-abi check - automatic in fc4 From fedora-extras-commits at redhat.com Wed Aug 17 10:41:03 2005 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Wed, 17 Aug 2005 06:41:03 -0400 Subject: fedora-security/audit fc4,1.43,1.44 Message-ID: <200508171041.j7HAf3wi025021@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25004 Modified Files: fc4 Log Message: Update with kernel stuff Fix my bad spelling Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- fc4 16 Aug 2005 08:28:58 -0000 1.43 +++ fc4 17 Aug 2005 10:41:01 -0000 1.44 @@ -3,6 +3,8 @@ ** are items that need attention +2005-2617 VULNERABLE (kernel, fixed 20050715) +2005-2555 VULNERABLE (kernel, fixed 20050806) 2005-2553 version (kernel, not 2.6) 2005-2550 backport (evolution) [since FEDORA-2005-743] 2005-2549 backport (evolution) [since FEDORA-2005-743] @@ -14,6 +16,9 @@ 2005-2498 ** php xmlrpc 2005-2475 VULNERABLE (unzip) bz#164928 2005-2471 VULNERABLE (netpbm) bz#165355 +2005-2459 VULNERABLE (kernel, fixed 20050805) +2005-2458 VULNERABLE (kernel, fixed 20050805) +2005-2457 ignore (kernel) this is just a bug 2005-2456 VULNERABLE (kernel, fixed after 20050726) 2005-2452 ** libtiff 2005-2448 ** libgadu in kdenetwork @@ -62,6 +67,9 @@ 2005-2260 version (mozilla, fixed 1.7.9) [since FEDORA-2005-619] 2005-2177 version (net-snmp, fixed 5.2.1.2) [since FEDORA-2005-561] 2005-2114 ** mozilla, can't find out when this was fixed upstream +2005-2100 version (kernel, not upstream) +2005-2099 VULNERABLE (kernel, fixed 20050804) bz#164989 +2005-2098 VULNERABLE (kernel, fixed 20050804) bz#164988 2005-2097 backport (xpdf) [since FEDORA-2005-729] 2005-2096 backport (zlib) [since FEDORA-2005-523] 2005-2096 backport (rpm) [since FEDORA-2005-565] @@ -901,14 +909,14 @@ 2003-0540 version (postfix, not 2.0 onwards) 2003-0517 version (mgetty, fixed 1.1.29) 2003-0516 version (mgetty, fixed 1.1.29) -2003-0501 verison (kernel, fixed 2.6.1) -2003-0476 verison (kernel, fixed 2.6.1) +2003-0501 version (kernel, fixed 2.6.1) +2003-0476 version (kernel, fixed 2.6.1) 2003-0468 version (postfix, fixed 1.1.12) 2003-0467 version (kernel, not 2.6) 2003-0465 version (kernel, not 2.6) 2003-0464 version (kernel, not 2.6) -2003-0462 verison (kernel, fixed 2.6.1) -2003-0461 verison (kernel, fixed 2.6.1) +2003-0462 version (kernel, fixed 2.6.1) +2003-0461 version (kernel, fixed 2.6.1) 2003-0459 version (kdelibs, not 3.2) 2003-0455 version (ImageMagick) 2003-0442 version (php, fixed 4.3.2) @@ -924,7 +932,7 @@ 2003-0386 version (openssh, fixed after 3.6.1) 2003-0370 version (kde, fixed 3.0) 2003-0367 backport (gzip) -2003-0364 verison (kernel, not 2.6) +2003-0364 version (kernel, not 2.6) 2003-0357 version (ethereal, fixed after 0.9.11) 2003-0356 version (ethereal, fixed after 0.9.11) 2003-0354 version (ghostscript, fixed 7.07) @@ -941,9 +949,9 @@ 2003-0253 version (httpd, fixed 2.0.47) 2003-0252 version (nfs-utils, fixed 1.0.4) 2003-0251 version (ypserv, fixed 2.7) -2003-0248 verison (kernel, not 2.6) -2003-0247 verison (kernel, not 2.6) -2003-0246 verison (kernel, not 2.6) +2003-0248 version (kernel, not 2.6) +2003-0247 version (kernel, not 2.6) +2003-0246 version (kernel, not 2.6) 2003-0245 version (httpd, fixed 2.0.46) 2003-0244 version (kernel, not 2.6) 2003-0211 version (xinetd, fixed 2.3.11) @@ -982,7 +990,7 @@ 2003-0127 version (kernel, not 2.6) 2003-0124 version (man, fixed 1.5l) 2003-0108 version (tcpdump, fixed after 3.7.1) -2003-0107 verison (zlib, fixed 1.2.0.2 at least) changelog +2003-0107 version (zlib, fixed 1.2.0.2 at least) changelog 2003-0102 version (file, fixed 3.41) 2003-0097 version (php, fixed 4.3.1) 2003-0093 version (tcpdump, fixed 3.7.2) @@ -1007,7 +1015,7 @@ 2003-0041 version (krb5, fixed after 1.2.7) 2003-0038 version (mailman, fixed 2.0.13 at least) 2003-0028 version (glibc, fixed after 2.3.1) -2003-0028 verison (krb5, fixed after 1.2.7) +2003-0028 version (krb5, fixed after 1.2.7) 2003-0026 version (dhcpd, fixed 3.0.1) 2003-0020 version (httpd, fixed 2.0.49) 2003-0019 version (kernel-utils, not upstream) From fedora-extras-commits at redhat.com Wed Aug 17 10:49:24 2005 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Wed, 17 Aug 2005 06:49:24 -0400 Subject: fedora-security/audit fc4,1.44,1.45 Message-ID: <200508171049.j7HAnODY025067@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25050 Modified Files: fc4 Log Message: 165 new CVE names from Mitre Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- fc4 17 Aug 2005 10:41:01 -0000 1.44 +++ fc4 17 Aug 2005 10:49:22 -0000 1.45 @@ -1,9 +1,12 @@ -Up to date CVE as of CVE email 20050815 -Up to date FC4 as of 20050815 +Up to date CVE as of CVE email 20050816 +Up to date FC4 as of 20050816 ** are items that need attention 2005-2617 VULNERABLE (kernel, fixed 20050715) +2005-2602 ** firefox +2005-2602 ** thunderbird +2005-2558 ** mysql 2005-2555 VULNERABLE (kernel, fixed 20050806) 2005-2553 version (kernel, not 2.6) 2005-2550 backport (evolution) [since FEDORA-2005-743] @@ -67,9 +70,12 @@ 2005-2260 version (mozilla, fixed 1.7.9) [since FEDORA-2005-619] 2005-2177 version (net-snmp, fixed 5.2.1.2) [since FEDORA-2005-561] 2005-2114 ** mozilla, can't find out when this was fixed upstream +2005-2101 backport (kdeedu) [since FEDORA-2005-744] 2005-2100 version (kernel, not upstream) 2005-2099 VULNERABLE (kernel, fixed 20050804) bz#164989 2005-2098 VULNERABLE (kernel, fixed 20050804) bz#164988 +2005-2103 ** gaim bz#165403 +2005-2102 ** gaim bz#165401 2005-2097 backport (xpdf) [since FEDORA-2005-729] 2005-2096 backport (zlib) [since FEDORA-2005-523] 2005-2096 backport (rpm) [since FEDORA-2005-565] From fedora-extras-commits at redhat.com Wed Aug 17 11:20:21 2005 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Wed, 17 Aug 2005 07:20:21 -0400 Subject: common tobuild,1.2205,1.2206 Message-ID: <200508171120.j7HBKLq9026394@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26377 Modified Files: tobuild Log Message: request build of rpms/uim/devel uim-0_4_8-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2205 retrieving revision 1.2206 diff -u -r1.2205 -r1.2206 --- tobuild 17 Aug 2005 08:51:42 -0000 1.2205 +++ tobuild 17 Aug 2005 11:20:19 -0000 1.2206 @@ -35,3 +35,4 @@ gemi rpms/plt-scheme/devel plt-scheme-299_200-1_fc5 devel jnovy rpms/cproto/devel cproto-4_7c-7 devel joost rpms/fpc/FC-3 fpc-2_0_0-1 fc3 +tagoh rpms/uim/devel uim-0_4_8-1_fc5 devel From fedora-extras-commits at redhat.com Wed Aug 17 11:36:08 2005 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Wed, 17 Aug 2005 07:36:08 -0400 Subject: common tobuild,1.2206,1.2207 Message-ID: <200508171136.j7HBa8t1026449@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26430 Modified Files: tobuild Log Message: doh Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2206 retrieving revision 1.2207 diff -u -r1.2206 -r1.2207 --- tobuild 17 Aug 2005 11:20:19 -0000 1.2206 +++ tobuild 17 Aug 2005 11:36:06 -0000 1.2207 @@ -35,4 +35,3 @@ gemi rpms/plt-scheme/devel plt-scheme-299_200-1_fc5 devel jnovy rpms/cproto/devel cproto-4_7c-7 devel joost rpms/fpc/FC-3 fpc-2_0_0-1 fc3 -tagoh rpms/uim/devel uim-0_4_8-1_fc5 devel From fedora-extras-commits at redhat.com Wed Aug 17 12:08:45 2005 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Wed, 17 Aug 2005 08:08:45 -0400 Subject: rpms/uim/devel uim.spec,1.18,1.19 Message-ID: <200508171208.j7HC8j1a028206@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/uim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28189 Modified Files: uim.spec Log Message: Index: uim.spec =================================================================== RCS file: /cvs/extras/rpms/uim/devel/uim.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- uim.spec 17 Aug 2005 09:08:58 -0000 1.18 +++ uim.spec 17 Aug 2005 12:08:43 -0000 1.19 @@ -106,6 +106,7 @@ %description qt Uim is a multilingual input method library. Uim aims to provide secure and useful input methods for all +languages. This package provides the Qt IM module and helper programs. @@ -215,6 +216,7 @@ %lang(ja) %doc README.ja %{_bindir}/uim-fep* %{_bindir}/uim-helper-server +%{_bindir}/uim-module-manager %{_bindir}/uim-sh %{_bindir}/uim-xim %{_libdir}/lib*.so.* From fedora-extras-commits at redhat.com Wed Aug 17 12:13:03 2005 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Wed, 17 Aug 2005 08:13:03 -0400 Subject: rpms/uim/FC-4 .cvsignore, 1.8, 1.9 sources, 1.7, 1.8 uim.spec, 1.14, 1.15 Message-ID: <200508171213.j7HCD3pW028275@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/uim/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28254 Modified Files: .cvsignore sources uim.spec Log Message: * Wed Aug 17 2005 Akira TAGOH - 0.4.8-1.fc4 - New upstream release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/uim/FC-4/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 3 Aug 2005 02:15:22 -0000 1.8 +++ .cvsignore 17 Aug 2005 12:13:01 -0000 1.9 @@ -7,3 +7,4 @@ uim-0.4.6.tar.gz uim-0.4.7.tar.gz uim-0.4.7.1.tar.gz +uim-0.4.8.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/uim/FC-4/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 3 Aug 2005 02:15:22 -0000 1.7 +++ sources 17 Aug 2005 12:13:01 -0000 1.8 @@ -1 +1 @@ -88c18b8fffa3a67401c932ac925a6d30 uim-0.4.7.1.tar.gz +f3e48b6ded979d029db9c342a0aa809a uim-0.4.8.tar.gz Index: uim.spec =================================================================== RCS file: /cvs/extras/rpms/uim/FC-4/uim.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- uim.spec 4 Aug 2005 11:50:28 -0000 1.14 +++ uim.spec 17 Aug 2005 12:13:01 -0000 1.15 @@ -4,8 +4,8 @@ Summary: A multilingual input method library Name: uim -Version: 0.4.7.1 -Release: 2%{?dist} +Version: 0.4.8 +Release: 1%{?dist} License: GPL/BSD Group: System Environment/Libraries URL: http://uim.freedesktop.org/ @@ -106,6 +106,7 @@ %description qt Uim is a multilingual input method library. Uim aims to provide secure and useful input methods for all +languages. This package provides the Qt IM module and helper programs. @@ -215,6 +216,7 @@ %lang(ja) %doc README.ja %{_bindir}/uim-fep* %{_bindir}/uim-helper-server +%{_bindir}/uim-module-manager %{_bindir}/uim-sh %{_bindir}/uim-xim %{_libdir}/lib*.so.* @@ -288,6 +290,9 @@ %{_datadir}/uim/skk*.scm %changelog +* Wed Aug 17 2005 Akira TAGOH - 0.4.8-1.fc4 +- New upstream release. + * Thu Aug 4 2005 Akira TAGOH - 0.4.7.1-2.fc4 - removed Requires: Canna-devel from uim-canna. this is no longer needed since 0.4.6-4. (Warren Togami, #165088) From fedora-extras-commits at redhat.com Wed Aug 17 12:18:07 2005 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Wed, 17 Aug 2005 08:18:07 -0400 Subject: rpms/uim/FC-3 uim.spec,1.7,1.8 Message-ID: <200508171218.j7HCI7T0028348@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/uim/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28331 Modified Files: uim.spec Log Message: * Wed Aug 17 2005 Akira TAGOH - 0.4.8-1.fc3 - New upstream release. Index: uim.spec =================================================================== RCS file: /cvs/extras/rpms/uim/FC-3/uim.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- uim.spec 4 Aug 2005 11:48:48 -0000 1.7 +++ uim.spec 17 Aug 2005 12:18:05 -0000 1.8 @@ -4,8 +4,8 @@ Summary: A multilingual input method library Name: uim -Version: 0.4.7.1 -Release: 2%{?dist} +Version: 0.4.8 +Release: 1%{?dist} License: GPL/BSD Group: System Environment/Libraries URL: http://uim.freedesktop.org/ @@ -106,6 +106,7 @@ %description qt Uim is a multilingual input method library. Uim aims to provide secure and useful input methods for all +languages. This package provides the Qt IM module and helper programs. @@ -215,6 +216,7 @@ %lang(ja) %doc README.ja %{_bindir}/uim-fep* %{_bindir}/uim-helper-server +%{_bindir}/uim-module-manager %{_bindir}/uim-sh %{_bindir}/uim-xim %{_libdir}/lib*.so.* @@ -288,6 +290,9 @@ %{_datadir}/uim/skk*.scm %changelog +* Wed Aug 17 2005 Akira TAGOH - 0.4.8-1.fc3 +- New upstream release. + * Thu Aug 4 2005 Akira TAGOH - 0.4.7.1-2.fc3 - removed Requires: Canna-devel from uim-canna. this is no longer needed since 0.4.6-4. (Warren Togami, #165088) From fedora-extras-commits at redhat.com Wed Aug 17 12:20:53 2005 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Wed, 17 Aug 2005 08:20:53 -0400 Subject: rpms/uim/FC-3 .cvsignore,1.7,1.8 sources,1.6,1.7 Message-ID: <200508171220.j7HCKrJD028423@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/uim/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28403 Modified Files: .cvsignore sources Log Message: Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/uim/FC-3/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 3 Aug 2005 01:59:07 -0000 1.7 +++ .cvsignore 17 Aug 2005 12:20:51 -0000 1.8 @@ -6,3 +6,4 @@ uim-0.4.5.1.tar.gz uim-0.4.7.tar.gz uim-0.4.7.1.tar.gz +uim-0.4.8.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/uim/FC-3/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 3 Aug 2005 01:59:07 -0000 1.6 +++ sources 17 Aug 2005 12:20:51 -0000 1.7 @@ -1 +1 @@ -88c18b8fffa3a67401c932ac925a6d30 uim-0.4.7.1.tar.gz +f3e48b6ded979d029db9c342a0aa809a uim-0.4.8.tar.gz From fedora-extras-commits at redhat.com Wed Aug 17 12:33:09 2005 From: fedora-extras-commits at redhat.com (Marc Maurer (uwog)) Date: Wed, 17 Aug 2005 08:33:09 -0400 Subject: rpms/aiksaurus/devel aiksaurus.spec,1.6,1.7 Message-ID: <200508171233.j7HCX9hM028682@cvs-int.fedora.redhat.com> Author: uwog Update of /cvs/extras/rpms/aiksaurus/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28656 Modified Files: aiksaurus.spec Log Message: Rebuild Index: aiksaurus.spec =================================================================== RCS file: /cvs/extras/rpms/aiksaurus/devel/aiksaurus.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- aiksaurus.spec 8 Jul 2005 20:18:33 -0000 1.6 +++ aiksaurus.spec 17 Aug 2005 12:33:07 -0000 1.7 @@ -1,7 +1,7 @@ Summary: An English-language thesaurus library. Name: aiksaurus Version: 1.2.1 -Release: 9 +Release: 10 Epoch: 1 Group: System Environment/Libraries License: GPL @@ -105,6 +105,9 @@ %{_libdir}/pkgconfig/gaiksaurus-1.0.pc %changelog +* Wed Aug 17 2005 Marc Maurer 1:1.2.1-10 +- Rebuild against new libcairo + * Fri Jul 8 2005 Marc Maurer 1:1.2.1-9 - Add URL From fedora-extras-commits at redhat.com Wed Aug 17 13:11:17 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Wed, 17 Aug 2005 09:11:17 -0400 Subject: rpms/gramps/FC-4 gramps.spec,1.10,1.11 Message-ID: <200508171311.j7HDBHES030834@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/gramps/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30815 Modified Files: gramps.spec Log Message: * Wed Aug 17 2005 Brian Pepple - 2.0.6-2 - Specify ver for python-reportlab. Index: gramps.spec =================================================================== RCS file: /cvs/extras/rpms/gramps/FC-4/gramps.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- gramps.spec 15 Aug 2005 19:34:31 -0000 1.10 +++ gramps.spec 17 Aug 2005 13:11:15 -0000 1.11 @@ -1,6 +1,6 @@ Name: gramps Version: 2.0.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Genealogical Research and Analysis Management Programming System Group: Applications/Productivity @@ -31,7 +31,7 @@ Requires: pygtk2-libglade Requires: python >= 2.3 Requires: rcs -Requires: python-reportlab +Requires: python-reportlab >= 1.20 Requires: graphviz Requires(post): scrollkeeper Requires(post): GConf2 @@ -112,6 +112,9 @@ %changelog +* Wed Aug 17 2005 Brian Pepple - 2.0.6-2 +- Specify ver for python-reportlab. + * Mon Aug 15 2005 Brian Pepple - 2.0.6-1 - Update to 2.0.6. - Bump minimum ver for python. From fedora-extras-commits at redhat.com Wed Aug 17 13:13:35 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Wed, 17 Aug 2005 09:13:35 -0400 Subject: rpms/gramps/devel gramps.spec,1.10,1.11 Message-ID: <200508171313.j7HDDZiu030921@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/gramps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30904 Modified Files: gramps.spec Log Message: * Wed Aug 17 2005 Brian Pepple - 2.0.6-3 - Specify ver for python-reportlab. Index: gramps.spec =================================================================== RCS file: /cvs/extras/rpms/gramps/devel/gramps.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- gramps.spec 15 Aug 2005 19:33:02 -0000 1.10 +++ gramps.spec 17 Aug 2005 13:13:33 -0000 1.11 @@ -1,6 +1,6 @@ Name: gramps Version: 2.0.6 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Genealogical Research and Analysis Management Programming System Group: Applications/Productivity @@ -31,7 +31,7 @@ Requires: pygtk2-libglade Requires: python >= 2.3 Requires: rcs -Requires: python-reportlab +Requires: python-reportlab >= 1.20 Requires: graphviz Requires(post): scrollkeeper Requires(post): GConf2 @@ -112,6 +112,9 @@ %changelog +* Wed Aug 17 2005 Brian Pepple - 2.0.6-3 +- Specify ver for python-reportlab. + * Mon Aug 15 2005 Brian Pepple - 2.0.6-2 - Update to 2.0.6. - Bump minimum ver for python. From fedora-extras-commits at redhat.com Wed Aug 17 13:19:10 2005 From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy)) Date: Wed, 17 Aug 2005 09:19:10 -0400 Subject: rpms/nedit/FC-4 nedit.spec,1.2,1.3 Message-ID: <200508171319.j7HDJAPL031024@cvs-int.fedora.redhat.com> Author: jnovy Update of /cvs/extras/rpms/nedit/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31007 Modified Files: nedit.spec Log Message: - spec cleanup - initial FC-4 Extras build Index: nedit.spec =================================================================== RCS file: /cvs/extras/rpms/nedit/FC-4/nedit.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- nedit.spec 27 Jul 2005 08:51:27 -0000 1.2 +++ nedit.spec 17 Aug 2005 13:19:08 -0000 1.3 @@ -1,11 +1,9 @@ %define desktop_file 1 -%if %{desktop_file} -%define desktop_file_utils_version 0.2.93 -%endif -Summary: A GUI text editor for systems with X and Motif. + +Summary: A GUI text editor for systems with X and Motif Name: nedit Version: 5.5 -Release: 4 +Release: 4.fc4 Source: http://nedit.org/ftp/v5_5/nedit-%{version}-src.tar.bz2 Source1: nedit.desktop Source2: nedit-icon.png @@ -15,12 +13,12 @@ Patch3: nedit-5.5-motif223.patch Patch4: nedit-5.5-varfix.patch URL: http://nedit.org -License: distributable +License: GPL Group: Applications/Editors BuildRoot: %{_tmppath}/%{name}-root BuildRequires: openmotif-devel >= 2.2.3 %if %{desktop_file} -BuildPrereq: desktop-file-utils >= %{desktop_file_utils_version} +BuildRequires: desktop-file-utils >= 0.2.93 %endif %description @@ -76,6 +74,10 @@ %endif %changelog +* Wed Aug 17 2005 Jindrich Novy 5.5-4.fc4 +- spec cleanup +- initial FC-4 Extras build + * Wed Jul 27 2005 Jindrich Novy 5.5-4 - initial Extras built From fedora-extras-commits at redhat.com Wed Aug 17 13:32:24 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Wed, 17 Aug 2005 09:32:24 -0400 Subject: rpms/scanssh - New directory Message-ID: <200508171332.j7HDWOgV031149@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/scanssh In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31129/scanssh Log Message: Directory /cvs/extras/rpms/scanssh added to the repository From fedora-extras-commits at redhat.com Wed Aug 17 13:32:25 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Wed, 17 Aug 2005 09:32:25 -0400 Subject: rpms/scanssh/devel - New directory Message-ID: <200508171332.j7HDWP6Z031154@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/scanssh/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31129/scanssh/devel Log Message: Directory /cvs/extras/rpms/scanssh/devel added to the repository From fedora-extras-commits at redhat.com Wed Aug 17 13:32:45 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Wed, 17 Aug 2005 09:32:45 -0400 Subject: rpms/scanssh Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200508171332.j7HDWjYa031201@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/scanssh In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31174 Added Files: Makefile import.log Log Message: Setup of module scanssh --- NEW FILE Makefile --- # Top level Makefile for module scanssh all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Wed Aug 17 13:32:46 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Wed, 17 Aug 2005 09:32:46 -0400 Subject: rpms/scanssh/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200508171332.j7HDWk0t031206@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/scanssh/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31174/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module scanssh --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Wed Aug 17 13:33:23 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Wed, 17 Aug 2005 09:33:23 -0400 Subject: rpms/scanssh import.log,1.1,1.2 Message-ID: <200508171333.j7HDXN1r031285@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/scanssh In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31253 Modified Files: import.log Log Message: auto-import scanssh-2.1-5 on branch devel from scanssh-2.1-5.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/scanssh/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 17 Aug 2005 13:32:43 -0000 1.1 +++ import.log 17 Aug 2005 13:33:21 -0000 1.2 @@ -0,0 +1 @@ +scanssh-2_1-5:HEAD:scanssh-2.1-5.src.rpm:1124285592 From fedora-extras-commits at redhat.com Wed Aug 17 13:33:23 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Wed, 17 Aug 2005 09:33:23 -0400 Subject: rpms/scanssh/devel scanssh-2.1-hide.patch, NONE, 1.1 scanssh.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200508171333.j7HDXNYw031294@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/scanssh/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31253/devel Modified Files: .cvsignore sources Added Files: scanssh-2.1-hide.patch scanssh.spec Log Message: auto-import scanssh-2.1-5 on branch devel from scanssh-2.1-5.src.rpm scanssh-2.1-hide.patch: --- NEW FILE scanssh-2.1-hide.patch --- --- scanssh-2.1/scanssh.h.hide 2005-06-20 15:34:47.000000000 +0200 +++ scanssh-2.1/scanssh.h 2005-06-20 15:35:21.000000000 +0200 @@ -28,8 +28,8 @@ #ifndef _SCANSSH_H_ #define _SCANSSH_H_ -#define SSHMAPVERSION "SSH-1.0-SSH_Version_Mapper\n" -#define SSHUSERAGENT "ScanSSH/2.0" +#define SSHMAPVERSION "SSH-1.99-OpenSSH_4.1\n" +#define SSHUSERAGENT "OpenSSH/4.1" #define MAXITER 10 #define LONGWAIT 50 #define SHORTWAIT 30 --- NEW FILE scanssh.spec --- Name: scanssh Summary: Fast SSH server and open proxy scanner Version: 2.1 Release: 5%{?dist} Group: Applications/Internet License: BSD URL: http://monkey.org/~provos/scanssh/ Source0: http://monkey.org/~provos/%{name}-%{version}.tar.gz Patch0: scanssh-2.1-hide.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libpcap, libevent-devel, libdnet-devel %description ScanSSH supports scanning a list of addresses and networks for open proxies, SSH protocol servers, Web and SMTP servers. Where possible ScanSSH, displays the version number of the running services. ScanSSH protocol scanner supports random selection of IP addresses from large network ranges and is useful for gathering statistics on the deployment of SSH protocol servers in a company or the Internet as whole. %prep %setup -q %{?_with_hidescan:%patch0 -p1} %build %configure %{__make} %{?_smp_mflags} CFLAGS="-Wall $RPM_OPT_FLAGS" %install rm -rf $RPM_BUILD_ROOT %{__make} install DESTDIR=$RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc README %{_bindir}/scanssh %{_mandir}/man1/scanssh* %changelog * Thu Aug 11 2005 Oliver Falk - 2.1-5 - Make hidescan patch not applied by default, use --define 'with_hidescan 1' if you want it enabled * Mon Aug 08 2005 Oliver Falk - 2.1-4 - Remove Requires, rpm will detect it automatically * Mon Aug 08 2005 Oliver Falk - 2.1-3 - Integrate changes suggested by Jos?? Pedro Oliveira after first FE review * Mon Jun 20 2005 Oliver Falk - 2.1-2 - Add patch to make us invisible/hide us. Don't let OpenSSH know that we scan it. * Tue Jun 07 2005 Oliver Falk - 2.1-1 - Initial build for FC 4 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/scanssh/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 17 Aug 2005 13:32:44 -0000 1.1 +++ .cvsignore 17 Aug 2005 13:33:21 -0000 1.2 @@ -0,0 +1 @@ +scanssh-2.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/scanssh/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 17 Aug 2005 13:32:44 -0000 1.1 +++ sources 17 Aug 2005 13:33:21 -0000 1.2 @@ -0,0 +1 @@ +9fab4253b56b2d15367d4872b370cdcb scanssh-2.1.tar.gz From fedora-extras-commits at redhat.com Wed Aug 17 14:01:07 2005 From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields)) Date: Wed, 17 Aug 2005 10:01:07 -0400 Subject: rpms/nautilus-open-terminal/devel nautilus-open-terminal.spec, 1.2, 1.3 Message-ID: <200508171401.j7HE1cgD000340@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/extras/rpms/nautilus-open-terminal/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv307 Modified Files: nautilus-open-terminal.spec Log Message: Rebuild against new cairo, release 0.4-6 Index: nautilus-open-terminal.spec =================================================================== RCS file: /cvs/extras/rpms/nautilus-open-terminal/devel/nautilus-open-terminal.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- nautilus-open-terminal.spec 17 Jul 2005 18:00:56 -0000 1.2 +++ nautilus-open-terminal.spec 17 Aug 2005 14:01:05 -0000 1.3 @@ -1,6 +1,6 @@ Name: nautilus-open-terminal Version: 0.4 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Nautilus extension for an open terminal shortcut Group: User Interface/Desktops @@ -47,6 +47,9 @@ %{_libdir}/nautilus/extensions-1.0/*.so* %changelog +* Wed Aug 17 2005 Paul W. Frields - 0.4-6 +- Rebuild against new cairo + * Sun Jul 17 2005 Paul W. Frields - 0.4-5 - Add libtoolize to fix multilib problem (#163463) From fedora-extras-commits at redhat.com Wed Aug 17 14:08:25 2005 From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields)) Date: Wed, 17 Aug 2005 10:08:25 -0400 Subject: common tobuild,1.2207,1.2208 Message-ID: <200508171408.j7HE8Pjx000449@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv432 Modified Files: tobuild Log Message: request build of rpms/nautilus-open-terminal/devel nautilus-open-terminal-0_4-6_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2207 retrieving revision 1.2208 diff -u -r1.2207 -r1.2208 --- tobuild 17 Aug 2005 11:36:06 -0000 1.2207 +++ tobuild 17 Aug 2005 14:08:23 -0000 1.2208 @@ -35,3 +35,4 @@ gemi rpms/plt-scheme/devel plt-scheme-299_200-1_fc5 devel jnovy rpms/cproto/devel cproto-4_7c-7 devel joost rpms/fpc/FC-3 fpc-2_0_0-1 fc3 +pfrields rpms/nautilus-open-terminal/devel nautilus-open-terminal-0_4-6_fc5 devel From fedora-extras-commits at redhat.com Wed Aug 17 14:12:13 2005 From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields)) Date: Wed, 17 Aug 2005 10:12:13 -0400 Subject: common tobuild,1.2208,1.2209 Message-ID: <200508171412.j7HECD1L000481@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv464/common Modified Files: tobuild Log Message: Silly rabbit, use plague Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2208 retrieving revision 1.2209 diff -u -r1.2208 -r1.2209 --- tobuild 17 Aug 2005 14:08:23 -0000 1.2208 +++ tobuild 17 Aug 2005 14:12:11 -0000 1.2209 @@ -35,4 +35,3 @@ gemi rpms/plt-scheme/devel plt-scheme-299_200-1_fc5 devel jnovy rpms/cproto/devel cproto-4_7c-7 devel joost rpms/fpc/FC-3 fpc-2_0_0-1 fc3 -pfrields rpms/nautilus-open-terminal/devel nautilus-open-terminal-0_4-6_fc5 devel From fedora-extras-commits at redhat.com Wed Aug 17 14:18:01 2005 From: fedora-extras-commits at redhat.com (Joost van der Sluis (joost)) Date: Wed, 17 Aug 2005 10:18:01 -0400 Subject: rpms/fpc/devel .cvsignore,1.2,1.3 fpc.spec,1.1,1.2 sources,1.2,1.3 Message-ID: <200508171418.j7HEI1Ti000529@cvs-int.fedora.redhat.com> Author: joost Update of /cvs/extras/rpms/fpc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv507 Modified Files: .cvsignore fpc.spec sources Log Message: - Fixed problems with POWER5 processor Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fpc/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 5 Aug 2005 15:15:37 -0000 1.2 +++ .cvsignore 17 Aug 2005 14:17:59 -0000 1.3 @@ -1,2 +1,3 @@ fpc-2.0.0.compiler.bin.tar.gz fpc-2.0.0.source.tar.gz +fpc-2.0.0-G5.patch Index: fpc.spec =================================================================== RCS file: /cvs/extras/rpms/fpc/devel/fpc.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- fpc.spec 5 Aug 2005 15:15:37 -0000 1.1 +++ fpc.spec 17 Aug 2005 14:17:59 -0000 1.2 @@ -1,6 +1,6 @@ Name: fpc Version: 2.0.0 -Release: 1 +Release: 2 Summary: Free Pascal Compiler Group: Development/Languages @@ -8,6 +8,7 @@ URL: http://www.freepascal.org/ Source0: ftp://ftp.freepascal.org/pub/fpc/dist/source-%{version}/%{name}-%{version}.source.tar.gz Source1: http://www.cnoc.nl/fpc/%{name}-%{version}.compiler.bin.tar.gz +Patch0: %{name}-%{version}-G5.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: gpm, glibc, ncurses, binutils @@ -54,6 +55,7 @@ %prep %setup -q -a1 -n %{name} +%patch0 %build # The source-files: @@ -156,6 +158,10 @@ %{_datadir}/fpcsrc %changelog +* Wed Aug 17 2005 Joost van der Sluis 2.0.0-2 +- Added a patch for compilation on POWER5, and provided + the new ppcppc binary/startcompiler + * Fri Aug 5 2005 Joost van der Sluis 2.0.0-1 - Removed gpm-devel requirement - Fixed a type in the -src description Index: sources =================================================================== RCS file: /cvs/extras/rpms/fpc/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 5 Aug 2005 15:15:37 -0000 1.2 +++ sources 17 Aug 2005 14:17:59 -0000 1.3 @@ -1,2 +1,3 @@ -db9a94a468bdc5f1067f2803818f5b2b fpc-2.0.0.compiler.bin.tar.gz +30de6e4d22949f53459a52e5f2b23799 fpc-2.0.0.compiler.bin.tar.gz 3f9c64d0146a3631f6963fd7477776d1 fpc-2.0.0.source.tar.gz +70d0dda3414db0991b1bf5742d1a01c1 fpc-2.0.0-G5.patch From fedora-extras-commits at redhat.com Wed Aug 17 14:58:14 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Wed, 17 Aug 2005 10:58:14 -0400 Subject: rpms/perl-Sort-Versions - New directory Message-ID: <200508171458.j7HEwEjL003660@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Sort-Versions In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3635/perl-Sort-Versions Log Message: Directory /cvs/extras/rpms/perl-Sort-Versions added to the repository From fedora-extras-commits at redhat.com Wed Aug 17 14:58:15 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Wed, 17 Aug 2005 10:58:15 -0400 Subject: rpms/perl-Sort-Versions/devel - New directory Message-ID: <200508171458.j7HEwFlq003667@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Sort-Versions/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3635/perl-Sort-Versions/devel Log Message: Directory /cvs/extras/rpms/perl-Sort-Versions/devel added to the repository From fedora-extras-commits at redhat.com Wed Aug 17 14:58:41 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Wed, 17 Aug 2005 10:58:41 -0400 Subject: rpms/perl-Sort-Versions Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200508171458.j7HEwfpc003748@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Sort-Versions In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3713 Added Files: Makefile import.log Log Message: Setup of module perl-Sort-Versions --- NEW FILE Makefile --- # Top level Makefile for module perl-Sort-Versions all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Wed Aug 17 14:58:41 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Wed, 17 Aug 2005 10:58:41 -0400 Subject: rpms/perl-Sort-Versions/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200508171458.j7HEwffm003753@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Sort-Versions/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3713/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Sort-Versions --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Wed Aug 17 14:59:41 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Wed, 17 Aug 2005 10:59:41 -0400 Subject: rpms/perl-Sort-Versions import.log,1.1,1.2 Message-ID: <200508171459.j7HExff2003878@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Sort-Versions In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3847 Modified Files: import.log Log Message: auto-import perl-Sort-Versions-1.5-2 on branch devel from perl-Sort-Versions-1.5-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Sort-Versions/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 17 Aug 2005 14:58:39 -0000 1.1 +++ import.log 17 Aug 2005 14:59:39 -0000 1.2 @@ -0,0 +1 @@ +perl-Sort-Versions-1_5-2:HEAD:perl-Sort-Versions-1.5-2.src.rpm:1124290763 From fedora-extras-commits at redhat.com Wed Aug 17 14:59:42 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Wed, 17 Aug 2005 10:59:42 -0400 Subject: rpms/perl-Sort-Versions/devel perl-Sort-Versions.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200508171459.j7HExg23003885@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Sort-Versions/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3847/devel Modified Files: .cvsignore sources Added Files: perl-Sort-Versions.spec Log Message: auto-import perl-Sort-Versions-1.5-2 on branch devel from perl-Sort-Versions-1.5-2.src.rpm --- NEW FILE perl-Sort-Versions.spec --- Name: perl-Sort-Versions Version: 1.5 Release: 2%{?dist} Summary: Perl module for sorting of revision-like numbers License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Sort-Versions/ Source0: http://www.cpan.org/modules/by-module/Sort/Sort-Versions-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description A perl 5 module for sorting of revision-like numbers Sort::Versions allows easy sorting of mixed non-numeric and numeric strings, like the 'version numbers' that many shared library systems and revision control packages use. This is quite useful if you are trying to deal with shared libraries. It can also be applied to applications that intersperse variable-width numeric fields within text. Other applications can undoubtedly be found. %prep %setup -q -n Sort-Versions-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type f -name '*.bs' -a -size 0 -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %clean rm -rf $RPM_BUILD_ROOT %check make test %files %defattr(-,root,root,-) %doc Changes %{perl_vendorlib}/Sort %{_mandir}/man3/* %changelog * Wed Aug 10 2005 Ralf Corsepius - 1.5-2 - FE re-submission. * Fri Jul 01 2005 Ralf Corsepius - 1.5-1 - FE submission. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Sort-Versions/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 17 Aug 2005 14:58:39 -0000 1.1 +++ .cvsignore 17 Aug 2005 14:59:40 -0000 1.2 @@ -0,0 +1 @@ +Sort-Versions-1.5.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Sort-Versions/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 17 Aug 2005 14:58:39 -0000 1.1 +++ sources 17 Aug 2005 14:59:40 -0000 1.2 @@ -0,0 +1 @@ +5434f948fdea6406851c77bebbd0ed19 Sort-Versions-1.5.tar.gz From fedora-extras-commits at redhat.com Wed Aug 17 15:01:02 2005 From: fedora-extras-commits at redhat.com (Joost van der Sluis (joost)) Date: Wed, 17 Aug 2005 11:01:02 -0400 Subject: rpms/fpc/devel fpc.spec,1.2,1.3 sources,1.3,1.4 Message-ID: <200508171501.j7HF12EH005103@cvs-int.fedora.redhat.com> Author: joost Update of /cvs/extras/rpms/fpc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3937 Modified Files: fpc.spec sources Log Message: * Wed Aug 17 2005 Joost van der Sluis 2.0.0-3 - replaced the ppcpcc-2.1.1 startcompilercompiler for the ppcppc-2.0.0 startcompiler Index: fpc.spec =================================================================== RCS file: /cvs/extras/rpms/fpc/devel/fpc.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- fpc.spec 17 Aug 2005 14:17:59 -0000 1.2 +++ fpc.spec 17 Aug 2005 15:01:01 -0000 1.3 @@ -1,6 +1,6 @@ Name: fpc Version: 2.0.0 -Release: 2 +Release: 3 Summary: Free Pascal Compiler Group: Development/Languages @@ -158,6 +158,10 @@ %{_datadir}/fpcsrc %changelog +* Wed Aug 17 2005 Joost van der Sluis 2.0.0-3 +- replaced the ppcpcc-2.1.1 startcompilercompiler for the + ppcppc-2.0.0 startcompiler + * Wed Aug 17 2005 Joost van der Sluis 2.0.0-2 - Added a patch for compilation on POWER5, and provided the new ppcppc binary/startcompiler Index: sources =================================================================== RCS file: /cvs/extras/rpms/fpc/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 17 Aug 2005 14:17:59 -0000 1.3 +++ sources 17 Aug 2005 15:01:01 -0000 1.4 @@ -1,3 +1,3 @@ -30de6e4d22949f53459a52e5f2b23799 fpc-2.0.0.compiler.bin.tar.gz +fd5730c59bb5a87e5828568b7d039cb5 fpc-2.0.0.compiler.bin.tar.gz 3f9c64d0146a3631f6963fd7477776d1 fpc-2.0.0.source.tar.gz 70d0dda3414db0991b1bf5742d1a01c1 fpc-2.0.0-G5.patch From fedora-extras-commits at redhat.com Wed Aug 17 15:02:48 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Wed, 17 Aug 2005 11:02:48 -0400 Subject: rpms/perl-Sort-Versions/devel perl-Sort-Versions.spec,1.1,1.2 Message-ID: <200508171503.j7HF3UZC005170@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Sort-Versions/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5153 Modified Files: perl-Sort-Versions.spec Log Message: Spec cleanup Index: perl-Sort-Versions.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Sort-Versions/devel/perl-Sort-Versions.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Sort-Versions.spec 17 Aug 2005 14:59:40 -0000 1.1 +++ perl-Sort-Versions.spec 17 Aug 2005 15:02:42 -0000 1.2 @@ -1,6 +1,6 @@ Name: perl-Sort-Versions Version: 1.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Perl module for sorting of revision-like numbers License: GPL or Artistic Group: Development/Libraries @@ -9,7 +9,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: perl Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -33,7 +32,6 @@ rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' -find $RPM_BUILD_ROOT -type f -name '*.bs' -a -size 0 -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* @@ -50,6 +48,9 @@ %{_mandir}/man3/* %changelog +* Wed Aug 17 2005 Ralf Corsepius - 1.5-3 +- Spec cleanup. + * Wed Aug 10 2005 Ralf Corsepius - 1.5-2 - FE re-submission. From fedora-extras-commits at redhat.com Wed Aug 17 15:55:27 2005 From: fedora-extras-commits at redhat.com (Joost van der Sluis (joost)) Date: Wed, 17 Aug 2005 11:55:27 -0400 Subject: rpms/fpc/devel fpc-2.0.0-G5.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 sources, 1.4, 1.5 Message-ID: <200508171555.j7HFtRqC005435@cvs-int.fedora.redhat.com> Author: joost Update of /cvs/extras/rpms/fpc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5358/devel Modified Files: .cvsignore sources Added Files: fpc-2.0.0-G5.patch Log Message: - Merged changes from devel to FC-4, FC-3 and FC-2 - placed fpc-2.0.0-G5.patch into the cvs fpc-2.0.0-G5.patch: --- NEW FILE fpc-2.0.0-G5.patch --- Index: rtl/powerpc/powerpc.inc =================================================================== --- rtl/powerpc/powerpc.inc (revision 830) +++ rtl/powerpc/powerpc.inc (working copy) @@ -203,374 +203,7 @@ end; {$endif MACOS} -{**************************************************************************** - Move / Fill -****************************************************************************} -{$ifndef FPC_SYSTEM_HAS_MOVE} -{$define FPC_SYSTEM_HAS_MOVE} -procedure Move(const source;var dest;count:longint);[public, alias: 'FPC_MOVE'];assembler; nostackframe; -asm - { count <= 0 ? } - cmpwi cr0,r5,0 - { check if we have to do the move backwards because of overlap } - sub r10,r4,r3 - { carry := boolean(dest-source < count) = boolean(overlap) } - subc r10,r10,r5 - - { count < 15 ? (to decide whether we will move dwords or bytes } - cmpwi cr1,r5,15 - - { if overlap, then r10 := -1 else r10 := 0 } - subfe r10,r10,r10 - - { count < 63 ? (32 + max. alignment (31) } - cmpwi cr7,r5,63 - - { if count <= 0, stop } - ble cr0,.LMoveDone - - { load the begin of the source in the data cache } - dcbt 0,r3 - { and the dest as well } - dcbtst 0,r4 - - { if overlap, then r0 := count else r0 := 0 } - and r0,r5,r10 - { if overlap, then point source and dest to the end } - add r3,r3,r0 - add r4,r4,r0 - { if overlap, then r6 := 0, else r6 := -1 } - not r6,r10 - { if overlap, then r10 := -2, else r10 := 0 } - slwi r10,r10,1 - { if overlap, then r10 := -1, else r10 := 1 } - addi r10,r10,1 - - { if count < 15, copy everything byte by byte } - blt cr1,.LMoveBytes - - { if no overlap, then source/dest += -1, otherwise they stay } - { After the next instruction, r3/r4 + r10 = next position to } - { load/store from/to } - add r3,r3,r6 - add r4,r4,r6 - - { otherwise, guarantee 4 byte alignment for dest for starters } -.LMove4ByteAlignLoop: - lbzux r0,r3,r10 - stbux r0,r4,r10 - { is dest now 4 aligned? } - andi. r0,r4,3 - subi r5,r5,1 - { while not aligned, continue } - bne cr0,.LMove4ByteAlignLoop - -{$ifndef ppc603} - { check for 32 byte alignment } - andi. r7,r4,31 -{$endif non ppc603} - { we are going to copy one byte again (the one at the newly } - { aligned address), so increase count byte 1 } - addi r5,r5,1 - { count div 4 for number of dwords to copy } - srwi r0,r5,2 - { if 11 <= count < 63, copy using dwords } - blt cr7,.LMoveDWords - -{$ifndef ppc603} - { # of dwords to copy to reach 32 byte alignment (*4) } - { (depends on forward/backward copy) } - - { if forward copy, r6 = -1 -> r8 := 32 } - { if backward copy, r6 = 0 -> r8 := 0 } - rlwinm r8,r6,0,31-6+1,31-6+1 - { if forward copy, we have to copy 32 - unaligned count bytes } - { if backward copy unaligned count bytes } - sub r7,r8,r7 - { if backward copy, the calculated value is now negate -> } - { make it positive again } - not r8, r6 - add r7, r7, r8 - xor r7, r7, r8 -{$endif not ppc603} - - { multiply the update count with 4 } - slwi r10,r10,2 - slwi r6,r6,2 - { and adapt the source and dest } - add r3,r3,r6 - add r4,r4,r6 - -{$ifndef ppc603} - beq cr0,.LMove32BytesAligned -.L32BytesAlignMoveLoop: - { count >= 39 -> align to 8 byte boundary and then use the FPU } - { since we're already at 4 byte alignment, use dword store } - subic. r7,r7,4 - lwzux r0,r3,r10 - subi r5,r5,4 - stwux r0,r4,r10 - bne .L32BytesAlignMoveLoop - -.LMove32BytesAligned: - { count div 32 ( >= 1, since count was >=63 } - srwi r0,r5,5 - { remainder } - andi. r5,r5,31 - { to decide if we will do some dword stores (instead of only } - { byte stores) afterwards or not } -{$else not ppc603} - srwi r0,r5,4 - andi. r5,r5,15 -{$endif not ppc603} - cmpwi cr1,r5,11 - mtctr r0 - - { r0 := count div 4, will be moved to ctr when copying dwords } - srwi r0,r5,2 - -{$ifndef ppc603} - { adjust the update count: it will now be 8 or -8 depending on overlap } - slwi r10,r10,1 - - { adjust source and dest pointers: because of the above loop, dest is now } - { aligned to 8 bytes. So if we add r6 we will still have an 8 bytes } - { aligned address) } - add r3,r3,r6 - add r4,r4,r6 - - slwi r6,r6,1 - - { the dcbz offset must give a 32 byte aligned address when added } - { to the current dest address and its address must point to the } - { bytes that will be overwritten in the current iteration. In case } - { of a forward loop, the dest address has currently an offset of } - { -8 compared to the bytes that will be overwritten (and r6 = -8). } - { In case of a backward of a loop, the dest address currently has } - { an offset of +32 compared to the bytes that will be overwritten } - { (and r6 = 0). So the forward dcbz offset must become +8 and the } - { backward -32 -> (-r6 * 5) - 32 gives the correct offset } - slwi r7,r6,2 - add r7,r7,r6 - neg r7,r7 - subi r7,r7,32 - -.LMove32ByteDcbz: - lfdux f0,r3,r10 - lfdux f1,r3,r10 - lfdux f2,r3,r10 - lfdux f3,r3,r10 - { must be done only now, in case source and dest are less than } - { 32 bytes apart! } - dcbz r4,r7 - stfdux f0,r4,r10 - stfdux f1,r4,r10 - stfdux f2,r4,r10 - stfdux f3,r4,r10 - bdnz .LMove32ByteDcbz -.LMove32ByteLoopDone: -{$else not ppc603} -.LMove16ByteLoop: - lwzux r11,r3,r10 - lwzux r7,r3,r10 - lwzux r8,r3,r10 - lwzux r9,r3,r10 - stwux r11,r4,r10 - stwux r7,r4,r10 - stwux r8,r4,r10 - stwux r9,r4,r10 - bdnz .LMove16ByteLoop -{$endif not ppc603} - - { cr0*4+eq is true if "count and 31" = 0 } - beq cr0,.LMoveDone - - { make r10 again -1 or 1, but first adjust source/dest pointers } - sub r3,r3,r6 - sub r4,r4,r6 -{$ifndef ppc603} - srawi r10,r10,3 - srawi r6,r6,3 -{$else not ppc603} - srawi r10,r10,2 - srawi r6,r6,2 -{$endif not ppc603} - - { cr1 contains whether count <= 11 } - ble cr1,.LMoveBytes - -.LMoveDWords: - mtctr r0 - andi. r5,r5,3 - { r10 * 4 } - slwi r10,r10,2 - slwi r6,r6,2 - add r3,r3,r6 - add r4,r4,r6 - -.LMoveDWordsLoop: - lwzux r0,r3,r10 - stwux r0,r4,r10 - bdnz .LMoveDWordsLoop - - beq cr0,.LMoveDone - { make r10 again -1 or 1 } - sub r3,r3,r6 - sub r4,r4,r6 - srawi r10,r10,2 - srawi r6,r6,2 -.LMoveBytes: - add r3,r3,r6 - add r4,r4,r6 - mtctr r5 -.LMoveBytesLoop: - lbzux r0,r3,r10 - stbux r0,r4,r10 - bdnz .LMoveBytesLoop -.LMoveDone: -end; -{$endif FPC_SYSTEM_HAS_MOVE} - - -{$ifndef FPC_SYSTEM_HAS_FILLCHAR} -{$define FPC_SYSTEM_HAS_FILLCHAR} - -Procedure FillChar(var x;count:longint;value:byte);assembler; -{ input: x in r3, count in r4, value in r5 } - -{$ifndef FPC_ABI_AIX} -{ in the AIX ABI, we can use te red zone for temp storage, otherwise we have } -{ to explicitely allocate room } -var - temp : packed record - case byte of - 0: (l1,l2: longint); - 1: (d: double); - end; -{$endif FPC_ABI_AIX} -asm - { no bytes? } - cmpwi cr6,r4,0 - { less than 15 bytes? } - cmpwi cr7,r4,15 - { less than 64 bytes? } - cmpwi cr1,r4,64 - { fill r5 with ValueValueValueValue } - rlwimi r5,r5,8,16,23 - { setup for aligning x to multiple of 4} - rlwinm r10,r3,0,31-2+1,31 - rlwimi r5,r5,16,0,15 - ble cr6,.LFillCharDone - { get the start of the data in the cache (and mark it as "will be } - { modified") } - dcbtst 0,r3 - subfic r10,r10,4 - blt cr7,.LFillCharVerySmall - { just store 4 bytes instead of using a loop to align (there are } - { plenty of other instructions now to keep the processor busy } - { while it handles the (possibly unaligned) store) } - stw r5,0(r3) - { r3 := align(r3,4) } - add r3,r3,r10 - { decrease count with number of bytes already stored } - sub r4,r4,r10 - blt cr1,.LFillCharSmall - { if we have to fill with 0 (which happens a lot), we can simply use } - { dcbz for the most part, which is very fast, so make a special case } - { for that } - cmplwi cr1,r5,0 - { align to a multiple of 32 (and immediately check whether we aren't } - { already 32 byte aligned) } - rlwinm. r10,r3,0,31-5+1,31 - { setup r3 for using update forms of store instructions } - subi r3,r3,4 - { get number of bytes to store } - subfic r10,r10,32 - { if already 32byte aligned, skip align loop } - beq .L32ByteAlignLoopDone - { substract from the total count } - sub r4,r4,r10 -.L32ByteAlignLoop: - { we were already aligned to 4 byres, so this will count down to } - { exactly 0 } - subic. r10,r10,4 - stwu r5,4(r3) - bne .L32ByteAlignLoop -.L32ByteAlignLoopDone: - { get the amount of 32 byte blocks } - srwi r10,r4,5 - { and keep the rest in r4 (recording whether there is any rest) } - rlwinm. r4,r4,0,31-5+1,31 - { move to ctr } - mtctr r10 - { check how many rest there is (to decide whether we'll use } - { FillCharSmall or FillCharVerySmall) } - cmplwi cr7,r4,11 - { if filling with zero, only use dcbz } - bne cr1, .LFillCharNoZero - { make r3 point again to the actual store position } - addi r3,r3,4 -.LFillCharDCBZLoop: - dcbz 0,r3 - addi r3,r3,32 - bdnz .LFillCharDCBZLoop - { if there was no rest, we're finished } - beq .LFillCharDone - b .LFillCharVerySmall -.LFillCharNoZero: -{$ifdef FPC_ABI_AIX} - stw r5,-4(r1) - stw r5,-8(r1) - lfd f0,-8(r1) -{$else FPC_ABI_AIX} - stw r5,temp - stw r5,temp+4 - lfd f0,temp -{$endif FPC_ABI_AIX} - { make r3 point to address-8, so we're able to use fp double stores } - { with update (it's already -4 now) } - subi r3,r3,4 - { load r10 with 8, so that dcbz uses the correct address } - li r10, 8 -.LFillChar32ByteLoop: - dcbz r3,r10 - stfdu f0,8(r3) - stfdu f0,8(r3) - stfdu f0,8(r3) - stfdu f0,8(r3) - bdnz .LFillChar32ByteLoop - { if there was no rest, we're finished } - beq .LFillCharDone - { make r3 point again to the actual next byte that must be written } - addi r3,r3,8 - b .LFillCharVerySmall -.LFillCharSmall: - { when we arrive here, we're already 4 byte aligned } - { get count div 4 to store dwords } - srwi r10,r4,2 - { get ready for use of update stores } - subi r3,r3,4 - mtctr r10 - rlwinm. r4,r4,0,31-2+1,31 -.LFillCharSmallLoop: - stwu r5,4(r3) - bdnz .LFillCharSmallLoop - { if nothing left, stop } - beq .LFillCharDone - { get ready to store bytes } - addi r3,r3,4 -.LFillCharVerySmall: - mtctr r4 - subi r3,r3,1 -.LFillCharVerySmallLoop: - stbu r5,1(r3) - bdnz .LFillCharVerySmallLoop -.LFillCharDone: -end; -{$endif FPC_SYSTEM_HAS_FILLCHAR} - - {$ifndef FPC_SYSTEM_HAS_FILLDWORD} {$define FPC_SYSTEM_HAS_FILLDWORD} procedure filldword(var x;count : longint;value : dword); Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fpc/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 17 Aug 2005 14:17:59 -0000 1.3 +++ .cvsignore 17 Aug 2005 15:55:24 -0000 1.4 @@ -1,3 +1,2 @@ fpc-2.0.0.compiler.bin.tar.gz fpc-2.0.0.source.tar.gz -fpc-2.0.0-G5.patch Index: sources =================================================================== RCS file: /cvs/extras/rpms/fpc/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 17 Aug 2005 15:01:01 -0000 1.4 +++ sources 17 Aug 2005 15:55:24 -0000 1.5 @@ -1,3 +1,2 @@ fd5730c59bb5a87e5828568b7d039cb5 fpc-2.0.0.compiler.bin.tar.gz 3f9c64d0146a3631f6963fd7477776d1 fpc-2.0.0.source.tar.gz -70d0dda3414db0991b1bf5742d1a01c1 fpc-2.0.0-G5.patch From fedora-extras-commits at redhat.com Wed Aug 17 15:55:20 2005 From: fedora-extras-commits at redhat.com (Joost van der Sluis (joost)) Date: Wed, 17 Aug 2005 11:55:20 -0400 Subject: rpms/fpc/FC-2 fpc-2.0.0-G5.patch, NONE, 1.1 fpc.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200508171555.j7HFtKtG005391@cvs-int.fedora.redhat.com> Author: joost Update of /cvs/extras/rpms/fpc/FC-2 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5358/FC-2 Modified Files: fpc.spec sources Added Files: fpc-2.0.0-G5.patch Log Message: - Merged changes from devel to FC-4, FC-3 and FC-2 - placed fpc-2.0.0-G5.patch into the cvs fpc-2.0.0-G5.patch: --- NEW FILE fpc-2.0.0-G5.patch --- Index: rtl/powerpc/powerpc.inc =================================================================== --- rtl/powerpc/powerpc.inc (revision 830) +++ rtl/powerpc/powerpc.inc (working copy) @@ -203,374 +203,7 @@ end; {$endif MACOS} -{**************************************************************************** - Move / Fill -****************************************************************************} -{$ifndef FPC_SYSTEM_HAS_MOVE} -{$define FPC_SYSTEM_HAS_MOVE} -procedure Move(const source;var dest;count:longint);[public, alias: 'FPC_MOVE'];assembler; nostackframe; -asm - { count <= 0 ? } - cmpwi cr0,r5,0 - { check if we have to do the move backwards because of overlap } - sub r10,r4,r3 - { carry := boolean(dest-source < count) = boolean(overlap) } - subc r10,r10,r5 - - { count < 15 ? (to decide whether we will move dwords or bytes } - cmpwi cr1,r5,15 - - { if overlap, then r10 := -1 else r10 := 0 } - subfe r10,r10,r10 - - { count < 63 ? (32 + max. alignment (31) } - cmpwi cr7,r5,63 - - { if count <= 0, stop } - ble cr0,.LMoveDone - - { load the begin of the source in the data cache } - dcbt 0,r3 - { and the dest as well } - dcbtst 0,r4 - - { if overlap, then r0 := count else r0 := 0 } - and r0,r5,r10 - { if overlap, then point source and dest to the end } - add r3,r3,r0 - add r4,r4,r0 - { if overlap, then r6 := 0, else r6 := -1 } - not r6,r10 - { if overlap, then r10 := -2, else r10 := 0 } - slwi r10,r10,1 - { if overlap, then r10 := -1, else r10 := 1 } - addi r10,r10,1 - - { if count < 15, copy everything byte by byte } - blt cr1,.LMoveBytes - - { if no overlap, then source/dest += -1, otherwise they stay } - { After the next instruction, r3/r4 + r10 = next position to } - { load/store from/to } - add r3,r3,r6 - add r4,r4,r6 - - { otherwise, guarantee 4 byte alignment for dest for starters } -.LMove4ByteAlignLoop: - lbzux r0,r3,r10 - stbux r0,r4,r10 - { is dest now 4 aligned? } - andi. r0,r4,3 - subi r5,r5,1 - { while not aligned, continue } - bne cr0,.LMove4ByteAlignLoop - -{$ifndef ppc603} - { check for 32 byte alignment } - andi. r7,r4,31 -{$endif non ppc603} - { we are going to copy one byte again (the one at the newly } - { aligned address), so increase count byte 1 } - addi r5,r5,1 - { count div 4 for number of dwords to copy } - srwi r0,r5,2 - { if 11 <= count < 63, copy using dwords } - blt cr7,.LMoveDWords - -{$ifndef ppc603} - { # of dwords to copy to reach 32 byte alignment (*4) } - { (depends on forward/backward copy) } - - { if forward copy, r6 = -1 -> r8 := 32 } - { if backward copy, r6 = 0 -> r8 := 0 } - rlwinm r8,r6,0,31-6+1,31-6+1 - { if forward copy, we have to copy 32 - unaligned count bytes } - { if backward copy unaligned count bytes } - sub r7,r8,r7 - { if backward copy, the calculated value is now negate -> } - { make it positive again } - not r8, r6 - add r7, r7, r8 - xor r7, r7, r8 -{$endif not ppc603} - - { multiply the update count with 4 } - slwi r10,r10,2 - slwi r6,r6,2 - { and adapt the source and dest } - add r3,r3,r6 - add r4,r4,r6 - -{$ifndef ppc603} - beq cr0,.LMove32BytesAligned -.L32BytesAlignMoveLoop: - { count >= 39 -> align to 8 byte boundary and then use the FPU } - { since we're already at 4 byte alignment, use dword store } - subic. r7,r7,4 - lwzux r0,r3,r10 - subi r5,r5,4 - stwux r0,r4,r10 - bne .L32BytesAlignMoveLoop - -.LMove32BytesAligned: - { count div 32 ( >= 1, since count was >=63 } - srwi r0,r5,5 - { remainder } - andi. r5,r5,31 - { to decide if we will do some dword stores (instead of only } - { byte stores) afterwards or not } -{$else not ppc603} - srwi r0,r5,4 - andi. r5,r5,15 -{$endif not ppc603} - cmpwi cr1,r5,11 - mtctr r0 - - { r0 := count div 4, will be moved to ctr when copying dwords } - srwi r0,r5,2 - -{$ifndef ppc603} - { adjust the update count: it will now be 8 or -8 depending on overlap } - slwi r10,r10,1 - - { adjust source and dest pointers: because of the above loop, dest is now } - { aligned to 8 bytes. So if we add r6 we will still have an 8 bytes } - { aligned address) } - add r3,r3,r6 - add r4,r4,r6 - - slwi r6,r6,1 - - { the dcbz offset must give a 32 byte aligned address when added } - { to the current dest address and its address must point to the } - { bytes that will be overwritten in the current iteration. In case } - { of a forward loop, the dest address has currently an offset of } - { -8 compared to the bytes that will be overwritten (and r6 = -8). } - { In case of a backward of a loop, the dest address currently has } - { an offset of +32 compared to the bytes that will be overwritten } - { (and r6 = 0). So the forward dcbz offset must become +8 and the } - { backward -32 -> (-r6 * 5) - 32 gives the correct offset } - slwi r7,r6,2 - add r7,r7,r6 - neg r7,r7 - subi r7,r7,32 - -.LMove32ByteDcbz: - lfdux f0,r3,r10 - lfdux f1,r3,r10 - lfdux f2,r3,r10 - lfdux f3,r3,r10 - { must be done only now, in case source and dest are less than } - { 32 bytes apart! } - dcbz r4,r7 - stfdux f0,r4,r10 - stfdux f1,r4,r10 - stfdux f2,r4,r10 - stfdux f3,r4,r10 - bdnz .LMove32ByteDcbz -.LMove32ByteLoopDone: -{$else not ppc603} -.LMove16ByteLoop: - lwzux r11,r3,r10 - lwzux r7,r3,r10 - lwzux r8,r3,r10 - lwzux r9,r3,r10 - stwux r11,r4,r10 - stwux r7,r4,r10 - stwux r8,r4,r10 - stwux r9,r4,r10 - bdnz .LMove16ByteLoop -{$endif not ppc603} - - { cr0*4+eq is true if "count and 31" = 0 } - beq cr0,.LMoveDone - - { make r10 again -1 or 1, but first adjust source/dest pointers } - sub r3,r3,r6 - sub r4,r4,r6 -{$ifndef ppc603} - srawi r10,r10,3 - srawi r6,r6,3 -{$else not ppc603} - srawi r10,r10,2 - srawi r6,r6,2 -{$endif not ppc603} - - { cr1 contains whether count <= 11 } - ble cr1,.LMoveBytes - -.LMoveDWords: - mtctr r0 - andi. r5,r5,3 - { r10 * 4 } - slwi r10,r10,2 - slwi r6,r6,2 - add r3,r3,r6 - add r4,r4,r6 - -.LMoveDWordsLoop: - lwzux r0,r3,r10 - stwux r0,r4,r10 - bdnz .LMoveDWordsLoop - - beq cr0,.LMoveDone - { make r10 again -1 or 1 } - sub r3,r3,r6 - sub r4,r4,r6 - srawi r10,r10,2 - srawi r6,r6,2 -.LMoveBytes: - add r3,r3,r6 - add r4,r4,r6 - mtctr r5 -.LMoveBytesLoop: - lbzux r0,r3,r10 - stbux r0,r4,r10 - bdnz .LMoveBytesLoop -.LMoveDone: -end; -{$endif FPC_SYSTEM_HAS_MOVE} - - -{$ifndef FPC_SYSTEM_HAS_FILLCHAR} -{$define FPC_SYSTEM_HAS_FILLCHAR} - -Procedure FillChar(var x;count:longint;value:byte);assembler; -{ input: x in r3, count in r4, value in r5 } - -{$ifndef FPC_ABI_AIX} -{ in the AIX ABI, we can use te red zone for temp storage, otherwise we have } -{ to explicitely allocate room } -var - temp : packed record - case byte of - 0: (l1,l2: longint); - 1: (d: double); - end; -{$endif FPC_ABI_AIX} -asm - { no bytes? } - cmpwi cr6,r4,0 - { less than 15 bytes? } - cmpwi cr7,r4,15 - { less than 64 bytes? } - cmpwi cr1,r4,64 - { fill r5 with ValueValueValueValue } - rlwimi r5,r5,8,16,23 - { setup for aligning x to multiple of 4} - rlwinm r10,r3,0,31-2+1,31 - rlwimi r5,r5,16,0,15 - ble cr6,.LFillCharDone - { get the start of the data in the cache (and mark it as "will be } - { modified") } - dcbtst 0,r3 - subfic r10,r10,4 - blt cr7,.LFillCharVerySmall - { just store 4 bytes instead of using a loop to align (there are } - { plenty of other instructions now to keep the processor busy } - { while it handles the (possibly unaligned) store) } - stw r5,0(r3) - { r3 := align(r3,4) } - add r3,r3,r10 - { decrease count with number of bytes already stored } - sub r4,r4,r10 - blt cr1,.LFillCharSmall - { if we have to fill with 0 (which happens a lot), we can simply use } - { dcbz for the most part, which is very fast, so make a special case } - { for that } - cmplwi cr1,r5,0 - { align to a multiple of 32 (and immediately check whether we aren't } - { already 32 byte aligned) } - rlwinm. r10,r3,0,31-5+1,31 - { setup r3 for using update forms of store instructions } - subi r3,r3,4 - { get number of bytes to store } - subfic r10,r10,32 - { if already 32byte aligned, skip align loop } - beq .L32ByteAlignLoopDone - { substract from the total count } - sub r4,r4,r10 -.L32ByteAlignLoop: - { we were already aligned to 4 byres, so this will count down to } - { exactly 0 } - subic. r10,r10,4 - stwu r5,4(r3) - bne .L32ByteAlignLoop -.L32ByteAlignLoopDone: - { get the amount of 32 byte blocks } - srwi r10,r4,5 - { and keep the rest in r4 (recording whether there is any rest) } - rlwinm. r4,r4,0,31-5+1,31 - { move to ctr } - mtctr r10 - { check how many rest there is (to decide whether we'll use } - { FillCharSmall or FillCharVerySmall) } - cmplwi cr7,r4,11 - { if filling with zero, only use dcbz } - bne cr1, .LFillCharNoZero - { make r3 point again to the actual store position } - addi r3,r3,4 -.LFillCharDCBZLoop: - dcbz 0,r3 - addi r3,r3,32 - bdnz .LFillCharDCBZLoop - { if there was no rest, we're finished } - beq .LFillCharDone - b .LFillCharVerySmall -.LFillCharNoZero: -{$ifdef FPC_ABI_AIX} - stw r5,-4(r1) - stw r5,-8(r1) - lfd f0,-8(r1) -{$else FPC_ABI_AIX} - stw r5,temp - stw r5,temp+4 - lfd f0,temp -{$endif FPC_ABI_AIX} - { make r3 point to address-8, so we're able to use fp double stores } - { with update (it's already -4 now) } - subi r3,r3,4 - { load r10 with 8, so that dcbz uses the correct address } - li r10, 8 -.LFillChar32ByteLoop: - dcbz r3,r10 - stfdu f0,8(r3) - stfdu f0,8(r3) - stfdu f0,8(r3) - stfdu f0,8(r3) - bdnz .LFillChar32ByteLoop - { if there was no rest, we're finished } - beq .LFillCharDone - { make r3 point again to the actual next byte that must be written } - addi r3,r3,8 - b .LFillCharVerySmall -.LFillCharSmall: - { when we arrive here, we're already 4 byte aligned } - { get count div 4 to store dwords } - srwi r10,r4,2 - { get ready for use of update stores } - subi r3,r3,4 - mtctr r10 - rlwinm. r4,r4,0,31-2+1,31 -.LFillCharSmallLoop: - stwu r5,4(r3) - bdnz .LFillCharSmallLoop - { if nothing left, stop } - beq .LFillCharDone - { get ready to store bytes } - addi r3,r3,4 -.LFillCharVerySmall: - mtctr r4 - subi r3,r3,1 -.LFillCharVerySmallLoop: - stbu r5,1(r3) - bdnz .LFillCharVerySmallLoop -.LFillCharDone: -end; -{$endif FPC_SYSTEM_HAS_FILLCHAR} - - {$ifndef FPC_SYSTEM_HAS_FILLDWORD} {$define FPC_SYSTEM_HAS_FILLDWORD} procedure filldword(var x;count : longint;value : dword); Index: fpc.spec =================================================================== RCS file: /cvs/extras/rpms/fpc/FC-2/fpc.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- fpc.spec 5 Aug 2005 15:15:37 -0000 1.1 +++ fpc.spec 17 Aug 2005 15:55:18 -0000 1.2 @@ -1,6 +1,6 @@ Name: fpc Version: 2.0.0 -Release: 1 +Release: 3 Summary: Free Pascal Compiler Group: Development/Languages @@ -8,6 +8,7 @@ URL: http://www.freepascal.org/ Source0: ftp://ftp.freepascal.org/pub/fpc/dist/source-%{version}/%{name}-%{version}.source.tar.gz Source1: http://www.cnoc.nl/fpc/%{name}-%{version}.compiler.bin.tar.gz +Patch0: %{name}-%{version}-G5.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: gpm, glibc, ncurses, binutils @@ -54,6 +55,7 @@ %prep %setup -q -a1 -n %{name} +%patch0 %build # The source-files: @@ -156,6 +158,14 @@ %{_datadir}/fpcsrc %changelog +* Wed Aug 17 2005 Joost van der Sluis 2.0.0-3 +- replaced the ppcpcc-2.1.1 startcompilercompiler for the + ppcppc-2.0.0 startcompiler + +* Wed Aug 17 2005 Joost van der Sluis 2.0.0-2 +- Added a patch for compilation on POWER5, and provided + the new ppcppc binary/startcompiler + * Fri Aug 5 2005 Joost van der Sluis 2.0.0-1 - Removed gpm-devel requirement - Fixed a type in the -src description Index: sources =================================================================== RCS file: /cvs/extras/rpms/fpc/FC-2/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 5 Aug 2005 15:15:37 -0000 1.2 +++ sources 17 Aug 2005 15:55:18 -0000 1.3 @@ -1,2 +1,2 @@ -db9a94a468bdc5f1067f2803818f5b2b fpc-2.0.0.compiler.bin.tar.gz +fd5730c59bb5a87e5828568b7d039cb5 fpc-2.0.0.compiler.bin.tar.gz 3f9c64d0146a3631f6963fd7477776d1 fpc-2.0.0.source.tar.gz From fedora-extras-commits at redhat.com Wed Aug 17 15:55:21 2005 From: fedora-extras-commits at redhat.com (Joost van der Sluis (joost)) Date: Wed, 17 Aug 2005 11:55:21 -0400 Subject: rpms/fpc/FC-3 fpc-2.0.0-G5.patch, NONE, 1.1 fpc.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200508171555.j7HFtLJ3005397@cvs-int.fedora.redhat.com> Author: joost Update of /cvs/extras/rpms/fpc/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5358/FC-3 Modified Files: fpc.spec sources Added Files: fpc-2.0.0-G5.patch Log Message: - Merged changes from devel to FC-4, FC-3 and FC-2 - placed fpc-2.0.0-G5.patch into the cvs fpc-2.0.0-G5.patch: --- NEW FILE fpc-2.0.0-G5.patch --- Index: rtl/powerpc/powerpc.inc =================================================================== --- rtl/powerpc/powerpc.inc (revision 830) +++ rtl/powerpc/powerpc.inc (working copy) @@ -203,374 +203,7 @@ end; {$endif MACOS} -{**************************************************************************** - Move / Fill -****************************************************************************} -{$ifndef FPC_SYSTEM_HAS_MOVE} -{$define FPC_SYSTEM_HAS_MOVE} -procedure Move(const source;var dest;count:longint);[public, alias: 'FPC_MOVE'];assembler; nostackframe; -asm - { count <= 0 ? } - cmpwi cr0,r5,0 - { check if we have to do the move backwards because of overlap } - sub r10,r4,r3 - { carry := boolean(dest-source < count) = boolean(overlap) } - subc r10,r10,r5 - - { count < 15 ? (to decide whether we will move dwords or bytes } - cmpwi cr1,r5,15 - - { if overlap, then r10 := -1 else r10 := 0 } - subfe r10,r10,r10 - - { count < 63 ? (32 + max. alignment (31) } - cmpwi cr7,r5,63 - - { if count <= 0, stop } - ble cr0,.LMoveDone - - { load the begin of the source in the data cache } - dcbt 0,r3 - { and the dest as well } - dcbtst 0,r4 - - { if overlap, then r0 := count else r0 := 0 } - and r0,r5,r10 - { if overlap, then point source and dest to the end } - add r3,r3,r0 - add r4,r4,r0 - { if overlap, then r6 := 0, else r6 := -1 } - not r6,r10 - { if overlap, then r10 := -2, else r10 := 0 } - slwi r10,r10,1 - { if overlap, then r10 := -1, else r10 := 1 } - addi r10,r10,1 - - { if count < 15, copy everything byte by byte } - blt cr1,.LMoveBytes - - { if no overlap, then source/dest += -1, otherwise they stay } - { After the next instruction, r3/r4 + r10 = next position to } - { load/store from/to } - add r3,r3,r6 - add r4,r4,r6 - - { otherwise, guarantee 4 byte alignment for dest for starters } -.LMove4ByteAlignLoop: - lbzux r0,r3,r10 - stbux r0,r4,r10 - { is dest now 4 aligned? } - andi. r0,r4,3 - subi r5,r5,1 - { while not aligned, continue } - bne cr0,.LMove4ByteAlignLoop - -{$ifndef ppc603} - { check for 32 byte alignment } - andi. r7,r4,31 -{$endif non ppc603} - { we are going to copy one byte again (the one at the newly } - { aligned address), so increase count byte 1 } - addi r5,r5,1 - { count div 4 for number of dwords to copy } - srwi r0,r5,2 - { if 11 <= count < 63, copy using dwords } - blt cr7,.LMoveDWords - -{$ifndef ppc603} - { # of dwords to copy to reach 32 byte alignment (*4) } - { (depends on forward/backward copy) } - - { if forward copy, r6 = -1 -> r8 := 32 } - { if backward copy, r6 = 0 -> r8 := 0 } - rlwinm r8,r6,0,31-6+1,31-6+1 - { if forward copy, we have to copy 32 - unaligned count bytes } - { if backward copy unaligned count bytes } - sub r7,r8,r7 - { if backward copy, the calculated value is now negate -> } - { make it positive again } - not r8, r6 - add r7, r7, r8 - xor r7, r7, r8 -{$endif not ppc603} - - { multiply the update count with 4 } - slwi r10,r10,2 - slwi r6,r6,2 - { and adapt the source and dest } - add r3,r3,r6 - add r4,r4,r6 - -{$ifndef ppc603} - beq cr0,.LMove32BytesAligned -.L32BytesAlignMoveLoop: - { count >= 39 -> align to 8 byte boundary and then use the FPU } - { since we're already at 4 byte alignment, use dword store } - subic. r7,r7,4 - lwzux r0,r3,r10 - subi r5,r5,4 - stwux r0,r4,r10 - bne .L32BytesAlignMoveLoop - -.LMove32BytesAligned: - { count div 32 ( >= 1, since count was >=63 } - srwi r0,r5,5 - { remainder } - andi. r5,r5,31 - { to decide if we will do some dword stores (instead of only } - { byte stores) afterwards or not } -{$else not ppc603} - srwi r0,r5,4 - andi. r5,r5,15 -{$endif not ppc603} - cmpwi cr1,r5,11 - mtctr r0 - - { r0 := count div 4, will be moved to ctr when copying dwords } - srwi r0,r5,2 - -{$ifndef ppc603} - { adjust the update count: it will now be 8 or -8 depending on overlap } - slwi r10,r10,1 - - { adjust source and dest pointers: because of the above loop, dest is now } - { aligned to 8 bytes. So if we add r6 we will still have an 8 bytes } - { aligned address) } - add r3,r3,r6 - add r4,r4,r6 - - slwi r6,r6,1 - - { the dcbz offset must give a 32 byte aligned address when added } - { to the current dest address and its address must point to the } - { bytes that will be overwritten in the current iteration. In case } - { of a forward loop, the dest address has currently an offset of } - { -8 compared to the bytes that will be overwritten (and r6 = -8). } - { In case of a backward of a loop, the dest address currently has } - { an offset of +32 compared to the bytes that will be overwritten } - { (and r6 = 0). So the forward dcbz offset must become +8 and the } - { backward -32 -> (-r6 * 5) - 32 gives the correct offset } - slwi r7,r6,2 - add r7,r7,r6 - neg r7,r7 - subi r7,r7,32 - -.LMove32ByteDcbz: - lfdux f0,r3,r10 - lfdux f1,r3,r10 - lfdux f2,r3,r10 - lfdux f3,r3,r10 - { must be done only now, in case source and dest are less than } - { 32 bytes apart! } - dcbz r4,r7 - stfdux f0,r4,r10 - stfdux f1,r4,r10 - stfdux f2,r4,r10 - stfdux f3,r4,r10 - bdnz .LMove32ByteDcbz -.LMove32ByteLoopDone: -{$else not ppc603} -.LMove16ByteLoop: - lwzux r11,r3,r10 - lwzux r7,r3,r10 - lwzux r8,r3,r10 - lwzux r9,r3,r10 - stwux r11,r4,r10 - stwux r7,r4,r10 - stwux r8,r4,r10 - stwux r9,r4,r10 - bdnz .LMove16ByteLoop -{$endif not ppc603} - - { cr0*4+eq is true if "count and 31" = 0 } - beq cr0,.LMoveDone - - { make r10 again -1 or 1, but first adjust source/dest pointers } - sub r3,r3,r6 - sub r4,r4,r6 -{$ifndef ppc603} - srawi r10,r10,3 - srawi r6,r6,3 -{$else not ppc603} - srawi r10,r10,2 - srawi r6,r6,2 -{$endif not ppc603} - - { cr1 contains whether count <= 11 } - ble cr1,.LMoveBytes - -.LMoveDWords: - mtctr r0 - andi. r5,r5,3 - { r10 * 4 } - slwi r10,r10,2 - slwi r6,r6,2 - add r3,r3,r6 - add r4,r4,r6 - -.LMoveDWordsLoop: - lwzux r0,r3,r10 - stwux r0,r4,r10 - bdnz .LMoveDWordsLoop - - beq cr0,.LMoveDone - { make r10 again -1 or 1 } - sub r3,r3,r6 - sub r4,r4,r6 - srawi r10,r10,2 - srawi r6,r6,2 -.LMoveBytes: - add r3,r3,r6 - add r4,r4,r6 - mtctr r5 -.LMoveBytesLoop: - lbzux r0,r3,r10 - stbux r0,r4,r10 - bdnz .LMoveBytesLoop -.LMoveDone: -end; -{$endif FPC_SYSTEM_HAS_MOVE} - - -{$ifndef FPC_SYSTEM_HAS_FILLCHAR} -{$define FPC_SYSTEM_HAS_FILLCHAR} - -Procedure FillChar(var x;count:longint;value:byte);assembler; -{ input: x in r3, count in r4, value in r5 } - -{$ifndef FPC_ABI_AIX} -{ in the AIX ABI, we can use te red zone for temp storage, otherwise we have } -{ to explicitely allocate room } -var - temp : packed record - case byte of - 0: (l1,l2: longint); - 1: (d: double); - end; -{$endif FPC_ABI_AIX} -asm - { no bytes? } - cmpwi cr6,r4,0 - { less than 15 bytes? } - cmpwi cr7,r4,15 - { less than 64 bytes? } - cmpwi cr1,r4,64 - { fill r5 with ValueValueValueValue } - rlwimi r5,r5,8,16,23 - { setup for aligning x to multiple of 4} - rlwinm r10,r3,0,31-2+1,31 - rlwimi r5,r5,16,0,15 - ble cr6,.LFillCharDone - { get the start of the data in the cache (and mark it as "will be } - { modified") } - dcbtst 0,r3 - subfic r10,r10,4 - blt cr7,.LFillCharVerySmall - { just store 4 bytes instead of using a loop to align (there are } - { plenty of other instructions now to keep the processor busy } - { while it handles the (possibly unaligned) store) } - stw r5,0(r3) - { r3 := align(r3,4) } - add r3,r3,r10 - { decrease count with number of bytes already stored } - sub r4,r4,r10 - blt cr1,.LFillCharSmall - { if we have to fill with 0 (which happens a lot), we can simply use } - { dcbz for the most part, which is very fast, so make a special case } - { for that } - cmplwi cr1,r5,0 - { align to a multiple of 32 (and immediately check whether we aren't } - { already 32 byte aligned) } - rlwinm. r10,r3,0,31-5+1,31 - { setup r3 for using update forms of store instructions } - subi r3,r3,4 - { get number of bytes to store } - subfic r10,r10,32 - { if already 32byte aligned, skip align loop } - beq .L32ByteAlignLoopDone - { substract from the total count } - sub r4,r4,r10 -.L32ByteAlignLoop: - { we were already aligned to 4 byres, so this will count down to } - { exactly 0 } - subic. r10,r10,4 - stwu r5,4(r3) - bne .L32ByteAlignLoop -.L32ByteAlignLoopDone: - { get the amount of 32 byte blocks } - srwi r10,r4,5 - { and keep the rest in r4 (recording whether there is any rest) } - rlwinm. r4,r4,0,31-5+1,31 - { move to ctr } - mtctr r10 - { check how many rest there is (to decide whether we'll use } - { FillCharSmall or FillCharVerySmall) } - cmplwi cr7,r4,11 - { if filling with zero, only use dcbz } - bne cr1, .LFillCharNoZero - { make r3 point again to the actual store position } - addi r3,r3,4 -.LFillCharDCBZLoop: - dcbz 0,r3 - addi r3,r3,32 - bdnz .LFillCharDCBZLoop - { if there was no rest, we're finished } - beq .LFillCharDone - b .LFillCharVerySmall -.LFillCharNoZero: -{$ifdef FPC_ABI_AIX} - stw r5,-4(r1) - stw r5,-8(r1) - lfd f0,-8(r1) -{$else FPC_ABI_AIX} - stw r5,temp - stw r5,temp+4 - lfd f0,temp -{$endif FPC_ABI_AIX} - { make r3 point to address-8, so we're able to use fp double stores } - { with update (it's already -4 now) } - subi r3,r3,4 - { load r10 with 8, so that dcbz uses the correct address } - li r10, 8 -.LFillChar32ByteLoop: - dcbz r3,r10 - stfdu f0,8(r3) - stfdu f0,8(r3) - stfdu f0,8(r3) - stfdu f0,8(r3) - bdnz .LFillChar32ByteLoop - { if there was no rest, we're finished } - beq .LFillCharDone - { make r3 point again to the actual next byte that must be written } - addi r3,r3,8 - b .LFillCharVerySmall -.LFillCharSmall: - { when we arrive here, we're already 4 byte aligned } - { get count div 4 to store dwords } - srwi r10,r4,2 - { get ready for use of update stores } - subi r3,r3,4 - mtctr r10 - rlwinm. r4,r4,0,31-2+1,31 -.LFillCharSmallLoop: - stwu r5,4(r3) - bdnz .LFillCharSmallLoop - { if nothing left, stop } - beq .LFillCharDone - { get ready to store bytes } - addi r3,r3,4 -.LFillCharVerySmall: - mtctr r4 - subi r3,r3,1 -.LFillCharVerySmallLoop: - stbu r5,1(r3) - bdnz .LFillCharVerySmallLoop -.LFillCharDone: -end; -{$endif FPC_SYSTEM_HAS_FILLCHAR} - - {$ifndef FPC_SYSTEM_HAS_FILLDWORD} {$define FPC_SYSTEM_HAS_FILLDWORD} procedure filldword(var x;count : longint;value : dword); Index: fpc.spec =================================================================== RCS file: /cvs/extras/rpms/fpc/FC-3/fpc.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- fpc.spec 5 Aug 2005 15:15:37 -0000 1.1 +++ fpc.spec 17 Aug 2005 15:55:19 -0000 1.2 @@ -1,6 +1,6 @@ Name: fpc Version: 2.0.0 -Release: 1 +Release: 3 Summary: Free Pascal Compiler Group: Development/Languages @@ -8,6 +8,7 @@ URL: http://www.freepascal.org/ Source0: ftp://ftp.freepascal.org/pub/fpc/dist/source-%{version}/%{name}-%{version}.source.tar.gz Source1: http://www.cnoc.nl/fpc/%{name}-%{version}.compiler.bin.tar.gz +Patch0: %{name}-%{version}-G5.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: gpm, glibc, ncurses, binutils @@ -54,6 +55,7 @@ %prep %setup -q -a1 -n %{name} +%patch0 %build # The source-files: @@ -156,6 +158,14 @@ %{_datadir}/fpcsrc %changelog +* Wed Aug 17 2005 Joost van der Sluis 2.0.0-3 +- replaced the ppcpcc-2.1.1 startcompilercompiler for the + ppcppc-2.0.0 startcompiler + +* Wed Aug 17 2005 Joost van der Sluis 2.0.0-2 +- Added a patch for compilation on POWER5, and provided + the new ppcppc binary/startcompiler + * Fri Aug 5 2005 Joost van der Sluis 2.0.0-1 - Removed gpm-devel requirement - Fixed a type in the -src description Index: sources =================================================================== RCS file: /cvs/extras/rpms/fpc/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 5 Aug 2005 15:15:37 -0000 1.2 +++ sources 17 Aug 2005 15:55:19 -0000 1.3 @@ -1,2 +1,2 @@ -db9a94a468bdc5f1067f2803818f5b2b fpc-2.0.0.compiler.bin.tar.gz +fd5730c59bb5a87e5828568b7d039cb5 fpc-2.0.0.compiler.bin.tar.gz 3f9c64d0146a3631f6963fd7477776d1 fpc-2.0.0.source.tar.gz From fedora-extras-commits at redhat.com Wed Aug 17 15:55:26 2005 From: fedora-extras-commits at redhat.com (Joost van der Sluis (joost)) Date: Wed, 17 Aug 2005 11:55:26 -0400 Subject: rpms/fpc/FC-4 fpc-2.0.0-G5.patch, NONE, 1.1 fpc.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200508171555.j7HFtQKC005429@cvs-int.fedora.redhat.com> Author: joost Update of /cvs/extras/rpms/fpc/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5358/FC-4 Modified Files: fpc.spec sources Added Files: fpc-2.0.0-G5.patch Log Message: - Merged changes from devel to FC-4, FC-3 and FC-2 - placed fpc-2.0.0-G5.patch into the cvs fpc-2.0.0-G5.patch: --- NEW FILE fpc-2.0.0-G5.patch --- Index: rtl/powerpc/powerpc.inc =================================================================== --- rtl/powerpc/powerpc.inc (revision 830) +++ rtl/powerpc/powerpc.inc (working copy) @@ -203,374 +203,7 @@ end; {$endif MACOS} -{**************************************************************************** - Move / Fill -****************************************************************************} -{$ifndef FPC_SYSTEM_HAS_MOVE} -{$define FPC_SYSTEM_HAS_MOVE} -procedure Move(const source;var dest;count:longint);[public, alias: 'FPC_MOVE'];assembler; nostackframe; -asm - { count <= 0 ? } - cmpwi cr0,r5,0 - { check if we have to do the move backwards because of overlap } - sub r10,r4,r3 - { carry := boolean(dest-source < count) = boolean(overlap) } - subc r10,r10,r5 - - { count < 15 ? (to decide whether we will move dwords or bytes } - cmpwi cr1,r5,15 - - { if overlap, then r10 := -1 else r10 := 0 } - subfe r10,r10,r10 - - { count < 63 ? (32 + max. alignment (31) } - cmpwi cr7,r5,63 - - { if count <= 0, stop } - ble cr0,.LMoveDone - - { load the begin of the source in the data cache } - dcbt 0,r3 - { and the dest as well } - dcbtst 0,r4 - - { if overlap, then r0 := count else r0 := 0 } - and r0,r5,r10 - { if overlap, then point source and dest to the end } - add r3,r3,r0 - add r4,r4,r0 - { if overlap, then r6 := 0, else r6 := -1 } - not r6,r10 - { if overlap, then r10 := -2, else r10 := 0 } - slwi r10,r10,1 - { if overlap, then r10 := -1, else r10 := 1 } - addi r10,r10,1 - - { if count < 15, copy everything byte by byte } - blt cr1,.LMoveBytes - - { if no overlap, then source/dest += -1, otherwise they stay } - { After the next instruction, r3/r4 + r10 = next position to } - { load/store from/to } - add r3,r3,r6 - add r4,r4,r6 - - { otherwise, guarantee 4 byte alignment for dest for starters } -.LMove4ByteAlignLoop: - lbzux r0,r3,r10 - stbux r0,r4,r10 - { is dest now 4 aligned? } - andi. r0,r4,3 - subi r5,r5,1 - { while not aligned, continue } - bne cr0,.LMove4ByteAlignLoop - -{$ifndef ppc603} - { check for 32 byte alignment } - andi. r7,r4,31 -{$endif non ppc603} - { we are going to copy one byte again (the one at the newly } - { aligned address), so increase count byte 1 } - addi r5,r5,1 - { count div 4 for number of dwords to copy } - srwi r0,r5,2 - { if 11 <= count < 63, copy using dwords } - blt cr7,.LMoveDWords - -{$ifndef ppc603} - { # of dwords to copy to reach 32 byte alignment (*4) } - { (depends on forward/backward copy) } - - { if forward copy, r6 = -1 -> r8 := 32 } - { if backward copy, r6 = 0 -> r8 := 0 } - rlwinm r8,r6,0,31-6+1,31-6+1 - { if forward copy, we have to copy 32 - unaligned count bytes } - { if backward copy unaligned count bytes } - sub r7,r8,r7 - { if backward copy, the calculated value is now negate -> } - { make it positive again } - not r8, r6 - add r7, r7, r8 - xor r7, r7, r8 -{$endif not ppc603} - - { multiply the update count with 4 } - slwi r10,r10,2 - slwi r6,r6,2 - { and adapt the source and dest } - add r3,r3,r6 - add r4,r4,r6 - -{$ifndef ppc603} - beq cr0,.LMove32BytesAligned -.L32BytesAlignMoveLoop: - { count >= 39 -> align to 8 byte boundary and then use the FPU } - { since we're already at 4 byte alignment, use dword store } - subic. r7,r7,4 - lwzux r0,r3,r10 - subi r5,r5,4 - stwux r0,r4,r10 - bne .L32BytesAlignMoveLoop - -.LMove32BytesAligned: - { count div 32 ( >= 1, since count was >=63 } - srwi r0,r5,5 - { remainder } - andi. r5,r5,31 - { to decide if we will do some dword stores (instead of only } - { byte stores) afterwards or not } -{$else not ppc603} - srwi r0,r5,4 - andi. r5,r5,15 -{$endif not ppc603} - cmpwi cr1,r5,11 - mtctr r0 - - { r0 := count div 4, will be moved to ctr when copying dwords } - srwi r0,r5,2 - -{$ifndef ppc603} - { adjust the update count: it will now be 8 or -8 depending on overlap } - slwi r10,r10,1 - - { adjust source and dest pointers: because of the above loop, dest is now } - { aligned to 8 bytes. So if we add r6 we will still have an 8 bytes } - { aligned address) } - add r3,r3,r6 - add r4,r4,r6 - - slwi r6,r6,1 - - { the dcbz offset must give a 32 byte aligned address when added } - { to the current dest address and its address must point to the } - { bytes that will be overwritten in the current iteration. In case } - { of a forward loop, the dest address has currently an offset of } - { -8 compared to the bytes that will be overwritten (and r6 = -8). } - { In case of a backward of a loop, the dest address currently has } - { an offset of +32 compared to the bytes that will be overwritten } - { (and r6 = 0). So the forward dcbz offset must become +8 and the } - { backward -32 -> (-r6 * 5) - 32 gives the correct offset } - slwi r7,r6,2 - add r7,r7,r6 - neg r7,r7 - subi r7,r7,32 - -.LMove32ByteDcbz: - lfdux f0,r3,r10 - lfdux f1,r3,r10 - lfdux f2,r3,r10 - lfdux f3,r3,r10 - { must be done only now, in case source and dest are less than } - { 32 bytes apart! } - dcbz r4,r7 - stfdux f0,r4,r10 - stfdux f1,r4,r10 - stfdux f2,r4,r10 - stfdux f3,r4,r10 - bdnz .LMove32ByteDcbz -.LMove32ByteLoopDone: -{$else not ppc603} -.LMove16ByteLoop: - lwzux r11,r3,r10 - lwzux r7,r3,r10 - lwzux r8,r3,r10 - lwzux r9,r3,r10 - stwux r11,r4,r10 - stwux r7,r4,r10 - stwux r8,r4,r10 - stwux r9,r4,r10 - bdnz .LMove16ByteLoop -{$endif not ppc603} - - { cr0*4+eq is true if "count and 31" = 0 } - beq cr0,.LMoveDone - - { make r10 again -1 or 1, but first adjust source/dest pointers } - sub r3,r3,r6 - sub r4,r4,r6 -{$ifndef ppc603} - srawi r10,r10,3 - srawi r6,r6,3 -{$else not ppc603} - srawi r10,r10,2 - srawi r6,r6,2 -{$endif not ppc603} - - { cr1 contains whether count <= 11 } - ble cr1,.LMoveBytes - -.LMoveDWords: - mtctr r0 - andi. r5,r5,3 - { r10 * 4 } - slwi r10,r10,2 - slwi r6,r6,2 - add r3,r3,r6 - add r4,r4,r6 - -.LMoveDWordsLoop: - lwzux r0,r3,r10 - stwux r0,r4,r10 - bdnz .LMoveDWordsLoop - - beq cr0,.LMoveDone - { make r10 again -1 or 1 } - sub r3,r3,r6 - sub r4,r4,r6 - srawi r10,r10,2 - srawi r6,r6,2 -.LMoveBytes: - add r3,r3,r6 - add r4,r4,r6 - mtctr r5 -.LMoveBytesLoop: - lbzux r0,r3,r10 - stbux r0,r4,r10 - bdnz .LMoveBytesLoop -.LMoveDone: -end; -{$endif FPC_SYSTEM_HAS_MOVE} - - -{$ifndef FPC_SYSTEM_HAS_FILLCHAR} -{$define FPC_SYSTEM_HAS_FILLCHAR} - -Procedure FillChar(var x;count:longint;value:byte);assembler; -{ input: x in r3, count in r4, value in r5 } - -{$ifndef FPC_ABI_AIX} -{ in the AIX ABI, we can use te red zone for temp storage, otherwise we have } -{ to explicitely allocate room } -var - temp : packed record - case byte of - 0: (l1,l2: longint); - 1: (d: double); - end; -{$endif FPC_ABI_AIX} -asm - { no bytes? } - cmpwi cr6,r4,0 - { less than 15 bytes? } - cmpwi cr7,r4,15 - { less than 64 bytes? } - cmpwi cr1,r4,64 - { fill r5 with ValueValueValueValue } - rlwimi r5,r5,8,16,23 - { setup for aligning x to multiple of 4} - rlwinm r10,r3,0,31-2+1,31 - rlwimi r5,r5,16,0,15 - ble cr6,.LFillCharDone - { get the start of the data in the cache (and mark it as "will be } - { modified") } - dcbtst 0,r3 - subfic r10,r10,4 - blt cr7,.LFillCharVerySmall - { just store 4 bytes instead of using a loop to align (there are } - { plenty of other instructions now to keep the processor busy } - { while it handles the (possibly unaligned) store) } - stw r5,0(r3) - { r3 := align(r3,4) } - add r3,r3,r10 - { decrease count with number of bytes already stored } - sub r4,r4,r10 - blt cr1,.LFillCharSmall - { if we have to fill with 0 (which happens a lot), we can simply use } - { dcbz for the most part, which is very fast, so make a special case } - { for that } - cmplwi cr1,r5,0 - { align to a multiple of 32 (and immediately check whether we aren't } - { already 32 byte aligned) } - rlwinm. r10,r3,0,31-5+1,31 - { setup r3 for using update forms of store instructions } - subi r3,r3,4 - { get number of bytes to store } - subfic r10,r10,32 - { if already 32byte aligned, skip align loop } - beq .L32ByteAlignLoopDone - { substract from the total count } - sub r4,r4,r10 -.L32ByteAlignLoop: - { we were already aligned to 4 byres, so this will count down to } - { exactly 0 } - subic. r10,r10,4 - stwu r5,4(r3) - bne .L32ByteAlignLoop -.L32ByteAlignLoopDone: - { get the amount of 32 byte blocks } - srwi r10,r4,5 - { and keep the rest in r4 (recording whether there is any rest) } - rlwinm. r4,r4,0,31-5+1,31 - { move to ctr } - mtctr r10 - { check how many rest there is (to decide whether we'll use } - { FillCharSmall or FillCharVerySmall) } - cmplwi cr7,r4,11 - { if filling with zero, only use dcbz } - bne cr1, .LFillCharNoZero - { make r3 point again to the actual store position } - addi r3,r3,4 -.LFillCharDCBZLoop: - dcbz 0,r3 - addi r3,r3,32 - bdnz .LFillCharDCBZLoop - { if there was no rest, we're finished } - beq .LFillCharDone - b .LFillCharVerySmall -.LFillCharNoZero: -{$ifdef FPC_ABI_AIX} - stw r5,-4(r1) - stw r5,-8(r1) - lfd f0,-8(r1) -{$else FPC_ABI_AIX} - stw r5,temp - stw r5,temp+4 - lfd f0,temp -{$endif FPC_ABI_AIX} - { make r3 point to address-8, so we're able to use fp double stores } - { with update (it's already -4 now) } - subi r3,r3,4 - { load r10 with 8, so that dcbz uses the correct address } - li r10, 8 -.LFillChar32ByteLoop: - dcbz r3,r10 - stfdu f0,8(r3) - stfdu f0,8(r3) - stfdu f0,8(r3) - stfdu f0,8(r3) - bdnz .LFillChar32ByteLoop - { if there was no rest, we're finished } - beq .LFillCharDone - { make r3 point again to the actual next byte that must be written } - addi r3,r3,8 - b .LFillCharVerySmall -.LFillCharSmall: - { when we arrive here, we're already 4 byte aligned } - { get count div 4 to store dwords } - srwi r10,r4,2 - { get ready for use of update stores } - subi r3,r3,4 - mtctr r10 - rlwinm. r4,r4,0,31-2+1,31 -.LFillCharSmallLoop: - stwu r5,4(r3) - bdnz .LFillCharSmallLoop - { if nothing left, stop } - beq .LFillCharDone - { get ready to store bytes } - addi r3,r3,4 -.LFillCharVerySmall: - mtctr r4 - subi r3,r3,1 -.LFillCharVerySmallLoop: - stbu r5,1(r3) - bdnz .LFillCharVerySmallLoop -.LFillCharDone: -end; -{$endif FPC_SYSTEM_HAS_FILLCHAR} - - {$ifndef FPC_SYSTEM_HAS_FILLDWORD} {$define FPC_SYSTEM_HAS_FILLDWORD} procedure filldword(var x;count : longint;value : dword); Index: fpc.spec =================================================================== RCS file: /cvs/extras/rpms/fpc/FC-4/fpc.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- fpc.spec 5 Aug 2005 15:15:37 -0000 1.1 +++ fpc.spec 17 Aug 2005 15:55:24 -0000 1.2 @@ -1,6 +1,6 @@ Name: fpc Version: 2.0.0 -Release: 1 +Release: 3 Summary: Free Pascal Compiler Group: Development/Languages @@ -8,6 +8,7 @@ URL: http://www.freepascal.org/ Source0: ftp://ftp.freepascal.org/pub/fpc/dist/source-%{version}/%{name}-%{version}.source.tar.gz Source1: http://www.cnoc.nl/fpc/%{name}-%{version}.compiler.bin.tar.gz +Patch0: %{name}-%{version}-G5.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: gpm, glibc, ncurses, binutils @@ -54,6 +55,7 @@ %prep %setup -q -a1 -n %{name} +%patch0 %build # The source-files: @@ -156,6 +158,14 @@ %{_datadir}/fpcsrc %changelog +* Wed Aug 17 2005 Joost van der Sluis 2.0.0-3 +- replaced the ppcpcc-2.1.1 startcompilercompiler for the + ppcppc-2.0.0 startcompiler + +* Wed Aug 17 2005 Joost van der Sluis 2.0.0-2 +- Added a patch for compilation on POWER5, and provided + the new ppcppc binary/startcompiler + * Fri Aug 5 2005 Joost van der Sluis 2.0.0-1 - Removed gpm-devel requirement - Fixed a type in the -src description Index: sources =================================================================== RCS file: /cvs/extras/rpms/fpc/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 5 Aug 2005 15:15:37 -0000 1.2 +++ sources 17 Aug 2005 15:55:24 -0000 1.3 @@ -1,2 +1,2 @@ -db9a94a468bdc5f1067f2803818f5b2b fpc-2.0.0.compiler.bin.tar.gz +fd5730c59bb5a87e5828568b7d039cb5 fpc-2.0.0.compiler.bin.tar.gz 3f9c64d0146a3631f6963fd7477776d1 fpc-2.0.0.source.tar.gz From fedora-extras-commits at redhat.com Wed Aug 17 16:33:52 2005 From: fedora-extras-commits at redhat.com (Joost van der Sluis (joost)) Date: Wed, 17 Aug 2005 12:33:52 -0400 Subject: rpms/fpc/FC-2 fpc.spec,1.2,1.3 Message-ID: <200508171633.j7HGXqfY006837@cvs-int.fedora.redhat.com> Author: joost Update of /cvs/extras/rpms/fpc/FC-2 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6779/FC-2 Modified Files: fpc.spec Log Message: * Wed Aug 17 2005 Joost van der Sluis 2.0.0-4 - Added %%{?dist} to release. Index: fpc.spec =================================================================== RCS file: /cvs/extras/rpms/fpc/FC-2/fpc.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- fpc.spec 17 Aug 2005 15:55:18 -0000 1.2 +++ fpc.spec 17 Aug 2005 16:33:50 -0000 1.3 @@ -1,6 +1,6 @@ Name: fpc Version: 2.0.0 -Release: 3 +Release: 4%{?dist} Summary: Free Pascal Compiler Group: Development/Languages @@ -158,6 +158,9 @@ %{_datadir}/fpcsrc %changelog +* Wed Aug 17 2005 Joost van der Sluis 2.0.0-4 +- Added %%{?dist} to release. + * Wed Aug 17 2005 Joost van der Sluis 2.0.0-3 - replaced the ppcpcc-2.1.1 startcompilercompiler for the ppcppc-2.0.0 startcompiler From fedora-extras-commits at redhat.com Wed Aug 17 16:33:53 2005 From: fedora-extras-commits at redhat.com (Joost van der Sluis (joost)) Date: Wed, 17 Aug 2005 12:33:53 -0400 Subject: rpms/fpc/devel fpc.spec,1.3,1.4 Message-ID: <200508171633.j7HGXrMa006855@cvs-int.fedora.redhat.com> Author: joost Update of /cvs/extras/rpms/fpc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6779/devel Modified Files: fpc.spec Log Message: * Wed Aug 17 2005 Joost van der Sluis 2.0.0-4 - Added %%{?dist} to release. Index: fpc.spec =================================================================== RCS file: /cvs/extras/rpms/fpc/devel/fpc.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- fpc.spec 17 Aug 2005 15:01:01 -0000 1.3 +++ fpc.spec 17 Aug 2005 16:33:51 -0000 1.4 @@ -1,6 +1,6 @@ Name: fpc Version: 2.0.0 -Release: 3 +Release: 4%{?dist} Summary: Free Pascal Compiler Group: Development/Languages @@ -158,6 +158,9 @@ %{_datadir}/fpcsrc %changelog +* Wed Aug 17 2005 Joost van der Sluis 2.0.0-4 +- Added %%{?dist} to release. + * Wed Aug 17 2005 Joost van der Sluis 2.0.0-3 - replaced the ppcpcc-2.1.1 startcompilercompiler for the ppcppc-2.0.0 startcompiler From fedora-extras-commits at redhat.com Wed Aug 17 16:33:53 2005 From: fedora-extras-commits at redhat.com (Joost van der Sluis (joost)) Date: Wed, 17 Aug 2005 12:33:53 -0400 Subject: rpms/fpc/FC-3 fpc.spec,1.2,1.3 Message-ID: <200508171633.j7HGXrrn006843@cvs-int.fedora.redhat.com> Author: joost Update of /cvs/extras/rpms/fpc/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6779/FC-3 Modified Files: fpc.spec Log Message: * Wed Aug 17 2005 Joost van der Sluis 2.0.0-4 - Added %%{?dist} to release. Index: fpc.spec =================================================================== RCS file: /cvs/extras/rpms/fpc/FC-3/fpc.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- fpc.spec 17 Aug 2005 15:55:19 -0000 1.2 +++ fpc.spec 17 Aug 2005 16:33:50 -0000 1.3 @@ -1,6 +1,6 @@ Name: fpc Version: 2.0.0 -Release: 3 +Release: 4%{?dist} Summary: Free Pascal Compiler Group: Development/Languages @@ -158,6 +158,9 @@ %{_datadir}/fpcsrc %changelog +* Wed Aug 17 2005 Joost van der Sluis 2.0.0-4 +- Added %%{?dist} to release. + * Wed Aug 17 2005 Joost van der Sluis 2.0.0-3 - replaced the ppcpcc-2.1.1 startcompilercompiler for the ppcppc-2.0.0 startcompiler From fedora-extras-commits at redhat.com Wed Aug 17 16:33:53 2005 From: fedora-extras-commits at redhat.com (Joost van der Sluis (joost)) Date: Wed, 17 Aug 2005 12:33:53 -0400 Subject: rpms/fpc/FC-4 fpc.spec,1.2,1.3 Message-ID: <200508171633.j7HGXrJM006849@cvs-int.fedora.redhat.com> Author: joost Update of /cvs/extras/rpms/fpc/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6779/FC-4 Modified Files: fpc.spec Log Message: * Wed Aug 17 2005 Joost van der Sluis 2.0.0-4 - Added %%{?dist} to release. Index: fpc.spec =================================================================== RCS file: /cvs/extras/rpms/fpc/FC-4/fpc.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- fpc.spec 17 Aug 2005 15:55:24 -0000 1.2 +++ fpc.spec 17 Aug 2005 16:33:51 -0000 1.3 @@ -1,6 +1,6 @@ Name: fpc Version: 2.0.0 -Release: 3 +Release: 4%{?dist} Summary: Free Pascal Compiler Group: Development/Languages @@ -158,6 +158,9 @@ %{_datadir}/fpcsrc %changelog +* Wed Aug 17 2005 Joost van der Sluis 2.0.0-4 +- Added %%{?dist} to release. + * Wed Aug 17 2005 Joost van der Sluis 2.0.0-3 - replaced the ppcpcc-2.1.1 startcompilercompiler for the ppcppc-2.0.0 startcompiler From fedora-extras-commits at redhat.com Wed Aug 17 17:00:05 2005 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 17 Aug 2005 13:00:05 -0400 Subject: rpms/exo/devel exo.spec,1.9,1.10 Message-ID: <200508171700.j7HH05wY007092@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/exo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7069 Modified Files: exo.spec Log Message: Rebuild for new libcairo and libpixman Index: exo.spec =================================================================== RCS file: /cvs/extras/rpms/exo/devel/exo.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- exo.spec 1 Jul 2005 18:45:33 -0000 1.9 +++ exo.spec 17 Aug 2005 17:00:03 -0000 1.10 @@ -3,7 +3,7 @@ Summary: Application library for the Xfce desktop environment Name: exo Version: 0.3.0 -Release: 9%{?dist} +Release: 10%{?dist} License: LGPL URL: http://libexo.os-cillation.com/ Source0: http://download.berlios.de/xfce-goodies/exo-0.3.0.tar.bz2 @@ -71,6 +71,9 @@ %{python_sitearch}/pyexo.* %changelog +* Wed Aug 17 2005 Kevin Fenzi - 0.3.0-10.fc5 +- Rebuild for new libcairo and libpixman + * Fri Jul 1 2005 Kevin Fenzi - 0.3.0-9.fc5 - Bump release for a new build From fedora-extras-commits at redhat.com Wed Aug 17 17:02:17 2005 From: fedora-extras-commits at redhat.com (Joost van der Sluis (joost)) Date: Wed, 17 Aug 2005 13:02:17 -0400 Subject: owners owners.list,1.89,1.90 Message-ID: <200508171702.j7HH2lwP008335@cvs-int.fedora.redhat.com> Author: joost Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8307 Modified Files: owners.list Log Message: - added fpc Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.89 retrieving revision 1.90 diff -u -r1.89 -r1.90 --- owners.list 17 Aug 2005 08:13:33 -0000 1.89 +++ owners.list 17 Aug 2005 17:02:14 -0000 1.90 @@ -169,6 +169,7 @@ Fedora Extras|fontforge|An outline and bitmap font editor|otaylor at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|foobillard|A free OpenGL game of playing billard|mitr at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|fortune-mod|A program which will display a fortune|sheltren at cs.ucsb.edu|extras-qa at fedoraproject.org| +Fedora Extras|fpc|Free Pascal Compiler|joost at cnoc.nl|extras-qa at fedoraproject.org| Fedora Extras|fping|Scriptable, parallelized ping-like utility|kaboom at oobleck.net|extras-qa at fedoraproject.org| Fedora Extras|freeciv|The Freeciv multi-player strategy game|bdpepple at ameritech.net|extras-qa at fedoraproject.org| Fedora Extras|freedroid|Clone of the C64 Game Paradroid|ville.skytta at iki.fi|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Wed Aug 17 17:14:41 2005 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Wed, 17 Aug 2005 13:14:41 -0400 Subject: rpms/Terminal/devel Terminal.spec,1.4,1.5 Message-ID: <200508171714.j7HHEfin008481@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/Terminal/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8462 Modified Files: Terminal.spec Log Message: Rebuild for new libcairo and libpixman Index: Terminal.spec =================================================================== RCS file: /cvs/extras/rpms/Terminal/devel/Terminal.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- Terminal.spec 5 Aug 2005 02:48:11 -0000 1.4 +++ Terminal.spec 17 Aug 2005 17:14:39 -0000 1.5 @@ -1,7 +1,7 @@ Summary: X Terminal Emulator Name: Terminal Version: 0.2.4 -Release: 4%{?dist} +Release: 5%{?dist} License: GPL URL: http://terminal.os-cillation.com/ Source0: http://download.berlios.de/xfce-goodies/Terminal-0.2.4.tar.bz2 @@ -48,6 +48,9 @@ %{_libexecdir}/TerminalHelp %changelog +* Wed Aug 17 2005 Kevin Fenzi - 0.2.4-5.fc5 +- Rebuild for new libcairo and libpixman + * Thu Aug 4 2005 Kevin Fenzi - 0.2.4-4.fc5 - Add dist tag From fedora-extras-commits at redhat.com Wed Aug 17 17:22:18 2005 From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio)) Date: Wed, 17 Aug 2005 13:22:18 -0400 Subject: rpms/qof/devel qof.spec,1.9,1.10 Message-ID: <200508171722.j7HHMINa008567@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/extras/rpms/qof/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8538 Modified Files: qof.spec Log Message: - Add dist tag. - Rebuild for devel (FC5). Index: qof.spec =================================================================== RCS file: /cvs/extras/rpms/qof/devel/qof.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- qof.spec 23 Mar 2005 13:06:11 -0000 1.9 +++ qof.spec 17 Aug 2005 17:22:15 -0000 1.10 @@ -1,6 +1,6 @@ Name: qof Version: 0.5.0 -Release: 5 +Release: 6%{?dist} Summary: QOF provides a query engine library for C objects Group: System Environment/Libraries @@ -108,6 +108,10 @@ %{_libdir}/pkgconfig/* %changelog +* Wed Aug 17 2005 Toshio Kuratomi - 0.5.0-6 +- Add dist tag. +- Rebuild for devel (FC5). + * Wed Mar 23 2005 Toshio Kuratomi - 0.5.0-5 - ltdl-devel package is libtool-ltdl-devel. From fedora-extras-commits at redhat.com Wed Aug 17 17:25:13 2005 From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl)) Date: Wed, 17 Aug 2005 13:25:13 -0400 Subject: rpms/brightside/devel brightside.spec,1.9,1.10 Message-ID: <200508171725.j7HHPDLW008674@cvs-int.fedora.redhat.com> Author: thl Update of /cvs/extras/rpms/brightside/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8657 Modified Files: brightside.spec Log Message: rebuild Index: brightside.spec =================================================================== RCS file: /cvs/extras/rpms/brightside/devel/brightside.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- brightside.spec 21 Jul 2005 12:11:59 -0000 1.9 +++ brightside.spec 17 Aug 2005 17:25:11 -0000 1.10 @@ -1,6 +1,6 @@ Name: brightside Version: 1.4.0 -Release: 8 +Release: 9 Summary: Add reactivity to the corners and edges of your GNOME desktop @@ -83,6 +83,9 @@ %changelog +* Wed Aug 17 2005 Thorsten Leemhuis - 1.4.0-9 +- rebuild + * Thu Jul 21 2005 Thorsten Leemhuis - 1.4.0-8 - rebuild From fedora-extras-commits at redhat.com Wed Aug 17 17:43:50 2005 From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio)) Date: Wed, 17 Aug 2005 13:43:50 -0400 Subject: rpms/gnotime/devel gnotime.spec,1.9,1.10 Message-ID: <200508171743.j7HHhoQl008786@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/extras/rpms/gnotime/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8769 Modified Files: gnotime.spec Log Message: - Add dist tag. - Rebuild for devel. Index: gnotime.spec =================================================================== RCS file: /cvs/extras/rpms/gnotime/devel/gnotime.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- gnotime.spec 4 May 2005 00:07:12 -0000 1.9 +++ gnotime.spec 17 Aug 2005 17:43:47 -0000 1.10 @@ -1,6 +1,6 @@ Name: gnotime Version: 2.2.1 -Release: 8 +Release: 9%{?dist} Summary: Tracks and reports time spent Group: Applications/Productivity @@ -148,6 +148,10 @@ %{_sysconfdir}/gconf/schemas/* %changelog +* Wed Aug 17 2005 Toshio Kuratomi - 2.2.1-9 +- Add dist tag. +- Rebuild for devel. + * Mon May 2 2005 Toshio Kuratomi - 2.2.1-8 - Add a patch adapted from the gnotime tracker. Original patch by goedson-users.sf.net. SF Tracker: 1171394. This allows separate setting From fedora-extras-commits at redhat.com Wed Aug 17 17:52:09 2005 From: fedora-extras-commits at redhat.com (Zing Zing Shishak (shishz)) Date: Wed, 17 Aug 2005 13:52:09 -0400 Subject: rpms/perl-XML-LibXSLT/devel .cvsignore, 1.2, 1.3 perl-XML-LibXSLT.spec, 1.3, 1.4 sources, 1.2, 1.3 Message-ID: <200508171752.j7HHq94V008895@cvs-int.fedora.redhat.com> Author: shishz Update of /cvs/extras/rpms/perl-XML-LibXSLT/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8874 Modified Files: .cvsignore perl-XML-LibXSLT.spec sources Log Message: * Wed Aug 17 2005 Zing - 1.58-1 - new upstream - use dist macro Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-XML-LibXSLT/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 5 Mar 2005 11:18:47 -0000 1.2 +++ .cvsignore 17 Aug 2005 17:52:06 -0000 1.3 @@ -1 +1 @@ -XML-LibXSLT-1.57.tar.gz +XML-LibXSLT-1.58.tar.gz Index: perl-XML-LibXSLT.spec =================================================================== RCS file: /cvs/extras/rpms/perl-XML-LibXSLT/devel/perl-XML-LibXSLT.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-XML-LibXSLT.spec 6 Apr 2005 22:13:09 -0000 1.3 +++ perl-XML-LibXSLT.spec 17 Aug 2005 17:52:06 -0000 1.4 @@ -1,18 +1,18 @@ %{!?perl_vendorarch: %define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)} Name: perl-XML-LibXSLT -Version: 1.57 -Release: 4 +Version: 1.58 +Release: 1%{?dist} -Summary: Perl module for interfacing to GNOME's libxslt +Summary: Perl module for interfacing to GNOME's libxslt Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/XML-LibXSLT/ -Source0: http://search.cpan.org/CPAN/authors/id/M/MS/MSERGEANT/XML-LibXSLT-1.57.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Source0: http://search.cpan.org/CPAN/authors/id/M/MS/MSERGEANT/XML-LibXSLT-1.58.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: perl >= 1:5.6.1, perl(XML::LibXML) >= 1.57 +BuildRequires: perl >= 1:5.6.1, perl(XML::LibXML) >= 1.58 BuildRequires: libxslt-devel >= 1.0.6 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) @@ -50,6 +50,10 @@ %{_mandir}/man3/*.3* %changelog +* Wed Aug 17 2005 Zing - 1.58-1 +- new upstream +- use dist macro + * Fri Apr 7 2005 Michael Schwendt - rebuilt Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-XML-LibXSLT/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 5 Mar 2005 11:18:47 -0000 1.2 +++ sources 17 Aug 2005 17:52:06 -0000 1.3 @@ -1 +1 @@ -9b831bc5a97444103f345105f0f6fced XML-LibXSLT-1.57.tar.gz +c7b707002fed5c3572d81f92c453a5ce XML-LibXSLT-1.58.tar.gz From fedora-extras-commits at redhat.com Wed Aug 17 18:07:30 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Wed, 17 Aug 2005 14:07:30 -0400 Subject: rpms/clisp - New directory Message-ID: <200508171807.j7HI7UNh010254@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/clisp In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10242/clisp Log Message: Directory /cvs/extras/rpms/clisp added to the repository From fedora-extras-commits at redhat.com Wed Aug 17 18:07:37 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Wed, 17 Aug 2005 14:07:37 -0400 Subject: rpms/clisp/devel - New directory Message-ID: <200508171807.j7HI7b80010277@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/clisp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10242/clisp/devel Log Message: Directory /cvs/extras/rpms/clisp/devel added to the repository From fedora-extras-commits at redhat.com Wed Aug 17 18:08:26 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Wed, 17 Aug 2005 14:08:26 -0400 Subject: rpms/clisp Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200508171808.j7HI8QZX010371@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/clisp In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10341 Added Files: Makefile import.log Log Message: Setup of module clisp --- NEW FILE Makefile --- # Top level Makefile for module clisp all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Wed Aug 17 18:08:26 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Wed, 17 Aug 2005 14:08:26 -0400 Subject: rpms/clisp/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200508171808.j7HI8Q1i010376@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/clisp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10341/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module clisp --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Wed Aug 17 18:26:12 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Wed, 17 Aug 2005 14:26:12 -0400 Subject: rpms/clisp import.log,1.1,1.2 Message-ID: <200508171826.j7HIQgTE010487@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/clisp In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10453 Modified Files: import.log Log Message: auto-import clisp-2.34-1 on branch devel from clisp-2.34-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/clisp/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 17 Aug 2005 18:08:23 -0000 1.1 +++ import.log 17 Aug 2005 18:26:10 -0000 1.2 @@ -0,0 +1 @@ +clisp-2_34-1:HEAD:clisp-2.34-1.src.rpm:1124303159 From fedora-extras-commits at redhat.com Wed Aug 17 18:26:12 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Wed, 17 Aug 2005 14:26:12 -0400 Subject: rpms/clisp/devel clisp.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200508171826.j7HIQhTI010491@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/clisp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10453/devel Modified Files: .cvsignore sources Added Files: clisp.spec Log Message: auto-import clisp-2.34-1 on branch devel from clisp-2.34-1.src.rpm --- NEW FILE clisp.spec --- Name: clisp Summary: Common Lisp (ANSI CL) implementation Version: 2.34 Release: 1%{?dist} Group: Development/Languages License: GPL URL: http://sourceforge.net/projects/clisp Source: http://download.sourceforge.net/clisp/clisp-2.34.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: readline-devel, XFree86-devel, gettext, pcre-devel, postgresql-devel BuildRequires: libsigsegv-devel, db4-devel, zlib-devel %description Common Lisp is a high-level, general-purpose programming language. GNU CLISP is a Common Lisp implementation by Bruno Haible of Karlsruhe University and Michael Stoll of Munich University, both in Germany. It mostly supports the Lisp described in the ANSI Common Lisp standard. GNU CLISP includes an interpreter, a compiler, a debugger, a large subset of CLOS, a foreign language interface and a socket interface. An X11 interface is available through CLX, Garnet, CLUE/CLIO. GNU CLISP runs Maxima, ACL2 and many other Common Lisp packages. %package devel Summary: Development files for CLISP Group: Development/Languages Requires: %{name} = %{version}-%{release} %description devel Files necessary for linking CLISP. %prep %setup -q %build sed -i -e 's|-Wpointer-arith|-Wpointer-arith -falign-functions=4|' src/makemake.in # during test phase something goes wrong during file copying, so disable check sed -i -e 's|^ make check$||' configure # setting CFLAGS breaks the build ./configure --prefix=%{_prefix} \ --fsstnd=redhat \ --with-dynamic-ffi \ --with-module=berkeley-db \ --with-module=clx/new-clx \ --with-module=i18n \ --with-module=pcre \ --with-module=postgresql \ --with-module=rawsock \ --with-module=regexp \ --with-module=syscalls \ --with-module=wildcard \ --with-module=zlib \ --with-module=bindings/glibc \ --with-readline \ --build %install rm -rf $RPM_BUILD_ROOT make -C src prefix=%{_prefix} DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install rm -f $RPM_BUILD_ROOT%{_docdir}/clisp-%{version}/doc/clisp.{dvi,1,ps} cp -p doc/mop-spec.pdf $RPM_BUILD_ROOT%{_docdir}/clisp-%{version}/doc %find_lang %{name} %find_lang %{name}low cat %{name}low.lang >> %{name}.lang %files -f %{name}.lang %defattr(-,root,root,-) %{_bindir}/clisp %{_mandir}/man1/* %{_docdir}/clisp-%{version} %dir %{_libdir}/clisp/base %dir %{_libdir}/clisp/full %dir %{_libdir}/clisp %{_libdir}/clisp/base/lispinit.mem %{_libdir}/clisp/base/lisp.run %{_libdir}/clisp/full/lispinit.mem %{_libdir}/clisp/full/lisp.run %{_libdir}/clisp/data %files devel %defattr(-,root,root,-) %attr(0755,root,root) %{_libdir}/clisp/clisp-link %{_libdir}/clisp/base/*.a %{_libdir}/clisp/base/*.o %{_libdir}/clisp/base/*.h %{_libdir}/clisp/base/*.dvi %{_libdir}/clisp/base/makevars %{_libdir}/clisp/full/*.a %{_libdir}/clisp/full/*.o %{_libdir}/clisp/full/*.h %{_libdir}/clisp/full/*.dvi %{_libdir}/clisp/full/makevars %{_libdir}/clisp/linkkit %clean rm -fr $RPM_BUILD_ROOT %changelog * Tue Aug 16 2005 Gerard Milmeister - 2.34-1 - New Version 2.34 * Sun Apr 10 2005 Gerard Milmeister - 2.33.2-2 - Simpler build command * Fri Feb 18 2005 Gerard Milmeister - 0:2.33.2-1 - New Version 2.33.2 * Sat Mar 20 2004 Gerard Milmeister - 0:2.33-0.fdr.1 - New Version 2.33 * Tue Oct 21 2003 Gerard Milmeister - 0:2.31-0.fdr.1 - First fedora release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/clisp/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 17 Aug 2005 18:08:24 -0000 1.1 +++ .cvsignore 17 Aug 2005 18:26:10 -0000 1.2 @@ -0,0 +1 @@ +clisp-2.34.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/clisp/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 17 Aug 2005 18:08:24 -0000 1.1 +++ sources 17 Aug 2005 18:26:10 -0000 1.2 @@ -0,0 +1 @@ +68b20ad2d13bdc544e57000e38c856de clisp-2.34.tar.bz2 From fedora-extras-commits at redhat.com Wed Aug 17 19:10:51 2005 From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl)) Date: Wed, 17 Aug 2005 15:10:51 -0400 Subject: rpms/python-crypto/devel .cvsignore, 1.3, 1.4 python-crypto.spec, 1.8, 1.9 sources, 1.3, 1.4 python-crypto-64bit-unclean.patch, 1.1, NONE Message-ID: <200508171910.j7HJApom012574@cvs-int.fedora.redhat.com> Author: thl Update of /cvs/extras/rpms/python-crypto/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12518/devel Modified Files: .cvsignore python-crypto.spec sources Removed Files: python-crypto-64bit-unclean.patch Log Message: Update to 2.0.1; Use Dist; Drop python-crypto-64bit-unclean.patch, similar patch was applied upstream Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-crypto/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Nov 2004 05:15:06 -0000 1.3 +++ .cvsignore 17 Aug 2005 19:10:48 -0000 1.4 @@ -1 +1 @@ -pycrypto-2.0.tar.gz +pycrypto-2.0.1.tar.gz Index: python-crypto.spec =================================================================== RCS file: /cvs/extras/rpms/python-crypto/devel/python-crypto.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- python-crypto.spec 5 May 2005 12:53:52 -0000 1.8 +++ python-crypto.spec 17 Aug 2005 19:10:48 -0000 1.9 @@ -3,14 +3,13 @@ Summary: Cryptography library for Python Name: python-crypto -Version: 2.0 -Release: 4 +Version: 2.0.1 +Release: 1%{?dist} License: Python License (CNRI Python License) Group: Development/Libraries URL: http://www.amk.ca/python/code/crypto.html -Source: http://www.amk.ca/files/python/crypto/pycrypto-2.0.tar.gz +Source: http://www.amk.ca/files/python/crypto/pycrypto-2.0.1.tar.gz Patch0: %{name}-x86_64-buildfix.patch -Patch1: %{name}-64bit-unclean.patch BuildRequires: python >= 2.2 BuildRequires: python-devel >= 2.2 BuildRequires: gmp-devel >= 4.1 @@ -22,33 +21,31 @@ SHA), and various encryption algorithms (AES, DES, IDEA, RSA, ElGamal, etc.). -# The pre section. + %prep -%setup -n pycrypto-2.0 -q +%setup -n pycrypto-%{version} -q %ifarch x86_64 %patch0 -b .patch0 %endif -%patch1 -b .patch1 -p 1 -# The build section. + %build CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build -# The install section. + %install rm -rf $RPM_BUILD_ROOT %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT - find -name "*.py"|xargs %{__perl} -pi -e "s:/usr/local/bin/python:%{__python}:" -# The clean section. + %clean rm -rf $RPM_BUILD_ROOT -# The files section. + %files %defattr(-,root,root,-) -%doc README TODO ACKS ChangeLog LICENSE Doc Demo +%doc README TODO ACKS ChangeLog LICENSE Doc %{python_sitearch}/Crypto/*.py %{python_sitearch}/Crypto/*.pyc %ghost %{python_sitearch}/Crypto/*.pyo @@ -77,7 +74,14 @@ %dir %{python_sitearch}/Crypto/PublicKey/ %dir %{python_sitearch}/Crypto/Util/ + %changelog +* Wed Aug 17 2005 Thorsten Leemhuis - 0:2.0.1-1 +- Update to 2.0.1 +- Use Dist +- Drop python-crypto-64bit-unclean.patch, similar patch was applied + upstream + * Thu May 05 2005 Thorsten Leemhuis - 0:2.0-4 - add python-crypto-64bit-unclean.patch (#156173) Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-crypto/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 8 Nov 2004 05:15:06 -0000 1.3 +++ sources 17 Aug 2005 19:10:48 -0000 1.4 @@ -1 +1 @@ -55f9875c554ede75ad605d2c7504d94f pycrypto-2.0.tar.gz +4d5674f3898a573691ffb335e8d749cd pycrypto-2.0.1.tar.gz --- python-crypto-64bit-unclean.patch DELETED --- From fedora-extras-commits at redhat.com Wed Aug 17 19:10:45 2005 From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl)) Date: Wed, 17 Aug 2005 15:10:45 -0400 Subject: rpms/python-crypto/FC-3 .cvsignore, 1.3, 1.4 python-crypto.spec, 1.6, 1.7 sources, 1.3, 1.4 Message-ID: <200508171911.j7HJBFuQ012580@cvs-int.fedora.redhat.com> Author: thl Update of /cvs/extras/rpms/python-crypto/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12518/FC-3 Modified Files: .cvsignore python-crypto.spec sources Log Message: Update to 2.0.1; Use Dist; Drop python-crypto-64bit-unclean.patch, similar patch was applied upstream Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-crypto/FC-3/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Nov 2004 05:15:06 -0000 1.3 +++ .cvsignore 17 Aug 2005 19:10:43 -0000 1.4 @@ -1 +1 @@ -pycrypto-2.0.tar.gz +pycrypto-2.0.1.tar.gz Index: python-crypto.spec =================================================================== RCS file: /cvs/extras/rpms/python-crypto/FC-3/python-crypto.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- python-crypto.spec 5 May 2005 12:53:51 -0000 1.6 +++ python-crypto.spec 17 Aug 2005 19:10:43 -0000 1.7 @@ -1,21 +1,19 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} -Summary: A cryptography library for Python. -Name: python-crypto -Version: 2.0 -Epoch: 0 -Release: 3 -License: Python License (CNRI Python License) -Group: Development/Libraries -URL: http://www.amk.ca/python/code/crypto.html -Source: http://www.amk.ca/files/python/crypto/pycrypto-2.0.tar.gz +Summary: Cryptography library for Python +Name: python-crypto +Version: 2.0.1 +Release: 1%{?dist} +License: Python License (CNRI Python License) +Group: Development/Libraries +URL: http://www.amk.ca/python/code/crypto.html +Source: http://www.amk.ca/files/python/crypto/pycrypto-2.0.1.tar.gz Patch0: %{name}-x86_64-buildfix.patch -Patch1: %{name}-64bit-unclean.patch -BuildRequires: python >= 0:2.2 -BuildRequires: python-devel >= 0:2.2 -BuildRequires: gmp-devel >= 0:4.1 -BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot-%(%{__id_u} -n) +BuildRequires: python >= 2.2 +BuildRequires: python-devel >= 2.2 +BuildRequires: gmp-devel >= 4.1 +BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot-%(%{__id_u} -n) Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") %description @@ -23,33 +21,31 @@ SHA), and various encryption algorithms (AES, DES, IDEA, RSA, ElGamal, etc.). -# The pre section. + %prep -%setup -n pycrypto-2.0 -q +%setup -n pycrypto-%{version} -q %ifarch x86_64 %patch0 -b .patch0 -%endif -%patch1 -b .patch1 -p 1 +%endif + -# The build section. %build CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build -# The install section. + %install rm -rf $RPM_BUILD_ROOT %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT - find -name "*.py"|xargs %{__perl} -pi -e "s:/usr/local/bin/python:%{__python}:" -# The clean section. + %clean rm -rf $RPM_BUILD_ROOT -# The files section. -%files + +%files %defattr(-,root,root,-) -%doc README TODO ACKS ChangeLog LICENSE Doc Demo +%doc README TODO ACKS ChangeLog LICENSE Doc %{python_sitearch}/Crypto/*.py %{python_sitearch}/Crypto/*.pyc %ghost %{python_sitearch}/Crypto/*.pyo @@ -78,13 +74,23 @@ %dir %{python_sitearch}/Crypto/PublicKey/ %dir %{python_sitearch}/Crypto/Util/ + %changelog -* Thu May 05 2005 Thorsten Leemhuis - 0:2.0-3 +* Wed Aug 17 2005 Thorsten Leemhuis - 0:2.0.1-1 +- Update to 2.0.1 +- Use Dist +- Drop python-crypto-64bit-unclean.patch, similar patch was applied + upstream + +* Thu May 05 2005 Thorsten Leemhuis - 0:2.0-4 - add python-crypto-64bit-unclean.patch (#156173) +* Mon Mar 21 2005 Seth Vidal - 0:2.0-3 +- iterate release for build on python 2.4 based systems + * Sat Dec 18 2004 Thorsten Leemhuis - 0:2.0-2 - Fix build on x86_64: use python_sitearch for files and patch source - to find gmp + to find gmp * Thu Aug 26 2004 Thorsten Leemhuis - 0:2.0-0.fdr.1 - Update to 2.00 Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-crypto/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 8 Nov 2004 05:15:06 -0000 1.3 +++ sources 17 Aug 2005 19:10:43 -0000 1.4 @@ -1 +1 @@ -55f9875c554ede75ad605d2c7504d94f pycrypto-2.0.tar.gz +4d5674f3898a573691ffb335e8d749cd pycrypto-2.0.1.tar.gz From fedora-extras-commits at redhat.com Wed Aug 17 19:10:45 2005 From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl)) Date: Wed, 17 Aug 2005 15:10:45 -0400 Subject: rpms/python-crypto/FC-4 .cvsignore,1.3,1.4 sources,1.3,1.4 Message-ID: <200508171911.j7HJBFd0012584@cvs-int.fedora.redhat.com> Author: thl Update of /cvs/extras/rpms/python-crypto/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12518/FC-4 Modified Files: .cvsignore sources Log Message: Update to 2.0.1; Use Dist; Drop python-crypto-64bit-unclean.patch, similar patch was applied upstream Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-crypto/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Nov 2004 05:15:06 -0000 1.3 +++ .cvsignore 17 Aug 2005 19:10:43 -0000 1.4 @@ -1 +1 @@ -pycrypto-2.0.tar.gz +pycrypto-2.0.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-crypto/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 8 Nov 2004 05:15:06 -0000 1.3 +++ sources 17 Aug 2005 19:10:43 -0000 1.4 @@ -1 +1 @@ -55f9875c554ede75ad605d2c7504d94f pycrypto-2.0.tar.gz +4d5674f3898a573691ffb335e8d749cd pycrypto-2.0.1.tar.gz From fedora-extras-commits at redhat.com Wed Aug 17 19:15:11 2005 From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl)) Date: Wed, 17 Aug 2005 15:15:11 -0400 Subject: rpms/python-crypto/FC-3 python-crypto-64bit-unclean.patch,1.1,NONE Message-ID: <200508171915.j7HJFBeH012887@cvs-int.fedora.redhat.com> Author: thl Update of /cvs/extras/rpms/python-crypto/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12864/FC-3 Removed Files: python-crypto-64bit-unclean.patch Log Message: Update to 2.0.1; Use Dist; Drop python-crypto-64bit-unclean.patch, similar patch was applied upstream; remove old files --- python-crypto-64bit-unclean.patch DELETED --- From fedora-extras-commits at redhat.com Wed Aug 17 19:15:11 2005 From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl)) Date: Wed, 17 Aug 2005 15:15:11 -0400 Subject: rpms/python-crypto/FC-4 python-crypto.spec, 1.8, 1.9 python-crypto-64bit-unclean.patch, 1.1, NONE Message-ID: <200508171915.j7HJFgSp012897@cvs-int.fedora.redhat.com> Author: thl Update of /cvs/extras/rpms/python-crypto/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12864/FC-4 Modified Files: python-crypto.spec Removed Files: python-crypto-64bit-unclean.patch Log Message: Update to 2.0.1; Use Dist; Drop python-crypto-64bit-unclean.patch, similar patch was applied upstream; remove old files Index: python-crypto.spec =================================================================== RCS file: /cvs/extras/rpms/python-crypto/FC-4/python-crypto.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- python-crypto.spec 5 May 2005 12:53:52 -0000 1.8 +++ python-crypto.spec 17 Aug 2005 19:15:09 -0000 1.9 @@ -3,14 +3,13 @@ Summary: Cryptography library for Python Name: python-crypto -Version: 2.0 -Release: 4 +Version: 2.0.1 +Release: 1%{?dist} License: Python License (CNRI Python License) Group: Development/Libraries URL: http://www.amk.ca/python/code/crypto.html -Source: http://www.amk.ca/files/python/crypto/pycrypto-2.0.tar.gz +Source: http://www.amk.ca/files/python/crypto/pycrypto-2.0.1.tar.gz Patch0: %{name}-x86_64-buildfix.patch -Patch1: %{name}-64bit-unclean.patch BuildRequires: python >= 2.2 BuildRequires: python-devel >= 2.2 BuildRequires: gmp-devel >= 4.1 @@ -22,33 +21,31 @@ SHA), and various encryption algorithms (AES, DES, IDEA, RSA, ElGamal, etc.). -# The pre section. + %prep -%setup -n pycrypto-2.0 -q +%setup -n pycrypto-%{version} -q %ifarch x86_64 %patch0 -b .patch0 %endif -%patch1 -b .patch1 -p 1 -# The build section. + %build CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build -# The install section. + %install rm -rf $RPM_BUILD_ROOT %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT - find -name "*.py"|xargs %{__perl} -pi -e "s:/usr/local/bin/python:%{__python}:" -# The clean section. + %clean rm -rf $RPM_BUILD_ROOT -# The files section. + %files %defattr(-,root,root,-) -%doc README TODO ACKS ChangeLog LICENSE Doc Demo +%doc README TODO ACKS ChangeLog LICENSE Doc %{python_sitearch}/Crypto/*.py %{python_sitearch}/Crypto/*.pyc %ghost %{python_sitearch}/Crypto/*.pyo @@ -77,7 +74,14 @@ %dir %{python_sitearch}/Crypto/PublicKey/ %dir %{python_sitearch}/Crypto/Util/ + %changelog +* Wed Aug 17 2005 Thorsten Leemhuis - 0:2.0.1-1 +- Update to 2.0.1 +- Use Dist +- Drop python-crypto-64bit-unclean.patch, similar patch was applied + upstream + * Thu May 05 2005 Thorsten Leemhuis - 0:2.0-4 - add python-crypto-64bit-unclean.patch (#156173) --- python-crypto-64bit-unclean.patch DELETED --- From fedora-extras-commits at redhat.com Wed Aug 17 20:37:15 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Wed, 17 Aug 2005 16:37:15 -0400 Subject: owners owners.list,1.90,1.91 Message-ID: <200508172037.j7HKbFeA014290@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14273 Modified Files: owners.list Log Message: - add libetpan - add koffice-langpack - take koffice ownership Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.90 retrieving revision 1.91 diff -u -r1.90 -r1.91 --- owners.list 17 Aug 2005 17:02:14 -0000 1.90 +++ owners.list 17 Aug 2005 20:37:12 -0000 1.91 @@ -336,7 +336,8 @@ Fedora Extras|kid3|Efficient ID3 tagger|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|kile|LaTeX source editor and TeX shell|rdieter at math.unl.edu|extras-qa at fedoraproject.org| Fedora Extras|kinput2|Japanese kanji input server for X11|tagoh at redhat.com|extras-qa at fedoraproject.org| -Fedora Extras|koffice|A set of office applications for KDE|than at redhat.com|extras-qa at fedoraproject.org| +Fedora Extras|koffice|A set of office applications for KDE|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| +Fedora Extras|koffice-langpack|Language files for koffic|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|konversation|An easy to use irc client for KDE|dennis at ausil.us|extras-qa at fedoraproject.org| Fedora Extras|kover|WYSIWYG CD cover printer with CDDB support|adrian at lisas.de|extras-qa at fedoraproject.org| Fedora Extras|kphone|A SIP (Session Initiation Protocol) user agent for Linux|dennis at dgilmore.net|extras-qa at fedoraproject.org| @@ -364,6 +365,7 @@ Fedora Extras|libdnet|Simple portable interface to lowlevel networking routines|oliver at linux-kernel.at|extras-qa at fedoraproject.org| Fedora Extras|libebml|The Extensible Binary Meta Language library|anvil at livna.org|extras-qa at fedoraproject.org| Fedora Extras|libesmtp|SMTP client library|pawsa at theochem.kth.se|extras-qa at fedoraproject.org| +Fedora Extras|libetpan|Portable, efficient middleware for different kinds of mail access|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|libevent|Abstract asynchronous event notification library|redhat-bugzilla at camperquake.de|extras-qa at fedoraproject.org| Fedora Extras|libfac|An extension to Singular-factory|rdieter at math.unl.edu|extras-qa at fedoraproject.org| Fedora Extras|libfwbuilder|Firewall Builder API|sgrubb at redhat.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Wed Aug 17 21:28:43 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Wed, 17 Aug 2005 17:28:43 -0400 Subject: rpms/synergy/devel .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 synergy.spec, 1.9, 1.10 Message-ID: <200508172128.j7HLShtx015901@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/synergy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15877 Modified Files: .cvsignore sources synergy.spec Log Message: Update to 1.2.4. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/synergy/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 3 Aug 2005 16:23:03 -0000 1.5 +++ .cvsignore 17 Aug 2005 21:28:41 -0000 1.6 @@ -1 +1 @@ -synergy-1.2.3.tar.gz +synergy-1.2.4.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/synergy/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 3 Aug 2005 16:23:03 -0000 1.5 +++ sources 17 Aug 2005 21:28:41 -0000 1.6 @@ -1 +1 @@ -76914a4e62603647eb82bd68017e623d synergy-1.2.3.tar.gz +71e174502b6495a51a1e830aff3cf428 synergy-1.2.4.tar.gz Index: synergy.spec =================================================================== RCS file: /cvs/extras/rpms/synergy/devel/synergy.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- synergy.spec 3 Aug 2005 16:23:03 -0000 1.9 +++ synergy.spec 17 Aug 2005 21:28:41 -0000 1.10 @@ -1,6 +1,6 @@ Summary: Mouse and keyboard sharing utility Name: synergy -Version: 1.2.3 +Version: 1.2.4 Release: 1%{?dist} License: GPL Group: System Environment/Daemons @@ -43,10 +43,14 @@ %doc AUTHORS ChangeLog COPYING NEWS README doc/PORTING %doc doc/*.html doc/*.css %doc examples/synergy.conf -%{_bindir}/* +%{_bindir}/synergyc +%{_bindir}/synergys %changelog +* Wed Aug 17 2005 Matthias Saou 1.2.4-1 +- Update to 1.2.4, -Werror patch still required. + * Wed Aug 3 2005 Matthias Saou 1.2.3-1 - Update to 1.2.3, -Werror patch still required (only for warn_unused_result anyway). From fedora-extras-commits at redhat.com Wed Aug 17 21:37:17 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Wed, 17 Aug 2005 17:37:17 -0400 Subject: rpms/clisp/FC-4 clisp.spec,1.1,1.2 Message-ID: <200508172137.j7HLbHU9016003@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/clisp/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15986 Modified Files: clisp.spec Log Message: fix libdir Index: clisp.spec =================================================================== RCS file: /cvs/extras/rpms/clisp/FC-4/clisp.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- clisp.spec 17 Aug 2005 18:26:10 -0000 1.1 +++ clisp.spec 17 Aug 2005 21:37:15 -0000 1.2 @@ -1,7 +1,7 @@ Name: clisp Summary: Common Lisp (ANSI CL) implementation Version: 2.34 -Release: 1%{?dist} +Release: 2%{?dist} Group: Development/Languages License: GPL @@ -43,6 +43,7 @@ sed -i -e 's|^ make check$||' configure # setting CFLAGS breaks the build ./configure --prefix=%{_prefix} \ + --libdir=%{_libdir} \ --fsstnd=redhat \ --with-dynamic-ffi \ --with-module=berkeley-db \ @@ -62,7 +63,7 @@ %install rm -rf $RPM_BUILD_ROOT -make -C src prefix=%{_prefix} DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install +make -C src prefix=%{_prefix} libdir=%{_libdir} DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install rm -f $RPM_BUILD_ROOT%{_docdir}/clisp-%{version}/doc/clisp.{dvi,1,ps} cp -p doc/mop-spec.pdf $RPM_BUILD_ROOT%{_docdir}/clisp-%{version}/doc %find_lang %{name} @@ -106,17 +107,8 @@ %changelog +* Wed Aug 17 2005 Gerard Milmeister - 2.34-2 +- Fix libdir for x86_64 + * Tue Aug 16 2005 Gerard Milmeister - 2.34-1 - New Version 2.34 - -* Sun Apr 10 2005 Gerard Milmeister - 2.33.2-2 -- Simpler build command - -* Fri Feb 18 2005 Gerard Milmeister - 0:2.33.2-1 -- New Version 2.33.2 - -* Sat Mar 20 2004 Gerard Milmeister - 0:2.33-0.fdr.1 -- New Version 2.33 - -* Tue Oct 21 2003 Gerard Milmeister - 0:2.31-0.fdr.1 -- First fedora release From fedora-extras-commits at redhat.com Wed Aug 17 21:39:04 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Wed, 17 Aug 2005 17:39:04 -0400 Subject: rpms/synergy/FC-3 .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 synergy.spec, 1.6, 1.7 Message-ID: <200508172139.j7HLd4jI016087@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/synergy/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16052/FC-3 Modified Files: .cvsignore sources synergy.spec Log Message: Update to 1.2.4. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/synergy/FC-3/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 3 Aug 2005 16:22:57 -0000 1.5 +++ .cvsignore 17 Aug 2005 21:39:02 -0000 1.6 @@ -1 +1 @@ -synergy-1.2.3.tar.gz +synergy-1.2.4.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/synergy/FC-3/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 3 Aug 2005 16:22:57 -0000 1.5 +++ sources 17 Aug 2005 21:39:02 -0000 1.6 @@ -1 +1 @@ -76914a4e62603647eb82bd68017e623d synergy-1.2.3.tar.gz +71e174502b6495a51a1e830aff3cf428 synergy-1.2.4.tar.gz Index: synergy.spec =================================================================== RCS file: /cvs/extras/rpms/synergy/FC-3/synergy.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- synergy.spec 3 Aug 2005 16:22:57 -0000 1.6 +++ synergy.spec 17 Aug 2005 21:39:02 -0000 1.7 @@ -1,6 +1,6 @@ Summary: Mouse and keyboard sharing utility Name: synergy -Version: 1.2.3 +Version: 1.2.4 Release: 1%{?dist} License: GPL Group: System Environment/Daemons @@ -43,10 +43,14 @@ %doc AUTHORS ChangeLog COPYING NEWS README doc/PORTING %doc doc/*.html doc/*.css %doc examples/synergy.conf -%{_bindir}/* +%{_bindir}/synergyc +%{_bindir}/synergys %changelog +* Wed Aug 17 2005 Matthias Saou 1.2.4-1 +- Update to 1.2.4, -Werror patch still required. + * Wed Aug 3 2005 Matthias Saou 1.2.3-1 - Update to 1.2.3, -Werror patch still required (only for warn_unused_result anyway). From fedora-extras-commits at redhat.com Wed Aug 17 21:39:05 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Wed, 17 Aug 2005 17:39:05 -0400 Subject: rpms/synergy/FC-4 .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 synergy.spec, 1.9, 1.10 Message-ID: <200508172139.j7HLd5pU016095@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/synergy/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16052/FC-4 Modified Files: .cvsignore sources synergy.spec Log Message: Update to 1.2.4. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/synergy/FC-4/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 3 Aug 2005 16:22:57 -0000 1.5 +++ .cvsignore 17 Aug 2005 21:39:03 -0000 1.6 @@ -1 +1 @@ -synergy-1.2.3.tar.gz +synergy-1.2.4.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/synergy/FC-4/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 3 Aug 2005 16:22:57 -0000 1.5 +++ sources 17 Aug 2005 21:39:03 -0000 1.6 @@ -1 +1 @@ -76914a4e62603647eb82bd68017e623d synergy-1.2.3.tar.gz +71e174502b6495a51a1e830aff3cf428 synergy-1.2.4.tar.gz Index: synergy.spec =================================================================== RCS file: /cvs/extras/rpms/synergy/FC-4/synergy.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- synergy.spec 3 Aug 2005 16:22:57 -0000 1.9 +++ synergy.spec 17 Aug 2005 21:39:03 -0000 1.10 @@ -1,6 +1,6 @@ Summary: Mouse and keyboard sharing utility Name: synergy -Version: 1.2.3 +Version: 1.2.4 Release: 1%{?dist} License: GPL Group: System Environment/Daemons @@ -43,10 +43,14 @@ %doc AUTHORS ChangeLog COPYING NEWS README doc/PORTING %doc doc/*.html doc/*.css %doc examples/synergy.conf -%{_bindir}/* +%{_bindir}/synergyc +%{_bindir}/synergys %changelog +* Wed Aug 17 2005 Matthias Saou 1.2.4-1 +- Update to 1.2.4, -Werror patch still required. + * Wed Aug 3 2005 Matthias Saou 1.2.3-1 - Update to 1.2.3, -Werror patch still required (only for warn_unused_result anyway). From fedora-extras-commits at redhat.com Wed Aug 17 21:45:56 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Wed, 17 Aug 2005 17:45:56 -0400 Subject: rpms/clisp/FC-3 clisp.spec,1.1,1.2 Message-ID: <200508172145.j7HLjuSj016218@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/clisp/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16201 Modified Files: clisp.spec Log Message: fix libdir Index: clisp.spec =================================================================== RCS file: /cvs/extras/rpms/clisp/FC-3/clisp.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- clisp.spec 17 Aug 2005 18:26:10 -0000 1.1 +++ clisp.spec 17 Aug 2005 21:45:54 -0000 1.2 @@ -1,7 +1,7 @@ Name: clisp Summary: Common Lisp (ANSI CL) implementation Version: 2.34 -Release: 1%{?dist} +Release: 2%{?dist} Group: Development/Languages License: GPL @@ -43,6 +43,7 @@ sed -i -e 's|^ make check$||' configure # setting CFLAGS breaks the build ./configure --prefix=%{_prefix} \ + --libdir=%{_libdir} \ --fsstnd=redhat \ --with-dynamic-ffi \ --with-module=berkeley-db \ @@ -62,7 +63,7 @@ %install rm -rf $RPM_BUILD_ROOT -make -C src prefix=%{_prefix} DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install +make -C src prefix=%{_prefix} libdir=%{_libdir} DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install rm -f $RPM_BUILD_ROOT%{_docdir}/clisp-%{version}/doc/clisp.{dvi,1,ps} cp -p doc/mop-spec.pdf $RPM_BUILD_ROOT%{_docdir}/clisp-%{version}/doc %find_lang %{name} @@ -106,17 +107,8 @@ %changelog +* Wed Aug 17 2005 Gerard Milmeister - 2.34-2 +- Fix libdir for x86_64 + * Tue Aug 16 2005 Gerard Milmeister - 2.34-1 - New Version 2.34 - -* Sun Apr 10 2005 Gerard Milmeister - 2.33.2-2 -- Simpler build command - -* Fri Feb 18 2005 Gerard Milmeister - 0:2.33.2-1 -- New Version 2.33.2 - -* Sat Mar 20 2004 Gerard Milmeister - 0:2.33-0.fdr.1 -- New Version 2.33 - -* Tue Oct 21 2003 Gerard Milmeister - 0:2.31-0.fdr.1 -- First fedora release From fedora-extras-commits at redhat.com Wed Aug 17 21:46:06 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Wed, 17 Aug 2005 17:46:06 -0400 Subject: rpms/clisp/devel clisp.spec,1.1,1.2 Message-ID: <200508172146.j7HLk6rb016241@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/clisp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16224 Modified Files: clisp.spec Log Message: fix libdir Index: clisp.spec =================================================================== RCS file: /cvs/extras/rpms/clisp/devel/clisp.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- clisp.spec 17 Aug 2005 18:26:10 -0000 1.1 +++ clisp.spec 17 Aug 2005 21:46:04 -0000 1.2 @@ -1,7 +1,7 @@ Name: clisp Summary: Common Lisp (ANSI CL) implementation Version: 2.34 -Release: 1%{?dist} +Release: 2%{?dist} Group: Development/Languages License: GPL @@ -43,6 +43,7 @@ sed -i -e 's|^ make check$||' configure # setting CFLAGS breaks the build ./configure --prefix=%{_prefix} \ + --libdir=%{_libdir} \ --fsstnd=redhat \ --with-dynamic-ffi \ --with-module=berkeley-db \ @@ -62,7 +63,7 @@ %install rm -rf $RPM_BUILD_ROOT -make -C src prefix=%{_prefix} DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install +make -C src prefix=%{_prefix} libdir=%{_libdir} DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install rm -f $RPM_BUILD_ROOT%{_docdir}/clisp-%{version}/doc/clisp.{dvi,1,ps} cp -p doc/mop-spec.pdf $RPM_BUILD_ROOT%{_docdir}/clisp-%{version}/doc %find_lang %{name} @@ -106,17 +107,8 @@ %changelog +* Wed Aug 17 2005 Gerard Milmeister - 2.34-2 +- Fix libdir for x86_64 + * Tue Aug 16 2005 Gerard Milmeister - 2.34-1 - New Version 2.34 - -* Sun Apr 10 2005 Gerard Milmeister - 2.33.2-2 -- Simpler build command - -* Fri Feb 18 2005 Gerard Milmeister - 0:2.33.2-1 -- New Version 2.33.2 - -* Sat Mar 20 2004 Gerard Milmeister - 0:2.33-0.fdr.1 -- New Version 2.33 - -* Tue Oct 21 2003 Gerard Milmeister - 0:2.31-0.fdr.1 -- First fedora release From fedora-extras-commits at redhat.com Wed Aug 17 21:58:01 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Wed, 17 Aug 2005 17:58:01 -0400 Subject: rpms/clisp/FC-4 clisp.spec,1.2,1.3 Message-ID: <200508172158.j7HLw1cE016307@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/clisp/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16290 Modified Files: clisp.spec Log Message: exclude arch ppc Index: clisp.spec =================================================================== RCS file: /cvs/extras/rpms/clisp/FC-4/clisp.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- clisp.spec 17 Aug 2005 21:37:15 -0000 1.2 +++ clisp.spec 17 Aug 2005 21:57:59 -0000 1.3 @@ -1,7 +1,7 @@ Name: clisp Summary: Common Lisp (ANSI CL) implementation Version: 2.34 -Release: 2%{?dist} +Release: 3%{?dist} Group: Development/Languages License: GPL @@ -10,7 +10,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: readline-devel, XFree86-devel, gettext, pcre-devel, postgresql-devel BuildRequires: libsigsegv-devel, db4-devel, zlib-devel - +ExcludeArch: ppc ppc64 %description Common Lisp is a high-level, general-purpose programming language. @@ -107,6 +107,9 @@ %changelog +* Wed Aug 17 2005 Gerard Milmeister - 2.34-3 +- Build fails on ppc, exclude for now + * Wed Aug 17 2005 Gerard Milmeister - 2.34-2 - Fix libdir for x86_64 From fedora-extras-commits at redhat.com Wed Aug 17 22:12:38 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Wed, 17 Aug 2005 18:12:38 -0400 Subject: rpms/clisp/devel clisp.spec,1.2,1.3 Message-ID: <200508172212.j7HMCcc2017620@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/clisp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17603 Modified Files: clisp.spec Log Message: exclude arch ppc Index: clisp.spec =================================================================== RCS file: /cvs/extras/rpms/clisp/devel/clisp.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- clisp.spec 17 Aug 2005 21:46:04 -0000 1.2 +++ clisp.spec 17 Aug 2005 22:12:36 -0000 1.3 @@ -1,7 +1,7 @@ Name: clisp Summary: Common Lisp (ANSI CL) implementation Version: 2.34 -Release: 2%{?dist} +Release: 3%{?dist} Group: Development/Languages License: GPL @@ -10,7 +10,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: readline-devel, XFree86-devel, gettext, pcre-devel, postgresql-devel BuildRequires: libsigsegv-devel, db4-devel, zlib-devel - +ExcludeArch: ppc ppc64 %description Common Lisp is a high-level, general-purpose programming language. @@ -107,6 +107,9 @@ %changelog +* Wed Aug 17 2005 Gerard Milmeister - 2.34-3 +- Build fails on ppc, exclude for now + * Wed Aug 17 2005 Gerard Milmeister - 2.34-2 - Fix libdir for x86_64 From fedora-extras-commits at redhat.com Wed Aug 17 22:13:23 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Wed, 17 Aug 2005 18:13:23 -0400 Subject: rpms/clisp/FC-3 clisp.spec,1.2,1.3 Message-ID: <200508172213.j7HMDNIJ017707@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/clisp/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17693 Modified Files: clisp.spec Log Message: exclude arch ppc Index: clisp.spec =================================================================== RCS file: /cvs/extras/rpms/clisp/FC-3/clisp.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- clisp.spec 17 Aug 2005 21:45:54 -0000 1.2 +++ clisp.spec 17 Aug 2005 22:13:15 -0000 1.3 @@ -1,7 +1,7 @@ Name: clisp Summary: Common Lisp (ANSI CL) implementation Version: 2.34 -Release: 2%{?dist} +Release: 3%{?dist} Group: Development/Languages License: GPL @@ -10,7 +10,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: readline-devel, XFree86-devel, gettext, pcre-devel, postgresql-devel BuildRequires: libsigsegv-devel, db4-devel, zlib-devel - +ExcludeArch: ppc ppc64 %description Common Lisp is a high-level, general-purpose programming language. @@ -107,6 +107,9 @@ %changelog +* Wed Aug 17 2005 Gerard Milmeister - 2.34-3 +- Build fails on ppc, exclude for now + * Wed Aug 17 2005 Gerard Milmeister - 2.34-2 - Fix libdir for x86_64 From fedora-extras-commits at redhat.com Wed Aug 17 22:14:18 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Wed, 17 Aug 2005 18:14:18 -0400 Subject: rpms/clisp/FC-3 clisp.spec,1.3,1.4 Message-ID: <200508172214.j7HMEI1f017765@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/clisp/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17751 Modified Files: clisp.spec Log Message: exclude arch ppc Index: clisp.spec =================================================================== RCS file: /cvs/extras/rpms/clisp/FC-3/clisp.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- clisp.spec 17 Aug 2005 22:13:15 -0000 1.3 +++ clisp.spec 17 Aug 2005 22:14:16 -0000 1.4 @@ -1,7 +1,7 @@ Name: clisp Summary: Common Lisp (ANSI CL) implementation Version: 2.34 -Release: 3%{?dist} +Release: 4%{?dist} Group: Development/Languages License: GPL From fedora-extras-commits at redhat.com Wed Aug 17 22:25:33 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Wed, 17 Aug 2005 18:25:33 -0400 Subject: rpms/clisp/FC-3 clisp.spec,1.4,1.5 Message-ID: <200508172225.j7HMPXn1017869@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/clisp/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17855 Modified Files: clisp.spec Log Message: disable postgres Index: clisp.spec =================================================================== RCS file: /cvs/extras/rpms/clisp/FC-3/clisp.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- clisp.spec 17 Aug 2005 22:14:16 -0000 1.4 +++ clisp.spec 17 Aug 2005 22:25:31 -0000 1.5 @@ -1,14 +1,14 @@ Name: clisp Summary: Common Lisp (ANSI CL) implementation Version: 2.34 -Release: 4%{?dist} +Release: 5%{?dist} Group: Development/Languages License: GPL URL: http://sourceforge.net/projects/clisp Source: http://download.sourceforge.net/clisp/clisp-2.34.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: readline-devel, XFree86-devel, gettext, pcre-devel, postgresql-devel +BuildRequires: readline-devel, XFree86-devel, gettext, pcre-devel BuildRequires: libsigsegv-devel, db4-devel, zlib-devel ExcludeArch: ppc ppc64 @@ -50,7 +50,6 @@ --with-module=clx/new-clx \ --with-module=i18n \ --with-module=pcre \ - --with-module=postgresql \ --with-module=rawsock \ --with-module=regexp \ --with-module=syscalls \ @@ -107,6 +106,9 @@ %changelog +* Thu Aug 18 2005 Gerard Milmeister - 2.34-5 +- Don't build with postgres (8.0 required) + * Wed Aug 17 2005 Gerard Milmeister - 2.34-3 - Build fails on ppc, exclude for now From fedora-extras-commits at redhat.com Wed Aug 17 22:26:31 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Wed, 17 Aug 2005 18:26:31 -0400 Subject: common tobuild,1.2209,1.2210 Message-ID: <200508172227.j7HMRFpK017938@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17921 Modified Files: tobuild Log Message: request build of rpms/clisp/FC-3 clisp-2_34-5_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2209 retrieving revision 1.2210 diff -u -r1.2209 -r1.2210 --- tobuild 17 Aug 2005 14:12:11 -0000 1.2209 +++ tobuild 17 Aug 2005 22:26:29 -0000 1.2210 @@ -35,3 +35,4 @@ gemi rpms/plt-scheme/devel plt-scheme-299_200-1_fc5 devel jnovy rpms/cproto/devel cproto-4_7c-7 devel joost rpms/fpc/FC-3 fpc-2_0_0-1 fc3 +gemi rpms/clisp/FC-3 clisp-2_34-5_fc3 fc3 From fedora-extras-commits at redhat.com Wed Aug 17 22:30:31 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Wed, 17 Aug 2005 18:30:31 -0400 Subject: owners owners.list,1.91,1.92 Message-ID: <200508172230.j7HMUV8U017978@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17961 Modified Files: owners.list Log Message: added clisp Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.91 retrieving revision 1.92 diff -u -r1.91 -r1.92 --- owners.list 17 Aug 2005 20:37:12 -0000 1.91 +++ owners.list 17 Aug 2005 22:30:28 -0000 1.92 @@ -81,6 +81,7 @@ Fedora Extras|chkrootkit|A tool to locally check for signs of a rootkit|bugs.michael at gmx.net|extras-qa at fedoraproject.org| Fedora Extras|cksfv|Utility to manipulate SFV files|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|clamav|End-user tools for the Clam Antivirus scanner|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org| +Fedora Extras|clisp|Common Lisp (ANSI CL) implementation|gemi at bluewin.ch|extras-qa at fedoraproject.org| Fedora Extras|cln|Class Library for Numbers|qspencer at ieee.org|extras-qa at fedoraproject.org| Fedora Extras|Coin2|A high-level 3D visualization library|rc040203 at freenet.de|extras-qa at fedoraproject.org| Fedora Extras|colordiff|Color terminal highlighter for diff files|ville.skytta at iki.fi|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Wed Aug 17 22:42:30 2005 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Wed, 17 Aug 2005 18:42:30 -0400 Subject: rpms/perl-Class-Container - New directory Message-ID: <200508172242.j7HMgUjq018065@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Class-Container In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18047/perl-Class-Container Log Message: Directory /cvs/extras/rpms/perl-Class-Container added to the repository From fedora-extras-commits at redhat.com Wed Aug 17 22:42:32 2005 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Wed, 17 Aug 2005 18:42:32 -0400 Subject: rpms/perl-Class-Container/devel - New directory Message-ID: <200508172242.j7HMgWmV018074@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Class-Container/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18047/perl-Class-Container/devel Log Message: Directory /cvs/extras/rpms/perl-Class-Container/devel added to the repository From fedora-extras-commits at redhat.com Wed Aug 17 22:42:51 2005 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Wed, 17 Aug 2005 18:42:51 -0400 Subject: rpms/perl-Class-Container Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200508172242.j7HMgpRg018123@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Class-Container In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18092 Added Files: Makefile import.log Log Message: Setup of module perl-Class-Container --- NEW FILE Makefile --- # Top level Makefile for module perl-Class-Container all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Wed Aug 17 22:42:51 2005 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Wed, 17 Aug 2005 18:42:51 -0400 Subject: rpms/perl-Class-Container/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200508172242.j7HMgpow018128@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Class-Container/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18092/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Class-Container --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Wed Aug 17 22:43:28 2005 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Wed, 17 Aug 2005 18:43:28 -0400 Subject: rpms/perl-Class-Container/devel perl-Class-Container.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200508172243.j7HMhS9I018194@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Class-Container/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18156/devel Modified Files: .cvsignore sources Added Files: perl-Class-Container.spec Log Message: auto-import perl-Class-Container-0.12-1 on branch devel from perl-Class-Container-0.12-1.src.rpm --- NEW FILE perl-Class-Container.spec --- %{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)} Name: perl-Class-Container Version: 0.12 Release: 1%{?dist} Summary: Class::Container Perl module License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Class-Container/ Source0: http://www.cpan.org/modules/by-module/Class/Class-Container-0.12.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Params::Validate) >= 0.23 BuildRequires: perl(Scalar::Util) Requires: perl(Params::Validate) >= 0.23 Requires: perl(Scalar::Util) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description This class facilitates building frameworks of several classes that inter-operate. It was first designed and built for "HTML::Mason", in which the Compiler, Lexer, Interpreter, Resolver, Component, Buffer, and several other objects must create each other transparently, passing the appropriate parameters to the right class, possibly substituting other subclasses for any of these objects. The main features of "Class::Container" are: * Explicit declaration of containment relationships (aggregation, factory creation, etc.) * Declaration of constructor parameters accepted by each member in a class framework * Transparent passing of constructor parameters to the class that needs them * Ability to create one (automatic) or many (manual) contained objects automatically and transparently %prep %setup -q -n Class-Container-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor %{__perl} -pi -e 's/^\tLD_RUN_PATH=[^\s]+\s*/\t/' Makefile make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null \; chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* %check || : make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Tue Aug 16 2005 Steven Pritchard 0.12-1 - Specfile autogenerated. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Container/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 17 Aug 2005 22:42:49 -0000 1.1 +++ .cvsignore 17 Aug 2005 22:43:26 -0000 1.2 @@ -0,0 +1 @@ +Class-Container-0.12.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Container/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 17 Aug 2005 22:42:49 -0000 1.1 +++ sources 17 Aug 2005 22:43:26 -0000 1.2 @@ -0,0 +1 @@ +6896bdb4464b96ad638e22b0400acbc9 Class-Container-0.12.tar.gz From fedora-extras-commits at redhat.com Wed Aug 17 22:43:28 2005 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Wed, 17 Aug 2005 18:43:28 -0400 Subject: rpms/perl-Class-Container import.log,1.1,1.2 Message-ID: <200508172243.j7HMhSh6018187@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Class-Container In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18156 Modified Files: import.log Log Message: auto-import perl-Class-Container-0.12-1 on branch devel from perl-Class-Container-0.12-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Container/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 17 Aug 2005 22:42:49 -0000 1.1 +++ import.log 17 Aug 2005 22:43:26 -0000 1.2 @@ -0,0 +1 @@ +perl-Class-Container-0_12-1:HEAD:perl-Class-Container-0.12-1.src.rpm:1124318596 From fedora-extras-commits at redhat.com Wed Aug 17 22:46:29 2005 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Wed, 17 Aug 2005 18:46:29 -0400 Subject: rpms/perl-Class-Container/devel perl-Class-Container.spec,1.1,1.2 Message-ID: <200508172246.j7HMkTbl018281@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Class-Container/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18264 Modified Files: perl-Class-Container.spec Log Message: Minor spec cleanup. Index: perl-Class-Container.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Container/devel/perl-Class-Container.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Class-Container.spec 17 Aug 2005 22:43:26 -0000 1.1 +++ perl-Class-Container.spec 17 Aug 2005 22:46:27 -0000 1.2 @@ -1,8 +1,6 @@ -%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)} - Name: perl-Class-Container Version: 0.12 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Class::Container Perl module License: GPL or Artistic Group: Development/Libraries @@ -43,7 +41,6 @@ %build %{__perl} Makefile.PL INSTALLDIRS=vendor -%{__perl} -pi -e 's/^\tLD_RUN_PATH=[^\s]+\s*/\t/' Makefile make %{?_smp_mflags} %install @@ -56,7 +53,7 @@ chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* -%check || : +%check make test %clean @@ -69,5 +66,8 @@ %{_mandir}/man3/* %changelog +* Wed Aug 17 2005 Steven Pritchard 0.12-2 +- Minor spec cleanup + * Tue Aug 16 2005 Steven Pritchard 0.12-1 - Specfile autogenerated. From fedora-extras-commits at redhat.com Wed Aug 17 22:50:50 2005 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Wed, 17 Aug 2005 18:50:50 -0400 Subject: rpms/perl-Exception-Class/devel - New directory Message-ID: <200508172250.j7HMooj2018441@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Exception-Class/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18386/perl-Exception-Class/devel Log Message: Directory /cvs/extras/rpms/perl-Exception-Class/devel added to the repository From fedora-extras-commits at redhat.com Wed Aug 17 22:50:49 2005 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Wed, 17 Aug 2005 18:50:49 -0400 Subject: rpms/perl-Exception-Class - New directory Message-ID: <200508172250.j7HMonDI018434@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Exception-Class In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18386/perl-Exception-Class Log Message: Directory /cvs/extras/rpms/perl-Exception-Class added to the repository From fedora-extras-commits at redhat.com Wed Aug 17 22:50:57 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Wed, 17 Aug 2005 18:50:57 -0400 Subject: rpms/OpenEXR/devel OpenEXR.spec,1.5,1.6 Message-ID: <200508172250.j7HMovXX018474@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/OpenEXR/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18411/devel Modified Files: OpenEXR.spec Log Message: Don't drink and maintain... Index: OpenEXR.spec =================================================================== RCS file: /cvs/extras/rpms/OpenEXR/devel/OpenEXR.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- OpenEXR.spec 16 Aug 2005 16:17:01 -0000 1.5 +++ OpenEXR.spec 17 Aug 2005 22:50:54 -0000 1.6 @@ -1,6 +1,6 @@ Name: OpenEXR Version: 1.2.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A high dynamic-range (HDR) image file format Group: System Environment/Libraries @@ -62,11 +62,13 @@ %doc %{_defaultdocdir}/%{name}-devel-%{version}/IlmImfExamples %{_datadir}/aclocal/* %{_includedir}/OpenEXR -%{_libdir}/*.a %{_libdir}/*.so %{_libdir}/pkgconfig/* %changelog +* Wed Aug 17 2005 Ignacio Vazquez-Abrams 1.2.2-5 +- Remove *.a from %%files devel + * Tue Aug 16 2005 Ignacio Vazquez-Abrams 1.2.2-4 - Removed -devel dep on zlib-devel (#165729) - Added --disable-static to %%configure From fedora-extras-commits at redhat.com Wed Aug 17 22:51:07 2005 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Wed, 17 Aug 2005 18:51:07 -0400 Subject: rpms/perl-Exception-Class Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200508172251.j7HMp7tI018515@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Exception-Class In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18484 Added Files: Makefile import.log Log Message: Setup of module perl-Exception-Class --- NEW FILE Makefile --- # Top level Makefile for module perl-Exception-Class all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Wed Aug 17 22:51:08 2005 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Wed, 17 Aug 2005 18:51:08 -0400 Subject: rpms/perl-Exception-Class/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200508172251.j7HMp8Q9018520@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Exception-Class/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18484/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Exception-Class --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Wed Aug 17 22:50:51 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Wed, 17 Aug 2005 18:50:51 -0400 Subject: rpms/OpenEXR/FC-4 OpenEXR.spec,1.5,1.6 Message-ID: <200508172251.j7HMpMdD018536@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/OpenEXR/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18411/FC-4 Modified Files: OpenEXR.spec Log Message: Don't drink and maintain... Index: OpenEXR.spec =================================================================== RCS file: /cvs/extras/rpms/OpenEXR/FC-4/OpenEXR.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- OpenEXR.spec 16 Aug 2005 16:16:55 -0000 1.5 +++ OpenEXR.spec 17 Aug 2005 22:50:49 -0000 1.6 @@ -1,6 +1,6 @@ Name: OpenEXR Version: 1.2.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A high dynamic-range (HDR) image file format Group: System Environment/Libraries @@ -62,11 +62,13 @@ %doc %{_defaultdocdir}/%{name}-devel-%{version}/IlmImfExamples %{_datadir}/aclocal/* %{_includedir}/OpenEXR -%{_libdir}/*.a %{_libdir}/*.so %{_libdir}/pkgconfig/* %changelog +* Wed Aug 17 2005 Ignacio Vazquez-Abrams 1.2.2-5 +- Remove *.a from %%files devel + * Tue Aug 16 2005 Ignacio Vazquez-Abrams 1.2.2-4 - Removed -devel dep on zlib-devel (#165729) - Added --disable-static to %%configure From fedora-extras-commits at redhat.com Wed Aug 17 22:50:51 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Wed, 17 Aug 2005 18:50:51 -0400 Subject: rpms/OpenEXR/FC-3 OpenEXR.spec,1.7,1.8 Message-ID: <200508172251.j7HMpLMV018533@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/OpenEXR/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18411/FC-3 Modified Files: OpenEXR.spec Log Message: Don't drink and maintain... Index: OpenEXR.spec =================================================================== RCS file: /cvs/extras/rpms/OpenEXR/FC-3/OpenEXR.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- OpenEXR.spec 17 Aug 2005 06:09:44 -0000 1.7 +++ OpenEXR.spec 17 Aug 2005 22:50:48 -0000 1.8 @@ -1,6 +1,6 @@ Name: OpenEXR Version: 1.2.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A high dynamic-range (HDR) image file format Group: System Environment/Libraries @@ -60,11 +60,13 @@ %doc %{_defaultdocdir}/%{name}-devel-%{version}/IlmImfExamples %{_datadir}/aclocal/* %{_includedir}/OpenEXR -%{_libdir}/*.a %{_libdir}/*.so %{_libdir}/pkgconfig/* %changelog +* Wed Aug 17 2005 Ignacio Vazquez-Abrams 1.2.2-5 +- Remove *.a from %%files devel + * Tue Aug 16 2005 Ignacio Vazquez-Abrams 1.2.2-4 - Removed -devel dep on zlib-devel (#165729) - Added --disable-static to %%configure From fedora-extras-commits at redhat.com Wed Aug 17 22:51:47 2005 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Wed, 17 Aug 2005 18:51:47 -0400 Subject: rpms/perl-Exception-Class import.log,1.1,1.2 Message-ID: <200508172251.j7HMpl4S018585@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Exception-Class In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18554 Modified Files: import.log Log Message: auto-import perl-Exception-Class-1.21-1 on branch devel from perl-Exception-Class-1.21-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Exception-Class/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 17 Aug 2005 22:51:05 -0000 1.1 +++ import.log 17 Aug 2005 22:51:45 -0000 1.2 @@ -0,0 +1 @@ +perl-Exception-Class-1_21-1:HEAD:perl-Exception-Class-1.21-1.src.rpm:1124319089 From fedora-extras-commits at redhat.com Wed Aug 17 22:51:47 2005 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Wed, 17 Aug 2005 18:51:47 -0400 Subject: rpms/perl-Exception-Class/devel perl-Exception-Class.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200508172251.j7HMplUc018592@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Exception-Class/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18554/devel Modified Files: .cvsignore sources Added Files: perl-Exception-Class.spec Log Message: auto-import perl-Exception-Class-1.21-1 on branch devel from perl-Exception-Class-1.21-1.src.rpm --- NEW FILE perl-Exception-Class.spec --- %{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)} Name: perl-Exception-Class Version: 1.21 Release: 1%{?dist} Summary: Exception::Class Perl module License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Exception-Class/ Source0: http://www.cpan.org/modules/by-module/Exception/Exception-Class-1.21.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Test::More) >= 0.46 BuildRequires: perl(Scalar::Util) BuildRequires: perl(Devel::StackTrace) >= 1.1 BuildRequires: perl(Class::Data::Inheritable) >= 0.02 Requires: perl(Test::More) >= 0.46 Requires: perl(Scalar::Util) Requires: perl(Devel::StackTrace) >= 1.1 Requires: perl(Class::Data::Inheritable) >= 0.02 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description This module allows you to declare hierarchies of exception classes for use in your code. It also provides a simple exception class that it uses as the default base class for all other exceptions. %prep %setup -q -n Exception-Class-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor %{__perl} -pi -e 's/^\tLD_RUN_PATH=[^\s]+\s*/\t/' Makefile make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null \; chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* %check || : make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes LICENSE README %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Tue Aug 16 2005 Steven Pritchard 1.21-1 - Specfile autogenerated. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Exception-Class/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 17 Aug 2005 22:51:06 -0000 1.1 +++ .cvsignore 17 Aug 2005 22:51:45 -0000 1.2 @@ -0,0 +1 @@ +Exception-Class-1.21.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Exception-Class/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 17 Aug 2005 22:51:06 -0000 1.1 +++ sources 17 Aug 2005 22:51:45 -0000 1.2 @@ -0,0 +1 @@ +3268817e7fa4367209f666bd8e33037c Exception-Class-1.21.tar.gz From fedora-extras-commits at redhat.com Wed Aug 17 23:00:43 2005 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Wed, 17 Aug 2005 19:00:43 -0400 Subject: rpms/perl-Exception-Class/devel perl-Exception-Class.spec,1.1,1.2 Message-ID: <200508172300.j7HN0hEJ018763@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Exception-Class/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18746 Modified Files: perl-Exception-Class.spec Log Message: Minor spec cleanup. Index: perl-Exception-Class.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Exception-Class/devel/perl-Exception-Class.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Exception-Class.spec 17 Aug 2005 22:51:45 -0000 1.1 +++ perl-Exception-Class.spec 17 Aug 2005 23:00:40 -0000 1.2 @@ -1,8 +1,6 @@ -%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)} - Name: perl-Exception-Class Version: 1.21 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Exception::Class Perl module License: GPL or Artistic Group: Development/Libraries @@ -30,7 +28,6 @@ %build %{__perl} Makefile.PL INSTALLDIRS=vendor -%{__perl} -pi -e 's/^\tLD_RUN_PATH=[^\s]+\s*/\t/' Makefile make %{?_smp_mflags} %install @@ -43,7 +40,7 @@ chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* -%check || : +%check make test %clean @@ -56,5 +53,8 @@ %{_mandir}/man3/* %changelog +* Wed Aug 17 2005 Steven Pritchard 1.21-2 +- Minor spec cleanup + * Tue Aug 16 2005 Steven Pritchard 1.21-1 - Specfile autogenerated. From fedora-extras-commits at redhat.com Thu Aug 18 00:21:30 2005 From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs)) Date: Wed, 17 Aug 2005 20:21:30 -0400 Subject: rpms/denyhosts/FC-4 README.fedora, NONE, 1.1 denyhosts-0.9.8-setup.patch, NONE, 1.1 denyhosts-1.0.0-config.patch, NONE, 1.1 denyhosts-1.0.0-daemon-control.patch, NONE, 1.1 denyhosts.logrotate, NONE, 1.1 denyhosts.sysconfig, NONE, 1.1 denyhosts.cron, 1.2, 1.3 denyhosts.init, 1.1, 1.2 denyhosts.spec, 1.2, 1.3 sources, 1.3, 1.4 denyhosts-0.5.5-workdir.patch, 1.1, NONE denyhosts-0.6.0-version.patch, 1.1, NONE Message-ID: <200508180021.j7I0LUZD021473@cvs-int.fedora.redhat.com> Author: tibbs Update of /cvs/extras/rpms/denyhosts/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21440 Modified Files: denyhosts.cron denyhosts.init denyhosts.spec sources Added Files: README.fedora denyhosts-0.9.8-setup.patch denyhosts-1.0.0-config.patch denyhosts-1.0.0-daemon-control.patch denyhosts.logrotate denyhosts.sysconfig Removed Files: denyhosts-0.5.5-workdir.patch denyhosts-0.6.0-version.patch Log Message: Pull from development branch. --- NEW FILE README.fedora --- Some useful information about DenyHosts as packaged by Fedora Extras -------------------------------------------------------------------- It installs and runs as a service, so you can start it with: service denyhosts start and enable it at boot time with: chkconfig denyhosts on By default it will process your logs every ten minutes. You can change the interval by editing /etc/cron.d/denyhosts. You can see a description of the file format by running: man 5 crontab By default, DenyHosts is set up to purge old block entries, but only after one year. If you wish to adjust this, edit /etc/denyhosts.conf and look for "PURGE_DENY". The purge procedure is run daily at 5AM. To adjust this frequency, edit /etc/cron.d/denyhosts. DenyHosts will process only your current logfile (/var/log/secure). If you want to incorporate an old logfile (in this example, /var/log/secure.1) , you can run denyhosts.py -c /etc/denyhosts.conf /var/log/secure.1 DenyHosts can also handle logs compressed with gzip or bzip2. Notes about upgrading --------------------- If upgrading from DenyHosts 0.6.0 or earlier, note that this package does not run denyhosts --migrate to make the old entries expirable. This preserves any entries that may have been manually added. You can, of course, run this yourself. This package runs denyhosts --upgrade099 automatically to move any post-0.6.0 and pre-0.9.9 entries into the proper format. denyhosts-0.9.8-setup.patch: --- NEW FILE denyhosts-0.9.8-setup.patch --- --- setup.py.orig 2005-07-22 17:39:17.000000000 -0500 +++ setup.py 2005-08-04 13:06:14.893095036 -0500 @@ -21,13 +21,13 @@ package_dir={'DenyHosts': 'DenyHosts'}, packages=["DenyHosts"], ##py_modules=["denyhosts_version"], - data_files=[(libpath, glob("denyhosts.cfg-dist")), - (libpath, glob("denyhosts-daemon-initscript")), - (libpath, glob("setup.py")), - (libpath, glob("daemon-control-dist")), - (libpath, glob("CHANGELOG.txt")), - (libpath, glob("README.txt")), - (libpath, glob("LICENSE.txt"))], +# data_files=[(libpath, glob("denyhosts.cfg-dist")), +# (libpath, glob("denyhosts-daemon-initscript")), +# (libpath, glob("setup.py")), +# (libpath, glob("daemon-control-dist")), +# (libpath, glob("CHANGELOG.txt")), +# (libpath, glob("README.txt")), +# (libpath, glob("LICENSE.txt"))], license="GPL", ##extra_path='denyhosts', long_description=""" denyhosts-1.0.0-config.patch: --- NEW FILE denyhosts-1.0.0-config.patch --- --- denyhosts.cfg-dist.orig 2005-08-15 10:51:55.000000000 -0500 +++ denyhosts.cfg-dist 2005-08-15 22:26:21.788502326 -0500 @@ -47,13 +47,18 @@ # 'y' = years # # never purge: -PURGE_DENY = +#PURGE_DENY = # # purge entries older than 1 week #PURGE_DENY = 1w # # purge entries older than 5 days #PURGE_DENY = 5d +# +# For the default Fedora Extras install, we want timestamping but no +# expiration (at least by default) so this is deliberately set high. +# Adjust to taste. +PURGE_DENY = 1y ####################################################################### @@ -116,7 +121,7 @@ # Note: when run in daemon mode, this directory should be specified # as an absolute path name (eg. /home/foo/denyhosts/data) # -WORK_DIR = denyhosts +WORK_DIR = /var/lib/denyhosts # ####################################################################### @@ -175,7 +180,7 @@ # match your email address. If you do not want to receive these reports # leave this field blank (or run with the --noemail option) # -ADMIN_EMAIL = +ADMIN_EMAIL = root # ####################################################################### denyhosts-1.0.0-daemon-control.patch: --- NEW FILE denyhosts-1.0.0-daemon-control.patch --- --- daemon-control-dist.orig 2005-08-16 17:31:58.285358954 -0500 +++ daemon-control-dist 2005-08-16 17:33:00.510336919 -0500 @@ -7,7 +7,7 @@ DENYHOSTS_BIN = "/usr/bin/denyhosts.py" DENYHOSTS_LOCK = "/var/lock/subsys/denyhosts" -DENYHOSTS_CFG = "/usr/share/denyhosts/denyhosts.cfg" +DENYHOSTS_CFG = "/etc/denyhosts.conf" ############################################### @@ -104,7 +104,7 @@ try: option = sys.argv[1] - if option in ('start', 'restart'): + if option in ('start', 'restart', 'condrestart'): if '--config' not in args and '-c' not in args: args.append("--config=%s" % DENYHOSTS_CFG) --- NEW FILE denyhosts.logrotate --- /var/log/denyhosts { missingok notifempty size 100k create 0644 root root postrotate /sbin/service denyhosts condrestart > /dev/null 2>&1 || : endscript } --- NEW FILE denyhosts.sysconfig --- # Should DenyHosts run in daemon mode? # If not set to "yes", you also need to edit /etc/cron.d/denyhosts # and uncomment the appropriate lines. DAEMON=yes Index: denyhosts.cron =================================================================== RCS file: /cvs/extras/rpms/denyhosts/FC-4/denyhosts.cron,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- denyhosts.cron 2 Jul 2005 21:38:47 -0000 1.2 +++ denyhosts.cron 18 Aug 2005 00:21:28 -0000 1.3 @@ -1,6 +1,12 @@ -# This defaults to running once every ten minutes, but if your host is being -# heavily attacked then it is reasonable to make it run as frequently as once -# every minute. DenyHosts runs quickly once it has initially processed your -# logs and should not take a significant amount of CPU time. -*/10 * * * * root [ -f /var/lock/subsys/denyhosts ] && /usr/bin/denyhosts.py -c /etc/denyhosts.conf - +# The Fedora default is to use daemon mode, but if you wish to have +# denyhosts run periodically, you can uncomment the appropriate two lines +# and edit /etc/sysconfig/denyhosts. (You will also have to start the +# "service" and set it to run at boot if necessary.) +# +# Run denyhosts occasionally; adjust the time span to your liking +#*/10 * * * * root [ -f /var/lock/subsys/denyhosts.init ] && /usr/bin/denyhosts.py -c /etc/denyhosts.conf +# +# Automatically purge old entries early in the morning. Note that you must +# edit /etc/denyhosts.conf and set PURGE_DENY to something reasonable, as the +# default value purge time is set very high. +#0 5 * * * root [ -f /var/lock/subsys/denyhosts.init ] && /usr/bin/denyhosts.py -c /etc/denyhosts.conf --purge Index: denyhosts.init =================================================================== RCS file: /cvs/extras/rpms/denyhosts/FC-4/denyhosts.init,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- denyhosts.init 20 May 2005 04:57:02 -0000 1.1 +++ denyhosts.init 18 Aug 2005 00:21:28 -0000 1.2 @@ -7,7 +7,7 @@ # # chkconfig: - 50 01 # -# description: Enable periodic execution of denyhosts, an SSH log watcher +# description: Enable execution of denyhosts, an SSH log watcher # processname denyhosts # config: /etc/denyhosts.cfg # @@ -15,29 +15,58 @@ # source function library . /etc/rc.d/init.d/functions -lockfile=/var/lock/subsys/denyhosts - +CONTROL=/usr/bin/denyhosts-control +CRONLOCK=/var/lock/subsys/denyhosts.init +LOCKFILE=/var/lock/subsys/denyhosts RETVAL=0 -start() { +[ -f /etc/sysconfig/denyhosts ] && . /etc/sysconfig/denyhosts + +c_start() { echo -n $"Enabling denyhosts: " - touch "$lockfile" && success || failure + touch "$CRONLOCK" && success || failure RETVAL=$? echo } -stop() { +c_stop() { echo -n $"Disabling denyhosts: " - rm -f "$lockfile" && success || failure + rm -f "$CRONLOCK" && success || failure RETVAL=$? echo } -restart() { - stop - start +c_restart() { + c_stop + c_start +} + +c_condrestart() { + [ -f "$CRONLOCK" ] && c_restart } +c_status() { + if [ -f $CRONLOCK ]; then + echo $"Denyhosts is enabled." + RETVAL=0 + else + echo $"Denyhosts is disabled." + RETVAL=3 + fi +} + +d_condrestart() { $CONTROL condrestart; RETVAL=$?; } +d_restart() { $CONTROL restart; RETVAL=$?; } +d_start() { $CONTROL start; RETVAL=$?; } +d_status() { $CONTROL status; RETVAL=$?; } +d_stop() { $CONTROL stop; RETVAL=$?; } + +condrestart() { if [ $DAEMON = "yes" ]; then d_condrestart; else c_restart; fi } +restart() { if [ $DAEMON = "yes" ]; then d_restart; else c_restart; fi } +start() { if [ $DAEMON = "yes" ]; then d_start; else c_start; fi } +status() { if [ $DAEMON = "yes" ]; then d_status; else c_status; fi } +stop() { if [ $DAEMON = "yes" ]; then d_stop; else c_stop; fi } + case "$1" in start) start @@ -51,16 +80,10 @@ reload) ;; condrestart) - [ -f "$lockfile" ] && restart + condrestart ;; status) - if [ -f $lockfile ]; then - echo $"Denyhosts is enabled." - RETVAL=0 - else - echo $"Denyhosts is disabled." - RETVAL=3 - fi + status ;; *) echo $"Usage: $0 {start|stop|status|restart|reload|force-reload|condrestart}" Index: denyhosts.spec =================================================================== RCS file: /cvs/extras/rpms/denyhosts/FC-4/denyhosts.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- denyhosts.spec 2 Jul 2005 21:38:47 -0000 1.2 +++ denyhosts.spec 18 Aug 2005 00:21:28 -0000 1.3 @@ -1,6 +1,6 @@ Name: denyhosts -Version: 0.6.0 -Release: 1%{?dist} +Version: 1.0.0 +release: 2%{?dist} Summary: A script to help thwart ssh server attacks Group: Applications/System @@ -10,12 +10,16 @@ Source1: denyhosts.cron Source2: denyhosts.init Source3: denyhosts-allowed-hosts -Patch0: denyhosts-0.5.5-workdir.patch -Patch1: denyhosts-0.6.0-version.patch +Source4: denyhosts.sysconfig +Source5: denyhosts.logrotate +Source6: README.fedora +Patch0: denyhosts-1.0.0-config.patch +Patch1: denyhosts-0.9.8-setup.patch +Patch2: denyhosts-1.0.0-daemon-control.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArchitectures: noarch -#BuildRequires: +BuildRequires: python-devel Requires: openssh-server %description @@ -31,21 +35,38 @@ %setup -q -n DenyHosts-%{version} %patch0 -p0 %patch1 -p0 +%patch2 -p0 + +cp %{SOURCE6} . + + +%build +python ./setup.py build + %install rm -rf $RPM_BUILD_ROOT +python ./setup.py install --root=$RPM_BUILD_ROOT --record=%{name}.files install -d $RPM_BUILD_ROOT%{_bindir} + install -d $RPM_BUILD_ROOT%{_initrddir} install -d $RPM_BUILD_ROOT%{_sysconfdir}/cron.d +install -d $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d +install -d $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig install -d -m 700 $RPM_BUILD_ROOT%{_localstatedir}/lib/denyhosts +install -d $RPM_BUILD_ROOT%{_localstatedir}/log -install -p -m 755 denyhosts.py $RPM_BUILD_ROOT%{_bindir} install -p -m 600 denyhosts.cfg-dist $RPM_BUILD_ROOT%{_sysconfdir}/denyhosts.conf +install -p -m 755 daemon-control-dist $RPM_BUILD_ROOT%{_bindir}/denyhosts-control install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/cron.d/denyhosts install -p -m 755 %{SOURCE2} $RPM_BUILD_ROOT%{_initrddir}/denyhosts install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_localstatedir}/lib/denyhosts/allowed-hosts +install -p -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/denyhosts +install -p -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/denyhosts + +touch $RPM_BUILD_ROOT%{_localstatedir}/log/denyhosts for i in allowed-warned-hosts hosts offset suspicious-logins \ users-hosts users-invalid users-valid; do @@ -56,25 +77,40 @@ %clean rm -rf $RPM_BUILD_ROOT + +# Note that we do not automaticaly run --migrate, because we can't be +# sure that all of the hosts.deny entries were created by denyhosts %post /sbin/chkconfig --add denyhosts -/sbin/service denyhosts condrestart >> /dev/null + +RUNNING=`/sbin/service denyhosts status | grep "is running"` +/sbin/service denyhosts stop > /dev/null 2>&1 || : +%{_bindir}/denyhosts.py -c /etc/denyhosts.conf --upgrade099 > /dev/null 2>&1 || : +if [ -n "$RUNNING" ]; then + /sbin/service denyhosts start > /dev/null 2>&1 +fi exit 0 + %preun if [ $1 = 0 ]; then + /sbin/service denyhosts stop > /dev/null 2>&1 /sbin/chkconfig --del denyhosts - /sbin/service denyhosts stop >> /dev/null fi exit 0 -%files + +%files -f %{name}.files %defattr(-,root,root,-) -%doc LICENSE.txt README.txt setup.py +%doc CHANGELOG.txt denyhosts.cfg-dist LICENSE.txt +%doc README.fedora README.txt setup.py %config(noreplace) %{_sysconfdir}/denyhosts.conf %config(noreplace) %{_sysconfdir}/cron.d/denyhosts +%config(noreplace) %{_sysconfdir}/logrotate.d/denyhosts +%config(noreplace) %{_sysconfdir}/sysconfig/denyhosts %config(noreplace) %{_localstatedir}/lib/denyhosts/allowed-hosts +%ghost %{_localstatedir}/log/denyhosts %ghost %{_localstatedir}/lib/denyhosts/allowed-warned-hosts %ghost %{_localstatedir}/lib/denyhosts/hosts %ghost %{_localstatedir}/lib/denyhosts/offset @@ -85,10 +121,54 @@ %dir %{_localstatedir}/lib/denyhosts -%{_bindir}/denyhosts.py %{_initrddir}/denyhosts +%{_bindir}/denyhosts-control %changelog +* Wed Aug 17 2005 Jason L Tibbitts III - 1.0.0-2 +- Restart the daemon in the logrotate script +- Stop the running daemon before calling --upgrade099 + +* Tue Aug 16 2005 Jason L Tibbitts III - 1.0.0-1 +- Fix condrestart +- Actually install logrotate entry + +* Mon Aug 15 2005 Jason L Tibbitts III - 1.0.0-0 +- Update to 1.0.0 +- Add logrotate entry +- Clean up initscript +- Add notes on upgrading. + +* Mon Aug 15 2005 Jason L Tibbitts III - 0.9.9-2 +- Automatically upgrade the format of hosts.deny entries. + +* Sun Aug 14 2005 Jason L Tibbitts III - 0.9.9-1 +- Framework for enabling daemon mode. + +* Sat Aug 13 2005 Jason L Tibbitts III - 0.9.9-0 +- Update to 0.9.9 + +* Fri Aug 5 2005 Jason L Tibbitts III - 0.9.8-1 +- Update to 0.9.8 + +* Fri Jul 22 2005 Jason L Tibbitts III - 0.8.0-3 +- Rename the lockfile used by the initscript/cron setup because + DenyHosts now has its own internal locking and they chose the exact + same lockfile we were using. +- Turn on PURGE_DENY in the installed config file. +- Delete data_files from setup.py. +- Enable purging in denyhosts.cron. +- Add README.fedora file. + +* Thu Jul 21 2005 Jason L Tibbitts III - 0.8.0-2 +- Package CHANGELOG.txt and denyhosts.cfg-dist as well (as + documentation). + +* Thu Jul 21 2005 Jason L Tibbitts III - 0.8.0-1 +- Update to 0.8.0 +- Use proper Python installation mechanism. +- Drop denyhosts-0.6.0-version.patch as it's no longer necessary. + * Sat Jul 2 2005 Jason L Tibbitts III - 0.6.0-1 - Update to 0.6.0 - Add fix for "from version import VERSION" issue. Index: sources =================================================================== RCS file: /cvs/extras/rpms/denyhosts/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 2 Jul 2005 21:38:47 -0000 1.3 +++ sources 18 Aug 2005 00:21:28 -0000 1.4 @@ -1 +1 @@ -6d65457ed9c31c548160e2aa74e5a80e DenyHosts-0.6.0.tar.gz +12633e88a120ccdbd604bd775b154a62 DenyHosts-1.0.0.tar.gz --- denyhosts-0.5.5-workdir.patch DELETED --- --- denyhosts-0.6.0-version.patch DELETED --- From fedora-extras-commits at redhat.com Thu Aug 18 00:21:45 2005 From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs)) Date: Wed, 17 Aug 2005 20:21:45 -0400 Subject: rpms/denyhosts/FC-3 README.fedora, NONE, 1.1 denyhosts-0.9.8-setup.patch, NONE, 1.1 denyhosts-1.0.0-config.patch, NONE, 1.1 denyhosts-1.0.0-daemon-control.patch, NONE, 1.1 denyhosts.logrotate, NONE, 1.1 denyhosts.sysconfig, NONE, 1.1 denyhosts.cron, 1.2, 1.3 denyhosts.init, 1.1, 1.2 denyhosts.spec, 1.2, 1.3 sources, 1.3, 1.4 denyhosts-0.5.5-workdir.patch, 1.1, NONE denyhosts-0.6.0-version.patch, 1.1, NONE Message-ID: <200508180021.j7I0LjlF021512@cvs-int.fedora.redhat.com> Author: tibbs Update of /cvs/extras/rpms/denyhosts/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21482 Modified Files: denyhosts.cron denyhosts.init denyhosts.spec sources Added Files: README.fedora denyhosts-0.9.8-setup.patch denyhosts-1.0.0-config.patch denyhosts-1.0.0-daemon-control.patch denyhosts.logrotate denyhosts.sysconfig Removed Files: denyhosts-0.5.5-workdir.patch denyhosts-0.6.0-version.patch Log Message: Pull from devel branch. --- NEW FILE README.fedora --- Some useful information about DenyHosts as packaged by Fedora Extras -------------------------------------------------------------------- It installs and runs as a service, so you can start it with: service denyhosts start and enable it at boot time with: chkconfig denyhosts on By default it will process your logs every ten minutes. You can change the interval by editing /etc/cron.d/denyhosts. You can see a description of the file format by running: man 5 crontab By default, DenyHosts is set up to purge old block entries, but only after one year. If you wish to adjust this, edit /etc/denyhosts.conf and look for "PURGE_DENY". The purge procedure is run daily at 5AM. To adjust this frequency, edit /etc/cron.d/denyhosts. DenyHosts will process only your current logfile (/var/log/secure). If you want to incorporate an old logfile (in this example, /var/log/secure.1) , you can run denyhosts.py -c /etc/denyhosts.conf /var/log/secure.1 DenyHosts can also handle logs compressed with gzip or bzip2. Notes about upgrading --------------------- If upgrading from DenyHosts 0.6.0 or earlier, note that this package does not run denyhosts --migrate to make the old entries expirable. This preserves any entries that may have been manually added. You can, of course, run this yourself. This package runs denyhosts --upgrade099 automatically to move any post-0.6.0 and pre-0.9.9 entries into the proper format. denyhosts-0.9.8-setup.patch: --- NEW FILE denyhosts-0.9.8-setup.patch --- --- setup.py.orig 2005-07-22 17:39:17.000000000 -0500 +++ setup.py 2005-08-04 13:06:14.893095036 -0500 @@ -21,13 +21,13 @@ package_dir={'DenyHosts': 'DenyHosts'}, packages=["DenyHosts"], ##py_modules=["denyhosts_version"], - data_files=[(libpath, glob("denyhosts.cfg-dist")), - (libpath, glob("denyhosts-daemon-initscript")), - (libpath, glob("setup.py")), - (libpath, glob("daemon-control-dist")), - (libpath, glob("CHANGELOG.txt")), - (libpath, glob("README.txt")), - (libpath, glob("LICENSE.txt"))], +# data_files=[(libpath, glob("denyhosts.cfg-dist")), +# (libpath, glob("denyhosts-daemon-initscript")), +# (libpath, glob("setup.py")), +# (libpath, glob("daemon-control-dist")), +# (libpath, glob("CHANGELOG.txt")), +# (libpath, glob("README.txt")), +# (libpath, glob("LICENSE.txt"))], license="GPL", ##extra_path='denyhosts', long_description=""" denyhosts-1.0.0-config.patch: --- NEW FILE denyhosts-1.0.0-config.patch --- --- denyhosts.cfg-dist.orig 2005-08-15 10:51:55.000000000 -0500 +++ denyhosts.cfg-dist 2005-08-15 22:26:21.788502326 -0500 @@ -47,13 +47,18 @@ # 'y' = years # # never purge: -PURGE_DENY = +#PURGE_DENY = # # purge entries older than 1 week #PURGE_DENY = 1w # # purge entries older than 5 days #PURGE_DENY = 5d +# +# For the default Fedora Extras install, we want timestamping but no +# expiration (at least by default) so this is deliberately set high. +# Adjust to taste. +PURGE_DENY = 1y ####################################################################### @@ -116,7 +121,7 @@ # Note: when run in daemon mode, this directory should be specified # as an absolute path name (eg. /home/foo/denyhosts/data) # -WORK_DIR = denyhosts +WORK_DIR = /var/lib/denyhosts # ####################################################################### @@ -175,7 +180,7 @@ # match your email address. If you do not want to receive these reports # leave this field blank (or run with the --noemail option) # -ADMIN_EMAIL = +ADMIN_EMAIL = root # ####################################################################### denyhosts-1.0.0-daemon-control.patch: --- NEW FILE denyhosts-1.0.0-daemon-control.patch --- --- daemon-control-dist.orig 2005-08-16 17:31:58.285358954 -0500 +++ daemon-control-dist 2005-08-16 17:33:00.510336919 -0500 @@ -7,7 +7,7 @@ DENYHOSTS_BIN = "/usr/bin/denyhosts.py" DENYHOSTS_LOCK = "/var/lock/subsys/denyhosts" -DENYHOSTS_CFG = "/usr/share/denyhosts/denyhosts.cfg" +DENYHOSTS_CFG = "/etc/denyhosts.conf" ############################################### @@ -104,7 +104,7 @@ try: option = sys.argv[1] - if option in ('start', 'restart'): + if option in ('start', 'restart', 'condrestart'): if '--config' not in args and '-c' not in args: args.append("--config=%s" % DENYHOSTS_CFG) --- NEW FILE denyhosts.logrotate --- /var/log/denyhosts { missingok notifempty size 100k create 0644 root root postrotate /sbin/service denyhosts condrestart > /dev/null 2>&1 || : endscript } --- NEW FILE denyhosts.sysconfig --- # Should DenyHosts run in daemon mode? # If not set to "yes", you also need to edit /etc/cron.d/denyhosts # and uncomment the appropriate lines. DAEMON=yes Index: denyhosts.cron =================================================================== RCS file: /cvs/extras/rpms/denyhosts/FC-3/denyhosts.cron,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- denyhosts.cron 2 Jul 2005 21:41:44 -0000 1.2 +++ denyhosts.cron 18 Aug 2005 00:21:43 -0000 1.3 @@ -1,6 +1,12 @@ -# This defaults to running once every ten minutes, but if your host is being -# heavily attacked then it is reasonable to make it run as frequently as once -# every minute. DenyHosts runs quickly once it has initially processed your -# logs and should not take a significant amount of CPU time. -*/10 * * * * root [ -f /var/lock/subsys/denyhosts ] && /usr/bin/denyhosts.py -c /etc/denyhosts.conf - +# The Fedora default is to use daemon mode, but if you wish to have +# denyhosts run periodically, you can uncomment the appropriate two lines +# and edit /etc/sysconfig/denyhosts. (You will also have to start the +# "service" and set it to run at boot if necessary.) +# +# Run denyhosts occasionally; adjust the time span to your liking +#*/10 * * * * root [ -f /var/lock/subsys/denyhosts.init ] && /usr/bin/denyhosts.py -c /etc/denyhosts.conf +# +# Automatically purge old entries early in the morning. Note that you must +# edit /etc/denyhosts.conf and set PURGE_DENY to something reasonable, as the +# default value purge time is set very high. +#0 5 * * * root [ -f /var/lock/subsys/denyhosts.init ] && /usr/bin/denyhosts.py -c /etc/denyhosts.conf --purge Index: denyhosts.init =================================================================== RCS file: /cvs/extras/rpms/denyhosts/FC-3/denyhosts.init,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- denyhosts.init 20 May 2005 04:57:02 -0000 1.1 +++ denyhosts.init 18 Aug 2005 00:21:43 -0000 1.2 @@ -7,7 +7,7 @@ # # chkconfig: - 50 01 # -# description: Enable periodic execution of denyhosts, an SSH log watcher +# description: Enable execution of denyhosts, an SSH log watcher # processname denyhosts # config: /etc/denyhosts.cfg # @@ -15,29 +15,58 @@ # source function library . /etc/rc.d/init.d/functions -lockfile=/var/lock/subsys/denyhosts - +CONTROL=/usr/bin/denyhosts-control +CRONLOCK=/var/lock/subsys/denyhosts.init +LOCKFILE=/var/lock/subsys/denyhosts RETVAL=0 -start() { +[ -f /etc/sysconfig/denyhosts ] && . /etc/sysconfig/denyhosts + +c_start() { echo -n $"Enabling denyhosts: " - touch "$lockfile" && success || failure + touch "$CRONLOCK" && success || failure RETVAL=$? echo } -stop() { +c_stop() { echo -n $"Disabling denyhosts: " - rm -f "$lockfile" && success || failure + rm -f "$CRONLOCK" && success || failure RETVAL=$? echo } -restart() { - stop - start +c_restart() { + c_stop + c_start +} + +c_condrestart() { + [ -f "$CRONLOCK" ] && c_restart } +c_status() { + if [ -f $CRONLOCK ]; then + echo $"Denyhosts is enabled." + RETVAL=0 + else + echo $"Denyhosts is disabled." + RETVAL=3 + fi +} + +d_condrestart() { $CONTROL condrestart; RETVAL=$?; } +d_restart() { $CONTROL restart; RETVAL=$?; } +d_start() { $CONTROL start; RETVAL=$?; } +d_status() { $CONTROL status; RETVAL=$?; } +d_stop() { $CONTROL stop; RETVAL=$?; } + +condrestart() { if [ $DAEMON = "yes" ]; then d_condrestart; else c_restart; fi } +restart() { if [ $DAEMON = "yes" ]; then d_restart; else c_restart; fi } +start() { if [ $DAEMON = "yes" ]; then d_start; else c_start; fi } +status() { if [ $DAEMON = "yes" ]; then d_status; else c_status; fi } +stop() { if [ $DAEMON = "yes" ]; then d_stop; else c_stop; fi } + case "$1" in start) start @@ -51,16 +80,10 @@ reload) ;; condrestart) - [ -f "$lockfile" ] && restart + condrestart ;; status) - if [ -f $lockfile ]; then - echo $"Denyhosts is enabled." - RETVAL=0 - else - echo $"Denyhosts is disabled." - RETVAL=3 - fi + status ;; *) echo $"Usage: $0 {start|stop|status|restart|reload|force-reload|condrestart}" Index: denyhosts.spec =================================================================== RCS file: /cvs/extras/rpms/denyhosts/FC-3/denyhosts.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- denyhosts.spec 2 Jul 2005 21:41:44 -0000 1.2 +++ denyhosts.spec 18 Aug 2005 00:21:43 -0000 1.3 @@ -1,6 +1,6 @@ Name: denyhosts -Version: 0.6.0 -Release: 1%{?dist} +Version: 1.0.0 +release: 2%{?dist} Summary: A script to help thwart ssh server attacks Group: Applications/System @@ -10,12 +10,16 @@ Source1: denyhosts.cron Source2: denyhosts.init Source3: denyhosts-allowed-hosts -Patch0: denyhosts-0.5.5-workdir.patch -Patch1: denyhosts-0.6.0-version.patch +Source4: denyhosts.sysconfig +Source5: denyhosts.logrotate +Source6: README.fedora +Patch0: denyhosts-1.0.0-config.patch +Patch1: denyhosts-0.9.8-setup.patch +Patch2: denyhosts-1.0.0-daemon-control.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArchitectures: noarch -#BuildRequires: +BuildRequires: python-devel Requires: openssh-server %description @@ -31,21 +35,38 @@ %setup -q -n DenyHosts-%{version} %patch0 -p0 %patch1 -p0 +%patch2 -p0 + +cp %{SOURCE6} . + + +%build +python ./setup.py build + %install rm -rf $RPM_BUILD_ROOT +python ./setup.py install --root=$RPM_BUILD_ROOT --record=%{name}.files install -d $RPM_BUILD_ROOT%{_bindir} + install -d $RPM_BUILD_ROOT%{_initrddir} install -d $RPM_BUILD_ROOT%{_sysconfdir}/cron.d +install -d $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d +install -d $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig install -d -m 700 $RPM_BUILD_ROOT%{_localstatedir}/lib/denyhosts +install -d $RPM_BUILD_ROOT%{_localstatedir}/log -install -p -m 755 denyhosts.py $RPM_BUILD_ROOT%{_bindir} install -p -m 600 denyhosts.cfg-dist $RPM_BUILD_ROOT%{_sysconfdir}/denyhosts.conf +install -p -m 755 daemon-control-dist $RPM_BUILD_ROOT%{_bindir}/denyhosts-control install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/cron.d/denyhosts install -p -m 755 %{SOURCE2} $RPM_BUILD_ROOT%{_initrddir}/denyhosts install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_localstatedir}/lib/denyhosts/allowed-hosts +install -p -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/denyhosts +install -p -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/denyhosts + +touch $RPM_BUILD_ROOT%{_localstatedir}/log/denyhosts for i in allowed-warned-hosts hosts offset suspicious-logins \ users-hosts users-invalid users-valid; do @@ -56,25 +77,40 @@ %clean rm -rf $RPM_BUILD_ROOT + +# Note that we do not automaticaly run --migrate, because we can't be +# sure that all of the hosts.deny entries were created by denyhosts %post /sbin/chkconfig --add denyhosts -/sbin/service denyhosts condrestart >> /dev/null + +RUNNING=`/sbin/service denyhosts status | grep "is running"` +/sbin/service denyhosts stop > /dev/null 2>&1 || : +%{_bindir}/denyhosts.py -c /etc/denyhosts.conf --upgrade099 > /dev/null 2>&1 || : +if [ -n "$RUNNING" ]; then + /sbin/service denyhosts start > /dev/null 2>&1 +fi exit 0 + %preun if [ $1 = 0 ]; then + /sbin/service denyhosts stop > /dev/null 2>&1 /sbin/chkconfig --del denyhosts - /sbin/service denyhosts stop >> /dev/null fi exit 0 -%files + +%files -f %{name}.files %defattr(-,root,root,-) -%doc LICENSE.txt README.txt setup.py +%doc CHANGELOG.txt denyhosts.cfg-dist LICENSE.txt +%doc README.fedora README.txt setup.py %config(noreplace) %{_sysconfdir}/denyhosts.conf %config(noreplace) %{_sysconfdir}/cron.d/denyhosts +%config(noreplace) %{_sysconfdir}/logrotate.d/denyhosts +%config(noreplace) %{_sysconfdir}/sysconfig/denyhosts %config(noreplace) %{_localstatedir}/lib/denyhosts/allowed-hosts +%ghost %{_localstatedir}/log/denyhosts %ghost %{_localstatedir}/lib/denyhosts/allowed-warned-hosts %ghost %{_localstatedir}/lib/denyhosts/hosts %ghost %{_localstatedir}/lib/denyhosts/offset @@ -85,10 +121,54 @@ %dir %{_localstatedir}/lib/denyhosts -%{_bindir}/denyhosts.py %{_initrddir}/denyhosts +%{_bindir}/denyhosts-control %changelog +* Wed Aug 17 2005 Jason L Tibbitts III - 1.0.0-2 +- Restart the daemon in the logrotate script +- Stop the running daemon before calling --upgrade099 + +* Tue Aug 16 2005 Jason L Tibbitts III - 1.0.0-1 +- Fix condrestart +- Actually install logrotate entry + +* Mon Aug 15 2005 Jason L Tibbitts III - 1.0.0-0 +- Update to 1.0.0 +- Add logrotate entry +- Clean up initscript +- Add notes on upgrading. + +* Mon Aug 15 2005 Jason L Tibbitts III - 0.9.9-2 +- Automatically upgrade the format of hosts.deny entries. + +* Sun Aug 14 2005 Jason L Tibbitts III - 0.9.9-1 +- Framework for enabling daemon mode. + +* Sat Aug 13 2005 Jason L Tibbitts III - 0.9.9-0 +- Update to 0.9.9 + +* Fri Aug 5 2005 Jason L Tibbitts III - 0.9.8-1 +- Update to 0.9.8 + +* Fri Jul 22 2005 Jason L Tibbitts III - 0.8.0-3 +- Rename the lockfile used by the initscript/cron setup because + DenyHosts now has its own internal locking and they chose the exact + same lockfile we were using. +- Turn on PURGE_DENY in the installed config file. +- Delete data_files from setup.py. +- Enable purging in denyhosts.cron. +- Add README.fedora file. + +* Thu Jul 21 2005 Jason L Tibbitts III - 0.8.0-2 +- Package CHANGELOG.txt and denyhosts.cfg-dist as well (as + documentation). + +* Thu Jul 21 2005 Jason L Tibbitts III - 0.8.0-1 +- Update to 0.8.0 +- Use proper Python installation mechanism. +- Drop denyhosts-0.6.0-version.patch as it's no longer necessary. + * Sat Jul 2 2005 Jason L Tibbitts III - 0.6.0-1 - Update to 0.6.0 - Add fix for "from version import VERSION" issue. Index: sources =================================================================== RCS file: /cvs/extras/rpms/denyhosts/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 2 Jul 2005 21:41:44 -0000 1.3 +++ sources 18 Aug 2005 00:21:43 -0000 1.4 @@ -1 +1 @@ -6d65457ed9c31c548160e2aa74e5a80e DenyHosts-0.6.0.tar.gz +12633e88a120ccdbd604bd775b154a62 DenyHosts-1.0.0.tar.gz --- denyhosts-0.5.5-workdir.patch DELETED --- --- denyhosts-0.6.0-version.patch DELETED --- From fedora-extras-commits at redhat.com Thu Aug 18 03:10:24 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 17 Aug 2005 23:10:24 -0400 Subject: rpms/perl-Class-Trigger - New directory Message-ID: <200508180310.j7I3AOQU025807@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Class-Trigger In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25787/perl-Class-Trigger Log Message: Directory /cvs/extras/rpms/perl-Class-Trigger added to the repository From fedora-extras-commits at redhat.com Thu Aug 18 03:10:25 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 17 Aug 2005 23:10:25 -0400 Subject: rpms/perl-Class-Trigger/devel - New directory Message-ID: <200508180310.j7I3APK4025812@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Class-Trigger/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25787/perl-Class-Trigger/devel Log Message: Directory /cvs/extras/rpms/perl-Class-Trigger/devel added to the repository From fedora-extras-commits at redhat.com Thu Aug 18 03:10:38 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 17 Aug 2005 23:10:38 -0400 Subject: rpms/perl-Class-Trigger Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200508180310.j7I3AcDh025863@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Class-Trigger In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25832 Added Files: Makefile import.log Log Message: Setup of module perl-Class-Trigger --- NEW FILE Makefile --- # Top level Makefile for module perl-Class-Trigger all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Thu Aug 18 03:10:39 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 17 Aug 2005 23:10:39 -0400 Subject: rpms/perl-Class-Trigger/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200508180310.j7I3Advv025868@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Class-Trigger/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25832/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Class-Trigger --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Thu Aug 18 03:10:56 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 17 Aug 2005 23:10:56 -0400 Subject: rpms/perl-Class-Trigger import.log,1.1,1.2 Message-ID: <200508180310.j7I3AucO025929@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Class-Trigger In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25898 Modified Files: import.log Log Message: auto-import perl-Class-Trigger-0.09-3 on branch devel from perl-Class-Trigger-0.09-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Trigger/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 18 Aug 2005 03:10:36 -0000 1.1 +++ import.log 18 Aug 2005 03:10:54 -0000 1.2 @@ -0,0 +1 @@ +perl-Class-Trigger-0_09-3:HEAD:perl-Class-Trigger-0.09-3.src.rpm:1124334707 From fedora-extras-commits at redhat.com Thu Aug 18 03:10:57 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 17 Aug 2005 23:10:57 -0400 Subject: rpms/perl-Class-Trigger/devel perl-Class-Trigger.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200508180311.j7I3Av81025936@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Class-Trigger/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25898/devel Modified Files: .cvsignore sources Added Files: perl-Class-Trigger.spec Log Message: auto-import perl-Class-Trigger-0.09-3 on branch devel from perl-Class-Trigger-0.09-3.src.rpm --- NEW FILE perl-Class-Trigger.spec --- Name: perl-Class-Trigger Version: 0.09 Release: 3%{?dist} Summary: Mixin to add / call inheritable triggers Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/Class-Trigger/ Source0: http://search.cpan.org/CPAN/authors/id/M/MI/MIYAGAWA/Class-Trigger-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(IO::Scalar), perl(Class::Data::Inheritable) Requires: perl(IO::Scalar) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description %{summary}. %prep %setup -q -n Class-Trigger-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README %{perl_vendorlib}/Class %{_mandir}/man3/*.3* %changelog * Wed Aug 17 2005 Tom "spot" Callaway 0.09-3 - fix missing BR: perl(Class::Data::Inheritable) - use %{_smp_mflags} * Fri Jul 8 2005 Tom "spot" Callaway 0.09-2 - cleanups * Wed Jul 6 2005 Tom "spot" Callaway 0.09-1 - Initial package for Fedora Extras Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Trigger/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 18 Aug 2005 03:10:37 -0000 1.1 +++ .cvsignore 18 Aug 2005 03:10:55 -0000 1.2 @@ -0,0 +1 @@ +Class-Trigger-0.09.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Trigger/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 18 Aug 2005 03:10:37 -0000 1.1 +++ sources 18 Aug 2005 03:10:55 -0000 1.2 @@ -0,0 +1 @@ +7f7ce8d219003dcf64258d5da78d2d47 Class-Trigger-0.09.tar.gz From fedora-extras-commits at redhat.com Thu Aug 18 03:27:57 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 17 Aug 2005 23:27:57 -0400 Subject: rpms/perl-CGI-Untaint - New directory Message-ID: <200508180327.j7I3Rvbe026147@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-CGI-Untaint In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26123/perl-CGI-Untaint Log Message: Directory /cvs/extras/rpms/perl-CGI-Untaint added to the repository From fedora-extras-commits at redhat.com Thu Aug 18 03:27:57 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 17 Aug 2005 23:27:57 -0400 Subject: rpms/perl-CGI-Untaint/devel - New directory Message-ID: <200508180328.j7I3RvqA026152@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-CGI-Untaint/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26123/perl-CGI-Untaint/devel Log Message: Directory /cvs/extras/rpms/perl-CGI-Untaint/devel added to the repository From fedora-extras-commits at redhat.com Thu Aug 18 03:28:13 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 17 Aug 2005 23:28:13 -0400 Subject: rpms/perl-CGI-Untaint Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200508180328.j7I3SDY1026199@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-CGI-Untaint In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26168 Added Files: Makefile import.log Log Message: Setup of module perl-CGI-Untaint --- NEW FILE Makefile --- # Top level Makefile for module perl-CGI-Untaint all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Thu Aug 18 03:28:13 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 17 Aug 2005 23:28:13 -0400 Subject: rpms/perl-CGI-Untaint/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200508180328.j7I3SDvU026204@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-CGI-Untaint/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26168/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-CGI-Untaint --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Thu Aug 18 03:28:36 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 17 Aug 2005 23:28:36 -0400 Subject: rpms/perl-CGI-Untaint import.log,1.1,1.2 Message-ID: <200508180328.j7I3SaZ1026263@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-CGI-Untaint In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26232 Modified Files: import.log Log Message: auto-import perl-CGI-Untaint-1.25-3 on branch devel from perl-CGI-Untaint-1.25-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-CGI-Untaint/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 18 Aug 2005 03:28:11 -0000 1.1 +++ import.log 18 Aug 2005 03:28:33 -0000 1.2 @@ -0,0 +1 @@ +perl-CGI-Untaint-1_25-3:HEAD:perl-CGI-Untaint-1.25-3.src.rpm:1124335766 From fedora-extras-commits at redhat.com Thu Aug 18 03:28:36 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 17 Aug 2005 23:28:36 -0400 Subject: rpms/perl-CGI-Untaint/devel perl-CGI-Untaint.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200508180328.j7I3Saic026270@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-CGI-Untaint/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26232/devel Modified Files: .cvsignore sources Added Files: perl-CGI-Untaint.spec Log Message: auto-import perl-CGI-Untaint-1.25-3 on branch devel from perl-CGI-Untaint-1.25-3.src.rpm --- NEW FILE perl-CGI-Untaint.spec --- Name: perl-CGI-Untaint Version: 1.25 Release: 3%{?dist} Summary: Process CGI input parameters Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/CGI-Untaint/ Source0: http://search.cpan.org/CPAN/authors/id/T/TM/TMTM/CGI-Untaint-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(UNIVERSAL::require) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description %{summary}. %prep %setup -q -n CGI-Untaint-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes %{perl_vendorlib}/CGI %{_mandir}/man3/*.3* %changelog * Wed Aug 17 2005 Tom "spot" Callaway 1.25-3 - minor cleanups * Fri Jul 8 2005 Tom "spot" Callaway 1.25-2 - cleanups * Wed Jul 6 2005 Tom "spot" Callaway 1.25-1 - Initial package for Fedora Extras Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-CGI-Untaint/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 18 Aug 2005 03:28:11 -0000 1.1 +++ .cvsignore 18 Aug 2005 03:28:34 -0000 1.2 @@ -0,0 +1 @@ +CGI-Untaint-1.25.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-CGI-Untaint/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 18 Aug 2005 03:28:11 -0000 1.1 +++ sources 18 Aug 2005 03:28:34 -0000 1.2 @@ -0,0 +1 @@ +f75b2641202e441a16db5040c37170c0 CGI-Untaint-1.25.tar.gz From fedora-extras-commits at redhat.com Thu Aug 18 03:38:59 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 17 Aug 2005 23:38:59 -0400 Subject: rpms/perl-Template-Plugin-Class - New directory Message-ID: <200508180338.j7I3cx2f026949@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Template-Plugin-Class In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26939/perl-Template-Plugin-Class Log Message: Directory /cvs/extras/rpms/perl-Template-Plugin-Class added to the repository From fedora-extras-commits at redhat.com Thu Aug 18 03:39:06 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 17 Aug 2005 23:39:06 -0400 Subject: rpms/perl-Template-Plugin-Class/devel - New directory Message-ID: <200508180339.j7I3d6oL026968@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Template-Plugin-Class/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26939/perl-Template-Plugin-Class/devel Log Message: Directory /cvs/extras/rpms/perl-Template-Plugin-Class/devel added to the repository From fedora-extras-commits at redhat.com Thu Aug 18 03:39:17 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 17 Aug 2005 23:39:17 -0400 Subject: rpms/perl-Template-Plugin-Class/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200508180339.j7I3dHiO027016@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Template-Plugin-Class/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26984/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Template-Plugin-Class --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Thu Aug 18 03:39:17 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 17 Aug 2005 23:39:17 -0400 Subject: rpms/perl-Template-Plugin-Class Makefile, NONE, 1.1 import.log, NONE, 1.1 Message-ID: <200508180339.j7I3dHCq027011@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Template-Plugin-Class In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26984 Added Files: Makefile import.log Log Message: Setup of module perl-Template-Plugin-Class --- NEW FILE Makefile --- # Top level Makefile for module perl-Template-Plugin-Class all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Thu Aug 18 03:39:37 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 17 Aug 2005 23:39:37 -0400 Subject: rpms/perl-Template-Plugin-Class import.log,1.1,1.2 Message-ID: <200508180340.j7I3e7fI027084@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Template-Plugin-Class In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27050 Modified Files: import.log Log Message: auto-import perl-Template-Plugin-Class-0.12-3 on branch devel from perl-Template-Plugin-Class-0.12-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Template-Plugin-Class/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 18 Aug 2005 03:39:15 -0000 1.1 +++ import.log 18 Aug 2005 03:39:35 -0000 1.2 @@ -0,0 +1 @@ +perl-Template-Plugin-Class-0_12-3:HEAD:perl-Template-Plugin-Class-0.12-3.src.rpm:1124336428 From fedora-extras-commits at redhat.com Thu Aug 18 03:39:37 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 17 Aug 2005 23:39:37 -0400 Subject: rpms/perl-Template-Plugin-Class/devel perl-Template-Plugin-Class.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200508180340.j7I3e8xb027088@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Template-Plugin-Class/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27050/devel Modified Files: .cvsignore sources Added Files: perl-Template-Plugin-Class.spec Log Message: auto-import perl-Template-Plugin-Class-0.12-3 on branch devel from perl-Template-Plugin-Class-0.12-3.src.rpm --- NEW FILE perl-Template-Plugin-Class.spec --- Name: perl-Template-Plugin-Class Version: 0.12 Release: 3%{?dist} Summary: Allow calling of class methods on arbitrary classes Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/Template-Plugin-Class/ Source0: http://search.cpan.org/CPAN/authors/id/R/RC/RCLAMP/Template-Plugin-Class-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Template), perl(Module::Build) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Requires: perl(Template) %description %{summary}. %prep %setup -q -n Template-Plugin-Class-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README %{perl_vendorlib}/Template/ %{_mandir}/man3/*.3* %changelog * Wed Aug 17 2005 Tom "spot" Callaway 0.12-3 - more cleanups * Fri Jul 8 2005 Tom "spot" Callaway 0.12-2 - cleanups * Wed Jul 6 2005 Tom "spot" Callaway 0.12-1 - Initial package for Fedora Extras Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Template-Plugin-Class/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 18 Aug 2005 03:39:15 -0000 1.1 +++ .cvsignore 18 Aug 2005 03:39:35 -0000 1.2 @@ -0,0 +1 @@ +Template-Plugin-Class-0.12.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Template-Plugin-Class/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 18 Aug 2005 03:39:15 -0000 1.1 +++ sources 18 Aug 2005 03:39:35 -0000 1.2 @@ -0,0 +1 @@ +2ed01153031599494f616b4cbdf87ab1 Template-Plugin-Class-0.12.tar.gz From fedora-extras-commits at redhat.com Thu Aug 18 03:41:31 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 17 Aug 2005 23:41:31 -0400 Subject: owners owners.list,1.92,1.93 Message-ID: <200508180341.j7I3fVIV027285@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27268 Modified Files: owners.list Log Message: Add perl modules Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.92 retrieving revision 1.93 diff -u -r1.92 -r1.93 --- owners.list 17 Aug 2005 22:30:28 -0000 1.92 +++ owners.list 18 Aug 2005 03:41:28 -0000 1.93 @@ -532,10 +532,12 @@ Fedora Extras|perl-bioperl|A package of public domain Perl tools for computational molecular biology|thm at duke.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Cache-Cache|Cache-Cache module for perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-CGI-Simple|Simple totally OO CGI interface that is CGI.pm compliant|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-CGI-Untaint|Process CGI input parameters|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Chart|Perl modules for producing many types of charts|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Class-Accessor|Automated accessor generation|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Class-Data-Inheritable|Inheritable, overridable class data|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Class-MethodMaker|Create generic methods for OO Perl|dgregor at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Class-Trigger|Mixin to add / call inheritable triggers|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Class-Whitehole|Base class to treat unhandled method calls as errors|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Config-General|Generic configuration module for Perl|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Config-IniFiles|A module for reading .ini-style configuration files|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com @@ -629,6 +631,7 @@ Fedora Extras|perl-String-ShellQuote|Perl module for quoting strings for passing through the shell|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Sub-Uplevel|Run a perl function in an upper stack frame|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-SVG|An extention to generate stand-alone or inline SVG|thm at duke.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Template-Plugin-Class|Allow calling of class methods on arbitrary classes|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Template-Toolkit|Template processing system|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Test-Builder-Tester|For bugs related to the perl-Test-Builder-Tester component|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Test-Exception|Library of test functions for exception based Perl code|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Thu Aug 18 03:48:52 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 17 Aug 2005 23:48:52 -0400 Subject: rpms/perl-DBIx-ContextualFetch - New directory Message-ID: <200508180348.j7I3mqMp027451@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-DBIx-ContextualFetch In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27431/perl-DBIx-ContextualFetch Log Message: Directory /cvs/extras/rpms/perl-DBIx-ContextualFetch added to the repository From fedora-extras-commits at redhat.com Thu Aug 18 03:48:52 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 17 Aug 2005 23:48:52 -0400 Subject: rpms/perl-DBIx-ContextualFetch/devel - New directory Message-ID: <200508180348.j7I3mqWI027456@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-DBIx-ContextualFetch/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27431/perl-DBIx-ContextualFetch/devel Log Message: Directory /cvs/extras/rpms/perl-DBIx-ContextualFetch/devel added to the repository From fedora-extras-commits at redhat.com Thu Aug 18 03:49:08 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 17 Aug 2005 23:49:08 -0400 Subject: rpms/perl-DBIx-ContextualFetch Makefile, NONE, 1.1 import.log, NONE, 1.1 Message-ID: <200508180349.j7I3n8eJ027507@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-DBIx-ContextualFetch In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27476 Added Files: Makefile import.log Log Message: Setup of module perl-DBIx-ContextualFetch --- NEW FILE Makefile --- # Top level Makefile for module perl-DBIx-ContextualFetch all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Thu Aug 18 03:49:08 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 17 Aug 2005 23:49:08 -0400 Subject: rpms/perl-DBIx-ContextualFetch/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200508180349.j7I3n80B027512@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-DBIx-ContextualFetch/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27476/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-DBIx-ContextualFetch --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Thu Aug 18 03:49:58 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 17 Aug 2005 23:49:58 -0400 Subject: owners owners.list,1.93,1.94 Message-ID: <200508180349.j7I3nwst027594@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27577 Modified Files: owners.list Log Message: perl-DBIx-ContextualFetch Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.93 retrieving revision 1.94 diff -u -r1.93 -r1.94 --- owners.list 18 Aug 2005 03:41:28 -0000 1.93 +++ owners.list 18 Aug 2005 03:49:56 -0000 1.94 @@ -550,6 +550,7 @@ Fedora Extras|perl-Crypt-CBC|Encrypt Data with Cipher Block Chaining Mode|andreas at bawue.net|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-DBD-SQLite|Self Contained RDBMS in a DBI Driver|jpo at di.uminho.pt|extras-qa at fedoraproject.org| Fedora Extras|perl-DBD-SQLite2|Self Contained RDBMS in a DBI Driver (sqlite 2.x)|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-DBIx-ContextualFetch|Add contextual fetches to DBI|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Devel-Cycle|Find memory cycles in objects|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Devel-StackTrace|Perl module implementing stack trace and stack trace frame objects|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Digest-Nilsimsa|Perl interface to the Nilsima Algorithm|wtogami at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Thu Aug 18 03:49:30 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 17 Aug 2005 23:49:30 -0400 Subject: rpms/perl-DBIx-ContextualFetch import.log,1.1,1.2 Message-ID: <200508180350.j7I3o1Ga027597@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-DBIx-ContextualFetch In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27540 Modified Files: import.log Log Message: auto-import perl-DBIx-ContextualFetch-1.02-3 on branch devel from perl-DBIx-ContextualFetch-1.02-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-DBIx-ContextualFetch/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 18 Aug 2005 03:49:06 -0000 1.1 +++ import.log 18 Aug 2005 03:49:28 -0000 1.2 @@ -0,0 +1 @@ +perl-DBIx-ContextualFetch-1_02-3:HEAD:perl-DBIx-ContextualFetch-1.02-3.src.rpm:1124337021 From fedora-extras-commits at redhat.com Thu Aug 18 03:49:31 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 17 Aug 2005 23:49:31 -0400 Subject: rpms/perl-DBIx-ContextualFetch/devel perl-DBIx-ContextualFetch.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200508180350.j7I3o1RI027601@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-DBIx-ContextualFetch/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27540/devel Modified Files: .cvsignore sources Added Files: perl-DBIx-ContextualFetch.spec Log Message: auto-import perl-DBIx-ContextualFetch-1.02-3 on branch devel from perl-DBIx-ContextualFetch-1.02-3.src.rpm --- NEW FILE perl-DBIx-ContextualFetch.spec --- Name: perl-DBIx-ContextualFetch Version: 1.02 Release: 3%{?dist} Summary: Add contextual fetches to DBI Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/DBIx-ContextualFetch Source0: http://search.cpan.org/CPAN/authors/id/T/TM/TMTM/DBIx-ContextualFetch-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(DBD::SQLite2) BuildRequires: perl(DBI) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Requires: perl(DBI) %description %{summary}. %prep %setup -q -n DBIx-ContextualFetch-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes %{perl_vendorlib}/DBIx %{_mandir}/man3/*.3* %changelog * Wed Aug 17 2005 Tom "spot" Callaway 1.02-3 - more cleanups * Fri Jul 8 2005 Tom "spot" Callaway 1.02-2 - cleanups * Wed Jul 6 2005 Tom "spot" Callaway 1.02-1 - Initial package for Fedora Extras Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-DBIx-ContextualFetch/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 18 Aug 2005 03:49:06 -0000 1.1 +++ .cvsignore 18 Aug 2005 03:49:29 -0000 1.2 @@ -0,0 +1 @@ +DBIx-ContextualFetch-1.02.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-DBIx-ContextualFetch/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 18 Aug 2005 03:49:06 -0000 1.1 +++ sources 18 Aug 2005 03:49:29 -0000 1.2 @@ -0,0 +1 @@ +e0e2d7db498de03fb3aef95ebd1e0947 DBIx-ContextualFetch-1.02.tar.gz From fedora-extras-commits at redhat.com Thu Aug 18 03:55:15 2005 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Wed, 17 Aug 2005 23:55:15 -0400 Subject: common tobuild,1.2210,1.2211 Message-ID: <200508180355.j7I3tFJE027957@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27940 Modified Files: tobuild Log Message: request build of rpms/perl-Class-Trigger/devel perl-Class-Trigger-0_09-3_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2210 retrieving revision 1.2211 diff -u -r1.2210 -r1.2211 --- tobuild 17 Aug 2005 22:26:29 -0000 1.2210 +++ tobuild 18 Aug 2005 03:55:13 -0000 1.2211 @@ -36,3 +36,4 @@ jnovy rpms/cproto/devel cproto-4_7c-7 devel joost rpms/fpc/FC-3 fpc-2_0_0-1 fc3 gemi rpms/clisp/FC-3 clisp-2_34-5_fc3 fc3 +katzj rpms/perl-Class-Trigger/devel perl-Class-Trigger-0_09-3_fc5 devel From fedora-extras-commits at redhat.com Thu Aug 18 04:01:36 2005 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Thu, 18 Aug 2005 00:01:36 -0400 Subject: common Makefile.common,1.30,1.31 Message-ID: <200508180402.j7I42UkZ029211@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29184 Modified Files: Makefile.common Log Message: make build should now do make plague... it's alive! Index: Makefile.common =================================================================== RCS file: /cvs/extras/common/Makefile.common,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- Makefile.common 3 Aug 2005 22:12:11 -0000 1.30 +++ Makefile.common 18 Aug 2005 04:01:34 -0000 1.31 @@ -312,7 +312,7 @@ endef USER := $(shell $(find-user)) -build: $(COMMON_DIR)/branches +oldbuild: $(COMMON_DIR)/branches @if [ -z "$(TARGET)" -a ! -d CVS ]; then echo "Must be in a branch subdirectory"; exit 1; fi @cvs status -v $(SPECFILE) 2>/dev/null | grep -q $(TAG); ret=$$? ;\ @@ -325,7 +325,7 @@ cvs commit -m "request build of $(CVS_REPOSITORY) $(TAG) for $(TARGET)" tobuild ;\ popd >/dev/null) -plague: $(COMMON_DIR)/branches +build plague: $(COMMON_DIR)/branches @if [ ! -x /usr/bin/plague-client ]; then echo "Must have plague-client installed - see http://fedoraproject.org/wiki/Extras/BuildSystemClientSetup"; exit 1; fi @if [ -z "$(TARGET)" -a ! -d CVS ]; then echo "Must be in a branch subdirectory"; exit 1; fi From fedora-extras-commits at redhat.com Thu Aug 18 04:11:32 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 18 Aug 2005 00:11:32 -0400 Subject: rpms/perl-IO-CaptureOutput - New directory Message-ID: <200508180411.j7I4BWIO029328@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-IO-CaptureOutput In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29308/perl-IO-CaptureOutput Log Message: Directory /cvs/extras/rpms/perl-IO-CaptureOutput added to the repository From fedora-extras-commits at redhat.com Thu Aug 18 04:11:32 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 18 Aug 2005 00:11:32 -0400 Subject: rpms/perl-IO-CaptureOutput/devel - New directory Message-ID: <200508180411.j7I4BWgt029333@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-IO-CaptureOutput/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29308/perl-IO-CaptureOutput/devel Log Message: Directory /cvs/extras/rpms/perl-IO-CaptureOutput/devel added to the repository From fedora-extras-commits at redhat.com Thu Aug 18 04:11:48 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 18 Aug 2005 00:11:48 -0400 Subject: rpms/perl-IO-CaptureOutput Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200508180411.j7I4BmNd029380@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-IO-CaptureOutput In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29353 Added Files: Makefile import.log Log Message: Setup of module perl-IO-CaptureOutput --- NEW FILE Makefile --- # Top level Makefile for module perl-IO-CaptureOutput all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Thu Aug 18 04:11:48 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 18 Aug 2005 00:11:48 -0400 Subject: rpms/perl-IO-CaptureOutput/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200508180411.j7I4BmxQ029385@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-IO-CaptureOutput/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29353/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-IO-CaptureOutput --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Thu Aug 18 04:12:13 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 18 Aug 2005 00:12:13 -0400 Subject: rpms/perl-IO-CaptureOutput import.log,1.1,1.2 Message-ID: <200508180412.j7I4Ch1P029456@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-IO-CaptureOutput In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29417 Modified Files: import.log Log Message: auto-import perl-IO-CaptureOutput-1.03-4 on branch devel from perl-IO-CaptureOutput-1.03-4.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-IO-CaptureOutput/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 18 Aug 2005 04:11:46 -0000 1.1 +++ import.log 18 Aug 2005 04:12:11 -0000 1.2 @@ -0,0 +1 @@ +perl-IO-CaptureOutput-1_03-4:HEAD:perl-IO-CaptureOutput-1.03-4.src.rpm:1124338383 From fedora-extras-commits at redhat.com Thu Aug 18 04:12:13 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 18 Aug 2005 00:12:13 -0400 Subject: rpms/perl-IO-CaptureOutput/devel perl-IO-CaptureOutput.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200508180412.j7I4ChsQ029460@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-IO-CaptureOutput/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29417/devel Modified Files: .cvsignore sources Added Files: perl-IO-CaptureOutput.spec Log Message: auto-import perl-IO-CaptureOutput-1.03-4 on branch devel from perl-IO-CaptureOutput-1.03-4.src.rpm --- NEW FILE perl-IO-CaptureOutput.spec --- Name: perl-IO-CaptureOutput Version: 1.03 Release: 4%{?dist} Summary: Capture STDOUT/STDERR from subprocesses and XS/C modules Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/IO-CaptureOutput Source0: http://search.cpan.org/CPAN/authors/id/S/SI/SIMONFLK/IO-CaptureOutput-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Inline), perl(Parse::RecDescent), perl(Test::Pod::Coverage), perl(Test::Pod) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description %{summary}. %prep %setup -q -n IO-CaptureOutput-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README %{perl_vendorlib}/IO %{_mandir}/man3/*.3* %changelog * Wed Aug 17 2005 Tom "spot" Callaway 1.03-4 - add BR (Test::Pod) * Wed Aug 17 2005 Tom "spot" Callaway 1.03-3 - more cleanups - add BR so testing passes * Fri Jul 8 2005 Tom "spot" Callaway 1.03-2 - cleanups * Wed Jul 6 2005 Tom "spot" Callaway 1.03-1 - Initial package for Fedora Extras Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-IO-CaptureOutput/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 18 Aug 2005 04:11:46 -0000 1.1 +++ .cvsignore 18 Aug 2005 04:12:11 -0000 1.2 @@ -0,0 +1 @@ +IO-CaptureOutput-1.03.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-IO-CaptureOutput/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 18 Aug 2005 04:11:46 -0000 1.1 +++ sources 18 Aug 2005 04:12:11 -0000 1.2 @@ -0,0 +1 @@ +a117ecf931cf03967bf6a6843164667a IO-CaptureOutput-1.03.tar.gz From fedora-extras-commits at redhat.com Thu Aug 18 04:17:11 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 18 Aug 2005 00:17:11 -0400 Subject: owners owners.list,1.94,1.95 Message-ID: <200508180417.j7I4HBvC029706@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29689 Modified Files: owners.list Log Message: perl-IO-CaptureOutput Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.94 retrieving revision 1.95 diff -u -r1.94 -r1.95 --- owners.list 18 Aug 2005 03:49:56 -0000 1.94 +++ owners.list 18 Aug 2005 04:17:09 -0000 1.95 @@ -583,6 +583,7 @@ Fedora Extras|perl-Image-Size|Determine the size of images in several common formats in Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Image-Xbm|Load, create, manipulate and save xbm image files in Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Image-Xpm|Load, create, manipulate and save xpm image files in Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-IO-CaptureOutput|Capture STDOUT/STDERR from subprocesses and XS/C modules|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-IO-Socket-SSL|Perl library for transparent SSL|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-IO-String|Emulate file interface for in-core strings|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-IO-stringy|I/O on in-core objects like strings and arrays|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Thu Aug 18 04:27:52 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 18 Aug 2005 00:27:52 -0400 Subject: rpms/perl-Ima-DBI - New directory Message-ID: <200508180427.j7I4Rqcw029988@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Ima-DBI In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29968/perl-Ima-DBI Log Message: Directory /cvs/extras/rpms/perl-Ima-DBI added to the repository From fedora-extras-commits at redhat.com Thu Aug 18 04:27:52 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 18 Aug 2005 00:27:52 -0400 Subject: rpms/perl-Ima-DBI/devel - New directory Message-ID: <200508180427.j7I4Rqq0029993@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Ima-DBI/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29968/perl-Ima-DBI/devel Log Message: Directory /cvs/extras/rpms/perl-Ima-DBI/devel added to the repository From fedora-extras-commits at redhat.com Thu Aug 18 04:28:07 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 18 Aug 2005 00:28:07 -0400 Subject: rpms/perl-Ima-DBI Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200508180428.j7I4S7fw030044@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Ima-DBI In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30013 Added Files: Makefile import.log Log Message: Setup of module perl-Ima-DBI --- NEW FILE Makefile --- # Top level Makefile for module perl-Ima-DBI all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Thu Aug 18 04:28:07 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 18 Aug 2005 00:28:07 -0400 Subject: rpms/perl-Ima-DBI/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200508180428.j7I4S7nj030049@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Ima-DBI/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30013/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Ima-DBI --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Thu Aug 18 04:28:26 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 18 Aug 2005 00:28:26 -0400 Subject: rpms/perl-Ima-DBI import.log,1.1,1.2 Message-ID: <200508180428.j7I4SQ4Y030108@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Ima-DBI In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30077 Modified Files: import.log Log Message: auto-import perl-Ima-DBI-0.33-3 on branch devel from perl-Ima-DBI-0.33-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Ima-DBI/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 18 Aug 2005 04:28:05 -0000 1.1 +++ import.log 18 Aug 2005 04:28:24 -0000 1.2 @@ -0,0 +1 @@ +perl-Ima-DBI-0_33-3:HEAD:perl-Ima-DBI-0.33-3.src.rpm:1124339357 From fedora-extras-commits at redhat.com Thu Aug 18 04:28:27 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 18 Aug 2005 00:28:27 -0400 Subject: rpms/perl-Ima-DBI/devel perl-Ima-DBI.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200508180428.j7I4SRGK030115@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Ima-DBI/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30077/devel Modified Files: .cvsignore sources Added Files: perl-Ima-DBI.spec Log Message: auto-import perl-Ima-DBI-0.33-3 on branch devel from perl-Ima-DBI-0.33-3.src.rpm --- NEW FILE perl-Ima-DBI.spec --- Name: perl-Ima-DBI Version: 0.33 Release: 3%{?dist} Summary: Database connection caching and organization Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/Ima-DBI Source0: http://search.cpan.org/CPAN/authors/id/T/TM/TMTM/Ima-DBI-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Class::Data::Inheritable) BuildRequires: perl(Class::WhiteHole) BuildRequires: perl(DBIx::ContextualFetch) Requires: perl(Class::Data::Inheritable), perl(Class::WhiteHole) Requires: perl(DBIx::ContextualFetch) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description %{summary}. %prep %setup -q -n Ima-DBI-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes %{perl_vendorlib}/Ima %{_mandir}/man3/*.3* %changelog * Wed Aug 17 2005 Tom "spot" Callaway 0.33-3 - minor cleanups * Fri Jul 8 2005 Tom "spot" Callaway 0.33-2 - cleanups * Wed Jul 6 2005 Tom "spot" Callaway 0.33-1 - Initial package for Fedora Extras Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Ima-DBI/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 18 Aug 2005 04:28:05 -0000 1.1 +++ .cvsignore 18 Aug 2005 04:28:25 -0000 1.2 @@ -0,0 +1 @@ +Ima-DBI-0.33.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Ima-DBI/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 18 Aug 2005 04:28:05 -0000 1.1 +++ sources 18 Aug 2005 04:28:25 -0000 1.2 @@ -0,0 +1 @@ +3d72cfbca2aa5e2b631020122858e3ae Ima-DBI-0.33.tar.gz From fedora-extras-commits at redhat.com Thu Aug 18 04:30:04 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 18 Aug 2005 00:30:04 -0400 Subject: owners owners.list,1.95,1.96 Message-ID: <200508180430.j7I4U4n2030311@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30294 Modified Files: owners.list Log Message: perl-Ima-DBI Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.95 retrieving revision 1.96 diff -u -r1.95 -r1.96 --- owners.list 18 Aug 2005 04:17:09 -0000 1.95 +++ owners.list 18 Aug 2005 04:30:02 -0000 1.96 @@ -577,6 +577,7 @@ Fedora Extras|perl-HTML-Template|Perl module to use HTML Templates|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-HTML-Template-Expr|Expression support extension for HTML::Template|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-HTML-Tree|HTML tree handling modules for Perl|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Ima-DBI|Database connection caching and organization|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Image-Base|Base class for loading, manipulating and saving images in Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Image-ExifTool|Utility for reading and writing image meta info|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Image-Info|Image meta information extraction module for Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Thu Aug 18 04:36:16 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 18 Aug 2005 00:36:16 -0400 Subject: rpms/perl-Template-Plugin-Class/devel perl-Template-Plugin-Class.spec, 1.1, 1.2 Message-ID: <200508180436.j7I4aGm9030544@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Template-Plugin-Class/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30497/devel Modified Files: perl-Template-Plugin-Class.spec Log Message: Its pedantic (boogie woogie, woogie)! Index: perl-Template-Plugin-Class.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Template-Plugin-Class/devel/perl-Template-Plugin-Class.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Template-Plugin-Class.spec 18 Aug 2005 03:39:35 -0000 1.1 +++ perl-Template-Plugin-Class.spec 18 Aug 2005 04:36:14 -0000 1.2 @@ -1,6 +1,6 @@ Name: perl-Template-Plugin-Class Version: 0.12 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Allow calling of class methods on arbitrary classes Group: Development/Libraries License: GPL or Artistic @@ -9,9 +9,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: perl(Template), perl(Module::Build) +BuildRequires: perl(Template::Plugin), perl(Module::Build) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) -Requires: perl(Template) +Requires: perl(Template::Plugin) %description %{summary}. @@ -44,6 +44,9 @@ %changelog +* Wed Aug 17 2005 Tom "spot" Callaway 0.12-4 +- perl(Template::Plugin) is more correct + * Wed Aug 17 2005 Tom "spot" Callaway 0.12-3 - more cleanups From fedora-extras-commits at redhat.com Thu Aug 18 04:36:10 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 18 Aug 2005 00:36:10 -0400 Subject: rpms/perl-Template-Plugin-Class/FC-3 perl-Template-Plugin-Class.spec, 1.1, 1.2 Message-ID: <200508180436.j7I4afir030547@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Template-Plugin-Class/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30497/FC-3 Modified Files: perl-Template-Plugin-Class.spec Log Message: Its pedantic (boogie woogie, woogie)! Index: perl-Template-Plugin-Class.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Template-Plugin-Class/FC-3/perl-Template-Plugin-Class.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Template-Plugin-Class.spec 18 Aug 2005 03:39:35 -0000 1.1 +++ perl-Template-Plugin-Class.spec 18 Aug 2005 04:36:08 -0000 1.2 @@ -1,6 +1,6 @@ Name: perl-Template-Plugin-Class Version: 0.12 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Allow calling of class methods on arbitrary classes Group: Development/Libraries License: GPL or Artistic @@ -9,9 +9,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: perl(Template), perl(Module::Build) +BuildRequires: perl(Template::Plugin), perl(Module::Build) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) -Requires: perl(Template) +Requires: perl(Template::Plugin) %description %{summary}. @@ -44,6 +44,9 @@ %changelog +* Wed Aug 17 2005 Tom "spot" Callaway 0.12-4 +- perl(Template::Plugin) is more correct + * Wed Aug 17 2005 Tom "spot" Callaway 0.12-3 - more cleanups From fedora-extras-commits at redhat.com Thu Aug 18 04:36:11 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 18 Aug 2005 00:36:11 -0400 Subject: rpms/perl-Template-Plugin-Class/FC-4 perl-Template-Plugin-Class.spec, 1.1, 1.2 Message-ID: <200508180436.j7I4afJM030550@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Template-Plugin-Class/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30497/FC-4 Modified Files: perl-Template-Plugin-Class.spec Log Message: Its pedantic (boogie woogie, woogie)! Index: perl-Template-Plugin-Class.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Template-Plugin-Class/FC-4/perl-Template-Plugin-Class.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Template-Plugin-Class.spec 18 Aug 2005 03:39:35 -0000 1.1 +++ perl-Template-Plugin-Class.spec 18 Aug 2005 04:36:09 -0000 1.2 @@ -1,6 +1,6 @@ Name: perl-Template-Plugin-Class Version: 0.12 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Allow calling of class methods on arbitrary classes Group: Development/Libraries License: GPL or Artistic @@ -9,9 +9,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: perl(Template), perl(Module::Build) +BuildRequires: perl(Template::Plugin), perl(Module::Build) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) -Requires: perl(Template) +Requires: perl(Template::Plugin) %description %{summary}. @@ -44,6 +44,9 @@ %changelog +* Wed Aug 17 2005 Tom "spot" Callaway 0.12-4 +- perl(Template::Plugin) is more correct + * Wed Aug 17 2005 Tom "spot" Callaway 0.12-3 - more cleanups From fedora-extras-commits at redhat.com Thu Aug 18 04:38:49 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 18 Aug 2005 00:38:49 -0400 Subject: rpms/perl-Template-Plugin-Class/FC-3 perl-Template-Plugin-Class.spec, 1.2, 1.3 Message-ID: <200508180438.j7I4cnYn030659@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Template-Plugin-Class/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30618/FC-3 Modified Files: perl-Template-Plugin-Class.spec Log Message: you can't get me back on the farm. Index: perl-Template-Plugin-Class.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Template-Plugin-Class/FC-3/perl-Template-Plugin-Class.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Template-Plugin-Class.spec 18 Aug 2005 04:36:08 -0000 1.2 +++ perl-Template-Plugin-Class.spec 18 Aug 2005 04:38:47 -0000 1.3 @@ -1,6 +1,6 @@ Name: perl-Template-Plugin-Class Version: 0.12 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Allow calling of class methods on arbitrary classes Group: Development/Libraries License: GPL or Artistic @@ -44,7 +44,7 @@ %changelog -* Wed Aug 17 2005 Tom "spot" Callaway 0.12-4 +* Wed Aug 17 2005 Tom "spot" Callaway 0.12-5 - perl(Template::Plugin) is more correct * Wed Aug 17 2005 Tom "spot" Callaway 0.12-3 From fedora-extras-commits at redhat.com Thu Aug 18 04:38:50 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 18 Aug 2005 00:38:50 -0400 Subject: rpms/perl-Template-Plugin-Class/devel perl-Template-Plugin-Class.spec, 1.2, 1.3 Message-ID: <200508180438.j7I4co7l030671@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Template-Plugin-Class/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30618/devel Modified Files: perl-Template-Plugin-Class.spec Log Message: you can't get me back on the farm. Index: perl-Template-Plugin-Class.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Template-Plugin-Class/devel/perl-Template-Plugin-Class.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Template-Plugin-Class.spec 18 Aug 2005 04:36:14 -0000 1.2 +++ perl-Template-Plugin-Class.spec 18 Aug 2005 04:38:48 -0000 1.3 @@ -1,6 +1,6 @@ Name: perl-Template-Plugin-Class Version: 0.12 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Allow calling of class methods on arbitrary classes Group: Development/Libraries License: GPL or Artistic @@ -44,7 +44,7 @@ %changelog -* Wed Aug 17 2005 Tom "spot" Callaway 0.12-4 +* Wed Aug 17 2005 Tom "spot" Callaway 0.12-5 - perl(Template::Plugin) is more correct * Wed Aug 17 2005 Tom "spot" Callaway 0.12-3 From fedora-extras-commits at redhat.com Thu Aug 18 04:38:49 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 18 Aug 2005 00:38:49 -0400 Subject: rpms/perl-Template-Plugin-Class/FC-4 perl-Template-Plugin-Class.spec, 1.2, 1.3 Message-ID: <200508180438.j7I4cnn5030665@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Template-Plugin-Class/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30618/FC-4 Modified Files: perl-Template-Plugin-Class.spec Log Message: you can't get me back on the farm. Index: perl-Template-Plugin-Class.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Template-Plugin-Class/FC-4/perl-Template-Plugin-Class.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Template-Plugin-Class.spec 18 Aug 2005 04:36:09 -0000 1.2 +++ perl-Template-Plugin-Class.spec 18 Aug 2005 04:38:47 -0000 1.3 @@ -1,6 +1,6 @@ Name: perl-Template-Plugin-Class Version: 0.12 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Allow calling of class methods on arbitrary classes Group: Development/Libraries License: GPL or Artistic @@ -44,7 +44,7 @@ %changelog -* Wed Aug 17 2005 Tom "spot" Callaway 0.12-4 +* Wed Aug 17 2005 Tom "spot" Callaway 0.12-5 - perl(Template::Plugin) is more correct * Wed Aug 17 2005 Tom "spot" Callaway 0.12-3 From fedora-extras-commits at redhat.com Thu Aug 18 05:01:38 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Thu, 18 Aug 2005 01:01:38 -0400 Subject: owners owners.list,1.96,1.97 Message-ID: <200508180502.j7I529ux032002@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31985 Modified Files: owners.list Log Message: Taking maintainership of fltk Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.96 retrieving revision 1.97 diff -u -r1.96 -r1.97 --- owners.list 18 Aug 2005 04:30:02 -0000 1.96 +++ owners.list 18 Aug 2005 05:01:35 -0000 1.97 @@ -163,7 +163,7 @@ Fedora Extras|firestarter|The Firestarter firewall tool for GNOME|compton at pcompton.com|extras-qa at fedoraproject.org| Fedora Extras|fish|A friendly interactive shell|liljencrantz at gmail.com|extras-qa at fedoraproject.org| Fedora Extras|flim|Emacs library for handling email messages|petersen at redhat.com|extras-qa at fedoraproject.org| -Fedora Extras|fltk|A C++ user interface toolkit for X11, Win32, and MacOS X|anvil at livna.org|extras-qa at fedoraproject.org| +Fedora Extras|fltk|A C++ user interface toolkit for X11, Win32, and MacOS X|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| Fedora Extras|flumotion|flumotion - the Fluendo Streaming Server|thomas at apestaart.org|extras-qa at fedoraproject.org| Fedora Extras|fluxbox|Fluxbox is a windowmanager that is based on Blackbox|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|fluxconf|Configuration utility for fluxbox|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Thu Aug 18 05:15:15 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Thu, 18 Aug 2005 01:15:15 -0400 Subject: owners owners.list,1.97,1.98 Message-ID: <200508180515.j7I5FFDJ032103@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32084 Modified Files: owners.list Log Message: Add perl-Sort-Versions Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.97 retrieving revision 1.98 diff -u -r1.97 -r1.98 --- owners.list 18 Aug 2005 05:01:35 -0000 1.97 +++ owners.list 18 Aug 2005 05:15:13 -0000 1.98 @@ -628,6 +628,7 @@ Fedora Extras|perl-Razor-Agent|Use a Razor catalogue server to filter spam messages|wtogami at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Set-IntSpan|Perl module for managing sets of integers|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-SOAP-Lite|Provides the Simple Object Access Protocol (SOAP)|thm at duke.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Sort-Versions|Perl module for sorting of revision-like numbers|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Spreadsheet-WriteExcel|Write formatted text and numbers to a cross-platform Excel binary file|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-SQL-Abstract|Generate SQL from Perl data structures|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-String-Ediff|Produce common sub-string indices for two strings|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Thu Aug 18 05:20:19 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Thu, 18 Aug 2005 01:20:19 -0400 Subject: rpms/fltk/devel fltk.spec,1.8,1.9 Message-ID: <200508180520.j7I5KJbg032162@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/fltk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32115/devel Modified Files: fltk.spec Log Message: Fixed BR/Requires for x86_64 Index: fltk.spec =================================================================== RCS file: /cvs/extras/rpms/fltk/devel/fltk.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- fltk.spec 6 Apr 2005 22:11:37 -0000 1.8 +++ fltk.spec 18 Aug 2005 05:20:17 -0000 1.9 @@ -1,7 +1,7 @@ Summary: C++ user interface toolkit for X11, Win32, and MacOS X Name: fltk Version: 1.1.4 -Release: 9 +Release: 10%{?dist} License: LGPL with exceptions Group: System Environment/Libraries @@ -9,14 +9,14 @@ Source0: %{name}-%{version}%{?extraversion}-source.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: libjpeg-devel zlib-devel libpng-devel XFree86-devel -BuildRequires: /usr/lib/pkgconfig/xft.pc pkgconfig +BuildRequires: %{_libdir}/pkgconfig/xft.pc pkgconfig BuildRequires: ImageMagick desktop-file-utils man %package devel Summary: Development package for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} -Requires: XFree86-devel libstdc++-devel /usr/lib/pkgconfig/xft.pc +Requires: XFree86-devel libstdc++-devel %{_libdir}/pkgconfig/xft.pc %package fluid Summary: Fast Light User Interface Designer @@ -125,6 +125,9 @@ %changelog +* Thu Aug 18 2005 Ignacio Vazquez-Abrams 0:1.1.4-10 +- Fixed BR/Requires for x86_64 + * Fri Apr 7 2005 Michael Schwendt - rebuilt From fedora-extras-commits at redhat.com Thu Aug 18 05:20:13 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Thu, 18 Aug 2005 01:20:13 -0400 Subject: rpms/fltk/FC-3 fltk.spec,1.5,1.6 Message-ID: <200508180520.j7I5Kife032165@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/fltk/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32115/FC-3 Modified Files: fltk.spec Log Message: Fixed BR/Requires for x86_64 Index: fltk.spec =================================================================== RCS file: /cvs/extras/rpms/fltk/FC-3/fltk.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- fltk.spec 10 Dec 2004 22:03:02 -0000 1.5 +++ fltk.spec 18 Aug 2005 05:20:11 -0000 1.6 @@ -1,7 +1,7 @@ Summary: A C++ user interface toolkit for X11, Win32, and MacOS X Name: fltk Version: 1.1.4 -Release: 8 +Release: 9 Epoch: 0 License: LGPL with exceptions Group: System Environment/Libraries @@ -9,14 +9,14 @@ Source0: %{name}-%{version}%{?extraversion}-source.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: libjpeg-devel zlib-devel libpng-devel XFree86-devel -BuildRequires: /usr/lib/pkgconfig/xft.pc pkgconfig +BuildRequires: %{_libdir}/pkgconfig/xft.pc pkgconfig BuildRequires: ImageMagick desktop-file-utils man %package devel Summary: Development package for %{name} Group: Development/Libraries Requires: %{name} = %{epoch}:%{version}-%{release} -Requires: XFree86-devel libstdc++-devel /usr/lib/pkgconfig/xft.pc +Requires: XFree86-devel libstdc++-devel %{_libdir}/pkgconfig/xft.pc %package fluid Summary: Fast Light User Interface Designer @@ -132,6 +132,9 @@ # ----------------------------------------------------------------------------- %changelog +* Thu Aug 18 2005 Ignacio Vazquez-Abrams 0:1.1.4-9 +- Fixed BR/Requires for x86_64 + * Thu Nov 20 2003 Dams 0:1.1.4-0.fdr.8 - Hopefully fixed Xft flags for rh80 From fedora-extras-commits at redhat.com Thu Aug 18 05:20:14 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Thu, 18 Aug 2005 01:20:14 -0400 Subject: rpms/fltk/FC-4 fltk.spec,1.8,1.9 Message-ID: <200508180520.j7I5KiIB032168@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/fltk/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32115/FC-4 Modified Files: fltk.spec Log Message: Fixed BR/Requires for x86_64 Index: fltk.spec =================================================================== RCS file: /cvs/extras/rpms/fltk/FC-4/fltk.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- fltk.spec 6 Apr 2005 22:11:37 -0000 1.8 +++ fltk.spec 18 Aug 2005 05:20:12 -0000 1.9 @@ -1,7 +1,7 @@ Summary: C++ user interface toolkit for X11, Win32, and MacOS X Name: fltk Version: 1.1.4 -Release: 9 +Release: 10%{?dist} License: LGPL with exceptions Group: System Environment/Libraries @@ -9,14 +9,14 @@ Source0: %{name}-%{version}%{?extraversion}-source.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: libjpeg-devel zlib-devel libpng-devel XFree86-devel -BuildRequires: /usr/lib/pkgconfig/xft.pc pkgconfig +BuildRequires: %{_libdir}/pkgconfig/xft.pc pkgconfig BuildRequires: ImageMagick desktop-file-utils man %package devel Summary: Development package for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} -Requires: XFree86-devel libstdc++-devel /usr/lib/pkgconfig/xft.pc +Requires: XFree86-devel libstdc++-devel %{_libdir}/pkgconfig/xft.pc %package fluid Summary: Fast Light User Interface Designer @@ -125,6 +125,9 @@ %changelog +* Thu Aug 18 2005 Ignacio Vazquez-Abrams 0:1.1.4-10 +- Fixed BR/Requires for x86_64 + * Fri Apr 7 2005 Michael Schwendt - rebuilt From fedora-extras-commits at redhat.com Thu Aug 18 05:23:40 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Thu, 18 Aug 2005 01:23:40 -0400 Subject: rpms/fltk/FC-4 fltk.spec,1.9,1.10 Message-ID: <200508180524.j7I5OA6m032211@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/fltk/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32179/FC-4 Modified Files: fltk.spec Log Message: Silly C+P error Index: fltk.spec =================================================================== RCS file: /cvs/extras/rpms/fltk/FC-4/fltk.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- fltk.spec 18 Aug 2005 05:20:12 -0000 1.9 +++ fltk.spec 18 Aug 2005 05:23:38 -0000 1.10 @@ -125,7 +125,7 @@ %changelog -* Thu Aug 18 2005 Ignacio Vazquez-Abrams 0:1.1.4-10 +* Thu Aug 18 2005 Ignacio Vazquez-Abrams 1.1.4-10 - Fixed BR/Requires for x86_64 * Fri Apr 7 2005 Michael Schwendt From fedora-extras-commits at redhat.com Thu Aug 18 05:23:40 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Thu, 18 Aug 2005 01:23:40 -0400 Subject: rpms/fltk/devel fltk.spec,1.9,1.10 Message-ID: <200508180524.j7I5OBEo032214@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/fltk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32179/devel Modified Files: fltk.spec Log Message: Silly C+P error Index: fltk.spec =================================================================== RCS file: /cvs/extras/rpms/fltk/devel/fltk.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- fltk.spec 18 Aug 2005 05:20:17 -0000 1.9 +++ fltk.spec 18 Aug 2005 05:23:38 -0000 1.10 @@ -125,7 +125,7 @@ %changelog -* Thu Aug 18 2005 Ignacio Vazquez-Abrams 0:1.1.4-10 +* Thu Aug 18 2005 Ignacio Vazquez-Abrams 1.1.4-10 - Fixed BR/Requires for x86_64 * Fri Apr 7 2005 Michael Schwendt From fedora-extras-commits at redhat.com Thu Aug 18 05:49:18 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 18 Aug 2005 01:49:18 -0400 Subject: fedora-rpmdevtools COPYING, 1.3, 1.4 check-buildroot, 1.4, 1.5 check-rpaths, 1.2, 1.3 check-rpaths-worker, 1.4, 1.5 fedora-md5, 1.3, 1.4 fedora-rmdevelrpms, 1.14, 1.15 fedora-rpmchecksig, 1.2, 1.3 fedora-rpmdevtools.spec, 1.69, 1.70 Message-ID: <200508180549.j7I5nIOY032319@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/fedora/fedora-rpmdevtools In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32290 Modified Files: COPYING check-buildroot check-rpaths check-rpaths-worker fedora-md5 fedora-rmdevelrpms fedora-rpmchecksig fedora-rpmdevtools.spec Log Message: Update FSF's address in copyright notices. Index: COPYING =================================================================== RCS file: /cvs/fedora/fedora-rpmdevtools/COPYING,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- COPYING 10 Aug 2005 01:44:57 -0000 1.3 +++ COPYING 18 Aug 2005 05:49:16 -0000 1.4 @@ -2,7 +2,7 @@ Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -305,7 +305,7 @@ 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 + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Also add information on how to contact you by electronic and paper mail. Index: check-buildroot =================================================================== RCS file: /cvs/fedora/fedora-rpmdevtools/check-buildroot,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- check-buildroot 10 Aug 2005 01:48:10 -0000 1.4 +++ check-buildroot 18 Aug 2005 05:49:16 -0000 1.5 @@ -13,7 +13,7 @@ # # 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. +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA test -z "$QA_SKIP_BUILD_ROOT" || exit 0 Index: check-rpaths =================================================================== RCS file: /cvs/fedora/fedora-rpmdevtools/check-rpaths,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- check-rpaths 12 May 2004 06:02:15 -0000 1.2 +++ check-rpaths 18 Aug 2005 05:49:16 -0000 1.3 @@ -14,7 +14,7 @@ # # 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. +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA test -z "$QA_SKIP_RPATHS" || { Index: check-rpaths-worker =================================================================== RCS file: /cvs/fedora/fedora-rpmdevtools/check-rpaths-worker,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- check-rpaths-worker 18 May 2004 21:50:13 -0000 1.4 +++ check-rpaths-worker 18 Aug 2005 05:49:16 -0000 1.5 @@ -14,7 +14,7 @@ # # 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. +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA fail= Index: fedora-md5 =================================================================== RCS file: /cvs/fedora/fedora-rpmdevtools/fedora-md5,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- fedora-md5 9 Aug 2004 19:08:28 -0000 1.3 +++ fedora-md5 18 Aug 2005 05:49:16 -0000 1.4 @@ -13,7 +13,7 @@ # # 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. +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA while test "$1"; do case "$1" in Index: fedora-rmdevelrpms =================================================================== RCS file: /cvs/fedora/fedora-rpmdevtools/fedora-rmdevelrpms,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- fedora-rmdevelrpms 16 Apr 2005 14:15:52 -0000 1.14 +++ fedora-rmdevelrpms 18 Aug 2005 05:49:16 -0000 1.15 @@ -38,7 +38,7 @@ # # 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. +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA import getopt, os, re, rpm, stat, sys, types Index: fedora-rpmchecksig =================================================================== RCS file: /cvs/fedora/fedora-rpmdevtools/fedora-rpmchecksig,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- fedora-rpmchecksig 15 Aug 2003 20:25:45 -0000 1.2 +++ fedora-rpmchecksig 18 Aug 2005 05:49:16 -0000 1.3 @@ -12,7 +12,7 @@ # # 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. +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #Copyright 2003 Duke University # Seth Vidal skvidal at phy.duke.edu # Index: fedora-rpmdevtools.spec =================================================================== RCS file: /cvs/fedora/fedora-rpmdevtools/fedora-rpmdevtools.spec,v retrieving revision 1.69 retrieving revision 1.70 diff -u -r1.69 -r1.70 --- fedora-rpmdevtools.spec 8 Jul 2005 17:24:17 -0000 1.69 +++ fedora-rpmdevtools.spec 18 Aug 2005 05:49:16 -0000 1.70 @@ -126,6 +126,9 @@ %changelog +* Thu Aug 18 2005 Ville Skytt?? +- Update FSF's address in copyright notices. + * Fri Jul 8 2005 Ville Skytt?? - 1.1-1 - Drop more pre-FC2 compat stuff from Perl spec template. - Treat gcc-gfortran as a devel package in rmdevelrpms. From fedora-extras-commits at redhat.com Thu Aug 18 06:04:08 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 18 Aug 2005 02:04:08 -0400 Subject: fedora-rpmdevtools check-buildroot, 1.5, 1.6 fedora-rpmdevtools.spec, 1.70, 1.71 Message-ID: <200508180604.j7I64UHX001076@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/fedora/fedora-rpmdevtools In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1057 Modified Files: check-buildroot fedora-rpmdevtools.spec Log Message: check-buildroot: grep for buildroot as a fixed string, not a regexp. Index: check-buildroot =================================================================== RCS file: /cvs/fedora/fedora-rpmdevtools/check-buildroot,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- check-buildroot 18 Aug 2005 05:49:16 -0000 1.5 +++ check-buildroot 18 Aug 2005 06:04:06 -0000 1.6 @@ -28,7 +28,7 @@ find "$RPM_BUILD_ROOT" \! $ \ -name '*.pyo' -o -name '*.pyc' -o -name '*.elc' -o -name '.packlist' \ $ -type f -print0 | \ - LANG=C xargs -0r grep "$RPM_BUILD_ROOT" >$tmp + LANG=C xargs -0r grep -F "$RPM_BUILD_ROOT" >$tmp test -s "$tmp" && { cat "$tmp" Index: fedora-rpmdevtools.spec =================================================================== RCS file: /cvs/fedora/fedora-rpmdevtools/fedora-rpmdevtools.spec,v retrieving revision 1.70 retrieving revision 1.71 diff -u -r1.70 -r1.71 --- fedora-rpmdevtools.spec 18 Aug 2005 05:49:16 -0000 1.70 +++ fedora-rpmdevtools.spec 18 Aug 2005 06:04:06 -0000 1.71 @@ -127,6 +127,7 @@ %changelog * Thu Aug 18 2005 Ville Skytt?? +- check-buildroot: grep for buildroot as a fixed string, not a regexp. - Update FSF's address in copyright notices. * Fri Jul 8 2005 Ville Skytt?? - 1.1-1 From fedora-extras-commits at redhat.com Thu Aug 18 06:53:29 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Thu, 18 Aug 2005 02:53:29 -0400 Subject: rpms/fltk/FC-3 fltk.spec,1.6,1.7 Message-ID: <200508180653.j7I6rTqV001329@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/fltk/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1312 Modified Files: fltk.spec Log Message: Hrm. Need a new unique tag on this one. Index: fltk.spec =================================================================== RCS file: /cvs/extras/rpms/fltk/FC-3/fltk.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- fltk.spec 18 Aug 2005 05:20:11 -0000 1.6 +++ fltk.spec 18 Aug 2005 06:53:27 -0000 1.7 @@ -1,7 +1,7 @@ Summary: A C++ user interface toolkit for X11, Win32, and MacOS X Name: fltk Version: 1.1.4 -Release: 9 +Release: 9%{?dist} Epoch: 0 License: LGPL with exceptions Group: System Environment/Libraries From rc040203 at freenet.de Thu Aug 18 07:00:05 2005 From: rc040203 at freenet.de (Ralf Corsepius) Date: Thu, 18 Aug 2005 09:00:05 +0200 Subject: rpms/perl-Class-Trigger/devel perl-Class-Trigger.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 In-Reply-To: <200508180311.j7I3Av81025936@cvs-int.fedora.redhat.com> References: <200508180311.j7I3Av81025936@cvs-int.fedora.redhat.com> Message-ID: <1124348406.5137.27.camel@mccallum.corsepiu.local> Repost - initially sent to the wrong list ... On Wed, 2005-08-17 at 23:10 -0400, Tom Callaway wrote: > --- NEW FILE perl-Class-Trigger.spec --- > Requires: perl(IO::Scalar) No pedantry, just a "normal" packaging bug: ;) "Requires: perl(IO::Scalar)" can be removed, because IO::Scalar is not used Class/Trigger.pm. Ralf From fedora-extras-commits at redhat.com Thu Aug 18 07:19:38 2005 From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau)) Date: Thu, 18 Aug 2005 03:19:38 -0400 Subject: rpms/yumex/FC-4 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 yumex.spec, 1.3, 1.4 Message-ID: <200508180719.j7I7JcX6002673@cvs-int.fedora.redhat.com> Author: timlau Update of /cvs/extras/rpms/yumex/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2652 Modified Files: .cvsignore sources yumex.spec Log Message: New release 0.42-02 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/yumex/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 17 Aug 2005 10:12:29 -0000 1.3 +++ .cvsignore 18 Aug 2005 07:19:36 -0000 1.4 @@ -1 +1 @@ -yumex-0.42-1.tar.gz +yumex-0.42-2.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/yumex/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 17 Aug 2005 10:12:29 -0000 1.3 +++ sources 18 Aug 2005 07:19:36 -0000 1.4 @@ -1 +1 @@ -8df6733cf79c6c375341e29d7a37d6ba yumex-0.42-1.tar.gz +5f2e258ab9296f2a0e38757d98d9b6b2 yumex-0.42-2.tar.gz Index: yumex.spec =================================================================== RCS file: /cvs/extras/rpms/yumex/FC-4/yumex.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- yumex.spec 17 Aug 2005 10:12:29 -0000 1.3 +++ yumex.spec 18 Aug 2005 07:19:36 -0000 1.4 @@ -1,8 +1,8 @@ -%define build_v 1 +%define build_v 2 Name: yumex Version: 0.42 -Release: 1.0%{?dist} +Release: 2.0%{?dist} Summary: Yum Extender graphical package management tool Group: Applications/System @@ -67,6 +67,11 @@ %{_datadir}/applications/fedora-%{name}.desktop %changelog +* Wed Aug 17 2005 Tim Lauridsen - 0.42-2.0 +- Release 0.42-2.0 +- Fixed TypeError in yumexBase.errorlog in yumbase.py + + * Wed Aug 17 2005 Tim Lauridsen - 0.42-1.0 - Release 0.42 - Added Requires: pygtk2-libglade (Bugzilla 163439) From fedora-extras-commits at redhat.com Thu Aug 18 09:15:34 2005 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Thu, 18 Aug 2005 05:15:34 -0400 Subject: fedora-security/audit fc4,1.45,1.46 Message-ID: <200508180915.j7I9FY7k006656@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6639 Modified Files: fc4 Log Message: More emails yesterday; a few of these need some attention later Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- fc4 17 Aug 2005 10:49:22 -0000 1.45 +++ fc4 18 Aug 2005 09:15:32 -0000 1.46 @@ -1,5 +1,5 @@ -Up to date CVE as of CVE email 20050816 -Up to date FC4 as of 20050816 +Up to date CVE as of CVE email 20050817 +Up to date FC4 as of 20050817 ** are items that need attention @@ -18,7 +18,7 @@ 2005-2500 version (kernel, flaw introduced after 2.6.12) 2005-2498 ** php xmlrpc 2005-2475 VULNERABLE (unzip) bz#164928 -2005-2471 VULNERABLE (netpbm) bz#165355 +2005-2471 backport (netpbm) [since FEDORA-2005-728] 2005-2459 VULNERABLE (kernel, fixed 20050805) 2005-2458 VULNERABLE (kernel, fixed 20050805) 2005-2457 ignore (kernel) this is just a bug @@ -31,6 +31,7 @@ 2005-2410 backport (NetworkManager) [since FEDORA-2005-680] 2005-2395 ** firefox 2005-2370 version (kdenetwork, fixed 3.4.2) [since FEDORA-2005-670] was backport since FEDORA-2005-624 +2005-2370 ** gaim [since FEDORA-2005-751] 2005-2369 version (kdenetwork, fixed 3.4.2) [since FEDORA-2005-670] was backport since FEDORA-2005-624 2005-2368 version (vim, fixed 6.3.086 at least) [since FEDORA-2005-737] 2005-2367 version (ethereal, fixed 0.10.12) [since FEDORA-2005-655] @@ -74,8 +75,9 @@ 2005-2100 version (kernel, not upstream) 2005-2099 VULNERABLE (kernel, fixed 20050804) bz#164989 2005-2098 VULNERABLE (kernel, fixed 20050804) bz#164988 -2005-2103 ** gaim bz#165403 -2005-2102 ** gaim bz#165401 +2005-2103 ** gaim [since FEDORA-2005-751] +2005-2102 ** gaim [since FEDORA-2005-751] +2005-2097 backport (cups) [since FEDORA-2005-732] 2005-2097 backport (xpdf) [since FEDORA-2005-729] 2005-2096 backport (zlib) [since FEDORA-2005-523] 2005-2096 backport (rpm) [since FEDORA-2005-565] @@ -391,6 +393,10 @@ 2005-0004 version (mysql, fixed 4.1.10) 2005-0003 version (kernel, fixed 2.6.10) 2005-0001 version (kernel, fixed 2.6.10) +2004-2396 ** passwd +2004-2395 ** passwd +2004-2394 ** passwd +2004-2392 ** libuser 2004-2302 version (kernel, fixed 2.6.10) 2004-2259 version (vsftpd, fixed 1.2.2) 2004-2228 version (firefox, fixed 1.0) From fedora-extras-commits at redhat.com Thu Aug 18 11:07:25 2005 From: fedora-extras-commits at redhat.com (Gavin Henry (ghenry)) Date: Thu, 18 Aug 2005 07:07:25 -0400 Subject: rpms/rdiff-backup import.log,1.4,1.5 Message-ID: <200508181108.j7IB8S3d009356@cvs-int.fedora.redhat.com> Author: ghenry Update of /cvs/extras/rpms/rdiff-backup In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9286 Modified Files: import.log Log Message: auto-import rdiff-backup-1.0.0-1 on branch FC-4 from rdiff-backup-1.0.0-1.src.rpm Upgraded to version 1.0.0 as per Bugzilla Bug 166238 Index: import.log =================================================================== RCS file: /cvs/extras/rpms/rdiff-backup/import.log,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- import.log 8 Nov 2004 05:18:08 -0000 1.4 +++ import.log 18 Aug 2005 11:06:57 -0000 1.5 @@ -1,3 +1,4 @@ rdiff-backup-0_12_6-0_fdr_1_rh90:HEAD:rdiff-backup-0.12.6-0.fdr.1.rh90.src.rpm:1099891075 rdiff-backup-0_12_6-0_fdr_1_1:HEAD:rdiff-backup-0.12.6-0.fdr.1.1.src.rpm:1099891082 rdiff-backup-0_12_6-0_fdr_1_2:HEAD:rdiff-backup-0.12.6-0.fdr.1.2.src.rpm:1099891088 +rdiff-backup-1_0_0-1:FC-4:rdiff-backup-1.0.0-1.src.rpm:1124363198 From fedora-extras-commits at redhat.com Thu Aug 18 11:07:47 2005 From: fedora-extras-commits at redhat.com (Gavin Henry (ghenry)) Date: Thu, 18 Aug 2005 07:07:47 -0400 Subject: rpms/rdiff-backup/FC-4 .cvsignore, 1.2, 1.3 rdiff-backup.spec, 1.8, 1.9 sources, 1.3, 1.4 Message-ID: <200508181108.j7IB8JhI009346@cvs-int.fedora.redhat.com> Author: ghenry Update of /cvs/extras/rpms/rdiff-backup/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9286/FC-4 Modified Files: .cvsignore rdiff-backup.spec sources Log Message: auto-import rdiff-backup-1.0.0-1 on branch FC-4 from rdiff-backup-1.0.0-1.src.rpm Upgraded to version 1.0.0 as per Bugzilla Bug 166238 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/rdiff-backup/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 05:17:55 -0000 1.2 +++ .cvsignore 18 Aug 2005 11:07:41 -0000 1.3 @@ -1 +1 @@ -rdiff-backup-0.12.6.tar.gz +rdiff-backup-1.0.0.tar.gz Index: rdiff-backup.spec =================================================================== RCS file: /cvs/extras/rpms/rdiff-backup/FC-4/rdiff-backup.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- rdiff-backup.spec 12 May 2005 02:56:28 -0000 1.8 +++ rdiff-backup.spec 18 Aug 2005 11:07:41 -0000 1.9 @@ -1,9 +1,9 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} -Version: 0.12.7 +Version: 1.0.0 Summary: Convenient and transparent local/remote incremental mirror/backup Name: rdiff-backup -Release: 3 +Release: 1%{?dist} URL: http://www.nongnu.org/rdiff-backup/ Source: http://savannah.nongnu.org/download/%{name}/%{name}-%{version}.tar.gz @@ -53,6 +53,9 @@ %ghost %{python_sitearch}/rdiff_backup/*.pyo %changelog +* Thu Aug 15 2005 Gavin Henry - 0:1.0.0-1 +- Latest version + * Wed May 11 2005 Bill Nottingham - 0:0.12.7-3 - rebuilt Index: sources =================================================================== RCS file: /cvs/extras/rpms/rdiff-backup/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 22 Jan 2005 20:27:02 -0000 1.3 +++ sources 18 Aug 2005 11:07:41 -0000 1.4 @@ -1 +1 @@ -12fb0085861483eab379cb578fa9c849 rdiff-backup-0.12.7.tar.gz +bfd0cd4361a8c34423f12a69fdd31517 rdiff-backup-1.0.0.tar.gz From fedora-extras-commits at redhat.com Thu Aug 18 11:39:15 2005 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Thu, 18 Aug 2005 07:39:15 -0400 Subject: rpms/bittorrent/devel bittorrent.spec, 1.25, 1.26 bittorrent.desktop, 1.1, 1.2 btseed.init, 1.3, 1.4 bttrack.init, 1.3, 1.4 sources, 1.9, 1.10 .cvsignore, 1.9, 1.10 Message-ID: <200508181139.j7IBdF7g009482@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/bittorrent/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9459 Modified Files: bittorrent.spec bittorrent.desktop btseed.init bttrack.init sources .cvsignore Log Message: * Thu Aug 18 2005 Paul Howarth 4.1.4-1 - update to 4.1.4 - all "binaries" renamed; initscripts & desktop entry changed accordingly - don't need to edit out "env python2"... stuff - appdir now set in platform.py instead of __init__.py - add credits-l10n.txt as %doc - add python-crypto dependency - add public.key in appropriate place - tweak Fedora/RHEL conditional build selection Index: bittorrent.spec =================================================================== RCS file: /cvs/extras/rpms/bittorrent/devel/bittorrent.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- bittorrent.spec 15 Jul 2005 12:12:58 -0000 1.25 +++ bittorrent.spec 18 Aug 2005 11:39:13 -0000 1.26 @@ -3,7 +3,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: bittorrent -Version: 4.1.3 +Version: 4.1.4 Release: 1%{?dist} Summary: BitTorrent swarming network file transfer tool @@ -19,9 +19,9 @@ BuildArch: noarch BuildRequires: python-devel desktop-file-utils gettext -Requires: python +Requires: python-crypto # FC4 and later auto-generate python version dependency -%if "%{fedora}" < "4" || 0%{?rhel} +%if %{!?fedora:0}%{?fedora} < 4 || %{!?rhel:0}%{?rhel} Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") %endif @@ -56,9 +56,8 @@ This package contains the GUI versions of the BitTorrent file transfer tool. -# Fedora >= 4 has /srv, as does RHEL4 -# Older versions of RHEL don't provide other dependencies needed for this package, so don't cater for them -%if "%{fedora}" >= "4" || 0%{?rhel} +# Fedora >= 4 has /srv, as does RHEL >= 4 +%if %{!?fedora:0}%{?fedora} >= 4 || %{!?rhel:0}%{?rhel} >= 4 %define bt_dir /srv/bittorrent/data %define bt_statedir /srv/bittorrent/state %else @@ -66,9 +65,19 @@ %define bt_statedir %{_localstatedir}/lib/bittorrent %endif +# Fedora >= 4 and RHEL > 4 have /etc/pki +%if %{!?fedora:0}%{?fedora} >= 4 || %{!?rhel:0}%{?rhel} > 4 +%define pkidir %{_sysconfdir}/pki +%else +%define pkidir %{_datadir} +%endif + %prep %setup -q -n BitTorrent-%{version} -%{__sed} -i "s/appdir = .*/appdir = '%{name}-%{version}'/" BitTorrent/__init__.py +%{__sed} -i "s#appdir = .*#appdir = '%{name}-%{version}'#" \ + BitTorrent/platform.py +%{__sed} -i "s#public_key_file = .*#public_key_file = open('%{pkidir}/bittorrent/public.key', 'rb')#" \ + BitTorrent/NewVersion.py %{__cat} <btseed.sysconfig DIR=%{bt_dir} @@ -110,7 +119,6 @@ %install %{__rm} -rf $RPM_BUILD_ROOT %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT -%{__sed} -i -e 's/env python2/env python/' $RPM_BUILD_ROOT%{_bindir}/* %{_bindir}/desktop-file-install --vendor %{desktopvendor} \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ @@ -119,6 +127,8 @@ %{__install} -d $RPM_BUILD_ROOT%{bt_dir} %{__install} -d $RPM_BUILD_ROOT%{bt_statedir} %{__install} -d $RPM_BUILD_ROOT%{_localstatedir}/log/bittorrent +%{__install} -d -m 755 $RPM_BUILD_ROOT%{pkidir}/bittorrent +%{__install} -m 0644 public.key $RPM_BUILD_ROOT%{pkidir}/bittorrent %{__install} -m 0644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/bittorrent.png %{__install} -m 0755 -D %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/btseed %{__install} -m 0755 -D %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/bttrack @@ -126,6 +136,9 @@ %{__install} -m 0644 -D bttrack.sysconfig $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/bttrack %{__install} -m 0644 -D btseed.logrotate $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/btseed %{__install} -m 0644 -D bttrack.logrotate $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/bttrack +# pidof doesn't find scripts with hyphenated names, so make some convenience links for initscripts +%{__ln_s} bittorrent-tracker $RPM_BUILD_ROOT%{_bindir}/bttrack +%{__ln_s} launchmany-console $RPM_BUILD_ROOT%{_bindir}/btseed %{find_lang} bittorrent %clean @@ -165,16 +178,18 @@ %files -f bittorrent.lang %defattr(-,root,root,-) -%doc README.txt credits.txt LICENSE.txt TRACKERLESS.txt -%{_bindir}/btdownloadcurses.py -%{_bindir}/btdownloadheadless.py -%{_bindir}/btlaunchmany.py -%{_bindir}/btlaunchmanycurses.py -%{_bindir}/btmaketorrent.py -%{_bindir}/btreannounce.py -%{_bindir}/btrename.py -%{_bindir}/btshowmetainfo.py -%{_bindir}/bttrack.py +%doc README.txt credits.txt credits-l10n.txt LICENSE.txt TRACKERLESS.txt +%{_bindir}/bittorrent-console +%{_bindir}/bittorrent-curses +%{_bindir}/bittorrent-tracker +%{_bindir}/changetracker-console +%{_bindir}/launchmany-console +%{_bindir}/launchmany-curses +%{_bindir}/maketorrent-console +%{_bindir}/torrentinfo-console +%{_bindir}/bttrack +%{_bindir}/btseed +%{pkidir}/bittorrent %dir %{python_sitelib}/BitTorrent %{python_sitelib}/BitTorrent/*.py %{python_sitelib}/BitTorrent/*.pyc @@ -195,13 +210,23 @@ %files gui %defattr(-,root,root,-) -%{_bindir}/btdownloadgui.py -%{_bindir}/btmaketorrentgui.py +%{_bindir}/bittorrent +%{_bindir}/maketorrent %{_datadir}/applications/%{desktopvendor}-bittorrent.desktop %{_datadir}/pixmaps/%{name}-%{version} %{_datadir}/icons/hicolor/48x48/apps/bittorrent.png %changelog +* Thu Aug 18 2005 Paul Howarth 4.1.4-1 +- update to 4.1.4 +- all "binaries" renamed; initscripts & desktop entry changed accordingly +- don't need to edit out "env python2"... stuff +- appdir now set in platform.py instead of __init__.py +- add credits-l10n.txt as %%doc +- add python-crypto dependency +- add public.key in appropriate place +- tweak Fedora/RHEL conditional build selection + * Fri Jul 15 2005 Paul Howarth 4.1.3-1 - update to 4.1.3 Index: bittorrent.desktop =================================================================== RCS file: /cvs/extras/rpms/bittorrent/devel/bittorrent.desktop,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- bittorrent.desktop 15 Mar 2005 05:50:46 -0000 1.1 +++ bittorrent.desktop 18 Aug 2005 11:39:13 -0000 1.2 @@ -2,7 +2,7 @@ Encoding=UTF-8 Name=BitTorrent File Transfer Comment=Distributed download of files from the Internet -Exec=btdownloadgui.py +Exec=bittorrent Icon=bittorrent.png Terminal=false Type=Application Index: btseed.init =================================================================== RCS file: /cvs/extras/rpms/bittorrent/devel/btseed.init,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- btseed.init 2 Jun 2005 14:26:47 -0000 1.3 +++ btseed.init 18 Aug 2005 11:39:13 -0000 1.4 @@ -3,7 +3,7 @@ # chkconfig: - 16 84 # description: Start up seed clients for BitTorrennt # -# processname: btlaunchmany.py +# processname: btseed # config: /etc/sysconfig/btseed # source function library @@ -25,7 +25,7 @@ . /etc/sysconfig/btseed RETVAL=0 -prog="/usr/bin/btlaunchmany.py" +prog="/usr/bin/btseed" btuser="torrent" case "$1" in @@ -34,9 +34,9 @@ runuser -s /bin/sh -c "$prog $OPTIONS $DIR" $btuser &> $SEEDLOG & disown -ar usleep 500000 - status btlaunchmany.py &> /dev/null && echo_success || echo_failure + status btseed &> /dev/null && echo_success || echo_failure RETVAL=$? - [ $RETVAL -eq 0 ] && touch /var/lock/subsys/btlaunchmany.py + [ $RETVAL -eq 0 ] && touch /var/lock/subsys/btseed echo ;; stop) @@ -44,7 +44,7 @@ killproc $prog #killproc "/usr/bin/python $prog" RETVAL=$? - [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/btlaunchmany.py + [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/btseed echo ;; restart|reload) @@ -53,14 +53,14 @@ RETVAL=$? ;; condrestart) - if [ -f /var/lock/subsys/btlaunchmany.py ]; then + if [ -f /var/lock/subsys/btseed ]; then $0 stop $0 start fi RETVAL=$? ;; status) - status btlaunchmany.py + status btseed RETVAL=$? ;; *) Index: bttrack.init =================================================================== RCS file: /cvs/extras/rpms/bittorrent/devel/bttrack.init,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- bttrack.init 2 Jun 2005 14:28:24 -0000 1.3 +++ bttrack.init 18 Aug 2005 11:39:13 -0000 1.4 @@ -3,7 +3,7 @@ # chkconfig: - 16 84 # description: Start up tracker for BitTorrennt # -# processname: bttrack.py +# processname: bttrack # config: /etc/sysconfig/bttrack # source function library @@ -12,7 +12,6 @@ # Check that networking is up. [ "${NETWORKING}" = "no" ] && exit 0 - # defaults PORT=6969 STATEFILE=/srv/bittorrent/state/bttrack @@ -25,7 +24,7 @@ . /etc/sysconfig/bttrack RETVAL=0 -prog="/usr/bin/bttrack.py" +prog="/usr/bin/bttrack" btuser="torrent" case "$1" in @@ -35,9 +34,9 @@ $OPTIONS --allowed_dir $DIR" $btuser &> /dev/null & disown -ar usleep 500000 - status bttrack.py &> /dev/null && echo_success || echo_failure + status bttrack &> /dev/null && echo_success || echo_failure RETVAL=$? - [ $RETVAL -eq 0 ] && touch /var/lock/subsys/bttrack.py + [ $RETVAL -eq 0 ] && touch /var/lock/subsys/bttrack echo ;; stop) @@ -45,7 +44,7 @@ killproc $prog #killproc "/usr/bin/python $prog" RETVAL=$? - [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/bttrack.py + [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/bttrack echo ;; restart|reload) @@ -54,14 +53,14 @@ RETVAL=$? ;; condrestart) - if [ -f /var/lock/subsys/bttrack.py ]; then + if [ -f /var/lock/subsys/bttrack ]; then $0 stop $0 start fi RETVAL=$? ;; status) - status bttrack.py + status bttrack RETVAL=$? ;; *) Index: sources =================================================================== RCS file: /cvs/extras/rpms/bittorrent/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 15 Jul 2005 12:12:58 -0000 1.9 +++ sources 18 Aug 2005 11:39:13 -0000 1.10 @@ -1 +1 @@ -cd4dff145b5dea3789fa384bb94a4de9 BitTorrent-4.1.3.tar.gz +1d0f85eb5cd4ac219853e2e6709f5847 BitTorrent-4.1.4.tar.gz Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bittorrent/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 15 Jul 2005 12:12:58 -0000 1.9 +++ .cvsignore 18 Aug 2005 11:39:13 -0000 1.10 @@ -1 +1 @@ -BitTorrent-4.1.3.tar.gz +BitTorrent-4.1.4.tar.gz From fedora-extras-commits at redhat.com Thu Aug 18 12:39:19 2005 From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy)) Date: Thu, 18 Aug 2005 08:39:19 -0400 Subject: rpms/cproto/FC-4 cproto.spec,1.1,1.2 Message-ID: <200508181239.j7ICdJbd010867@cvs-int.fedora.redhat.com> Author: jnovy Update of /cvs/extras/rpms/cproto/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10850 Modified Files: cproto.spec Log Message: initial FC-4 Extras build Index: cproto.spec =================================================================== RCS file: /cvs/extras/rpms/cproto/FC-4/cproto.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- cproto.spec 17 Aug 2005 07:43:34 -0000 1.1 +++ cproto.spec 18 Aug 2005 12:39:17 -0000 1.2 @@ -1,7 +1,7 @@ Summary: Generates function prototypes and variable declarations from C code Name: cproto Version: 4.7c -Release: 7 +Release: 7.fc4 License: Public Domain Group: Development/Tools Source: ftp://invisible-island.net/cproto/cproto-4_7c.tgz @@ -43,6 +43,9 @@ %{_mandir}/man1/cproto.* %changelog +* Thu Aug 18 2005 Jindrich Novy 4.7c-7.fc4 +- initial FC-4 Extras build + * Sat Aug 13 2005 Jindrich Novy 4.7c-7 - prepare for Fedora Extras inclusion (#165811) From fedora-extras-commits at redhat.com Thu Aug 18 15:23:05 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 18 Aug 2005 11:23:05 -0400 Subject: rpms/xbsql - New directory Message-ID: <200508181523.j7IFN5xu014860@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/xbsql In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14836/xbsql Log Message: Directory /cvs/extras/rpms/xbsql added to the repository From fedora-extras-commits at redhat.com Thu Aug 18 15:23:05 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 18 Aug 2005 11:23:05 -0400 Subject: rpms/xbsql/devel - New directory Message-ID: <200508181523.j7IFN56M014865@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/xbsql/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14836/xbsql/devel Log Message: Directory /cvs/extras/rpms/xbsql/devel added to the repository From fedora-extras-commits at redhat.com Thu Aug 18 15:23:21 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 18 Aug 2005 11:23:21 -0400 Subject: rpms/xbsql Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200508181523.j7IFNLW3014912@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/xbsql In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14881 Added Files: Makefile import.log Log Message: Setup of module xbsql --- NEW FILE Makefile --- # Top level Makefile for module xbsql all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Thu Aug 18 15:23:21 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 18 Aug 2005 11:23:21 -0400 Subject: rpms/xbsql/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200508181523.j7IFNLHp014917@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/xbsql/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14881/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module xbsql --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Thu Aug 18 15:23:51 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 18 Aug 2005 11:23:51 -0400 Subject: rpms/xbsql import.log,1.1,1.2 Message-ID: <200508181524.j7IFOLwb015026@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/xbsql In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14945 Modified Files: import.log Log Message: auto-import xbsql-0.11-4 on branch devel from xbsql-0.11-4.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/xbsql/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 18 Aug 2005 15:23:19 -0000 1.1 +++ import.log 18 Aug 2005 15:23:49 -0000 1.2 @@ -0,0 +1 @@ +xbsql-0_11-4:HEAD:xbsql-0.11-4.src.rpm:1124378681 From fedora-extras-commits at redhat.com Thu Aug 18 15:23:51 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 18 Aug 2005 11:23:51 -0400 Subject: rpms/xbsql/devel xbsql.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200508181524.j7IFOMKh015030@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/xbsql/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14945/devel Modified Files: .cvsignore sources Added Files: xbsql.spec Log Message: auto-import xbsql-0.11-4 on branch devel from xbsql-0.11-4.src.rpm --- NEW FILE xbsql.spec --- Name: xbsql Summary: A SQL wrapper for xbase Version: 0.11 Release: 4%{?dist} Group: Development/Libraries License: LGPL URL: http://www.quaking.demon.co.uk/xbsql/ Source0: http://www.rekallrevealed.org/packages/%{name}-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: xbase-devel, ncurses-devel, readline-devel %description XBSQL is a wrapper library which provides an SQL-subset interface to Xbase DBMS. %package devel Summary: XBSQL development libraries and headers Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: xbase-devel %description devel Headers and libraries for compiling programs that use the XBSQL library. %prep %setup -q %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-, root, root, 0755) %doc AUTHORS COPYING doc/*.html README %{_libdir}/*.so.* %{_bindir}/xql %files devel %defattr(-, root, root, 0755) %{_includedir}/* %{_libdir}/*.so %{_libdir}/*.a %changelog * Thu Aug 18 2005 Tom "spot" Callaway 0.11-4 - add the Requires: xbase-devel for the -devel package * Mon Jul 18 2005 Tom "spot" Callaway 0.11-3 - add BR: readline-devel * Sun Jul 10 2005 Tom "spot" Callaway 0.11-2 - shorten description - add BuildRequires: ncurses-devel * Fri Jun 17 2005 Tom "spot" Callaway 0.11-1 - initial package for Fedora Extras Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xbsql/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 18 Aug 2005 15:23:19 -0000 1.1 +++ .cvsignore 18 Aug 2005 15:23:49 -0000 1.2 @@ -0,0 +1 @@ +xbsql-0.11.tgz Index: sources =================================================================== RCS file: /cvs/extras/rpms/xbsql/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 18 Aug 2005 15:23:19 -0000 1.1 +++ sources 18 Aug 2005 15:23:49 -0000 1.2 @@ -0,0 +1 @@ +7f8c8584cf0f592660fb2653a4bfc415 xbsql-0.11.tgz From fedora-extras-commits at redhat.com Thu Aug 18 15:25:45 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 18 Aug 2005 11:25:45 -0400 Subject: owners owners.list,1.98,1.99 Message-ID: <200508181525.j7IFPjnr015084@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15067 Modified Files: owners.list Log Message: xbsql Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.98 retrieving revision 1.99 diff -u -r1.98 -r1.99 --- owners.list 18 Aug 2005 05:15:13 -0000 1.98 +++ owners.list 18 Aug 2005 15:25:43 -0000 1.99 @@ -902,6 +902,7 @@ Fedora Extras|xbase|XBase compatible database library and tools|tcallawa at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|xbindkeys|Binds keys or mouse buttons to shell commands under X|gauret at free.fr|extras-qa at fedoraproject.org| Fedora Extras|xboard|An X Window System graphical chessboard|kaboom at oobleck.net|extras-qa at fedoraproject.org| +Fedora Extras|xbsql|A SQL wrapper for xbase|tcallawa at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|xca|Graphical X.509 certificate management tool|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org| Fedora Extras|xcin|A XIM server input method for Traditional Chinese|llch at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|xdaliclock|A clock for the X Window System|kaboom at oobleck.net|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Thu Aug 18 15:38:01 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 18 Aug 2005 11:38:01 -0400 Subject: rpms/xbsql/FC-3 xbsql-0.11-ncurses64.patch, NONE, 1.1 xbsql.spec, 1.1, 1.2 Message-ID: <200508181538.j7IFcW6S015435@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/xbsql/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15379/FC-3 Modified Files: xbsql.spec Added Files: xbsql-0.11-ncurses64.patch Log Message: Fix 64bit ncurses detection xbsql-0.11-ncurses64.patch: --- NEW FILE xbsql-0.11-ncurses64.patch --- --- xbsql-0.11/configure.BAD 2005-08-18 10:34:49.000000000 -0500 +++ xbsql-0.11/configure 2005-08-18 10:36:22.000000000 -0500 @@ -6977,10 +6977,15 @@ if test -f /usr/lib/libncurses.so then curses=ncurses - + elif test -f /usr/lib64/libncurses.so + then + curses=ncurses elif test -f /usr/lib/libcurses.so then curses=curses + elif test -f /usr/lib64/libcurses.so + then + curses=curses else { { echo "$as_me:6985: error: No (n)curses installation" >&5 echo "$as_me: error: No (n)curses installation" >&2;} Index: xbsql.spec =================================================================== RCS file: /cvs/extras/rpms/xbsql/FC-3/xbsql.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xbsql.spec 18 Aug 2005 15:23:49 -0000 1.1 +++ xbsql.spec 18 Aug 2005 15:37:59 -0000 1.2 @@ -1,13 +1,14 @@ Name: xbsql Summary: A SQL wrapper for xbase Version: 0.11 -Release: 4%{?dist} +Release: 5%{?dist} Group: Development/Libraries License: LGPL URL: http://www.quaking.demon.co.uk/xbsql/ Source0: http://www.rekallrevealed.org/packages/%{name}-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: xbase-devel, ncurses-devel, readline-devel +Patch0: xbsql-0.11-ncurses64.patch %description XBSQL is a wrapper library which provides an SQL-subset interface to Xbase @@ -24,6 +25,7 @@ %prep %setup -q +%patch0 -p1 %build %configure @@ -54,6 +56,9 @@ %{_libdir}/*.a %changelog +* Thu Aug 18 2005 Tom "spot" Callaway 0.11-5 +- fix 64 bit ncurses detection + * Thu Aug 18 2005 Tom "spot" Callaway 0.11-4 - add the Requires: xbase-devel for the -devel package From fedora-extras-commits at redhat.com Thu Aug 18 15:38:02 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 18 Aug 2005 11:38:02 -0400 Subject: rpms/xbsql/FC-4 xbsql-0.11-ncurses64.patch, NONE, 1.1 xbsql.spec, 1.1, 1.2 Message-ID: <200508181538.j7IFcWTu015438@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/xbsql/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15379/FC-4 Modified Files: xbsql.spec Added Files: xbsql-0.11-ncurses64.patch Log Message: Fix 64bit ncurses detection xbsql-0.11-ncurses64.patch: --- NEW FILE xbsql-0.11-ncurses64.patch --- --- xbsql-0.11/configure.BAD 2005-08-18 10:34:49.000000000 -0500 +++ xbsql-0.11/configure 2005-08-18 10:36:22.000000000 -0500 @@ -6977,10 +6977,15 @@ if test -f /usr/lib/libncurses.so then curses=ncurses - + elif test -f /usr/lib64/libncurses.so + then + curses=ncurses elif test -f /usr/lib/libcurses.so then curses=curses + elif test -f /usr/lib64/libcurses.so + then + curses=curses else { { echo "$as_me:6985: error: No (n)curses installation" >&5 echo "$as_me: error: No (n)curses installation" >&2;} Index: xbsql.spec =================================================================== RCS file: /cvs/extras/rpms/xbsql/FC-4/xbsql.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xbsql.spec 18 Aug 2005 15:23:49 -0000 1.1 +++ xbsql.spec 18 Aug 2005 15:38:00 -0000 1.2 @@ -1,13 +1,14 @@ Name: xbsql Summary: A SQL wrapper for xbase Version: 0.11 -Release: 4%{?dist} +Release: 5%{?dist} Group: Development/Libraries License: LGPL URL: http://www.quaking.demon.co.uk/xbsql/ Source0: http://www.rekallrevealed.org/packages/%{name}-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: xbase-devel, ncurses-devel, readline-devel +Patch0: xbsql-0.11-ncurses64.patch %description XBSQL is a wrapper library which provides an SQL-subset interface to Xbase @@ -24,6 +25,7 @@ %prep %setup -q +%patch0 -p1 %build %configure @@ -54,6 +56,9 @@ %{_libdir}/*.a %changelog +* Thu Aug 18 2005 Tom "spot" Callaway 0.11-5 +- fix 64 bit ncurses detection + * Thu Aug 18 2005 Tom "spot" Callaway 0.11-4 - add the Requires: xbase-devel for the -devel package From fedora-extras-commits at redhat.com Thu Aug 18 15:38:02 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 18 Aug 2005 11:38:02 -0400 Subject: rpms/xbsql/devel xbsql-0.11-ncurses64.patch, NONE, 1.1 xbsql.spec, 1.1, 1.2 Message-ID: <200508181538.j7IFcWsS015439@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/xbsql/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15379/devel Modified Files: xbsql.spec Added Files: xbsql-0.11-ncurses64.patch Log Message: Fix 64bit ncurses detection xbsql-0.11-ncurses64.patch: --- NEW FILE xbsql-0.11-ncurses64.patch --- --- xbsql-0.11/configure.BAD 2005-08-18 10:34:49.000000000 -0500 +++ xbsql-0.11/configure 2005-08-18 10:36:22.000000000 -0500 @@ -6977,10 +6977,15 @@ if test -f /usr/lib/libncurses.so then curses=ncurses - + elif test -f /usr/lib64/libncurses.so + then + curses=ncurses elif test -f /usr/lib/libcurses.so then curses=curses + elif test -f /usr/lib64/libcurses.so + then + curses=curses else { { echo "$as_me:6985: error: No (n)curses installation" >&5 echo "$as_me: error: No (n)curses installation" >&2;} Index: xbsql.spec =================================================================== RCS file: /cvs/extras/rpms/xbsql/devel/xbsql.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xbsql.spec 18 Aug 2005 15:23:49 -0000 1.1 +++ xbsql.spec 18 Aug 2005 15:38:00 -0000 1.2 @@ -1,13 +1,14 @@ Name: xbsql Summary: A SQL wrapper for xbase Version: 0.11 -Release: 4%{?dist} +Release: 5%{?dist} Group: Development/Libraries License: LGPL URL: http://www.quaking.demon.co.uk/xbsql/ Source0: http://www.rekallrevealed.org/packages/%{name}-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: xbase-devel, ncurses-devel, readline-devel +Patch0: xbsql-0.11-ncurses64.patch %description XBSQL is a wrapper library which provides an SQL-subset interface to Xbase @@ -24,6 +25,7 @@ %prep %setup -q +%patch0 -p1 %build %configure @@ -54,6 +56,9 @@ %{_libdir}/*.a %changelog +* Thu Aug 18 2005 Tom "spot" Callaway 0.11-5 +- fix 64 bit ncurses detection + * Thu Aug 18 2005 Tom "spot" Callaway 0.11-4 - add the Requires: xbase-devel for the -devel package From fedora-extras-commits at redhat.com Thu Aug 18 16:44:34 2005 From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio)) Date: Thu, 18 Aug 2005 12:44:34 -0400 Subject: rpms/gnotime/devel gnotime-gtkhtml3.8-qof.patch, NONE, 1.1 gnotime.spec, 1.10, 1.11 gnotime-gtkhtml3.6-qof.patch, 1.1, NONE Message-ID: <200508181644.j7IGiYkg017100@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/extras/rpms/gnotime/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17080 Modified Files: gnotime.spec Added Files: gnotime-gtkhtml3.8-qof.patch Removed Files: gnotime-gtkhtml3.6-qof.patch Log Message: - Fix build for gtkhtml3-3.7 (and 3.8 when it appears) - Fix gtkhtml test to fail if gtkhtml3 of a known version is not installed. gnotime-gtkhtml3.8-qof.patch: --- NEW FILE gnotime-gtkhtml3.8-qof.patch --- diff -uNr gnotime-2.2.1/configure.in gnotime-2.2.1.new/configure.in --- gnotime-2.2.1/configure.in 2004-05-23 13:08:18.000000000 -0700 +++ gnotime-2.2.1.new/configure.in 2005-08-18 09:28:25.000000000 -0700 @@ -50,6 +50,8 @@ LIBGTKHTML_REQUIRED=3.0.0 LIBXML2_REQUIRED=2.0.0 SCROLLKEEPER_BUILD_REQUIRED=0.3.5 +LIBQOF_REQUIRED_MIN=0.5.0 +LIBQOF_REQUIRED_MAX=0.5.0 dnl ******************************* dnl Guile checks @@ -167,7 +169,18 @@ dnl gtkhtml dnl ******************************* -PKG_CHECK_MODULES(LIBGTKHTML, libgtkhtml-3.1 >= $LIBGTKHTML_REQUIRED) +GTKHTMLPRESENT=no +for GTKHTMLVER in 3.8 3.7 3.6 3.5 3.4 3.2 3.1 3.0; do + if $PKG_CONFIG --exists libgtkhtml-$GTKHTMLVER; then + PKG_CHECK_MODULES(LIBGTKHTML, libgtkhtml-$GTKHTMLVER >= $LIBGTKHTML_REQUIRED) + GTKHTMLPRESENT=yes + break + fi +done +if test x$GTKHTMLPRESENT = x'no'; then + AC_ERROR([gtkhtml3 is needd in order to compile this program.]) +fi + AC_SUBST(LIBGTKHTML_CFLAGS) AC_SUBST(LIBGTKHTML_LIBS) @@ -182,6 +195,42 @@ AC_SUBST(LIBXML2_LIBS) dnl ***************************** +dnl libqof +dnl ***************************** + +AC_ARG_WITH(system-qof, +AC_HELP_STRING([--with-system-qof], +[use installed libqof rather than the bundled one. If not specified, configure will use the system qof if installed, otherwise its own.]), + +[ +if test x$withval = "xyes"; then + PKG_CHECK_MODULES(LIBQOF, qof-0 >= $LIBQOF_REQUIRED_MIN qof-0 <= $LIBQOF_REQUIRED_MAX) + qofbuild=no +else + AC_MSG_NOTICE([Using internal libqof]) + LIBQOF_CFLAGS='-I$(top_srcdir)/lib -I$(top_srcdir)/lib/qof' + LIBQOF_LIBS='$(top_builddir)/lib/qof/libqof.la $(top_builddir)/lib/libqofsql/libqofsql.la' + qofbuild=yes +fi +], +[ +if $PKG_CONFIG --exists "qof-0 >= $LIBQOF_REQUIRED_MIN qof-0 <= $LIBQOF_REQUIRED_MAX"; then + PKG_CHECK_MODULES(LIBQOF, qof-0 >= $LIBQOF_REQUIRED_MIN qof-0 <= $LIBQOF_REQUIRED_MAX) + qofbuild=no +else + AC_MSG_NOTICE([Using internal libqof]) + LIBQOF_CFLAGS='-I$(top_srcdir)/lib -I$(top_srcdir)/lib/qof' + LIBQOF_LIBS='$(top_builddir)/lib/qof/libqof.la $(top_builddir)/lib/libqofsql/libqofsql.la' + qofbuild=yes +fi +]) + +AM_CONDITIONAL(QOFBUILD, test x$qofbuild = xyes) + +AC_SUBST(LIBQOF_CFLAGS) +AC_SUBST(LIBQOF_LIBS) + +dnl ***************************** dnl scrollkeeper dnl ***************************** dnl To substitute into the gnotime.spec diff -uNr gnotime-2.2.1/lib/libqofsql/Makefile.am gnotime-2.2.1.new/lib/libqofsql/Makefile.am --- gnotime-2.2.1/lib/libqofsql/Makefile.am 2004-04-08 22:09:04.000000000 -0700 +++ gnotime-2.2.1.new/lib/libqofsql/Makefile.am 2005-08-18 09:24:51.000000000 -0700 @@ -1,6 +1,9 @@ ## Process this file with automake to produce Makefile.in +if QOFBUILD lib_LTLIBRARIES = libqofsql.la +noinst_PROGRAMS = sql_parse_test +endif libqofsql_la_SOURCES = \ parser.c \ @@ -15,9 +18,11 @@ sql_tree.h qofsqlincludedir = ${pkgincludedir} +if QOFBUILD qofsqlinclude_HEADERS = sql_parser.h - -noinst_PROGRAMS = sql_parse_test +else +noinst_HEADERS = sql_parser.h +endif EXTRA_DIST = \ .cvsignore \ diff -uNr gnotime-2.2.1/lib/qof/Makefile.am gnotime-2.2.1.new/lib/qof/Makefile.am --- gnotime-2.2.1/lib/qof/Makefile.am 2004-05-02 20:46:13.000000000 -0700 +++ gnotime-2.2.1.new/lib/qof/Makefile.am 2005-08-18 09:24:51.000000000 -0700 @@ -1,7 +1,8 @@ # pkglib_LTLIBRARIES = libqof.la - +if QOFBUILD lib_LTLIBRARIES = libqof.la +endif libqof_la_SOURCES = \ gnc-date.c \ @@ -28,7 +29,7 @@ qofsql.c qofincludedir = ${pkgincludedir} -qofinclude_HEADERS = \ +public_headers = \ gnc-date.h \ gnc-engine-util.h \ gnc-numeric.h \ @@ -67,7 +68,14 @@ qofquerycore-p.h \ qofsession-p.h - +if QOFBUILD +qofinclude_HEADERS = \ + $(public_headers) +else +noinst_HEADERS += \ + $(public_headers) +endif + EXTRA_DIST = \ README \ .cvsignore @@ -83,6 +91,3 @@ -I$(includedir) \ -DPREFIX=\""$(prefix)"\" \ -DDATADIR=\""$(datadir)"\" - - - diff -uNr gnotime-2.2.1/src/Makefile.am gnotime-2.2.1.new/src/Makefile.am --- gnotime-2.2.1/src/Makefile.am 2004-04-23 18:28:39.000000000 -0700 +++ gnotime-2.2.1.new/src/Makefile.am 2005-08-18 09:24:51.000000000 -0700 @@ -91,11 +91,10 @@ ${LIBGNOMEVFS_CFLAGS} \ ${LIBGTKHTML_CFLAGS} \ ${LIBGLADE_CFLAGS} \ + ${LIBQOF_CFLAGS} \ ${LIBXML2_CFLAGS} INCLUDES = \ - -I../lib \ - -I../lib/qof \ -I$(includedir) \ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ -DGTTGLADEDIR=\""$(datadir)/gnotime"\" \ @@ -109,8 +108,7 @@ gnotime_LDADD = \ $(GNOTIME_LIBS) \ - ../lib/qof/libqof.la \ - ../lib/libqofsql/libqofsql.la \ + $(LIBQOF_LIBS) \ $(LIBGLADE_LIBS) \ $(LIBGTKHTML_LIBS) \ ${LIBGNOMEVFS_LIBS} \ @@ -125,7 +123,3 @@ down.xpm \ left.xpm \ design.txt - - - - Index: gnotime.spec =================================================================== RCS file: /cvs/extras/rpms/gnotime/devel/gnotime.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- gnotime.spec 17 Aug 2005 17:43:47 -0000 1.10 +++ gnotime.spec 18 Aug 2005 16:44:32 -0000 1.11 @@ -1,6 +1,6 @@ Name: gnotime Version: 2.2.1 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Tracks and reports time spent Group: Applications/Productivity @@ -12,9 +12,9 @@ Source2: http://www.tiki-lounge.com/~toshio/fedora/gtt_startprojwin.png # Simple patch to make the .desktop more complete Patch0: http://www.tiki-lounge.com/~toshio/fedora/gnotime-desktop.patch -# Combined patch allowing builds with gtkhtml3.0 or 3.1 and +# Combined patch allowing builds with gtkhtml3.0 through 3.8 and # builds with a libqof installed on the system instead of bundled with Gnotime. -Patch1: http://www.tiki-lounge.com/~toshio/fedora/gnotime-gtkhtml3.6-qof.patch +Patch1: http://www.tiki-lounge.com/~toshio/fedora/gnotime-gtkhtml3.8-qof.patch # Fixes includes of qof headers in source files. Patch2: http://www.tiki-lounge.com/~toshio/fedora/gnotime-qof-include.patch # Fixes the idle timer for kernel 2.6. @@ -148,6 +148,10 @@ %{_sysconfdir}/gconf/schemas/* %changelog +* Thu Aug 18 2005 Toshio Kuratomi - 2.2.1-10 +- Fix build for gtkhtml3-3.7. +- Fix gtkhtml test to fail if gtkhtml3 is not installed. + * Wed Aug 17 2005 Toshio Kuratomi - 2.2.1-9 - Add dist tag. - Rebuild for devel. --- gnotime-gtkhtml3.6-qof.patch DELETED --- From fedora-extras-commits at redhat.com Thu Aug 18 17:28:29 2005 From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio)) Date: Thu, 18 Aug 2005 13:28:29 -0400 Subject: rpms/gnotime/devel gnotime.spec,1.11,1.12 Message-ID: <200508181728.j7IHSTVR018402@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/extras/rpms/gnotime/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18384 Modified Files: gnotime.spec Log Message: - Fix the patch level on the new gtkhtml3 patch. Index: gnotime.spec =================================================================== RCS file: /cvs/extras/rpms/gnotime/devel/gnotime.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- gnotime.spec 18 Aug 2005 16:44:32 -0000 1.11 +++ gnotime.spec 18 Aug 2005 17:28:27 -0000 1.12 @@ -1,6 +1,6 @@ Name: gnotime Version: 2.2.1 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Tracks and reports time spent Group: Applications/Productivity @@ -62,7 +62,7 @@ %prep %setup -q %patch0 -p0 -%patch1 -p0 +%patch1 -p1 %patch2 -p0 %patch3 -p0 %patch4 -p0 @@ -148,6 +148,9 @@ %{_sysconfdir}/gconf/schemas/* %changelog +* Thu Aug 18 2005 Toshio Kuratomi - 2.2.1-11 +- Fix the patch level on the new gtkhtml3 patch. + * Thu Aug 18 2005 Toshio Kuratomi - 2.2.1-10 - Fix build for gtkhtml3-3.7. - Fix gtkhtml test to fail if gtkhtml3 is not installed. From fedora-extras-commits at redhat.com Thu Aug 18 18:04:29 2005 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Thu, 18 Aug 2005 14:04:29 -0400 Subject: devel/gaim-guifications gaim-guifications.spec,1.3,1.4 Message-ID: <200508181805.j7II5QZA019754@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/extras/devel/gaim-guifications In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19735 Modified Files: gaim-guifications.spec Log Message: * Thu Aug 18 2005 Jeremy Katz - 2.12-2 - rebuild for new cairo Index: gaim-guifications.spec =================================================================== RCS file: /cvs/extras/devel/gaim-guifications/gaim-guifications.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gaim-guifications.spec 4 Aug 2005 10:49:46 -0000 1.3 +++ gaim-guifications.spec 18 Aug 2005 18:04:27 -0000 1.4 @@ -13,7 +13,7 @@ Summary: Guifications Plugin for Gaim Name: gaim-guifications Version: 2.12 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Applications/Internet Url: http://guifications.sourceforge.net/Guifications/ @@ -53,6 +53,9 @@ %{_datadir}/pixmaps/gaim/guifications %changelog +* Thu Aug 18 2005 Jeremy Katz - 2.12-2 +- rebuild for new cairo + * Thu Aug 4 2005 Colin Charles 2.12-1 - bump to new upstream release From fedora-extras-commits at redhat.com Thu Aug 18 18:06:53 2005 From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs)) Date: Thu, 18 Aug 2005 14:06:53 -0400 Subject: rpms/denyhosts/devel denyhosts.logrotate, 1.1, 1.2 denyhosts.spec, 1.10, 1.11 Message-ID: <200508181806.j7II6rh0019825@cvs-int.fedora.redhat.com> Author: tibbs Update of /cvs/extras/rpms/denyhosts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19805 Modified Files: denyhosts.logrotate denyhosts.spec Log Message: * Thu Aug 18 2005 Jason L Tibbitts III - 1.0.1-1 - Update to 1.0.1 Index: denyhosts.logrotate =================================================================== RCS file: /cvs/extras/rpms/denyhosts/devel/denyhosts.logrotate,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- denyhosts.logrotate 16 Aug 2005 22:41:43 -0000 1.1 +++ denyhosts.logrotate 18 Aug 2005 18:06:35 -0000 1.2 @@ -3,4 +3,8 @@ notifempty size 100k create 0644 root root + postrotate + /sbin/service denyhosts condrestart > /dev/null 2>&1 || : + endscript + } Index: denyhosts.spec =================================================================== RCS file: /cvs/extras/rpms/denyhosts/devel/denyhosts.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- denyhosts.spec 16 Aug 2005 22:41:43 -0000 1.10 +++ denyhosts.spec 18 Aug 2005 18:06:36 -0000 1.11 @@ -1,5 +1,5 @@ Name: denyhosts -Version: 1.0.0 +Version: 1.0.1 release: 1%{?dist} Summary: A script to help thwart ssh server attacks @@ -82,8 +82,13 @@ # sure that all of the hosts.deny entries were created by denyhosts %post /sbin/chkconfig --add denyhosts -%{_bindir}/denyhosts.py -c /etc/denyhosts.conf --upgrade099 || : -/sbin/service denyhosts condrestart > /dev/null 2>&1 + +RUNNING=`/sbin/service denyhosts status | grep "is running"` +/sbin/service denyhosts stop > /dev/null 2>&1 || : +%{_bindir}/denyhosts.py -c /etc/denyhosts.conf --upgrade099 > /dev/null 2>&1 || : +if [ -n "$RUNNING" ]; then + /sbin/service denyhosts start > /dev/null 2>&1 +fi exit 0 @@ -120,6 +125,13 @@ %{_bindir}/denyhosts-control %changelog +* Thu Aug 18 2005 Jason L Tibbitts III - 1.0.1-1 +- Update to 1.0.1 + +* Wed Aug 17 2005 Jason L Tibbitts III - 1.0.0-2 +- Restart the daemon in the logrotate script +- Stop the running daemon before calling --upgrade099 + * Tue Aug 16 2005 Jason L Tibbitts III - 1.0.0-1 - Fix condrestart - Actually install logrotate entry From fedora-extras-commits at redhat.com Thu Aug 18 18:08:01 2005 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Thu, 18 Aug 2005 14:08:01 -0400 Subject: devel/libgnomedb libgnomedb.spec,1.3,1.4 Message-ID: <200508181808.j7II81nZ019873@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/extras/devel/libgnomedb In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19847 Modified Files: libgnomedb.spec Log Message: * Thu Aug 18 2005 Jeremy Katz - 1:1.2.0-5 - rebuild for devel changes Index: libgnomedb.spec =================================================================== RCS file: /cvs/extras/devel/libgnomedb/libgnomedb.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- libgnomedb.spec 5 Aug 2005 17:56:58 -0000 1.3 +++ libgnomedb.spec 18 Aug 2005 18:07:59 -0000 1.4 @@ -1,7 +1,7 @@ Summary: Library for writing gnome database programs Name: libgnomedb Version: 1.2.0 -Release: 4 +Release: 5 Epoch: 1 Source: %{name}-%{version}.tar.bz2 URL: http://www.gnome-db.org/ @@ -101,6 +101,9 @@ %changelog +* Thu Aug 18 2005 Jeremy Katz - 1:1.2.0-5 +- rebuild for devel changes + * Fri Aug 5 2005 Hans de Goede 1.2.0-4 - Remove libgnomedb.la file from devel package. From fedora-extras-commits at redhat.com Thu Aug 18 18:09:26 2005 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Thu, 18 Aug 2005 14:09:26 -0400 Subject: devel/liferea liferea.spec,1.15,1.16 Message-ID: <200508181809.j7II9QdT019951@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/extras/devel/liferea In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19934 Modified Files: liferea.spec Log Message: * Thu Aug 18 2005 Jeremy Katz - 0.9.6-3 - rebuild for devel changes Index: liferea.spec =================================================================== RCS file: /cvs/extras/devel/liferea/liferea.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- liferea.spec 15 Aug 2005 23:32:28 -0000 1.15 +++ liferea.spec 18 Aug 2005 18:09:24 -0000 1.16 @@ -2,7 +2,7 @@ Name: liferea Version: 0.9.6 -Release: 2%{?dist} +Release: 3%{?dist} Summary: An RSS/RDF feed reader Group: Applications/Internet @@ -92,6 +92,9 @@ %changelog +* Thu Aug 18 2005 Jeremy Katz - 0.9.6-3 +- rebuild for devel changes + * Mon Aug 15 2005 Brian Pepple - 0.9.6-2 - Update to 0.9.6. From fedora-extras-commits at redhat.com Thu Aug 18 18:11:47 2005 From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs)) Date: Thu, 18 Aug 2005 14:11:47 -0400 Subject: rpms/denyhosts/devel .cvsignore,1.7,1.8 sources,1.7,1.8 Message-ID: <200508181811.j7IIBleD020097@cvs-int.fedora.redhat.com> Author: tibbs Update of /cvs/extras/rpms/denyhosts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20078 Modified Files: .cvsignore sources Log Message: Update sources. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/denyhosts/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 16 Aug 2005 03:30:56 -0000 1.7 +++ .cvsignore 18 Aug 2005 18:11:45 -0000 1.8 @@ -1 +1 @@ -DenyHosts-1.0.0.tar.gz +DenyHosts-1.0.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/denyhosts/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 16 Aug 2005 03:30:56 -0000 1.7 +++ sources 18 Aug 2005 18:11:45 -0000 1.8 @@ -1 +1 @@ -12633e88a120ccdbd604bd775b154a62 DenyHosts-1.0.0.tar.gz +4ba9a956499cc440f594d84c80e7b7f6 DenyHosts-1.0.1.tar.gz From fedora-extras-commits at redhat.com Thu Aug 18 18:11:57 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Thu, 18 Aug 2005 14:11:57 -0400 Subject: rpms/clisp/FC-4 clisp.spec,1.3,1.4 Message-ID: <200508181811.j7IIBvOa020120@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/clisp/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20103 Modified Files: clisp.spec Log Message: ulimit for ppc Index: clisp.spec =================================================================== RCS file: /cvs/extras/rpms/clisp/FC-4/clisp.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- clisp.spec 17 Aug 2005 21:57:59 -0000 1.3 +++ clisp.spec 18 Aug 2005 18:11:55 -0000 1.4 @@ -1,7 +1,7 @@ Name: clisp Summary: Common Lisp (ANSI CL) implementation Version: 2.34 -Release: 3%{?dist} +Release: 5%{?dist} Group: Development/Languages License: GPL @@ -10,7 +10,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: readline-devel, XFree86-devel, gettext, pcre-devel, postgresql-devel BuildRequires: libsigsegv-devel, db4-devel, zlib-devel -ExcludeArch: ppc ppc64 %description Common Lisp is a high-level, general-purpose programming language. @@ -42,23 +41,21 @@ # during test phase something goes wrong during file copying, so disable check sed -i -e 's|^ make check$||' configure # setting CFLAGS breaks the build +ulimit -S -s 8192 ./configure --prefix=%{_prefix} \ --libdir=%{_libdir} \ --fsstnd=redhat \ --with-dynamic-ffi \ --with-module=berkeley-db \ --with-module=clx/new-clx \ - --with-module=i18n \ --with-module=pcre \ --with-module=postgresql \ --with-module=rawsock \ - --with-module=regexp \ - --with-module=syscalls \ --with-module=wildcard \ --with-module=zlib \ --with-module=bindings/glibc \ --with-readline \ - --build + --build build %install @@ -107,6 +104,9 @@ %changelog +* Thu Aug 18 2005 Gerard Milmeister - 2.34-4 +- Use ulimit for the build to succeed on ppc + * Wed Aug 17 2005 Gerard Milmeister - 2.34-3 - Build fails on ppc, exclude for now From fedora-extras-commits at redhat.com Thu Aug 18 18:15:28 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 18 Aug 2005 14:15:28 -0400 Subject: rpms/synaptic/devel synaptic.spec,1.12,1.13 Message-ID: <200508181815.j7IIFSV8020207@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/synaptic/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20190 Modified Files: synaptic.spec Log Message: * Wed Aug 17 2005 Ville Skytt?? - 0.57.2-2 - Rebuild for new libcairo in devel. Index: synaptic.spec =================================================================== RCS file: /cvs/extras/rpms/synaptic/devel/synaptic.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- synaptic.spec 14 Jul 2005 06:26:51 -0000 1.12 +++ synaptic.spec 18 Aug 2005 18:15:25 -0000 1.13 @@ -3,7 +3,7 @@ Summary: Graphical frontend for APT package manager. Name: synaptic Version: 0.57.2 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Applications/System @@ -99,6 +99,9 @@ %{_mandir}/man8/%{name}.8* %changelog +* Wed Aug 17 2005 Ville Skytt?? - 0.57.2-2 +- Rebuild for new libcairo in devel. + * Tue Jul 12 2005 Panu Matilainen 0.57.2-1 - remove explicit yelp dependency, add support for browsing help with firefox (#163036) From fedora-extras-commits at redhat.com Thu Aug 18 18:15:44 2005 From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs)) Date: Thu, 18 Aug 2005 14:15:44 -0400 Subject: rpms/denyhosts/devel denyhosts.spec,1.11,1.12 Message-ID: <200508181815.j7IIFi15020235@cvs-int.fedora.redhat.com> Author: tibbs Update of /cvs/extras/rpms/denyhosts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20218 Modified Files: denyhosts.spec Log Message: * Thu Aug 18 2005 Jason L Tibbitts III - 1.0.1-2 - Bump release for build Index: denyhosts.spec =================================================================== RCS file: /cvs/extras/rpms/denyhosts/devel/denyhosts.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- denyhosts.spec 18 Aug 2005 18:06:36 -0000 1.11 +++ denyhosts.spec 18 Aug 2005 18:15:42 -0000 1.12 @@ -1,6 +1,6 @@ Name: denyhosts Version: 1.0.1 -release: 1%{?dist} +release: 2%{?dist} Summary: A script to help thwart ssh server attacks Group: Applications/System @@ -125,6 +125,9 @@ %{_bindir}/denyhosts-control %changelog +* Thu Aug 18 2005 Jason L Tibbitts III - 1.0.1-2 +- Bump release for build + * Thu Aug 18 2005 Jason L Tibbitts III - 1.0.1-1 - Update to 1.0.1 From fedora-extras-commits at redhat.com Thu Aug 18 18:22:49 2005 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Thu, 18 Aug 2005 14:22:49 -0400 Subject: devel/gnumeric gnumeric.spec,1.6,1.7 Message-ID: <200508181822.j7IIMnGo020304@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/extras/devel/gnumeric In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20287 Modified Files: gnumeric.spec Log Message: * Thu Aug 18 2005 Jeremy Katz - 1:1.4.3-6 - rebuild for changes in the devel tree Index: gnumeric.spec =================================================================== RCS file: /cvs/extras/devel/gnumeric/gnumeric.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- gnumeric.spec 4 Aug 2005 22:30:45 -0000 1.6 +++ gnumeric.spec 18 Aug 2005 18:22:47 -0000 1.7 @@ -4,7 +4,7 @@ Summary: A spreadsheet program for GNOME. Name: gnumeric Version: 1.4.3 -Release: 5 +Release: 6 Epoch: 1 License: GPL Group: Applications/Productivity @@ -141,6 +141,9 @@ %dir %{_libdir}/gnumeric/%{gnumeric_version} %changelog +* Thu Aug 18 2005 Jeremy Katz - 1:1.4.3-6 +- rebuild for changes in the devel tree + * Fri Aug 5 2005 Hans de Goede 1.4.3-5 - gtk2-devel and libart_lgpl-devel where not getting sucked in because of a bug in another package this has been fixed now so the buildrequires From fedora-extras-commits at redhat.com Thu Aug 18 18:39:56 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Thu, 18 Aug 2005 14:39:56 -0400 Subject: rpms/clisp/FC-4 clisp.spec,1.4,1.5 Message-ID: <200508181839.j7IIduw1020438@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/clisp/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20421 Modified Files: clisp.spec Log Message: do the compilation in the "build" directory Index: clisp.spec =================================================================== RCS file: /cvs/extras/rpms/clisp/FC-4/clisp.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- clisp.spec 18 Aug 2005 18:11:55 -0000 1.4 +++ clisp.spec 18 Aug 2005 18:39:54 -0000 1.5 @@ -60,7 +60,7 @@ %install rm -rf $RPM_BUILD_ROOT -make -C src prefix=%{_prefix} libdir=%{_libdir} DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install +make -C build prefix=%{_prefix} libdir=%{_libdir} DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install rm -f $RPM_BUILD_ROOT%{_docdir}/clisp-%{version}/doc/clisp.{dvi,1,ps} cp -p doc/mop-spec.pdf $RPM_BUILD_ROOT%{_docdir}/clisp-%{version}/doc %find_lang %{name} @@ -104,6 +104,9 @@ %changelog +* Thu Aug 18 2005 Gerard Milmeister - 2.34-5 +- do the compilation in the "build" directory + * Thu Aug 18 2005 Gerard Milmeister - 2.34-4 - Use ulimit for the build to succeed on ppc From fedora-extras-commits at redhat.com Thu Aug 18 18:41:54 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Thu, 18 Aug 2005 14:41:54 -0400 Subject: rpms/clisp/FC-4 clisp.spec,1.5,1.6 Message-ID: <200508181841.j7IIfsgx020525@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/clisp/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20508 Modified Files: clisp.spec Log Message: Index: clisp.spec =================================================================== RCS file: /cvs/extras/rpms/clisp/FC-4/clisp.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- clisp.spec 18 Aug 2005 18:39:54 -0000 1.5 +++ clisp.spec 18 Aug 2005 18:41:52 -0000 1.6 @@ -1,7 +1,7 @@ Name: clisp Summary: Common Lisp (ANSI CL) implementation Version: 2.34 -Release: 5%{?dist} +Release: 7%{?dist} Group: Development/Languages License: GPL From fedora-extras-commits at redhat.com Thu Aug 18 19:30:10 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 18 Aug 2005 15:30:10 -0400 Subject: rpms/tinyerp - New directory Message-ID: <200508181930.j7IJUADm022039@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/tinyerp In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22017/tinyerp Log Message: Directory /cvs/extras/rpms/tinyerp added to the repository From fedora-extras-commits at redhat.com Thu Aug 18 19:30:10 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 18 Aug 2005 15:30:10 -0400 Subject: rpms/tinyerp/devel - New directory Message-ID: <200508181930.j7IJUAJw022044@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/tinyerp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22017/tinyerp/devel Log Message: Directory /cvs/extras/rpms/tinyerp/devel added to the repository From fedora-extras-commits at redhat.com Thu Aug 18 19:30:26 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 18 Aug 2005 15:30:26 -0400 Subject: rpms/tinyerp/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200508181930.j7IJUQF9022098@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/tinyerp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22066/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module tinyerp --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Thu Aug 18 19:30:26 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 18 Aug 2005 15:30:26 -0400 Subject: rpms/tinyerp Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200508181930.j7IJUQjn022093@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/tinyerp In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22066 Added Files: Makefile import.log Log Message: Setup of module tinyerp --- NEW FILE Makefile --- # Top level Makefile for module tinyerp all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Thu Aug 18 19:31:25 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 18 Aug 2005 15:31:25 -0400 Subject: rpms/tinyerp import.log,1.1,1.2 Message-ID: <200508181931.j7IJVPo6022199@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/tinyerp In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22162 Modified Files: import.log Log Message: auto-import tinyerp-2.1.3-6 on branch devel from tinyerp-2.1.3-6.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/tinyerp/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 18 Aug 2005 19:30:24 -0000 1.1 +++ import.log 18 Aug 2005 19:31:22 -0000 1.2 @@ -0,0 +1 @@ +tinyerp-2_1_3-6:HEAD:tinyerp-2.1.3-6.src.rpm:1124393535 From fedora-extras-commits at redhat.com Thu Aug 18 19:31:25 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 18 Aug 2005 15:31:25 -0400 Subject: rpms/tinyerp/devel tinyerp-2.1.3-client-correctver.patch, NONE, 1.1 tinyerp-2.1.3-client-flag.patch, NONE, 1.1 tinyerp-2.1.3-client-syspath.patch, NONE, 1.1 tinyerp-2.1.3-server-py24.patch, NONE, 1.1 tinyerp-2.1.3-server-syspath.patch, NONE, 1.1 tinyerp.desktop, NONE, 1.1 tinyerp.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200508181931.j7IJVPJe022211@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/tinyerp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22162/devel Modified Files: .cvsignore sources Added Files: tinyerp-2.1.3-client-correctver.patch tinyerp-2.1.3-client-flag.patch tinyerp-2.1.3-client-syspath.patch tinyerp-2.1.3-server-py24.patch tinyerp-2.1.3-server-syspath.patch tinyerp.desktop tinyerp.spec Log Message: auto-import tinyerp-2.1.3-6 on branch devel from tinyerp-2.1.3-6.src.rpm tinyerp-2.1.3-client-correctver.patch: --- NEW FILE tinyerp-2.1.3-client-correctver.patch --- --- tinyerp-2.1.3/tinyerp-client-2.1.3/setup.py.BAD 2005-08-01 13:23:18.000000000 -0500 +++ tinyerp-2.1.3/tinyerp-client-2.1.3/setup.py 2005-08-01 13:23:23.000000000 -0500 @@ -18,7 +18,7 @@ opj = os.path.join name = 'tinyerp-client' -version = '2.1.2' +version = '2.1.3' required_modules = [('gtk', 'gtk python bindings'), ('gtk.glade', 'glade python bindings')] tinyerp-2.1.3-client-flag.patch: --- NEW FILE tinyerp-2.1.3-client-flag.patch --- --- tinyerp-2.1.3/tinyerp-client-2.1.3/bin/tinyerp-client.BAD 2005-08-03 12:03:57.000000000 -0500 +++ tinyerp-2.1.3/tinyerp-client-2.1.3/bin/tinyerp-client 2005-08-03 12:04:13.000000000 -0500 @@ -101,7 +101,7 @@ try: pixbuf = gtk.gdk.pixbuf_new_from_file(os.path.join(os.path.dirname(__file__),'flag.png')) except: - pixbuf = gtk.gdk.pixbuf_new_from_file('flag.png') + pixbuf = gtk.gdk.pixbuf_new_from_file('/usr/share/pixmaps/terp-client/flag.png') if pixbuf: icon_set = gtk.IconSet (pixbuf) factory.add ('terp-translate', icon_set) tinyerp-2.1.3-client-syspath.patch: --- NEW FILE tinyerp-2.1.3-client-syspath.patch --- --- tinyerp-2.1.3/tinyerp-client-2.1.3/setup.py.BAD 2005-08-01 19:29:30.000000000 -0500 +++ tinyerp-2.1.3/tinyerp-client-2.1.3/setup.py 2005-08-01 19:29:39.000000000 -0500 @@ -54,7 +54,7 @@ for dirpath, dirnames, filenames in os.walk(path): if '__init__.py' in filenames: modname = dirpath.replace(os.path.sep, '.') - yield modname.replace('bin', 'terp-client', 1) + yield modname.replace('bin', 'tinyerp_client', 1) def translations(): trans = [] @@ -96,19 +96,19 @@ translations = translations(), pot_file = 'bin/po/terp-msg.pot', scripts = ['bin/tinyerp-client'], - packages = ['terp-client', 'terp-client.common', - 'terp-client.modules', 'terp-client.modules.action', - 'terp-client.modules.gui', - 'terp-client.modules.gui.window', - 'terp-client.modules.gui.window.view_sel', - 'terp-client.modules.gui.window.view_tree', - 'terp-client.modules.spool', - 'terp-client.printer', 'terp-client.tools', - 'terp-client.widget', - 'terp-client.widget.form', - 'terp-client.widget.search', - 'terp-client.widget.tree'] + list(find_plugins()), - package_dir = {'terp-client': 'bin'}, + packages = ['tinyerp_client', 'tinyerp_client.common', + 'tinyerp_client.modules', 'tinyerp_client.modules.action', + 'tinyerp_client.modules.gui', + 'tinyerp_client.modules.gui.window', + 'tinyerp_client.modules.gui.window.view_sel', + 'tinyerp_client.modules.gui.window.view_tree', + 'tinyerp_client.modules.spool', + 'tinyerp_client.printer', 'tinyerp_client.tools', + 'tinyerp_client.widget', + 'tinyerp_client.widget.form', + 'tinyerp_client.widget.search', + 'tinyerp_client.widget.tree'] + list(find_plugins()), + package_dir = {'tinyerp_client': 'bin'}, ) # this is now done by 'install_script' --- tinyerp-2.1.3/tinyerp-client-2.1.3/bin/__init__.py.BAD 2005-08-02 15:20:40.000000000 -0500 +++ tinyerp-2.1.3/tinyerp-client-2.1.3/bin/__init__.py 2005-08-02 15:46:58.000000000 -0500 @@ -0,0 +1 @@ + --- tinyerp-2.1.3/tinyerp-client-2.1.3/bin/tinyerp-client.BAD 2005-07-07 02:21:26.000000000 -0500 +++ tinyerp-2.1.3/tinyerp-client-2.1.3/bin/tinyerp-client 2005-08-03 11:51:46.000000000 -0500 @@ -52,6 +52,10 @@ os.environ['PATH']+=";GTK-2.0//lib;GTK-2.0//bin;" sys.path.append('.') +from distutils.sysconfig import get_python_lib +terp_path = "/".join([get_python_lib(), 'tinyerp_client']) +sys.path.append(terp_path) + import pygtk pygtk.require('2.0') import gtk tinyerp-2.1.3-server-py24.patch: --- NEW FILE tinyerp-2.1.3-server-py24.patch --- --- tinyerp-2.1.3/tinyerp-server-2.1.3/setup.py.BAD 2005-08-01 12:59:31.000000000 -0500 +++ tinyerp-2.1.3/tinyerp-server-2.1.3/setup.py 2005-08-01 12:59:45.000000000 -0500 @@ -60,21 +60,21 @@ [f for f in glob.glob('doc/*') if os.path.isfile(f)]), (opj('share','doc','tinyerp-server', 'i18n'), glob.glob('doc/i18n/*')), - (opj('lib', 'python2.3', 'site-packages', 'tinyerp_server', 'addons', + (opj('lib', 'python2.4', 'site-packages', 'tinyerp_server', 'addons', 'custom'), glob.glob('bin/addons/custom/*xml') + glob.glob('bin/addons/custom/*xsl'))] for addon in find_addons(): add_path = addon.replace('.', os.path.sep).replace('tinyerp_server', 'bin', 1) - pathfiles = [(opj('lib', 'python2.3', 'site-packages', + pathfiles = [(opj('lib', 'python2.4', 'site-packages', add_path.replace('bin', 'tinyerp_server', 1)), glob.glob(opj(add_path, '*xml')) + glob.glob(opj(add_path, '*sql'))), - (opj('lib', 'python2.3', 'site-packages', + (opj('lib', 'python2.4', 'site-packages', add_path.replace('bin', 'tinyerp_server', 1), 'datas'), glob.glob(opj(add_path, 'datas', '*xml'))), - (opj('lib', 'python2.3', 'site-packages', + (opj('lib', 'python2.4', 'site-packages', add_path.replace('bin', 'tinyerp_server', 1), 'report'), glob.glob(opj(add_path, 'report', '*xml')) + glob.glob(opj(add_path, 'report', '*xsl')))] tinyerp-2.1.3-server-syspath.patch: --- NEW FILE tinyerp-2.1.3-server-syspath.patch --- --- tinyerp-2.1.3/tinyerp-server-2.1.3/bin/tinyerp-server.BAD 2005-08-03 14:10:39.000000000 -0500 +++ tinyerp-2.1.3/tinyerp-server-2.1.3/bin/tinyerp-server 2005-08-03 14:11:09.000000000 -0500 @@ -46,6 +46,10 @@ #---------------------------------------------------------- import os, signal, sys +from distutils.sysconfig import get_python_lib +terp_path = "/".join([get_python_lib(), 'tinyerp_server']) +sys.path.append(terp_path) + #---------------------------------------------------------- # get logger #---------------------------------------------------------- @@ -58,9 +62,9 @@ #----------------------------------------------------------------------- import tools if not tools.config['root_path']: - tools.config['root_path'] = os.path.abspath(os.path.dirname(sys.argv[0])) + tools.config['root_path'] = os.path.abspath(terp_path) if not tools.config['addons_path']: - tools.config['addons_path'] = os.path.join(tools.config['root_path'], 'addons') + tools.config['addons_path'] = os.path.join(terp_path, 'addons') #os.chdir(tools.file_path_root) --- NEW FILE tinyerp.desktop --- [Desktop Entry] Encoding=UTF-8 Name=TinyERP GenericName=ERP Client Comment=Access TinyERP server Exec=tinyerp-client Icon=/usr/share/pixmaps/terp-client/tinyerp.png StartupNotify=true Terminal=false Type=Application Categories=Application;Internet;X-Fedora; Version=2.1.3 X-Desktop-File-Install-Version=0.4 --- NEW FILE tinyerp.spec --- %{?!pyver: %define pyver %(python -c 'import sys;print(sys.version[0:3])')} %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: tinyerp Version: 2.1.3 Release: 6%{?dist} License: GPL Group: Applications/Productivity Summary: Open Source ERP Client URL: http://tinyerp.org Source0: http://tinyerp.org/download/sources/tinyerp-server-%{version}.tar.gz Source1: http://tinyerp.org/download/sources/tinyerp-client-%{version}.tar.gz Source2: tinyerp.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python, pygtk2-devel, pygtk2-libglade BuildRequires: python-psycopg, libxslt-python BuildRequires: desktop-file-utils, xorg-x11-Xvfb Requires: pygtk2, pygtk2-libglade # FC-3 does not need this patch applied Patch0: tinyerp-2.1.3-server-py24.patch Patch1: tinyerp-2.1.3-client-correctver.patch Patch2: tinyerp-2.1.3-client-syspath.patch Patch3: tinyerp-2.1.3-client-flag.patch Patch4: tinyerp-2.1.3-server-syspath.patch %description Tiny ERP is a free enterprise management software package. It covers all domains for small to medium businesses; accounting, stock management, sales, customer relationship, purchases, project management... %package server Group: System Environment/Daemons Summary: Open Source ERP Server Requires: pygtk2, pygtk2-libglade Requires: python-psycopg, libxslt-python Requires: postgresql-python, libxml2-python Requires: libxslt-python, python-imaging Requires: python-psycopg, python-reportlab Requires: graphviz, pyparsing, postgresql-server %description server Server components for Tiny ERP. %prep %setup -q -a 1 -c %{name}-%{version} %if "%{pyver}" == "2.4" %patch0 -p1 %endif %patch1 -p1 %patch2 -p1 %patch3 -p1 %patch4 -p1 %build cd tinyerp-client-%{version} /usr/X11R6/bin/Xvfb :69 -nolisten tcp -ac -terminate & DISPLAY=:69 ./setup.py build cd ../tinyerp-server-%{version} DISPLAY=:69 ./setup.py build %install rm -rf $RPM_BUILD_ROOT cd tinyerp-client-%{version} /usr/X11R6/bin/Xvfb :69 -nolisten tcp -ac -terminate & DISPLAY=:69 ./setup.py install --root=$RPM_BUILD_ROOT cd ../tinyerp-server-%{version} DISPLAY=:69 ./setup.py install --root=$RPM_BUILD_ROOT cd .. %find_lang tinyerp-client mv $RPM_BUILD_ROOT/%{_datadir}/terp-client/* $RPM_BUILD_ROOT/%{python_sitelib}/tinyerp_client rm -rf $RPM_BUILD_ROOT/%{_datadir}/terp-client desktop-file-install --vendor fedora \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ %{SOURCE2} cd $RPM_BUILD_ROOT%{python_sitelib}/tinyerp_client for i in tinyerp.png tinyerp-icon-16x16.png tinyerp-icon-32x32.png tinyerp-icon-64x64.png; do ln -s ../../../../share/pixmaps/terp-client/$i $i done %clean rm -rf $RPM_BUILD_ROOT %files -f %{name}-client.lang %doc %defattr(-,root,root,0755) %{_bindir}/tinyerp-client %{python_sitelib}/tinyerp_client/ %{_defaultdocdir}/%{name}-client-%{version}/ %{_mandir}/man1/tinyerp-client.* %{_datadir}/pixmaps/terp-client/ %{_datadir}/applications/*.desktop %files server %{_bindir}/tinyerp-server %{python_sitelib}/tinyerp_server/ %{_defaultdocdir}/%{name}-server/ %{_mandir}/man1/tinyerp-server.* %changelog * Thu Aug 18 2005 Tom "spot" Callaway 2.1.3-6 - use Xvfb to fake DISPLAY * Wed Aug 3 2005 Tom "spot" Callaway 2.1.3-5 - make patching more generic - fix another server bug * Wed Aug 3 2005 Tom "spot" Callaway 2.1.3-4 - add more Requires - add .desktop file for client * Wed Aug 3 2005 Tom "spot" Callaway 2.1.3-3 - move files around * Wed Aug 3 2005 Tom "spot" Callaway 2.1.3-2 - fix python to, you know, actually work * Mon Aug 1 2005 Tom "spot" Callaway 2.1.3-1 - initial package for Fedora Extras Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/tinyerp/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 18 Aug 2005 19:30:24 -0000 1.1 +++ .cvsignore 18 Aug 2005 19:31:23 -0000 1.2 @@ -0,0 +1,2 @@ +tinyerp-client-2.1.3.tar.gz +tinyerp-server-2.1.3.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/tinyerp/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 18 Aug 2005 19:30:24 -0000 1.1 +++ sources 18 Aug 2005 19:31:23 -0000 1.2 @@ -0,0 +1,2 @@ +60c3e202f07be0ccac5abd6a733549f7 tinyerp-client-2.1.3.tar.gz +9d4a0d90a29a089368c3fc24c9f4b8bc tinyerp-server-2.1.3.tar.gz From fedora-extras-commits at redhat.com Thu Aug 18 19:38:39 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 18 Aug 2005 15:38:39 -0400 Subject: owners owners.list,1.99,1.100 Message-ID: <200508181938.j7IJcdOq022459@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22438 Modified Files: owners.list Log Message: tinyerp Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.99 retrieving revision 1.100 diff -u -r1.99 -r1.100 --- owners.list 18 Aug 2005 15:25:43 -0000 1.99 +++ owners.list 18 Aug 2005 19:38:37 -0000 1.100 @@ -852,6 +852,7 @@ Fedora Extras|thunderbird|thunderbird mail|wtogami at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|tidy|Utility to clean up and pretty print HTML/XHTML/XML|rdieter at math.unl.edu|extras-qa at fedoraproject.org| Fedora Extras|tin|A basic Internet news reader|adrian at lisas.de|extras-qa at fedoraproject.org| +Fedora Extras|tinyerp|Open Source ERP Client|tcallawa at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|tkcvs|TkCVS and TkDiff|gemi at bluewin.ch|extras-qa at fedoraproject.org| Fedora Extras|tktable|Table/matrix widget extension to Tcl/Tk|jfontain at free.fr|extras-qa at fedoraproject.org| Fedora Extras|tla|The Low-Budget arch Revision Control System|shahms at shahms.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Thu Aug 18 19:40:56 2005 From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs)) Date: Thu, 18 Aug 2005 15:40:56 -0400 Subject: rpms/denyhosts/FC-4 denyhosts.spec,1.3,1.4 sources,1.4,1.5 Message-ID: <200508181940.j7IJeu7p022531@cvs-int.fedora.redhat.com> Author: tibbs Update of /cvs/extras/rpms/denyhosts/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22512 Modified Files: denyhosts.spec sources Log Message: Pull from devel branch. Index: denyhosts.spec =================================================================== RCS file: /cvs/extras/rpms/denyhosts/FC-4/denyhosts.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- denyhosts.spec 18 Aug 2005 00:21:28 -0000 1.3 +++ denyhosts.spec 18 Aug 2005 19:40:54 -0000 1.4 @@ -1,5 +1,5 @@ Name: denyhosts -Version: 1.0.0 +Version: 1.0.1 release: 2%{?dist} Summary: A script to help thwart ssh server attacks @@ -125,6 +125,12 @@ %{_bindir}/denyhosts-control %changelog +* Thu Aug 18 2005 Jason L Tibbitts III - 1.0.1-2 +- Bump release for build + +* Thu Aug 18 2005 Jason L Tibbitts III - 1.0.1-1 +- Update to 1.0.1 + * Wed Aug 17 2005 Jason L Tibbitts III - 1.0.0-2 - Restart the daemon in the logrotate script - Stop the running daemon before calling --upgrade099 Index: sources =================================================================== RCS file: /cvs/extras/rpms/denyhosts/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 18 Aug 2005 00:21:28 -0000 1.4 +++ sources 18 Aug 2005 19:40:54 -0000 1.5 @@ -1 +1 @@ -12633e88a120ccdbd604bd775b154a62 DenyHosts-1.0.0.tar.gz +4ba9a956499cc440f594d84c80e7b7f6 DenyHosts-1.0.1.tar.gz From fedora-extras-commits at redhat.com Thu Aug 18 19:41:46 2005 From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs)) Date: Thu, 18 Aug 2005 15:41:46 -0400 Subject: rpms/denyhosts/FC-3 denyhosts.spec,1.3,1.4 sources,1.4,1.5 Message-ID: <200508181941.j7IJfkWL022611@cvs-int.fedora.redhat.com> Author: tibbs Update of /cvs/extras/rpms/denyhosts/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22592 Modified Files: denyhosts.spec sources Log Message: Pull from devel branch. Index: denyhosts.spec =================================================================== RCS file: /cvs/extras/rpms/denyhosts/FC-3/denyhosts.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- denyhosts.spec 18 Aug 2005 00:21:43 -0000 1.3 +++ denyhosts.spec 18 Aug 2005 19:41:44 -0000 1.4 @@ -1,5 +1,5 @@ Name: denyhosts -Version: 1.0.0 +Version: 1.0.1 release: 2%{?dist} Summary: A script to help thwart ssh server attacks @@ -125,6 +125,12 @@ %{_bindir}/denyhosts-control %changelog +* Thu Aug 18 2005 Jason L Tibbitts III - 1.0.1-2 +- Bump release for build + +* Thu Aug 18 2005 Jason L Tibbitts III - 1.0.1-1 +- Update to 1.0.1 + * Wed Aug 17 2005 Jason L Tibbitts III - 1.0.0-2 - Restart the daemon in the logrotate script - Stop the running daemon before calling --upgrade099 Index: sources =================================================================== RCS file: /cvs/extras/rpms/denyhosts/FC-3/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 18 Aug 2005 00:21:43 -0000 1.4 +++ sources 18 Aug 2005 19:41:44 -0000 1.5 @@ -1 +1 @@ -12633e88a120ccdbd604bd775b154a62 DenyHosts-1.0.0.tar.gz +4ba9a956499cc440f594d84c80e7b7f6 DenyHosts-1.0.1.tar.gz From fedora-extras-commits at redhat.com Thu Aug 18 19:48:21 2005 From: fedora-extras-commits at redhat.com (David Zeuthen (davidz)) Date: Thu, 18 Aug 2005 15:48:21 -0400 Subject: rpms/NetworkManager-vpnc/devel .cvsignore, 1.2, 1.3 NetworkManager-vpnc.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200508181948.j7IJmLMo022834@cvs-int.fedora.redhat.com> Author: davidz Update of /cvs/extras/rpms/NetworkManager-vpnc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22813 Modified Files: .cvsignore NetworkManager-vpnc.spec sources Log Message: * Thu Aug 18 2005 David Zeuthen 0.3-1 - New upstream release - Bump some versions for deps Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/NetworkManager-vpnc/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 30 Jun 2005 20:25:29 -0000 1.2 +++ .cvsignore 18 Aug 2005 19:48:19 -0000 1.3 @@ -1 +1,2 @@ NetworkManager-vpnc-0.2.tar.gz +NetworkManager-vpnc-0.3.tar.gz Index: NetworkManager-vpnc.spec =================================================================== RCS file: /cvs/extras/rpms/NetworkManager-vpnc/devel/NetworkManager-vpnc.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- NetworkManager-vpnc.spec 2 Jul 2005 01:18:01 -0000 1.2 +++ NetworkManager-vpnc.spec 18 Aug 2005 19:48:19 -0000 1.3 @@ -1,13 +1,13 @@ -%define nm_version 0.4-32.cvs20050629 -%define dbus_version 0.34 +%define nm_version 0.4.1 +%define dbus_version 0.35 %define gtk2_version 2.6.0 -%define vpnc_version 0.3.3-1 +%define vpnc_version 0.3.3-3 %define shared_mime_version 0.16-3 Summary: NetworkManager VPN integration for vpnc Name: NetworkManager-vpnc -Version: 0.2 -Release: 2 +Version: 0.3 +Release: 1 License: GPL Group: System Environment/Base Source: %{name}-%{version}.tar.gz @@ -84,6 +84,10 @@ %{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-cisco-vpn-settings.png %changelog +* Thu Aug 18 2005 David Zeuthen 0.3-1 +- New upstream release +- Bump some versions for deps + * Fri Jul 1 2005 David Zeuthen 0.2-2 - Add missing changelog entry for last commit - Temporarily BuildReq libpng-devel as it is not pulled in by gtk2-devel Index: sources =================================================================== RCS file: /cvs/extras/rpms/NetworkManager-vpnc/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 30 Jun 2005 20:25:29 -0000 1.2 +++ sources 18 Aug 2005 19:48:19 -0000 1.3 @@ -1 +1 @@ -31034c7cbefb09bb8a081085a6babb64 NetworkManager-vpnc-0.2.tar.gz +1dbc51c83118494a20cf9446a667585b NetworkManager-vpnc-0.3.tar.gz From fedora-extras-commits at redhat.com Thu Aug 18 20:07:42 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 18 Aug 2005 16:07:42 -0400 Subject: rpms/glunarclock/devel glunarclock.spec,1.10,1.11 Message-ID: <200508182007.j7IK7g8f024164@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/glunarclock/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24102/glunarclock/devel Modified Files: glunarclock.spec Log Message: prepare rebuild for cairo ABI change in core Index: glunarclock.spec =================================================================== RCS file: /cvs/extras/rpms/glunarclock/devel/glunarclock.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- glunarclock.spec 30 Jul 2005 07:19:36 -0000 1.10 +++ glunarclock.spec 18 Aug 2005 20:07:40 -0000 1.11 @@ -1,6 +1,6 @@ Name: glunarclock Version: 0.32.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: GNOME applet that displays the current lunar phase Group: User Interface/Desktops @@ -90,6 +90,9 @@ %changelog +* Thu Aug 18 2005 Michael Schwendt - 0.32.4-3 +- rebuilt + * Mon Jul 25 2005 Michael Schwendt - 0.32.4-2 - Update to 0.32.4. - Fix compiler warnings bug #149711. From fedora-extras-commits at redhat.com Thu Aug 18 20:07:24 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 18 Aug 2005 16:07:24 -0400 Subject: rpms/galculator/devel galculator.spec,1.6,1.7 Message-ID: <200508182007.j7IK7vUP024168@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/galculator/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24102/galculator/devel Modified Files: galculator.spec Log Message: prepare rebuild for cairo ABI change in core Index: galculator.spec =================================================================== RCS file: /cvs/extras/rpms/galculator/devel/galculator.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- galculator.spec 25 Jul 2005 18:54:42 -0000 1.6 +++ galculator.spec 18 Aug 2005 20:07:22 -0000 1.7 @@ -1,6 +1,6 @@ Name: galculator Version: 1.2.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GTK 2 based scientific calculator Group: Applications/Engineering @@ -54,6 +54,9 @@ %changelog +* Thu Aug 18 2005 Michael Schwendt - 1.2.5-2 +- rebuilt + * Mon Jul 25 2005 Michael Schwendt - 1.2.5-1 - Update to 1.2.5 (also fixes #162018). From fedora-extras-commits at redhat.com Thu Aug 18 20:07:23 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 18 Aug 2005 16:07:23 -0400 Subject: rpms/firestarter/devel firestarter.spec,1.14,1.15 Message-ID: <200508182007.j7IK7vqq024169@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/firestarter/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24102/firestarter/devel Modified Files: firestarter.spec Log Message: prepare rebuild for cairo ABI change in core Index: firestarter.spec =================================================================== RCS file: /cvs/extras/rpms/firestarter/devel/firestarter.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- firestarter.spec 28 Jun 2005 16:10:58 -0000 1.14 +++ firestarter.spec 18 Aug 2005 20:07:21 -0000 1.15 @@ -1,6 +1,6 @@ Name: firestarter Version: 1.0.3 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Firewall tool for GNOME Group: Applications/Internet @@ -150,6 +150,9 @@ %changelog +* Thu Aug 18 2005 Michael Schwendt - 1.0.3-6 +- rebuilt + * Tue Jun 28 2005 Michael Schwendt - remove work-around from 1.0.3-5 again, bug has been fixed From fedora-extras-commits at redhat.com Thu Aug 18 20:07:22 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 18 Aug 2005 16:07:22 -0400 Subject: rpms/anjuta/devel anjuta.spec,1.12,1.13 Message-ID: <200508182007.j7IK7r0S024167@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/anjuta/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24102/anjuta/devel Modified Files: anjuta.spec Log Message: prepare rebuild for cairo ABI change in core Index: anjuta.spec =================================================================== RCS file: /cvs/extras/rpms/anjuta/devel/anjuta.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- anjuta.spec 8 Jul 2005 10:15:04 -0000 1.12 +++ anjuta.spec 18 Aug 2005 20:07:20 -0000 1.13 @@ -1,6 +1,6 @@ Name: anjuta Version: 1.2.3 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 1 Summary: GNOME IDE for C and C++ @@ -122,6 +122,9 @@ %changelog +* Thu Aug 18 2005 Michael Schwendt - 1:1.2.3-3 +- rebuilt + * Thu Jul 7 2005 Michael Schwendt - 1:1.2.3-2 - Update to 1.2.3. - Add gettext-devel dependency (Paul Frields). From fedora-extras-commits at redhat.com Thu Aug 18 20:11:50 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 18 Aug 2005 16:11:50 -0400 Subject: rpms/inkscape/devel inkscape.spec,1.15,1.16 Message-ID: <200508182011.j7IKBoCW024428@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/inkscape/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24411/inkscape/devel Modified Files: inkscape.spec Log Message: prepare rebuild for cairo ABI change in core Index: inkscape.spec =================================================================== RCS file: /cvs/extras/rpms/inkscape/devel/inkscape.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- inkscape.spec 29 Jul 2005 10:34:59 -0000 1.15 +++ inkscape.spec 18 Aug 2005 20:11:48 -0000 1.16 @@ -1,6 +1,6 @@ Name: inkscape Version: 0.42 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Vector-based drawing program using SVG Group: Applications/Productivity @@ -102,6 +102,9 @@ %changelog +* Thu Aug 18 2005 Michael Schwendt - 0.42-3 +- rebuilt + * Fri Jul 29 2005 Michael Schwendt - 0.42-2 - Extend ngettext/dgettext patch for x86_64 build. From fedora-extras-commits at redhat.com Thu Aug 18 20:48:45 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 18 Aug 2005 16:48:45 -0400 Subject: rpms/kile/devel kile.spec,1.11,1.12 Message-ID: <200508182048.j7IKmj7g024567@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/kile/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24520/devel Modified Files: kile.spec Log Message: * Thu Aug 18 2005 Rex Dieter 1.8.1-2 - fix broken Obsoletes (#166300) - drop paranoid qt/kdelibs Req's Index: kile.spec =================================================================== RCS file: /cvs/extras/rpms/kile/devel/kile.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- kile.spec 5 Aug 2005 17:25:06 -0000 1.11 +++ kile.spec 18 Aug 2005 20:48:43 -0000 1.12 @@ -3,7 +3,7 @@ Name: kile Summary: (La)TeX source editor and TeX shell Version: 1.8.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Applications/Publishing @@ -18,16 +18,19 @@ #Requires: gnuplot #Requires: xfig +# For Extras, not really needed -- Rex +%if 0 BuildRequires: qt-devel >= 1:3.3 -%define qt_ver %(rpm -q --qf '%%{version}' qt-devel ) +%define qt_ver %{expand:%%(rpm -q --qf '%%{VERSION}' qt-devel )} Requires: qt >= 1:%{qt_ver} BuildRequires: kdelibs-devel >= 6:3.3 -%define kdelibs_ver %(rpm -q --qf '%%{version}' kdelibs-devel ) +%define kdelibs_ver %{expand:%%(rpm -q --qf '%%{VERSION}' kdelibs-devel )} Requires: kdelibs >= 6:%{kdelibs_ver} +%endif # kile-i18n is no longer separate pkg -Obsoletes: kile-i18n < %{epoch}:%{version}-%{releaes} -#Provides: kile-i18n = %{epoch}:%{version}-%{release} +Obsoletes: kile-i18n < %{version}-%{release} +#Provides: kile-i18n = %{version}-%{release} %description Kile is a user friendly (La)TeX editor. The main features are: @@ -104,6 +107,10 @@ %changelog +* Thu Aug 18 2005 Rex Dieter 1.8.1-2 +- fix broken Obsoletes (#166300) +- drop paranoid qt/kdelibs Req's + * Thu Jun 02 2005 Rex Dieter 1.8.1-1 - 1.8.1 - x86_64 fix (bug #161343) From fedora-extras-commits at redhat.com Thu Aug 18 20:48:39 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 18 Aug 2005 16:48:39 -0400 Subject: rpms/kile/FC-3 kile.spec,1.6,1.7 Message-ID: <200508182049.j7IKn9Vp024570@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/kile/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24520/FC-3 Modified Files: kile.spec Log Message: * Thu Aug 18 2005 Rex Dieter 1.8.1-2 - fix broken Obsoletes (#166300) - drop paranoid qt/kdelibs Req's Index: kile.spec =================================================================== RCS file: /cvs/extras/rpms/kile/FC-3/kile.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- kile.spec 5 Aug 2005 17:47:59 -0000 1.6 +++ kile.spec 18 Aug 2005 20:48:37 -0000 1.7 @@ -3,7 +3,7 @@ Name: kile Summary: (La)TeX source editor and TeX shell Version: 1.8.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Applications/Publishing @@ -18,16 +18,19 @@ #Requires: gnuplot #Requires: xfig +# For Extras, not really needed -- Rex +%if 0 BuildRequires: qt-devel >= 1:3.3 -%define qt_ver %(rpm -q --qf '%%{version}' qt-devel ) +%define qt_ver %{expand:%%(rpm -q --qf '%%{VERSION}' qt-devel )} Requires: qt >= 1:%{qt_ver} BuildRequires: kdelibs-devel >= 6:3.3 -%define kdelibs_ver %(rpm -q --qf '%%{version}' kdelibs-devel ) +%define kdelibs_ver %{expand:%%(rpm -q --qf '%%{VERSION}' kdelibs-devel )} Requires: kdelibs >= 6:%{kdelibs_ver} +%endif # kile-i18n is no longer separate pkg -Obsoletes: kile-i18n < %{epoch}:%{version}-%{releaes} -#Provides: kile-i18n = %{epoch}:%{version}-%{release} +Obsoletes: kile-i18n < %{version}-%{release} +#Provides: kile-i18n = %{version}-%{release} %description Kile is a user friendly (La)TeX editor. The main features are: @@ -104,6 +107,10 @@ %changelog +* Thu Aug 18 2005 Rex Dieter 1.8.1-2 +- fix broken Obsoletes (#166300) +- drop paranoid qt/kdelibs Req's + * Thu Jun 02 2005 Rex Dieter 1.8.1-1 - 1.8.1 - x86_64 fix (bug #161343) From fedora-extras-commits at redhat.com Thu Aug 18 20:48:40 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 18 Aug 2005 16:48:40 -0400 Subject: rpms/kile/FC-4 kile.spec,1.9,1.10 Message-ID: <200508182049.j7IKnA46024573@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/kile/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24520/FC-4 Modified Files: kile.spec Log Message: * Thu Aug 18 2005 Rex Dieter 1.8.1-2 - fix broken Obsoletes (#166300) - drop paranoid qt/kdelibs Req's Index: kile.spec =================================================================== RCS file: /cvs/extras/rpms/kile/FC-4/kile.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- kile.spec 5 Aug 2005 17:35:52 -0000 1.9 +++ kile.spec 18 Aug 2005 20:48:37 -0000 1.10 @@ -3,7 +3,7 @@ Name: kile Summary: (La)TeX source editor and TeX shell Version: 1.8.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Applications/Publishing @@ -18,16 +18,19 @@ #Requires: gnuplot #Requires: xfig +# For Extras, not really needed -- Rex +%if 0 BuildRequires: qt-devel >= 1:3.3 -%define qt_ver %(rpm -q --qf '%%{version}' qt-devel ) +%define qt_ver %{expand:%%(rpm -q --qf '%%{VERSION}' qt-devel )} Requires: qt >= 1:%{qt_ver} BuildRequires: kdelibs-devel >= 6:3.3 -%define kdelibs_ver %(rpm -q --qf '%%{version}' kdelibs-devel ) +%define kdelibs_ver %{expand:%%(rpm -q --qf '%%{VERSION}' kdelibs-devel )} Requires: kdelibs >= 6:%{kdelibs_ver} +%endif # kile-i18n is no longer separate pkg -Obsoletes: kile-i18n < %{epoch}:%{version}-%{releaes} -#Provides: kile-i18n = %{epoch}:%{version}-%{release} +Obsoletes: kile-i18n < %{version}-%{release} +#Provides: kile-i18n = %{version}-%{release} %description Kile is a user friendly (La)TeX editor. The main features are: @@ -104,6 +107,10 @@ %changelog +* Thu Aug 18 2005 Rex Dieter 1.8.1-2 +- fix broken Obsoletes (#166300) +- drop paranoid qt/kdelibs Req's + * Thu Jun 02 2005 Rex Dieter 1.8.1-1 - 1.8.1 - x86_64 fix (bug #161343) From ville.skytta at iki.fi Thu Aug 18 20:50:40 2005 From: ville.skytta at iki.fi (Ville =?ISO-8859-1?Q?Skytt=E4?=) Date: Thu, 18 Aug 2005 23:50:40 +0300 Subject: re-APPROVED: keychain In-Reply-To: <1124226211.7774.108.camel@serendipity.dogma.lan> References: <1123234721.23575.21.camel@localhost.localdomain> <1123242981.23575.49.camel@localhost.localdomain> <1124198705.7774.92.camel@serendipity.dogma.lan> <1124220674.21490.140.camel@localhost.localdomain> <1124226211.7774.108.camel@serendipity.dogma.lan> Message-ID: <1124398240.19299.4.camel@localhost.localdomain> On Tue, 2005-08-16 at 23:03 +0200, Alexander Dalloz wrote: > Commited changes to CVS. Okay, been using this for a while and noticed nothing wrong, so re-APPROVED. Go ahead and request builds and branches, and don't forget to update owners.list in CVS. Thanks! From fedora-extras-commits at redhat.com Thu Aug 18 20:58:14 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 18 Aug 2005 16:58:14 -0400 Subject: rpms/kile/devel kile.spec,1.12,1.13 Message-ID: <200508182058.j7IKwEXB024650@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/kile/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24633 Modified Files: kile.spec Log Message: OK, don't drop BR: qt-devel, kdelibs-devel Index: kile.spec =================================================================== RCS file: /cvs/extras/rpms/kile/devel/kile.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- kile.spec 18 Aug 2005 20:48:43 -0000 1.12 +++ kile.spec 18 Aug 2005 20:58:12 -0000 1.13 @@ -3,7 +3,7 @@ Name: kile Summary: (La)TeX source editor and TeX shell Version: 1.8.1 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Applications/Publishing @@ -18,15 +18,12 @@ #Requires: gnuplot #Requires: xfig -# For Extras, not really needed -- Rex -%if 0 BuildRequires: qt-devel >= 1:3.3 %define qt_ver %{expand:%%(rpm -q --qf '%%{VERSION}' qt-devel )} Requires: qt >= 1:%{qt_ver} BuildRequires: kdelibs-devel >= 6:3.3 %define kdelibs_ver %{expand:%%(rpm -q --qf '%%{VERSION}' kdelibs-devel )} Requires: kdelibs >= 6:%{kdelibs_ver} -%endif # kile-i18n is no longer separate pkg Obsoletes: kile-i18n < %{version}-%{release} @@ -107,9 +104,8 @@ %changelog -* Thu Aug 18 2005 Rex Dieter 1.8.1-2 +* Thu Aug 18 2005 Rex Dieter 1.8.1-3 - fix broken Obsoletes (#166300) -- drop paranoid qt/kdelibs Req's * Thu Jun 02 2005 Rex Dieter 1.8.1-1 - 1.8.1 From fedora-extras-commits at redhat.com Thu Aug 18 21:01:37 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 18 Aug 2005 17:01:37 -0400 Subject: rpms/inkscape/devel inkscape.spec,1.16,1.17 Message-ID: <200508182102.j7IL2854025895@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/inkscape/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25870 Modified Files: inkscape.spec Log Message: Hmm... peaking into it a bit. It doesn't like the upgraded GC, and rawhide extras still block yum update here. Index: inkscape.spec =================================================================== RCS file: /cvs/extras/rpms/inkscape/devel/inkscape.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- inkscape.spec 18 Aug 2005 20:11:48 -0000 1.16 +++ inkscape.spec 18 Aug 2005 21:01:11 -0000 1.17 @@ -59,7 +59,9 @@ --with-xinerama \ --enable-static=no \ --with-python \ ---with-inkjar +--with-inkjar || : +cat config.log +exit 1 #temporarily disabled until I can look into it further #--with-gnome-print \ From fedora-extras-commits at redhat.com Thu Aug 18 21:08:28 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 18 Aug 2005 17:08:28 -0400 Subject: rpms/inkscape/devel inkscape.spec,1.17,1.18 Message-ID: <200508182108.j7IL8Sab026040@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/inkscape/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26023 Modified Files: inkscape.spec Log Message: Index: inkscape.spec =================================================================== RCS file: /cvs/extras/rpms/inkscape/devel/inkscape.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- inkscape.spec 18 Aug 2005 21:01:11 -0000 1.17 +++ inkscape.spec 18 Aug 2005 21:08:26 -0000 1.18 @@ -59,9 +59,7 @@ --with-xinerama \ --enable-static=no \ --with-python \ ---with-inkjar || : -cat config.log -exit 1 +--with-inkjar #temporarily disabled until I can look into it further #--with-gnome-print \ From fedora-extras-commits at redhat.com Thu Aug 18 21:39:20 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 18 Aug 2005 17:39:20 -0400 Subject: rpms/inkscape/devel inkscape-0.42-GC-check.patch, NONE, 1.1 inkscape.spec, 1.18, 1.19 Message-ID: <200508182139.j7ILdKhA026198@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/inkscape/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26178 Modified Files: inkscape.spec Added Files: inkscape-0.42-GC-check.patch Log Message: adding a first patch to see whether it now likes the new GC version inkscape-0.42-GC-check.patch: --- NEW FILE inkscape-0.42-GC-check.patch --- diff -Nur inkscape-0.42-orig/configure inkscape-0.42/configure --- inkscape-0.42-orig/configure 2005-07-25 07:25:35.000000000 +0200 +++ inkscape-0.42/configure 2005-08-18 23:31:12.000000000 +0200 @@ -22931,7 +22931,7 @@ # desired function name. They're all in libgc. # The "break" will exit from the top level # AC_CHECK_HEADERS. - gc_libs="" + gc_libs="-lpthread $lt_cv_dlopen_libs" echo "$as_me:$LINENO: checking for GC_init in -lgc" >&5 echo $ECHO_N "checking for GC_init in -lgc... $ECHO_C" >&6 if test "${ac_cv_lib_gc_GC_init+set}" = set; then @@ -23003,7 +23003,7 @@ gc_ok=no fi - gc_libs="-lpthread" + gc_libs="-lpthread $lt_cv_dlopen_libs" echo "$as_me:$LINENO: checking for GC_malloc in -lgc" >&5 echo $ECHO_N "checking for GC_malloc in -lgc... $ECHO_C" >&6 if test "${ac_cv_lib_gc_GC_malloc+set}" = set; then @@ -23075,7 +23075,7 @@ gc_ok=no fi - gc_libs="$lt_cv_dlopen_libs" + gc_libs="-lpthread $lt_cv_dlopen_libs" echo "$as_me:$LINENO: checking for GC_realloc in -lgc" >&5 echo $ECHO_N "checking for GC_realloc in -lgc... $ECHO_C" >&6 if test "${ac_cv_lib_gc_GC_realloc+set}" = set; then Index: inkscape.spec =================================================================== RCS file: /cvs/extras/rpms/inkscape/devel/inkscape.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- inkscape.spec 18 Aug 2005 21:08:26 -0000 1.18 +++ inkscape.spec 18 Aug 2005 21:39:18 -0000 1.19 @@ -8,6 +8,7 @@ URL: http://inkscape.sourceforge.net/ Source0: http://download.sourceforge.net/inkscape/inkscape-%{version}.tar.bz2 Patch0: inkscape-0.42-gettext-x86_64.patch +Patch1: inkscape-0.42-GC-check.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: atk-devel @@ -58,6 +59,7 @@ --disable-dependency-tracking \ --with-xinerama \ --enable-static=no \ +--enable-dlopen \ --with-python \ --with-inkjar #temporarily disabled until I can look into it further @@ -104,6 +106,7 @@ %changelog * Thu Aug 18 2005 Michael Schwendt - 0.42-3 - rebuilt +- add patch to repair link-check of GC >= 6.5 (needs pthread and dl) * Fri Jul 29 2005 Michael Schwendt - 0.42-2 - Extend ngettext/dgettext patch for x86_64 build. From fedora-extras-commits at redhat.com Thu Aug 18 21:46:43 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 18 Aug 2005 17:46:43 -0400 Subject: rpms/inkscape/devel inkscape.spec,1.19,1.20 Message-ID: <200508182146.j7ILkhZV026257@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/inkscape/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26240 Modified Files: inkscape.spec Log Message: Index: inkscape.spec =================================================================== RCS file: /cvs/extras/rpms/inkscape/devel/inkscape.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- inkscape.spec 18 Aug 2005 21:39:18 -0000 1.19 +++ inkscape.spec 18 Aug 2005 21:46:41 -0000 1.20 @@ -52,6 +52,7 @@ %prep %setup -q %patch0 -p1 -b .dgettext +%patch1 -p1 -b .GC-check %build From fedora-extras-commits at redhat.com Thu Aug 18 21:56:53 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 18 Aug 2005 17:56:53 -0400 Subject: rpms/inkscape/devel inkscape-0.42-GC-check.patch, 1.1, 1.2 inkscape.spec, 1.20, 1.21 Message-ID: <200508182156.j7ILur5v026323@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/inkscape/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26301 Modified Files: inkscape-0.42-GC-check.patch inkscape.spec Log Message: stubborn configure script... ;) inkscape-0.42-GC-check.patch: Index: inkscape-0.42-GC-check.patch =================================================================== RCS file: /cvs/extras/rpms/inkscape/devel/inkscape-0.42-GC-check.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- inkscape-0.42-GC-check.patch 18 Aug 2005 21:39:18 -0000 1.1 +++ inkscape-0.42-GC-check.patch 18 Aug 2005 21:56:51 -0000 1.2 @@ -1,12 +1,12 @@ diff -Nur inkscape-0.42-orig/configure inkscape-0.42/configure --- inkscape-0.42-orig/configure 2005-07-25 07:25:35.000000000 +0200 -+++ inkscape-0.42/configure 2005-08-18 23:31:12.000000000 +0200 ++++ inkscape-0.42/configure 2005-08-18 23:55:52.000000000 +0200 @@ -22931,7 +22931,7 @@ # desired function name. They're all in libgc. # The "break" will exit from the top level # AC_CHECK_HEADERS. - gc_libs="" -+ gc_libs="-lpthread $lt_cv_dlopen_libs" ++ gc_libs="-lpthread -ldl" echo "$as_me:$LINENO: checking for GC_init in -lgc" >&5 echo $ECHO_N "checking for GC_init in -lgc... $ECHO_C" >&6 if test "${ac_cv_lib_gc_GC_init+set}" = set; then @@ -15,7 +15,7 @@ fi - gc_libs="-lpthread" -+ gc_libs="-lpthread $lt_cv_dlopen_libs" ++ gc_libs="-lpthread -ldl" echo "$as_me:$LINENO: checking for GC_malloc in -lgc" >&5 echo $ECHO_N "checking for GC_malloc in -lgc... $ECHO_C" >&6 if test "${ac_cv_lib_gc_GC_malloc+set}" = set; then @@ -24,7 +24,16 @@ fi - gc_libs="$lt_cv_dlopen_libs" -+ gc_libs="-lpthread $lt_cv_dlopen_libs" ++ gc_libs="-lpthread -ldl" echo "$as_me:$LINENO: checking for GC_realloc in -lgc" >&5 echo $ECHO_N "checking for GC_realloc in -lgc... $ECHO_C" >&6 if test "${ac_cv_lib_gc_GC_realloc+set}" = set; then +@@ -23147,7 +23147,7 @@ + gc_ok=no + fi + +- gc_libs="-lpthread $lt_cv_dlopen_libs" ++ gc_libs="-lpthread -ldl" + echo "$as_me:$LINENO: checking for GC_free in -lgc" >&5 + echo $ECHO_N "checking for GC_free in -lgc... $ECHO_C" >&6 + if test "${ac_cv_lib_gc_GC_free+set}" = set; then Index: inkscape.spec =================================================================== RCS file: /cvs/extras/rpms/inkscape/devel/inkscape.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- inkscape.spec 18 Aug 2005 21:46:41 -0000 1.20 +++ inkscape.spec 18 Aug 2005 21:56:51 -0000 1.21 @@ -60,7 +60,6 @@ --disable-dependency-tracking \ --with-xinerama \ --enable-static=no \ ---enable-dlopen \ --with-python \ --with-inkjar #temporarily disabled until I can look into it further From fedora-extras-commits at redhat.com Thu Aug 18 22:11:40 2005 From: fedora-extras-commits at redhat.com (Jef Spaleta (jspaleta)) Date: Thu, 18 Aug 2005 18:11:40 -0400 Subject: rpms/glabels/devel glabels.spec,1.2,1.3 Message-ID: <200508182211.j7IMBeCL027650@cvs-int.fedora.redhat.com> Author: jspaleta Update of /cvs/extras/rpms/glabels/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27633 Modified Files: glabels.spec Log Message: * Thu Aug 18 2005 Jef Spaleta - 2.0.3-3 - rebuild Index: glabels.spec =================================================================== RCS file: /cvs/extras/rpms/glabels/devel/glabels.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- glabels.spec 8 Jul 2005 04:13:32 -0000 1.2 +++ glabels.spec 18 Aug 2005 22:11:38 -0000 1.3 @@ -1,6 +1,6 @@ Name: glabels Version: 2.0.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A program for creating labels and business cards for GNOME Group: Applications/Publishing @@ -99,6 +99,9 @@ %exclude %{_libdir}/libglabels.la %changelog +* Thu Aug 18 2005 Jef Spaleta - 2.0.3-3 +- rebuild + * Thu Jul 7 2005 Jef Spaleta - 2.0.3-2 - use Source0 From fedora-extras-commits at redhat.com Thu Aug 18 22:22:59 2005 From: fedora-extras-commits at redhat.com (Jef Spaleta (jspaleta)) Date: Thu, 18 Aug 2005 18:22:59 -0400 Subject: rpms/istanbul/devel istanbul.spec,1.1,1.2 Message-ID: <200508182222.j7IMMx1E027721@cvs-int.fedora.redhat.com> Author: jspaleta Update of /cvs/extras/rpms/istanbul/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27704 Modified Files: istanbul.spec Log Message: * Thu Aug 18 2005 Jef Spaleta - 0.1.1-5 - rebuild Index: istanbul.spec =================================================================== RCS file: /cvs/extras/rpms/istanbul/devel/istanbul.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- istanbul.spec 27 Jul 2005 01:29:11 -0000 1.1 +++ istanbul.spec 18 Aug 2005 22:22:57 -0000 1.2 @@ -8,7 +8,7 @@ Summary: Desktop Session Recorder Name: istanbul Version: 0.1.1 -Release: 4 +Release: 5 License: GPL Group: Applications/Multimedia URL: http://live.gnome.org/Istanbul @@ -96,6 +96,9 @@ %{python_sitelib}/%{name}/configure/*.py* %changelog +* Thu Aug 18 2005 Jef Spaleta - 0.1.1-5 +- rebuild + * Thu Jul 21 2005 Jef Spaleta - 0.1.1-4 - minor specfile cleanup From fedora-extras-commits at redhat.com Fri Aug 19 02:49:24 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Thu, 18 Aug 2005 22:49:24 -0400 Subject: rpms/leafpad/devel leafpad.spec,1.12,1.13 Message-ID: <200508190249.j7J2ns18000511@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/leafpad/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv494 Modified Files: leafpad.spec Log Message: Rebuild for new Cairo Index: leafpad.spec =================================================================== RCS file: /cvs/extras/rpms/leafpad/devel/leafpad.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- leafpad.spec 23 Jul 2005 07:30:28 -0000 1.12 +++ leafpad.spec 19 Aug 2005 02:49:22 -0000 1.13 @@ -1,6 +1,6 @@ Name: leafpad Version: 0.8.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GTK+ based simple text editor @@ -57,6 +57,9 @@ %{_datadir}/pixmaps/%{name}.png %changelog +* Thu Aug 18 2005 Ignacio Vazquez-Abrams 0.8.3-2 +- Rebuild for new Cairo + * Sat Jul 23 2005 Ignacio Vazquez-Abrams 0.8.3-1 - Upstream update From fedora-extras-commits at redhat.com Fri Aug 19 02:51:12 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Thu, 18 Aug 2005 22:51:12 -0400 Subject: rpms/fyre/devel fyre.spec,1.9,1.10 Message-ID: <200508190251.j7J2pCe6000539@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/fyre/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv522 Modified Files: fyre.spec Log Message: Rebuild for new Cairo Index: fyre.spec =================================================================== RCS file: /cvs/extras/rpms/fyre/devel/fyre.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- fyre.spec 8 Jul 2005 16:44:06 -0000 1.9 +++ fyre.spec 19 Aug 2005 02:51:09 -0000 1.10 @@ -1,6 +1,6 @@ Name: fyre Version: 1.0.0 -Release: 9%{?dist} +Release: 10%{?dist} Summary: A tool for creating artwork from chaotic functions Group: Amusements/Graphics @@ -75,6 +75,9 @@ %config(noreplace) %{_sysconfdir}/sysconfig/fyre %changelog +* Thu Aug 18 2005 Ignacio Vazquez-Abrams 1.0.0-10 +- Rebuild for new Cairo + * Fri Jul 8 2005 Ignacio Vazquez-Abrams 1.0.0-9 - Added restart definition to initscript (#161008) From fedora-extras-commits at redhat.com Fri Aug 19 05:16:23 2005 From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl)) Date: Fri, 19 Aug 2005 01:16:23 -0400 Subject: rpms/revelation/devel revelation.spec,1.10,1.11 Message-ID: <200508190516.j7J5GNCS004450@cvs-int.fedora.redhat.com> Author: thl Update of /cvs/extras/rpms/revelation/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4433 Modified Files: revelation.spec Log Message: rebuild Index: revelation.spec =================================================================== RCS file: /cvs/extras/rpms/revelation/devel/revelation.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- revelation.spec 8 Aug 2005 16:35:42 -0000 1.10 +++ revelation.spec 19 Aug 2005 05:16:21 -0000 1.11 @@ -4,7 +4,7 @@ Summary: Password manager for GNOME 2 Name: revelation Version: 0.4.4 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Applications/Productivity Source: ftp://oss.codepoet.no/revelation/revelation-0.4.4.tar.bz2 @@ -103,6 +103,9 @@ %{_libexecdir}/revelation-applet %changelog +* Fri Aug 19 2005 Thorsten Leemhuis 0.4.4-2 +- rebuild + * Mon Aug 08 2005 Thorsten Leemhuis 0.4.4-1 - Update to 0.4.4 - Use dist-macro From fedora-extras-commits at redhat.com Fri Aug 19 12:46:00 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Fri, 19 Aug 2005 08:46:00 -0400 Subject: rpms/perl-Test-LongString - New directory Message-ID: <200508191246.j7JCk0rj014879@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Test-LongString In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14869/perl-Test-LongString Log Message: Directory /cvs/extras/rpms/perl-Test-LongString added to the repository From fedora-extras-commits at redhat.com Fri Aug 19 12:46:08 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Fri, 19 Aug 2005 08:46:08 -0400 Subject: rpms/perl-Test-LongString/devel - New directory Message-ID: <200508191246.j7JCk8TG014898@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Test-LongString/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14869/perl-Test-LongString/devel Log Message: Directory /cvs/extras/rpms/perl-Test-LongString/devel added to the repository From fedora-extras-commits at redhat.com Fri Aug 19 12:46:36 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Fri, 19 Aug 2005 08:46:36 -0400 Subject: rpms/perl-Test-LongString Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200508191246.j7JCkama014946@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Test-LongString In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14919 Added Files: Makefile import.log Log Message: Setup of module perl-Test-LongString --- NEW FILE Makefile --- # Top level Makefile for module perl-Test-LongString all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Fri Aug 19 12:46:36 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Fri, 19 Aug 2005 08:46:36 -0400 Subject: rpms/perl-Test-LongString/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200508191246.j7JCkaXQ014951@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Test-LongString/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14919/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Test-LongString --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Fri Aug 19 12:47:23 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Fri, 19 Aug 2005 08:47:23 -0400 Subject: rpms/perl-Test-LongString import.log,1.1,1.2 Message-ID: <200508191247.j7JClNfD015019@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Test-LongString In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14983 Modified Files: import.log Log Message: auto-import perl-Test-LongString-0.08-1 on branch devel from perl-Test-LongString-0.08-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Test-LongString/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 19 Aug 2005 12:46:33 -0000 1.1 +++ import.log 19 Aug 2005 12:47:21 -0000 1.2 @@ -0,0 +1 @@ +perl-Test-LongString-0_08-1:HEAD:perl-Test-LongString-0.08-1.src.rpm:1124455628 From fedora-extras-commits at redhat.com Fri Aug 19 12:47:24 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Fri, 19 Aug 2005 08:47:24 -0400 Subject: rpms/perl-Test-LongString/devel perl-Test-LongString.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200508191247.j7JClOnn015026@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Test-LongString/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14983/devel Modified Files: .cvsignore sources Added Files: perl-Test-LongString.spec Log Message: auto-import perl-Test-LongString-0.08-1 on branch devel from perl-Test-LongString-0.08-1.src.rpm --- NEW FILE perl-Test-LongString.spec --- Name: perl-Test-LongString Version: 0.08 Release: 1%{?dist} Summary: Tests strings for equality License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Test-LongString/ Source0: http://www.cpan.org/modules/by-module/Test/Test-LongString-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl # Required by the tests BuildRequires: perl(Test::Builder::Tester) BuildRequires: perl(Test::Pod::Coverage) >= 1.04 BuildRequires: perl(Test::Pod) >= 1.14 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description This module provides some drop-in replacements for the string comparison functions of Test::More, but which are more suitable when you test against long strings. If you've ever had to search for text in a multi-line string like an HTML document, or find specific items in binary data, this is the module for you. %prep %setup -q -n Test-LongString-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type f -name '*.bs' -a -size 0 -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %clean rm -rf $RPM_BUILD_ROOT %check make test %files %defattr(-,root,root,-) %doc Changes README %{perl_vendorlib}/Test %{_mandir}/man3/* %changelog * Thu Aug 11 2005 Ralf Corsepius - 0.08-1 - FE submission. * Thu Aug 11 2005 Ralf Corsepius - 0.07-1 - FE submission. * Tue Mar 22 2005 Ralf Corsepius - 0.07-0.pm.2 - Initial packman version. - Update to FE standards. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Test-LongString/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 19 Aug 2005 12:46:34 -0000 1.1 +++ .cvsignore 19 Aug 2005 12:47:22 -0000 1.2 @@ -0,0 +1 @@ +Test-LongString-0.08.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Test-LongString/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 19 Aug 2005 12:46:34 -0000 1.1 +++ sources 19 Aug 2005 12:47:22 -0000 1.2 @@ -0,0 +1 @@ +c0906f6abfe4eabf408dfb245b7f589d Test-LongString-0.08.tar.gz From fedora-extras-commits at redhat.com Fri Aug 19 12:50:11 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Fri, 19 Aug 2005 08:50:11 -0400 Subject: rpms/perl-Test-LongString/devel perl-Test-LongString.spec,1.1,1.2 Message-ID: <200508191250.j7JCoBov015139@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Test-LongString/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15120 Modified Files: perl-Test-LongString.spec Log Message: Spec cleanup Index: perl-Test-LongString.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Test-LongString/devel/perl-Test-LongString.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Test-LongString.spec 19 Aug 2005 12:47:22 -0000 1.1 +++ perl-Test-LongString.spec 19 Aug 2005 12:50:09 -0000 1.2 @@ -1,7 +1,7 @@ Name: perl-Test-LongString Version: 0.08 -Release: 1%{?dist} -Summary: Tests strings for equality +Release: 2%{?dist} +Summary: Perl module to test long strings License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Test-LongString/ @@ -9,7 +9,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: perl # Required by the tests BuildRequires: perl(Test::Builder::Tester) @@ -36,7 +35,6 @@ rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' -find $RPM_BUILD_ROOT -type f -name '*.bs' -a -size 0 -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* @@ -53,12 +51,11 @@ %{_mandir}/man3/* %changelog +* Fri Aug 19 2005 Ralf Corsepius - 0.08-2 +- Spec cleanup. + * Thu Aug 11 2005 Ralf Corsepius - 0.08-1 - FE submission. * Thu Aug 11 2005 Ralf Corsepius - 0.07-1 - FE submission. - -* Tue Mar 22 2005 Ralf Corsepius - 0.07-0.pm.2 -- Initial packman version. -- Update to FE standards. From fedora-extras-commits at redhat.com Fri Aug 19 12:54:10 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Fri, 19 Aug 2005 08:54:10 -0400 Subject: owners owners.list,1.100,1.101 Message-ID: <200508191254.j7JCsAGt015219@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15199 Modified Files: owners.list Log Message: Add perl-Test-LongString Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.100 retrieving revision 1.101 diff -u -r1.100 -r1.101 --- owners.list 18 Aug 2005 19:38:37 -0000 1.100 +++ owners.list 19 Aug 2005 12:54:08 -0000 1.101 @@ -639,6 +639,7 @@ Fedora Extras|perl-Template-Toolkit|Template processing system|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Test-Builder-Tester|For bugs related to the perl-Test-Builder-Tester component|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Test-Exception|Library of test functions for exception based Perl code|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Test-LongString|Perl module to test long strings|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Test-Manifest|Test case module for Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Test-Memory-Cycle|Check for memory leaks and circular memory references|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Test-MockModule|Override subroutines in a module for unit testing|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Fri Aug 19 13:18:11 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Fri, 19 Aug 2005 09:18:11 -0400 Subject: rpms/perl-Text-Quoted - New directory Message-ID: <200508191318.j7JDIB0t016602@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Text-Quoted In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16582/perl-Text-Quoted Log Message: Directory /cvs/extras/rpms/perl-Text-Quoted added to the repository From fedora-extras-commits at redhat.com Fri Aug 19 13:18:11 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Fri, 19 Aug 2005 09:18:11 -0400 Subject: rpms/perl-Text-Quoted/devel - New directory Message-ID: <200508191318.j7JDIBeY016607@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Text-Quoted/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16582/perl-Text-Quoted/devel Log Message: Directory /cvs/extras/rpms/perl-Text-Quoted/devel added to the repository From fedora-extras-commits at redhat.com Fri Aug 19 13:18:42 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Fri, 19 Aug 2005 09:18:42 -0400 Subject: rpms/perl-Text-Quoted Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200508191318.j7JDIgw4016658@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Text-Quoted In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16627 Added Files: Makefile import.log Log Message: Setup of module perl-Text-Quoted --- NEW FILE Makefile --- # Top level Makefile for module perl-Text-Quoted all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Fri Aug 19 13:18:42 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Fri, 19 Aug 2005 09:18:42 -0400 Subject: rpms/perl-Text-Quoted/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200508191318.j7JDIgXt016663@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Text-Quoted/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16627/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Text-Quoted --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Fri Aug 19 13:19:32 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Fri, 19 Aug 2005 09:19:32 -0400 Subject: rpms/perl-Text-Quoted import.log,1.1,1.2 Message-ID: <200508191320.j7JDK2Pd016725@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Text-Quoted In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16691 Modified Files: import.log Log Message: auto-import perl-Text-Quoted-1.8-1 on branch devel from perl-Text-Quoted-1.8-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Text-Quoted/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 19 Aug 2005 13:18:40 -0000 1.1 +++ import.log 19 Aug 2005 13:19:30 -0000 1.2 @@ -0,0 +1 @@ +perl-Text-Quoted-1_8-1:HEAD:perl-Text-Quoted-1.8-1.src.rpm:1124457555 From fedora-extras-commits at redhat.com Fri Aug 19 13:19:33 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Fri, 19 Aug 2005 09:19:33 -0400 Subject: rpms/perl-Text-Quoted/devel perl-Text-Quoted.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200508191320.j7JDK3Vs016729@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Text-Quoted/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16691/devel Modified Files: .cvsignore sources Added Files: perl-Text-Quoted.spec Log Message: auto-import perl-Text-Quoted-1.8-1 on branch devel from perl-Text-Quoted-1.8-1.src.rpm --- NEW FILE perl-Text-Quoted.spec --- Name: perl-Text-Quoted Version: 1.8 Release: 1%{?dist} Summary: Extract the structure of a quoted mail message License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Text-Quoted/ Source0: http://www.cpan.org/modules/by-module/Text/Text-Quoted-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildRequires: perl BuildRequires: perl(Text::Autoformat) %description Text::Quoted examines the structure of some text which may contain multiple different levels of quoting, and turns the text into a nested data structure. %prep %setup -q -n Text-Quoted-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type f -name '*.bs' -a -size 0 -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %clean rm -rf $RPM_BUILD_ROOT %check make test %files %defattr(-,root,root,-) %doc Changes README %{perl_vendorlib}/Text %{_mandir}/man3/* %changelog * Thu Aug 11 2005 Ralf Corsepius - 1.8-1 - FE submission. * Mon Mar 21 2005 Ralf Corsepius - 1.8-0.pm.2 - Initial packman version. - Update to FE standards. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Text-Quoted/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 19 Aug 2005 13:18:40 -0000 1.1 +++ .cvsignore 19 Aug 2005 13:19:30 -0000 1.2 @@ -0,0 +1 @@ +Text-Quoted-1.8.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Text-Quoted/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 19 Aug 2005 13:18:40 -0000 1.1 +++ sources 19 Aug 2005 13:19:30 -0000 1.2 @@ -0,0 +1 @@ +cab9d462b480437bab72b6044ac6c788 Text-Quoted-1.8.tar.gz From fedora-extras-commits at redhat.com Fri Aug 19 13:22:26 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Fri, 19 Aug 2005 09:22:26 -0400 Subject: rpms/perl-Text-Quoted/devel perl-Text-Quoted.spec,1.1,1.2 Message-ID: <200508191322.j7JDMQD7016786@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Text-Quoted/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16769 Modified Files: perl-Text-Quoted.spec Log Message: Spec cleanup. Index: perl-Text-Quoted.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Text-Quoted/devel/perl-Text-Quoted.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Text-Quoted.spec 19 Aug 2005 13:19:30 -0000 1.1 +++ perl-Text-Quoted.spec 19 Aug 2005 13:22:24 -0000 1.2 @@ -1,6 +1,6 @@ Name: perl-Text-Quoted Version: 1.8 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Extract the structure of a quoted mail message License: GPL or Artistic Group: Development/Libraries @@ -12,7 +12,6 @@ Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) -BuildRequires: perl BuildRequires: perl(Text::Autoformat) %description @@ -30,7 +29,6 @@ rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' -find $RPM_BUILD_ROOT -type f -name '*.bs' -a -size 0 -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* @@ -47,9 +45,8 @@ %{_mandir}/man3/* %changelog +* Thu Aug 19 2005 Ralf Corsepius - 1.8-2 +- Spec cleanup. + * Thu Aug 11 2005 Ralf Corsepius - 1.8-1 - FE submission. - -* Mon Mar 21 2005 Ralf Corsepius - 1.8-0.pm.2 -- Initial packman version. -- Update to FE standards. From fedora-extras-commits at redhat.com Fri Aug 19 13:25:11 2005 From: fedora-extras-commits at redhat.com (Marc Maurer (uwog)) Date: Fri, 19 Aug 2005 09:25:11 -0400 Subject: rpms/abiword/devel abiword-2.3.4-pangographics.patch, NONE, 1.1 abiword.spec, 1.11, 1.12 Message-ID: <200508191325.j7JDPB5d016857@cvs-int.fedora.redhat.com> Author: uwog Update of /cvs/extras/rpms/abiword/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16837 Modified Files: abiword.spec Added Files: abiword-2.3.4-pangographics.patch Log Message: Disable the experimental pango renderer abiword-2.3.4-pangographics.patch: --- NEW FILE abiword-2.3.4-pangographics.patch --- diff --recursive -Nau abiword-2.3.4.org/abi/src/af/gr/unix/GNUmakefile.am abiword-2.3.4/abi/src/af/gr/unix/GNUmakefile.am --- abiword-2.3.4.org/abi/src/af/gr/unix/GNUmakefile.am 2005-03-20 18:41:14.000000000 +0100 +++ abiword-2.3.4/abi/src/af/gr/unix/GNUmakefile.am 2005-08-19 15:20:28.000000000 +0200 @@ -24,6 +24,5 @@ libGr_unix_a_SOURCES=\ gr_UnixGraphics.cpp \ - gr_UnixImage.cpp \ - gr_UnixPangoGraphics.cpp + gr_UnixImage.cpp Index: abiword.spec =================================================================== RCS file: /cvs/extras/rpms/abiword/devel/abiword.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- abiword.spec 16 Aug 2005 22:46:25 -0000 1.11 +++ abiword.spec 19 Aug 2005 13:25:08 -0000 1.12 @@ -3,7 +3,7 @@ Summary: The AbiWord word processor Name: abiword Version: 2.3.4 -Release: 1 +Release: 2 Epoch: 1 Group: Applications/Editors License: GPL @@ -41,6 +41,7 @@ Patch0: abiword-2.0.9-windowshelppaths.patch Patch1: abiword-2.2.6-desktop.patch +Patch2: abiword-2.3.4-pangographics.patch %description AbiWord is a cross-platform Open Source word processor. The goal is to make @@ -50,6 +51,7 @@ %setup -q %patch0 -p1 -b .windowshelppaths %patch1 -p1 -b .desktop +%patch2 -p1 -b .pangographics %build cd abi @@ -128,7 +130,10 @@ %{_datadir}/icons/*png %changelog -* Thu Aug 17 2005 Marc Maurer - 1:2.3.4-1 +* Fri Aug 19 2005 Marc Maurer - 1:2.3.4-2 +- Disable the experimental pango renderer + +* Thu Aug 17 2005 Marc Maurer - 1:2.3.4-1 - Update to 2.3.4 - Add link-grammar dependency From fedora-extras-commits at redhat.com Fri Aug 19 13:36:26 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Fri, 19 Aug 2005 09:36:26 -0400 Subject: rpms/scim-anthy/devel README, NONE, 1.1 Makefile, 1.1, NONE scim-anthy.spec, 1.7, NONE sources, 1.6, NONE Message-ID: <200508191336.j7JDaQAs016945@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/scim-anthy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16929 Added Files: README Removed Files: Makefile scim-anthy.spec sources Log Message: scim-anthy is now in Core devel. --- NEW FILE README --- scim-anthy has moved to Fedora Core development. --- Makefile DELETED --- --- scim-anthy.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Fri Aug 19 13:43:54 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Fri, 19 Aug 2005 09:43:54 -0400 Subject: rpms/scim-anthy/FC-4 .cvsignore, 1.5, 1.6 scim-anthy.spec, 1.18, 1.19 sources, 1.7, 1.8 Message-ID: <200508191343.j7JDhs2f017000@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/scim-anthy/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16975 Modified Files: .cvsignore scim-anthy.spec sources Log Message: - 0.6.1 release - no longer explicitly require anthy Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/scim-anthy/FC-4/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 29 Jul 2005 11:07:13 -0000 1.5 +++ .cvsignore 19 Aug 2005 13:43:52 -0000 1.6 @@ -1 +1 @@ -scim-anthy-0.5.3.tar.gz +scim-anthy-0.6.1.tar.gz Index: scim-anthy.spec =================================================================== RCS file: /cvs/extras/rpms/scim-anthy/FC-4/scim-anthy.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- scim-anthy.spec 2 Aug 2005 01:21:44 -0000 1.18 +++ scim-anthy.spec 19 Aug 2005 13:43:52 -0000 1.19 @@ -1,6 +1,6 @@ Name: scim-anthy -Version: 0.5.3 -Release: 3.1%{?dist} +Version: 0.6.1 +Release: 1%{?dist} Summary: SCIM IMEngine for anthy for Japanese input Group: System Environment/Libraries @@ -9,7 +9,6 @@ Source0: http://sourceforge.jp/projects/scim-imengine/files/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: anthy BuildRequires: scim-devel anthy-devel %description @@ -46,6 +45,10 @@ %changelog +* Fri Aug 19 2005 Jens Petersen - 0.6.1-1 +- 0.6.1 release +- no longer explicitly require anthy + * Tue Aug 2 2005 Ryo Dairiki - 0.5.3-3.1 - remove update-xinput-scim settings Index: sources =================================================================== RCS file: /cvs/extras/rpms/scim-anthy/FC-4/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 29 Jul 2005 11:07:14 -0000 1.7 +++ sources 19 Aug 2005 13:43:52 -0000 1.8 @@ -1 +1 @@ -ba42960652a82cd594f443d8275184f9 scim-anthy-0.5.3.tar.gz +a4df7596d8f9f019313bb03f12d7cb78 scim-anthy-0.6.1.tar.gz From fedora-extras-commits at redhat.com Fri Aug 19 13:46:43 2005 From: fedora-extras-commits at redhat.com (Marc Maurer (uwog)) Date: Fri, 19 Aug 2005 09:46:43 -0400 Subject: rpms/abiword/devel abiword.spec,1.12,1.13 Message-ID: <200508191346.j7JDkhNR017068@cvs-int.fedora.redhat.com> Author: uwog Update of /cvs/extras/rpms/abiword/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17051 Modified Files: abiword.spec Log Message: Fix the build by rerunning autogen.sh Index: abiword.spec =================================================================== RCS file: /cvs/extras/rpms/abiword/devel/abiword.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- abiword.spec 19 Aug 2005 13:25:08 -0000 1.12 +++ abiword.spec 19 Aug 2005 13:46:40 -0000 1.13 @@ -3,7 +3,7 @@ Summary: The AbiWord word processor Name: abiword Version: 2.3.4 -Release: 2 +Release: 3 Epoch: 1 Group: Applications/Editors License: GPL @@ -55,7 +55,9 @@ %build cd abi -autoconf +# rerun autogen.sh, as we patch some Makefile.am's (see patch2) +./autogen.sh +#autoconf %configure --enable-gnome --with-libxml2 cd ../wv %configure --with-libwmf --with-libxml2 @@ -130,6 +132,10 @@ %{_datadir}/icons/*png %changelog +* Fri Aug 19 2005 Marc Maurer - 1:2.3.4-3 +- Fix the build after applying the pango disabling patch by + rerunning autogen.sh + * Fri Aug 19 2005 Marc Maurer - 1:2.3.4-2 - Disable the experimental pango renderer From fedora-extras-commits at redhat.com Fri Aug 19 13:54:07 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 19 Aug 2005 09:54:07 -0400 Subject: rpms/chkrootkit/devel chkrootkit.spec,1.10,1.11 Message-ID: <200508191354.j7JDs7AF017139@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/chkrootkit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17122 Modified Files: chkrootkit.spec Log Message: * Fri Aug 19 2005 Michael Schwendt - 0.45-4 - Pass on command-line arguments to main program (#166321). Index: chkrootkit.spec =================================================================== RCS file: /cvs/extras/rpms/chkrootkit/devel/chkrootkit.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- chkrootkit.spec 9 May 2005 21:37:22 -0000 1.10 +++ chkrootkit.spec 19 Aug 2005 13:54:05 -0000 1.11 @@ -1,6 +1,6 @@ Name: chkrootkit Version: 0.45 -Release: 3 +Release: 4%{?dist} Summary: Tool to locally check for signs of a rootkit Group: Applications/System License: BSD-like @@ -54,7 +54,7 @@ cat << EOF > .tmp.chkrootkit.sbin #! /bin/sh cd %{_libdir}/%{name}-%{version} -./chkrootkit +./chkrootkit "\$@" EOF install -p -D -m0755 .tmp.chkrootkit.sbin ${RPM_BUILD_ROOT}%{_sbindir}/chkrootkit @@ -106,6 +106,9 @@ %changelog +* Fri Aug 19 2005 Michael Schwendt - 0.45-4 +- Pass on command-line arguments to main program (#166321). + * Mon May 9 2005 Michael Schwendt - 0.45-3 - Create debuginfo package, remove stripping from Makefile in %%prep, build with optflags. From fedora-extras-commits at redhat.com Fri Aug 19 13:54:57 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 19 Aug 2005 09:54:57 -0400 Subject: rpms/chkrootkit/FC-3 chkrootkit.spec,1.7,1.8 Message-ID: <200508191355.j7JDtRFB017217@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/chkrootkit/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17183/FC-3 Modified Files: chkrootkit.spec Log Message: sync with devel erratum Index: chkrootkit.spec =================================================================== RCS file: /cvs/extras/rpms/chkrootkit/FC-3/chkrootkit.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- chkrootkit.spec 24 Feb 2005 15:13:53 -0000 1.7 +++ chkrootkit.spec 19 Aug 2005 13:54:55 -0000 1.8 @@ -1,9 +1,7 @@ Name: chkrootkit Version: 0.45 -Release: 1 -Epoch: 0 -Summary: A tool to locally check for signs of a rootkit - +Release: 4%{?dist} +Summary: Tool to locally check for signs of a rootkit Group: Applications/System License: BSD-like URL: http://www.chkrootkit.org @@ -15,6 +13,7 @@ Source5: chkrootkit.pam Patch1: chkrootkit-0.44-getCMD.patch Patch2: chkrootkit-0.44-inetd.patch +Patch3: chkrootkit-0.45-includes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -32,7 +31,7 @@ * chkwtmp: checks for wtmp deletions. * chkproc: checks for signs of LKM trojans. * chkdirs: checks for signs of LKM trojans. - * strings: quick and dirty strings replacement. + * strings: quick and dirty strings replacement. * chkutmp: checks for utmp deletions. @@ -40,10 +39,12 @@ %setup -q -n %{name}-%{version} %patch1 -p1 -b .getCMD %patch2 -p1 -b .inetd +%patch3 -p1 -b .includes +sed -i -e 's!\s\+ at strip.*!!g' Makefile %build -make sense +make sense CC="%{__cc} $RPM_OPT_FLAGS" %install @@ -53,7 +54,7 @@ cat << EOF > .tmp.chkrootkit.sbin #! /bin/sh cd %{_libdir}/%{name}-%{version} -./chkrootkit +./chkrootkit "\$@" EOF install -p -D -m0755 .tmp.chkrootkit.sbin ${RPM_BUILD_ROOT}%{_sbindir}/chkrootkit @@ -105,6 +106,16 @@ %changelog +* Fri Aug 19 2005 Michael Schwendt - 0.45-4 +- Pass on command-line arguments to main program (#166321). + +* Mon May 9 2005 Michael Schwendt - 0.45-3 +- Create debuginfo package, remove stripping from Makefile in %%prep, + build with optflags. + +* Thu Mar 17 2005 Michael Schwendt - 0.45-2 +- Make GCC4 shut up by including more C headers in chkproc.c/chkwtmp.c + * Thu Feb 24 2005 Michael Schwendt - 0:0.45-1 - Update to 0.45, trim description. From fedora-extras-commits at redhat.com Fri Aug 19 13:54:57 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 19 Aug 2005 09:54:57 -0400 Subject: rpms/chkrootkit/FC-4 chkrootkit.spec,1.10,1.11 Message-ID: <200508191355.j7JDtRdu017220@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/chkrootkit/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17183/FC-4 Modified Files: chkrootkit.spec Log Message: sync with devel erratum Index: chkrootkit.spec =================================================================== RCS file: /cvs/extras/rpms/chkrootkit/FC-4/chkrootkit.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- chkrootkit.spec 9 May 2005 21:37:22 -0000 1.10 +++ chkrootkit.spec 19 Aug 2005 13:54:55 -0000 1.11 @@ -1,6 +1,6 @@ Name: chkrootkit Version: 0.45 -Release: 3 +Release: 4%{?dist} Summary: Tool to locally check for signs of a rootkit Group: Applications/System License: BSD-like @@ -54,7 +54,7 @@ cat << EOF > .tmp.chkrootkit.sbin #! /bin/sh cd %{_libdir}/%{name}-%{version} -./chkrootkit +./chkrootkit "\$@" EOF install -p -D -m0755 .tmp.chkrootkit.sbin ${RPM_BUILD_ROOT}%{_sbindir}/chkrootkit @@ -106,6 +106,9 @@ %changelog +* Fri Aug 19 2005 Michael Schwendt - 0.45-4 +- Pass on command-line arguments to main program (#166321). + * Mon May 9 2005 Michael Schwendt - 0.45-3 - Create debuginfo package, remove stripping from Makefile in %%prep, build with optflags. From fedora-extras-commits at redhat.com Fri Aug 19 13:59:45 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 19 Aug 2005 09:59:45 -0400 Subject: rpms/chkrootkit/FC-3 chkrootkit-0.45-includes.patch,NONE,1.1 Message-ID: <200508191359.j7JDxjSG017327@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/chkrootkit/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17309 Added Files: chkrootkit-0.45-includes.patch Log Message: sync with devel chkrootkit-0.45-includes.patch: --- NEW FILE chkrootkit-0.45-includes.patch --- diff -Nur chkrootkit-0.45-orig/chkproc.c chkrootkit-0.45/chkproc.c --- chkrootkit-0.45-orig/chkproc.c 2004-09-13 20:39:29.000000000 +0200 +++ chkrootkit-0.45/chkproc.c 2005-03-17 16:48:48.000000000 +0100 @@ -48,6 +48,7 @@ #include #include #include +#include #if defined(__sun) #include #include diff -Nur chkrootkit-0.45-orig/chkwtmp.c chkrootkit-0.45/chkwtmp.c --- chkrootkit-0.45-orig/chkwtmp.c 2004-09-06 21:24:56.000000000 +0200 +++ chkrootkit-0.45/chkwtmp.c 2005-03-17 16:49:01.000000000 +0100 @@ -17,7 +17,7 @@ Nelson Murilo, nelson at pangeia.com.br */ - +#include #include #include #include From fedora-extras-commits at redhat.com Fri Aug 19 14:05:36 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Fri, 19 Aug 2005 10:05:36 -0400 Subject: rpms/perl-Text-Quoted/devel perl-Text-Quoted.spec,1.2,1.3 Message-ID: <200508191406.j7JE61dl018564@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Text-Quoted/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18546 Modified Files: perl-Text-Quoted.spec Log Message: chmod -x Quote.pm Index: perl-Text-Quoted.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Text-Quoted/devel/perl-Text-Quoted.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Text-Quoted.spec 19 Aug 2005 13:22:24 -0000 1.2 +++ perl-Text-Quoted.spec 19 Aug 2005 14:05:32 -0000 1.3 @@ -1,6 +1,6 @@ Name: perl-Text-Quoted Version: 1.8 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Extract the structure of a quoted mail message License: GPL or Artistic Group: Development/Libraries @@ -21,6 +21,9 @@ %prep %setup -q -n Text-Quoted-%{version} +# Shipped +x in perl-Text-Quoted-1.8 +chmod -x Quoted.pm + %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} @@ -45,6 +48,9 @@ %{_mandir}/man3/* %changelog +* Thu Aug 19 2005 Ralf Corsepius - 1.8-3 +- chmod -x Quote.pm. + * Thu Aug 19 2005 Ralf Corsepius - 1.8-2 - Spec cleanup. From fedora-extras-commits at redhat.com Fri Aug 19 14:08:18 2005 From: fedora-extras-commits at redhat.com (Marc Maurer (uwog)) Date: Fri, 19 Aug 2005 10:08:18 -0400 Subject: rpms/abiword/devel abiword-2.3.4-pangographics.patch, 1.1, 1.2 abiword.spec, 1.13, 1.14 Message-ID: <200508191408.j7JE8Iko018671@cvs-int.fedora.redhat.com> Author: uwog Update of /cvs/extras/rpms/abiword/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18619 Modified Files: abiword-2.3.4-pangographics.patch abiword.spec Log Message: Disable more pango code abiword-2.3.4-pangographics.patch: Index: abiword-2.3.4-pangographics.patch =================================================================== RCS file: /cvs/extras/rpms/abiword/devel/abiword-2.3.4-pangographics.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- abiword-2.3.4-pangographics.patch 19 Aug 2005 13:25:08 -0000 1.1 +++ abiword-2.3.4-pangographics.patch 19 Aug 2005 14:08:16 -0000 1.2 @@ -1,5 +1,5 @@ -diff --recursive -Nau abiword-2.3.4.org/abi/src/af/gr/unix/GNUmakefile.am abiword-2.3.4/abi/src/af/gr/unix/GNUmakefile.am ---- abiword-2.3.4.org/abi/src/af/gr/unix/GNUmakefile.am 2005-03-20 18:41:14.000000000 +0100 +diff --recursive -Nau abiword-2.3.4.orig/abi/src/af/gr/unix/GNUmakefile.am abiword-2.3.4/abi/src/af/gr/unix/GNUmakefile.am +--- abiword-2.3.4.orig/abi/src/af/gr/unix/GNUmakefile.am 2005-03-20 18:41:14.000000000 +0100 +++ abiword-2.3.4/abi/src/af/gr/unix/GNUmakefile.am 2005-08-19 15:20:28.000000000 +0200 @@ -24,6 +24,5 @@ @@ -9,3 +9,15 @@ - gr_UnixPangoGraphics.cpp + gr_UnixImage.cpp +diff --recursive -Nau abiword-2.3.4.orig/abi/src/af/xap/unix/xap_UnixApp.cpp abiword-2.3.4/abi/src/af/xap/unix/xap_UnixApp.cpp +--- abiword-2.3.4.orig/abi/src/af/xap/unix/xap_UnixApp.cpp 2005-07-05 16:08:20.000000000 +0200 ++++ abiword-2.3.4/abi/src/af/xap/unix/xap_UnixApp.cpp 2005-08-19 16:04:00.000000000 +0200 +@@ -107,7 +107,7 @@ + + + UT_ASSERT( bSuccess ); +-#if 1 ++#if 0 + bSuccess = pGF->registerClass(GR_UnixPangoGraphics::graphicsAllocator, + GR_UnixPangoGraphics::graphicsDescriptor, + GR_UnixPangoGraphics::s_getClassId()); Index: abiword.spec =================================================================== RCS file: /cvs/extras/rpms/abiword/devel/abiword.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- abiword.spec 19 Aug 2005 13:46:40 -0000 1.13 +++ abiword.spec 19 Aug 2005 14:08:16 -0000 1.14 @@ -3,7 +3,7 @@ Summary: The AbiWord word processor Name: abiword Version: 2.3.4 -Release: 3 +Release: 4 Epoch: 1 Group: Applications/Editors License: GPL @@ -132,6 +132,9 @@ %{_datadir}/icons/*png %changelog +* Fri Aug 19 2005 Marc Maurer - 1:2.3.4-4 +- Update the pango patch to disable more pango code + * Fri Aug 19 2005 Marc Maurer - 1:2.3.4-3 - Fix the build after applying the pango disabling patch by rerunning autogen.sh From fedora-extras-commits at redhat.com Fri Aug 19 14:15:38 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 19 Aug 2005 10:15:38 -0400 Subject: rpms/chkrootkit/devel chkrootkit.spec,1.11,1.12 Message-ID: <200508191415.j7JEFcmp018779@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/chkrootkit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18732/devel Modified Files: chkrootkit.spec Log Message: Index: chkrootkit.spec =================================================================== RCS file: /cvs/extras/rpms/chkrootkit/devel/chkrootkit.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- chkrootkit.spec 19 Aug 2005 13:54:05 -0000 1.11 +++ chkrootkit.spec 19 Aug 2005 14:15:36 -0000 1.12 @@ -54,7 +54,7 @@ cat << EOF > .tmp.chkrootkit.sbin #! /bin/sh cd %{_libdir}/%{name}-%{version} -./chkrootkit "\$@" +exec ./chkrootkit "\$@" EOF install -p -D -m0755 .tmp.chkrootkit.sbin ${RPM_BUILD_ROOT}%{_sbindir}/chkrootkit From fedora-extras-commits at redhat.com Fri Aug 19 14:15:32 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 19 Aug 2005 10:15:32 -0400 Subject: rpms/chkrootkit/FC-3 chkrootkit.spec,1.8,1.9 Message-ID: <200508191416.j7JEG2lf018782@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/chkrootkit/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18732/FC-3 Modified Files: chkrootkit.spec Log Message: Index: chkrootkit.spec =================================================================== RCS file: /cvs/extras/rpms/chkrootkit/FC-3/chkrootkit.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- chkrootkit.spec 19 Aug 2005 13:54:55 -0000 1.8 +++ chkrootkit.spec 19 Aug 2005 14:15:30 -0000 1.9 @@ -54,7 +54,7 @@ cat << EOF > .tmp.chkrootkit.sbin #! /bin/sh cd %{_libdir}/%{name}-%{version} -./chkrootkit "\$@" +exec ./chkrootkit "\$@" EOF install -p -D -m0755 .tmp.chkrootkit.sbin ${RPM_BUILD_ROOT}%{_sbindir}/chkrootkit From fedora-extras-commits at redhat.com Fri Aug 19 14:15:33 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 19 Aug 2005 10:15:33 -0400 Subject: rpms/chkrootkit/FC-4 chkrootkit.spec,1.11,1.12 Message-ID: <200508191416.j7JEG3xc018785@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/chkrootkit/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18732/FC-4 Modified Files: chkrootkit.spec Log Message: Index: chkrootkit.spec =================================================================== RCS file: /cvs/extras/rpms/chkrootkit/FC-4/chkrootkit.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- chkrootkit.spec 19 Aug 2005 13:54:55 -0000 1.11 +++ chkrootkit.spec 19 Aug 2005 14:15:31 -0000 1.12 @@ -54,7 +54,7 @@ cat << EOF > .tmp.chkrootkit.sbin #! /bin/sh cd %{_libdir}/%{name}-%{version} -./chkrootkit "\$@" +exec ./chkrootkit "\$@" EOF install -p -D -m0755 .tmp.chkrootkit.sbin ${RPM_BUILD_ROOT}%{_sbindir}/chkrootkit From fedora-extras-commits at redhat.com Fri Aug 19 15:34:52 2005 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Fri, 19 Aug 2005 11:34:52 -0400 Subject: web/include navigation.inc,1.9,1.10 Message-ID: <200508191534.j7JFYqCo022013@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/fedora/web/include In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21993/include Modified Files: navigation.inc Log Message: let's try to clean up the noise Index: navigation.inc =================================================================== RCS file: /cvs/fedora/web/include/navigation.inc,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- navigation.inc 17 Aug 2005 07:38:52 -0000 1.9 +++ navigation.inc 19 Aug 2005 15:34:49 -0000 1.10 @@ -23,7 +23,6 @@ "Documentation"=>array("uri"=>"/docs/","sub"=>array( "Release Notes"=>array("uri"=>"/docs/release-notes/"), "Installation Guide"=>array("uri"=>"/docs/fedora-install-guide-en/"), - //"Yum"=>array("uri"=>"/docs/yum/","sub"=>array( "Managing Software With Yum"=>array("uri"=>"/docs/yum/index.php"), "Jargon Buster"=>array("uri"=>"/docs/jargon-buster/"), "SELinux FAQ"=>array("uri"=>"/docs/selinux-faq/") From fedora-extras-commits at redhat.com Fri Aug 19 15:59:05 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 19 Aug 2005 11:59:05 -0400 Subject: rpms/kile/FC-3 kile.spec,1.7,1.8 Message-ID: <200508191559.j7JFx5O4023880@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/kile/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23841/FC-3 Modified Files: kile.spec Log Message: sync w/-devel branch Index: kile.spec =================================================================== RCS file: /cvs/extras/rpms/kile/FC-3/kile.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- kile.spec 18 Aug 2005 20:48:37 -0000 1.7 +++ kile.spec 19 Aug 2005 15:59:03 -0000 1.8 @@ -3,7 +3,7 @@ Name: kile Summary: (La)TeX source editor and TeX shell Version: 1.8.1 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Applications/Publishing @@ -18,15 +18,12 @@ #Requires: gnuplot #Requires: xfig -# For Extras, not really needed -- Rex -%if 0 BuildRequires: qt-devel >= 1:3.3 %define qt_ver %{expand:%%(rpm -q --qf '%%{VERSION}' qt-devel )} Requires: qt >= 1:%{qt_ver} BuildRequires: kdelibs-devel >= 6:3.3 %define kdelibs_ver %{expand:%%(rpm -q --qf '%%{VERSION}' kdelibs-devel )} Requires: kdelibs >= 6:%{kdelibs_ver} -%endif # kile-i18n is no longer separate pkg Obsoletes: kile-i18n < %{version}-%{release} @@ -107,9 +104,8 @@ %changelog -* Thu Aug 18 2005 Rex Dieter 1.8.1-2 +* Thu Aug 18 2005 Rex Dieter 1.8.1-3 - fix broken Obsoletes (#166300) -- drop paranoid qt/kdelibs Req's * Thu Jun 02 2005 Rex Dieter 1.8.1-1 - 1.8.1 From fedora-extras-commits at redhat.com Fri Aug 19 15:59:06 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 19 Aug 2005 11:59:06 -0400 Subject: rpms/kile/FC-4 kile.spec,1.10,1.11 Message-ID: <200508191559.j7JFx6WL023887@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/kile/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23841/FC-4 Modified Files: kile.spec Log Message: sync w/-devel branch Index: kile.spec =================================================================== RCS file: /cvs/extras/rpms/kile/FC-4/kile.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- kile.spec 18 Aug 2005 20:48:37 -0000 1.10 +++ kile.spec 19 Aug 2005 15:59:04 -0000 1.11 @@ -3,7 +3,7 @@ Name: kile Summary: (La)TeX source editor and TeX shell Version: 1.8.1 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Applications/Publishing @@ -18,15 +18,12 @@ #Requires: gnuplot #Requires: xfig -# For Extras, not really needed -- Rex -%if 0 BuildRequires: qt-devel >= 1:3.3 %define qt_ver %{expand:%%(rpm -q --qf '%%{VERSION}' qt-devel )} Requires: qt >= 1:%{qt_ver} BuildRequires: kdelibs-devel >= 6:3.3 %define kdelibs_ver %{expand:%%(rpm -q --qf '%%{VERSION}' kdelibs-devel )} Requires: kdelibs >= 6:%{kdelibs_ver} -%endif # kile-i18n is no longer separate pkg Obsoletes: kile-i18n < %{version}-%{release} @@ -107,9 +104,8 @@ %changelog -* Thu Aug 18 2005 Rex Dieter 1.8.1-2 +* Thu Aug 18 2005 Rex Dieter 1.8.1-3 - fix broken Obsoletes (#166300) -- drop paranoid qt/kdelibs Req's * Thu Jun 02 2005 Rex Dieter 1.8.1-1 - 1.8.1 From fedora-extras-commits at redhat.com Fri Aug 19 16:43:05 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Fri, 19 Aug 2005 12:43:05 -0400 Subject: rpms/plt-scheme/FC-4 plt-scheme.spec,1.5,1.6 Message-ID: <200508191643.j7JGh5XO025437@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/plt-scheme/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25420 Modified Files: plt-scheme.spec Log Message: Index: plt-scheme.spec =================================================================== RCS file: /cvs/extras/rpms/plt-scheme/FC-4/plt-scheme.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- plt-scheme.spec 16 Aug 2005 21:46:36 -0000 1.5 +++ plt-scheme.spec 19 Aug 2005 16:43:03 -0000 1.6 @@ -1,6 +1,6 @@ Name: plt-scheme Version: 299.200 -Release: 3%{?dist} +Release: 5%{?dist} Summary: Graphical environment for developing programs using Scheme Group: Development/Languages @@ -11,9 +11,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: XFree86-devel, libpng-devel, freetype-devel, fontconfig-devel, libjpeg-devel BuildRequires: zlib-devel, openssl-devel -BuildRequires: desktop-file-utils, sed +BuildRequires: desktop-file-utils Obsoletes: plt, drscheme Provides: plt-scheme, drscheme, mzscheme, mred, mrflow +ExcludeArch: x86_64 %description @@ -44,6 +45,8 @@ %build cd src %configure --enable-gl --enable-xrender --enable-xft +# increase default font size +sed -i -e "s|fsize = 10|fsize = 12|" wxxt/src/Application/AppMain.cc make %{?_smp_mflags} %install @@ -115,6 +118,9 @@ %changelog +* Wed Aug 17 2005 Gerard Milmeister - 299.200-4 +- Increase font size from 10 to 12 + * Tue Aug 16 2005 Gerard Milmeister - 299.200-3 - Added openssl-devel buildreq From fedora-extras-commits at redhat.com Fri Aug 19 16:49:55 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Fri, 19 Aug 2005 12:49:55 -0400 Subject: rpms/plt-scheme/FC-3 plt-scheme.spec,1.4,1.5 Message-ID: <200508191649.j7JGntEm025541@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/plt-scheme/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25524 Modified Files: plt-scheme.spec Log Message: Index: plt-scheme.spec =================================================================== RCS file: /cvs/extras/rpms/plt-scheme/FC-3/plt-scheme.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- plt-scheme.spec 16 Aug 2005 21:47:42 -0000 1.4 +++ plt-scheme.spec 19 Aug 2005 16:49:53 -0000 1.5 @@ -1,6 +1,6 @@ Name: plt-scheme Version: 299.200 -Release: 3%{?dist} +Release: 5%{?dist} Summary: Graphical environment for developing programs using Scheme Group: Development/Languages @@ -11,9 +11,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: XFree86-devel, libpng-devel, freetype-devel, fontconfig-devel, libjpeg-devel BuildRequires: zlib-devel, openssl-devel -BuildRequires: desktop-file-utils, sed +BuildRequires: desktop-file-utils Obsoletes: plt, drscheme Provides: plt-scheme, drscheme, mzscheme, mred, mrflow +ExcludeArch: x86_64 %description @@ -44,6 +45,8 @@ %build cd src %configure --enable-gl --enable-xrender --enable-xft +# increase default font size +sed -i -e "s|fsize = 10|fsize = 12|" wxxt/src/Application/AppMain.cc make %{?_smp_mflags} %install @@ -115,6 +118,9 @@ %changelog +* Wed Aug 17 2005 Gerard Milmeister - 299.200-4 +- Increase font size from 10 to 12 + * Tue Aug 16 2005 Gerard Milmeister - 299.200-3 - Added openssl-devel buildreq From fedora-extras-commits at redhat.com Fri Aug 19 16:56:05 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Fri, 19 Aug 2005 12:56:05 -0400 Subject: rpms/plt-scheme/devel plt-scheme.spec,1.5,1.6 Message-ID: <200508191656.j7JGu5tp025604@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/plt-scheme/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25587/devel Modified Files: plt-scheme.spec Log Message: Index: plt-scheme.spec =================================================================== RCS file: /cvs/extras/rpms/plt-scheme/devel/plt-scheme.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- plt-scheme.spec 16 Aug 2005 21:48:28 -0000 1.5 +++ plt-scheme.spec 19 Aug 2005 16:56:03 -0000 1.6 @@ -1,6 +1,6 @@ Name: plt-scheme Version: 299.200 -Release: 3%{?dist} +Release: 5%{?dist} Summary: Graphical environment for developing programs using Scheme Group: Development/Languages @@ -11,9 +11,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: XFree86-devel, libpng-devel, freetype-devel, fontconfig-devel, libjpeg-devel BuildRequires: zlib-devel, openssl-devel -BuildRequires: desktop-file-utils, sed +BuildRequires: desktop-file-utils Obsoletes: plt, drscheme Provides: plt-scheme, drscheme, mzscheme, mred, mrflow +ExcludeArch: x86_64 %description @@ -44,6 +45,8 @@ %build cd src %configure --enable-gl --enable-xrender --enable-xft +# increase default font size +sed -i -e "s|fsize = 10|fsize = 12|" wxxt/src/Application/AppMain.cc make %{?_smp_mflags} %install @@ -115,6 +118,9 @@ %changelog +* Wed Aug 17 2005 Gerard Milmeister - 299.200-4 +- Increase font size from 10 to 12 + * Tue Aug 16 2005 Gerard Milmeister - 299.200-3 - Added openssl-devel buildreq From fedora-extras-commits at redhat.com Fri Aug 19 17:09:05 2005 From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields)) Date: Fri, 19 Aug 2005 13:09:05 -0400 Subject: rpms/nautilus-open-terminal/devel nautilus-open-terminal-0.4-gtk+extravar.patch, NONE, 1.1 nautilus-open-terminal.spec, 1.3, 1.4 Message-ID: <200508191709.j7JH95v6026870@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/extras/rpms/nautilus-open-terminal/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26850 Modified Files: nautilus-open-terminal.spec Added Files: nautilus-open-terminal-0.4-gtk+extravar.patch Log Message: Patch to include missing header and remove unused variable (#166346) nautilus-open-terminal-0.4-gtk+extravar.patch: --- NEW FILE nautilus-open-terminal-0.4-gtk+extravar.patch --- diff -uNr nautilus-open-terminal-0.4-original/src/nautilus-open-terminal.c nautilus-open-terminal-0.4/src/nautilus-open-terminal.c --- nautilus-open-terminal-0.4-original/src/nautilus-open-terminal.c 2005-07-08 15:11:54.000000000 -0400 +++ nautilus-open-terminal-0.4/src/nautilus-open-terminal.c 2005-08-19 12:44:22.000000000 -0400 @@ -30,6 +30,7 @@ #include #include +#include #include #include #include @@ -217,7 +218,6 @@ NautilusFileInfo *file_info) { NautilusMenuItem *item; - gboolean is_desktop; TerminalFileInfo terminal_file_info; terminal_file_info = get_terminal_file_info (file_info); Index: nautilus-open-terminal.spec =================================================================== RCS file: /cvs/extras/rpms/nautilus-open-terminal/devel/nautilus-open-terminal.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- nautilus-open-terminal.spec 17 Aug 2005 14:01:05 -0000 1.3 +++ nautilus-open-terminal.spec 19 Aug 2005 17:09:03 -0000 1.4 @@ -7,6 +7,7 @@ License: GPL URL: http://manny.cluecoder.org/packages/nautilus-open-terminal/ Source0: http://manny.cluecoder.org/packages/nautilus-open-terminal/%{name}-%{version}.tar.gz +Patch0: nautilus-open-terminal-0.4-gtk+extravar.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gnome-desktop-devel @@ -21,6 +22,7 @@ %prep %setup -q +%patch0 -p1 %build @@ -49,6 +51,7 @@ %changelog * Wed Aug 17 2005 Paul W. Frields - 0.4-6 - Rebuild against new cairo +- Include and remove unused variable (#166346) * Sun Jul 17 2005 Paul W. Frields - 0.4-5 - Add libtoolize to fix multilib problem (#163463) From fedora-extras-commits at redhat.com Fri Aug 19 17:15:54 2005 From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl)) Date: Fri, 19 Aug 2005 13:15:54 -0400 Subject: rpms/mail-notification/devel mail-notification.spec,1.8,1.9 Message-ID: <200508191715.j7JHFssD026950@cvs-int.fedora.redhat.com> Author: thl Update of /cvs/extras/rpms/mail-notification/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26933 Modified Files: mail-notification.spec Log Message: rebuild Index: mail-notification.spec =================================================================== RCS file: /cvs/extras/rpms/mail-notification/devel/mail-notification.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- mail-notification.spec 14 Aug 2005 18:03:09 -0000 1.8 +++ mail-notification.spec 19 Aug 2005 17:15:52 -0000 1.9 @@ -1,6 +1,6 @@ Name: mail-notification Version: 2.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Status icon that informs you if you have new mail Group: Applications/Internet @@ -113,6 +113,9 @@ %changelog +* Fri Aug 19 2005 Thorsten Leemhuis - 2.0-2 +- rebuild + * Wed Aug 10 2005 Thorsten Leemhuis - 2.0-1 - Update to 2.0 -- build without evolution support for now (seems it needs the whole evo-source) From fedora-extras-commits at redhat.com Fri Aug 19 17:45:55 2005 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Fri, 19 Aug 2005 13:45:55 -0400 Subject: rpms/gazpacho/devel gazpacho-0.6.1-installroot.patch, NONE, 1.1 gazpacho-0.6.1-nox.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 gazpacho.spec, 1.11, 1.12 sources, 1.6, 1.7 Message-ID: <200508191745.j7JHjtqH027091@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/extras/rpms/gazpacho/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27062 Modified Files: .cvsignore gazpacho.spec sources Added Files: gazpacho-0.6.1-installroot.patch gazpacho-0.6.1-nox.patch Log Message: update to 0.6.1. add patch from upstream svn to fix where __installed__ gets created. patch build to not require X. hack around brp-python-bytecompile creating .py[co] files in %{_docdir} gazpacho-0.6.1-installroot.patch: --- NEW FILE gazpacho-0.6.1-installroot.patch --- Index: setup.py =================================================================== --- setup.py (revision 1656) +++ setup.py (revision 1657) @@ -60,20 +60,9 @@ glade_dir = os.path.join(prefix, 'share', 'gazpacho', 'glade') docs_dir = os.path.join(prefix, 'share', 'doc', 'gazpacho') ''' - filename = os.path.join(self.build_dir, 'gazpacho', + filename = os.path.join(self.install_dir, 'gazpacho', '__installed__.py') install = self.distribution.get_command_obj('install') - # Overkill: Don't generate the file if we have the same prefix - if (os.path.exists(filename) and not newer(__file__, filename)): - d = {} - try: - # This may have security implications, but do we care? - execfile(filename, {}, d) - except Exception, e: - raise SystemExit('Error: %s' % e) - if d.get('prefix') == install.prefix: - return install_lib.install(self) - self.mkpath(os.path.dirname(filename)) fp = open(filename, 'w') fp.write(installed_template % dict(prefix=install.prefix)) gazpacho-0.6.1-nox.patch: --- NEW FILE gazpacho-0.6.1-nox.patch --- --- gazpacho-0.6.1/setup.py.nox 2005-08-15 11:56:27.000000000 -0400 +++ gazpacho-0.6.1/setup.py 2005-08-15 11:56:42.000000000 -0400 @@ -9,8 +9,6 @@ import sys import shutil -from gazpacho import application - def listfiles(*dirs): dir, pattern = os.path.split(os.path.join(*dirs)) return [os.path.join(dir, filename) @@ -108,7 +106,7 @@ ['gazpacho.desktop'])) setup(name='gazpacho', - version=application.__version__, + version="0.6.1", description='GTK+ GUI Designer', author='SICEm S.L.', author_email='lgs at sicem.biz', Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gazpacho/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 15 Apr 2005 02:33:11 -0000 1.6 +++ .cvsignore 19 Aug 2005 17:45:53 -0000 1.7 @@ -1 +1 @@ -gazpacho-0.5.3.tar.bz2 +gazpacho-0.6.1.tar.bz2 Index: gazpacho.spec =================================================================== RCS file: /cvs/extras/rpms/gazpacho/devel/gazpacho.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- gazpacho.spec 15 Apr 2005 02:37:11 -0000 1.11 +++ gazpacho.spec 19 Aug 2005 17:45:53 -0000 1.12 @@ -2,25 +2,38 @@ Summary: Glade Interface Creator Name: gazpacho -Version: 0.5.3 -Release: 2 +Version: 0.6.1 +Release: 1%{?dist} License: GPL Group: Development/Tools URL: http://gazpacho.sicem.biz/ Provides: Gazpacho = %{version}-%{release} Source0: ftp://ftp.gnome.org/pub/gnome/sources/gazpacho/gazpacho-%{version}.tar.bz2 +Patch0: gazpacho-0.6.1-nox.patch +# already upstream, remove for next release +Patch1: gazpacho-0.6.1-installroot.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildArch: noarch Requires: pygtk2 >= 2.4.0, pygtk2-libglade Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") +# hrm, the brp-python-bytecompile will byte-compile docs stuff too +# which is probably not what we want +%define __os_install_post \ + [ -x /usr/lib/rpm/brp-python-bytecompile ] && /usr/lib/rpm/brp-python-bytecompile \ + rm -f $RPM_BUILD_ROOT/%{_docdir}/gazpacho/examples/*.py[co] \ +%{nil} + + %description This program allows you to create the Graphical User Interface (GUI) of your GTK+ program in a visual way. Yes, it is a Glade-3 clone. It is compatible with libglade. %prep -%setup -q -n Gazpacho-%{version} +%setup -q +%patch0 -p1 -b .nox +%patch1 -p0 %build python ./setup.py build @@ -38,10 +51,16 @@ %files -f %{name}-%{version}.files %defattr(-,root,root,-) -%doc README COPYING NEWS +%doc README COPYING NEWS +# this will go away in the next version +/usr/lib/gazpacho/widgets/gtk+.py[co] +%{python_sitelib}/gazpacho/__installed__.py* %changelog +* Fri Aug 19 2005 Jeremy Katz - 0.6.1 +- update to 0.6.1 + * Thu Apr 14 2005 Jeremy Katz - 0.5.3-2 - rebuild for devel Index: sources =================================================================== RCS file: /cvs/extras/rpms/gazpacho/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 15 Apr 2005 02:33:11 -0000 1.6 +++ sources 19 Aug 2005 17:45:53 -0000 1.7 @@ -1 +1 @@ -2116623fc44d11fc775679d2f5d25c6a gazpacho-0.5.3.tar.bz2 +71c53c5ada604c729233ea0b0bcb731e gazpacho-0.6.1.tar.bz2 From fedora-extras-commits at redhat.com Fri Aug 19 18:48:45 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Fri, 19 Aug 2005 14:48:45 -0400 Subject: extras-buildsys ChangeLog,1.97.2.4,1.97.2.5 Message-ID: <200508191849.j7JInFlO028437@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28405 Modified Files: Tag: STABLE_0_3 ChangeLog Log Message: 2005-08-19 Dan Williams * server/Repo.py server/CONFIG.py - Add repo script capability, where a random script gets run after createrepo Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.97.2.4 retrieving revision 1.97.2.5 diff -u -r1.97.2.4 -r1.97.2.5 --- ChangeLog 15 Aug 2005 19:42:10 -0000 1.97.2.4 +++ ChangeLog 19 Aug 2005 18:48:43 -0000 1.97.2.5 @@ -1,3 +1,10 @@ +2005-08-19 Dan Williams + + * server/Repo.py + server/CONFIG.py + - Add repo script capability, where a random script + gets run after createrepo + 2005-08-15 Dan Williams * server/BuildMaster.py From fedora-extras-commits at redhat.com Fri Aug 19 18:48:46 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Fri, 19 Aug 2005 14:48:46 -0400 Subject: extras-buildsys/server CONFIG.py, 1.21, 1.21.2.1 Repo.py, 1.11, 1.11.2.1 Message-ID: <200508191849.j7JInGWV028441@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28405/server Modified Files: Tag: STABLE_0_3 CONFIG.py Repo.py Log Message: 2005-08-19 Dan Williams * server/Repo.py server/CONFIG.py - Add repo script capability, where a random script gets run after createrepo Index: CONFIG.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/Attic/CONFIG.py,v retrieving revision 1.21 retrieving revision 1.21.2.1 diff -u -r1.21 -r1.21.2.1 --- CONFIG.py 25 Jul 2005 19:47:15 -0000 1.21 +++ CONFIG.py 19 Aug 2005 18:48:43 -0000 1.21.2.1 @@ -7,6 +7,7 @@ config_opts['make_cmd'] = "/usr/bin/make" config_opts['log_url'] = "http://foo.foo.org/logs/" config_opts['guest_allowed'] = True +config_opts['repo_script'] = '' # Index: Repo.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/Repo.py,v retrieving revision 1.11 retrieving revision 1.11.2.1 diff -u -r1.11 -r1.11.2.1 --- Repo.py 18 Jul 2005 21:11:27 -0000 1.11 +++ Repo.py 19 Aug 2005 18:48:43 -0000 1.11.2.1 @@ -19,6 +19,9 @@ import shutil import time import commands +import popen2 +import fcntl +import EmailUtils # Load in the config @@ -44,6 +47,16 @@ self._repo_additions = [] self._lock_count = 0 self._stop = False + + self._pobj = None + self._repo_script_start = 0 + try: + self._repo_script = config_opts['repo_script'] + if len(self._repo_script): + self._repo_script = None + except KeyError: + self._repo_script = None + threading.Thread.__init__(self) def target(self): @@ -91,27 +104,96 @@ if s != 0: print "Error: createrepo failed with exit status %d! Output: '%s'" % (s, o) + def _run_repo_script(self): + cmd = "%s %s" % (self._repo_script, self._target) + print "Repo '%s': executing repository script %s" % (self._target, self._repo_script) + self._pobj = popen2.Popen4(cmd=cmd) + fcntl.fcntl(self._pobj.fromchild.fileno(), fcntl.F_SETFL, os.O_NONBLOCK) + self._repo_script_start = time.time() + + def _email_repo_script_failure(self, subject): + admins = config_opts['admin_emails'] + msg = self._get_repo_script_output() + for addr in admins: + EmailUtils.email_result(addr, msg, subject) + + def _get_repo_script_output(self): + output = "" + while True: + try: + string = os.read(self._pobj.fromchild.fileno(), 1024) + if not len(string): + break + except OSError, e: + break + output = output + string + return output + + def _monitor_repo_script(self): + unlock = False + exit_status = self._pobj.poll() + if exit_status == 0: + print "Repo '%s': repo script %s done." % (self._target, self._repo_script) + unlock = True + elif exit_status > 0: + subj = "Repo '%s': repo script %s exited with error: %d." % (self._target, self._repo_script, exit_status) + self._email_repo_script_failure(subj) + print subj + unlock = True + else: + # If the repo script has been going for more than an hour, kill it + if time.time() > self._repo_script_start + (60 * 60): + try: + os.kill(self._pobj.pid, 9) + except OSError: + pass + subj = "Repo '%s': repo script %s timed out and was killed." % (self._target, self._repo_script) + self._email_repo_script_failure(subj) + print subj + unlock = True + + if unlock: + self._repo_script_start = 0 + self._lock_count = 0 + self._pobj = None def run(self): while self._stop == False: - # We have 2 lock levels. When the repo is in either, clients are prevented - # from starting their 'prep' state. Clients may already be in the 'prep' - # state when we lock the repo, therefore we don't actually enter lock level - # 2 until all clients have finished their 'prep' state. Only then do we - # copy RPMs to the repo and run createrepo on it. + # We have 3 lock levels: + # + # 0 - repo unlocked + # 1 - entered when jobs request packages to be copied to the repo; + # builders blocked from entering the 'prep' state + # 2 - entered when no builders are currently in the 'prep' state; + # packages copied to repo and createrepo is run + # 3 - entered when createrepo is done; repo script run prepping_builders = self._builder_manager.any_prepping_builders() self._lock.acquire() - # If the lock level is 2, update the repo + # Level 2: update the repo if self._lock_count == 2: print "Repo '%s': updating repository metadata..." % self._target self._update_repo() print "Repo '%s': Done updating." % self._target - self._lock_count = 0 - # Enter lock level 2 if there are no build clients in the + # If there's a repo script for this target, enter level 3 + if self._repo_script: + self._run_repo_script() + self._lock_count = 3 + else: + self._lock_count = 0 + + # Level 3: monitor the repo script + if self._lock_count == 3: + if self._pobj: + self._monitor_repo_script() + else: + # If for some reason self._pobj is None, unlock the repo + self._lock_count = 0 + + # Enter lock level 2 if there are no builders in the # 'prep' state and we are already at lock level 1 if not prepping_builders and self._lock_count == 1: self._lock_count = 2 From fedora-extras-commits at redhat.com Fri Aug 19 18:57:22 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 19 Aug 2005 14:57:22 -0400 Subject: rpms/xsupplicant/devel - New directory Message-ID: <200508191857.j7JIvMto028513@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/xsupplicant/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28492/xsupplicant/devel Log Message: Directory /cvs/extras/rpms/xsupplicant/devel added to the repository From fedora-extras-commits at redhat.com Fri Aug 19 18:57:22 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 19 Aug 2005 14:57:22 -0400 Subject: rpms/xsupplicant - New directory Message-ID: <200508191857.j7JIvMYp028515@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/xsupplicant In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28492/xsupplicant Log Message: Directory /cvs/extras/rpms/xsupplicant added to the repository From fedora-extras-commits at redhat.com Fri Aug 19 18:57:37 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 19 Aug 2005 14:57:37 -0400 Subject: rpms/xsupplicant Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200508191857.j7JIvbXO028564@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/xsupplicant In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28537 Added Files: Makefile import.log Log Message: Setup of module xsupplicant --- NEW FILE Makefile --- # Top level Makefile for module xsupplicant all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Fri Aug 19 18:57:38 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 19 Aug 2005 14:57:38 -0400 Subject: rpms/xsupplicant/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200508191857.j7JIvcj7028569@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/xsupplicant/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28537/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module xsupplicant --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Fri Aug 19 18:58:20 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 19 Aug 2005 14:58:20 -0400 Subject: rpms/xsupplicant import.log,1.1,1.2 Message-ID: <200508191858.j7JIwKVW028684@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/xsupplicant In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28653 Modified Files: import.log Log Message: auto-import xsupplicant-1.2-1 on branch devel from xsupplicant-1.2-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/xsupplicant/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 19 Aug 2005 18:57:35 -0000 1.1 +++ import.log 19 Aug 2005 18:58:18 -0000 1.2 @@ -0,0 +1 @@ +xsupplicant-1_2-1:HEAD:xsupplicant-1.2-1.src.rpm:1124477950 From fedora-extras-commits at redhat.com Fri Aug 19 18:58:21 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 19 Aug 2005 14:58:21 -0400 Subject: rpms/xsupplicant/devel xsupplicant.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200508191858.j7JIwLLZ028691@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/xsupplicant/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28653/devel Modified Files: .cvsignore sources Added Files: xsupplicant.spec Log Message: auto-import xsupplicant-1.2-1 on branch devel from xsupplicant-1.2-1.src.rpm --- NEW FILE xsupplicant.spec --- Name: xsupplicant Summary: Open Source Implementation of IEEE 802.1x Version: 1.2 Release: 1%{?dist} License: GPL Group: System Environment/Base URL: http://www.open1x.org/ Source0: http://download.sourceforge.net/open1x/xsupplicant-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: openssl-devel, bison, flex %description This software allows a GNU/Linux or BSD workstation to authenticate with a RADIUS server using 802.1x and various EAP protocols. The intended use is for computers with wireless LAN connections to complete a strong authentication before joining the network. %prep %setup -q perl -pi.orig -e 's|/lib\b|/%{_lib}|g' configure* %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install install -D -m0600 etc/xsupplicant.conf $RPM_BUILD_ROOT%{_sysconfdir}/xsupplicant.conf %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc AUTHORS COPYING README doc/html/ doc/txt/ doc/README* etc/*.conf %config(noreplace) %{_sysconfdir}/xsupplicant.conf %{_bindir}/config-parser %{_bindir}/xsup_monitor %{_bindir}/xsup_set_pwd %{_bindir}/xsup_get_state %{_sbindir}/xsupplicant %changelog * Fri Aug 19 2005 Tom "spot" Callaway 1.2-1 - bump to 1.2 final * Sat Aug 13 2005 Tom "spot" Callaway 1.2-0.1.pre1 - initial package for Fedora Extras Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xsupplicant/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 19 Aug 2005 18:57:36 -0000 1.1 +++ .cvsignore 19 Aug 2005 18:58:19 -0000 1.2 @@ -0,0 +1 @@ +xsupplicant-1.2.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/xsupplicant/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 19 Aug 2005 18:57:36 -0000 1.1 +++ sources 19 Aug 2005 18:58:19 -0000 1.2 @@ -0,0 +1 @@ +e1eee37899b49ed238648699d0a01c5b xsupplicant-1.2.tar.gz From fedora-extras-commits at redhat.com Fri Aug 19 18:59:26 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 19 Aug 2005 14:59:26 -0400 Subject: owners owners.list,1.101,1.102 Message-ID: <200508191859.j7JIxQup028742@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28725 Modified Files: owners.list Log Message: xsupplicant Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.101 retrieving revision 1.102 diff -u -r1.101 -r1.102 --- owners.list 19 Aug 2005 12:54:08 -0000 1.101 +++ owners.list 19 Aug 2005 18:59:24 -0000 1.102 @@ -948,6 +948,7 @@ Fedora Extras|xosd|On-screen display library for X|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|xplanet|Render a planetary image into an X window|jylitalo at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|xprobe2|An active operating system fingerprinting tool|lmacken at redhat.com|extras-qa at fedoraproject.org| +Fedora Extras|xsupplicant|Open Source Implementation of IEEE 802.1x|tcallawa at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|xtide|A program for calculating tide all over the world|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|xvattr|Utility for getting and setting Xv attributes|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|yap|High-performance Prolog Compiler|gemi at bluewin.ch|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Fri Aug 19 19:34:58 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Fri, 19 Aug 2005 15:34:58 -0400 Subject: extras-buildsys ChangeLog,1.97.2.5,1.97.2.6 Message-ID: <200508191935.j7JJZS07030378@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30346 Modified Files: Tag: STABLE_0_3 ChangeLog Log Message: 2005-08-19 Dan Williams Patch from Ignacio Vazquez-Abrams * server/PackageJob.py - (make_job_log_url): Only show one slash in the log URL Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.97.2.5 retrieving revision 1.97.2.6 diff -u -r1.97.2.5 -r1.97.2.6 --- ChangeLog 19 Aug 2005 18:48:43 -0000 1.97.2.5 +++ ChangeLog 19 Aug 2005 19:34:56 -0000 1.97.2.6 @@ -1,5 +1,11 @@ 2005-08-19 Dan Williams + Patch from Ignacio Vazquez-Abrams + * server/PackageJob.py + - (make_job_log_url): Only show one slash in the log URL + +2005-08-19 Dan Williams + * server/Repo.py server/CONFIG.py - Add repo script capability, where a random script From fedora-extras-commits at redhat.com Fri Aug 19 19:34:59 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Fri, 19 Aug 2005 15:34:59 -0400 Subject: extras-buildsys/server PackageJob.py,1.21,1.21.2.1 Message-ID: <200508191935.j7JJZTUw030381@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30346/server Modified Files: Tag: STABLE_0_3 PackageJob.py Log Message: 2005-08-19 Dan Williams Patch from Ignacio Vazquez-Abrams * server/PackageJob.py - (make_job_log_url): Only show one slash in the log URL Index: PackageJob.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/PackageJob.py,v retrieving revision 1.21 retrieving revision 1.21.2.1 diff -u -r1.21 -r1.21.2.1 --- PackageJob.py 6 Aug 2005 17:58:34 -0000 1.21 +++ PackageJob.py 19 Aug 2005 19:34:57 -0000 1.21.2.1 @@ -102,7 +102,11 @@ def make_job_log_url(target, uid, name, ver, release): if target and uid and name and ver and release: - return "%s/%s/%s-%s-%s-%s/" % (config_opts['log_url'], target, uid, name, ver, release) + if config_opts['log_url'].endswith('/'): + slash='' + else: + slash='/' + return "%s%s%s/%s-%s-%s-%s/" % (config_opts['log_url'], slash, target, uid, name, ver, release) return None From fedora-extras-commits at redhat.com Fri Aug 19 19:50:44 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Fri, 19 Aug 2005 15:50:44 -0400 Subject: extras-buildsys plague.spec,1.24.2.2,1.24.2.3 Message-ID: <200508191950.j7JJoisN030486@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30469 Modified Files: Tag: STABLE_0_3 plague.spec Log Message: * Mon Aug 15 2005 Dan Williams 0.3.3-1 - Version 0.3.3 o Add repo script support o Fix double-slashes in log URL (Ignacio Vazquez-Abrams) o Clear out old job info when requeueing jobs Index: plague.spec =================================================================== RCS file: /cvs/fedora/extras-buildsys/plague.spec,v retrieving revision 1.24.2.2 retrieving revision 1.24.2.3 diff -u -r1.24.2.2 -r1.24.2.3 --- plague.spec 15 Aug 2005 19:42:10 -0000 1.24.2.2 +++ plague.spec 19 Aug 2005 19:50:42 -0000 1.24.2.3 @@ -2,8 +2,8 @@ Summary: Distributed build system for RPMs Name: plague -Version: 0.3.2 -Release: 3%{?dist} +Version: 0.3.3 +Release: 1%{?dist} License: GPL Group: Development/Tools Source: http://people.redhat.com/dcbw/plague/%{name}-%{version}.tar.bz2 @@ -146,6 +146,12 @@ %changelog +* Mon Aug 15 2005 Dan Williams 0.3.3-1 +- Version 0.3.3 + o Add repo script support + o Fix double-slashes in log URL (Ignacio Vazquez-Abrams) + o Clear out old job info when requeueing jobs + * Mon Aug 15 2005 Dan Williams 0.3.2-3 - Clear out old job info when requeueing jobs From fedora-extras-commits at redhat.com Fri Aug 19 19:51:28 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Fri, 19 Aug 2005 15:51:28 -0400 Subject: extras-buildsys ChangeLog,1.97.2.6,1.97.2.7 Message-ID: <200508191951.j7JJpSF6030514@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30497 Modified Files: Tag: STABLE_0_3 ChangeLog Log Message: 2005-08-19 Dan Williams * Tag plague-0_3_3_RELEASE Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.97.2.6 retrieving revision 1.97.2.7 diff -u -r1.97.2.6 -r1.97.2.7 --- ChangeLog 19 Aug 2005 19:34:56 -0000 1.97.2.6 +++ ChangeLog 19 Aug 2005 19:51:26 -0000 1.97.2.7 @@ -1,5 +1,9 @@ 2005-08-19 Dan Williams + * Tag plague-0_3_3_RELEASE + +2005-08-19 Dan Williams + Patch from Ignacio Vazquez-Abrams * server/PackageJob.py - (make_job_log_url): Only show one slash in the log URL From fedora-extras-commits at redhat.com Fri Aug 19 21:35:30 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Fri, 19 Aug 2005 17:35:30 -0400 Subject: owners owners.list,1.102,1.103 Message-ID: <200508192135.j7JLZUbP000785@cvs-int.fedora.redhat.com> Author: wtogami Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv763 Modified Files: owners.list Log Message: synce is now orphaned Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.102 retrieving revision 1.103 diff -u -r1.102 -r1.103 --- owners.list 19 Aug 2005 18:59:24 -0000 1.102 +++ owners.list 19 Aug 2005 21:35:28 -0000 1.103 @@ -824,7 +824,7 @@ Fedora Extras|sylpheed-claws|The bleeding edge branch of Sylpheed|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|sylpheed|GTK+ based, lightweight, and fast email client|bugs.michael at gmx.net|extras-qa at fedoraproject.org| Fedora Extras|synaptic|Graphical frontend for APT package manager|pmatilai at laiskiainen.org|extras-qa at fedoraproject.org| -Fedora Extras|synce|For bugs related to the synce component|gafton at redhat.com|extras-qa at fedoraproject.org| +Fedora Extras|synce|For bugs related to the synce component|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|synergy|Mouse and keyboard sharing utility|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|syslog-ng|Syslog replacement daemon|jpo at di.uminho.pt|extras-qa at fedoraproject.org| Fedora Extras|system-switch-im|A utility for switching default IIIMF to XIM servers|llch at redhat.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Fri Aug 19 22:49:10 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Fri, 19 Aug 2005 18:49:10 -0400 Subject: rpms/sylpheed-claws-plugins - New directory Message-ID: <200508192249.j7JMnAKS002125@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/sylpheed-claws-plugins In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2101/sylpheed-claws-plugins Log Message: Directory /cvs/extras/rpms/sylpheed-claws-plugins added to the repository From fedora-extras-commits at redhat.com Fri Aug 19 22:49:10 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Fri, 19 Aug 2005 18:49:10 -0400 Subject: rpms/sylpheed-claws-plugins/devel - New directory Message-ID: <200508192249.j7JMnApk002130@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/sylpheed-claws-plugins/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2101/sylpheed-claws-plugins/devel Log Message: Directory /cvs/extras/rpms/sylpheed-claws-plugins/devel added to the repository From fedora-extras-commits at redhat.com Fri Aug 19 22:49:47 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Fri, 19 Aug 2005 18:49:47 -0400 Subject: rpms/sylpheed-claws-plugins Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200508192249.j7JMnlOW002177@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/sylpheed-claws-plugins In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2146 Added Files: Makefile import.log Log Message: Setup of module sylpheed-claws-plugins --- NEW FILE Makefile --- # Top level Makefile for module sylpheed-claws-plugins all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Fri Aug 19 22:49:48 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Fri, 19 Aug 2005 18:49:48 -0400 Subject: rpms/sylpheed-claws-plugins/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200508192249.j7JMnmZj002183@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/sylpheed-claws-plugins/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2146/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module sylpheed-claws-plugins --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Fri Aug 19 22:51:29 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Fri, 19 Aug 2005 18:51:29 -0400 Subject: rpms/sylpheed-claws-plugins import.log,1.1,1.2 Message-ID: <200508192251.j7JMpxmO002248@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/sylpheed-claws-plugins In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2213 Modified Files: import.log Log Message: auto-import sylpheed-claws-plugins-1.9.13-3 on branch devel from sylpheed-claws-plugins-1.9.13-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws-plugins/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 19 Aug 2005 22:49:45 -0000 1.1 +++ import.log 19 Aug 2005 22:51:26 -0000 1.2 @@ -0,0 +1 @@ +sylpheed-claws-plugins-1_9_13-3:HEAD:sylpheed-claws-plugins-1.9.13-3.src.rpm:1124491874 From fedora-extras-commits at redhat.com Fri Aug 19 22:51:29 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Fri, 19 Aug 2005 18:51:29 -0400 Subject: rpms/sylpheed-claws-plugins/devel sylpheed-claws-plugins.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200508192251.j7JMpTih002243@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/sylpheed-claws-plugins/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2213/devel Modified Files: .cvsignore sources Added Files: sylpheed-claws-plugins.spec Log Message: auto-import sylpheed-claws-plugins-1.9.13-3 on branch devel from sylpheed-claws-plugins-1.9.13-3.src.rpm --- NEW FILE sylpheed-claws-plugins.spec --- Name: sylpheed-claws-plugins Version: 1.9.13 Release: 3 Summary: Additional plugins for sylpheed-claws Group: Applications/Internet License: GPL URL: http://claws.sylpheed.org Source0: http://dl.sf.net/sylpheed-claws/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: sylpheed-claws-devel >= %{version} BuildRequires: glib2-devel BuildRequires: gtk2-devel BuildRequires: libetpan-devel BuildRequires: perl %ifnarch x86_64 BuildRequires: synce-devel %endif Requires: %{name}-cachesaver = %{version}-%{release} Requires: %{name}-etpan-privacy = %{version}-%{release} Requires: %{name}-fetchinfo = %{version}-%{release} Requires: %{name}-maildir = %{version}-%{release} Requires: %{name}-mailmbox = %{version}-%{release} Requires: %{name}-perl = %{version}-%{release} %ifnarch x86_64 Requires: %{name}-synce = %{version}-%{release} %endif Requires: %{name}-vcalendar = %{version}-%{release} %description Additional plugins for sylpheed-claws %package cachesaver Summary: A cache saving plugin Group: Applications/Internet Requires: sylpheed-claws >= %{version} %description cachesaver This plugin saves the caches every 60 seconds (or user-defined period). It helps avoiding the loss of metadata on crashes. %package etpan-privacy Summary: Privacy plugin for sylpheed-claws Group: Applications/Internet Requires: sylpheed-claws >= %{version} %description etpan-privacy This allows to use the privacy architecture of etPan!, so that drivers implemented for etPan! can be immediately used in sylpheed-claws. %package fetchinfo Summary: Inserts headers containing some download information Group: Applications/Internet Requires: sylpheed-claws >= %{version} %description fetchinfo This plugin inserts headers containing some download information: UIDL, Sylpheeds account name, POP server, user ID and retrieval time. %package maildir Summary: Provide direct access to Maildir++ Mailboxes Group: Applications/Internet Requires: sylpheed-claws >= %{version} %description maildir The Maildir++ plugin for Sylpheed-Claws provides direct access to Maildir++ Mailboxes used by IMAP-Servers like Courier-IMAP, BincIMAP or Dovecot without having all the IMAP overhead of a connection to 'localhost' %package mailmbox Summary: Support for mailboxes in mbox format Group: Applications/Internet Requires: sylpheed-claws >= %{version} %description mailmbox This plugin provides direct support for mailboxes in mbox format. %package perl Summary: Extended filtering engine Group: Applications/Internet Requires: sylpheed-claws >= %{version} Requires: perl %description perl This plugin provides an extended filtering engine for the email client sylpheed-claws. It allows for the use of full perl power in email filters. %ifnarch x86_64 %package synce Summary: Keeping the addressbook of a Windows CE device in sync Group: Applications/Internet Requires: sylpheed-claws >= %{version} %description synce This plugin assists in keeping the addressbook of a Windows CE device (Pocket PC/ iPAQ, Smartphone etc) in sync with Claws' addressbook, with respect to email addresses. %endif %package vcalendar Summary: vCalendar message handling Group: Applications/Internet Requires: sylpheed-claws >= %{version} %description vcalendar This plugin enables vCalendar message handling like that produced by Evolution or Outlook. %prep %setup -q -c %build # cachesaver cd cachesaver-0.5 %configure --disable-static --disable-dependency-tracking %{__make} %{?_smp_mflags} #etpan-privacy cd ../etpan-privacy-0.9 %configure --disable-static --disable-dependency-tracking %{__make} %{?_smp_mflags} #fetchinfo-plugin cd ../fetchinfo-plugin-0.4.6 %configure --disable-static --disable-dependency-tracking %{__make} %{?_smp_mflags} #maildir cd ../maildir-0.8 %configure --disable-static --disable-dependency-tracking %{__make} %{?_smp_mflags} #mailmbox cd ../mailmbox-1.2 %configure --disable-static --disable-dependency-tracking %{__make} %{?_smp_mflags} #perl cd ../perl_plugin-0.3 %configure --disable-static --disable-dependency-tracking %{__make} %{?_smp_mflags} #synce %ifnarch x86_64 cd ../synce_plugin-0.2 %configure --disable-static --disable-dependency-tracking %{__make} %{?_smp_mflags} %endif #vcalendar cd ../vcalendar-1.6 %configure --disable-static --disable-dependency-tracking %{__make} %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT # cachesaver cd cachesaver-0.5 %{__make} install DESTDIR=$RPM_BUILD_ROOT #etpan-privacy cd ../etpan-privacy-0.9 %{__make} install DESTDIR=$RPM_BUILD_ROOT #fetchinfo-plugin cd ../fetchinfo-plugin-0.4.6 %{__make} install DESTDIR=$RPM_BUILD_ROOT #maildir cd ../maildir-0.8 %{__make} install DESTDIR=$RPM_BUILD_ROOT #mailmbox cd ../mailmbox-1.2 %{__make} install DESTDIR=$RPM_BUILD_ROOT #perl cd ../perl_plugin-0.3 %{__make} install DESTDIR=$RPM_BUILD_ROOT #synce %ifnarch x86_64 cd ../synce_plugin-0.2 %{__make} install DESTDIR=$RPM_BUILD_ROOT %endif #vcalendar cd ../vcalendar-1.6 %{__make} install DESTDIR=$RPM_BUILD_ROOT find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';' %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc README %files cachesaver %defattr(-,root,root,-) %doc cachesaver-0.5/AUTHORS %doc cachesaver-0.5/ChangeLog %doc cachesaver-0.5/COPYING %{_libdir}/sylpheed-claws/plugins/cachesaver* %files etpan-privacy %defattr(-,root,root,-) %doc etpan-privacy-0.9/AUTHORS %doc etpan-privacy-0.9/ChangeLog %doc etpan-privacy-0.9/COPYING %doc etpan-privacy-0.9/README %{_libdir}/sylpheed-claws/plugins/etpan-privacy.so %files fetchinfo %defattr(-,root,root,-) %doc fetchinfo-plugin-0.4.6/ChangeLog %doc fetchinfo-plugin-0.4.6/COPYING %doc fetchinfo-plugin-0.4.6/README %{_libdir}/sylpheed-claws/plugins/fetchinfo* %files maildir %defattr(-,root,root,-) %doc maildir-0.8/AUTHORS %doc maildir-0.8/ChangeLog %doc maildir-0.8/COPYING %doc maildir-0.8/README %doc maildir-0.8/doc/README.xml %{_libdir}/sylpheed-claws/plugins/maildir* %files mailmbox %defattr(-,root,root,-) %doc mailmbox-1.2/AUTHORS %doc mailmbox-1.2/ChangeLog %doc mailmbox-1.2/COPYING %doc mailmbox-1.2/README %{_libdir}/sylpheed-claws/plugins/mailmbox* %files perl %defattr(-,root,root,-) %doc perl_plugin-0.3/AUTHORS %doc perl_plugin-0.3/ChangeLog %doc perl_plugin-0.3/COPYING %doc perl_plugin-0.3/README %doc perl_plugin-0.3/sc_perl.pod %{_libdir}/sylpheed-claws/plugins/perl_plugin.so %ifnarch x86_64 %files synce %defattr(-,root,root,-) %doc synce_plugin-0.2/AUTHORS %doc synce_plugin-0.2/ChangeLog %doc synce_plugin-0.2/COPYING %doc synce_plugin-0.2/README %{_libdir}/sylpheed-claws/plugins/synce* %endif %files vcalendar %defattr(-,root,root,-) %doc vcalendar-1.6/AUTHORS %doc vcalendar-1.6/ChangeLog %doc vcalendar-1.6/COPYING %doc vcalendar-1.6/README %{_libdir}/sylpheed-claws/plugins/vcalendar.so %exclude %{_includedir}/ical.h %changelog * Sat Aug 20 2005 Andreas Bierfert 1.0.13-3 - exlude ical.h * Thu Aug 18 2005 Andreas Bierfert 1.9.13-2 - use setup macro (-c) - disable synce build on x86_64 for now (#148003) * Sun Jul 31 2005 Andreas Bierfert 1.9.13-1 - Initial Release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws-plugins/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 19 Aug 2005 22:49:45 -0000 1.1 +++ .cvsignore 19 Aug 2005 22:51:27 -0000 1.2 @@ -0,0 +1 @@ +sylpheed-claws-plugins-1.9.13.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws-plugins/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 19 Aug 2005 22:49:45 -0000 1.1 +++ sources 19 Aug 2005 22:51:27 -0000 1.2 @@ -0,0 +1 @@ +7eaef0d7a6d8fadbee17c04b5b6d5bbb sylpheed-claws-plugins-1.9.13.tar.gz From fedora-extras-commits at redhat.com Fri Aug 19 23:06:00 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Fri, 19 Aug 2005 19:06:00 -0400 Subject: rpms/sylpheed-claws-plugins/devel sylpheed-claws-plugins.spec, 1.1, 1.2 Message-ID: <200508192307.j7JN71aM003504@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/sylpheed-claws-plugins/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3481 Modified Files: sylpheed-claws-plugins.spec Log Message: - add dist tag- add dist tag Index: sylpheed-claws-plugins.spec =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws-plugins/devel/sylpheed-claws-plugins.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sylpheed-claws-plugins.spec 19 Aug 2005 22:51:27 -0000 1.1 +++ sylpheed-claws-plugins.spec 19 Aug 2005 23:05:58 -0000 1.2 @@ -1,6 +1,6 @@ Name: sylpheed-claws-plugins Version: 1.9.13 -Release: 3 +Release: 4%{?dist} Summary: Additional plugins for sylpheed-claws Group: Applications/Internet @@ -271,7 +271,11 @@ %changelog * Sat Aug 20 2005 Andreas Bierfert -1.0.13-3 +1.9.13-4 +- add dist tag + +* Sat Aug 20 2005 Andreas Bierfert +1.9.13-3 - exlude ical.h * Thu Aug 18 2005 Andreas Bierfert From fedora-extras-commits at redhat.com Fri Aug 19 23:55:04 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Fri, 19 Aug 2005 19:55:04 -0400 Subject: rpms/perl-Locale-gettext/devel perl-Locale-gettext.spec,1.1,1.2 Message-ID: <200508192355.j7JNt4jg003634@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Locale-gettext/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3617 Modified Files: perl-Locale-gettext.spec Log Message: Add Provides: perl-gettext (RH bugzilla PR 165885). Index: perl-Locale-gettext.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Locale-gettext/devel/perl-Locale-gettext.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Locale-gettext.spec 10 Aug 2005 06:54:53 -0000 1.1 +++ perl-Locale-gettext.spec 19 Aug 2005 23:55:02 -0000 1.2 @@ -1,6 +1,6 @@ Name: perl-Locale-gettext Version: 1.05 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Interface to gettext family of functions Group: Development/Libraries @@ -13,6 +13,9 @@ BuildRequires: gettext Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +# RH bugzilla PR 165885 +Provides: perl-gettext = %{version}-%{release} + %description The gettext module permits access from perl to the gettext() family of functions for retrieving message strings from databases constructed to @@ -53,6 +56,9 @@ %changelog +* Mon Aug 20 2005 Ralf Corsepius - 1.05-3 +- Add Provides: perl-gettext (RH bugzilla PR 165885). + * Tue Aug 09 2005 Ralf Corsepius - 1.05-2 - Add BuildRequires: gettext. From fedora-extras-commits at redhat.com Fri Aug 19 23:56:05 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Fri, 19 Aug 2005 19:56:05 -0400 Subject: rpms/perl-Locale-gettext/FC-4 perl-Locale-gettext.spec,1.1,1.2 Message-ID: <200508192356.j7JNu5mo003686@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Locale-gettext/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3669 Modified Files: perl-Locale-gettext.spec Log Message: Add Provides: perl-gettext (RH bugzilla PR 165885). Index: perl-Locale-gettext.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Locale-gettext/FC-4/perl-Locale-gettext.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Locale-gettext.spec 10 Aug 2005 06:54:53 -0000 1.1 +++ perl-Locale-gettext.spec 19 Aug 2005 23:56:02 -0000 1.2 @@ -1,6 +1,6 @@ Name: perl-Locale-gettext Version: 1.05 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Interface to gettext family of functions Group: Development/Libraries @@ -13,6 +13,9 @@ BuildRequires: gettext Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +# RH bugzilla PR 165885 +Provides: perl-gettext = %{version}-%{release} + %description The gettext module permits access from perl to the gettext() family of functions for retrieving message strings from databases constructed to @@ -53,6 +56,9 @@ %changelog +* Mon Aug 20 2005 Ralf Corsepius - 1.05-3 +- Add Provides: perl-gettext (RH bugzilla PR 165885). + * Tue Aug 09 2005 Ralf Corsepius - 1.05-2 - Add BuildRequires: gettext. From fedora-extras-commits at redhat.com Sat Aug 20 00:08:45 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Fri, 19 Aug 2005 20:08:45 -0400 Subject: rpms/perl-Regexp-Common - New directory Message-ID: <200508200008.j7K08jo6005046@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Regexp-Common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5022/perl-Regexp-Common Log Message: Directory /cvs/extras/rpms/perl-Regexp-Common added to the repository From fedora-extras-commits at redhat.com Sat Aug 20 00:08:46 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Fri, 19 Aug 2005 20:08:46 -0400 Subject: rpms/perl-Regexp-Common/devel - New directory Message-ID: <200508200008.j7K08ktg005052@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Regexp-Common/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5022/perl-Regexp-Common/devel Log Message: Directory /cvs/extras/rpms/perl-Regexp-Common/devel added to the repository From fedora-extras-commits at redhat.com Sat Aug 20 00:09:12 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Fri, 19 Aug 2005 20:09:12 -0400 Subject: rpms/perl-Regexp-Common Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200508200009.j7K09CmM005105@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Regexp-Common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5071 Added Files: Makefile import.log Log Message: Setup of module perl-Regexp-Common --- NEW FILE Makefile --- # Top level Makefile for module perl-Regexp-Common all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Sat Aug 20 00:09:12 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Fri, 19 Aug 2005 20:09:12 -0400 Subject: rpms/perl-Regexp-Common/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200508200009.j7K09Cjg005110@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Regexp-Common/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5071/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Regexp-Common --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Sat Aug 20 00:10:15 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Fri, 19 Aug 2005 20:10:15 -0400 Subject: rpms/perl-Regexp-Common import.log,1.1,1.2 Message-ID: <200508200010.j7K0AjHI005179@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Regexp-Common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5138 Modified Files: import.log Log Message: auto-import perl-Regexp-Common-2.120-1 on branch devel from perl-Regexp-Common-2.120-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Regexp-Common/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 20 Aug 2005 00:09:10 -0000 1.1 +++ import.log 20 Aug 2005 00:10:13 -0000 1.2 @@ -0,0 +1 @@ +perl-Regexp-Common-2_120-1:HEAD:perl-Regexp-Common-2.120-1.src.rpm:1124496602 From fedora-extras-commits at redhat.com Sat Aug 20 00:10:15 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Fri, 19 Aug 2005 20:10:15 -0400 Subject: rpms/perl-Regexp-Common/devel perl-Regexp-Common.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200508200010.j7K0AjwJ005183@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Regexp-Common/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5138/devel Modified Files: .cvsignore sources Added Files: perl-Regexp-Common.spec Log Message: auto-import perl-Regexp-Common-2.120-1 on branch devel from perl-Regexp-Common-2.120-1.src.rpm --- NEW FILE perl-Regexp-Common.spec --- Name: perl-Regexp-Common Version: 2.120 Release: 1%{?dist} Summary: Regexp::Common Perl module License: Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Regexp-Common/ Source0: http://www.cpan.org/modules/by-module/Regexp/Regexp-Common-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Regexp::Common - Provide commonly requested regular expressions %prep %setup -q -n Regexp-Common-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type f -name '*.bs' -a -size 0 -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %clean rm -rf $RPM_BUILD_ROOT %check make test %files %defattr(-,root,root,-) %doc TODO README %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Thu Aug 11 2005 Ralf Corsepius - 1.120-1 - FE submission. * Mon Mar 21 2005 Ralf Corsepius - 1.120-0.pm.2 - Initial packman version. - Update to FE standards. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Regexp-Common/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 20 Aug 2005 00:09:10 -0000 1.1 +++ .cvsignore 20 Aug 2005 00:10:13 -0000 1.2 @@ -0,0 +1 @@ +Regexp-Common-2.120.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Regexp-Common/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 20 Aug 2005 00:09:10 -0000 1.1 +++ sources 20 Aug 2005 00:10:13 -0000 1.2 @@ -0,0 +1 @@ +a14f2a3c3f2718a567ec26f57a2bae13 Regexp-Common-2.120.tar.gz From fedora-extras-commits at redhat.com Sat Aug 20 00:31:54 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Fri, 19 Aug 2005 20:31:54 -0400 Subject: rpms/perl-Regexp-Common/devel perl-Regexp-Common.spec,1.1,1.2 Message-ID: <200508200031.j7K0VsiG005650@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Regexp-Common/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5633 Modified Files: perl-Regexp-Common.spec Log Message: Spec cleanup. Index: perl-Regexp-Common.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Regexp-Common/devel/perl-Regexp-Common.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Regexp-Common.spec 20 Aug 2005 00:10:13 -0000 1.1 +++ perl-Regexp-Common.spec 20 Aug 2005 00:31:52 -0000 1.2 @@ -1,6 +1,6 @@ Name: perl-Regexp-Common Version: 2.120 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Regexp::Common Perl module License: Artistic Group: Development/Libraries @@ -26,7 +26,6 @@ rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' -find $RPM_BUILD_ROOT -type f -name '*.bs' -a -size 0 -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* @@ -39,13 +38,12 @@ %files %defattr(-,root,root,-) %doc TODO README -%{perl_vendorlib}/* +%{perl_vendorlib}/Regexp %{_mandir}/man3/* %changelog -* Thu Aug 11 2005 Ralf Corsepius - 1.120-1 -- FE submission. +* Thu Aug 11 2005 Ralf Corsepius - 2.120-2 +- Spec cleanup. -* Mon Mar 21 2005 Ralf Corsepius - 1.120-0.pm.2 -- Initial packman version. -- Update to FE standards. +* Thu Aug 11 2005 Ralf Corsepius - 2.120-1 +- FE submission. From fedora-extras-commits at redhat.com Sat Aug 20 01:02:16 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Fri, 19 Aug 2005 21:02:16 -0400 Subject: rpms/perl-Tree-Simple - New directory Message-ID: <200508200102.j7K12GsF009077@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Tree-Simple In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9067/perl-Tree-Simple Log Message: Directory /cvs/extras/rpms/perl-Tree-Simple added to the repository From fedora-extras-commits at redhat.com Sat Aug 20 01:02:40 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Fri, 19 Aug 2005 21:02:40 -0400 Subject: rpms/perl-Tree-Simple/devel - New directory Message-ID: <200508200102.j7K12eSU009096@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Tree-Simple/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9067/perl-Tree-Simple/devel Log Message: Directory /cvs/extras/rpms/perl-Tree-Simple/devel added to the repository From fedora-extras-commits at redhat.com Sat Aug 20 01:05:07 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Fri, 19 Aug 2005 21:05:07 -0400 Subject: rpms/plague/devel .cvsignore, 1.3, 1.4 plague.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <200508200105.j7K15bl9009142@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/extras/rpms/plague/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9114 Modified Files: .cvsignore plague.spec sources Log Message: * Mon Aug 15 2005 Dan Williams 0.3.3-1 - Version 0.3.3 o Add repo script support o Fix double-slashes in log URL (Ignacio Vazquez-Abrams) o Clear out old job info when requeueing jobs Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/plague/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 15 Aug 2005 16:25:51 -0000 1.3 +++ .cvsignore 20 Aug 2005 01:05:05 -0000 1.4 @@ -1,2 +1,3 @@ plague-0.3.1.tar.bz2 plague-0.3.2.tar.bz2 +plague-0.3.3.tar.bz2 Index: plague.spec =================================================================== RCS file: /cvs/extras/rpms/plague/devel/plague.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- plague.spec 15 Aug 2005 19:21:50 -0000 1.4 +++ plague.spec 20 Aug 2005 01:05:05 -0000 1.5 @@ -2,8 +2,8 @@ Summary: Distributed build system for RPMs Name: plague -Version: 0.3.2 -Release: 2%{?dist} +Version: 0.3.3 +Release: 1%{?dist} License: GPL Group: Development/Tools Source: http://people.redhat.com/dcbw/plague/%{name}-%{version}.tar.bz2 @@ -146,6 +146,12 @@ %changelog +* Mon Aug 15 2005 Dan Williams 0.3.3-1 +- Version 0.3.3 + o Add repo script support + o Fix double-slashes in log URL (Ignacio Vazquez-Abrams) + o Clear out old job info when requeueing jobs + * Mon Aug 15 2005 Dan Williams 0.3.2-2 - Append %{?dist} to Releases to get correct precedence on FC3, FC4, and Rawhide Index: sources =================================================================== RCS file: /cvs/extras/rpms/plague/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 15 Aug 2005 16:25:51 -0000 1.3 +++ sources 20 Aug 2005 01:05:05 -0000 1.4 @@ -1 +1 @@ -293d5d5b92b5a2742c51ecece3201987 plague-0.3.2.tar.bz2 +b41caa73d7cf8410f67a947046dff1a9 plague-0.3.3.tar.bz2 From fedora-extras-commits at redhat.com Sat Aug 20 01:05:40 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Fri, 19 Aug 2005 21:05:40 -0400 Subject: rpms/perl-Tree-Simple/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200508200105.j7K15eex009174@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Tree-Simple/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9139/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Tree-Simple --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Sat Aug 20 01:05:39 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Fri, 19 Aug 2005 21:05:39 -0400 Subject: rpms/perl-Tree-Simple Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200508200105.j7K15dVJ009171@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Tree-Simple In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9139 Added Files: Makefile import.log Log Message: Setup of module perl-Tree-Simple --- NEW FILE Makefile --- # Top level Makefile for module perl-Tree-Simple all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Sat Aug 20 01:09:00 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Fri, 19 Aug 2005 21:09:00 -0400 Subject: rpms/perl-Tree-Simple/devel perl-Tree-Simple.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200508200109.j7K190wf009305@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Tree-Simple/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9249/devel Modified Files: .cvsignore sources Added Files: perl-Tree-Simple.spec Log Message: auto-import perl-Tree-Simple-1.15-1 on branch devel from perl-Tree-Simple-1.15-1.src.rpm --- NEW FILE perl-Tree-Simple.spec --- Name: perl-Tree-Simple Version: 1.15 Release: 1%{?dist} Summary: Tree::Simple Perl module License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Tree-Simple/ Source0: http://www.cpan.org/modules/by-module/Tree/Tree-Simple-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl BuildRequires: perl(Test::Exception) >= 0.15 BuildRequires: perl(Test::Pod::Coverage) >= 1.04 BuildRequires: perl(Test::Memory::Cycle) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description A simple tree object. %prep %setup -q -n Tree-Simple-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type f -name '*.bs' -a -size 0 -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %clean rm -rf $RPM_BUILD_ROOT %check make test %files %defattr(-,root,root,-) %doc Changes README %{perl_vendorlib}/Tree %{_mandir}/man3/* %changelog * Thu Aug 11 2005 Ralf Corsepius - 1.15-1 - Upstream update. * Thu Aug 11 2005 Ralf Corsepius - 1.14-1 - FE submission. * Mon Mar 21 2005 Ralf Corsepius - 1.14-0.pm.2 - Initial packman version. - Update to FE standards. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Tree-Simple/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 20 Aug 2005 01:05:38 -0000 1.1 +++ .cvsignore 20 Aug 2005 01:08:39 -0000 1.2 @@ -0,0 +1 @@ +Tree-Simple-1.15.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Tree-Simple/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 20 Aug 2005 01:05:38 -0000 1.1 +++ sources 20 Aug 2005 01:08:39 -0000 1.2 @@ -0,0 +1 @@ +f4bb1afd402186952ea0b87ceeb3bc41 Tree-Simple-1.15.tar.gz From fedora-extras-commits at redhat.com Sat Aug 20 01:08:39 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Fri, 19 Aug 2005 21:08:39 -0400 Subject: rpms/perl-Tree-Simple import.log,1.1,1.2 Message-ID: <200508200109.j7K19AQL009318@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Tree-Simple In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9249 Modified Files: import.log Log Message: auto-import perl-Tree-Simple-1.15-1 on branch devel from perl-Tree-Simple-1.15-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Tree-Simple/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 20 Aug 2005 01:05:37 -0000 1.1 +++ import.log 20 Aug 2005 01:08:37 -0000 1.2 @@ -0,0 +1 @@ +perl-Tree-Simple-1_15-1:HEAD:perl-Tree-Simple-1.15-1.src.rpm:1124500048 From fedora-extras-commits at redhat.com Sat Aug 20 01:09:31 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Fri, 19 Aug 2005 21:09:31 -0400 Subject: rpms/plague/FC-4 plague.spec,1.4,1.5 sources,1.3,1.4 Message-ID: <200508200109.j7K19VuT009374@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/extras/rpms/plague/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9355 Modified Files: plague.spec sources Log Message: * Mon Aug 15 2005 Dan Williams 0.3.3-1 - Version 0.3.3 o Add repo script support o Fix double-slashes in log URL (Ignacio Vazquez-Abrams) o Clear out old job info when requeueing jobs Index: plague.spec =================================================================== RCS file: /cvs/extras/rpms/plague/FC-4/plague.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- plague.spec 15 Aug 2005 19:22:05 -0000 1.4 +++ plague.spec 20 Aug 2005 01:09:29 -0000 1.5 @@ -2,8 +2,8 @@ Summary: Distributed build system for RPMs Name: plague -Version: 0.3.2 -Release: 2%{?dist} +Version: 0.3.3 +Release: 1%{?dist} License: GPL Group: Development/Tools Source: http://people.redhat.com/dcbw/plague/%{name}-%{version}.tar.bz2 @@ -146,6 +146,12 @@ %changelog +* Mon Aug 15 2005 Dan Williams 0.3.3-1 +- Version 0.3.3 + o Add repo script support + o Fix double-slashes in log URL (Ignacio Vazquez-Abrams) + o Clear out old job info when requeueing jobs + * Mon Aug 15 2005 Dan Williams 0.3.2-2 - Append %{?dist} to Releases to get correct precedence on FC3, FC4, and Rawhide Index: sources =================================================================== RCS file: /cvs/extras/rpms/plague/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 15 Aug 2005 16:25:51 -0000 1.3 +++ sources 20 Aug 2005 01:09:29 -0000 1.4 @@ -1 +1 @@ -293d5d5b92b5a2742c51ecece3201987 plague-0.3.2.tar.bz2 +b41caa73d7cf8410f67a947046dff1a9 plague-0.3.3.tar.bz2 From fedora-extras-commits at redhat.com Sat Aug 20 01:11:04 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Fri, 19 Aug 2005 21:11:04 -0400 Subject: rpms/plague/FC-3 plague.spec,1.4,1.5 sources,1.3,1.4 Message-ID: <200508200111.j7K1B4Ok009452@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/extras/rpms/plague/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9433 Modified Files: plague.spec sources Log Message: * Mon Aug 15 2005 Dan Williams 0.3.3-1 - Version 0.3.3 o Add repo script support o Fix double-slashes in log URL (Ignacio Vazquez-Abrams) o Clear out old job info when requeueing jobs Index: plague.spec =================================================================== RCS file: /cvs/extras/rpms/plague/FC-3/plague.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- plague.spec 15 Aug 2005 19:22:23 -0000 1.4 +++ plague.spec 20 Aug 2005 01:11:02 -0000 1.5 @@ -2,8 +2,8 @@ Summary: Distributed build system for RPMs Name: plague -Version: 0.3.2 -Release: 2%{?dist} +Version: 0.3.3 +Release: 1%{?dist} License: GPL Group: Development/Tools Source: http://people.redhat.com/dcbw/plague/%{name}-%{version}.tar.bz2 @@ -146,6 +146,12 @@ %changelog +* Mon Aug 15 2005 Dan Williams 0.3.3-1 +- Version 0.3.3 + o Add repo script support + o Fix double-slashes in log URL (Ignacio Vazquez-Abrams) + o Clear out old job info when requeueing jobs + * Mon Aug 15 2005 Dan Williams 0.3.2-2 - Append %{?dist} to Releases to get correct precedence on FC3, FC4, and Rawhide Index: sources =================================================================== RCS file: /cvs/extras/rpms/plague/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 15 Aug 2005 16:25:51 -0000 1.3 +++ sources 20 Aug 2005 01:11:02 -0000 1.4 @@ -1 +1 @@ -293d5d5b92b5a2742c51ecece3201987 plague-0.3.2.tar.bz2 +b41caa73d7cf8410f67a947046dff1a9 plague-0.3.3.tar.bz2 From fedora-extras-commits at redhat.com Sat Aug 20 01:16:30 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Fri, 19 Aug 2005 21:16:30 -0400 Subject: rpms/perl-Tree-Simple/devel perl-Tree-Simple.spec,1.1,1.2 Message-ID: <200508200116.j7K1GUx9009517@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Tree-Simple/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9500 Modified Files: perl-Tree-Simple.spec Log Message: Spec cleanup. Index: perl-Tree-Simple.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Tree-Simple/devel/perl-Tree-Simple.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Tree-Simple.spec 20 Aug 2005 01:08:39 -0000 1.1 +++ perl-Tree-Simple.spec 20 Aug 2005 01:16:28 -0000 1.2 @@ -1,6 +1,6 @@ Name: perl-Tree-Simple Version: 1.15 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tree::Simple Perl module License: GPL or Artistic Group: Development/Libraries @@ -9,8 +9,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: perl BuildRequires: perl(Test::Exception) >= 0.15 +BuildRequires: perl(Test::Pod) >= 1.14 BuildRequires: perl(Test::Pod::Coverage) >= 1.04 BuildRequires: perl(Test::Memory::Cycle) @@ -22,6 +22,9 @@ %prep %setup -q -n Tree-Simple-%{version} +# Shipped executable with 1.15 +chmod -x lib/Tree/Simple.pm + %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} @@ -30,7 +33,6 @@ rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' -find $RPM_BUILD_ROOT -type f -name '*.bs' -a -size 0 -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* @@ -47,12 +49,11 @@ %{_mandir}/man3/* %changelog +* Thu Aug 20 2005 Ralf Corsepius - 1.15-2 +- Spec cleanup. + * Thu Aug 11 2005 Ralf Corsepius - 1.15-1 - Upstream update. * Thu Aug 11 2005 Ralf Corsepius - 1.14-1 - FE submission. - -* Mon Mar 21 2005 Ralf Corsepius - 1.14-0.pm.2 -- Initial packman version. -- Update to FE standards. From fedora-extras-commits at redhat.com Sat Aug 20 01:22:10 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Fri, 19 Aug 2005 21:22:10 -0400 Subject: owners owners.list,1.103,1.104 Message-ID: <200508200122.j7K1MAHH009625@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9608 Modified Files: owners.list Log Message: Add perl-Regexp-Common, perl-Tree-Simple Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.103 retrieving revision 1.104 diff -u -r1.103 -r1.104 --- owners.list 19 Aug 2005 21:35:28 -0000 1.103 +++ owners.list 20 Aug 2005 01:22:08 -0000 1.104 @@ -626,6 +626,7 @@ Fedora Extras|perl-Pod-POM|Object-oriented interface to Perl POD documents|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Pod-Simple|Framework for parsing POD documentation|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Razor-Agent|Use a Razor catalogue server to filter spam messages|wtogami at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Regexp-Common|Regexp::Common Perl module|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Set-IntSpan|Perl module for managing sets of integers|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-SOAP-Lite|Provides the Simple Object Access Protocol (SOAP)|thm at duke.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Sort-Versions|Perl module for sorting of revision-like numbers|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com @@ -637,6 +638,7 @@ Fedora Extras|perl-SVG|An extention to generate stand-alone or inline SVG|thm at duke.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Template-Plugin-Class|Allow calling of class methods on arbitrary classes|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Template-Toolkit|Template processing system|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Tree-Simple|Tree::Simple Perl module|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Test-Builder-Tester|For bugs related to the perl-Test-Builder-Tester component|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Test-Exception|Library of test functions for exception based Perl code|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Test-LongString|Perl module to test long strings|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Sat Aug 20 01:25:42 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Fri, 19 Aug 2005 21:25:42 -0400 Subject: rpms/perl-Regexp-Common/FC-4 perl-Regexp-Common.spec,1.2,1.3 Message-ID: <200508200125.j7K1Pgu5009732@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Regexp-Common/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9685/FC-4 Modified Files: perl-Regexp-Common.spec Log Message: Further spec cleanup. Index: perl-Regexp-Common.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Regexp-Common/FC-4/perl-Regexp-Common.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Regexp-Common.spec 20 Aug 2005 00:31:52 -0000 1.2 +++ perl-Regexp-Common.spec 20 Aug 2005 01:25:40 -0000 1.3 @@ -1,6 +1,6 @@ Name: perl-Regexp-Common Version: 2.120 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Regexp::Common Perl module License: Artistic Group: Development/Libraries @@ -9,7 +9,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: perl Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -42,7 +41,10 @@ %{_mandir}/man3/* %changelog -* Thu Aug 11 2005 Ralf Corsepius - 2.120-2 +* Thu Aug 20 2005 Ralf Corsepius - 2.120-3 +- Further spec cleanup. + +* Thu Aug 20 2005 Ralf Corsepius - 2.120-2 - Spec cleanup. * Thu Aug 11 2005 Ralf Corsepius - 2.120-1 From fedora-extras-commits at redhat.com Sat Aug 20 01:25:37 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Fri, 19 Aug 2005 21:25:37 -0400 Subject: rpms/perl-Regexp-Common/FC-3 perl-Regexp-Common.spec,1.2,1.3 Message-ID: <200508200126.j7K1Q8Uo009738@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Regexp-Common/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9685/FC-3 Modified Files: perl-Regexp-Common.spec Log Message: Further spec cleanup. Index: perl-Regexp-Common.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Regexp-Common/FC-3/perl-Regexp-Common.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Regexp-Common.spec 20 Aug 2005 00:31:52 -0000 1.2 +++ perl-Regexp-Common.spec 20 Aug 2005 01:25:35 -0000 1.3 @@ -1,6 +1,6 @@ Name: perl-Regexp-Common Version: 2.120 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Regexp::Common Perl module License: Artistic Group: Development/Libraries @@ -9,7 +9,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: perl Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -42,7 +41,10 @@ %{_mandir}/man3/* %changelog -* Thu Aug 11 2005 Ralf Corsepius - 2.120-2 +* Thu Aug 20 2005 Ralf Corsepius - 2.120-3 +- Further spec cleanup. + +* Thu Aug 20 2005 Ralf Corsepius - 2.120-2 - Spec cleanup. * Thu Aug 11 2005 Ralf Corsepius - 2.120-1 From fedora-extras-commits at redhat.com Sat Aug 20 01:25:37 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Fri, 19 Aug 2005 21:25:37 -0400 Subject: rpms/perl-Regexp-Common/devel perl-Regexp-Common.spec,1.2,1.3 Message-ID: <200508200126.j7K1Q7nH009735@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Regexp-Common/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9685/devel Modified Files: perl-Regexp-Common.spec Log Message: Further spec cleanup. Index: perl-Regexp-Common.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Regexp-Common/devel/perl-Regexp-Common.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Regexp-Common.spec 20 Aug 2005 00:31:52 -0000 1.2 +++ perl-Regexp-Common.spec 20 Aug 2005 01:25:35 -0000 1.3 @@ -1,6 +1,6 @@ Name: perl-Regexp-Common Version: 2.120 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Regexp::Common Perl module License: Artistic Group: Development/Libraries @@ -9,7 +9,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: perl Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -42,7 +41,10 @@ %{_mandir}/man3/* %changelog -* Thu Aug 11 2005 Ralf Corsepius - 2.120-2 +* Thu Aug 20 2005 Ralf Corsepius - 2.120-3 +- Further spec cleanup. + +* Thu Aug 20 2005 Ralf Corsepius - 2.120-2 - Spec cleanup. * Thu Aug 11 2005 Ralf Corsepius - 2.120-1 From fedora-extras-commits at redhat.com Sat Aug 20 04:32:26 2005 From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields)) Date: Sat, 20 Aug 2005 00:32:26 -0400 Subject: rpms/nautilus-open-terminal/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200508200432.j7K4WQm1015553@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/extras/rpms/nautilus-open-terminal/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15534 Modified Files: .cvsignore sources Log Message: Committed new patch properly, hopefully Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/nautilus-open-terminal/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 17 Jul 2005 13:12:29 -0000 1.2 +++ .cvsignore 20 Aug 2005 04:32:24 -0000 1.3 @@ -1 +1,2 @@ nautilus-open-terminal-0.4.tar.gz +nautilus-open-terminal-0.4-gtk+extravar.patch Index: sources =================================================================== RCS file: /cvs/extras/rpms/nautilus-open-terminal/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 17 Jul 2005 13:12:29 -0000 1.2 +++ sources 20 Aug 2005 04:32:24 -0000 1.3 @@ -1 +1,2 @@ 931a50e602f60340a5ed369f50146f36 nautilus-open-terminal-0.4.tar.gz +c7eba5a440c317584f46e8686932d125 nautilus-open-terminal-0.4-gtk+extravar.patch From fedora-extras-commits at redhat.com Sat Aug 20 04:58:20 2005 From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau)) Date: Sat, 20 Aug 2005 00:58:20 -0400 Subject: rpms/yumex/FC-4 yumex.spec,1.4,1.5 Message-ID: <200508200458.j7K4wKeA015632@cvs-int.fedora.redhat.com> Author: timlau Update of /cvs/extras/rpms/yumex/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15615 Modified Files: yumex.spec Log Message: Release 0.42-03 Index: yumex.spec =================================================================== RCS file: /cvs/extras/rpms/yumex/FC-4/yumex.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- yumex.spec 18 Aug 2005 07:19:36 -0000 1.4 +++ yumex.spec 20 Aug 2005 04:58:18 -0000 1.5 @@ -1,8 +1,8 @@ -%define build_v 2 +%define build_v 3 Name: yumex Version: 0.42 -Release: 2.0%{?dist} +Release: 3.0%{?dist} Summary: Yum Extender graphical package management tool Group: Applications/System @@ -67,6 +67,9 @@ %{_datadir}/applications/fedora-%{name}.desktop %changelog +* Sat Aug 20 2005 Tim Lauridsen - 0.42-3.0 +- Release 0.42-3.0 +- Fixed Dependencies not resolved bug. * Wed Aug 17 2005 Tim Lauridsen - 0.42-2.0 - Release 0.42-2.0 - Fixed TypeError in yumexBase.errorlog in yumbase.py From fedora-extras-commits at redhat.com Sat Aug 20 05:00:01 2005 From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau)) Date: Sat, 20 Aug 2005 01:00:01 -0400 Subject: rpms/yumex/FC-4 .cvsignore,1.4,1.5 sources,1.4,1.5 Message-ID: <200508200500.j7K501Oi015664@cvs-int.fedora.redhat.com> Author: timlau Update of /cvs/extras/rpms/yumex/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15645 Modified Files: .cvsignore sources Log Message: Release 0.42-03 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/yumex/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 18 Aug 2005 07:19:36 -0000 1.4 +++ .cvsignore 20 Aug 2005 04:59:59 -0000 1.5 @@ -1 +1 @@ -yumex-0.42-2.tar.gz +yumex-0.42-3.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/yumex/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 18 Aug 2005 07:19:36 -0000 1.4 +++ sources 20 Aug 2005 04:59:59 -0000 1.5 @@ -1 +1 @@ -5f2e258ab9296f2a0e38757d98d9b6b2 yumex-0.42-2.tar.gz +db714544f1edc71dc518f4c781d0a761 yumex-0.42-3.tar.gz From fedora-extras-commits at redhat.com Sat Aug 20 08:31:23 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sat, 20 Aug 2005 04:31:23 -0400 Subject: rpms/libAfterImage - New directory Message-ID: <200508200831.j7K8VNIw021364@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libAfterImage In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21340/libAfterImage Log Message: Directory /cvs/extras/rpms/libAfterImage added to the repository From fedora-extras-commits at redhat.com Sat Aug 20 08:31:23 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sat, 20 Aug 2005 04:31:23 -0400 Subject: rpms/libAfterImage/devel - New directory Message-ID: <200508200831.j7K8VNng021369@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libAfterImage/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21340/libAfterImage/devel Log Message: Directory /cvs/extras/rpms/libAfterImage/devel added to the repository From fedora-extras-commits at redhat.com Sat Aug 20 08:32:19 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sat, 20 Aug 2005 04:32:19 -0400 Subject: rpms/libAfterImage Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200508200832.j7K8WJ29021414@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libAfterImage In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21387 Added Files: Makefile import.log Log Message: Setup of module libAfterImage --- NEW FILE Makefile --- # Top level Makefile for module libAfterImage all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Sat Aug 20 08:32:20 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sat, 20 Aug 2005 04:32:20 -0400 Subject: rpms/libAfterImage/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200508200832.j7K8WKga021419@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libAfterImage/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21387/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module libAfterImage --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Sat Aug 20 08:34:12 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sat, 20 Aug 2005 04:34:12 -0400 Subject: rpms/libAfterImage import.log,1.1,1.2 Message-ID: <200508200834.j7K8YCwD021505@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libAfterImage In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21471 Modified Files: import.log Log Message: auto-import libAfterImage-1.07-3 on branch devel from libAfterImage-1.07-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/libAfterImage/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 20 Aug 2005 08:32:17 -0000 1.1 +++ import.log 20 Aug 2005 08:34:10 -0000 1.2 @@ -0,0 +1 @@ +libAfterImage-1_07-3:HEAD:libAfterImage-1.07-3.src.rpm:1124526832 From fedora-extras-commits at redhat.com Sat Aug 20 08:34:13 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sat, 20 Aug 2005 04:34:13 -0400 Subject: rpms/libAfterImage/devel libAfterImage-COPYING, NONE, 1.1 libAfterImage-Makefile-ldconfig.patch, NONE, 1.1 libAfterImage-afterimage-config.patch, NONE, 1.1 libAfterImage.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200508200834.j7K8YDhI021510@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libAfterImage/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21471/devel Modified Files: .cvsignore sources Added Files: libAfterImage-COPYING libAfterImage-Makefile-ldconfig.patch libAfterImage-afterimage-config.patch libAfterImage.spec Log Message: auto-import libAfterImage-1.07-3 on branch devel from libAfterImage-1.07-3.src.rpm --- NEW FILE libAfterImage-COPYING --- GNU LESSER GENERAL PUBLIC LICENSE Version 2.1, February 1999 Copyright (C) 1991, 1999 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. [This is the first released version of the Lesser GPL. It also counts as the successor of the GNU Library Public License, version 2, hence the version number 2.1.] Preamble The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public Licenses are intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This license, the Lesser General Public License, applies to some specially designated software packages--typically libraries--of the Free Software Foundation and other authors who decide to use it. You can use it too, but we suggest you first think carefully about whether this license or the ordinary General Public License is the better strategy to use in any particular case, based on the explanations below. When we speak of free software, we are referring to freedom of use, 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 and use pieces of it in new free programs; and that you are informed that you can do these things. To protect your rights, we need to make restrictions that forbid distributors to deny you these rights or to ask you to surrender these rights. These restrictions translate to certain responsibilities for you if you distribute copies of the library or if you modify it. For example, if you distribute copies of the library, whether gratis or for a fee, you must give the recipients all the rights that we gave you. You must make sure that they, too, receive or can get the source code. If you link other code with the library, you must provide complete object files to the recipients, so that they can relink them with the library after making changes to the library and recompiling it. And you must show them these terms so they know their rights. We protect your rights with a two-step method: (1) we copyright the library, and (2) we offer you this license, which gives you legal permission to copy, distribute and/or modify the library. To protect each distributor, we want to make it very clear that there is no warranty for the free library. Also, if the library is modified by someone else and passed on, the recipients should know that what they have is not the original version, so that the original author's reputation will not be affected by problems that might be introduced by others. Finally, software patents pose a constant threat to the existence of any free program. We wish to make sure that a company cannot effectively restrict the users of a free program by obtaining a restrictive license from a patent holder. Therefore, we insist that any patent license obtained for a version of the library must be consistent with the full freedom of use specified in this license. Most GNU software, including some libraries, is covered by the ordinary GNU General Public License. This license, the GNU Lesser General Public License, applies to certain designated libraries, and is quite different from the ordinary General Public License. We use this license for certain libraries in order to permit linking those libraries into non-free programs. When a program is linked with a library, whether statically or using a shared library, the combination of the two is legally speaking a combined work, a derivative of the original library. The ordinary General Public License therefore permits such linking only if the entire combination fits its criteria of freedom. The Lesser General Public License permits more lax criteria for linking other code with the library. We call this license the "Lesser" General Public License because it does Less to protect the user's freedom than the ordinary General Public License. It also provides other free software developers Less of an advantage over competing non-free programs. These disadvantages are the reason we use the ordinary General Public License for many libraries. However, the Lesser license provides advantages in certain special circumstances. For example, on rare occasions, there may be a special need to encourage the widest possible use of a certain library, so that it becomes a de-facto standard. To achieve this, non-free programs must be allowed to use the library. A more frequent case is that a free library does the same job as widely used non-free libraries. In this case, there is little to gain by limiting the free library to free software only, so we use the Lesser General Public License. In other cases, permission to use a particular library in non-free programs enables a greater number of people to use a large body of free software. For example, permission to use the GNU C Library in non-free programs enables many more people to use the whole GNU operating system, as well as its variant, the GNU/Linux operating system. Although the Lesser General Public License is Less protective of the users' freedom, it does ensure that the user of a program that is linked with the Library has the freedom and the wherewithal to run that program using a modified version of the Library. The precise terms and conditions for copying, distribution and modification follow. Pay close attention to the difference between a "work based on the library" and a "work that uses the library". The former contains code derived from the library, whereas the latter must be combined with the library in order to run. GNU LESSER GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION 0. This License Agreement applies to any software library or other program which contains a notice placed by the copyright holder or other authorized party saying it may be distributed under the terms of this Lesser General Public License (also called "this License"). Each licensee is addressed as "you". A "library" means a collection of software functions and/or data prepared so as to be conveniently linked with application programs (which use some of those functions and data) to form executables. The "Library", below, refers to any such software library or work which has been distributed under these terms. A "work based on the Library" means either the Library or any derivative work under copyright law: that is to say, a work containing the Library or a portion of it, either verbatim or with modifications and/or translated straightforwardly into another language. (Hereinafter, translation is included without limitation in the term "modification".) "Source code" for a work means the preferred form of the work for making modifications to it. For a library, 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 library. Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running a program using the Library is not restricted, and output from such a program is covered only if its contents constitute a work based on the Library (independent of the use of the Library in a tool for writing it). Whether that is true depends on what the Library does and what the program that uses the Library does. 1. You may copy and distribute verbatim copies of the Library's complete 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 distribute a copy of this License along with the Library. 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 Library or any portion of it, thus forming a work based on the Library, 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) The modified work must itself be a software library. b) You must cause the files modified to carry prominent notices stating that you changed the files and the date of any change. c) You must cause the whole of the work to be licensed at no charge to all third parties under the terms of this License. d) If a facility in the modified Library refers to a function or a table of data to be supplied by an application program that uses the facility, other than as an argument passed when the facility is invoked, then you must make a good faith effort to ensure that, in the event an application does not supply such function or table, the facility still operates, and performs whatever part of its purpose remains meaningful. (For example, a function in a library to compute square roots has a purpose that is entirely well-defined independent of the application. Therefore, Subsection 2d requires that any application-supplied function or table used by this function must be optional: if the application does not supply it, the square root function must still compute square roots.) These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Library, 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 Library, 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 Library. In addition, mere aggregation of another work not based on the Library with the Library (or with a work based on the Library) on a volume of a storage or distribution medium does not bring the other work under the scope of this License. 3. You may opt to apply the terms of the ordinary GNU General Public License instead of this License to a given copy of the Library. To do this, you must alter all the notices that refer to this License, so that they refer to the ordinary GNU General Public License, version 2, instead of to this License. (If a newer version than version 2 of the ordinary GNU General Public License has appeared, then you can specify that version instead if you wish.) Do not make any other change in these notices. Once this change is made in a given copy, it is irreversible for that copy, so the ordinary GNU General Public License applies to all subsequent copies and derivative works made from that copy. This option is useful when you wish to copy part of the code of the Library into a program that is not a library. 4. You may copy and distribute the Library (or a portion or derivative of it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you 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. If distribution of 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 satisfies the requirement to distribute the source code, even though third parties are not compelled to copy the source along with the object code. 5. A program that contains no derivative of any portion of the Library, but is designed to work with the Library by being compiled or linked with it, is called a "work that uses the Library". Such a work, in isolation, is not a derivative work of the Library, and therefore falls outside the scope of this License. However, linking a "work that uses the Library" with the Library creates an executable that is a derivative of the Library (because it contains portions of the Library), rather than a "work that uses the library". The executable is therefore covered by this License. Section 6 states terms for distribution of such executables. When a "work that uses the Library" uses material from a header file that is part of the Library, the object code for the work may be a derivative work of the Library even though the source code is not. Whether this is true is especially significant if the work can be linked without the Library, or if the work is itself a library. The threshold for this to be true is not precisely defined by law. If such an object file uses only numerical parameters, data structure layouts and accessors, and small macros and small inline functions (ten lines or less in length), then the use of the object file is unrestricted, regardless of whether it is legally a derivative work. (Executables containing this object code plus portions of the Library will still fall under Section 6.) Otherwise, if the work is a derivative of the Library, you may distribute the object code for the work under the terms of Section 6. Any executables containing that work also fall under Section 6, whether or not they are linked directly with the Library itself. 6. As an exception to the Sections above, you may also combine or link a "work that uses the Library" with the Library to produce a work containing portions of the Library, and distribute that work under terms of your choice, provided that the terms permit modification of the work for the customer's own use and reverse engineering for debugging such modifications. You must give prominent notice with each copy of the work that the Library is used in it and that the Library and its use are covered by this License. You must supply a copy of this License. If the work during execution displays copyright notices, you must include the copyright notice for the Library among them, as well as a reference directing the user to the copy of this License. Also, you must do one of these things: a) Accompany the work with the complete corresponding machine-readable source code for the Library including whatever changes were used in the work (which must be distributed under Sections 1 and 2 above); and, if the work is an executable linked with the Library, with the complete machine-readable "work that uses the Library", as object code and/or source code, so that the user can modify the Library and then relink to produce a modified executable containing the modified Library. (It is understood that the user who changes the contents of definitions files in the Library will not necessarily be able to recompile the application to use the modified definitions.) b) Use a suitable shared library mechanism for linking with the Library. A suitable mechanism is one that (1) uses at run time a copy of the library already present on the user's computer system, rather than copying library functions into the executable, and (2) will operate properly with a modified version of the library, if the user installs one, as long as the modified version is interface-compatible with the version that the work was made with. c) Accompany the work with a written offer, valid for at least three years, to give the same user the materials specified in Subsection 6a, above, for a charge no more than the cost of performing this distribution. d) If distribution of the work is made by offering access to copy from a designated place, offer equivalent access to copy the above specified materials from the same place. e) Verify that the user has already received a copy of these materials or that you have already sent this user a copy. For an executable, the required form of the "work that uses the Library" must include any data and utility programs needed for reproducing the executable from it. However, as a special exception, the materials to be 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. It may happen that this requirement contradicts the license restrictions of other proprietary libraries that do not normally accompany the operating system. Such a contradiction means you cannot use both them and the Library together in an executable that you distribute. 7. You may place library facilities that are a work based on the Library side-by-side in a single library together with other library facilities not covered by this License, and distribute such a combined library, provided that the separate distribution of the work based on the Library and of the other library facilities is otherwise permitted, and provided that you do these two things: a) Accompany the combined library with a copy of the same work based on the Library, uncombined with any other library facilities. This must be distributed under the terms of the Sections above. b) Give prominent notice with the combined library of the fact that part of it is a work based on the Library, and explaining where to find the accompanying uncombined form of the same work. 8. You may not copy, modify, sublicense, link with, or distribute the Library except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense, link with, or distribute the Library 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. 9. 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 Library or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Library (or any work based on the Library), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Library or works based on it. 10. Each time you redistribute the Library (or any work based on the Library), the recipient automatically receives a license from the original licensor to copy, distribute, link with or modify the Library 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 with this License. 11. 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 Library at all. For example, if a patent license would not permit royalty-free redistribution of the Library 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 Library. 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. 12. If the distribution and/or use of the Library is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Library 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. 13. The Free Software Foundation may publish revised and/or new versions of the Lesser 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 Library 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 Library does not specify a license version number, you may choose any version ever published by the Free Software Foundation. 14. If you wish to incorporate parts of the Library into other free programs whose distribution conditions are incompatible with these, 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 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE LIBRARY "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 LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. 16. 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 LIBRARY 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 LIBRARY (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 LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), 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 Libraries If you develop a new library, and you want it to be of the greatest possible use to the public, we recommend making it free software that everyone can redistribute and change. You can do so by permitting redistribution under these terms (or, alternatively, under the terms of the ordinary General Public License). To apply these terms, attach the following notices to the library. 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) This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. This library 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 Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License along with this library; 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. You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the library, if necessary. Here is a sample; alter the names: Yoyodyne, Inc., hereby disclaims all copyright interest in the library `Frob' (a library for tweaking knobs) written by James Random Hacker. , 1 April 1990 Ty Coon, President of Vice That's all there is to it! libAfterImage-Makefile-ldconfig.patch: --- NEW FILE libAfterImage-Makefile-ldconfig.patch --- --- Makefile.in.orig 2005-08-16 10:00:02.000000000 +0200 +++ Makefile.in 2005-08-16 10:00:35.000000000 +0200 @@ -135,20 +135,6 @@ @(if [ -d $(LIBDIR) ] && [ -w $(LIBDIR) ]; then \ echo "$(INSTALL_LIB) $(LIB_STATIC) $(LIBDIR)"; \ $(INSTALL_LIB) $(LIB_STATIC) $(LIBDIR); \ - if [ `uname` = "Linux" ]; then \ - if test $(LIBDIR) = "/lib" || test $(LIBDIR) = "/usr/lib"; then \ - echo "" > /dev/null; \ - elif grep -q $(LIBDIR) /etc/ld.so.conf > /dev/null 2>&1; then \ - echo "" > /dev/null; \ - else \ - echo "Unable to find $(LIBDIR) in ld.so.conf. In order to use "; \ - echo "$(LIB_STATIC), you may need to add it or set LD_LIBRARY_PATH."; \ - fi; \ - if test -w /etc; then \ - echo "$(LDCONFIG)"; \ - $(LDCONFIG); \ - fi; \ - fi ;\ fi \ ) @@ -161,18 +147,6 @@ $(RM) -f $(LIBDIR)/$(LIB_SHARED).$(LIBVERMAJOR) $(LIBDIR)/$(LIB_SHARED); \ $(LN_S) -f $(LIB_SHARED).$(LIBVER) $(LIBDIR)/$(LIB_SHARED).$(LIBVERMAJOR); \ $(LN_S) -f $(LIB_SHARED).$(LIBVERMAJOR) $(LIBDIR)/$(LIB_SHARED); \ - if test `uname` = "Linux"; then \ - if test $(LIBDIR) = "/lib" || test $(LIBDIR) = "/usr/lib"; then \ - echo "" > /dev/null; \ - elif grep -q $(LIBDIR) /etc/ld.so.conf > /dev/null 2>&1; then \ - echo "" > /dev/null; \ - else \ - echo "Unable to find $(LIBDIR) in ld.so.conf. In order to use "; \ - echo "$(LIB_SHARED), you may need to add it or set LD_LIBRARY_PATH."; \ - fi; \ - echo "$(LDCONFIG)"; \ - $(LDCONFIG); \ - fi \ ) install.cyg: libAfterImage-afterimage-config.patch: --- NEW FILE libAfterImage-afterimage-config.patch --- --- afterimage-config.in.orig 2005-08-18 07:23:52.000000000 +0200 +++ afterimage-config.in 2005-08-18 07:23:59.000000000 +0200 @@ -110,11 +110,7 @@ libs="-lAfterBase $libs" fi libs="-lAfterImage $libs" - if test "@libdir@" != "/usr/lib" ; then - echo -L at libdir@ $libs - else - echo $libs - fi + echo $libs else echo $libs fi --- NEW FILE libAfterImage.spec --- Name: libAfterImage Version: 1.07 Release: 3%{?dist} Summary: A generic image manipulation library Group: System Environment/Libraries License: LGPL URL: http://www.afterstep.org/afterimage/index.php Source0: ftp://ftp.afterstep.org/stable/libAfterImage/libAfterImage-1.07.tar.bz2 Source1: libAfterImage-COPYING Patch0: libAfterImage-Makefile-ldconfig.patch Patch1: libAfterImage-afterimage-config.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: xorg-x11-devel BuildRequires: freetype-devel BuildRequires: zlib-devel BuildRequires: libtiff-devel BuildRequires: libpng-devel BuildRequires: libungif-devel BuildRequires: libjpeg-devel %description libAfterImage is a generic image manipulation library. It was initially implemented to address AfterStep Window Manager's needs for image handling, but it evolved into extremely powerful and flexible software, suitable for virtually any project that has needs for loading, manipulating, displaying images, as well as writing images in files. Most of the popular image formats are supported using standard libraries, with XCF, XPM, PPM/PNM, BMP, ICO, TGA and GIF being supported internally. PNG, JPEG and TIFF formats are supported via standard libraries. Powerful text rendering capabilities included, providing support for TrueType fonts using FreeType library, and antialiasing of standard fonts from X window system. %package devel Summary: Files needed for software development with %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: freetype-devel Requires: zlib-devel Requires: libtiff-devel Requires: libjpeg-devel Requires: libpng-devel Requires: xorg-x11-devel %description devel The %{name}-devel package contains the files needed for development with %{name} %prep %setup -q %patch0 %patch1 %build %configure --enable-i18n --enable-sharedlibs \ --with-xpm --without-builtin-ungif --disable-staticlibs --enable-glx \ --without-afterbase --disable-mmx-optimization \ --x-includes=%{_prefix}/X11R6/include --x-libraries=%{_prefix}/X11R6/%{_lib} \ make CCFLAGS="-DNO_DEBUG_OUTPUT $RPM_OPT_FLAGS" %{?_smp_mflags} \ LIBAFTERIMAGE_PATH=../ %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_bindir} mkdir -p $RPM_BUILD_ROOT%{_libdir} mkdir -p $RPM_BUILD_ROOT%{_includedir} make install DESTDIR=$RPM_BUILD_ROOT LIBAFTERIMAGE_PATH=../ cp %{SOURCE1} %{_builddir}/%{name}-%{version}/COPYING %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc README ChangeLog COPYING %{_libdir}/*.so.* %files devel %defattr(-,root,root,-) %{_bindir}/* %{_includedir}/libAfterImage/ %{_libdir}/*.so %changelog * Sat Aug 20 2005 Andreas Bierfert 1.07-3 - build with debug information - add dist tag * Thu Aug 18 2005 Andreas Bierfert 1.07-2 - fix issues mentioned in #166046 #1 * Tue Aug 16 2005 Andreas Bierfert 1.07-1 - Initial Release - Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libAfterImage/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 20 Aug 2005 08:32:17 -0000 1.1 +++ .cvsignore 20 Aug 2005 08:34:11 -0000 1.2 @@ -0,0 +1 @@ +libAfterImage-1.07.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libAfterImage/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 20 Aug 2005 08:32:17 -0000 1.1 +++ sources 20 Aug 2005 08:34:11 -0000 1.2 @@ -0,0 +1 @@ +bd59c81347029a9b272f76f6acbde088 libAfterImage-1.07.tar.bz2 From fedora-extras-commits at redhat.com Sat Aug 20 08:54:12 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sat, 20 Aug 2005 04:54:12 -0400 Subject: owners owners.list,1.104,1.105 Message-ID: <200508200854.j7K8sC61022039@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22022 Modified Files: owners.list Log Message: - add libAfterImage - add sylpheed-claws-plugins Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.104 retrieving revision 1.105 diff -u -r1.104 -r1.105 --- owners.list 20 Aug 2005 01:22:08 -0000 1.104 +++ owners.list 20 Aug 2005 08:54:09 -0000 1.105 @@ -355,6 +355,7 @@ Fedora Extras|leafpad|GTK+ based simple text editor|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| Fedora Extras|lft|Alternate traceroute tool|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|lib3ds|The 3D Studio File Format Library|rc040203 at freenet.de|extras-qa at fedoraproject.org| +Fedora Extras|libAfterImage|A generic image manipulation library|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|libannodex|Library for annotating and indexing networked media|thomas at apestaart.org|extras-qa at fedoraproject.org| Fedora Extras|libapreq2|Apache HTTP request library|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|libassuan|GnuPG IPC library|rdieter at math.unl.edu|extras-qa at fedoraproject.org| @@ -824,6 +825,7 @@ Fedora Extras|swatch|A tool for actively monitoring log files|jpo at di.uminho.pt|extras-qa at fedoraproject.org| Fedora Extras|sword|Free Bible Software Project|mpeters at mac.com|extras-qa at fedoraproject.org| Fedora Extras|sylpheed-claws|The bleeding edge branch of Sylpheed|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| +Fedora Extras|sylpheed-claws-plugins|Additional plugins for sylpheed-claws|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|sylpheed|GTK+ based, lightweight, and fast email client|bugs.michael at gmx.net|extras-qa at fedoraproject.org| Fedora Extras|synaptic|Graphical frontend for APT package manager|pmatilai at laiskiainen.org|extras-qa at fedoraproject.org| Fedora Extras|synce|For bugs related to the synce component|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sat Aug 20 08:59:46 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sat, 20 Aug 2005 04:59:46 -0400 Subject: rpms/aterm/FC-3 aterm.spec, 1.6, 1.7 sources, 1.2, 1.3 aterm-cleanup.patch, 1.1, NONE Message-ID: <200508200859.j7K8xkuY022196@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/aterm/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22177 Modified Files: aterm.spec sources Removed Files: aterm-cleanup.patch Log Message: - upgrade to new version Index: aterm.spec =================================================================== RCS file: /cvs/extras/rpms/aterm/FC-3/aterm.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- aterm.spec 31 May 2005 22:46:38 -0000 1.6 +++ aterm.spec 20 Aug 2005 08:59:44 -0000 1.7 @@ -1,48 +1,38 @@ Name: aterm -Version: 0.4.2 -Release: 6%{?dist} -Epoch: 0 -Summary: Aterm (Afterstep XVT) - a VT102 emulator for the X window system +Version: 1.0.0 +Release: 1%{?dist} + +Summary: Afterstep XVT, VT102 emulator for the X Window system Group: User Interface/X License: GPL URL: http://aterm.sourceforge.net -Source0: http://dl.sf.net/aterm/%{name}-%{version}.tar.gz +Source0: ftp://ftp.afterstep.org/apps/aterm/aterm-1.0.0.tar.bz2 Source1: aterm.desktop -Patch0: aterm-cleanup.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -BuildRequires: XFree86-devel +BuildRequires: xorg-x11-devel BuildRequires: desktop-file-utils +BuildRequires: libAfterImage-devel %description -aterm, version 0.4.2, is a colour vt102 terminal emulator, based on +aterm, version 1.00 is a colour vt102 terminal emulator, based on rxvt 2.4.8 with Alfredo Kojima??s additions of fast transparency, intended as an xterm(1) replacement for users who do not require fea- tures such as Tektronix 4014 emulation and toolkit-style configurabil- ity. As a result, aterm uses much less swap space -- a significant advantage on a machine serving many X sessions. -It was created with AfterStep Window Manger users in mind, but is not -tied to any libraries, and can be used anywhere. - - %prep %setup -q -%patch0 + %build -%configure --enable-utmp \ - --enable-wtmp \ - --enable-background-image \ - --enable-transparency \ - --enable-fading \ - --enable-menubar \ - --enable-graphics \ - --enable-next-scroll \ - --enable-xgetdefault \ - --with-term=xterm \ - --with-x \ - --with-xpm +%configure --enable-fading --enable-background-image \ +--enable-next-scroll --enable-utmp --enable-wtmp \ +--enable-menubar --enable-graphics -enable-kanji \ +--enable-big5 --enable-greek --enable-ttygid \ +--enable-xgetdefault --with-term=xterm --with-x + make %{?_smp_mflags} @@ -63,19 +53,30 @@ %files %defattr(-,root,root,-) -%doc ChangeLog doc/BUGS doc/FAQ doc/README.menu doc/README.Unix98PTY -%doc doc/README.xvt doc/TODO doc/ChangeLog.rxvt -%doc doc/menu/* -%doc doc/*.html +%doc ChangeLog ChangeLog.0.4 +%doc doc/README.* doc/FAQ doc/ChangeLog.rxvt doc/menu/* %{_bindir}/* %{_mandir}/man1/* %{_datadir}/applications/* %changelog -* Wed Jun 01 2005 Andreas Bierfert -- backport from 1.00beta2 to close #149366 -- add dist +* Tue Aug 16 2005 Andreas Bierfert +1.0.0-1 +- upgrade to stable +- add libAfterImage support +- add dist tag + +* Thu Jun 23 2005 Andreas Bierfert +1.00-0.1.beta4 +- upgrade + +* Fri Jun 03 2005 Andreas Bierfert +1.00-0.1.beta3 +- upgrade + +* Fri Apr 7 2005 Michael Schwendt +- rebuilt * Sun Jun 22 2003 Andreas Bierfert (awjb) 0:0.4.2-0.fdr.5 - changed Source0 Index: sources =================================================================== RCS file: /cvs/extras/rpms/aterm/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 04:03:25 -0000 1.2 +++ sources 20 Aug 2005 08:59:44 -0000 1.3 @@ -1 +1 @@ -d046fcf7fadd661dd5efb393a43c57b1 aterm-0.4.2.tar.gz +ceb64c62ae243a7fc3ddb0d6f9a19faa aterm-1.0.0.tar.bz2 --- aterm-cleanup.patch DELETED --- From fedora-extras-commits at redhat.com Sat Aug 20 09:00:30 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sat, 20 Aug 2005 05:00:30 -0400 Subject: rpms/aterm/FC-4 aterm.spec, 1.8, 1.9 sources, 1.2, 1.3 aterm-cleanup.patch, 1.1, NONE Message-ID: <200508200900.j7K90UkG022235@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/aterm/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22216 Modified Files: aterm.spec sources Removed Files: aterm-cleanup.patch Log Message: - upgrade to new version Index: aterm.spec =================================================================== RCS file: /cvs/extras/rpms/aterm/FC-4/aterm.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- aterm.spec 31 May 2005 22:51:11 -0000 1.8 +++ aterm.spec 20 Aug 2005 09:00:28 -0000 1.9 @@ -1,48 +1,38 @@ Name: aterm -Version: 0.4.2 -Release: 7%{?dist} +Version: 1.0.0 +Release: 1%{?dist} Summary: Afterstep XVT, VT102 emulator for the X Window system Group: User Interface/X License: GPL URL: http://aterm.sourceforge.net -Source0: http://dl.sf.net/aterm/%{name}-%{version}.tar.gz +Source0: ftp://ftp.afterstep.org/apps/aterm/aterm-1.0.0.tar.bz2 Source1: aterm.desktop -Patch0: aterm-cleanup.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: xorg-x11-devel BuildRequires: desktop-file-utils +BuildRequires: libAfterImage-devel %description -aterm, version 0.4.2, is a colour vt102 terminal emulator, based on +aterm, version 1.00 is a colour vt102 terminal emulator, based on rxvt 2.4.8 with Alfredo Kojima??s additions of fast transparency, intended as an xterm(1) replacement for users who do not require fea- tures such as Tektronix 4014 emulation and toolkit-style configurabil- ity. As a result, aterm uses much less swap space -- a significant advantage on a machine serving many X sessions. -It was created with AfterStep Window Manger users in mind, but is not -tied to any libraries, and can be used anywhere. - - %prep %setup -q -%patch0 + %build -%configure --enable-utmp \ - --enable-wtmp \ - --enable-background-image \ - --enable-transparency \ - --enable-fading \ - --enable-menubar \ - --enable-graphics \ - --enable-next-scroll \ - --enable-xgetdefault \ - --with-term=xterm \ - --with-x \ - --with-xpm +%configure --enable-fading --enable-background-image \ +--enable-next-scroll --enable-utmp --enable-wtmp \ +--enable-menubar --enable-graphics -enable-kanji \ +--enable-big5 --enable-greek --enable-ttygid \ +--enable-xgetdefault --with-term=xterm --with-x + make %{?_smp_mflags} @@ -63,19 +53,27 @@ %files %defattr(-,root,root,-) -%doc ChangeLog doc/BUGS doc/FAQ doc/README.menu doc/README.Unix98PTY -%doc doc/README.xvt doc/TODO doc/ChangeLog.rxvt -%doc doc/menu/* -%doc doc/*.html +%doc ChangeLog ChangeLog.0.4 +%doc doc/README.* doc/FAQ doc/ChangeLog.rxvt doc/menu/* %{_bindir}/* %{_mandir}/man1/* %{_datadir}/applications/* %changelog -* Wed Jun 01 2005 Andreas Bierfert -- backport from 1.00beta2 to close #149366 -- add dist +* Tue Aug 16 2005 Andreas Bierfert +1.0.0-1 +- upgrade to stable +- add libAfterImage support +- add dist tag + +* Thu Jun 23 2005 Andreas Bierfert +1.00-0.1.beta4 +- upgrade + +* Fri Jun 03 2005 Andreas Bierfert +1.00-0.1.beta3 +- upgrade * Fri Apr 7 2005 Michael Schwendt - rebuilt Index: sources =================================================================== RCS file: /cvs/extras/rpms/aterm/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 04:03:25 -0000 1.2 +++ sources 20 Aug 2005 09:00:28 -0000 1.3 @@ -1 +1 @@ -d046fcf7fadd661dd5efb393a43c57b1 aterm-0.4.2.tar.gz +ceb64c62ae243a7fc3ddb0d6f9a19faa aterm-1.0.0.tar.bz2 --- aterm-cleanup.patch DELETED --- From fedora-extras-commits at redhat.com Sat Aug 20 09:00:51 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sat, 20 Aug 2005 05:00:51 -0400 Subject: rpms/aterm/devel .cvsignore, 1.4, 1.5 aterm.spec, 1.9, 1.10 sources, 1.4, 1.5 Message-ID: <200508200900.j7K90pd8022262@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/aterm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22241 Modified Files: .cvsignore aterm.spec sources Log Message: - upgrade to new version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/aterm/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 23 Jun 2005 16:34:54 -0000 1.4 +++ .cvsignore 20 Aug 2005 09:00:49 -0000 1.5 @@ -1 +1 @@ -aterm-1.00.beta4.tar.bz2 +aterm-1.0.0.tar.bz2 Index: aterm.spec =================================================================== RCS file: /cvs/extras/rpms/aterm/devel/aterm.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- aterm.spec 23 Jun 2005 16:34:54 -0000 1.9 +++ aterm.spec 20 Aug 2005 09:00:49 -0000 1.10 @@ -1,17 +1,18 @@ Name: aterm -Version: 1.00 -Release: 0.1.beta4 +Version: 1.0.0 +Release: 1%{?dist} Summary: Afterstep XVT, VT102 emulator for the X Window system Group: User Interface/X License: GPL URL: http://aterm.sourceforge.net -Source0: ftp://ftp.afterstep.org/apps/aterm/aterm-1.00.beta4.tar.bz2 +Source0: ftp://ftp.afterstep.org/apps/aterm/aterm-1.0.0.tar.bz2 Source1: aterm.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: xorg-x11-devel BuildRequires: desktop-file-utils +BuildRequires: libAfterImage-devel %description aterm, version 1.00 is a colour vt102 terminal emulator, based on @@ -22,7 +23,7 @@ advantage on a machine serving many X sessions. %prep -%setup -q -n aterm-1.00.beta4 +%setup -q %build @@ -60,6 +61,12 @@ %changelog +* Tue Aug 16 2005 Andreas Bierfert +1.0.0-1 +- upgrade to stable +- add libAfterImage support +- add dist tag + * Thu Jun 23 2005 Andreas Bierfert 1.00-0.1.beta4 - upgrade Index: sources =================================================================== RCS file: /cvs/extras/rpms/aterm/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 23 Jun 2005 16:34:54 -0000 1.4 +++ sources 20 Aug 2005 09:00:49 -0000 1.5 @@ -1 +1 @@ -7fbfc6291d566bbcd6bb05006a718a8a aterm-1.00.beta4.tar.bz2 +ceb64c62ae243a7fc3ddb0d6f9a19faa aterm-1.0.0.tar.bz2 From fedora-extras-commits at redhat.com Sat Aug 20 09:04:10 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sat, 20 Aug 2005 05:04:10 -0400 Subject: rpms/aterm/FC-4 .cvsignore,1.2,1.3 Message-ID: <200508200904.j7K94AEP023507@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/aterm/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23475/FC-4 Modified Files: .cvsignore Log Message: - add .cvsignore Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/aterm/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:03:25 -0000 1.2 +++ .cvsignore 20 Aug 2005 09:04:08 -0000 1.3 @@ -1 +1 @@ -aterm-0.4.2.tar.gz +aterm-1.0.0.tar.bz2 From fedora-extras-commits at redhat.com Sat Aug 20 09:04:08 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sat, 20 Aug 2005 05:04:08 -0400 Subject: rpms/aterm/FC-3 .cvsignore,1.2,1.3 Message-ID: <200508200904.j7K94dK5023510@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/aterm/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23475/FC-3 Modified Files: .cvsignore Log Message: - add .cvsignore Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/aterm/FC-3/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:03:25 -0000 1.2 +++ .cvsignore 20 Aug 2005 09:04:06 -0000 1.3 @@ -1 +1 @@ -aterm-0.4.2.tar.gz +aterm-1.0.0.tar.bz2 From fedora-extras-commits at redhat.com Sat Aug 20 10:54:27 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sat, 20 Aug 2005 06:54:27 -0400 Subject: rpms/wmacpi - New directory Message-ID: <200508201054.j7KAsR86024930@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wmacpi In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24910/wmacpi Log Message: Directory /cvs/extras/rpms/wmacpi added to the repository From fedora-extras-commits at redhat.com Sat Aug 20 10:54:28 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sat, 20 Aug 2005 06:54:28 -0400 Subject: rpms/wmacpi/devel - New directory Message-ID: <200508201054.j7KAsSHw024935@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wmacpi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24910/wmacpi/devel Log Message: Directory /cvs/extras/rpms/wmacpi/devel added to the repository From fedora-extras-commits at redhat.com Sat Aug 20 10:54:57 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sat, 20 Aug 2005 06:54:57 -0400 Subject: rpms/wmacpi Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200508201054.j7KAsvRu024982@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wmacpi In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24955 Added Files: Makefile import.log Log Message: Setup of module wmacpi --- NEW FILE Makefile --- # Top level Makefile for module wmacpi all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Sat Aug 20 10:54:57 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sat, 20 Aug 2005 06:54:57 -0400 Subject: rpms/wmacpi/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200508201055.j7KAsvcZ024987@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wmacpi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24955/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module wmacpi --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Sat Aug 20 10:55:44 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sat, 20 Aug 2005 06:55:44 -0400 Subject: rpms/wmacpi import.log,1.1,1.2 Message-ID: <200508201056.j7KAuExM025053@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wmacpi In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25019 Modified Files: import.log Log Message: auto-import wmacpi-1.34-4 on branch devel from wmacpi-1.34-4.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/wmacpi/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 20 Aug 2005 10:54:54 -0000 1.1 +++ import.log 20 Aug 2005 10:55:42 -0000 1.2 @@ -0,0 +1 @@ +wmacpi-1_34-4:HEAD:wmacpi-1.34-4.src.rpm:1124535329 From fedora-extras-commits at redhat.com Sat Aug 20 10:55:45 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sat, 20 Aug 2005 06:55:45 -0400 Subject: rpms/wmacpi/devel wmacpi.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200508201056.j7KAuF5x025057@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wmacpi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25019/devel Modified Files: .cvsignore sources Added Files: wmacpi.spec Log Message: auto-import wmacpi-1.34-4 on branch devel from wmacpi-1.34-4.src.rpm --- NEW FILE wmacpi.spec --- Name: wmacpi Version: 1.34 Release: 4%{?dist} Summary: Dockapp for laptop acpi/apm information Group: User Interface/X License: GPL URL: http://www.ne.jp/asahi/linux/timecop/ Source0: http://www.ne.jp/asahi/linux/timecop/software/wmacpi-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: xorg-x11-devel %description Dockapp which displays acpi/apm information. his is a typical laptop ACPI dockapp. One interesting feature is the "timer" mode, where you can keep track of how long the laptop has been "on battery". This is opposite of the information usually provided by the BIOS, which is "time remaining", and in many cases wrong. This option can be toggled at run-time. System messages scroll on the bottom of the window, AC plug flashes when battery is charging, and green LED inside the big button flashes red if battery level is critical low. %prep %setup -q %build make CFLAGS="$RPM_OPT_FLAGS -DACPI -ansi -I%{_prefix}/X11R6/include" \ LDFLAGS="$RPM_OPT_FLAGS -DACPI -L%{_prefix}/X11R6/%{_lib} -lX11 -lXpm -lXext" \ %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT %{__mkdir_p} ${RPM_BUILD_ROOT}%{_bindir} %{__install} %{_builddir}/%{name}-%{version}/wmacpi ${RPM_BUILD_ROOT}%{_bindir} %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc AUTHORS COPYING README %{_bindir}/wmacpi %changelog * Sat Aug 20 2005 Andreas Bierfert 1.34-4 - better description - add dist tag * Sat Aug 20 2005 Andreas Bierfert 1.34-3 - fix x86_64 xorg lib dir * Sat Aug 20 2005 Andreas Bierfert 1.34-2 -minor cleanups * Fri Jun 03 2005 Andreas Bierfert 1.34-1 - Initial Release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wmacpi/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 20 Aug 2005 10:54:55 -0000 1.1 +++ .cvsignore 20 Aug 2005 10:55:43 -0000 1.2 @@ -0,0 +1 @@ +wmacpi-1.34.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/wmacpi/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 20 Aug 2005 10:54:55 -0000 1.1 +++ sources 20 Aug 2005 10:55:43 -0000 1.2 @@ -0,0 +1 @@ +ef4f5f94102a7f5cbaa71a8f0a4a2c3b wmacpi-1.34.tar.gz From fedora-extras-commits at redhat.com Sat Aug 20 12:11:31 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sat, 20 Aug 2005 08:11:31 -0400 Subject: rpms/sylpheed-claws/devel sylpheed-claws.spec,1.21,1.22 Message-ID: <200508201211.j7KCBVtB027767@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/sylpheed-claws/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27750 Modified Files: sylpheed-claws.spec Log Message: - rebuild Index: sylpheed-claws.spec =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws/devel/sylpheed-claws.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- sylpheed-claws.spec 15 Aug 2005 10:26:56 -0000 1.21 +++ sylpheed-claws.spec 20 Aug 2005 12:11:29 -0000 1.22 @@ -2,7 +2,7 @@ Name: sylpheed-claws Version: 1.9.13 -Release: 4%{?dist} +Release: 5%{?dist} Summary: The bleeding edge branch of Sylpheed Group: Applications/Internet License: GPL @@ -113,6 +113,10 @@ %{_libdir}/sylpheed-claws/plugins/*deps %changelog +* Sat Aug 20 2005 Andreas Bierfert +1.9.14-5 +- bump release for rebuild + * Mon Aug 15 2005 Andreas Bierfert 1.9.13-4 - fix files From fedora-extras-commits at redhat.com Sat Aug 20 12:55:41 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sat, 20 Aug 2005 08:55:41 -0400 Subject: rpms/meld/FC-3 meld-1.0.0-fedora-162403.patch, NONE, 1.1 meld-1.0.0-po_fr.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 meld.spec, 1.7, 1.8 sources, 1.5, 1.6 Message-ID: <200508201256.j7KCuBTJ028005@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/meld/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27955/FC-3 Modified Files: .cvsignore meld.spec sources Added Files: meld-1.0.0-fedora-162403.patch meld-1.0.0-po_fr.patch Log Message: sync with devel and work around Core gnome-python2-gtksourceview crash bug 162403 meld-1.0.0-fedora-162403.patch: --- NEW FILE meld-1.0.0-fedora-162403.patch --- diff -Nur meld-1.0.0-orig/filediff.py meld-1.0.0/filediff.py --- meld-1.0.0-orig/filediff.py 2005-06-23 20:41:08.000000000 +0200 +++ meld-1.0.0/filediff.py 2005-08-20 14:48:24.000000000 +0200 @@ -38,13 +38,22 @@ sourceview_available = 0 -for sourceview in "gtksourceview sourceview".split(): - try: - gsv = __import__(sourceview) - sourceview_available = 1 - break - except ImportError: - pass +# Work around missing strict dependency in gnome-python2-gtksourceview. +gnomeprint_available = 0 +try: + __import__("gnomeprint") + gnomeprint_available = 1 +except ImportError: + pass + +if gnomeprint_available == 1: + for sourceview in "gtksourceview sourceview".split(): + try: + gsv = __import__(sourceview) + sourceview_available = 1 + break + except ImportError: + pass if sourceview_available: def set_highlighting_enabled(buf, fname, enabled): diff -Nur meld-1.0.0-orig/meldapp.py meld-1.0.0/meldapp.py --- meld-1.0.0-orig/meldapp.py 2005-07-01 20:32:08.000000000 +0200 +++ meld-1.0.0/meldapp.py 2005-08-20 14:46:21.000000000 +0200 @@ -37,13 +37,22 @@ # optional sourceview_available = 0 -for sourceview in "gtksourceview sourceview".split(): - try: - __import__(sourceview) - sourceview_available = 1 - break - except ImportError: - pass +# Work around missing strict dependency in gnome-python2-gtksourceview. +gnomeprint_available = 0 +try: + __import__("gnomeprint") + gnomeprint_available = 1 +except ImportError: + pass + +if gnomeprint_available == 1: + for sourceview in "gtksourceview sourceview".split(): + try: + __import__(sourceview) + sourceview_available = 1 + break + except ImportError: + pass version = "1.0.0" meld-1.0.0-po_fr.patch: --- NEW FILE meld-1.0.0-po_fr.patch --- --- meld-1.0.0.old/po/fr.po 2005-07-03 18:41:20.000000000 -0400 +++ meld-1.0.0/po/fr.po 2005-07-03 18:40:45.000000000 -0400 @@ -15,6 +15,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Generated-By: pygettext.py 1.5\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../meld.desktop.in.h:1 msgid "Compare and merge your files." Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/meld/FC-3/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 1 Jul 2005 21:21:50 -0000 1.5 +++ .cvsignore 20 Aug 2005 12:55:39 -0000 1.6 @@ -1 +1 @@ -meld-0.9.6.tar.bz2 +meld-1.0.0.tar.bz2 Index: meld.spec =================================================================== RCS file: /cvs/extras/rpms/meld/FC-3/meld.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- meld.spec 1 Jul 2005 21:21:50 -0000 1.7 +++ meld.spec 20 Aug 2005 12:55:39 -0000 1.8 @@ -1,14 +1,14 @@ Name: meld -Version: 0.9.6 -# temporarily use 0 for FC-3 erratum -Release: 0%{?dist} +Version: 1.0.0 +Release: 1%{?dist} Summary: Visual diff and merge tool Group: Development/Tools License: GPL URL: http://meld.sourceforge.net/ -Source0: http://ftp.gnome.org/pub/gnome/sources/meld/0.9/meld-%{version}.tar.bz2 +Source0: http://ftp.gnome.org/pub/gnome/sources/meld/1.0/meld-%{version}.tar.bz2 Patch0: desktop.patch +Patch1: meld-1.0.0-po_fr.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -37,6 +37,7 @@ %prep %setup -q %patch0 -p1 -b .desktop +%patch1 -p1 -b .po_fr %build @@ -83,6 +84,10 @@ %changelog +* Mon Jul 25 2005 Michael Schwendt - 1.0.0-1 +- Update to 1.0.0. +- Include fix for upstream bug #309408. + * Wed Jun 8 2005 Michael Schwendt - 0.9.6-1 - Remove unused meld shell script from src.rpm. - Add scriptlets for scrollkeeper-update. Index: sources =================================================================== RCS file: /cvs/extras/rpms/meld/FC-3/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 1 Jul 2005 21:21:50 -0000 1.5 +++ sources 20 Aug 2005 12:55:39 -0000 1.6 @@ -1 +1 @@ -73419987b125c0cfbb1f04cfe454a8e5 meld-0.9.6.tar.bz2 +ccde817f0396d39e9e40f31a3a7611f6 meld-1.0.0.tar.bz2 From fedora-extras-commits at redhat.com Sat Aug 20 12:55:41 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sat, 20 Aug 2005 08:55:41 -0400 Subject: rpms/meld/FC-4 meld-1.0.0-fedora-162403.patch, NONE, 1.1 meld-1.0.0-po_fr.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 meld.spec, 1.10, 1.11 sources, 1.5, 1.6 Message-ID: <200508201256.j7KCuBWf028010@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/meld/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27955/FC-4 Modified Files: .cvsignore meld.spec sources Added Files: meld-1.0.0-fedora-162403.patch meld-1.0.0-po_fr.patch Log Message: sync with devel and work around Core gnome-python2-gtksourceview crash bug 162403 meld-1.0.0-fedora-162403.patch: --- NEW FILE meld-1.0.0-fedora-162403.patch --- diff -Nur meld-1.0.0-orig/filediff.py meld-1.0.0/filediff.py --- meld-1.0.0-orig/filediff.py 2005-06-23 20:41:08.000000000 +0200 +++ meld-1.0.0/filediff.py 2005-08-20 14:48:24.000000000 +0200 @@ -38,13 +38,22 @@ sourceview_available = 0 -for sourceview in "gtksourceview sourceview".split(): - try: - gsv = __import__(sourceview) - sourceview_available = 1 - break - except ImportError: - pass +# Work around missing strict dependency in gnome-python2-gtksourceview. +gnomeprint_available = 0 +try: + __import__("gnomeprint") + gnomeprint_available = 1 +except ImportError: + pass + +if gnomeprint_available == 1: + for sourceview in "gtksourceview sourceview".split(): + try: + gsv = __import__(sourceview) + sourceview_available = 1 + break + except ImportError: + pass if sourceview_available: def set_highlighting_enabled(buf, fname, enabled): diff -Nur meld-1.0.0-orig/meldapp.py meld-1.0.0/meldapp.py --- meld-1.0.0-orig/meldapp.py 2005-07-01 20:32:08.000000000 +0200 +++ meld-1.0.0/meldapp.py 2005-08-20 14:46:21.000000000 +0200 @@ -37,13 +37,22 @@ # optional sourceview_available = 0 -for sourceview in "gtksourceview sourceview".split(): - try: - __import__(sourceview) - sourceview_available = 1 - break - except ImportError: - pass +# Work around missing strict dependency in gnome-python2-gtksourceview. +gnomeprint_available = 0 +try: + __import__("gnomeprint") + gnomeprint_available = 1 +except ImportError: + pass + +if gnomeprint_available == 1: + for sourceview in "gtksourceview sourceview".split(): + try: + __import__(sourceview) + sourceview_available = 1 + break + except ImportError: + pass version = "1.0.0" meld-1.0.0-po_fr.patch: --- NEW FILE meld-1.0.0-po_fr.patch --- --- meld-1.0.0.old/po/fr.po 2005-07-03 18:41:20.000000000 -0400 +++ meld-1.0.0/po/fr.po 2005-07-03 18:40:45.000000000 -0400 @@ -15,6 +15,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Generated-By: pygettext.py 1.5\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../meld.desktop.in.h:1 msgid "Compare and merge your files." Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/meld/FC-4/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 8 Jun 2005 19:30:51 -0000 1.5 +++ .cvsignore 20 Aug 2005 12:55:39 -0000 1.6 @@ -1 +1 @@ -meld-0.9.6.tar.bz2 +meld-1.0.0.tar.bz2 Index: meld.spec =================================================================== RCS file: /cvs/extras/rpms/meld/FC-4/meld.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- meld.spec 8 Jun 2005 20:17:42 -0000 1.10 +++ meld.spec 20 Aug 2005 12:55:39 -0000 1.11 @@ -1,13 +1,15 @@ Name: meld -Version: 0.9.6 -Release: 1 +Version: 1.0.0 +Release: 0.1%{?dist} Summary: Visual diff and merge tool Group: Development/Tools License: GPL URL: http://meld.sourceforge.net/ -Source0: http://ftp.gnome.org/pub/gnome/sources/meld/0.9/meld-%{version}.tar.bz2 +Source0: http://ftp.gnome.org/pub/gnome/sources/meld/1.0/meld-%{version}.tar.bz2 Patch0: desktop.patch +Patch1: meld-1.0.0-po_fr.patch +Patch2: meld-1.0.0-fedora-162403.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -36,6 +38,8 @@ %prep %setup -q %patch0 -p1 -b .desktop +%patch1 -p1 -b .po_fr +%patch2 -p1 -b .fedora-162403 %build @@ -82,6 +86,14 @@ %changelog +* Sat Aug 20 2005 Michael Schwendt - 1.0.0-0.1 +- Work around missing gnome-python2-gnomeprint dependency in + gnome-python2-gtksourceview package for FC4 and FC3 (#162403). + +* Mon Jul 25 2005 Michael Schwendt - 1.0.0-1 +- Update to 1.0.0. +- Include fix for upstream bug #309408. + * Wed Jun 8 2005 Michael Schwendt - 0.9.6-1 - Remove unused meld shell script from src.rpm. - Add scriptlets for scrollkeeper-update. Index: sources =================================================================== RCS file: /cvs/extras/rpms/meld/FC-4/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 8 Jun 2005 19:30:51 -0000 1.5 +++ sources 20 Aug 2005 12:55:39 -0000 1.6 @@ -1 +1 @@ -73419987b125c0cfbb1f04cfe454a8e5 meld-0.9.6.tar.bz2 +ccde817f0396d39e9e40f31a3a7611f6 meld-1.0.0.tar.bz2 From fedora-extras-commits at redhat.com Sat Aug 20 12:57:11 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sat, 20 Aug 2005 08:57:11 -0400 Subject: rpms/meld/FC-3 meld.spec,1.8,1.9 Message-ID: <200508201257.j7KCvBVB028062@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/meld/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28045 Modified Files: meld.spec Log Message: sync with FC4 Index: meld.spec =================================================================== RCS file: /cvs/extras/rpms/meld/FC-3/meld.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- meld.spec 20 Aug 2005 12:55:39 -0000 1.8 +++ meld.spec 20 Aug 2005 12:57:09 -0000 1.9 @@ -1,6 +1,6 @@ Name: meld Version: 1.0.0 -Release: 1%{?dist} +Release: 0.1%{?dist} Summary: Visual diff and merge tool Group: Development/Tools @@ -9,6 +9,7 @@ Source0: http://ftp.gnome.org/pub/gnome/sources/meld/1.0/meld-%{version}.tar.bz2 Patch0: desktop.patch Patch1: meld-1.0.0-po_fr.patch +Patch2: meld-1.0.0-fedora-162403.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -38,6 +39,7 @@ %setup -q %patch0 -p1 -b .desktop %patch1 -p1 -b .po_fr +%patch2 -p1 -b .fedora-162403 %build @@ -84,6 +86,10 @@ %changelog +* Sat Aug 20 2005 Michael Schwendt - 1.0.0-0.1 +- Work around missing gnome-python2-gnomeprint dependency in + gnome-python2-gtksourceview package for FC4 and FC3 (#162403). + * Mon Jul 25 2005 Michael Schwendt - 1.0.0-1 - Update to 1.0.0. - Include fix for upstream bug #309408. From fedora-extras-commits at redhat.com Sat Aug 20 13:18:14 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sat, 20 Aug 2005 09:18:14 -0400 Subject: rpms/libAfterImage/FC-4 libAfterImage.spec,1.1,1.2 Message-ID: <200508201318.j7KDIEFc029452@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libAfterImage/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29435 Modified Files: libAfterImage.spec Log Message: - add -fPIC Index: libAfterImage.spec =================================================================== RCS file: /cvs/extras/rpms/libAfterImage/FC-4/libAfterImage.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libAfterImage.spec 20 Aug 2005 08:34:11 -0000 1.1 +++ libAfterImage.spec 20 Aug 2005 13:18:12 -0000 1.2 @@ -1,6 +1,6 @@ Name: libAfterImage Version: 1.07 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A generic image manipulation library Group: System Environment/Libraries @@ -61,7 +61,7 @@ --without-afterbase --disable-mmx-optimization \ --x-includes=%{_prefix}/X11R6/include --x-libraries=%{_prefix}/X11R6/%{_lib} \ -make CCFLAGS="-DNO_DEBUG_OUTPUT $RPM_OPT_FLAGS" %{?_smp_mflags} \ +make CCFLAGS="-DNO_DEBUG_OUTPUT -fPIC $RPM_OPT_FLAGS" %{?_smp_mflags} \ LIBAFTERIMAGE_PATH=../ @@ -94,6 +94,10 @@ %changelog * Sat Aug 20 2005 Andreas Bierfert +1.07-4 +- add -fPIC + +* Sat Aug 20 2005 Andreas Bierfert 1.07-3 - build with debug information - add dist tag From fedora-extras-commits at redhat.com Sat Aug 20 13:24:10 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sat, 20 Aug 2005 09:24:10 -0400 Subject: owners owners.list,1.105,1.106 Message-ID: <200508201324.j7KDOA9a029518@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29501 Modified Files: owners.list Log Message: - take on ownership of synce Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.105 retrieving revision 1.106 diff -u -r1.105 -r1.106 --- owners.list 20 Aug 2005 08:54:09 -0000 1.105 +++ owners.list 20 Aug 2005 13:24:08 -0000 1.106 @@ -828,7 +828,7 @@ Fedora Extras|sylpheed-claws-plugins|Additional plugins for sylpheed-claws|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|sylpheed|GTK+ based, lightweight, and fast email client|bugs.michael at gmx.net|extras-qa at fedoraproject.org| Fedora Extras|synaptic|Graphical frontend for APT package manager|pmatilai at laiskiainen.org|extras-qa at fedoraproject.org| -Fedora Extras|synce|For bugs related to the synce component|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| +Fedora Extras|synce|For bugs related to the synce component|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|synergy|Mouse and keyboard sharing utility|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|syslog-ng|Syslog replacement daemon|jpo at di.uminho.pt|extras-qa at fedoraproject.org| Fedora Extras|system-switch-im|A utility for switching default IIIMF to XIM servers|llch at redhat.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sat Aug 20 13:26:24 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sat, 20 Aug 2005 09:26:24 -0400 Subject: rpms/libAfterImage/FC-3 libAfterImage.spec,1.1,1.2 Message-ID: <200508201326.j7KDQsM5029559@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libAfterImage/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29526/FC-3 Modified Files: libAfterImage.spec Log Message: - add -fPIC Index: libAfterImage.spec =================================================================== RCS file: /cvs/extras/rpms/libAfterImage/FC-3/libAfterImage.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libAfterImage.spec 20 Aug 2005 08:34:11 -0000 1.1 +++ libAfterImage.spec 20 Aug 2005 13:26:22 -0000 1.2 @@ -1,6 +1,6 @@ Name: libAfterImage Version: 1.07 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A generic image manipulation library Group: System Environment/Libraries @@ -61,7 +61,7 @@ --without-afterbase --disable-mmx-optimization \ --x-includes=%{_prefix}/X11R6/include --x-libraries=%{_prefix}/X11R6/%{_lib} \ -make CCFLAGS="-DNO_DEBUG_OUTPUT $RPM_OPT_FLAGS" %{?_smp_mflags} \ +make CCFLAGS="-DNO_DEBUG_OUTPUT -fPIC $RPM_OPT_FLAGS" %{?_smp_mflags} \ LIBAFTERIMAGE_PATH=../ @@ -94,6 +94,10 @@ %changelog * Sat Aug 20 2005 Andreas Bierfert +1.07-4 +- add -fPIC + +* Sat Aug 20 2005 Andreas Bierfert 1.07-3 - build with debug information - add dist tag From fedora-extras-commits at redhat.com Sat Aug 20 13:26:25 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sat, 20 Aug 2005 09:26:25 -0400 Subject: rpms/libAfterImage/devel libAfterImage.spec,1.1,1.2 Message-ID: <200508201327.j7KDQtFZ029562@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libAfterImage/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29526/devel Modified Files: libAfterImage.spec Log Message: - add -fPIC Index: libAfterImage.spec =================================================================== RCS file: /cvs/extras/rpms/libAfterImage/devel/libAfterImage.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libAfterImage.spec 20 Aug 2005 08:34:11 -0000 1.1 +++ libAfterImage.spec 20 Aug 2005 13:26:23 -0000 1.2 @@ -1,6 +1,6 @@ Name: libAfterImage Version: 1.07 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A generic image manipulation library Group: System Environment/Libraries @@ -61,7 +61,7 @@ --without-afterbase --disable-mmx-optimization \ --x-includes=%{_prefix}/X11R6/include --x-libraries=%{_prefix}/X11R6/%{_lib} \ -make CCFLAGS="-DNO_DEBUG_OUTPUT $RPM_OPT_FLAGS" %{?_smp_mflags} \ +make CCFLAGS="-DNO_DEBUG_OUTPUT -fPIC $RPM_OPT_FLAGS" %{?_smp_mflags} \ LIBAFTERIMAGE_PATH=../ @@ -94,6 +94,10 @@ %changelog * Sat Aug 20 2005 Andreas Bierfert +1.07-4 +- add -fPIC + +* Sat Aug 20 2005 Andreas Bierfert 1.07-3 - build with debug information - add dist tag From fedora-extras-commits at redhat.com Sat Aug 20 13:57:41 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sat, 20 Aug 2005 09:57:41 -0400 Subject: rpms/synce/FC-3 synce-rra-Makefile.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 synce.spec, 1.3, 1.4 synce-rra-0.9.0-ambiguous.patch, 1.1, NONE Message-ID: <200508201358.j7KDwBLo029984@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/synce/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29915/FC-3 Modified Files: .cvsignore sources synce.spec Added Files: synce-rra-Makefile.patch Removed Files: synce-rra-0.9.0-ambiguous.patch Log Message: - version upgrade synce-rra-Makefile.patch: --- NEW FILE synce-rra-Makefile.patch --- --- synce-rra-0.9.1/lib/Makefile.in.orig 2005-08-20 15:08:17.000000000 +0200 +++ synce-rra-0.9.1/lib/Makefile.in 2005-08-20 15:08:44.000000000 +0200 @@ -132,7 +132,7 @@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -AM_CFLAGS = -g -Wall -Wsign-compare -Wno-long-long -Werror -ansi @CFLAGS@ -I.. +AM_CFLAGS = -ansi @CFLAGS@ -I.. include_HEADERS = \ appointment.h \ --- synce-rra-0.9.1/lib/Makefile.am.orig 2005-08-20 15:08:51.000000000 +0200 +++ synce-rra-0.9.1/lib/Makefile.am 2005-08-20 15:09:04.000000000 +0200 @@ -1,5 +1,5 @@ ## useful flags -AM_CFLAGS = -g -Wall -Wsign-compare -Wno-long-long -Werror -ansi @CFLAGS@ -I.. +AM_CFLAGS = -ansi @CFLAGS@ -I.. ## @APPLE_CFLAGS@ includedir = @includedir@/rra --- synce-rra-0.9.1/src/Makefile.in.orig 2005-08-20 15:14:21.000000000 +0200 +++ synce-rra-0.9.1/src/Makefile.in 2005-08-20 15:14:38.000000000 +0200 @@ -131,7 +131,7 @@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -AM_CFLAGS = -g -Wall -Wsign-compare -Wno-long-long -Werror -ansi @CFLAGS@ -I../lib +AM_CFLAGS = -ansi @CFLAGS@ -I../lib LDADD = -L../lib ../lib/librra.la bin_PROGRAMS = synce-matchmaker --- synce-rra-0.9.1/src/Makefile.am.orig 2005-08-20 15:14:12.000000000 +0200 +++ synce-rra-0.9.1/src/Makefile.am 2005-08-20 15:14:55.000000000 +0200 @@ -1,5 +1,5 @@ ## useful flags -AM_CFLAGS = -g -Wall -Wsign-compare -Wno-long-long -Werror -ansi @CFLAGS@ -I../lib +AM_CFLAGS = -ansi @CFLAGS@ -I../lib LDADD = -L../lib ../lib/librra.la bin_PROGRAMS = synce-matchmaker Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/synce/FC-3/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 2 Apr 2005 01:40:47 -0000 1.3 +++ .cvsignore 20 Aug 2005 13:57:39 -0000 1.4 @@ -1,7 +1,6 @@ -libmimedir-0.3.tar.gz -synce-dccm-0.9.0.tar.gz -synce-librapi2-0.9.0.tar.gz -synce-libsynce-0.9.0.tar.gz -synce-rra-0.9.0.tar.gz -synce-serial-0.9.0.tar.gz +synce-dccm-0.9.1.tar.gz +synce-librapi2-0.9.1.tar.gz +synce-libsynce-0.9.1.tar.gz +synce-rra-0.9.1.tar.gz +synce-serial-0.9.1.tar.gz libmimedir-0.4.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/synce/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 2 Apr 2005 01:40:47 -0000 1.3 +++ sources 20 Aug 2005 13:57:39 -0000 1.4 @@ -1,6 +1,6 @@ -a32607bf423e5e5467b80edc2b7dac5d synce-dccm-0.9.0.tar.gz -f585e8d56c83d4e811197d671fd4c201 synce-librapi2-0.9.0.tar.gz -497efcbf55453da808041e7f8d55690b synce-libsynce-0.9.0.tar.gz -c6e6c29916518359a9c188f455305970 synce-rra-0.9.0.tar.gz -3042891c850fa685e40b1216debc34f9 synce-serial-0.9.0.tar.gz +8818b71133049fe9c739166225aebe0c synce-dccm-0.9.1.tar.gz +6ab07aa21dfbdb1047348b3a47071a3a synce-librapi2-0.9.1.tar.gz +3fcffb776a5bedc23458152e5a650348 synce-libsynce-0.9.1.tar.gz +72742f93f19d5727159989ec80a725f0 synce-rra-0.9.1.tar.gz +77f8879486469118386fb7429ec5a794 synce-serial-0.9.1.tar.gz 156e1eb69377d9ae9180a09e38148ec6 libmimedir-0.4.tar.gz Index: synce.spec =================================================================== RCS file: /cvs/extras/rpms/synce/FC-3/synce.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- synce.spec 2 Apr 2005 01:40:47 -0000 1.3 +++ synce.spec 20 Aug 2005 13:57:39 -0000 1.4 @@ -1,20 +1,23 @@ -Summary: Serial connection support for Pocket PC devices -Name: synce -Version: 0.9.0 -Release: 3.fc3 -License: MIT -Group: Applications/Communications -Source0: synce-libsynce-%{version}.tar.gz -Source1: synce-dccm-%{version}.tar.gz -Source2: synce-serial-%{version}.tar.gz -Source3: synce-rra-%{version}.tar.gz -Source4: synce-librapi2-%{version}.tar.gz -Source5: libmimedir-0.4.tar.gz -Patch0: synce-rra-0.9.0-ambiguous.patch -URL: http://synce.sourceforge.net/ -ExcludeArch: x86_64 +Name: synce +Version: 0.9.1 +Release: 1%{?dist} +Summary: Serial connection support for Pocket PC devices + +Group: Applications/Communications +License: MIT +URL: http://synce.sourceforge.net/ +Source0: http://dl.sf.net/synce/synce-libsynce-%{version}.tar.gz +Source1: http://dl.sf.net/synce/synce-dccm-%{version}.tar.gz +Source2: http://dl.sf.net/synce/synce-serial-%{version}.tar.gz +Source3: http://dl.sf.net/synce/synce-rra-%{version}.tar.gz +Source4: http://dl.sf.net/synce/synce-librapi2-%{version}.tar.gz +Source5: http://dl.sf.net/synce/libmimedir-0.4.tar.gz +Patch0: synce-rra-Makefile.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + Requires: ppp -BuildRoot: %{_tmppath}/%{name}-%{version}-root + +ExcludeArch: x86_64 %description The purpose of the SynCE project is to provide a means of @@ -37,7 +40,7 @@ %prep %setup -q -c -a 1 -a 2 -a 3 -a 4 -a 5 -%patch0 -p0 -b .ambiguous +%patch0 %build # build libsynce @@ -155,6 +158,11 @@ %{_datadir}/aclocal/*.m4 %changelog +* Sat Aug 20 2005 Andreas Bierfert +0.9.1-1 +- beautify specfile +- upgrade to new version + * Fri Apr 1 2005 Warren Togami 0.9.0-3 - ownership/perms fix (#150016 jpo) - libmimedir-0.4 --- synce-rra-0.9.0-ambiguous.patch DELETED --- From fedora-extras-commits at redhat.com Sat Aug 20 13:57:42 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sat, 20 Aug 2005 09:57:42 -0400 Subject: rpms/synce/devel synce-rra-Makefile.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 synce.spec, 1.4, 1.5 synce-rra-0.9.0-ambiguous.patch, 1.1, NONE Message-ID: <200508201358.j7KDwCva029992@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/synce/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29915/devel Modified Files: .cvsignore sources synce.spec Added Files: synce-rra-Makefile.patch Removed Files: synce-rra-0.9.0-ambiguous.patch Log Message: - version upgrade synce-rra-Makefile.patch: --- NEW FILE synce-rra-Makefile.patch --- --- synce-rra-0.9.1/lib/Makefile.in.orig 2005-08-20 15:08:17.000000000 +0200 +++ synce-rra-0.9.1/lib/Makefile.in 2005-08-20 15:08:44.000000000 +0200 @@ -132,7 +132,7 @@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -AM_CFLAGS = -g -Wall -Wsign-compare -Wno-long-long -Werror -ansi @CFLAGS@ -I.. +AM_CFLAGS = -ansi @CFLAGS@ -I.. include_HEADERS = \ appointment.h \ --- synce-rra-0.9.1/lib/Makefile.am.orig 2005-08-20 15:08:51.000000000 +0200 +++ synce-rra-0.9.1/lib/Makefile.am 2005-08-20 15:09:04.000000000 +0200 @@ -1,5 +1,5 @@ ## useful flags -AM_CFLAGS = -g -Wall -Wsign-compare -Wno-long-long -Werror -ansi @CFLAGS@ -I.. +AM_CFLAGS = -ansi @CFLAGS@ -I.. ## @APPLE_CFLAGS@ includedir = @includedir@/rra --- synce-rra-0.9.1/src/Makefile.in.orig 2005-08-20 15:14:21.000000000 +0200 +++ synce-rra-0.9.1/src/Makefile.in 2005-08-20 15:14:38.000000000 +0200 @@ -131,7 +131,7 @@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -AM_CFLAGS = -g -Wall -Wsign-compare -Wno-long-long -Werror -ansi @CFLAGS@ -I../lib +AM_CFLAGS = -ansi @CFLAGS@ -I../lib LDADD = -L../lib ../lib/librra.la bin_PROGRAMS = synce-matchmaker --- synce-rra-0.9.1/src/Makefile.am.orig 2005-08-20 15:14:12.000000000 +0200 +++ synce-rra-0.9.1/src/Makefile.am 2005-08-20 15:14:55.000000000 +0200 @@ -1,5 +1,5 @@ ## useful flags -AM_CFLAGS = -g -Wall -Wsign-compare -Wno-long-long -Werror -ansi @CFLAGS@ -I../lib +AM_CFLAGS = -ansi @CFLAGS@ -I../lib LDADD = -L../lib ../lib/librra.la bin_PROGRAMS = synce-matchmaker Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/synce/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 2 Apr 2005 01:38:48 -0000 1.3 +++ .cvsignore 20 Aug 2005 13:57:40 -0000 1.4 @@ -1,7 +1,6 @@ -libmimedir-0.3.tar.gz -synce-dccm-0.9.0.tar.gz -synce-librapi2-0.9.0.tar.gz -synce-libsynce-0.9.0.tar.gz -synce-rra-0.9.0.tar.gz -synce-serial-0.9.0.tar.gz +synce-dccm-0.9.1.tar.gz +synce-librapi2-0.9.1.tar.gz +synce-libsynce-0.9.1.tar.gz +synce-rra-0.9.1.tar.gz +synce-serial-0.9.1.tar.gz libmimedir-0.4.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/synce/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 2 Apr 2005 01:38:48 -0000 1.3 +++ sources 20 Aug 2005 13:57:40 -0000 1.4 @@ -1,6 +1,6 @@ -a32607bf423e5e5467b80edc2b7dac5d synce-dccm-0.9.0.tar.gz -f585e8d56c83d4e811197d671fd4c201 synce-librapi2-0.9.0.tar.gz -497efcbf55453da808041e7f8d55690b synce-libsynce-0.9.0.tar.gz -c6e6c29916518359a9c188f455305970 synce-rra-0.9.0.tar.gz -3042891c850fa685e40b1216debc34f9 synce-serial-0.9.0.tar.gz +8818b71133049fe9c739166225aebe0c synce-dccm-0.9.1.tar.gz +6ab07aa21dfbdb1047348b3a47071a3a synce-librapi2-0.9.1.tar.gz +3fcffb776a5bedc23458152e5a650348 synce-libsynce-0.9.1.tar.gz +72742f93f19d5727159989ec80a725f0 synce-rra-0.9.1.tar.gz +77f8879486469118386fb7429ec5a794 synce-serial-0.9.1.tar.gz 156e1eb69377d9ae9180a09e38148ec6 libmimedir-0.4.tar.gz Index: synce.spec =================================================================== RCS file: /cvs/extras/rpms/synce/devel/synce.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- synce.spec 2 Apr 2005 01:38:48 -0000 1.4 +++ synce.spec 20 Aug 2005 13:57:40 -0000 1.5 @@ -1,20 +1,23 @@ -Summary: Serial connection support for Pocket PC devices -Name: synce -Version: 0.9.0 -Release: 3.fc4 -License: MIT -Group: Applications/Communications -Source0: synce-libsynce-%{version}.tar.gz -Source1: synce-dccm-%{version}.tar.gz -Source2: synce-serial-%{version}.tar.gz -Source3: synce-rra-%{version}.tar.gz -Source4: synce-librapi2-%{version}.tar.gz -Source5: libmimedir-0.4.tar.gz -Patch0: synce-rra-0.9.0-ambiguous.patch -URL: http://synce.sourceforge.net/ -ExcludeArch: x86_64 +Name: synce +Version: 0.9.1 +Release: 1%{?dist} +Summary: Serial connection support for Pocket PC devices + +Group: Applications/Communications +License: MIT +URL: http://synce.sourceforge.net/ +Source0: http://dl.sf.net/synce/synce-libsynce-%{version}.tar.gz +Source1: http://dl.sf.net/synce/synce-dccm-%{version}.tar.gz +Source2: http://dl.sf.net/synce/synce-serial-%{version}.tar.gz +Source3: http://dl.sf.net/synce/synce-rra-%{version}.tar.gz +Source4: http://dl.sf.net/synce/synce-librapi2-%{version}.tar.gz +Source5: http://dl.sf.net/synce/libmimedir-0.4.tar.gz +Patch0: synce-rra-Makefile.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + Requires: ppp -BuildRoot: %{_tmppath}/%{name}-%{version}-root + +ExcludeArch: x86_64 %description The purpose of the SynCE project is to provide a means of @@ -37,7 +40,7 @@ %prep %setup -q -c -a 1 -a 2 -a 3 -a 4 -a 5 -%patch0 -p0 -b .ambiguous +%patch0 %build # build libsynce @@ -155,6 +158,11 @@ %{_datadir}/aclocal/*.m4 %changelog +* Sat Aug 20 2005 Andreas Bierfert +0.9.1-1 +- beautify specfile +- upgrade to new version + * Fri Apr 1 2005 Warren Togami 0.9.0-3 - ownership/perms fix (#150016 jpo) - libmimedir-0.4 --- synce-rra-0.9.0-ambiguous.patch DELETED --- From fedora-extras-commits at redhat.com Sat Aug 20 13:57:41 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sat, 20 Aug 2005 09:57:41 -0400 Subject: rpms/synce/FC-4 synce-rra-Makefile.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 synce.spec, 1.4, 1.5 synce-rra-0.9.0-ambiguous.patch, 1.1, NONE Message-ID: <200508201358.j7KDwCMQ029989@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/synce/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29915/FC-4 Modified Files: .cvsignore sources synce.spec Added Files: synce-rra-Makefile.patch Removed Files: synce-rra-0.9.0-ambiguous.patch Log Message: - version upgrade synce-rra-Makefile.patch: --- NEW FILE synce-rra-Makefile.patch --- --- synce-rra-0.9.1/lib/Makefile.in.orig 2005-08-20 15:08:17.000000000 +0200 +++ synce-rra-0.9.1/lib/Makefile.in 2005-08-20 15:08:44.000000000 +0200 @@ -132,7 +132,7 @@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -AM_CFLAGS = -g -Wall -Wsign-compare -Wno-long-long -Werror -ansi @CFLAGS@ -I.. +AM_CFLAGS = -ansi @CFLAGS@ -I.. include_HEADERS = \ appointment.h \ --- synce-rra-0.9.1/lib/Makefile.am.orig 2005-08-20 15:08:51.000000000 +0200 +++ synce-rra-0.9.1/lib/Makefile.am 2005-08-20 15:09:04.000000000 +0200 @@ -1,5 +1,5 @@ ## useful flags -AM_CFLAGS = -g -Wall -Wsign-compare -Wno-long-long -Werror -ansi @CFLAGS@ -I.. +AM_CFLAGS = -ansi @CFLAGS@ -I.. ## @APPLE_CFLAGS@ includedir = @includedir@/rra --- synce-rra-0.9.1/src/Makefile.in.orig 2005-08-20 15:14:21.000000000 +0200 +++ synce-rra-0.9.1/src/Makefile.in 2005-08-20 15:14:38.000000000 +0200 @@ -131,7 +131,7 @@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -AM_CFLAGS = -g -Wall -Wsign-compare -Wno-long-long -Werror -ansi @CFLAGS@ -I../lib +AM_CFLAGS = -ansi @CFLAGS@ -I../lib LDADD = -L../lib ../lib/librra.la bin_PROGRAMS = synce-matchmaker --- synce-rra-0.9.1/src/Makefile.am.orig 2005-08-20 15:14:12.000000000 +0200 +++ synce-rra-0.9.1/src/Makefile.am 2005-08-20 15:14:55.000000000 +0200 @@ -1,5 +1,5 @@ ## useful flags -AM_CFLAGS = -g -Wall -Wsign-compare -Wno-long-long -Werror -ansi @CFLAGS@ -I../lib +AM_CFLAGS = -ansi @CFLAGS@ -I../lib LDADD = -L../lib ../lib/librra.la bin_PROGRAMS = synce-matchmaker Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/synce/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 2 Apr 2005 01:38:48 -0000 1.3 +++ .cvsignore 20 Aug 2005 13:57:39 -0000 1.4 @@ -1,7 +1,6 @@ -libmimedir-0.3.tar.gz -synce-dccm-0.9.0.tar.gz -synce-librapi2-0.9.0.tar.gz -synce-libsynce-0.9.0.tar.gz -synce-rra-0.9.0.tar.gz -synce-serial-0.9.0.tar.gz +synce-dccm-0.9.1.tar.gz +synce-librapi2-0.9.1.tar.gz +synce-libsynce-0.9.1.tar.gz +synce-rra-0.9.1.tar.gz +synce-serial-0.9.1.tar.gz libmimedir-0.4.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/synce/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 2 Apr 2005 01:38:48 -0000 1.3 +++ sources 20 Aug 2005 13:57:39 -0000 1.4 @@ -1,6 +1,6 @@ -a32607bf423e5e5467b80edc2b7dac5d synce-dccm-0.9.0.tar.gz -f585e8d56c83d4e811197d671fd4c201 synce-librapi2-0.9.0.tar.gz -497efcbf55453da808041e7f8d55690b synce-libsynce-0.9.0.tar.gz -c6e6c29916518359a9c188f455305970 synce-rra-0.9.0.tar.gz -3042891c850fa685e40b1216debc34f9 synce-serial-0.9.0.tar.gz +8818b71133049fe9c739166225aebe0c synce-dccm-0.9.1.tar.gz +6ab07aa21dfbdb1047348b3a47071a3a synce-librapi2-0.9.1.tar.gz +3fcffb776a5bedc23458152e5a650348 synce-libsynce-0.9.1.tar.gz +72742f93f19d5727159989ec80a725f0 synce-rra-0.9.1.tar.gz +77f8879486469118386fb7429ec5a794 synce-serial-0.9.1.tar.gz 156e1eb69377d9ae9180a09e38148ec6 libmimedir-0.4.tar.gz Index: synce.spec =================================================================== RCS file: /cvs/extras/rpms/synce/FC-4/synce.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- synce.spec 2 Apr 2005 01:38:48 -0000 1.4 +++ synce.spec 20 Aug 2005 13:57:39 -0000 1.5 @@ -1,20 +1,23 @@ -Summary: Serial connection support for Pocket PC devices -Name: synce -Version: 0.9.0 -Release: 3.fc4 -License: MIT -Group: Applications/Communications -Source0: synce-libsynce-%{version}.tar.gz -Source1: synce-dccm-%{version}.tar.gz -Source2: synce-serial-%{version}.tar.gz -Source3: synce-rra-%{version}.tar.gz -Source4: synce-librapi2-%{version}.tar.gz -Source5: libmimedir-0.4.tar.gz -Patch0: synce-rra-0.9.0-ambiguous.patch -URL: http://synce.sourceforge.net/ -ExcludeArch: x86_64 +Name: synce +Version: 0.9.1 +Release: 1%{?dist} +Summary: Serial connection support for Pocket PC devices + +Group: Applications/Communications +License: MIT +URL: http://synce.sourceforge.net/ +Source0: http://dl.sf.net/synce/synce-libsynce-%{version}.tar.gz +Source1: http://dl.sf.net/synce/synce-dccm-%{version}.tar.gz +Source2: http://dl.sf.net/synce/synce-serial-%{version}.tar.gz +Source3: http://dl.sf.net/synce/synce-rra-%{version}.tar.gz +Source4: http://dl.sf.net/synce/synce-librapi2-%{version}.tar.gz +Source5: http://dl.sf.net/synce/libmimedir-0.4.tar.gz +Patch0: synce-rra-Makefile.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + Requires: ppp -BuildRoot: %{_tmppath}/%{name}-%{version}-root + +ExcludeArch: x86_64 %description The purpose of the SynCE project is to provide a means of @@ -37,7 +40,7 @@ %prep %setup -q -c -a 1 -a 2 -a 3 -a 4 -a 5 -%patch0 -p0 -b .ambiguous +%patch0 %build # build libsynce @@ -155,6 +158,11 @@ %{_datadir}/aclocal/*.m4 %changelog +* Sat Aug 20 2005 Andreas Bierfert +0.9.1-1 +- beautify specfile +- upgrade to new version + * Fri Apr 1 2005 Warren Togami 0.9.0-3 - ownership/perms fix (#150016 jpo) - libmimedir-0.4 --- synce-rra-0.9.0-ambiguous.patch DELETED --- From fedora-extras-commits at redhat.com Sat Aug 20 14:59:42 2005 From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields)) Date: Sat, 20 Aug 2005 10:59:42 -0400 Subject: web/html/docs index.php,1.3,1.4 Message-ID: <200508201459.j7KExgXX031423@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/fedora/web/html/docs In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31406 Modified Files: index.php Log Message: Fix title of yum doc, and remove deprecated updates doc from list Index: index.php =================================================================== RCS file: /cvs/fedora/web/html/docs/index.php,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- index.php 16 Aug 2005 21:11:24 -0000 1.3 +++ index.php 20 Aug 2005 14:59:40 -0000 1.4 @@ -25,10 +25,9 @@ Fedora Core 2 SELinux FAQ Fedora Core 3 SELinux FAQ Stateless Linux tutorial - Keeping Up to Date Udev on Fedora Understanding and Customizing the Apache HTTP SELinux Policy (Fedora Core 3) - Yum Software Management + Managing Software with Yum From fedora-extras-commits at redhat.com Sat Aug 20 16:07:56 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Sat, 20 Aug 2005 12:07:56 -0400 Subject: rpms/grip/devel grip.spec,1.6,1.7 Message-ID: <200508201608.j7KG8Rsv001563@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/grip/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1515 Modified Files: grip.spec Log Message: * Sat Aug 20 2005 Adrian Reber - 1:3.2.0-7 - rebuilt Index: grip.spec =================================================================== RCS file: /cvs/extras/rpms/grip/devel/grip.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- grip.spec 4 Aug 2005 17:24:30 -0000 1.6 +++ grip.spec 20 Aug 2005 16:07:54 -0000 1.7 @@ -1,7 +1,7 @@ Summary: Front-end for CD rippers and Ogg Vorbis encoders Name: grip Version: 3.2.0 -Release: 6%{?dist} +Release: 7%{?dist} Epoch: 1 License: GPL Group: Applications/Multimedia @@ -77,6 +77,9 @@ %{_mandir}/man1/* %changelog +* Sat Aug 20 2005 Adrian Reber - 1:3.2.0-7 +- rebuilt + * Thu Aug 04 2005 Adrian Reber - 1:3.2.0-6 - added patch for buffer overflow in id3.c (#160671) From fedora-extras-commits at redhat.com Sat Aug 20 16:35:58 2005 From: fedora-extras-commits at redhat.com (Jeff Carlson (jcarlson)) Date: Sat, 20 Aug 2005 12:35:58 -0400 Subject: rpms/zile - New directory Message-ID: <200508201635.j7KGZwpv001743@cvs-int.fedora.redhat.com> Author: jcarlson Update of /cvs/extras/rpms/zile In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1723/zile Log Message: Directory /cvs/extras/rpms/zile added to the repository From fedora-extras-commits at redhat.com Sat Aug 20 16:35:58 2005 From: fedora-extras-commits at redhat.com (Jeff Carlson (jcarlson)) Date: Sat, 20 Aug 2005 12:35:58 -0400 Subject: rpms/zile/devel - New directory Message-ID: <200508201636.j7KGZwKt001748@cvs-int.fedora.redhat.com> Author: jcarlson Update of /cvs/extras/rpms/zile/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1723/zile/devel Log Message: Directory /cvs/extras/rpms/zile/devel added to the repository From fedora-extras-commits at redhat.com Sat Aug 20 16:36:12 2005 From: fedora-extras-commits at redhat.com (Jeff Carlson (jcarlson)) Date: Sat, 20 Aug 2005 12:36:12 -0400 Subject: rpms/zile Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200508201636.j7KGaCli001795@cvs-int.fedora.redhat.com> Author: jcarlson Update of /cvs/extras/rpms/zile In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1768 Added Files: Makefile import.log Log Message: Setup of module zile --- NEW FILE Makefile --- # Top level Makefile for module zile all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Sat Aug 20 16:36:12 2005 From: fedora-extras-commits at redhat.com (Jeff Carlson (jcarlson)) Date: Sat, 20 Aug 2005 12:36:12 -0400 Subject: rpms/zile/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200508201636.j7KGaCgd001800@cvs-int.fedora.redhat.com> Author: jcarlson Update of /cvs/extras/rpms/zile/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1768/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module zile --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Sat Aug 20 16:36:40 2005 From: fedora-extras-commits at redhat.com (Jeff Carlson (jcarlson)) Date: Sat, 20 Aug 2005 12:36:40 -0400 Subject: rpms/zile/devel zile.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200508201636.j7KGaeqx001870@cvs-int.fedora.redhat.com> Author: jcarlson Update of /cvs/extras/rpms/zile/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1832/devel Modified Files: .cvsignore sources Added Files: zile.spec Log Message: auto-import zile-2.2.4-1 on branch devel from zile-2.2.4-1.src.rpm --- NEW FILE zile.spec --- Summary: Zile Is Lossy Emacs Name: zile Version: 2.2.4 Release: 1%{?dist} License: GPL Group: Applications/Editors URL: http://zile.sourceforge.net/ Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libtermcap-devel texinfo %description Zile is a small Emacs clone. Zile is a customizable, self-documenting real-time open-source display editor. Zile was written to be as similar as possible to Emacs; every Emacs user should feel at home. %prep %setup -q %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install rm -f $RPM_BUILD_ROOT/%{_infodir}/dir %clean rm -rf $RPM_BUILD_ROOT %post /sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || : %preun if [ $1 == 0 ] ; then /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || : fi %files %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS %{_bindir}/* %{_infodir}/* %{_mandir}/man1/* %{_datadir}/zile/ %changelog * Thu Aug 18 2005 Jeff Carlson - 2.2.4-1 - Bump to latest release. - Supposed to fix x86_64 crash. * Thu Aug 18 2005 Jeff Carlson - 2.2.1-5 - Caught another BuildRequires. * Thu Aug 18 2005 Jeff Carlson - 2.2.1-4 - Added missed BuildRequires. * Fri Aug 12 2005 Jeff Carlson - 2.2.1-3 - Multiple fixups recommended by spot. * Wed Jul 13 2005 Jeff Carlson - 2.2.1-2 - Don't package "dir" in infodir. * Wed Jul 13 2005 Jeff Carlson - 2.2.1-1 - Initial build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/zile/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 20 Aug 2005 16:36:10 -0000 1.1 +++ .cvsignore 20 Aug 2005 16:36:38 -0000 1.2 @@ -0,0 +1 @@ +zile-2.2.4.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/zile/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 20 Aug 2005 16:36:10 -0000 1.1 +++ sources 20 Aug 2005 16:36:38 -0000 1.2 @@ -0,0 +1 @@ +4c4212d9c3bc744ef438bfdf61d976e3 zile-2.2.4.tar.gz From fedora-extras-commits at redhat.com Sat Aug 20 16:36:40 2005 From: fedora-extras-commits at redhat.com (Jeff Carlson (jcarlson)) Date: Sat, 20 Aug 2005 12:36:40 -0400 Subject: rpms/zile import.log,1.1,1.2 Message-ID: <200508201636.j7KGaeBH001863@cvs-int.fedora.redhat.com> Author: jcarlson Update of /cvs/extras/rpms/zile In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1832 Modified Files: import.log Log Message: auto-import zile-2.2.4-1 on branch devel from zile-2.2.4-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/zile/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 20 Aug 2005 16:36:10 -0000 1.1 +++ import.log 20 Aug 2005 16:36:38 -0000 1.2 @@ -0,0 +1 @@ +zile-2_2_4-1:HEAD:zile-2.2.4-1.src.rpm:1124555794 From fedora-extras-commits at redhat.com Sat Aug 20 16:41:03 2005 From: fedora-extras-commits at redhat.com (Jeff Carlson (jcarlson)) Date: Sat, 20 Aug 2005 12:41:03 -0400 Subject: owners owners.list,1.106,1.107 Message-ID: <200508201641.j7KGf3kf001934@cvs-int.fedora.redhat.com> Author: jcarlson Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1917 Modified Files: owners.list Log Message: Added Jeff Carlson as owner of zile. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.106 retrieving revision 1.107 diff -u -r1.106 -r1.107 --- owners.list 20 Aug 2005 13:24:08 -0000 1.106 +++ owners.list 20 Aug 2005 16:41:01 -0000 1.107 @@ -959,6 +959,7 @@ Fedora Extras|yasm|Complete rewrite of the NASM assembler|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|yumex|A GUI for Yum|tla at rasmil.dk|extras-qa at fedoraproject.org| Fedora Extras|yum-utils|Utilities based around the yum package manager|skvidal at phy.duke.edu|extras-qa at fedoraproject.org| +Fedora Extras|zile|Zile Is Lossy Emacs|jeff+redhatbugzilla at ultimateevil.org|extras-qa at fedoraproject.org| Fedora Extras|zoo|File archiving utility with compression|Nicolas.Mailhot at laPoste.net|extras-qa at fedoraproject.org| Fedora Extras|zope|Application server in Python|gauret at free.fr|extras-qa at fedoraproject.org| Fedora Extras|zziplib|Lightweight library to easily extract data from zip files|matthias at rpmforge.net|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sat Aug 20 19:54:47 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sat, 20 Aug 2005 15:54:47 -0400 Subject: rpms/bluefish/devel bluefish.spec,1.13,1.14 Message-ID: <200508201954.j7KJslXP006000@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/bluefish/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5983 Modified Files: bluefish.spec Log Message: prepare ordinary rebuild for GTK+/Cairo change Index: bluefish.spec =================================================================== RCS file: /cvs/extras/rpms/bluefish/devel/bluefish.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- bluefish.spec 29 Jul 2005 21:13:44 -0000 1.13 +++ bluefish.spec 20 Aug 2005 19:54:45 -0000 1.14 @@ -1,7 +1,6 @@ Name: bluefish Version: 1.0.2 -Release: 2%{?dist} - +Release: 3%{?dist} Summary: GTK2 web development application for experienced users Group: Development/Tools @@ -81,6 +80,9 @@ %changelog +* Sat Aug 20 2005 Michael Schwendt - 1.0.2-3 +- rebuilt + * Fri Jul 29 2005 Paul Howarth - 1.0.2-2 - buildrequire libgnomeui-devel, not libgnomeui From fedora-extras-commits at redhat.com Sat Aug 20 21:37:15 2005 From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields)) Date: Sat, 20 Aug 2005 17:37:15 -0400 Subject: rpms/nautilus-open-terminal/devel nautilus-open-terminal.spec, 1.4, 1.5 Message-ID: <200508202137.j7KLbFcS008901@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/extras/rpms/nautilus-open-terminal/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8884 Modified Files: nautilus-open-terminal.spec Log Message: Push release for new build Index: nautilus-open-terminal.spec =================================================================== RCS file: /cvs/extras/rpms/nautilus-open-terminal/devel/nautilus-open-terminal.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- nautilus-open-terminal.spec 19 Aug 2005 17:09:03 -0000 1.4 +++ nautilus-open-terminal.spec 20 Aug 2005 21:37:13 -0000 1.5 @@ -1,6 +1,6 @@ Name: nautilus-open-terminal Version: 0.4 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Nautilus extension for an open terminal shortcut Group: User Interface/Desktops @@ -49,6 +49,9 @@ %{_libdir}/nautilus/extensions-1.0/*.so* %changelog +* Sat Aug 20 2005 Paul W. Frields - 0.4-7 +- Push release for new build + * Wed Aug 17 2005 Paul W. Frields - 0.4-6 - Rebuild against new cairo - Include and remove unused variable (#166346) From fedora-extras-commits at redhat.com Sat Aug 20 22:07:12 2005 From: fedora-extras-commits at redhat.com (Gavin Henry (ghenry)) Date: Sat, 20 Aug 2005 18:07:12 -0400 Subject: owners owners.list,1.107,1.108 Message-ID: <200508202207.j7KM7Cgc010312@cvs-int.fedora.redhat.com> Author: ghenry Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10287 Modified Files: owners.list Log Message: Committing in . Modified Files: owners.list Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.107 retrieving revision 1.108 diff -u -r1.107 -r1.108 --- owners.list 20 Aug 2005 16:41:01 -0000 1.107 +++ owners.list 20 Aug 2005 22:06:56 -0000 1.108 @@ -525,6 +525,7 @@ Fedora Extras|pdfjam|Utilities for join, rotate and align PDFs|jpo at di.uminho.pt|extras-qa at fedoraproject.org| Fedora Extras|pdftk|The PDF Tool Kit|Jochen at herr-schmitt.de|extras-qa at fedoraproject.org| Fedora Extras|pdftohtml|A PDF to HTML converter|gauret at free.fr|extras-qa at fedoraproject.org| +Fedora Extras|perl-Apache-LogRegex|Perl module for parsing a line from an Apache logfile into a hash|ghenry at suretecsystems.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-AppConfig|Perl module for reading configuration files|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Archive-Zip|Perl library for accessing Zip archives|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Array-Compare|Perl extension for comparing arrays|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Sat Aug 20 22:27:25 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sat, 20 Aug 2005 18:27:25 -0400 Subject: rpms/airsnort/devel airsnort.spec,1.2,1.3 Message-ID: <200508202227.j7KMRPW5010453@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/airsnort/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10436 Modified Files: airsnort.spec Log Message: - rebuild Index: airsnort.spec =================================================================== RCS file: /cvs/extras/rpms/airsnort/devel/airsnort.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- airsnort.spec 11 Aug 2005 00:59:51 -0000 1.2 +++ airsnort.spec 20 Aug 2005 22:27:23 -0000 1.3 @@ -1,6 +1,6 @@ Name: airsnort Version: 0.2.7e -Release: 5%{?dist} +Release: 6%{?dist} Summary: Wireless LAN (WLAN) tool which recovers encryption keys Group: Applications/Communications @@ -62,6 +62,10 @@ %{_datadir}/applications/* %changelog +* Sun Aug 21 2005 Andreas Bierfert +0.2.7e-6 +- rebuild + * Thu Aug 11 2005 Andreas Bierfert 0.2.7e-5 - add dist tag From fedora-extras-commits at redhat.com Sat Aug 20 22:34:27 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sat, 20 Aug 2005 18:34:27 -0400 Subject: rpms/synce/FC-4 synce.spec,1.5,1.6 Message-ID: <200508202234.j7KMYRhN010520@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/synce/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10503 Modified Files: synce.spec Log Message: - reenable x86_64 Index: synce.spec =================================================================== RCS file: /cvs/extras/rpms/synce/FC-4/synce.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- synce.spec 20 Aug 2005 13:57:39 -0000 1.5 +++ synce.spec 20 Aug 2005 22:34:25 -0000 1.6 @@ -1,6 +1,6 @@ Name: synce Version: 0.9.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Serial connection support for Pocket PC devices Group: Applications/Communications @@ -17,8 +17,6 @@ Requires: ppp -ExcludeArch: x86_64 - %description The purpose of the SynCE project is to provide a means of communication with a Windows CE device from a computer running Linux, @@ -158,6 +156,10 @@ %{_datadir}/aclocal/*.m4 %changelog +* Sun Aug 21 2005 Andreas Bierfert +0.9.1-2 +- reenable x86_64 + * Sat Aug 20 2005 Andreas Bierfert 0.9.1-1 - beautify specfile From fedora-extras-commits at redhat.com Sat Aug 20 23:11:28 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sat, 20 Aug 2005 19:11:28 -0400 Subject: rpms/synce/FC-4 synce.spec,1.6,1.7 Message-ID: <200508202311.j7KNBSvX011835@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/synce/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11818 Modified Files: synce.spec Log Message: - more x86_64 build fixes Index: synce.spec =================================================================== RCS file: /cvs/extras/rpms/synce/FC-4/synce.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- synce.spec 20 Aug 2005 22:34:25 -0000 1.6 +++ synce.spec 20 Aug 2005 23:11:26 -0000 1.7 @@ -43,7 +43,7 @@ %build # build libsynce cd synce-libsynce-%{version} -%configure +%configure --disable-static make SYNCEINC="$(pwd)/lib" SYNCELIB="$(pwd)/lib/.libs" @@ -52,14 +52,16 @@ cd synce-dccm-%{version} %configure \ --with-libsynce-include="${SYNCEINC}" \ - --with-libsynce-lib="${SYNCELIB}" + --with-libsynce-lib="${SYNCELIB}" \ + --disable-static make LDFLAGS="-L${SYNCEINC}" cd .. # build librapi2 cd synce-librapi2-%{version} %configure \ --with-libsynce-include="${SYNCEINC}" \ - --with-libsynce-lib="${SYNCELIB}" + --with-libsynce-lib="${SYNCELIB}" \ + --disable-static make LDFLAGS="-L${SYNCEINC}" RAPI2INC="$(pwd)/src" RAPI2LIB="$(pwd)/src/.libs" @@ -68,6 +70,9 @@ cd libmimedir-0.4 %configure make +# build shared libmimedir to work around x86_64 build error +ld --shared --whole-archive libmimedir.a -o libmimedir.so +rm libmimedir.a MIMEDIRINC="$(pwd)" MIMEDIRLIB="$(pwd)" cd .. @@ -79,7 +84,8 @@ --with-librapi2-include="${RAPI2INC}" \ --with-librapi2-lib="${RAPI2LIB}" \ --with-libmimedir-include="${MIMEDIRINC}" \ - --with-libmimedir-lib="${MIMEDIRLIB}" + --with-libmimedir-lib="${MIMEDIRLIB}" \ + --disable-static make LDFLAGS="-L${SYNCEINC} -L${RAPI2INC} -L${MIMEDIRLIB}" cd .. # build the serial support @@ -96,6 +102,8 @@ cd .. done +find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';' + %clean rm -rf $RPM_BUILD_ROOT @@ -150,15 +158,14 @@ %files devel %defattr(-,root,root,-) %{_includedir}/*.h -%{_libdir}/lib*.a -%{_libdir}/lib*.la %{_libdir}/lib*.so %{_datadir}/aclocal/*.m4 %changelog * Sun Aug 21 2005 Andreas Bierfert 0.9.1-2 -- reenable x86_64 +- reenable x86_64 (#148003) +- disable static libs * Sat Aug 20 2005 Andreas Bierfert 0.9.1-1 From fedora-extras-commits at redhat.com Sat Aug 20 23:28:03 2005 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Sat, 20 Aug 2005 19:28:03 -0400 Subject: rpms/perl-Text-Autoformat/FC-3 perl-Text-Autoformat.spec,1.3,1.4 Message-ID: <200508202328.j7KNSYdd012000@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Text-Autoformat/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11949/FC-3 Modified Files: perl-Text-Autoformat.spec Log Message: Fix permissions (#166406). Index: perl-Text-Autoformat.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Text-Autoformat/FC-3/perl-Text-Autoformat.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-Text-Autoformat.spec 27 May 2005 02:32:57 -0000 1.3 +++ perl-Text-Autoformat.spec 20 Aug 2005 23:28:01 -0000 1.4 @@ -2,7 +2,7 @@ Name: perl-Text-Autoformat Version: 1.13 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Text::Autoformat Perl module License: Artistic Group: Development/Libraries @@ -32,6 +32,7 @@ %prep %setup -q -n Text-Autoformat-%{version} +chmod a-x lib/Text/Autoformat.pm Changes README %build %{__perl} Makefile.PL INSTALLDIRS=vendor @@ -60,6 +61,9 @@ %{_mandir}/man3/* %changelog +* Sat Aug 20 2005 Steven Pritchard 1.13-2 +- Fix permissions (#166406). + * Tue May 24 2005 Steven Pritchard 1.13-1 - Update to 1.13 final. - Filter bogus perl(Hang) and perl(NullHang) auto-provides. From fedora-extras-commits at redhat.com Sat Aug 20 23:28:04 2005 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Sat, 20 Aug 2005 19:28:04 -0400 Subject: rpms/perl-Text-Autoformat/devel perl-Text-Autoformat.spec,1.4,1.5 Message-ID: <200508202328.j7KNSZg5012006@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Text-Autoformat/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11949/devel Modified Files: perl-Text-Autoformat.spec Log Message: Fix permissions (#166406). Index: perl-Text-Autoformat.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Text-Autoformat/devel/perl-Text-Autoformat.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-Text-Autoformat.spec 25 May 2005 19:03:08 -0000 1.4 +++ perl-Text-Autoformat.spec 20 Aug 2005 23:28:02 -0000 1.5 @@ -2,7 +2,7 @@ Name: perl-Text-Autoformat Version: 1.13 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Text::Autoformat Perl module License: Artistic Group: Development/Libraries @@ -32,6 +32,7 @@ %prep %setup -q -n Text-Autoformat-%{version} +chmod a-x lib/Text/Autoformat.pm Changes README %build %{__perl} Makefile.PL INSTALLDIRS=vendor @@ -60,6 +61,9 @@ %{_mandir}/man3/* %changelog +* Sat Aug 20 2005 Steven Pritchard 1.13-2 +- Fix permissions (#166406). + * Tue May 24 2005 Steven Pritchard 1.13-1 - Update to 1.13 final. - Filter bogus perl(Hang) and perl(NullHang) auto-provides. From fedora-extras-commits at redhat.com Sat Aug 20 23:28:04 2005 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Sat, 20 Aug 2005 19:28:04 -0400 Subject: rpms/perl-Text-Autoformat/FC-4 perl-Text-Autoformat.spec,1.4,1.5 Message-ID: <200508202328.j7KNSY0V012003@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Text-Autoformat/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11949/FC-4 Modified Files: perl-Text-Autoformat.spec Log Message: Fix permissions (#166406). Index: perl-Text-Autoformat.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Text-Autoformat/FC-4/perl-Text-Autoformat.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-Text-Autoformat.spec 25 May 2005 19:03:08 -0000 1.4 +++ perl-Text-Autoformat.spec 20 Aug 2005 23:28:02 -0000 1.5 @@ -2,7 +2,7 @@ Name: perl-Text-Autoformat Version: 1.13 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Text::Autoformat Perl module License: Artistic Group: Development/Libraries @@ -32,6 +32,7 @@ %prep %setup -q -n Text-Autoformat-%{version} +chmod a-x lib/Text/Autoformat.pm Changes README %build %{__perl} Makefile.PL INSTALLDIRS=vendor @@ -60,6 +61,9 @@ %{_mandir}/man3/* %changelog +* Sat Aug 20 2005 Steven Pritchard 1.13-2 +- Fix permissions (#166406). + * Tue May 24 2005 Steven Pritchard 1.13-1 - Update to 1.13 final. - Filter bogus perl(Hang) and perl(NullHang) auto-provides. From fedora-extras-commits at redhat.com Sat Aug 20 23:33:20 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sat, 20 Aug 2005 19:33:20 -0400 Subject: rpms/synce/FC-4 synce.spec,1.7,1.8 Message-ID: <200508202333.j7KNXK2m012143@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/synce/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12126 Modified Files: synce.spec Log Message: - add fPIC for libmimedir Index: synce.spec =================================================================== RCS file: /cvs/extras/rpms/synce/FC-4/synce.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- synce.spec 20 Aug 2005 23:11:26 -0000 1.7 +++ synce.spec 20 Aug 2005 23:33:18 -0000 1.8 @@ -68,7 +68,7 @@ cd .. # build libmimedir cd libmimedir-0.4 -%configure +CFLAGS="$RPM_OPT_FLAGS -fPIC" %configure make # build shared libmimedir to work around x86_64 build error ld --shared --whole-archive libmimedir.a -o libmimedir.so From fedora-extras-commits at redhat.com Sat Aug 20 23:42:43 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sat, 20 Aug 2005 19:42:43 -0400 Subject: rpms/synce/FC-3 synce.spec,1.4,1.5 Message-ID: <200508202343.j7KNhDoB012302@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/synce/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12268/FC-3 Modified Files: synce.spec Log Message: - reenable x86_64 - disable static libs Index: synce.spec =================================================================== RCS file: /cvs/extras/rpms/synce/FC-3/synce.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- synce.spec 20 Aug 2005 13:57:39 -0000 1.4 +++ synce.spec 20 Aug 2005 23:42:41 -0000 1.5 @@ -1,6 +1,6 @@ Name: synce Version: 0.9.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Serial connection support for Pocket PC devices Group: Applications/Communications @@ -17,8 +17,6 @@ Requires: ppp -ExcludeArch: x86_64 - %description The purpose of the SynCE project is to provide a means of communication with a Windows CE device from a computer running Linux, @@ -45,7 +43,7 @@ %build # build libsynce cd synce-libsynce-%{version} -%configure +%configure --disable-static make SYNCEINC="$(pwd)/lib" SYNCELIB="$(pwd)/lib/.libs" @@ -54,22 +52,27 @@ cd synce-dccm-%{version} %configure \ --with-libsynce-include="${SYNCEINC}" \ - --with-libsynce-lib="${SYNCELIB}" + --with-libsynce-lib="${SYNCELIB}" \ + --disable-static make LDFLAGS="-L${SYNCEINC}" cd .. # build librapi2 cd synce-librapi2-%{version} %configure \ --with-libsynce-include="${SYNCEINC}" \ - --with-libsynce-lib="${SYNCELIB}" + --with-libsynce-lib="${SYNCELIB}" \ + --disable-static make LDFLAGS="-L${SYNCEINC}" RAPI2INC="$(pwd)/src" RAPI2LIB="$(pwd)/src/.libs" cd .. # build libmimedir cd libmimedir-0.4 -%configure +CFLAGS="$RPM_OPT_FLAGS -fPIC" %configure make +# build shared libmimedir to work around x86_64 build error +ld --shared --whole-archive libmimedir.a -o libmimedir.so +rm libmimedir.a MIMEDIRINC="$(pwd)" MIMEDIRLIB="$(pwd)" cd .. @@ -81,7 +84,8 @@ --with-librapi2-include="${RAPI2INC}" \ --with-librapi2-lib="${RAPI2LIB}" \ --with-libmimedir-include="${MIMEDIRINC}" \ - --with-libmimedir-lib="${MIMEDIRLIB}" + --with-libmimedir-lib="${MIMEDIRLIB}" \ + --disable-static make LDFLAGS="-L${SYNCEINC} -L${RAPI2INC} -L${MIMEDIRLIB}" cd .. # build the serial support @@ -98,6 +102,8 @@ cd .. done +find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';' + %clean rm -rf $RPM_BUILD_ROOT @@ -152,12 +158,15 @@ %files devel %defattr(-,root,root,-) %{_includedir}/*.h -%{_libdir}/lib*.a -%{_libdir}/lib*.la %{_libdir}/lib*.so %{_datadir}/aclocal/*.m4 %changelog +* Sun Aug 21 2005 Andreas Bierfert +0.9.1-2 +- reenable x86_64 (#148003) +- disable static libs + * Sat Aug 20 2005 Andreas Bierfert 0.9.1-1 - beautify specfile From fedora-extras-commits at redhat.com Sat Aug 20 23:42:44 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sat, 20 Aug 2005 19:42:44 -0400 Subject: rpms/synce/devel synce.spec,1.5,1.6 Message-ID: <200508202343.j7KNhEKJ012305@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/synce/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12268/devel Modified Files: synce.spec Log Message: - reenable x86_64 - disable static libs Index: synce.spec =================================================================== RCS file: /cvs/extras/rpms/synce/devel/synce.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- synce.spec 20 Aug 2005 13:57:40 -0000 1.5 +++ synce.spec 20 Aug 2005 23:42:41 -0000 1.6 @@ -1,6 +1,6 @@ Name: synce Version: 0.9.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Serial connection support for Pocket PC devices Group: Applications/Communications @@ -17,8 +17,6 @@ Requires: ppp -ExcludeArch: x86_64 - %description The purpose of the SynCE project is to provide a means of communication with a Windows CE device from a computer running Linux, @@ -45,7 +43,7 @@ %build # build libsynce cd synce-libsynce-%{version} -%configure +%configure --disable-static make SYNCEINC="$(pwd)/lib" SYNCELIB="$(pwd)/lib/.libs" @@ -54,22 +52,27 @@ cd synce-dccm-%{version} %configure \ --with-libsynce-include="${SYNCEINC}" \ - --with-libsynce-lib="${SYNCELIB}" + --with-libsynce-lib="${SYNCELIB}" \ + --disable-static make LDFLAGS="-L${SYNCEINC}" cd .. # build librapi2 cd synce-librapi2-%{version} %configure \ --with-libsynce-include="${SYNCEINC}" \ - --with-libsynce-lib="${SYNCELIB}" + --with-libsynce-lib="${SYNCELIB}" \ + --disable-static make LDFLAGS="-L${SYNCEINC}" RAPI2INC="$(pwd)/src" RAPI2LIB="$(pwd)/src/.libs" cd .. # build libmimedir cd libmimedir-0.4 -%configure +CFLAGS="$RPM_OPT_FLAGS -fPIC" %configure make +# build shared libmimedir to work around x86_64 build error +ld --shared --whole-archive libmimedir.a -o libmimedir.so +rm libmimedir.a MIMEDIRINC="$(pwd)" MIMEDIRLIB="$(pwd)" cd .. @@ -81,7 +84,8 @@ --with-librapi2-include="${RAPI2INC}" \ --with-librapi2-lib="${RAPI2LIB}" \ --with-libmimedir-include="${MIMEDIRINC}" \ - --with-libmimedir-lib="${MIMEDIRLIB}" + --with-libmimedir-lib="${MIMEDIRLIB}" \ + --disable-static make LDFLAGS="-L${SYNCEINC} -L${RAPI2INC} -L${MIMEDIRLIB}" cd .. # build the serial support @@ -98,6 +102,8 @@ cd .. done +find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';' + %clean rm -rf $RPM_BUILD_ROOT @@ -152,12 +158,15 @@ %files devel %defattr(-,root,root,-) %{_includedir}/*.h -%{_libdir}/lib*.a -%{_libdir}/lib*.la %{_libdir}/lib*.so %{_datadir}/aclocal/*.m4 %changelog +* Sun Aug 21 2005 Andreas Bierfert +0.9.1-2 +- reenable x86_64 (#148003) +- disable static libs + * Sat Aug 20 2005 Andreas Bierfert 0.9.1-1 - beautify specfile From fedora-extras-commits at redhat.com Sat Aug 20 23:47:01 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sat, 20 Aug 2005 19:47:01 -0400 Subject: rpms/sylpheed-claws-plugins/FC-4 sylpheed-claws-plugins.spec, 1.2, 1.3 Message-ID: <200508202347.j7KNlVLG012432@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/sylpheed-claws-plugins/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12400/FC-4 Modified Files: sylpheed-claws-plugins.spec Log Message: - enable x86_64 synce plugin Index: sylpheed-claws-plugins.spec =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws-plugins/FC-4/sylpheed-claws-plugins.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sylpheed-claws-plugins.spec 19 Aug 2005 23:05:58 -0000 1.2 +++ sylpheed-claws-plugins.spec 20 Aug 2005 23:46:59 -0000 1.3 @@ -1,6 +1,6 @@ Name: sylpheed-claws-plugins Version: 1.9.13 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Additional plugins for sylpheed-claws Group: Applications/Internet @@ -14,9 +14,7 @@ BuildRequires: gtk2-devel BuildRequires: libetpan-devel BuildRequires: perl -%ifnarch x86_64 BuildRequires: synce-devel -%endif Requires: %{name}-cachesaver = %{version}-%{release} Requires: %{name}-etpan-privacy = %{version}-%{release} @@ -24,9 +22,7 @@ Requires: %{name}-maildir = %{version}-%{release} Requires: %{name}-mailmbox = %{version}-%{release} Requires: %{name}-perl = %{version}-%{release} -%ifnarch x86_64 Requires: %{name}-synce = %{version}-%{release} -%endif Requires: %{name}-vcalendar = %{version}-%{release} %description @@ -88,7 +84,6 @@ This plugin provides an extended filtering engine for the email client sylpheed-claws. It allows for the use of full perl power in email filters. -%ifnarch x86_64 %package synce Summary: Keeping the addressbook of a Windows CE device in sync Group: Applications/Internet @@ -98,7 +93,6 @@ This plugin assists in keeping the addressbook of a Windows CE device (Pocket PC/ iPAQ, Smartphone etc) in sync with Claws' addressbook, with respect to email addresses. -%endif %package vcalendar Summary: vCalendar message handling @@ -145,11 +139,9 @@ %{__make} %{?_smp_mflags} #synce -%ifnarch x86_64 cd ../synce_plugin-0.2 %configure --disable-static --disable-dependency-tracking %{__make} %{?_smp_mflags} -%endif #vcalendar cd ../vcalendar-1.6 @@ -184,10 +176,8 @@ %{__make} install DESTDIR=$RPM_BUILD_ROOT #synce -%ifnarch x86_64 cd ../synce_plugin-0.2 %{__make} install DESTDIR=$RPM_BUILD_ROOT -%endif #vcalendar cd ../vcalendar-1.6 @@ -250,7 +240,6 @@ %doc perl_plugin-0.3/sc_perl.pod %{_libdir}/sylpheed-claws/plugins/perl_plugin.so -%ifnarch x86_64 %files synce %defattr(-,root,root,-) %doc synce_plugin-0.2/AUTHORS @@ -258,7 +247,6 @@ %doc synce_plugin-0.2/COPYING %doc synce_plugin-0.2/README %{_libdir}/sylpheed-claws/plugins/synce* -%endif %files vcalendar %defattr(-,root,root,-) @@ -270,6 +258,10 @@ %exclude %{_includedir}/ical.h %changelog +* Sun Aug 21 2005 Andreas Bierfert +1.9.13-5 +- enable x86_64 synce plugin + * Sat Aug 20 2005 Andreas Bierfert 1.9.13-4 - add dist tag From fedora-extras-commits at redhat.com Sat Aug 20 23:47:01 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sat, 20 Aug 2005 19:47:01 -0400 Subject: rpms/sylpheed-claws-plugins/devel sylpheed-claws-plugins.spec, 1.2, 1.3 Message-ID: <200508202347.j7KNlVwM012435@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/sylpheed-claws-plugins/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12400/devel Modified Files: sylpheed-claws-plugins.spec Log Message: - enable x86_64 synce plugin Index: sylpheed-claws-plugins.spec =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws-plugins/devel/sylpheed-claws-plugins.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sylpheed-claws-plugins.spec 19 Aug 2005 23:05:58 -0000 1.2 +++ sylpheed-claws-plugins.spec 20 Aug 2005 23:46:59 -0000 1.3 @@ -1,6 +1,6 @@ Name: sylpheed-claws-plugins Version: 1.9.13 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Additional plugins for sylpheed-claws Group: Applications/Internet @@ -14,9 +14,7 @@ BuildRequires: gtk2-devel BuildRequires: libetpan-devel BuildRequires: perl -%ifnarch x86_64 BuildRequires: synce-devel -%endif Requires: %{name}-cachesaver = %{version}-%{release} Requires: %{name}-etpan-privacy = %{version}-%{release} @@ -24,9 +22,7 @@ Requires: %{name}-maildir = %{version}-%{release} Requires: %{name}-mailmbox = %{version}-%{release} Requires: %{name}-perl = %{version}-%{release} -%ifnarch x86_64 Requires: %{name}-synce = %{version}-%{release} -%endif Requires: %{name}-vcalendar = %{version}-%{release} %description @@ -88,7 +84,6 @@ This plugin provides an extended filtering engine for the email client sylpheed-claws. It allows for the use of full perl power in email filters. -%ifnarch x86_64 %package synce Summary: Keeping the addressbook of a Windows CE device in sync Group: Applications/Internet @@ -98,7 +93,6 @@ This plugin assists in keeping the addressbook of a Windows CE device (Pocket PC/ iPAQ, Smartphone etc) in sync with Claws' addressbook, with respect to email addresses. -%endif %package vcalendar Summary: vCalendar message handling @@ -145,11 +139,9 @@ %{__make} %{?_smp_mflags} #synce -%ifnarch x86_64 cd ../synce_plugin-0.2 %configure --disable-static --disable-dependency-tracking %{__make} %{?_smp_mflags} -%endif #vcalendar cd ../vcalendar-1.6 @@ -184,10 +176,8 @@ %{__make} install DESTDIR=$RPM_BUILD_ROOT #synce -%ifnarch x86_64 cd ../synce_plugin-0.2 %{__make} install DESTDIR=$RPM_BUILD_ROOT -%endif #vcalendar cd ../vcalendar-1.6 @@ -250,7 +240,6 @@ %doc perl_plugin-0.3/sc_perl.pod %{_libdir}/sylpheed-claws/plugins/perl_plugin.so -%ifnarch x86_64 %files synce %defattr(-,root,root,-) %doc synce_plugin-0.2/AUTHORS @@ -258,7 +247,6 @@ %doc synce_plugin-0.2/COPYING %doc synce_plugin-0.2/README %{_libdir}/sylpheed-claws/plugins/synce* -%endif %files vcalendar %defattr(-,root,root,-) @@ -270,6 +258,10 @@ %exclude %{_includedir}/ical.h %changelog +* Sun Aug 21 2005 Andreas Bierfert +1.9.13-5 +- enable x86_64 synce plugin + * Sat Aug 20 2005 Andreas Bierfert 1.9.13-4 - add dist tag From fedora-extras-commits at redhat.com Sun Aug 21 00:08:13 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sat, 20 Aug 2005 20:08:13 -0400 Subject: rpms/perl-Apache-LogRegex - New directory Message-ID: <200508210008.j7L08DTx013700@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/perl-Apache-LogRegex In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13686/perl-Apache-LogRegex Log Message: Directory /cvs/extras/rpms/perl-Apache-LogRegex added to the repository From fedora-extras-commits at redhat.com Sun Aug 21 00:08:59 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sat, 20 Aug 2005 20:08:59 -0400 Subject: rpms/perl-Apache-LogRegex/devel - New directory Message-ID: <200508210008.j7L08xOW013756@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/perl-Apache-LogRegex/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13742/perl-Apache-LogRegex/devel Log Message: Directory /cvs/extras/rpms/perl-Apache-LogRegex/devel added to the repository From fedora-extras-commits at redhat.com Sun Aug 21 00:09:42 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sat, 20 Aug 2005 20:09:42 -0400 Subject: rpms/perl-Apache-LogRegex Makefile,NONE,1.1 Message-ID: <200508210009.j7L09gMX013795@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/perl-Apache-LogRegex In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13767/perl-Apache-LogRegex Added Files: Makefile Log Message: set up module --- NEW FILE Makefile --- # Top level Makefile for module perl-Apache-LogRegex all : CVS/Root common-update @cvs update common-update : CVS/Root common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Sun Aug 21 00:09:43 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sat, 20 Aug 2005 20:09:43 -0400 Subject: rpms/perl-Apache-LogRegex/devel Makefile,NONE,1.1 Message-ID: <200508210009.j7L09hp5013800@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/perl-Apache-LogRegex/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13767/perl-Apache-LogRegex/devel Added Files: Makefile Log Message: set up module ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' From fedora-extras-commits at redhat.com Sun Aug 21 00:31:57 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sat, 20 Aug 2005 20:31:57 -0400 Subject: rpms/synce/FC-4 synce.spec,1.8,1.9 Message-ID: <200508210031.j7L0Vvpb013836@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/synce/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13819 Modified Files: synce.spec Log Message: - fix dep problem - add missing ldconfig Index: synce.spec =================================================================== RCS file: /cvs/extras/rpms/synce/FC-4/synce.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- synce.spec 20 Aug 2005 23:33:18 -0000 1.8 +++ synce.spec 21 Aug 2005 00:31:55 -0000 1.9 @@ -1,6 +1,6 @@ Name: synce Version: 0.9.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Serial connection support for Pocket PC devices Group: Applications/Communications @@ -102,11 +102,17 @@ cd .. done +install -m 775 libmimedir-0.4/libmimedir.so $RPM_BUILD_ROOT/%{_libdir}/libmimedir.so + find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';' %clean rm -rf $RPM_BUILD_ROOT +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + %files %defattr(-,root,root,-) #%doc README LICENSE @@ -154,6 +160,8 @@ %{_bindir}/synce-serial-* %{_datadir}/synce %{_mandir}/man8/synce-serial-* +#libmimedir +%{_libdir}/libmimedir.so %files devel %defattr(-,root,root,-) @@ -163,6 +171,11 @@ %changelog * Sun Aug 21 2005 Andreas Bierfert +0.9.1-3 +- fix dep problem +- add missing ldconfig + +* Sun Aug 21 2005 Andreas Bierfert 0.9.1-2 - reenable x86_64 (#148003) - disable static libs From fedora-extras-commits at redhat.com Sun Aug 21 00:39:15 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sat, 20 Aug 2005 20:39:15 -0400 Subject: rpms/synce/FC-3 synce.spec,1.5,1.6 Message-ID: <200508210039.j7L0dF8I013910@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/synce/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13881/FC-3 Modified Files: synce.spec Log Message: - fix dep problem - add missing ldconfig Index: synce.spec =================================================================== RCS file: /cvs/extras/rpms/synce/FC-3/synce.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- synce.spec 20 Aug 2005 23:42:41 -0000 1.5 +++ synce.spec 21 Aug 2005 00:39:13 -0000 1.6 @@ -1,6 +1,6 @@ Name: synce Version: 0.9.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Serial connection support for Pocket PC devices Group: Applications/Communications @@ -102,11 +102,17 @@ cd .. done +install -m 775 libmimedir-0.4/libmimedir.so $RPM_BUILD_ROOT/%{_libdir}/libmimedir.so + find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';' %clean rm -rf $RPM_BUILD_ROOT +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + %files %defattr(-,root,root,-) #%doc README LICENSE @@ -154,6 +160,8 @@ %{_bindir}/synce-serial-* %{_datadir}/synce %{_mandir}/man8/synce-serial-* +#libmimedir +%{_libdir}/libmimedir.so %files devel %defattr(-,root,root,-) @@ -163,6 +171,11 @@ %changelog * Sun Aug 21 2005 Andreas Bierfert +0.9.1-3 +- fix dep problem +- add missing ldconfig + +* Sun Aug 21 2005 Andreas Bierfert 0.9.1-2 - reenable x86_64 (#148003) - disable static libs From fedora-extras-commits at redhat.com Sun Aug 21 00:39:16 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sat, 20 Aug 2005 20:39:16 -0400 Subject: rpms/synce/devel synce.spec,1.6,1.7 Message-ID: <200508210039.j7L0dGMj013916@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/synce/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13881/devel Modified Files: synce.spec Log Message: - fix dep problem - add missing ldconfig Index: synce.spec =================================================================== RCS file: /cvs/extras/rpms/synce/devel/synce.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- synce.spec 20 Aug 2005 23:42:41 -0000 1.6 +++ synce.spec 21 Aug 2005 00:39:14 -0000 1.7 @@ -1,6 +1,6 @@ Name: synce Version: 0.9.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Serial connection support for Pocket PC devices Group: Applications/Communications @@ -102,11 +102,17 @@ cd .. done +install -m 775 libmimedir-0.4/libmimedir.so $RPM_BUILD_ROOT/%{_libdir}/libmimedir.so + find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';' %clean rm -rf $RPM_BUILD_ROOT +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + %files %defattr(-,root,root,-) #%doc README LICENSE @@ -154,6 +160,8 @@ %{_bindir}/synce-serial-* %{_datadir}/synce %{_mandir}/man8/synce-serial-* +#libmimedir +%{_libdir}/libmimedir.so %files devel %defattr(-,root,root,-) @@ -163,6 +171,11 @@ %changelog * Sun Aug 21 2005 Andreas Bierfert +0.9.1-3 +- fix dep problem +- add missing ldconfig + +* Sun Aug 21 2005 Andreas Bierfert 0.9.1-2 - reenable x86_64 (#148003) - disable static libs From fedora-extras-commits at redhat.com Sun Aug 21 00:57:26 2005 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Sat, 20 Aug 2005 20:57:26 -0400 Subject: owners owners.list,1.108,1.109 Message-ID: <200508210057.j7L0vQCu014034@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14017 Modified Files: owners.list Log Message: Add perl-Class-Container and perl-Exception-Class. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.108 retrieving revision 1.109 diff -u -r1.108 -r1.109 --- owners.list 20 Aug 2005 22:06:56 -0000 1.108 +++ owners.list 21 Aug 2005 00:57:24 -0000 1.109 @@ -537,6 +537,7 @@ Fedora Extras|perl-CGI-Untaint|Process CGI input parameters|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Chart|Perl modules for producing many types of charts|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Class-Accessor|Automated accessor generation|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Class-Container|Perl module for building frameworks of classes|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Class-Data-Inheritable|Inheritable, overridable class data|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Class-MethodMaker|Create generic methods for OO Perl|dgregor at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Class-Trigger|Mixin to add / call inheritable triggers|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com @@ -557,6 +558,7 @@ Fedora Extras|perl-Devel-StackTrace|Perl module implementing stack trace and stack trace frame objects|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Digest-Nilsimsa|Perl interface to the Nilsima Algorithm|wtogami at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Error|Error Perl module|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Exception-Class|Declare hierarchies of exception classes|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Exporter-Lite|Lightweight exporting of variables|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-ExtUtils-CBuilder|Compile and link C code for Perl modules|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-ExtUtils-Depends|Easily build XS extensions that depend on XS extensions|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Sun Aug 21 01:25:57 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Sat, 20 Aug 2005 21:25:57 -0400 Subject: rpms/scim-anthy/FC-3 .cvsignore, 1.4, 1.5 scim-anthy.spec, 1.11, 1.12 sources, 1.5, 1.6 Message-ID: <200508210125.j7L1PwvK015347@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim-anthy/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15326 Modified Files: .cvsignore scim-anthy.spec sources Log Message: Sync with FC4 branch Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/scim-anthy/FC-3/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 29 Jul 2005 11:12:16 -0000 1.4 +++ .cvsignore 21 Aug 2005 01:25:55 -0000 1.5 @@ -1 +1 @@ -scim-anthy-0.5.3.tar.gz +scim-anthy-0.6.1.tar.gz Index: scim-anthy.spec =================================================================== RCS file: /cvs/extras/rpms/scim-anthy/FC-3/scim-anthy.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- scim-anthy.spec 2 Aug 2005 01:22:17 -0000 1.11 +++ scim-anthy.spec 21 Aug 2005 01:25:55 -0000 1.12 @@ -1,6 +1,6 @@ Name: scim-anthy -Version: 0.5.3 -Release: 3.1%{?dist} +Version: 0.6.1 +Release: 1%{?dist} Summary: SCIM IMEngine for anthy for Japanese input Group: System Environment/Libraries @@ -9,7 +9,6 @@ Source0: http://sourceforge.jp/projects/scim-imengine/files/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: anthy BuildRequires: scim-devel anthy-devel %description @@ -46,6 +45,10 @@ %changelog +* Fri Aug 19 2005 Jens Petersen - 0.6.1-1 +- 0.6.1 release +- no longer explicitly require anthy + * Tue Aug 2 2005 Ryo Dairiki - 0.5.3-3.1 - remove update-xinput-scim settings Index: sources =================================================================== RCS file: /cvs/extras/rpms/scim-anthy/FC-3/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 29 Jul 2005 11:12:16 -0000 1.5 +++ sources 21 Aug 2005 01:25:55 -0000 1.6 @@ -1 +1 @@ -ba42960652a82cd594f443d8275184f9 scim-anthy-0.5.3.tar.gz +a4df7596d8f9f019313bb03f12d7cb78 scim-anthy-0.6.1.tar.gz From fedora-extras-commits at redhat.com Sun Aug 21 10:56:23 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Sun, 21 Aug 2005 06:56:23 -0400 Subject: rpms/perl-Font-AFM - New directory Message-ID: <200508211056.j7LAuN2E031052@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Font-AFM In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31032/perl-Font-AFM Log Message: Directory /cvs/extras/rpms/perl-Font-AFM added to the repository From fedora-extras-commits at redhat.com Sun Aug 21 10:56:23 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Sun, 21 Aug 2005 06:56:23 -0400 Subject: rpms/perl-Font-AFM/devel - New directory Message-ID: <200508211056.j7LAuNGT031057@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Font-AFM/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31032/perl-Font-AFM/devel Log Message: Directory /cvs/extras/rpms/perl-Font-AFM/devel added to the repository From fedora-extras-commits at redhat.com Sun Aug 21 10:56:51 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Sun, 21 Aug 2005 06:56:51 -0400 Subject: rpms/perl-Font-AFM/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200508211056.j7LAup2i031092@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Font-AFM/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31074/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Font-AFM --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Sun Aug 21 10:57:47 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Sun, 21 Aug 2005 06:57:47 -0400 Subject: rpms/perl-Font-AFM/devel perl-Font-AFM.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200508211057.j7LAvlro031140@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Font-AFM/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31120/devel Modified Files: .cvsignore sources Added Files: perl-Font-AFM.spec Log Message: auto-import perl-Font-AFM-1.19-1 on branch devel from perl-Font-AFM-1.19-1.src.rpm --- NEW FILE perl-Font-AFM.spec --- Name: perl-Font-AFM Version: 1.19 Release: 1%{?dist} Summary: Font::AFM Perl module Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/Font-AFM/ Source0: http://www.cpan.org/authors/id/G/GA/GAAS/Font-AFM-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildArch: noarch %description Interface to Adobe Font Metrics files %prep %setup -q -n Font-AFM-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README %{perl_vendorlib}/Font %{_mandir}/man3/Font* %changelog * Thu Aug 22 2005 Ralf Corsepius - 1.19-1 - FE submission. * Mon Mar 21 2005 Ralf Corsepius - 1.19-0.pm.2 - Initial packman release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Font-AFM/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 21 Aug 2005 10:56:49 -0000 1.1 +++ .cvsignore 21 Aug 2005 10:57:45 -0000 1.2 @@ -0,0 +1 @@ +Font-AFM-1.19.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Font-AFM/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 21 Aug 2005 10:56:49 -0000 1.1 +++ sources 21 Aug 2005 10:57:45 -0000 1.2 @@ -0,0 +1 @@ +f72a12a20656c41b29a79c985bd231c9 Font-AFM-1.19.tar.gz From fedora-extras-commits at redhat.com Sun Aug 21 11:06:26 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Sun, 21 Aug 2005 07:06:26 -0400 Subject: rpms/perl-Font-AFM/devel perl-Font-AFM.spec,1.1,1.2 Message-ID: <200508211106.j7LB6QVJ032403@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Font-AFM/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32386 Modified Files: perl-Font-AFM.spec Log Message: Review feedback Index: perl-Font-AFM.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Font-AFM/devel/perl-Font-AFM.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Font-AFM.spec 21 Aug 2005 10:57:45 -0000 1.1 +++ perl-Font-AFM.spec 21 Aug 2005 11:06:24 -0000 1.2 @@ -1,23 +1,28 @@ Name: perl-Font-AFM Version: 1.19 -Release: 1%{?dist} -Summary: Font::AFM Perl module +Release: 2%{?dist} +Summary: Perl interface to Adobe Font Metrics files Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/Font-AFM/ Source0: http://www.cpan.org/authors/id/G/GA/GAAS/Font-AFM-%{version}.tar.gz + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildArch: noarch +BuildRequires: %{_datadir}/a2ps/afm/phvr.afm + %description Interface to Adobe Font Metrics files %prep %setup -q -n Font-AFM-%{version} +# We don't have Helvetica, use phvr.afm instead +sed -i -e 's,Helvetica,phvr,g' t/afm.t %build %{__perl} Makefile.PL INSTALLDIRS=vendor @@ -33,8 +38,7 @@ %check -make test - +make test METRICS=%{_datadir}/a2ps/afm %clean rm -rf $RPM_BUILD_ROOT @@ -47,7 +51,10 @@ %{_mandir}/man3/Font* %changelog -* Thu Aug 22 2005 Ralf Corsepius - 1.19-1 +* Thu Aug 22 2005 Ralf Corsepius - 1.19-2 +- Review feedback. + +* Thu Aug 18 2005 Ralf Corsepius - 1.19-1 - FE submission. * Mon Mar 21 2005 Ralf Corsepius - 1.19-0.pm.2 From fedora-extras-commits at redhat.com Sun Aug 21 11:09:41 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Sun, 21 Aug 2005 07:09:41 -0400 Subject: owners owners.list,1.109,1.110 Message-ID: <200508211109.j7LB9fTD032475@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32458 Modified Files: owners.list Log Message: Add perl-Font-AFM Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.109 retrieving revision 1.110 diff -u -r1.109 -r1.110 --- owners.list 21 Aug 2005 00:57:24 -0000 1.109 +++ owners.list 21 Aug 2005 11:09:39 -0000 1.110 @@ -568,6 +568,7 @@ Fedora Extras|perl-File-BOM|Utilities for reading Byte Order Marks|mpeters at mac.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-File-Find-Rule|Perl module implementing an alternative interface to File::Find|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-File-Tail|Perl extension for reading from continously updated files|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Font-AFM|Perl interface to Adobe Font Metrics files|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-FreezeThaw|Convert Perl structures to strings and back|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-GDGraph3d|3D graph generation package for Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-GDGraph|Graph generation package for Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Sun Aug 21 11:57:20 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Sun, 21 Aug 2005 07:57:20 -0400 Subject: rpms/perl-Font-AFM/devel perl-Font-AFM.spec,1.2,1.3 Message-ID: <200508211157.j7LBvKpw032595@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Font-AFM/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32578 Modified Files: perl-Font-AFM.spec Log Message: I love changelogs. Index: perl-Font-AFM.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Font-AFM/devel/perl-Font-AFM.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Font-AFM.spec 21 Aug 2005 11:06:24 -0000 1.2 +++ perl-Font-AFM.spec 21 Aug 2005 11:57:18 -0000 1.3 @@ -51,11 +51,11 @@ %{_mandir}/man3/Font* %changelog -* Thu Aug 22 2005 Ralf Corsepius - 1.19-2 +* Sun Aug 21 2005 Ralf Corsepius - 1.19-3 +- Changelog cleanup. + +* Sun Aug 21 2005 Ralf Corsepius - 1.19-2 - Review feedback. * Thu Aug 18 2005 Ralf Corsepius - 1.19-1 - FE submission. - -* Mon Mar 21 2005 Ralf Corsepius - 1.19-0.pm.2 -- Initial packman release. From fedora-extras-commits at redhat.com Sun Aug 21 12:40:18 2005 From: fedora-extras-commits at redhat.com (Marc Maurer (uwog)) Date: Sun, 21 Aug 2005 08:40:18 -0400 Subject: rpms/abiword/devel .cvsignore, 1.7, 1.8 abiword.spec, 1.14, 1.15 sources, 1.7, 1.8 Message-ID: <200508211240.j7LCeI4s001411@cvs-int.fedora.redhat.com> Author: uwog Update of /cvs/extras/rpms/abiword/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1390 Modified Files: .cvsignore abiword.spec sources Log Message: Update to 2.3.5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/abiword/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 16 Aug 2005 22:46:25 -0000 1.7 +++ .cvsignore 21 Aug 2005 12:40:16 -0000 1.8 @@ -1 +1 @@ -abiword-2.3.4.tar.bz2 +abiword-2.3.5.tar.bz2 Index: abiword.spec =================================================================== RCS file: /cvs/extras/rpms/abiword/devel/abiword.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- abiword.spec 19 Aug 2005 14:08:16 -0000 1.14 +++ abiword.spec 21 Aug 2005 12:40:16 -0000 1.15 @@ -2,8 +2,8 @@ Summary: The AbiWord word processor Name: abiword -Version: 2.3.4 -Release: 4 +Version: 2.3.5 +Release: 1 Epoch: 1 Group: Applications/Editors License: GPL @@ -132,6 +132,9 @@ %{_datadir}/icons/*png %changelog +* Sun Aug 21 2005 Marc Maurer - 1:2.3.5-1 +- Update to 2.3.5 + * Fri Aug 19 2005 Marc Maurer - 1:2.3.4-4 - Update the pango patch to disable more pango code Index: sources =================================================================== RCS file: /cvs/extras/rpms/abiword/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 16 Aug 2005 22:46:25 -0000 1.7 +++ sources 21 Aug 2005 12:40:16 -0000 1.8 @@ -1 +1 @@ -b205d8bb5240fdcb126daf8a7a9e45c8 abiword-2.3.4.tar.bz2 +2b2f2b5f5379b6dd7fe4145b3f7a28d4 abiword-2.3.5.tar.bz2 From fedora-extras-commits at redhat.com Sun Aug 21 12:50:33 2005 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Sun, 21 Aug 2005 08:50:33 -0400 Subject: rpms/bluefish/devel bluefish.spec, 1.14, 1.15 sources, 1.5, 1.6 .cvsignore, 1.5, 1.6 Message-ID: <200508211250.j7LCoXm6001492@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/bluefish/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1471 Modified Files: bluefish.spec sources .cvsignore Log Message: update to 1.0.3 Index: bluefish.spec =================================================================== RCS file: /cvs/extras/rpms/bluefish/devel/bluefish.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- bluefish.spec 20 Aug 2005 19:54:45 -0000 1.14 +++ bluefish.spec 21 Aug 2005 12:50:31 -0000 1.15 @@ -1,6 +1,6 @@ Name: bluefish -Version: 1.0.2 -Release: 3%{?dist} +Version: 1.0.3 +Release: 1%{?dist} Summary: GTK2 web development application for experienced users Group: Development/Tools @@ -80,6 +80,9 @@ %changelog +* Sun Aug 21 2005 Paul Howarth - 1.0.3-1 +- update to 1.0.3 + * Sat Aug 20 2005 Michael Schwendt - 1.0.2-3 - rebuilt Index: sources =================================================================== RCS file: /cvs/extras/rpms/bluefish/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 29 Jul 2005 16:49:46 -0000 1.5 +++ sources 21 Aug 2005 12:50:31 -0000 1.6 @@ -1 +1 @@ -281d72f5c45c913671c36bc6b7b45445 bluefish-1.0.2.tar.bz2 +f4cda1e21089155383930616ab673d69 bluefish-1.0.3.tar.bz2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bluefish/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 29 Jul 2005 16:49:46 -0000 1.5 +++ .cvsignore 21 Aug 2005 12:50:31 -0000 1.6 @@ -1 +1 @@ -bluefish-1.0.2.tar.bz2 +bluefish-1.0.3.tar.bz2 From fedora-extras-commits at redhat.com Sun Aug 21 14:34:26 2005 From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer)) Date: Sun, 21 Aug 2005 10:34:26 -0400 Subject: owners owners.list,1.110,1.111 Message-ID: <200508211434.j7LEYQ3w004246@cvs-int.fedora.redhat.com> Author: jwboyer Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4229 Modified Files: owners.list Log Message: Add bugzilla info for plague Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.110 retrieving revision 1.111 diff -u -r1.110 -r1.111 --- owners.list 21 Aug 2005 11:09:39 -0000 1.110 +++ owners.list 21 Aug 2005 14:34:24 -0000 1.111 @@ -692,6 +692,7 @@ Fedora Extras|php-pecl-pdo-sqlite|PECL package for PHP Data Objects Interface to SQLite v3|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|php-pecl-sqlite|PECL package for accessing SQLite databases|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|pinentry|Collection of simple PIN or passphrase entry dialogs|ville.skytta at iki.fi|extras-qa at fedoraproject.org| +Fedora Extras|plague|Distributed build system for RPMs|dcbw at redhat.com|extras-qa at fedoraproject.org Fedora Extras|plib16|Set of portable libraries especially useful for games|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|plib|Set of portable libraries especially useful for games|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|plone|User friendly and powerful open source Content Management System|gauret at free.fr|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sun Aug 21 15:33:26 2005 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Sun, 21 Aug 2005 11:33:26 -0400 Subject: rpms/bluefish/FC-4 bluefish.spec, 1.13, 1.14 sources, 1.5, 1.6 .cvsignore, 1.5, 1.6 Message-ID: <200508211533.j7LFXQ2W005529@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/bluefish/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5508 Modified Files: bluefish.spec sources .cvsignore Log Message: resync with devel Index: bluefish.spec =================================================================== RCS file: /cvs/extras/rpms/bluefish/FC-4/bluefish.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- bluefish.spec 29 Jul 2005 21:15:12 -0000 1.13 +++ bluefish.spec 21 Aug 2005 15:33:24 -0000 1.14 @@ -1,7 +1,6 @@ Name: bluefish -Version: 1.0.2 -Release: 2%{?dist} - +Version: 1.0.3 +Release: 1%{?dist} Summary: GTK2 web development application for experienced users Group: Development/Tools @@ -81,6 +80,12 @@ %changelog +* Sun Aug 21 2005 Paul Howarth - 1.0.3-1 +- update to 1.0.3 + +* Sat Aug 20 2005 Michael Schwendt - 1.0.2-3 +- rebuilt + * Fri Jul 29 2005 Paul Howarth - 1.0.2-2 - buildrequire libgnomeui-devel, not libgnomeui Index: sources =================================================================== RCS file: /cvs/extras/rpms/bluefish/FC-4/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 29 Jul 2005 16:52:55 -0000 1.5 +++ sources 21 Aug 2005 15:33:24 -0000 1.6 @@ -1 +1 @@ -281d72f5c45c913671c36bc6b7b45445 bluefish-1.0.2.tar.bz2 +f4cda1e21089155383930616ab673d69 bluefish-1.0.3.tar.bz2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bluefish/FC-4/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 29 Jul 2005 16:52:55 -0000 1.5 +++ .cvsignore 21 Aug 2005 15:33:24 -0000 1.6 @@ -1 +1 @@ -bluefish-1.0.2.tar.bz2 +bluefish-1.0.3.tar.bz2 From fedora-extras-commits at redhat.com Sun Aug 21 15:35:12 2005 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Sun, 21 Aug 2005 11:35:12 -0400 Subject: rpms/bluefish/FC-3 bluefish.spec, 1.10, 1.11 sources, 1.5, 1.6 .cvsignore, 1.5, 1.6 Message-ID: <200508211535.j7LFZgnA005600@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/bluefish/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5579 Modified Files: bluefish.spec sources .cvsignore Log Message: resync with devel Index: bluefish.spec =================================================================== RCS file: /cvs/extras/rpms/bluefish/FC-3/bluefish.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- bluefish.spec 29 Jul 2005 21:16:06 -0000 1.10 +++ bluefish.spec 21 Aug 2005 15:35:09 -0000 1.11 @@ -1,7 +1,6 @@ Name: bluefish -Version: 1.0.2 -Release: 2%{?dist} - +Version: 1.0.3 +Release: 1%{?dist} Summary: GTK2 web development application for experienced users Group: Development/Tools @@ -81,6 +80,12 @@ %changelog +* Sun Aug 21 2005 Paul Howarth - 1.0.3-1 +- update to 1.0.3 + +* Sat Aug 20 2005 Michael Schwendt - 1.0.2-3 +- rebuilt + * Fri Jul 29 2005 Paul Howarth - 1.0.2-2 - buildrequire libgnomeui-devel, not libgnomeui Index: sources =================================================================== RCS file: /cvs/extras/rpms/bluefish/FC-3/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 29 Jul 2005 16:59:33 -0000 1.5 +++ sources 21 Aug 2005 15:35:09 -0000 1.6 @@ -1 +1 @@ -281d72f5c45c913671c36bc6b7b45445 bluefish-1.0.2.tar.bz2 +f4cda1e21089155383930616ab673d69 bluefish-1.0.3.tar.bz2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bluefish/FC-3/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 29 Jul 2005 16:59:33 -0000 1.5 +++ .cvsignore 21 Aug 2005 15:35:09 -0000 1.6 @@ -1 +1 @@ -bluefish-1.0.2.tar.bz2 +bluefish-1.0.3.tar.bz2 From fedora-extras-commits at redhat.com Sun Aug 21 16:29:35 2005 From: fedora-extras-commits at redhat.com (Jeff Sheltren (sheltren)) Date: Sun, 21 Aug 2005 12:29:35 -0400 Subject: mock/etc fedora-1-i386-core.cfg, NONE, 1.1 fedora-2-i386-core.cfg, NONE, 1.1 redhat-73-i386.cfg, NONE, 1.1 redhat-9-i386.cfg, NONE, 1.1 Message-ID: <200508211629.j7LGTZSp007001@cvs-int.fedora.redhat.com> Author: sheltren Update of /cvs/fedora/mock/etc In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6971/etc Added Files: fedora-1-i386-core.cfg fedora-2-i386-core.cfg redhat-73-i386.cfg redhat-9-i386.cfg Log Message: add commands to man page, create config files for legacy distributions --- NEW FILE fedora-1-i386-core.cfg --- #!/usr/bin/python -tt import os config_opts['root'] = 'fedora-1-i386-core' config_opts['basedir'] = '/var/lib/mock/' config_opts['chroot'] = '/usr/sbin/mock-helper chroot' config_opts['mount'] = '/usr/sbin/mock-helper mount' config_opts['umount'] = '/usr/sbin/mock-helper umount' config_opts['rm'] = '/usr/sbin/mock-helper rm' config_opts['mknod'] = '/usr/sbin/mock-helper mknod' config_opts['yum'] = '/usr/sbin/mock-helper yum' config_opts['runuser'] = '/bin/su' config_opts['buildgroup'] = 'build' config_opts['chrootuser'] = 'mockbuild' config_opts['chrootgroup'] = 'mockbuild' config_opts['chrootuid'] = os.geteuid() config_opts['chrootgid'] = os.getegid() config_opts['chroothome'] = '/builddir' config_opts['clean'] = True config_opts['target_arch'] = 'i386' config_opts['yum.conf'] = """ [main] cachedir=/var/cache/yum debuglevel=1 logfile=/var/log/yum.log reposdir=/dev/null retries=20 obsoletes=1 gpgcheck=0 assumeyes=1 # repos [core] name=core baseurl=http://download.fedoralegacy.org/fedora/1/os/i386/ [updates-released] name=updates baseurl=http://download.fedoralegacy.org/fedora/1/updates/i386/ [groups] name=groups baseurl=http://fedoraproject.org/buildgroups/1/i386/ """ --- NEW FILE fedora-2-i386-core.cfg --- #!/usr/bin/python -tt import os config_opts['root'] = 'fedora-2-i386-core' config_opts['basedir'] = '/var/lib/mock/' config_opts['chroot'] = '/usr/sbin/mock-helper chroot' config_opts['mount'] = '/usr/sbin/mock-helper mount' config_opts['umount'] = '/usr/sbin/mock-helper umount' config_opts['rm'] = '/usr/sbin/mock-helper rm' config_opts['mknod'] = '/usr/sbin/mock-helper mknod' config_opts['yum'] = '/usr/sbin/mock-helper yum' config_opts['runuser'] = '/bin/su' config_opts['buildgroup'] = 'build' config_opts['chrootuser'] = 'mockbuild' config_opts['chrootgroup'] = 'mockbuild' config_opts['chrootuid'] = os.geteuid() config_opts['chrootgid'] = os.getegid() config_opts['chroothome'] = '/builddir' config_opts['clean'] = True config_opts['target_arch'] = 'i386' config_opts['yum.conf'] = """ [main] cachedir=/var/cache/yum debuglevel=1 logfile=/var/log/yum.log reposdir=/dev/null retries=20 obsoletes=1 gpgcheck=0 assumeyes=1 # repos [core] name=core baseurl=http://download.fedoralegacy.org/fedora/2/os/i386/ [updates-released] name=updates baseurl=http://download.fedoralegacy.org/fedora/2/updates/i386/ [groups] name=groups baseurl=http://fedoraproject.org/buildgroups/2/i386/ """ --- NEW FILE redhat-73-i386.cfg --- #!/usr/bin/python -tt import os config_opts['root'] = 'redhat-73-i386' config_opts['basedir'] = '/var/lib/mock/' config_opts['chroot'] = '/usr/sbin/mock-helper chroot' config_opts['mount'] = '/usr/sbin/mock-helper mount' config_opts['umount'] = '/usr/sbin/mock-helper umount' config_opts['rm'] = '/usr/sbin/mock-helper rm' config_opts['mknod'] = '/usr/sbin/mock-helper mknod' config_opts['yum'] = '/usr/sbin/mock-helper yum' config_opts['runuser'] = '/bin/su' config_opts['buildgroup'] = 'build' config_opts['chrootuser'] = 'mockbuild' config_opts['chrootgroup'] = 'mockbuild' config_opts['chrootuid'] = os.geteuid() config_opts['chrootgid'] = os.getegid() config_opts['chroothome'] = '/builddir' config_opts['clean'] = True config_opts['target_arch'] = 'i386' config_opts['yum.conf'] = """ [main] cachedir=/var/cache/yum debuglevel=1 logfile=/var/log/yum.log reposdir=/dev/null retries=20 obsoletes=1 gpgcheck=0 assumeyes=1 # repos [core] name=core baseurl=http://download.fedoralegacy.org/redhat/7.3/os/i386/ [updates-released] name=updates baseurl=http://download.fedoralegacy.org/redhat/7.3/updates/i386/ [groups] name=groups baseurl=http://fedoraproject.org/buildgroups/rh73/i386/ """ --- NEW FILE redhat-9-i386.cfg --- #!/usr/bin/python -tt import os config_opts['root'] = 'redhat-9-i386' config_opts['basedir'] = '/var/lib/mock/' config_opts['chroot'] = '/usr/sbin/mock-helper chroot' config_opts['mount'] = '/usr/sbin/mock-helper mount' config_opts['umount'] = '/usr/sbin/mock-helper umount' config_opts['rm'] = '/usr/sbin/mock-helper rm' config_opts['mknod'] = '/usr/sbin/mock-helper mknod' config_opts['yum'] = '/usr/sbin/mock-helper yum' config_opts['runuser'] = '/bin/su' config_opts['buildgroup'] = 'build' config_opts['chrootuser'] = 'mockbuild' config_opts['chrootgroup'] = 'mockbuild' config_opts['chrootuid'] = os.geteuid() config_opts['chrootgid'] = os.getegid() config_opts['chroothome'] = '/builddir' config_opts['clean'] = True config_opts['target_arch'] = 'i386' config_opts['yum.conf'] = """ [main] cachedir=/var/cache/yum debuglevel=1 logfile=/var/log/yum.log reposdir=/dev/null retries=20 obsoletes=1 gpgcheck=0 assumeyes=1 # repos [core] name=core baseurl=http://download.fedoralegacy.org/redhat/9/os/i386/ [updates-released] name=updates baseurl=http://download.fedoralegacy.org/redhat/9/updates/i386/ [groups] name=groups baseurl=http://fedoraproject.org/buildgroups/rh9/i386/ """ From fedora-extras-commits at redhat.com Sun Aug 21 16:29:34 2005 From: fedora-extras-commits at redhat.com (Jeff Sheltren (sheltren)) Date: Sun, 21 Aug 2005 12:29:34 -0400 Subject: mock/docs mock.1,1.1,1.2 Message-ID: <200508211630.j7LGU4eb007008@cvs-int.fedora.redhat.com> Author: sheltren Update of /cvs/fedora/mock/docs In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6971/docs Modified Files: mock.1 Log Message: add commands to man page, create config files for legacy distributions Index: mock.1 =================================================================== RCS file: /cvs/fedora/mock/docs/mock.1,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mock.1 5 Aug 2005 08:12:44 -0000 1.1 +++ mock.1 21 Aug 2005 16:29:32 -0000 1.2 @@ -4,7 +4,7 @@ mock \- build a SRPM in a chroot .SH "SYNTAX" .LP -mock [\-r CHROOT] [\-\-no\-clean] [\-\-arch=ARCH] [\-\-debug] [\-\-resultdir=RESULTDIR] [\-\-statedir=STATEDIR] [\-\-uniqueext=UNIQUEEXT] \fIfilename\fR +mock [\-r CHROOT] [\-\-no\-clean] [\-\-arch=ARCH] [\-\-debug] [\-\-resultdir=RESULTDIR] [\-\-statedir=STATEDIR] [\-\-uniqueext=UNIQUEEXT] [command] \fIfilename\fR .SH "DESCRIPTION" .LP @@ -33,6 +33,14 @@ \fB\-\-version\fR Show version number and exit. .TP +\fBcommand\fR is one of: +.TP +\fBinit\fR \- initialize a chroot (install packages, setup devices, etc.) +.TP +\fBclean\fR \- purge the chroot tree +.TP +\fBrebuild\fR \- If no command is specified, rebuild is assumed. Rebuilds the specified SRPM +.TP .SH "FILES" .LP \fI/etc/mock/\fP From fedora-extras-commits at redhat.com Sun Aug 21 17:09:08 2005 From: fedora-extras-commits at redhat.com (Darko Ilic (darko)) Date: Sun, 21 Aug 2005 13:09:08 -0400 Subject: kadischi - Imported sources Message-ID: <200508211709.j7LH98mE008317@cvs-int.fedora.redhat.com> Author: darko Update of /cvs/devel/kadischi In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8300 Log Message: Status: Vendor Tag: Fedora Release Tags: First_import N kadischi/pycheckrc N kadischi/configure.ac N kadischi/autogen.sh N kadischi/Makefile.am N kadischi/.cvsignore N kadischi/po/POTFILES.in N kadischi/rc/readonly-halt N kadischi/rc/readonly-root N kadischi/rc/rc.readonly-livecd N kadischi/rc/Makefile.am N kadischi/doc/FAQ N kadischi/doc/NEWS N kadischi/doc/TODO N kadischi/doc/README N kadischi/doc/Makefile.am N kadischi/doc/INSTALL N kadischi/doc/CREDITS N kadischi/lib/functions.py N kadischi/lib/shvar.py N kadischi/lib/Makefile.am N kadischi/conf/build.conf N kadischi/conf/Makefile.am N kadischi/livecd_generator/kadischi N kadischi/livecd_generator/livecd-mkinitrd.sh N kadischi/livecd_generator/movefiles.py N kadischi/livecd_generator/Makefile.am N kadischi/livecd_generator/kadischi.py N kadischi/livecd_generator/install-boot.sh N kadischi/livecd_generator/create-iso.sh N kadischi/scanswap/scanswap.c N kadischi/scanswap/Makefile.am N kadischi/scanswap/.cvsignore N kadischi/linuxrc/livecd-linuxrc N kadischi/linuxrc/Makefile.am N kadischi/post_install_scripts/05fsclean.py N kadischi/post_install_scripts/03fstab.py N kadischi/post_install_scripts/Makefile.am N kadischi/post_install_scripts/02install.sh N kadischi/post_install_scripts/04auth.sh N kadischi/post_install_scripts/01umountproc.sh N kadischi/post_install_scripts/06sysconfig.py N kadischi/ks_examples/minimal-livecd.cfg N kadischi/ks_examples/Makefile.am N kadischi/find_live_cd/Makefile.am N kadischi/find_live_cd/.cvsignore N kadischi/find_live_cd/find_live_cd.c N kadischi/patches/Makefile.am N kadischi/patches/anaconda.patch N kadischi/patches/flags.py.patch No conflicts created by this import From fedora-extras-commits at redhat.com Sun Aug 21 22:18:06 2005 From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields)) Date: Sun, 21 Aug 2005 18:18:06 -0400 Subject: web/html/docs/fedora-install-guide-en index.php,1.1,1.2 Message-ID: <200508212218.j7LMI6Lg014953@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/fedora/web/html/docs/fedora-install-guide-en In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14924/fedora-install-guide-en Modified Files: index.php Log Message: Add tarball for installation guide (#162006) Index: index.php =================================================================== RCS file: /cvs/fedora/web/html/docs/fedora-install-guide-en/index.php,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- index.php 10 Jun 2005 21:23:41 -0000 1.1 +++ index.php 21 Aug 2005 22:18:04 -0000 1.2 @@ -20,7 +20,8 @@ Fedora Core 4 - Fedora Core 4 Installation Guide - currently focused on x86 + Fedora Core 4 Installation Guide - currently focused on x86 + Other formats: Compressed archive (.tar.gz, 4.2 MB) Download Projects FAQ Logout '.$_SESSION['user']['username'].'» '. side_nav($this->options); print ' '; print ''; print ' '; } function displayFooter($date = "", $front = 0) { print ' '; if ($this->options['side_content']) { print ''. $this->options['side_content']. ' '; } print ' Copyright © 2005 David T. Farning. All rights reserved. '; print'The Fedora Finder is not a supported product of Fedora or Red Hat, Inc. '; if ($front) { print 'Fedora is a trademark of Red Hat, Inc. '; } if ($front) { print 'Red Hat, Inc. is not responsible for the content of other sites. '; } print 'Legal | Trademark Guidelines '; if (!empty($date)) { print ' This page last modified at: '.ereg_replace('\\$Da'.'te: (.*)\\$', '\\1', $date).' '; } print ' '; } } ?> From fedora-extras-commits at redhat.com Mon Aug 1 20:38:03 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Mon, 1 Aug 2005 16:38:03 -0400 Subject: bouncer_r/php/downloads/extras/3/x86_64 .cvsignore,NONE,1.1 Message-ID: <200508012038.j71Kc30U014259@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/php/downloads/extras/3/x86_64 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13863/php/downloads/extras/3/x86_64 Added Files: .cvsignore Log Message: cvs cleanup for fedora initial commit --- NEW FILE .cvsignore --- primary.xml.gz repomd.xml From fedora-extras-commits at redhat.com Mon Aug 1 20:38:04 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Mon, 1 Aug 2005 16:38:04 -0400 Subject: bouncer_r/php/admin/repos/products index.php,NONE,1.1 Message-ID: <200508012038.j71Kc4lE014264@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/php/admin/repos/products In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13863/php/admin/repos/products Added Files: index.php Log Message: cvs cleanup for fedora initial commit ***** Error reading new file: [Errno 2] No such file or directory: 'index.php' From fedora-extras-commits at redhat.com Mon Aug 1 20:38:04 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Mon, 1 Aug 2005 16:38:04 -0400 Subject: bouncer_r/test/cfg init.php, 1.1, NONE config.php-local, 1.3, NONE config.php, 1.3, NONE admin_init.php, 1.1, NONE Message-ID: <200508012038.j71Kc4qR014267@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/test/cfg In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13863/test/cfg Removed Files: init.php config.php-local config.php admin_init.php Log Message: cvs cleanup for fedora initial commit --- init.php DELETED --- --- config.php-local DELETED --- --- config.php DELETED --- --- admin_init.php DELETED --- From fedora-extras-commits at redhat.com Mon Aug 1 20:38:09 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Mon, 1 Aug 2005 16:38:09 -0400 Subject: bouncer_r/php/admin/mirrors/regions/continents index.php,NONE,1.1 Message-ID: <200508012038.j71Kc9fa014307@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/php/admin/mirrors/regions/continents In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13863/php/admin/mirrors/regions/continents Added Files: index.php Log Message: cvs cleanup for fedora initial commit ***** Error reading new file: [Errno 2] No such file or directory: 'index.php' From fedora-extras-commits at redhat.com Mon Aug 1 20:38:10 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Mon, 1 Aug 2005 16:38:10 -0400 Subject: bouncer_r/test/downloads/core/development/x86_64 .cvsignore, 1.1, NONE Message-ID: <200508012038.j71KcAWZ014315@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/test/downloads/core/development/x86_64 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13863/test/downloads/core/development/x86_64 Removed Files: .cvsignore Log Message: cvs cleanup for fedora initial commit --- .cvsignore DELETED --- From fedora-extras-commits at redhat.com Mon Aug 1 20:38:16 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Mon, 1 Aug 2005 16:38:16 -0400 Subject: bouncer_r/test/admin/repos index.php,1.2,NONE Message-ID: <200508012038.j71KcGPj014342@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/test/admin/repos In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13863/test/admin/repos Removed Files: index.php Log Message: cvs cleanup for fedora initial commit --- index.php DELETED --- From fedora-extras-commits at redhat.com Mon Aug 1 20:38:10 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Mon, 1 Aug 2005 16:38:10 -0400 Subject: bouncer_r/php/downloads/core/3/i386 .cvsignore,NONE,1.1 Message-ID: <200508012038.j71KcABJ014312@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/php/downloads/core/3/i386 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13863/php/downloads/core/3/i386 Added Files: .cvsignore Log Message: cvs cleanup for fedora initial commit --- NEW FILE .cvsignore --- primary.xml.gz repomd.xml From fedora-extras-commits at redhat.com Mon Aug 1 20:38:16 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Mon, 1 Aug 2005 16:38:16 -0400 Subject: bouncer_r/test/downloads/core/development/s390 .cvsignore,1.1,NONE Message-ID: <200508012038.j71KcGfd014347@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/test/downloads/core/development/s390 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13863/test/downloads/core/development/s390 Removed Files: .cvsignore Log Message: cvs cleanup for fedora initial commit --- .cvsignore DELETED --- From fedora-extras-commits at redhat.com Mon Aug 1 20:38:22 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Mon, 1 Aug 2005 16:38:22 -0400 Subject: bouncer_r/php/admin/templates index.php,NONE,1.1 Message-ID: <200508012038.j71KcMHm014378@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/php/admin/templates In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13863/php/admin/templates Added Files: index.php Log Message: cvs cleanup for fedora initial commit ***** Error reading new file: [Errno 2] No such file or directory: 'index.php' From fedora-extras-commits at redhat.com Mon Aug 1 20:38:21 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Mon, 1 Aug 2005 16:38:21 -0400 Subject: bouncer_r/test/downloads index.php,1.2,NONE Message-ID: <200508012038.j71KcLbQ014373@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/test/downloads In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13863/test/downloads Removed Files: index.php Log Message: cvs cleanup for fedora initial commit --- index.php DELETED --- From fedora-extras-commits at redhat.com Mon Aug 1 20:38:27 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Mon, 1 Aug 2005 16:38:27 -0400 Subject: bouncer_r/test/admin/mirrors/subscribe index.php,1.1,NONE Message-ID: <200508012038.j71KcRUn014404@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/test/admin/mirrors/subscribe In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13863/test/admin/mirrors/subscribe Removed Files: index.php Log Message: cvs cleanup for fedora initial commit --- index.php DELETED --- From fedora-extras-commits at redhat.com Mon Aug 1 20:38:28 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Mon, 1 Aug 2005 16:38:28 -0400 Subject: bouncer_r/php/downloads/core/development/x86_64 .cvsignore, NONE, 1.1 Message-ID: <200508012038.j71KcS8X014409@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/php/downloads/core/development/x86_64 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13863/php/downloads/core/development/x86_64 Added Files: .cvsignore Log Message: cvs cleanup for fedora initial commit --- NEW FILE .cvsignore --- primary.xml.gz repomd.xml From fedora-extras-commits at redhat.com Mon Aug 1 20:38:33 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Mon, 1 Aug 2005 16:38:33 -0400 Subject: bouncer_r/test/downloads/extras/3/SRPMS .cvsignore,1.1,NONE Message-ID: <200508012038.j71KcXVS014439@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/test/downloads/extras/3/SRPMS In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13863/test/downloads/extras/3/SRPMS Removed Files: .cvsignore Log Message: cvs cleanup for fedora initial commit --- .cvsignore DELETED --- From fedora-extras-commits at redhat.com Mon Aug 1 20:38:44 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Mon, 1 Aug 2005 16:38:44 -0400 Subject: bouncer_r/php/admin/repos index.php,NONE,1.1 Message-ID: <200508012038.j71KcigZ014600@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/php/admin/repos In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13863/php/admin/repos Added Files: index.php Log Message: cvs cleanup for fedora initial commit ***** Error reading new file: [Errno 2] No such file or directory: 'index.php' From fedora-extras-commits at redhat.com Mon Aug 1 20:38:39 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Mon, 1 Aug 2005 16:38:39 -0400 Subject: bouncer_r/php/admin/users/contacts index.php,NONE,1.1 Message-ID: <200508012038.j71KcdeV014523@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/php/admin/users/contacts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13863/php/admin/users/contacts Added Files: index.php Log Message: cvs cleanup for fedora initial commit ***** Error reading new file: [Errno 2] No such file or directory: 'index.php' From fedora-extras-commits at redhat.com Mon Aug 1 20:38:40 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Mon, 1 Aug 2005 16:38:40 -0400 Subject: bouncer_r/php/downloads/core/development/s390 .cvsignore,NONE,1.1 Message-ID: <200508012038.j71KceIc014540@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/php/downloads/core/development/s390 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13863/php/downloads/core/development/s390 Added Files: .cvsignore Log Message: cvs cleanup for fedora initial commit --- NEW FILE .cvsignore --- repomd.xml primary.xml.gz From fedora-extras-commits at redhat.com Mon Aug 1 20:38:40 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Mon, 1 Aug 2005 16:38:40 -0400 Subject: bouncer_r/test/downloads/extras/development/i386 .cvsignore, 1.1, NONE Message-ID: <200508012038.j71Kce7V014538@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/test/downloads/extras/development/i386 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13863/test/downloads/extras/development/i386 Removed Files: .cvsignore Log Message: cvs cleanup for fedora initial commit --- .cvsignore DELETED --- From fedora-extras-commits at redhat.com Mon Aug 1 20:38:41 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Mon, 1 Aug 2005 16:38:41 -0400 Subject: bouncer_r/php/downloads/extras/development/i386 .cvsignore, NONE, 1.1 Message-ID: <200508012038.j71KcfpO014573@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/php/downloads/extras/development/i386 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13863/php/downloads/extras/development/i386 Added Files: .cvsignore Log Message: cvs cleanup for fedora initial commit --- NEW FILE .cvsignore --- primary.xml.gz repomd.xml From fedora-extras-commits at redhat.com Mon Aug 1 20:38:42 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Mon, 1 Aug 2005 16:38:42 -0400 Subject: bouncer_r/test/inc widgets.inc, 1.1, NONE site.inc, 1.1, NONE navigation.inc, 1.2, NONE utils.inc, 1.1, NONE template.inc, 1.1, NONE Message-ID: <200508012038.j71KcgPs014586@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/test/inc In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13863/test/inc Removed Files: widgets.inc site.inc navigation.inc utils.inc template.inc Log Message: cvs cleanup for fedora initial commit --- widgets.inc DELETED --- --- site.inc DELETED --- --- navigation.inc DELETED --- --- utils.inc DELETED --- --- template.inc DELETED --- From fedora-extras-commits at redhat.com Mon Aug 1 20:38:41 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Mon, 1 Aug 2005 16:38:41 -0400 Subject: bouncer_r/test/downloads/core/development/i386 .cvsignore,1.1,NONE Message-ID: <200508012038.j71Kcfgp014560@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/test/downloads/core/development/i386 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13863/test/downloads/core/development/i386 Removed Files: .cvsignore Log Message: cvs cleanup for fedora initial commit --- .cvsignore DELETED --- From fedora-extras-commits at redhat.com Mon Aug 1 20:38:43 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Mon, 1 Aug 2005 16:38:43 -0400 Subject: bouncer_r/php/downloads/core/4/i386 .cvsignore,NONE,1.1 Message-ID: <200508012038.j71Kchuf014592@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/php/downloads/core/4/i386 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13863/php/downloads/core/4/i386 Added Files: .cvsignore Log Message: cvs cleanup for fedora initial commit --- NEW FILE .cvsignore --- primary.xml.gz repomd.xml From fedora-extras-commits at redhat.com Mon Aug 1 20:38:43 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Mon, 1 Aug 2005 16:38:43 -0400 Subject: bouncer_r/test/downloads/dag index.php,1.1,NONE Message-ID: <200508012038.j71KchhF014597@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/test/downloads/dag In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13863/test/downloads/dag Removed Files: index.php Log Message: cvs cleanup for fedora initial commit --- index.php DELETED --- From fedora-extras-commits at redhat.com Mon Aug 1 20:38:50 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Mon, 1 Aug 2005 16:38:50 -0400 Subject: bouncer_r/test/admin/templates index.php,1.1,NONE Message-ID: <200508012038.j71Kcoxa014636@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/test/admin/templates In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13863/test/admin/templates Removed Files: index.php Log Message: cvs cleanup for fedora initial commit --- index.php DELETED --- From fedora-extras-commits at redhat.com Mon Aug 1 20:38:50 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Mon, 1 Aug 2005 16:38:50 -0400 Subject: bouncer_r/php/downloads/extras/3/i386 .cvsignore,NONE,1.1 Message-ID: <200508012038.j71KcocV014641@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/php/downloads/extras/3/i386 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13863/php/downloads/extras/3/i386 Added Files: .cvsignore Log Message: cvs cleanup for fedora initial commit --- NEW FILE .cvsignore --- primary.xml.gz repomd.xml From fedora-extras-commits at redhat.com Mon Aug 1 20:38:41 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Mon, 1 Aug 2005 16:38:41 -0400 Subject: bouncer_r/test/admin logout.php, 1.1, NONE index.php, 1.2, NONE login.php, 1.1, NONE Message-ID: <200508012038.j71KcfOY014544@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/test/admin In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13863/test/admin Removed Files: logout.php index.php login.php Log Message: cvs cleanup for fedora initial commit --- logout.php DELETED --- --- index.php DELETED --- --- login.php DELETED --- From fedora-extras-commits at redhat.com Mon Aug 1 20:38:55 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Mon, 1 Aug 2005 16:38:55 -0400 Subject: bouncer_r/test/admin/tasks index.php,1.1,NONE Message-ID: <200508012038.j71Kctwa014682@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/test/admin/tasks In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13863/test/admin/tasks Removed Files: index.php Log Message: cvs cleanup for fedora initial commit --- index.php DELETED --- From fedora-extras-commits at redhat.com Mon Aug 1 20:38:56 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Mon, 1 Aug 2005 16:38:56 -0400 Subject: bouncer_r/test/downloads/core/4/i386 .cvsignore,1.1,NONE Message-ID: <200508012038.j71Kcu5M014694@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/test/downloads/core/4/i386 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13863/test/downloads/core/4/i386 Removed Files: .cvsignore Log Message: cvs cleanup for fedora initial commit --- .cvsignore DELETED --- From fedora-extras-commits at redhat.com Mon Aug 1 20:38:56 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Mon, 1 Aug 2005 16:38:56 -0400 Subject: bouncer_r/php/downloads/core index.php,NONE,1.1 Message-ID: <200508012038.j71Kcuw0014702@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/php/downloads/core In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13863/php/downloads/core Added Files: index.php Log Message: cvs cleanup for fedora initial commit ***** Error reading new file: [Errno 2] No such file or directory: 'index.php' From fedora-extras-commits at redhat.com Mon Aug 1 20:39:03 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Mon, 1 Aug 2005 16:39:03 -0400 Subject: bouncer_r/php/downloads/extras/4/ppc .cvsignore,NONE,1.1 Message-ID: <200508012039.j71Kd3Eu014759@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/php/downloads/extras/4/ppc In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13863/php/downloads/extras/4/ppc Added Files: .cvsignore Log Message: cvs cleanup for fedora initial commit --- NEW FILE .cvsignore --- primary.xml.gz repomd.xml From fedora-extras-commits at redhat.com Mon Aug 1 20:38:56 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Mon, 1 Aug 2005 16:38:56 -0400 Subject: bouncer_r/test/downloads/core/development/ia64 .cvsignore,1.1,NONE Message-ID: <200508012039.j71Kcu5G014699@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/test/downloads/core/development/ia64 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13863/test/downloads/core/development/ia64 Removed Files: .cvsignore Log Message: cvs cleanup for fedora initial commit --- .cvsignore DELETED --- From fedora-extras-commits at redhat.com Mon Aug 1 20:39:03 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Mon, 1 Aug 2005 16:39:03 -0400 Subject: bouncer_r/test/admin/users index.php,1.1,NONE Message-ID: <200508012039.j71Kd3Of014751@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/test/admin/users In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13863/test/admin/users Removed Files: index.php Log Message: cvs cleanup for fedora initial commit --- index.php DELETED --- From fedora-extras-commits at redhat.com Mon Aug 1 20:39:09 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Mon, 1 Aug 2005 16:39:09 -0400 Subject: bouncer_r/php/downloads/extras/4/x86_64 .cvsignore,NONE,1.1 Message-ID: <200508012039.j71Kd9Fu014791@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/php/downloads/extras/4/x86_64 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13863/php/downloads/extras/4/x86_64 Added Files: .cvsignore Log Message: cvs cleanup for fedora initial commit --- NEW FILE .cvsignore --- primary.xml.gz repomd.xml From fedora-extras-commits at redhat.com Mon Aug 1 20:39:03 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Mon, 1 Aug 2005 16:39:03 -0400 Subject: bouncer_r/test/downloads/extras .cvsignore, 1.1, NONE index.php, 1.1, NONE Message-ID: <200508012039.j71Kd3so014756@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/test/downloads/extras In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13863/test/downloads/extras Removed Files: .cvsignore index.php Log Message: cvs cleanup for fedora initial commit --- .cvsignore DELETED --- --- index.php DELETED --- From fedora-extras-commits at redhat.com Mon Aug 1 20:39:04 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Mon, 1 Aug 2005 16:39:04 -0400 Subject: bouncer_r/php/downloads/core/development/ia64 .cvsignore,NONE,1.1 Message-ID: <200508012039.j71Kd4rm014764@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/php/downloads/core/development/ia64 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13863/php/downloads/core/development/ia64 Added Files: .cvsignore Log Message: cvs cleanup for fedora initial commit --- NEW FILE .cvsignore --- primary.xml.gz repomd.xml From fedora-extras-commits at redhat.com Mon Aug 1 20:39:10 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Mon, 1 Aug 2005 16:39:10 -0400 Subject: bouncer_r/php/admin/repos/versions index.php,NONE,1.1 Message-ID: <200508012039.j71KdAkw014796@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/php/admin/repos/versions In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13863/php/admin/repos/versions Added Files: index.php Log Message: cvs cleanup for fedora initial commit ***** Error reading new file: [Errno 2] No such file or directory: 'index.php' From fedora-extras-commits at redhat.com Mon Aug 1 20:39:15 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Mon, 1 Aug 2005 16:39:15 -0400 Subject: bouncer_r/php/downloads/core/3/x86_64 .cvsignore,NONE,1.1 Message-ID: <200508012039.j71KdFqn014824@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/php/downloads/core/3/x86_64 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13863/php/downloads/core/3/x86_64 Added Files: .cvsignore Log Message: cvs cleanup for fedora initial commit --- NEW FILE .cvsignore --- primary.xml.gz repomd.xml From fedora-extras-commits at redhat.com Mon Aug 1 20:39:21 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Mon, 1 Aug 2005 16:39:21 -0400 Subject: bouncer_r/php/css layout.css,NONE,1.1 Message-ID: <200508012039.j71KdLPM014886@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/php/css In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13863/php/css Added Files: layout.css Log Message: cvs cleanup for fedora initial commit --- NEW FILE layout.css --- body { font-size: 0.9em; font-family: bitstream vera sans,sans-serif; margin: 0; padding: 0; /* (The background color is specified elsewhere, so do a global replacement if it ever changes) */ background-color: #d9d9d9; } a:link { color: #900; } a:visited { color: #48468f; } a:hover { color: #f20; } a[name] { color: inherit; text-decoration: inherit; } #fedora-header { background-color: #fff; height: 62px; } #fedora-header img { border: 0; vertical-align: middle; } #fedora-header-logo { /* position is offset by the header padding amount */ position: absolute; left: 26px; top: 13px; z-index: 3; } #fedora-header-logo img { width: 110px; height: 40; } #fedora-header-items { /* position is offset by the header padding amount */ position: absolute; right: 10px; top: 15px; text-align: right; display: inline; } #fedora-header-items a { color: #000; text-decoration: none; padding: 7pt; font-size: 0.8em; } #fedora-header-items a:hover, #fedora-header-search-button:hover { color: #f20; cursor: pointer; } #fedora-header-items img { margin-right: 1px; width: 36px; height: 36px; } #fedora-header-search { height: 25px; } #fedora-header-search-entry { vertical-align: top; margin: 0.65em 4px 0 10px; padding: 2px 4px; background-color: #f5f5f5; border: 1px solid #999; font-size: 0.8em !important; } #fedora-header-search-entry:focus { background-color: #fff; border: 1px solid #555; } #fedora-header-search-button { font-size: 0.8em !important; vertical-align: top; margin-top: 0.2em; border: 0; padding: 7px; background: #fff url('../img/header-search.png') no-repeat left; padding-left: 21px; } #fedora-header-items form { float: right; } #fedora-header-items input { font-size: 0.85em; } #fedora-nav { margin: 0; padding: 0; background-color: #22437f; font-size: 0; height: 5px; border-top: 1px solid #000; border-bottom: 1px solid #f5f5f5; } #fedora-nav ul { margin: 0; padding: 0; } #fedora-nav li { display: inline; list-style: none; padding: 0 5pt; } #fedora-nav li + li { padding-left: 8pt; border-left: 1px solid #99a5bf; } #fedora-nav a { color: #c5ccdb; text-decoration: none; } #fedora-nav a:hover { color: #fff; } #fedora-side-left { position: absolute; z-index: 2; width: 11em; /* Space down for the approx line height (fonts) */ left: 12px; } #fedora-side-right { position: absolute; z-index: 1; width: 13em; right: 12px; padding-top: 3px; } #fedora-side-left, #fedora-side-right { top: 2px; /* add to the top margin to compensate for the fixed sizes */ margin-top: 75px; color: #555; font-size: 0.9em; } #fedora-side-right ul { list-style: square inside; padding: 0; margin: 0; } /* Left-side naviagation */ #fedora-side-nav-label { display: none; } #fedora-side-nav { list-style: none; margin: 0; padding: 0; border: 1px solid #5976b2; border-top: 0; background-color: #22437f; } #fedora-side-nav li { margin: 0; padding: 0; border-top: 1px solid #5976b2; /* IE/Win gets upset if there is no bottom border... Go figure. */ border-bottom: 1px solid #22437f; } #fedora-side-nav a { margin: 0; color: #c5ccdb; display: block; text-decoration: none; padding: 4px 6px; } #fedora-side-nav a:hover { background-color: #34548f; color: #fff; } #fedora-side-nav ul { list-style: none; margin: 0; padding: 0; } #fedora-side-nav ul li { border-top: 1px solid #34548e; background-color: #34548e; /* IE/Win gets upset if there is no bottom border... Go figure. */ border-bottom: 1px solid #34548e; } #fedora-side-nav ul li:hover { border-bottom: 1px solid #34548f; } #fedora-side-nav ul li a { padding-left: 18px; color: #a7b2c9; } #fedora-side-nav ul li a:hover { background-color: #46659e; } #fedora-side-nav ul ul li a { padding-left: 36px; } #fedora-side-nav strong a { font-weight: normal; color: #fff !important; background-color: #10203b; } #fedora-side-nav strong a:hover { background-color: #172e56 !important; } /* content containers */ #fedora-middle-one, #fedora-middle-two, #fedora-middle-three { font-size: 0.9em; /* position: relative; */ /* relative to utilize z-index */ width: auto; min-width: 120px; margin: 10px; z-index: 3; /* content can overlap when the browser is narrow */ } #fedora-middle-two, #fedora-middle-three { margin-left: 11em; padding-left: 24px; } #fedora-middle-three { margin-right: 13em; padding-right: 24px; } #fedora-content { padding: 24px; border: 1px solid #aaa; background-color: #fff; } #fedora-content > .fedora-corner-bottom { top: 0 } .fedora-corner-tl, .fedora-corner-tr, .fedora-corner-bl, .fedora-corner-br { background-color: #d9d9d9; position: relative; width: 19px; height: 19px; /* The following line is to render PNGs with alpha transparency within IE/Win, using DirectX */ /* Work-around for IE6/Mac borkage (Part 1) */ display: none; } .fedora-corner-tl, .fedora-corner-bl { float: left; left: 0px; } .fedora-corner-tr, .fedora-corner-br { float: right; right: 0px; } .fedora-corner-tl, .fedora-corner-tr { top: 0px; } .fedora-corner-bl, .fedora-corner-br { bottom: 0px; margin-top: -19px; /* Opera fix (part 1) */ top: -18px;} html>body .fedora-corner-tl { background: #d9d9d9 url("../img/corner-tl.png") no-repeat left top; } html>body .fedora-corner-tr { background: #d9d9d9 url("../img/corner-tr.png") no-repeat right top; } html>body .fedora-corner-bl { background: #d9d9d9 url("../img/corner-bl.png") no-repeat left bottom; } html>body .fedora-corner-br { background: #d9d9d9 url("../img/corner-br.png") no-repeat right bottom; } .fedora-corner-tl { filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='../img/corner-tl.png',sizingMethod='scale'); } .fedora-corner-tr { filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='../img/corner-tr.png',sizingMethod='scale'); } .fedora-corner-br { filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='../img/corner-br.png',sizingMethod='scale'); } .fedora-corner-bl { filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='../img/corner-bl.png',sizingMethod='scale'); } /* \*/ .fedora-corner-tl, .fedora-corner-tr, .fedora-corner-bl, .fedora-corner-br { /* Restore the view for everything but IE6/Mac (part 2 of the "IE/Mac fix") */ display: block; } /* */ .fedora-corner-bl, .fedora-corner-br { top: 0px; } .content { margin: 0 1em } #fedora-sidelist { position: relative; bottom: 3px; margin: 0; padding: 3px !important; border: 1px solid #bbb; background-color: #ccc; border-radius: 2.5px; -moz-border-radius: 2.5px; } #fedora-sidelist strong a { font-weight: normal; background-color: #555; color: #fff; } #fedora-sidelist strong a:hover { background-color: #333; color: #fff; } #fedora-sidelist li { list-style-position: outside; font-size: 0.9em; list-style: none; border: 1px solid #ccc; border-width: 1px 0; padding: 0; list-style: none; } #fedora-sidelist li a { text-decoration: none; display: block; padding: 6px 8px; border-radius: 2.5px; -moz-border-radius: 2.5px; } #fedora-sidelist li a:hover { background-color: #999; color: #eee; } #fedora-footer { font-size: 0.75em; text-align: center; color: #777; margin-bottom: 2em; } #fedora-printable { text-align: center; margin: 1em 0; font-size: 0.85em; } #fedora-printable a { text-decoration: none; padding: 5px 0; padding-left: 18px; background: transparent url("/images/printable.png") no-repeat left; } #fedora-printable a:hover { text-decoration: underline; } From fedora-extras-commits at redhat.com Mon Aug 1 20:39:15 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Mon, 1 Aug 2005 16:39:15 -0400 Subject: bouncer_r/test/downloads/extras/4/i386 .cvsignore,1.1,NONE Message-ID: <200508012039.j71KdFaQ014829@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/test/downloads/extras/4/i386 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13863/test/downloads/extras/4/i386 Removed Files: .cvsignore Log Message: cvs cleanup for fedora initial commit --- .cvsignore DELETED --- From fedora-extras-commits at redhat.com Mon Aug 1 20:39:21 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Mon, 1 Aug 2005 16:39:21 -0400 Subject: bouncer_r/php/admin/repos/arches index.php,NONE,1.1 Message-ID: <200508012039.j71KdLKc014891@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/php/admin/repos/arches In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13863/php/admin/repos/arches Added Files: index.php Log Message: cvs cleanup for fedora initial commit ***** Error reading new file: [Errno 2] No such file or directory: 'index.php' From fedora-extras-commits at redhat.com Mon Aug 1 20:39:22 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Mon, 1 Aug 2005 16:39:22 -0400 Subject: bouncer_r/test/admin/repos/versions index.php,1.1,NONE Message-ID: <200508012039.j71KdM1H014899@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/test/admin/repos/versions In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13863/test/admin/repos/versions Removed Files: index.php Log Message: cvs cleanup for fedora initial commit --- index.php DELETED --- From fedora-extras-commits at redhat.com Mon Aug 1 20:39:29 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Mon, 1 Aug 2005 16:39:29 -0400 Subject: bouncer_r/php/admin/mirrors/subscribe index-old.php, NONE, 1.1 index.php, NONE, 1.1 Message-ID: <200508012039.j71KdTTw014962@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/php/admin/mirrors/subscribe In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13863/php/admin/mirrors/subscribe Added Files: index-old.php index.php Log Message: cvs cleanup for fedora initial commit ***** Error reading new file: [Errno 2] No such file or directory: 'index-old.php' ***** Error reading new file: [Errno 2] No such file or directory: 'index.php' From fedora-extras-commits at redhat.com Mon Aug 1 20:39:22 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Mon, 1 Aug 2005 16:39:22 -0400 Subject: bouncer_r/test/admin/repos/products index.php,1.1,NONE Message-ID: <200508012039.j71KdMpH014896@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/test/admin/repos/products In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13863/test/admin/repos/products Removed Files: index.php Log Message: cvs cleanup for fedora initial commit --- index.php DELETED --- From fedora-extras-commits at redhat.com Mon Aug 1 20:39:22 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Mon, 1 Aug 2005 16:39:22 -0400 Subject: bouncer_r/test/admin/mirrors/types index.php,1.1,NONE Message-ID: <200508012039.j71KdMOj014904@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/test/admin/mirrors/types In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13863/test/admin/mirrors/types Removed Files: index.php Log Message: cvs cleanup for fedora initial commit --- index.php DELETED --- From fedora-extras-commits at redhat.com Mon Aug 1 20:39:28 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Mon, 1 Aug 2005 16:39:28 -0400 Subject: bouncer_r/test/downloads/extras/4/SRPMS .cvsignore,1.1,NONE Message-ID: <200508012039.j71KdSKR014957@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/test/downloads/extras/4/SRPMS In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13863/test/downloads/extras/4/SRPMS Removed Files: .cvsignore Log Message: cvs cleanup for fedora initial commit --- .cvsignore DELETED --- From fedora-extras-commits at redhat.com Mon Aug 1 20:39:29 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Mon, 1 Aug 2005 16:39:29 -0400 Subject: bouncer_r/test/downloads/extras/development/ppc .cvsignore, 1.1, NONE Message-ID: <200508012039.j71KdTQ4014967@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/test/downloads/extras/development/ppc In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13863/test/downloads/extras/development/ppc Removed Files: .cvsignore Log Message: cvs cleanup for fedora initial commit --- .cvsignore DELETED --- From fedora-extras-commits at redhat.com Mon Aug 1 20:39:35 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Mon, 1 Aug 2005 16:39:35 -0400 Subject: bouncer_r/test/downloads/core/4/ppc .cvsignore,1.1,NONE Message-ID: <200508012039.j71KdZdV015020@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/test/downloads/core/4/ppc In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13863/test/downloads/core/4/ppc Removed Files: .cvsignore Log Message: cvs cleanup for fedora initial commit --- .cvsignore DELETED --- From fedora-extras-commits at redhat.com Mon Aug 1 20:39:36 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Mon, 1 Aug 2005 16:39:36 -0400 Subject: bouncer_r/test/downloads/core/development/ppc64 .cvsignore, 1.1, NONE Message-ID: <200508012039.j71Kdau7015033@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/test/downloads/core/development/ppc64 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13863/test/downloads/core/development/ppc64 Removed Files: .cvsignore Log Message: cvs cleanup for fedora initial commit --- .cvsignore DELETED --- From fedora-extras-commits at redhat.com Mon Aug 1 20:39:41 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Mon, 1 Aug 2005 16:39:41 -0400 Subject: bouncer_r/test/downloads/extras/4/ppc .cvsignore,1.1,NONE Message-ID: <200508012039.j71KdfsN015072@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/test/downloads/extras/4/ppc In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13863/test/downloads/extras/4/ppc Removed Files: .cvsignore Log Message: cvs cleanup for fedora initial commit --- .cvsignore DELETED --- From fedora-extras-commits at redhat.com Mon Aug 1 20:39:35 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Mon, 1 Aug 2005 16:39:35 -0400 Subject: bouncer_r/php/downloads/core/development/ppc .cvsignore,NONE,1.1 Message-ID: <200508012039.j71KdZhO015025@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/php/downloads/core/development/ppc In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13863/php/downloads/core/development/ppc Added Files: .cvsignore Log Message: cvs cleanup for fedora initial commit --- NEW FILE .cvsignore --- primary.xml.gz repomd.xml From fedora-extras-commits at redhat.com Mon Aug 1 20:39:35 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Mon, 1 Aug 2005 16:39:35 -0400 Subject: bouncer_r/php/downloads index.php,NONE,1.1 Message-ID: <200508012039.j71KdZiv015030@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/php/downloads In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13863/php/downloads Added Files: index.php Log Message: cvs cleanup for fedora initial commit ***** Error reading new file: [Errno 2] No such file or directory: 'index.php' From fedora-extras-commits at redhat.com Mon Aug 1 20:39:50 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Mon, 1 Aug 2005 16:39:50 -0400 Subject: bouncer_r/php/downloads/core/development/i386 .cvsignore,NONE,1.1 Message-ID: <200508012039.j71Kdos3015200@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/php/downloads/core/development/i386 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13863/php/downloads/core/development/i386 Added Files: .cvsignore Log Message: cvs cleanup for fedora initial commit --- NEW FILE .cvsignore --- primary.xml.gz repomd.xml From fedora-extras-commits at redhat.com Mon Aug 1 20:39:42 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Mon, 1 Aug 2005 16:39:42 -0400 Subject: bouncer_r/php/downloads/core/development/s390x .cvsignore,NONE,1.1 Message-ID: <200508012039.j71KdgsU015077@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/php/downloads/core/development/s390x In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13863/php/downloads/core/development/s390x Added Files: .cvsignore Log Message: cvs cleanup for fedora initial commit --- NEW FILE .cvsignore --- primary.xml.gz repomd.xml From fedora-extras-commits at redhat.com Mon Aug 1 20:39:52 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Mon, 1 Aug 2005 16:39:52 -0400 Subject: bouncer_r/test/downloads/core/4/x86_64 .cvsignore,1.1,NONE Message-ID: <200508012039.j71KdqAD015225@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/test/downloads/core/4/x86_64 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13863/test/downloads/core/4/x86_64 Removed Files: .cvsignore Log Message: cvs cleanup for fedora initial commit --- .cvsignore DELETED --- From fedora-extras-commits at redhat.com Mon Aug 1 20:39:49 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Mon, 1 Aug 2005 16:39:49 -0400 Subject: bouncer_r/php/admin/tasks index.php,NONE,1.1 Message-ID: <200508012039.j71KdnQi015182@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/php/admin/tasks In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13863/php/admin/tasks Added Files: index.php Log Message: cvs cleanup for fedora initial commit ***** Error reading new file: [Errno 2] No such file or directory: 'index.php' From fedora-extras-commits at redhat.com Mon Aug 1 20:39:50 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Mon, 1 Aug 2005 16:39:50 -0400 Subject: bouncer_r/test/downloads/extras/development/x86_64 .cvsignore, 1.1, NONE Message-ID: <200508012039.j71Kdobu015215@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/test/downloads/extras/development/x86_64 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13863/test/downloads/extras/development/x86_64 Removed Files: .cvsignore Log Message: cvs cleanup for fedora initial commit --- .cvsignore DELETED --- From fedora-extras-commits at redhat.com Mon Aug 1 20:39:52 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Mon, 1 Aug 2005 16:39:52 -0400 Subject: bouncer_r/test/admin/mirrors/regions index.php,1.2,NONE Message-ID: <200508012039.j71KdqLj015220@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/test/admin/mirrors/regions In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13863/test/admin/mirrors/regions Removed Files: index.php Log Message: cvs cleanup for fedora initial commit --- index.php DELETED --- From fedora-extras-commits at redhat.com Mon Aug 1 20:39:48 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Mon, 1 Aug 2005 16:39:48 -0400 Subject: bouncer_r/test/downloads/core/development/s390x .cvsignore, 1.1, NONE Message-ID: <200508012039.j71KdmOs015154@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/test/downloads/core/development/s390x In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13863/test/downloads/core/development/s390x Removed Files: .cvsignore Log Message: cvs cleanup for fedora initial commit --- .cvsignore DELETED --- From fedora-extras-commits at redhat.com Mon Aug 1 20:39:48 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Mon, 1 Aug 2005 16:39:48 -0400 Subject: bouncer_r/test/downloads/extras/4/x86_64 .cvsignore,1.1,NONE Message-ID: <200508012039.j71Kdmxw015173@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/test/downloads/extras/4/x86_64 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13863/test/downloads/extras/4/x86_64 Removed Files: .cvsignore Log Message: cvs cleanup for fedora initial commit --- .cvsignore DELETED --- From fedora-extras-commits at redhat.com Mon Aug 1 20:39:49 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Mon, 1 Aug 2005 16:39:49 -0400 Subject: bouncer_r/php/admin/mirrors/regions index.php,NONE,1.1 Message-ID: <200508012039.j71KdndT015181@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/php/admin/mirrors/regions In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13863/php/admin/mirrors/regions Added Files: index.php Log Message: cvs cleanup for fedora initial commit ***** Error reading new file: [Errno 2] No such file or directory: 'index.php' From fedora-extras-commits at redhat.com Mon Aug 1 20:39:47 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Mon, 1 Aug 2005 16:39:47 -0400 Subject: bouncer_r/php/admin/mirrors/types index.php,NONE,1.1 Message-ID: <200508012039.j71KdlfF015138@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/php/admin/mirrors/types In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13863/php/admin/mirrors/types Added Files: index.php Log Message: cvs cleanup for fedora initial commit ***** Error reading new file: [Errno 2] No such file or directory: 'index.php' From fedora-extras-commits at redhat.com Mon Aug 1 20:39:58 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Mon, 1 Aug 2005 16:39:58 -0400 Subject: bouncer_r/test/admin/repos/arches index.php,1.1,NONE Message-ID: <200508012039.j71KdwCe015258@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/test/admin/repos/arches In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13863/test/admin/repos/arches Removed Files: index.php Log Message: cvs cleanup for fedora initial commit --- index.php DELETED --- From fedora-extras-commits at redhat.com Mon Aug 1 20:39:59 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Mon, 1 Aug 2005 16:39:59 -0400 Subject: bouncer_r/test/admin/users/contacts index.php,1.2,NONE Message-ID: <200508012039.j71KdxgQ015265@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/test/admin/users/contacts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13863/test/admin/users/contacts Removed Files: index.php Log Message: cvs cleanup for fedora initial commit --- index.php DELETED --- From fedora-extras-commits at redhat.com Mon Aug 1 20:39:50 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Mon, 1 Aug 2005 16:39:50 -0400 Subject: bouncer_r/php/downloads/extras/development/SRPMS .cvsignore, NONE, 1.1 Message-ID: <200508012040.j71KdoUl015185@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/php/downloads/extras/development/SRPMS In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13863/php/downloads/extras/development/SRPMS Added Files: .cvsignore Log Message: cvs cleanup for fedora initial commit --- NEW FILE .cvsignore --- primary.xml.gz repomd.xml From fedora-extras-commits at redhat.com Mon Aug 1 20:40:04 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Mon, 1 Aug 2005 16:40:04 -0400 Subject: bouncer_r/php/admin/users index.php,NONE,1.1 Message-ID: <200508012040.j71Ke4nc015315@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/php/admin/users In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13863/php/admin/users Added Files: index.php Log Message: cvs cleanup for fedora initial commit ***** Error reading new file: [Errno 2] No such file or directory: 'index.php' From fedora-extras-commits at redhat.com Mon Aug 1 20:40:05 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Mon, 1 Aug 2005 16:40:05 -0400 Subject: bouncer_r/test index.php,1.1,NONE Message-ID: <200508012040.j71Ke5nS015323@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/test In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13863/test Removed Files: index.php Log Message: cvs cleanup for fedora initial commit --- index.php DELETED --- From fedora-extras-commits at redhat.com Mon Aug 1 20:40:11 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Mon, 1 Aug 2005 16:40:11 -0400 Subject: bouncer_r/test/downloads/core/3/i386 .cvsignore,1.1,NONE Message-ID: <200508012040.j71KeBMH015362@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/test/downloads/core/3/i386 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13863/test/downloads/core/3/i386 Removed Files: .cvsignore Log Message: cvs cleanup for fedora initial commit --- .cvsignore DELETED --- From fedora-extras-commits at redhat.com Mon Aug 1 20:40:09 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Mon, 1 Aug 2005 16:40:09 -0400 Subject: rpms/python-matplotlib/devel python-matplotlib.spec,1.6,1.7 Message-ID: <200508012040.j71Ke9Ev015345@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/python-matplotlib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15271 Modified Files: python-matplotlib.spec Log Message: - New upstream version matplotlib 0.83.2 Index: python-matplotlib.spec =================================================================== RCS file: /cvs/extras/rpms/python-matplotlib/devel/python-matplotlib.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- python-matplotlib.spec 28 Jul 2005 23:06:28 -0000 1.6 +++ python-matplotlib.spec 1 Aug 2005 20:40:06 -0000 1.7 @@ -1,8 +1,8 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: python-matplotlib -Version: 0.83.1 -Release: 2%{?dist} +Version: 0.83.2 +Release: 1%{?dist} Summary: Python plotting library Group: Development/Libraries @@ -47,6 +47,9 @@ %{_datadir}/matplotlib/ %changelog +* Fri Jul 29 2005 Orion Poplawski 0.83.2-1 +- New upstream version matplotlib 0.83.2 + * Thu Jul 28 2005 Orion Poplawski 0.83.1-2 - Bump rel to fix botched tag From fedora-extras-commits at redhat.com Mon Aug 1 20:40:05 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Mon, 1 Aug 2005 16:40:05 -0400 Subject: bouncer_r/test/downloads/core/3/x86_64 .cvsignore,1.1,NONE Message-ID: <200508012040.j71Ke5Zb015320@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/test/downloads/core/3/x86_64 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13863/test/downloads/core/3/x86_64 Removed Files: .cvsignore Log Message: cvs cleanup for fedora initial commit --- .cvsignore DELETED --- From fedora-extras-commits at redhat.com Mon Aug 1 20:40:06 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Mon, 1 Aug 2005 16:40:06 -0400 Subject: bouncer_r/test/downloads/extras/development/SRPMS .cvsignore, 1.1, NONE Message-ID: <200508012040.j71Ke6na015328@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/test/downloads/extras/development/SRPMS In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13863/test/downloads/extras/development/SRPMS Removed Files: .cvsignore Log Message: cvs cleanup for fedora initial commit --- .cvsignore DELETED --- From fedora-extras-commits at redhat.com Mon Aug 1 20:40:16 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Mon, 1 Aug 2005 16:40:16 -0400 Subject: bouncer_r/php/downloads/core/4/ppc .cvsignore,NONE,1.1 Message-ID: <200508012040.j71KeGNv015391@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/php/downloads/core/4/ppc In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13863/php/downloads/core/4/ppc Added Files: .cvsignore Log Message: cvs cleanup for fedora initial commit --- NEW FILE .cvsignore --- primary.xml.gz repomd.xml From fedora-extras-commits at redhat.com Mon Aug 1 20:40:22 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Mon, 1 Aug 2005 16:40:22 -0400 Subject: bouncer_r/php/downloads/extras/4/SRPMS .cvsignore,NONE,1.1 Message-ID: <200508012040.j71KeMDm015432@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/php/downloads/extras/4/SRPMS In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13863/php/downloads/extras/4/SRPMS Added Files: .cvsignore Log Message: cvs cleanup for fedora initial commit --- NEW FILE .cvsignore --- primary.xml.gz repomd.xml From fedora-extras-commits at redhat.com Mon Aug 1 20:40:23 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Mon, 1 Aug 2005 16:40:23 -0400 Subject: bouncer_r/php/downloads/dag index.php,NONE,1.1 Message-ID: <200508012040.j71KeNqo015437@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/php/downloads/dag In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13863/php/downloads/dag Added Files: index.php Log Message: cvs cleanup for fedora initial commit ***** Error reading new file: [Errno 2] No such file or directory: 'index.php' From fedora-extras-commits at redhat.com Mon Aug 1 20:40:24 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Mon, 1 Aug 2005 16:40:24 -0400 Subject: bouncer_r/test/downloads/extras/3/i386 .cvsignore,1.1,NONE Message-ID: <200508012040.j71KeOtL015442@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/test/downloads/extras/3/i386 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13863/test/downloads/extras/3/i386 Removed Files: .cvsignore Log Message: cvs cleanup for fedora initial commit --- .cvsignore DELETED --- From fedora-extras-commits at redhat.com Mon Aug 1 20:40:35 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Mon, 1 Aug 2005 16:40:35 -0400 Subject: bouncer_r/php/downloads/extras/3/SRPMS .cvsignore,NONE,1.1 Message-ID: <200508012040.j71KeZ5k015478@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/php/downloads/extras/3/SRPMS In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13863/php/downloads/extras/3/SRPMS Added Files: .cvsignore Log Message: cvs cleanup for fedora initial commit --- NEW FILE .cvsignore --- primary.xml.gz repomd.xml From fedora-extras-commits at redhat.com Mon Aug 1 20:38:39 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Mon, 1 Aug 2005 16:38:39 -0400 Subject: bouncer_r/php/cfg config.php, 1.3, 1.4 config.php-sf, 1.2, 1.3 config.php-local, 1.1, NONE Message-ID: <200508012040.j71KedlE015497@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/php/cfg In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13863/php/cfg Added Files: config.php config.php-sf Removed Files: config.php-local Log Message: cvs cleanup for fedora initial commit Index: config.php =================================================================== RCS file: config.php diff -N config.php --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ config.php 1 Aug 2005 20:38:37 -0000 1.4 @@ -0,0 +1,21 @@ + Index: config.php-sf =================================================================== RCS file: config.php-sf diff -N config.php-sf --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ config.php-sf 1 Aug 2005 20:38:37 -0000 1.3 @@ -0,0 +1,21 @@ + --- config.php-local DELETED --- From fedora-extras-commits at redhat.com Mon Aug 1 20:40:35 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Mon, 1 Aug 2005 16:40:35 -0400 Subject: bouncer_r/php/downloads/extras index.php, NONE, 1.1 .cvsignore, NONE, 1.1 Message-ID: <200508012040.j71KeZFB015475@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/php/downloads/extras In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13863/php/downloads/extras Added Files: index.php .cvsignore Log Message: cvs cleanup for fedora initial commit ***** Error reading new file: [Errno 2] No such file or directory: 'index.php' --- NEW FILE .cvsignore --- 3 4 From fedora-extras-commits at redhat.com Mon Aug 1 20:38:03 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Mon, 1 Aug 2005 16:38:03 -0400 Subject: bouncer_r/python repomd.py, NONE, 1.1 derivedrepocheckers.py, 1.1, 1.2 mirrorchecker.py, 1.1, 1.2 repoview.py, 1.1, 1.2 derivedmirrorcheckers.py, 1.1, 1.2 repochecker.py, 1.2, 1.3 sentry.py, 1.2, 1.3 Message-ID: <200508012038.j71Kc3PO014256@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/python In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13863/python Modified Files: derivedrepocheckers.py mirrorchecker.py repoview.py derivedmirrorcheckers.py repochecker.py sentry.py Added Files: repomd.py Log Message: cvs cleanup for fedora initial commit --- NEW FILE repomd.py --- import sentryutil import threading import urllib2 import os import gzip import re import time ## # Try to import cElementTree, and if that fails attempt to fall back to # ElementTree, a slower, but pure-python implementation. # try: from cElementTree import iterparse except ImportError: from elementtree.ElementTree import iterparse def _bn(tag): """ This is a very dirty way to go from {xmlns}tag to just tag. """ try: return tag.split('}')[1] except: return tag emailre = re.compile('<.*?@.*?>') def _webify(text): """ Make it difficult to harvest email addresses. """ if text is None: return None mo = emailre.search(text) if mo: email = mo.group(0) remail = email.replace('.', '{*}') remail = remail.replace('@', '{%}') text = re.sub(email, remail, text) return text class RepoMD: """ The base class. """ def __init__(self, caller,aRepo,webpath): self.caller = caller self.aRepo = aRepo self.rFilepath = aRepo.repo_url self.lFilepath = (webpath +'/'+ aRepo.product_path +'/'+ aRepo.version_path+'/'+aRepo.arch_path) self.p_timestamp = aRepo.repo_primary_timestamp self.repodata = {} self.arches = [] self.packages = {} def checkRepo(self): self._parseRepoMD() return self._checkNecessity() def updateRepo(self): print '+++++++++++++++++++++' self._parseRepoMD() try: #data = self.caller.getURI(self.rFilepath+ '/'+self.repodata['primary']['location'],self.lFilepath, self.lFilepath+'/primary.xml.gz') pass except urllib2.HTTPError, e: if 400 <= e.code <= 499: return (2, RepoIntegrityChecker.repoStatusAssociations[2] % e.__str__()) raise e #FIXME add errorhandling to report promary.xml.gz failure self._parsePrimary() dataForNewFileRecord = [] dataForNewArchRecord = [] i=0 for pkgid in self.packages.keys(): # print self.packages[pkgid].pkgid dataForNewFileRecord.append((self.packages[pkgid].pkgid, self.packages[pkgid].n, self.packages[pkgid].summary, self.packages[pkgid].vendor, self.packages[pkgid].v, self.packages[pkgid].license, self.packages[pkgid].r, self.packages[pkgid].url, self.aRepo.repo_id )) #dataForNewFileRecord.append((self.packages[pkgid].pkgid, # self.packages[pkgid].n, # self.packages[pkgid].summary, # self.packages[pkgid].vendor, # self.packages[pkgid].v, # self.packages[pkgid].license, # self.packages[pkgid].r, # self.packages[pkgid].url, # self.packages[pkgid].description, # self.aRepo.repo_id # )) #print self.packages[pkgid].pkgid for arch in self.packages[pkgid].arches.values(): # print ' ' + self.packages[pkgid].pkgid + ' ' + arch.arch + ' ' + arch.getFileName() + ' ' + str(arch.time) + ' ' + arch.packager + ' ' + str(arch.size) dataForNewArchRecord.append((self.packages[pkgid].pkgid, arch.arch, arch.getFileName(), str(arch.time), arch.packager, str(arch.size), self.aRepo.repo_id, )) self.caller.database.executeSql(RepoMD.DeleteFilesSQL % self.aRepo.repo_id) self.caller.database.executeManySql(RepoMD.InsertFilesSQL, dataForNewFileRecord) self.caller.database.executeSql(RepoMD.DeleteArchesSQL % self.aRepo.repo_id) self.caller.database.executeManySql(RepoMD.InsertArchesSQL, dataForNewArchRecord) self.caller.database.executeSql(RepoMD.UpdateTimestampSQL % (str(self.repodata['primary']['timestamp']), self.aRepo.repo_id)) self.caller.database.commit() DeleteArchesSQL = """ DELETE FROM file_arches WHERE repo_id = %d """ InsertArchesSQL = """ INSERT INTO file_arches (`pkg_id`, `arch_arch`, `arch_filename`, `arch_time`, `arch_packager`, `arch_size`, `repo_id`) VALUES (%s,%s,%s,%s,%s,%s,%s) """ DeleteFilesSQL = """ DELETE FROM files WHERE repo_id = %d """ InsertFilesSQL = """ INSERT INTO files (`pkg_id`, `pkg_name`, `pkg_summary`, `pkg_vendor`, `pkg_version`, `pkg_license`, `pkg_release`, `pkg_url`, `repo_id`) VALUES (%s,%s,%s,%s,%s,%s,%s,%s, %s) """ #InsertFilesSQL = """ # INSERT INTO # files (`pkg_id`, # `pkg_name`, # `pkg_summary`, # `pkg_vendor`, # `pkg_version`, # `pkg_license`, # `pkg_release`, # `pkg_url`, # `pkg_description`, # `repo_id`) # VALUES # (%s,%s,%s,%s,%s,%s,%s,%s, %s,%s) # """ #---------------------------------------------------------------------------------------------- # I n s e r t N e w R e p o s S Q L #---------------------------------------------------------------------------------------------- UpdateTimestampSQL= """ UPDATE repos SET repo_primary_timestamp = %s, repo_active = '1' WHERE repo_id = %d""" def _parseRepoMD(self): """ Parser method for repomd.xml """ type = 'unknown' self.caller.logger.log(sentryutil.INFO7, "%s: Reading repository data...", threading.currentThread().getName()) for event, elem in iterparse(self.lFilepath+'/repomd.xml', events=('start',)): tag = _bn(elem.tag) if tag == 'data': type = elem.get('type', 'unknown') self.repodata[type] = {} elif tag == 'location': self.repodata[type]['location'] = elem.get('href', '#') elif tag == 'checksum': self.repodata[type]['checksum'] = elem.text elif tag == 'timestamp': self.repodata[type]['timestamp'] = elem.text elem.clear() # _say('done\n') def _checkNecessity(self): """ This will look at the checksum for primary.xml and compare it to the one recorded during the last run in repoview/checksum. If they match, the program exits, unless overridden with -f. """ print self.p_timestamp print self.repodata['primary']['timestamp'] if self.p_timestamp != self.repodata['primary']['timestamp']: return 0 self.caller.logger.log(sentryutil.INFO7, "%s: Repository has not changed.", threading.currentThread().getName()) return 1 def _getFileFh(self, loc): """ Transparently handle gzipped xml files. """ if loc[-3:] == '.gz': fh = gzip.open(loc, 'r') else: fh = open(loc, 'r') return fh def _getevr(self, elem): """ Utility method to get e-v-r out of the element. """ e = elem.get('epoch', '0') v = elem.get('ver', '0') r = elem.get('rel', '0') return {'epoch': e, 'ver': v, 'rel': r} def _mkpkgid(self, n, e, v, r): """ Make the n-e-v-r package id out of n, e, v, r. """ return '%s-%s-%s-%s' % (n, e, v, r) def _doPackage(self, pkgdata): """ Helper method for cleanliness. Accepts pkgdata and sees if we need to create a new package or add arches to existing ones, or ignore it outright. """ if not pkgdata: return 0 if pkgdata['arch'] not in self.arches: print pkgdata['arch'] self.arches.append(pkgdata['arch']) ## We make a package here from pkgdata ## (n, e, v, r) = (pkgdata['name'], pkgdata['epoch'], pkgdata['ver'], pkgdata['rel']) pkgid = self._mkpkgid(n, e, v, r) if self.packages.has_key(pkgid): package = self.packages[pkgid] else: package = Package(n, e, v, r) package.pkgid = pkgid self.packages[pkgid] = package package.doPackage(pkgdata) return 1 def _parsePrimary(self): """ Utility method for parsing primary.xml. """ self.caller.logger.log(sentryutil.INFO7, "%s: parsing primary...", threading.currentThread().getName()) fh = self._getFileFh(self.lFilepath+'/primary.xml.gz') pct = 0 ignored = 0 pkgdata = {} simpletags = ( 'name', 'arch', 'summary', 'description', 'url', 'packager', 'checksum', 'license', 'group', 'vendor') for event, elem in iterparse(fh): tag = _bn(elem.tag) if tag == 'package': if not self._doPackage(pkgdata): ignored += 1 pct += 1 self.caller.logger.log(sentryutil.INFO7, "%s: parsing primary: %s packages.", threading.currentThread().getName(),pct) pkgdata = {} elif tag in simpletags: pkgdata[tag] = _webify(elem.text) elif tag == 'version': pkgdata.update(self._getevr(elem)) elif tag == 'time': pkgdata['time'] = elem.get('build', '0') elif tag == 'size': pkgdata['size'] = elem.get('package', '0') elif tag == 'location': pkgdata['location'] = elem.get('href', '#') elem.clear() self.pkgcount = pct fh.close() class Archer: """ This class handles all possible architectures for a package, since the listing is done by n-e-v-r.html, and a single release can have more than one architecture available, e.g. "src". This is effectively where all packages end up being: there are no further sublevels. """ def __init__(self, pkgdata): self.arch = pkgdata['arch'] self.time = int(pkgdata['time']) self.size = int(pkgdata['size']) self.loc = pkgdata['location'] self.packager = pkgdata['packager'] def getFileName(self): """ Get the basename of the RPM file in question. """ return os.path.basename(self.loc) def getTime(self, format='%c'): """ Return the build time of this package in locale format, unless passed as format='strformat'. """ return time.strftime(format, time.localtime(self.time)) def getSize(self): """ You can access the byte size of the package by looking at arch.size, but this will return the size in sane units (KiB or MiB). """ kbsize = self.size/1024 if kbsize/1024 < 1: return '%d KiB' % kbsize else: return '%0.2f MiB' % (float(kbsize)/1024) class Package: """ A bit of a misnomer -- this is "package" in the sense of repoview, not in the sense of an .rpm file, since it will include multiple architectures. """ def __init__(self, n, e, v, r): self.nevr = (n, e, v, r) self.n = n self.e = e self.v = v self.r = r self.group = None self.rpmgroup = None self.arches = {} self.incomplete = 1 self.changelogs = [] def doPackage(self, pkgdata): """ Accept a dict with key-value pairs and populate ourselves with it. """ if self.incomplete: self._getPrimary(pkgdata) pkgid = pkgdata['checksum'] if self.arches.has_key(pkgid): return arch = Archer(pkgdata) self.arches[pkgid] = arch def addChangelogs(self, changelogs): """ Accept changelogs from other-parser and assign them, unless we already have some (sometimes happens with multiple architectures). """ if self.changelogs: return 0 self.changelogs = changelogs return 1 def _getPrimary(self, pkgdata): """ A helper method to grab values from pkgdata dict. """ self.summary = pkgdata['summary'] self.description = pkgdata['description'] self.url = pkgdata['url'] self.license = pkgdata['license'] self.vendor = pkgdata['vendor'] self.rpmgroup = pkgdata['group'] self.incomplete = 0 def getChangeLogs(self): """ Get the changelogs in the [c-formatted date, author, entry] style. """ self.changelogs.sort() self.changelogs.reverse() retlist = [] for changelog in self.changelogs: date, author, entry = changelog date = time.strftime('%c', time.localtime(date)) retlist.append ([date, author, entry]) return retlist Index: derivedrepocheckers.py =================================================================== RCS file: /cvs/fedora/bouncer_r/python/derivedrepocheckers.py,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- derivedrepocheckers.py 6 Jul 2005 20:44:08 -0000 1.1 +++ derivedrepocheckers.py 1 Aug 2005 20:38:01 -0000 1.2 @@ -39,6 +39,7 @@ import cse.MySQLDatabase import cse.TabularData +from repomd import * #========================================================================== # D a t a b a s e S o u r c e d M i r r o r I n t e g r i t y C h e c k e r @@ -107,6 +108,44 @@ return self.database.executeSql(DatabaseSourcedRepoIntegrityChecker.ReposSQL) + #------------------------------------------ + # r e p o A c t i o n G o o d T o B a d + #------------------------------------------ + def repoActionGoodToBad (self, repoTuple): + """The action to take if a mirror is found to be bad. + """ + self.actionThreadDatabaseConnection.executeSql(DatabaseSourcedRepoIntegrityChecker.repoActionGoodToBadMarkRepoSQL % repoTuple[0].repo_id) + self.actionThreadDatabaseConnection.commit() + super(DatabaseSourcedRepoIntegrityChecker, self).repoActionGoodToBad(repoTuple) + + + #------------------------------------------ + # r e p o A c t i o n G o o d T o B a d + #------------------------------------------ + def repoActionBadToGood (self, repoTuple): + """The action to take if a mirror is found to be Good. + """ + self.actionThreadDatabaseConnection.executeSql(DatabaseSourcedRepoIntegrityChecker.repoActionBadtToGoodMarkRepoSQL % repoTuple[0].repo_id) + self.actionThreadDatabaseConnection.commit() + super(DatabaseSourcedRepoIntegrityChecker, self).repoActionBadToGood(repoTuple) + + + + #------------------------------------------ + # r e p o A c t i o n U p d a t e + #------------------------------------------ + def repoActionUpdate (self, repoTuple): + """The action to take if a mirror is found to be bad. + """ + #self.actionThreadDatabaseConnection.executeSql(DatabaseSourcedRepoIntegrityChecker.repoActionGoodToBadMarkRepoSQL % repoTuple[0].repo_id) + #self.actionThreadDatabaseConnection.commit() + + repomd = RepoMD(self, repoTuple[0], repoTuple[6]) + repomd.updateRepo() + super(DatabaseSourcedRepoIntegrityChecker, self).repoActionUpdate(repoTuple) + + + #-------------------- # R e p o s S Q L @@ -119,6 +158,27 @@ repos r""" + #-------------------------------------------------------------------- + # r e p o A c t i o n G o o d T o B a d M a r k M i r r o r S Q L + #-------------------------------------------------------------------- + repoActionGoodToBadMarkRepoSQL = """ + update repos + set + repo_active = '0' + where + repo_id = %d""" + + #-------------------------------------------------------------------- + # r e p o A c t i o n B a d T o G o o d M a r k M i r r o r S Q L + #-------------------------------------------------------------------- + repoActionGoodToBadMarkRepoSQL = """ + update repos + set + repo_active = '1' + where + repo_id = %d""" + + #================================================================================ # N e w M i r r o r s A n d F i l e s M i r r o r I n t e g r i t y C h e c k e r #================================================================================ @@ -170,12 +230,13 @@ dataForNewReposTableRecords = [ ] dataForUrlUpdate = [] for x in listOfNewRepos: - dataForUrlUpdate = (self.doTemplateSubstitution(x.template_text, x.__dict__), x.repo_id ) - + url = self.doTemplateSubstitution(x.template_text, x.__dict__) + dataForUrlUpdate = (url, x.repo_id ) self.database.executeSql(NewReposIntegrityChecker.UpdateNewReposSQL % dataForUrlUpdate) self.database.commit() + listOfNewRepos = self.database.executeSql(NewReposIntegrityChecker.NewReposSQL) return cse.TabularData.TabularData((listOfNewRepos.schema, listOfNewRepos)) #---------------------------------------------------------------------------------------------- @@ -189,23 +250,17 @@ v.*, a.* FROM - repos r - JOIN - templates t - ON - r.template_id = t.template_id - JOIN - products p - ON - r.product_id = p.product_id - JOIN - versions v - ON - r.version_id = v.version_id - JOIN - archs a - ON - r.arch_id = a.arch_id + repos r, templates t, products p, versions v, archs a + WHERE + r.version_id = v.version_id + AND + r.arch_id = a.arch_id + AND + r.product_id = p.product_id + AND + r.template_id = t.template_id + AND + r.repo_active = '1' """ @@ -221,13 +276,6 @@ WHERE repo_id = %d""" -# update downloadables -# set -# downloadable_active = '1' -# where -# mirror_id = %d -# and file_id = %d""" - #---------------------------------------------------------------------------------------------- # M i r r o r s A n d F i l e s N o t R e p r e s e n t e d I n D o w n l o a d a b l e s S Q L @@ -249,6 +297,3 @@ where d.file_id is null and m.mirror_admin_disable = '0'""" - - - \ No newline at end of file Index: mirrorchecker.py =================================================================== RCS file: /cvs/fedora/bouncer_r/python/mirrorchecker.py,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mirrorchecker.py 6 Jul 2005 20:44:08 -0000 1.1 +++ mirrorchecker.py 1 Aug 2005 20:38:01 -0000 1.2 @@ -152,44 +152,47 @@ self.downloadTaskManager = threadlib.TaskManager(self.numberOfThreads) self.actionTaskManager = threadlib.TaskManager(1) # never change this value - an unsynchronized list called 'humanReadableActionList' used by this thread MirrorIntegrityChecker.logger.log(sentryutil.INFO9, self.workingEnvironment.__str__()) - try: - try: - MirrorIntegrityChecker.logger.log(sentryutil.DEBUG2, "about to give out special initialization task to action thread") - self.actionTaskManager.newTask(self.specialInitializationTask, None) # give a derived class a chance to execute intialization in the thread assigned to process actions - if self.checklevel != 0: - for aMirror in self.getListOfMirrors(): - MirrorIntegrityChecker.logger.log(sentryutil.DEBUG1, "handing out check tasks to task threads") - self.downloadTaskManager.newTask (self.checkMirrorTask, (aMirror, self.filterListOfFiles(self.getListOfFiles(aMirror.mirror_id)))) - finally: - MirrorIntegrityChecker.logger.log(sentryutil.DEBUG2, "waiting for task threads to quit") - self.downloadTaskManager.waitForCompletion() - MirrorIntegrityChecker.logger.log(sentryutil.DEBUG2, "waiting for the action thread to quit") - self.actionTaskManager.newTask(self.specialFinalizationTask, None) # give a derived class a chance to execute finalization in the thread assigned to process actions - self.actionTaskManager.waitForCompletion() - MirrorIntegrityChecker.logger.log(sentryutil.DEBUG3, "all threads stopped") - except Exception, e: - # something bad has happened - or perhaps a keyboard interrupt - MirrorIntegrityChecker.logger.exception(e) - MirrorIntegrityChecker.logger.log(sentryutil.DEBUG9, " stopping all threads - please wait...") - try: - # eat up all pending tasks in the task queue - while (True): - self.downloadTaskManager.taskQueue.get(False) - except: pass - self.downloadTaskManager.waitForCompletion() - try: - # eat up all the actions in the action queue - while (True): - self.actionTaskManager.taskQueue.get(False) - except: pass - self.actionTaskManager.waitForCompletion() - MirrorIntegrityChecker.logger.log(sentryutil.DEBUG9, " done") - sys.exit() - - MirrorIntegrityChecker.logger.log(sentryutil.DEBUG4, "begin postCheck") - self.postCheck() - MirrorIntegrityChecker.logger.log(sentryutil.DEBUG4, "begin notifyOfActionsTaken") - self.notifyOfActionsTaken() +# try: +# try: + + MirrorIntegrityChecker.logger.log(sentryutil.DEBUG2, "about to give out special initialization task to action thread") + self.actionTaskManager.newTask(self.specialInitializationTask, None) # give a derived class a chance to execute intialization in the thread assigned to process actions +# if self.checklevel != 0: + for aMirror in self.getListOfMirrors(): + print aMirror +# MirrorIntegrityChecker.logger.log(sentryutil.DEBUG1, "handing out check tasks to task threads") +# self.downloadTaskManager.newTask (self.checkMirrorTask, (aMirror, self.filterListOfFiles(self.getListOfFiles(aMirror.mirror_id)))) + +# finally: +# MirrorIntegrityChecker.logger.log(sentryutil.DEBUG2, "waiting for task threads to quit") +# self.downloadTaskManager.waitForCompletion() +# MirrorIntegrityChecker.logger.log(sentryutil.DEBUG2, "waiting for the action thread to quit") +# self.actionTaskManager.newTask(self.specialFinalizationTask, None) # give a derived class a chance to execute finalization in the thread assigned to process actions +# self.actionTaskManager.waitForCompletion() +# MirrorIntegrityChecker.logger.log(sentryutil.DEBUG3, "all threads stopped") +# except Exception, e: +# # something bad has happened - or perhaps a keyboard interrupt +# MirrorIntegrityChecker.logger.exception(e) +# MirrorIntegrityChecker.logger.log(sentryutil.DEBUG9, " stopping all threads - please wait...") +# try: +# # eat up all pending tasks in the task queue +# while (True): +# self.downloadTaskManager.taskQueue.get(False) +# except: pass +# self.downloadTaskManager.waitForCompletion() +# try: +# # eat up all the actions in the action queue +# while (True): +# self.actionTaskManager.taskQueue.get(False) +# except: pass +# self.actionTaskManager.waitForCompletion() +# MirrorIntegrityChecker.logger.log(sentryutil.DEBUG9, " done") +# sys.exit() + +# MirrorIntegrityChecker.logger.log(sentryutil.DEBUG4, "begin postCheck") +# self.postCheck() +# MirrorIntegrityChecker.logger.log(sentryutil.DEBUG4, "begin notifyOfActionsTaken") +# self.notifyOfActionsTaken() #-------------------- # f i l e S t a t u s Index: repoview.py =================================================================== RCS file: /cvs/fedora/bouncer_r/python/repoview.py,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- repoview.py 9 Jul 2005 21:16:44 -0000 1.1 +++ repoview.py 1 Aug 2005 20:38:01 -0000 1.2 @@ -21,40 +21,679 @@ # Author: Konstantin Ryabitsev # -import repochecker -import sentryutil -import threading +import fnmatch +import getopt +import gzip +import os +import re +import shutil +import sys +import time +## +# Try to import cElementTree, and if that fails attempt to fall back to +# ElementTree, a slower, but pure-python implementation. +# +try: + from cElementTree import iterparse +except ImportError: + from elementtree.ElementTree import iterparse + +from kid import Template +## +# Kid generates a FutureWarning on python 2.3 +# +if sys.version_info[0] == 2 and sys.version_info[1] == 3: + import warnings + warnings.filterwarnings('ignore', category=FutureWarning) + +## +# Some hardcoded constants +# +pkgkid = 'package.kid' +pkgfile = '%s.html' +grkid = 'group.kid' +grfile = '%s.group.html' +idxkid = 'index.kid' +idxfile = 'index.html' + +VERSION = '0.3' +DEFAULT_TEMPLATEDIR = './templates' + +def _bn(tag): + """ + This is a very dirty way to go from {xmlns}tag to just tag. + """ + try: return tag.split('}')[1] + except: return tag + +emailre = re.compile('<.*?@.*?>') +def _webify(text): + """ + Make it difficult to harvest email addresses. + """ + if text is None: return None + mo = emailre.search(text) + if mo: + email = mo.group(0) + remail = email.replace('.', '{*}') + remail = remail.replace('@', '{%}') + text = re.sub(email, remail, text) + return text + +quiet = 0 +def _say(text, flush=0): + """ + Unless in quiet mode, output the text passed. + """ + if quiet: return + sys.stdout.write(text) + if flush: sys.stdout.flush() + +def _mkid(text): + """ + Remove slashes. + """ + text = text.replace('/', '.') + text = text.replace(' ', '') + return text + +## Jonathan :) + + + +class GroupFactory(dict): + """ + A small utility class that extends the dict functionality to aide in + kid template generation. It contains the groups, keyed by group id. + """ + def __init__(self): + dict.__init__(self) + self.sortedlist = None + + def getSortedList(self, showinvisible=0): + """ + Get the sorted list of groups. The sorting is done by group id + in ascending order (locale-specific). + """ + if self.sortedlist is None: + grids = [] + for grid in self.keys(): + if self[grid].uservisible or showinvisible: + grids.append(grid) + grids.sort() + self.sortedlist = [] + for grid in grids: + self.sortedlist.append(self[grid]) + return self.sortedlist + +class Group: + """ + Contains a list of packages. + """ + def __init__(self, grid=None, name=None): + self.packages = [] + self.grid = grid + self.name = name + self.sorted = 0 + self.uservisible = 1 + + def getSortedList(self, trim=0, nevr=None): + """ + A utility method for calling from kid templates. This will + return a sorted list of packages, optionally trimmed since + on large repositories this list can be very large, and makes + the display useless. If you pass the trim parameter, you must + pass the nevr parameter, too, so the it knows around which package + to trim. + """ + if not self.sorted: + nevrlist = {} + for package in self.packages: + nevrlist[package.nevr] = package + keys = nevrlist.keys() + keys.sort() + retlist = [] + for nevr in keys: + retlist.append(nevrlist[nevr]) + self.packages = retlist + self.sorted = 1 + if not trim or len(self.packages) <= trim: return self.packages + retlist = [] + i = 0 + for pkg in self.packages: + if pkg.nevr == nevr: break + i += 1 + half = trim/2 + if i - half < 0: + return self.packages[0:trim] + if i + half > len(self.packages): + return self.packages[-trim:] + return self.packages[i-half:i+half] + class RepoView: """ The base class. """ - def __init__(self, RepoIntegrityChecker, aRepoTuple, webpath): - print (webpath) - - self.aRepoTuple = aRepoTuple - self.webpath=webpath - - #self.ignore = ignore - #self.xarch = xarch - #self.arches = [] - #self.force = force - #self.outdir = os.path.join(self.repodir, 'repodata', 'repoview') - #self.packages = {} - #self.groups = GroupFactory() - #self.letters = GroupFactory() - #self.maxlatest = maxlatest - #self.repodata = {} - - #if not os.access(repomd, os.R_OK): - # sys.stderr.write('Not found: %s\n' % repomd) - # sys.stderr.write('Does not look like a repository. Exiting.\n') - # sys.exit(1) - #self._parseRepoMD(repomd) + def __init__(self, repodir, ignore=[], xarch=[], force=0, maxlatest=30): + self.repodir = repodir + self.ignore = ignore + self.xarch = xarch + self.arches = [] + self.force = force + self.outdir = os.path.join(self.repodir, 'repodata', 'repoview') + self.packages = {} + self.groups = GroupFactory() + self.letters = GroupFactory() + self.maxlatest = maxlatest + self.repodata = {} + repomd = os.path.join(self.repodir, 'repodata', 'repomd.xml') + if not os.access(repomd, os.R_OK): + sys.stderr.write('Not found: %s\n' % repomd) + sys.stderr.write('Does not look like a repository. Exiting.\n') + sys.exit(1) + self._parseRepoMD(repomd) ## Do packages (primary.xml and other.xml) - #self._parsePrimary() - #self._parseOther() + self._parsePrimary() + self._parseOther() ## Do groups and resolve them - #if self.repodata.has_key('group'): - # self._parseGroups() - \ No newline at end of file + if self.repodata.has_key('group'): + self._parseGroups() + + def _parseRepoMD(self, loc): + """ + Parser method for repomd.xml + """ + type = 'unknown' + _say('Reading repository data...', 1) + for event, elem in iterparse(loc, events=('start',)): + tag = _bn(elem.tag) + if tag == 'data': + type = elem.get('type', 'unknown') + self.repodata[type] = {} + elif tag == 'location': + self.repodata[type]['location'] = elem.get('href', '#') + elif tag == 'checksum': + self.repodata[type]['checksum'] = elem.text + elem.clear() + _say('done\n') + self._checkNecessity() + + def _checkNecessity(self): + """ + This will look at the checksum for primary.xml and compare it to the + one recorded during the last run in repoview/checksum. If they match, + the program exits, unless overridden with -f. + """ + if self.force: return 1 + ## Check and get the existing repoview checksum file + try: + chkfile = os.path.join(self.outdir, 'checksum') + fh = open(chkfile, 'r') + checksum = fh.read() + fh.close() + except IOError: return 1 + checksum = checksum.strip() + if checksum != self.repodata['primary']['checksum']: return 1 + _say("RepoView: Repository has not changed. Force the run with -f.\n") + sys.exit(0) + + def _getFileFh(self, loc): + """ + Transparently handle gzipped xml files. + """ + loc = os.path.join(self.repodir, loc) + if loc[-3:] == '.gz': fh = gzip.open(loc, 'r') + else: fh = open(loc, 'r') + return fh + + def _parseGroups(self): + """ + Utility method for parsing comps.xml. + """ + _say('parsing comps...', 1) + fh = self._getFileFh(self.repodata['group']['location']) + namemap = self._getNameMap() + pct = 0 + group = Group() + for event, elem in iterparse(fh): + tag = elem.tag + if tag == 'group': + pct += 1 + _say('\rparsing comps: %s groups' % pct) + self.groups[group.grid] = group + group = Group() + elif tag == 'id': + group.grid = _mkid(elem.text) + elif tag == 'name' and not elem.attrib: + group.name = _webify(elem.text) + elif tag == 'description' and not elem.attrib: + group.description = _webify(elem.text) + elif tag == 'uservisible': + if elem.text.lower() == 'true': group.uservisible = 1 + else: group.uservisible = 0 + elif tag == 'packagereq': + pkgname = elem.text + if pkgname in namemap.keys(): + pkglist = namemap[pkgname] + group.packages += pkglist + for pkg in pkglist: + pkg.group = group + elem.clear() + _say('...done\n', 1) + fh.close() + + def _getNameMap(self): + """ + Needed for group parsing: since only package names are listed in + , this maps names to package objects. The result is in the + format: {'pkgname': [pkgobject1, pkgobject2, ...]}. + """ + namemap = {} + for pkgid in self.packages.keys(): + package = self.packages[pkgid] + name = package.n + if name not in namemap.keys(): + namemap[name] = [package] + else: + namemap[name].append(package) + return namemap + + def _parsePrimary(self): + """ + Utility method for parsing primary.xml. + """ + _say('parsing primary...', 1) + fh = self._getFileFh(self.repodata['primary']['location']) + pct = 0 + ignored = 0 + pkgdata = {} + simpletags = ( + 'name', + 'arch', + 'summary', + 'description', + 'url', + 'packager', + 'checksum', + 'license', + 'group', + 'vendor') + for event, elem in iterparse(fh): + tag = _bn(elem.tag) + if tag == 'package': + if not self._doPackage(pkgdata): ignored += 1 + pct += 1 + _say('\rparsing primary: %s packages, %s ignored' % + (pct, ignored)) + pkgdata = {} + elif tag in simpletags: + pkgdata[tag] = _webify(elem.text) + elif tag == 'version': + pkgdata.update(self._getevr(elem)) + elif tag == 'time': + pkgdata['time'] = elem.get('build', '0') + elif tag == 'size': + pkgdata['size'] = elem.get('package', '0') + elif tag == 'location': + pkgdata['location'] = elem.get('href', '#') + elem.clear() + self.pkgcount = pct - ignored + self.pkgignored = ignored + _say('...done\n', 1) + fh.close() + + def _doPackage(self, pkgdata): + """ + Helper method for cleanliness. Accepts pkgdata and sees if we need + to create a new package or add arches to existing ones, or ignore it + outright. + """ + if not pkgdata: return 0 + if pkgdata['arch'] in self.xarch: return 0 + if pkgdata['arch'] not in self.arches: + self.arches.append(pkgdata['arch']) + ## We make a package here from pkgdata ## + (n, e, v, r) = (pkgdata['name'], pkgdata['epoch'], + pkgdata['ver'], pkgdata['rel']) + pkgid = self._mkpkgid(n, e, v, r) + if self._checkIgnore(pkgid): return 0 + if self.packages.has_key(pkgid): + package = self.packages[pkgid] + else: + package = Package(n, e, v, r) + package.pkgid = pkgid + self.packages[pkgid] = package + package.doPackage(pkgdata) + return 1 + + def _checkIgnore(self, pkgid): + """ + Check if package id (n-e-v-r) matches the ignore globs passed + via -i. + """ + for glob in self.ignore: + if fnmatch.fnmatchcase(pkgid, glob): return 1 + return 0 + + def _parseOther(self, limit=3): + """ + Utility method to parse other.xml. + """ + _say('parsing other...', 1) + fh = self._getFileFh(self.repodata['other']['location']) + pct = 0 + ignored = 0 + changelogs = [] + evr = None + cct = 0 + for event, elem in iterparse(fh): + tag = _bn(elem.tag) + if tag == 'package': + n = elem.get('name', '__unknown__') + pkgid = self._mkpkgid(n, evr['epoch'], evr['ver'], evr['rel']) + if not self._doOther(pkgid, changelogs): ignored += 1 + pct += 1 + _say('\rparsing other: %s packages, %s ignored' % + (pct, ignored)) + evr = None + changelogs = [] + n = None + cct = 0 + elif tag == 'version': + evr = self._getevr(elem) + elif tag == 'changelog': + if cct >= limit: continue + author = _webify(elem.get('author', 'incognito')) + date = int(elem.get('date', '0')) + changelog = _webify(elem.text) + changelogs.append([date, author, changelog]) + cct += 1 + elem.clear() + _say('...done\n', 1) + fh.close() + + def _doOther(self, pkgid, changelogs): + """ + Helper method for cleanliness. + """ + if pkgid and changelogs and self.packages.has_key(pkgid): + package = self.packages[pkgid] + return package.addChangelogs(changelogs) + return 0 + + def _mkpkgid(self, n, e, v, r): + """ + Make the n-e-v-r package id out of n, e, v, r. + """ + return '%s-%s-%s-%s' % (n, e, v, r) + + def _getevr(self, elem): + """ + Utility method to get e-v-r out of the element. + """ + e = elem.get('epoch', '0') + v = elem.get('ver', '0') + r = elem.get('rel', '0') + return {'epoch': e, 'ver': v, 'rel': r} + + def _makeExtraGroups(self): + """ + This is a utility method to create the extra groups. Currently, + the extra groups are: + __nogroup__: packages not in any other groups + __latest__: the last NN packages updated + letter groups: All packages get grouped by their uppercased first + letter + Any empty groups are then removed. + """ + nogroup = Group(grid='__nogroup__', + name='Packages not in Groups') + latest = {} + i = 0 + makerpmgroups = 0 + if not len(self.groups): + makerpmgroups = 1 + for pkgid in self.packages.keys(): + package = self.packages[pkgid] + if package.group is None: + if makerpmgroups: + grid = _mkid(package.rpmgroup) + if grid not in self.groups.keys(): + group = Group(grid=grid, name=package.rpmgroup) + self.groups[grid] = group + else: + group = self.groups[grid] + package.group = group + group.packages.append(package) + else: + package.group = nogroup + nogroup.packages.append(package) + letter = pkgid[0].upper() + if letter not in self.letters.keys(): + group = Group(grid=letter, name='Letter: %s' % letter) + self.letters[letter] = group + self.letters[letter].packages.append(package) + # btime is number of seconds since epoch, so reverse logic! + btime = 0 + for arch in package.arches.values(): + if arch.time > btime: btime = arch.time + if len(latest.keys()) < self.maxlatest: + latest[btime] = package + else: + times = latest.keys() + times.sort() + times.reverse() + oldest = times[-1] + if btime > oldest: + del latest[oldest] + latest[btime] = package + i += 1 + _say('\rcreating extra groups: %s entries' % i) + if nogroup.packages: + self.groups[nogroup.grid] = nogroup + times = latest.keys() + times.sort() + times.reverse() + lgroup = Group(grid='__latest__', + name='Last %s Packages Updated' % len(times)) + for time in times: + lgroup.packages.append(latest[time]) + lgroup.sorted = 1 + self.groups[lgroup.grid] = lgroup + _say('...done\n', 1) + ## Prune empty groups + for grid in self.groups.keys(): + if not self.groups[grid].packages: del self.groups[grid] + + def _mkOutDir(self, templatedir): + """ + Remove the existing repoview directory if it exists, and create a + new one, copying in the layout dir from templates (if found). + """ + if os.path.isdir(self.outdir): + _say('deleting old repoview...', 1) + shutil.rmtree(self.outdir) + _say('done\n', 1) + os.mkdir(self.outdir) + layoutsrc = os.path.join(templatedir, 'layout') + layoutdst = os.path.join(self.outdir, 'layout') + if os.path.isdir(layoutsrc): + _say('copying layout...', 1) + shutil.copytree(layoutsrc, layoutdst) + _say('done\n', 1) + + def mkLinkUrl(self, object, isindex=0): + """ + This is a utility method passed to kid templates. The templates use + it to get the link to a package, group, or layout object without + having to figure things out on their own. + """ + link = '#' + prefix = '' + if isindex: + if self.toplevel: prefix = os.path.join('repodata', 'repoview') + else: prefix = 'repoview' + if object.__class__ is str: + if not isindex and object == idxfile: + if self.toplevel: link = os.path.join('..', '..', object) + else: link = os.path.join('..', object) + else: + link = os.path.join(prefix, object) + elif object.__class__ is Package: + link = os.path.join(prefix, pkgfile % object.pkgid) + elif object.__class__ is Group: + link = os.path.join(prefix, grfile % object.grid) + elif object.__class__ is Archer: + if isindex and self.toplevel: + link = os.path.join('..', object.loc) + else: + link = os.path.join('..', '..', object.loc) + return link + + def applyTemplates(self, templatedir, toplevel=0, title='RepoView'): + """ + Just what it says. :) + """ + if not self.packages: + _say('No packages available.') + sys.exit(0) + gentime = time.strftime('%c') + self.toplevel = toplevel + self._makeExtraGroups() + self._mkOutDir(templatedir) + stats = { + 'title': title, + 'pkgcount': self.pkgcount, + 'pkgignored': self.pkgignored, + 'ignorelist': self.ignore, + 'archlist': self.arches, + 'ignorearchlist': self.xarch, + 'VERSION': VERSION, + 'gentime': gentime + } + ## Do groups + grtmpl = os.path.join(templatedir, grkid) + kobj = Template(file=grtmpl, mkLinkUrl=self.mkLinkUrl, + letters=self.letters, groups=self.groups, stats=stats) + i = 0 + for grid in self.groups.keys(): + kobj.group = self.groups[grid] + out = os.path.join(self.outdir, grfile % grid) + fh = open(out, 'w') + kobj.write(fh) + fh.close() + i += 1 + _say('writing groups: %s written\r' % i) + _say('\n', 1) + ## Do letter groups + i = 0 + for grid in self.letters.keys(): + kobj.group = self.letters[grid] + out = os.path.join(self.outdir, grfile % grid) + fh = open(out, 'w') + kobj.write(fh) + fh.close() + i += 1 + _say('writing letter groups: %s written\r' % i) + _say('\n', 1) + ## Do packages + i = 0 + pkgtmpl = os.path.join(templatedir, pkgkid) + kobj = Template(file=pkgtmpl, mkLinkUrl=self.mkLinkUrl, + letters=self.letters, stats=stats) + for pkgid in self.packages.keys(): + kobj.package = self.packages[pkgid] + out = os.path.join(self.outdir, pkgfile % pkgid) + fh = open(out, 'w') + kobj.write(fh) + fh.close() + i += 1 + _say('writing packages: %s written\r' % i) + _say('\n', 1) + ## Do index + _say('generating index...', 1) + idxtmpl = os.path.join(templatedir, idxkid) + self.arches.sort() + kobj = Template(file=idxtmpl, mkLinkUrl=self.mkLinkUrl, + letters=self.letters, groups=self.groups, stats=stats) + if self.toplevel: out = os.path.join(self.repodir, idxfile) + else: out = os.path.join(self.repodir, 'repodata', idxfile) + fh = open(out, 'w') + kobj.write(out) + fh.close() + _say('done\n') + _say('writing checksum...', 1) + chkfile = os.path.join(self.outdir, 'checksum') + fh = open(chkfile, 'w') + fh.write(self.repodata['primary']['checksum']) + fh.close() + _say('done\n') + +def usage(ecode=0): + print """ + repoview [-i name] [-x arch] [-k dir] [-l title] [-t] [-f] [-q] [repodir] + This will make your repository browseable + -i name + Optionally ignore this package -- can be a shell-style glob. + This is useful for excluding debuginfo packages: + -i *debuginfo* -i *doc* + The globbing will be done against name-epoch-version-release, + e.g. foo-0-1.0-1 + -x arch + Optionally exclude this arch. E.g.: + -x src -x ia64 + -k templatedir + Use an alternative directory with kid templates instead of + the default: %s + The template directory must contain three required template + files: index.kid, group.kid, package.kid and the + "layout" dir which will be copied into the repoview directory. + -l title + Describe the repository in a few words. By default, "RepoView" is used. + E.g.: + -l "Extras for Fedora Core 3 x86" + -t + Place the index.html into the top level of the repodir, instead of + just in repodata/index.html. + -f + Regenerate the pages even if the repomd checksum hasn't changed. + -q + Do not output anything except fatal erros. + repodir + Where to look for the 'repodata' directory. + """ % DEFAULT_TEMPLATEDIR + sys.exit(ecode) + +def main(args): + global quiet + if not args: usage() + ignore = [] + xarch = [] + toplevel = 0 + templatedir = DEFAULT_TEMPLATEDIR + title = 'RepoView' + force = 0 + try: + gopts, cmds = getopt.getopt(args, 'i:x:k:l:tfqh', ['help']) + if not cmds: usage(1) + for o, a in gopts: + if o == '-i': ignore.append(a) + elif o == '-x': xarch.append(a) + elif o == '-k': templatedir = a + elif o == '-l': title = a + elif o == '-t': toplevel = 1 + elif o == '-f': force = 1 + elif o == '-q': quiet = 1 + else: usage() + repodir = cmds[0] + except getopt.error, e: + print "Error: %s" % e + usage(1) + if templatedir is None: + templatedir = os.path.join(repodir, 'templates') + rv = RepoView(repodir, ignore=ignore, xarch=xarch, force=force) + rv.applyTemplates(templatedir, toplevel=toplevel, title=title) + +if __name__ == '__main__': + main(sys.argv[1:]) Index: derivedmirrorcheckers.py =================================================================== RCS file: /cvs/fedora/bouncer_r/python/derivedmirrorcheckers.py,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- derivedmirrorcheckers.py 10 Jul 2005 09:15:28 -0000 1.1 +++ derivedmirrorcheckers.py 1 Aug 2005 20:38:01 -0000 1.2 @@ -173,7 +173,7 @@ from mirrors m where - m.mirror_admin_disable = '0'""" + m.mirror_active = '1'""" #---------------------------- # T a r g e t F i l e s S Q L @@ -485,22 +485,23 @@ def getListOfMirrors (self): """Execute appropriate SQL to get the list of mirrors """ - listOfMirrorsAndFilesNotRepresentedInDownloadables = self.database.executeSql(NewMirrorsAndFilesMirrorIntegrityChecker.MirrorsAndFilesNotRepresentedInDownloadablesSQL) + listOfMirrorsAndReposNotRepresentedInDownloadables = self.database.executeSql(NewMirrorsAndFilesMirrorIntegrityChecker.MirrorsAndReposNotRepresentedInDownloadablesSQL) + print listOfMirrorsAndReposNotRepresentedInDownloadables self.filesForEachMirror = { } uniqueMirrorList = [] dataForNewDownloadablesTableRecords = [ ] - for x in listOfMirrorsAndFilesNotRepresentedInDownloadables: + for x in listOfMirrorsAndReposNotRepresentedInDownloadables: if self.filesForEachMirror.has_key(x.mirror_id): self.filesForEachMirror[x.mirror_id].append(x.file_id) - else: - self.filesForEachMirror[x.mirror_id] = [ x.file_id ] - uniqueMirrorList.append(x) - dataForNewDownloadablesTableRecords.append( (x.mirror_id, x.file_id, '0', 0, self.doTemplateSubstitution(x.template_text, x.__dict__))) + # else: + # self.filesForEachMirror[x.mirror_id] = [ x.file_id ] + # uniqueMirrorList.append(x) + # dataForNewDownloadablesTableRecords.append( (x.mirror_id, x.file_id, '0', 0, self.doTemplateSubstitution(x.template_text, x.__dict__))) - self.database.executeManySql(NewMirrorsAndFilesMirrorIntegrityChecker.InsertMirrorsAndFilesNotRepresentedInDownloadablesSQL, dataForNewDownloadablesTableRecords) - self.database.commit() + #self.database.executeManySql(NewMirrorsAndFilesMirrorIntegrityChecker.InsertMirrorsAndFilesNotRepresentedInDownloadablesSQL, dataForNewDownloadablesTableRecords) + #self.database.commit() - return cse.TabularData.TabularData((listOfMirrorsAndFilesNotRepresentedInDownloadables.schema, uniqueMirrorList)) + #return cse.TabularData.TabularData((listOfMirrorsAndFilesNotRepresentedInDownloadables.schema, uniqueMirrorList)) #---------------------------- # g e t L i s t O f F i l e s @@ -519,23 +520,52 @@ #---------------------------------------------------------------------------------------------- # M i r r o r s A n d F i l e s N o t R e p r e s e n t e d I n D o w n l o a d a b l e s S Q L #---------------------------------------------------------------------------------------------- - MirrorsAndFilesNotRepresentedInDownloadablesSQL = """ - select - m.*, - f.file_id, + + + + MirrorsAndReposNotRepresentedInDownloadablesSQL = """ + SELECT + r.*, t.template_text, - pv.*, - o.*, - l.* - from - ((((((mirrors m join files f) left outer join downloadables d on m.mirror_id = d.mirror_id and f.file_id = d.file_id) - join templates t on f.template_id = t.template_id) - join product_versions pv on f.pv_id = pv.pv_id) - join oss o on f.os_id = o.os_id) - join langs l on f.lang_id = l.lang_id) - where - d.file_id is null - and m.mirror_admin_disable = '0'""" + p.*, + v.*, + a.* + FROM + repos r, templates t, products p, versions v, archs a + WHERE + r.version_id = v.version_id + AND + r.arch_id = a.arch_id + AND + r.product_id = p.product_id + AND + r.template_id = t.template_id + AND + r.repo_active = '1' + + """ + + + + + +# MirrorsAndFilesNotRepresentedInDownloadablesSQL = """ +# select +# m.*, +# f.file_id, +# t.template_text, +# pv.*, +# o.*, +# l.* +# from +# ((((((mirrors m join files f) left outer join downloadables d on m.mirror_id = d.mirror_id and f.file_id = d.file_id) +# join templates t on f.template_id = t.template_id) +# join product_versions pv on f.pv_id = pv.pv_id) +# join oss o on f.os_id = o.os_id) +# join langs l on f.lang_id = l.lang_id) +# where +# d.file_id is null +# and m.mirror_admin_disable = '0'""" #---------------------------------------------------------------------------------------------------------- Index: repochecker.py =================================================================== RCS file: /cvs/fedora/bouncer_r/python/repochecker.py,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- repochecker.py 9 Jul 2005 21:16:44 -0000 1.2 +++ repochecker.py 1 Aug 2005 20:38:01 -0000 1.3 @@ -36,67 +36,18 @@ import socket import sys -import re -import gzip +from repomd import * + import StringIO import time import os import shutil -## -# Try to import cElementTree, and if that fails attempt to fall back to -# ElementTree, a slower, but pure-python implementation. -# -try: - from cElementTree import iterparse -except ImportError: - from elementtree.ElementTree import iterparse - -from kid import Template - -## -# Some hardcoded constants -# -pkgkid = 'package.kid' -pkgfile = '%s.html' -grkid = 'group.kid' -grfile = '%s.group.html' -idxkid = 'index.kid' -idxfile = 'index.html' -VERSION = '0.3' -DEFAULT_TEMPLATEDIR = './templates' -def _bn(tag): - """ - This is a very dirty way to go from {xmlns}tag to just tag. - """ - try: return tag.split('}')[1] - except: return tag - -emailre = re.compile('<.*?@.*?>') -def _webify(text): - """ - Make it difficult to harvest email addresses. - """ - if text is None: return None - mo = emailre.search(text) - if mo: - email = mo.group(0) - remail = email.replace('.', '{*}') - remail = remail.replace('@', '{%}') - text = re.sub(email, remail, text) - return text - -def _mkid(text): - """ - Remove slashes. - """ - text = text.replace('/', '.') - text = text.replace(' ', '') - return text + #============================================ -# M i r r o r I n t e g r i t y C h e c k e r +# R e p o I n t e g r i t y C h e c k e r #============================================ class RepoIntegrityChecker (object): """This base class sets up the framework for testing a set of repos @@ -172,45 +123,17 @@ pass - #-------------------------------------------------- - # s p e c i a l I n i t i a l i z a t i o n T a s k - #-------------------------------------------------- - def specialInitializationTask (self, unusedDummy): - """Meant to be overridden in a derived class, this function is given to the - action thread to accomplish any preprocess initialization such as logging into - a database""" - pass - - #---------------------------------------------- - # s p e c i a l F i n a l i z a t i o n T a s k - #---------------------------------------------- - def specialFinalizationTask (self, unusedDummy): - """Meant to be overridden in a derived class, this function is given to the - action thread to accomplish any postprocess initialization such as logging off a - a database""" - pass - - #---------------------------- - # g e t L i s t O f F i l e s - #---------------------------- - def getListOfFiles (self, auxillaryData=None): - """Get a list of files in tabular data format - - This routine is meant to be overridden by a subclass. - """ - return TabularData() - - + #---------- # c h e c k #---------- def check (self): - """Queue mirrors for testing. + """Queue repos for testing. - After fetching the list of mirrors, this routine iterates through them, queueing - for testing. Along with the mirror information, it also bundles this list of - files expected to be found on the mirror into a tuple. This tuple is subsequently - referred to as a mirrorTuple. + After fetching the list of repos, this routine iterates through them, queueing + for testing. Along with the repo information, it also bundles this list of + files expected to be found on the repo into a tuple. This tuple is subsequently + referred to as a repoTuple. """ self.preCheck() @@ -257,17 +180,334 @@ RepoIntegrityChecker.logger.log(sentryutil.DEBUG4, "begin notifyOfActionsTaken") self.notifyOfActionsTaken() + #------------------------------ + # c h e c k R e p o T a s k + #------------------------------ + def checkRepoTask (self, aRepo): + """Check a repo by downloading and checking its metadata. + + This function is to be called by a worker thread. + + The results of this check are queued in the actions queue. + + Parameters: + aRepoTuple - a tuple in the form (repoInformation, listOfFileInformation) + + Notes: + 1) why does 'repoIsValid' have string values rather than boolean? The MySQL database for + setup with a column type of enum. In MySQL, enum is just a restriction on values + for a varchar column type. Since 'aRepo.repo_active' will be fetched as a string + and 'repoIsValid' is used in comparison with 'aRepo.repo_active', it was thought + they should be of the same type. For clarity in the future, perhaps these should be + reimplemented as boolean or at least 0 and 1 integers. + """ + + + + repoStatus = '2' #see note 1 above + #try: + RepoIntegrityChecker.logger.log(sentryutil.INFO7, "%s: downloading: %s", threading.currentThread().getName(), "asdf") + repoStatus, errorMessage = self.repoStatus (aRepo) + + repoStatus = str(repoStatus) + print repoStatus + print errorMessage + try: + pass + except Exception, e: + # something bad happened while downloading a file from a repo. This means that the status of the + # repo itself might have to be changed. + message = e.__str__() + if message == '': + message = e.__class__ + if aRepo.repo_active == '1': + # the repo is bad, but used to be good - take the bad repo action + self.actionTaskManager.newTask(self.repoActionGoodToBad, (aRepo, None, None, message, mx.DateTime.now(), self.checklevel)) + RepoIntegrityChecker.logger.log(sentryutil.INFO6, "%s: repoActionGoodToBad: %s", threading.currentThread().getName(), e) + else: + # the repo is bad, but was marked bad before, there is no change in status + self.actionTaskManager.newTask(self.repoActionBadNoChange, (aRepo, None, None, message, mx.DateTime.now(), self.checklevel)) + RepoIntegrityChecker.logger.log(sentryutil.INFO6, "%s: repoActionBadNoChange: %s ", threading.currentThread().getName(), aRepo.repo_name) + + else: + if aRepo.repo_active == '1' and repoStatus == '0': + # the repo is good and remains good + self.actionTaskManager.newTask(self.repoActionGoodNoChange, (aRepo, None, None, 'the repo is OK', mx.DateTime.now(), self.checklevel)) + RepoIntegrityChecker.logger.log(sentryutil.INFO6, "%s: repoActionGoodNoChange: %s", threading.currentThread().getName(), aRepo.repo_name) + + elif (aRepo.repo_active == '0' or aRepo.repo_active == '1') and repoStatus == '1': + # the repo is good and remains good + tempTuple = (aRepo, None, None, 'updating repo ', mx.DateTime.now(), self.checklevel, self.webpath) + self.actionTaskManager.newTask(self.repoActionUpdate, tempTuple) + RepoIntegrityChecker.logger.log(sentryutil.INFO6, "%s: repoActionUpdate: %s", threading.currentThread().getName(), aRepo.repo_name) + + elif aRepo.repo_active == '1' and repoStatus == '2': + # the repo is good, but used to be marked bad, take the bad to good transition + self.actionTaskManager.newTask(self.repoActionGoodToBad, (aRepo, None, None, message, mx.DateTime.now(), self.checklevel)) + RepoIntegrityChecker.logger.log(sentryutil.INFO6, "%s: repoActionGoodToBad: %s", threading.currentThread().getName(), e) + + elif aRepo.repo_active == '0' and repoStatus == '0': + self.actionTaskManager.newTask(self.repoActionBadToGood, (aRepo, None, None, message, mx.DateTime.now(), self.checklevel)) + RepoIntegrityChecker.logger.log(sentryutil.INFO6, "%s: repoActionBadToGood: %s", threading.currentThread().getName(), e) + + else: +# # we never managed to download anything - assume all of this repo's files are marked as bad. +# # there are no files to download and the repo was marked as bad, don't change the status. + self.actionTaskManager.newTask(self.repoActionBadNoChange, (aRepo, None, None, 'all files are bad - full test required', mx.DateTime.now(), self.checklevel)) + RepoIntegrityChecker.logger.log(sentryutil.INFO6, "%s: repoActionBadNoChange: %s ", threading.currentThread().getName(), aRepo.repo_name) + + + #-------------------- + # f i l e S t a t u s + #-------------------- + def repoStatus (self, aRepo): + """Returns a value indicating the validity of the file using several tests. + + In general, this function will be called only by a worker thread. + + This routine downloads a URL and first checks to see if it returns the + desired MimeType as indicated by the mimeTypeAssociations dictionary. + If it passes that test, it downloads the entire file and creates a hash. + + Parameters: + aURL - the complete URL to try to download + expectedHashCode - a string representing the hash code of the file. The length of + this string will be used to determine which hash algorithm to use. See the + class level variable 'hashLengthHashAlgorithmsAssociations' to see the lengths + and their associations. + + This routine returns a tuple: (ReturnCode, HumanReadableErrorMessage) + See the class level variable 'fileStatusAssociations' for the messages + The ReturnCode is as follows: + 0 - the repo is okay + 1 - repo is out of date + 2 - an HTTP Error occurred + """ + print aRepo + + #try: + rFilepath = aRepo.repo_url + '/'+ aRepo.metadata_path + lFilepath = (self.webpath +'/'+ aRepo.product_path +'/'+ aRepo.version_path+'/'+aRepo.arch_path) + timestamp = aRepo.repo_primary_timestamp + + data = self.getURI(rFilepath+'/repomd.xml',lFilepath, lFilepath+'/repomd.xml') + + #except urllib2.HTTPError, e: + # if 400 <= e.code <= 499: + # return (2, RepoIntegrityChecker.repoStatusAssociations[2] % e.__str__()) + # raise e + + repomd = RepoMD(self, aRepo, self.webpath) + repoIsUp2date = repomd.checkRepo() + + if repoIsUp2date != 1: + # old primary timestamp + return (1, RepoIntegrityChecker.repoStatusAssociations[1]) + # the repo is OK + return (0, RepoIntegrityChecker.repoStatusAssociations[0]) + + #-------------------------------------------- + # r e p o S t a t u s A s s o c i a t i o n s + #-------------------------------------------- + # This dictionary represents the possible return values of the 'reopStatus' method + repoStatusAssociations = { 0: 'the repo is OK', + 1: 'the repo is out of date', + 2: '%s' + } + + + #-------------------------------------------------- + # s p e c i a l I n i t i a l i z a t i o n T a s k + #-------------------------------------------------- + def specialInitializationTask (self, unusedDummy): + """Meant to be overridden in a derived class, this function is given to the + action thread to accomplish any preprocess initialization such as logging into + a database""" + pass + + + #---------------------------------------------- + # s p e c i a l F i n a l i z a t i o n T a s k + #---------------------------------------------- + def specialFinalizationTask (self, unusedDummy): + """Meant to be overridden in a derived class, this function is given to the + action thread to accomplish any postprocess initialization such as logging off a + a database""" + pass + + + #------------------------------------------ + # r e p o A c t i o n G o o d T o B a d + #------------------------------------------ + def repoActionGoodToBad (self, repoTuple): + """ Derived classes implement whatever action is appropriate when a repo changes status from good to bad. + This function is run exclusively by the action thread. + + Any derived classes implementing this function MUST chain their execution to + the their parent classes like this: + super(MyDerivedClass, self).repoActionGoodToBad() + + Parameter: + repoFileTuple - (repoObject, fileObject, url, errorMessageOrException, timestamp, testType) + """ + if self.workingEnvironment.has_key('notifyRepoActionGoodToBad'): + actionString = 'repoActionGoodToBad (%s): %s (%s) ' % (repoTuple[4], repoTuple[0].repo_baseurl, repoTuple[3]) + self.humanReadableActionList.append(actionString) + RepoIntegrityChecker.logger.log(sentryutil.INFO4, "%s: repoActionGoodToBad %s", threading.currentThread().getName(), repoTuple[0].repo_name) + + + #------------------------------------------ + # r e p o A c t i o n B a d T o G o o d + #------------------------------------------ + def repoActionBadToGood (self, repoTuple): + """ Derived classes implement whatever action is appropriate when a repo changes status from bad to good. + This function is run exclusively by the action thread. + + Any derived classes implementing this function MUST chain their execution to + the their parent classes like this: + super(MyDerivedClass, self).repoActionBadToGood() + + Parameter: + repoFileTuple - (repoObject, fileObject, url, errorMessageOrException, timestamp, testType) + """ + if self.workingEnvironment.has_key('notifyRepoActionBadToGood'): + actionString = 'repoActionBadToGood (%s): %s' % (repoTuple[4], repoTuple[0].repo_baseurl) + self.humanReadableActionList.append(actionString) + RepoIntegrityChecker.logger.log(sentryutil.INFO4, "%s: repoActionGoodToBad %s", threading.currentThread().getName(), repoFileTuple[0].repo_name) + + + #------------------------------------------------ + # r e p o A c t i o n G o o d N o C h a n g e + #------------------------------------------------ + def repoActionGoodNoChange (self, repoFileTuple): + """ Derived classes implement whatever action is appropriate when a repo changes is good and does not need to change status. + This function is run exclusively by the action thread. + + Any derived classes implementing this function MUST chain their execution to + the their parent classes like this: + super(MyDerivedClass, self).repoActionGoodNoChange() + + Parameter: + repoFileTuple - (repoObject, fileObject, url, errorMessageOrException, timestamp, testType) + """ + if self.workingEnvironment.has_key('notifyRepoActionGoodNoChange'): + actionString = 'repoActionGoodNoChange (%s): %s' % (repoFileTuple[4], repoFileTuple[0].repo_baseurl) + self.humanReadableActionList.append(actionString) + RepoIntegrityChecker.logger.log(sentryutil.INFO4, "%s: repoActionGoodNoChange %s", threading.currentThread().getName(), repoFileTuple[0].repo_name) + + + #---------------------------------------------- + # r e p o A c t i o n B a d N o C h a n g e + #---------------------------------------------- + def repoActionBadNoChange (self, repoTuple): + """ Derived classes implement whatever action is appropriate when a repo changes is bad and does not need to change status. + This function is run exclusively by the action thread. - def _get(self,uri,filename): - RepoIntegrityChecker.logger.log(sentryutil.INFO7, "%s: downloading: %s", threading.currentThread().getName(), uri) - request = urllib2.Request(uri) - request.add_header("Accept-encoding", "gzip") - usock = urllib2.urlopen(request) - data = usock.read() - if usock.headers.get('content-encoding', None) == 'gzip': - data = gzip.GzipFile(fileobj=StringIO.StringIO(data)).read() + Any derived classes implementing this function MUST chain their execution to + the their parent classes like this: + super(MyDerivedClass, self).repoActionBadNoChange() + + Parameter: + repoFileTuple - (repoObject, fileObject, url, errorMessageOrException, timestamp, testType) + """ + if self.workingEnvironment.has_key('notifyRepoActionBadNoChange'): + actionString = 'repoActionBadNoChange (%s): %s (%s) ' % (repoTuple[4], repoTuple[0].repo_baseurl, repoTuple[3]) + self.humanReadableActionList.append(actionString) + RepoIntegrityChecker.logger.log(sentryutil.INFO4, "%s: repoActionBadNoChange %s", threading.currentThread().getName(), repoTuple[0].repo_name) + + + #---------------------------------------------- + # r e p o A c t i o n B a d N o C h a n g e + #---------------------------------------------- + def repoActionUpdate (self, repoTuple): + """ Derived classes implement whatever action is appropriate when a repo changes is bad and does not need to change status. + This function is run exclusively by the action thread. + + Any derived classes implementing this function MUST chain their execution to + the their parent classes like this: + super(MyDerivedClass, self).repoActionBadNoChange() + + Parameter: + repoFileTuple - (repoObject, fileObject, url, errorMessageOrException, timestamp, testType) + """ + if self.workingEnvironment.has_key('notifyRepoActionUpdate'): + actionString = 'repoActionBadNoChange (%s): %s (%s) ' % (repoTuple[4], repoTuple[0].repo_baseurl, repoTuple[3]) + self.humanReadableActionList.append(actionString) + RepoIntegrityChecker.logger.log(sentryutil.INFO4, "%s: repoActionUpdate %s", threading.currentThread().getName(), repoTuple[0].repo_name) + + + + #-------------------------- + # g e n e r i c A c t i o n + #-------------------------- + def genericAction (self, parameter): + """ If a derived class needs to setup an action for the action thread but that action does not fit the other defined actions + this function can serve as the action. + + This function is run exclusively by the action thread. + + Any derived classes implementing this function MUST chain their execution to + the their parent classes like this: + super(MyDerivedClass, self).genericAction() + + Parameter: + parameter - whatever the derived class needs + """ + self.humanReadableActionList.append(parameters) + RepoIntegrityChecker.logger.log(sentryutil.INFO4, "%s: genericAction %s", parameter) + + + #---------------------------------------- + # n o t i f y O f A c t i o n s T a k e n + #---------------------------------------- + def notifyOfActionsTaken (self): + for x in enumerate(self.humanReadableActionList): + print "%4d %s" % x + + + + + + + + + + + + + + + + + + + + + + + def getURI(self,uri,filepath,filename): + try: + RepoIntegrityChecker.logger.log(sentryutil.INFO7, "%s: downloading: %s", threading.currentThread().getName(), uri) + request = urllib2.Request(uri) + request.add_header("Accept-encoding", "gzip") + usock = urllib2.urlopen(request) + data = usock.read() + except urllib2.HTTPError, e: + raise e + #if usock.headers.get('content-encoding', None) == 'gzip': + # data = gzip.GzipFile(fileobj=StringIO.StringIO(data)).read() RepoIntegrityChecker.logger.log(sentryutil.INFO7, "%s: done downloading: %s", threading.currentThread().getName(), uri) RepoIntegrityChecker.logger.log(sentryutil.INFO7, "%s: saving: %s", threading.currentThread().getName(), filename) + + if os.path.exists(filepath) and os.path.isdir(filepath): + pass + else: + try: + os.makedirs(filepath, mode=0755) + except OSError, e: + raise Errors.RepoError, "Error making cache directory: %s error was: %s" % ((filepath), e) + + fh = open(filename,'wb') fh.write(data) fh.close() @@ -276,25 +516,25 @@ #------------------------------ - # c h e c k M i r r o r T a s k + # c h e c k R e p o T a s k #------------------------------ - def checkRepoTask (self, aRepoTuple): - """Check a mirror by downloading all of its files. + def checkRepoTask_old (self, aRepoTuple): + """Check a repo by downloading all of its files. This function is to be called by a worker thread. - Given a mirror, this routine iterates through the associated file list, downloading + Given a repo, this routine iterates through the associated file list, downloading each file. After downloading, the file is checked for validity using the 'fileIsValid' function. The results of this check are queued in the actions queue. Parameters: - aMirrorTuple - a tuple in the form (mirrorInformation, listOfFileInformation) + aRepoTuple - a tuple in the form (repoInformation, listOfFileInformation) Notes: - 1) why does 'mirrorIsValid' have string values rather than boolean? The MySQL database for + 1) why does 'repoIsValid' have string values rather than boolean? The MySQL database for setup with a column type of enum. In MySQL, enum is just a restriction on values - for a varchar column type. Since 'aMirror.mirror_active' will be fetched as a string - and 'mirrorIsValid' is used in comparison with 'aMirror.mirror_active', it was thought + for a varchar column type. Since 'aRepo.repo_active' will be fetched as a string + and 'repoIsValid' is used in comparison with 'aRepo.repo_active', it was thought they should be of the same type. For clarity in the future, perhaps these should be reimplemented as boolean or at least 0 and 1 integers. """ @@ -307,7 +547,7 @@ letters = GroupFactory() maxlatest = 30 - mirrorIsValid = '0' #see note 1 above + repoIsValid = '0' #see note 1 above rFilepath = aRepoTuple.repo_url lFilepath = (self.webpath +'/'+ aRepoTuple.product_path +'/'+ aRepoTuple.version_path+'/'+aRepoTuple.arch_path) @@ -326,513 +566,14 @@ self.database.executeSql(RepoIntegrityChecker.UpdateTimestampSQL % (str(repodata['primary']['timestamp']), aRepoTuple.repo_id)) self.database.commit() - print ('--------------------' + repodata['primary']['timestamp']) - def _parseRepoMD(self, rFilepath, lFilepath,repodata,timestamp): - """ - Parser method for repomd.xml - """ - #type = 'unknown' - rFilename = (rFilepath+'/repodata/repomd.xml') - lFilename = (lFilepath+'/repodata/repomd.xml') - - if os.path.exists(lFilepath+'/repodata/') and os.path.isdir(lFilepath+'/repodata/'): - pass - else: - try: - os.makedirs(lFilepath+('/repodata/'), mode=0755) - except OSError, e: - raise Errors.RepoError, \ - "Error making cache directory: %s error was: %s" % ((lFilepath+'/repodata/'), e) - - - - data = self._get(rFilename,lFilename) - - RepoIntegrityChecker.logger.log(sentryutil.INFO7, "%s: parsing repo metadata: %s", threading.currentThread().getName(), lFilename) - for event, elem in iterparse(lFilename, events=('start',)): - tag = _bn(elem.tag) - if tag == 'data': - type = elem.get('type', 'unknown') - repodata[type] = {} - elif tag == 'location': - repodata[type]['location'] = elem.get('href', '#') - elif tag == 'checksum': - repodata[type]['checksum'] = elem.text - elif tag == 'timestamp': - repodata[type]['timestamp'] = elem.text - elem.clear() - - self._checkNecessity(repodata,timestamp) - return repodata - - def _checkNecessity(self,repodata,timestamp): - """ - This will look at the checksum for primary.xml and compare it to the - one recorded during the last run in repoview/checksum. If they match, - the program exits, unless overridden with -f. - """ - if timestamp != repodata['primary']['timestamp']: - return 1 - RepoIntegrityChecker.logger.log(sentryutil.INFO7, "%s: Repository has not changed.", threading.currentThread().getName()) - return 0 - - def _mkpkgid(self, n, e, v, r): - """ - Make the n-e-v-r package id out of n, e, v, r. - """ - return '%s-%s-%s-%s' % (n, e, v, r) - - def _checkIgnore(self, pkgid,ignore): - """ - Check if package id (n-e-v-r) matches the ignore globs passed - via -i. - """ - for glob in ignore: - if fnmatch.fnmatchcase(pkgid, glob): return 1 - return 0 - - def _getevr(self, elem): - """ - Utility method to get e-v-r out of the element. - """ - e = elem.get('epoch', '0') - v = elem.get('ver', '0') - r = elem.get('rel', '0') - return {'epoch': e, 'ver': v, 'rel': r} - - - def _doPackage(self, pkgdata,xarch,arches,ignore,packages): - """ - Helper method for cleanliness. Accepts pkgdata and sees if we need - to create a new package or add arches to existing ones, or ignore it - outright. - """ - if not pkgdata: return 0 - if pkgdata['arch'] in xarch: return 0 - if pkgdata['arch'] not in arches: - arches.append(pkgdata['arch']) - ## We make a package here from pkgdata ## - (n, e, v, r) = (pkgdata['name'], pkgdata['epoch'], - pkgdata['ver'], pkgdata['rel']) - pkgid = self._mkpkgid(n, e, v, r) - if self._checkIgnore(pkgid,ignore): return 0 - if packages.has_key(pkgid): - package = packages[pkgid] - else: - package = Package(n, e, v, r) - package.pkgid = pkgid - packages[pkgid] = package - package.doPackage(pkgdata) - return - - def _parsePrimary(self, rFilepath, lFilepath,repodata,xarch,arches,ignore,packages): - """ - Utility method for parsing primary.xml. - """ - rFilename = (rFilepath+ '/'+ repodata['primary']['location']) - lFilename = (lFilepath+ '/'+ repodata['primary']['location']) - - - data = self._get(rFilename,lFilename) - RepoIntegrityChecker.logger.log(sentryutil.INFO7, "%s: parsing primary: %s", threading.currentThread().getName(), lFilename) - - fh = self._get(rFilename,lFilename) - pct = 0 - ignored = 0 - pkgdata = {} - simpletags = ( - 'name', - 'arch', - 'summary', - 'description', - 'url', - 'packager', - 'checksum', - 'license', - 'group', - 'vendor') - for event, elem in iterparse(lFilename): - tag = _bn(elem.tag) - if tag == 'package': - if not self._doPackage(pkgdata,xarch,arches,ignore,packages): ignored += 1 - pct += 1 - RepoIntegrityChecker.logger.log(sentryutil.INFO7, "parsing primary: %s packages, %s ignored", pct, ignored) - - pkgdata = {} - elif tag in simpletags: - pkgdata[tag] = _webify(elem.text) - elif tag == 'version': - pkgdata.update(self._getevr(elem)) - elif tag == 'time': - pkgdata['time'] = elem.get('build', '0') - elif tag == 'size': - pkgdata['size'] = elem.get('package', '0') - elif tag == 'location': - pkgdata['location'] = elem.get('href', '#') - elem.clear() - self.pkgcount = pct - ignored - self.pkgignored = ignored - - def _doOther(self, pkgid, changelogs,packages): - """ - Helper method for cleanliness. - """ - if pkgid and changelogs and packages.has_key(pkgid): - package = packages[pkgid] - return package.addChangelogs(changelogs) - return 0 - - def _parseOther(self,rFilepath,lFilepath,repodata,packages, limit=3): - """ - Utility method to parse other.xml. - """ - rFilename = (rFilepath+ '/'+ repodata['other']['location']) - lFilename = (lFilepath+ '/'+ repodata['other']['location']) - data = self._get(rFilename,lFilename) - - RepoIntegrityChecker.logger.log(sentryutil.INFO7, "%s: parsing other: %s", threading.currentThread().getName(), lFilename) - - pct = 0 - ignored = 0 - changelogs = [] - evr = None - cct = 0 - for event, elem in iterparse(lFilename): - tag = _bn(elem.tag) - if tag == 'package': - n = elem.get('name', '__unknown__') - pkgid = self._mkpkgid(n, evr['epoch'], evr['ver'], evr['rel']) - if not self._doOther(pkgid, changelogs,packages): ignored += 1 - pct += 1 - - RepoIntegrityChecker.logger.log(sentryutil.INFO7, "parsing other: %s packages, %s ignored", pct, ignored) - evr = None - changelogs = [] - n = None - cct = 0 - elif tag == 'version': - evr = self._getevr(elem) - elif tag == 'changelog': - if cct >= limit: continue - author = _webify(elem.get('author', 'incognito')) - date = int(elem.get('date', '0')) - changelog = _webify(elem.text) - changelogs.append([date, author, changelog]) - cct += 1 - elem.clear() - - - def mkLinkUrl(self, object, isindex=0): - """ - This is a utility method passed to kid templates. The templates use - it to get the link to a package, group, or layout object without - having to figure things out on their own. - """ - link = '#' - prefix = '' - if isindex: - if self.toplevel: prefix = os.path.join('repodata', 'repoview') - else: prefix = 'repoview' - if object.__class__ is str: - if not isindex and object == idxfile: - if self.toplevel: link = os.path.join('..', '..', object) - else: link = os.path.join('..', object) - else: - link = os.path.join(prefix, object) - elif object.__class__ is Package: - link = os.path.join(prefix, pkgfile % object.pkgid) - elif object.__class__ is Group: - link = os.path.join(prefix, grfile % object.grid) - elif object.__class__ is Archer: - if isindex and self.toplevel: - link = os.path.join('..', object.loc) - else: - link = os.path.join('..', '..', object.loc) - return link - - - def applyTemplates(self, lFilepath,templatedir,packages,groups,letters, maxlatest,outdir,arches,repodata,toplevel=0, title='RepoView'): - """ - Just what it says. :) - """ - if not packages: - RepoIntegrityChecker.logger.log(sentryutil.INFO7, "No packages available") - sys.exit(0) - gentime = time.strftime('%c') - self.toplevel = toplevel - self._makeExtraGroups(groups,packages,letters,maxlatest) - self._mkOutDir(templatedir,outdir) - stats = { - 'title': title, - 'pkgcount': 0, - 'pkgignored': {}, - #'ignorelist': self.ignore, - 'archlist': {}, - #'ignorearchlist': self.xarch, - 'VERSION': VERSION, - 'gentime': gentime - } - ## Do groups - grtmpl = os.path.join(templatedir, grkid) - kobj = Template(file=grtmpl, mkLinkUrl=self.mkLinkUrl, - letters=letters, groups=groups, stats=stats) - i = 0 - for grid in groups.keys(): - kobj.group = groups[grid] - out = os.path.join(outdir, grfile % grid) - fh = open(out, 'w') - kobj.write(fh) - fh.close() - i += 1 - RepoIntegrityChecker.logger.log(sentryutil.INFO7, "writing groups: %s written", i) - - ## Do letter groups - i = 0 - for grid in letters.keys(): - kobj.group = letters[grid] - out = os.path.join(outdir, grfile % grid) - fh = open(out, 'w') - kobj.write(fh) - fh.close() - i += 1 - RepoIntegrityChecker.logger.log(sentryutil.INFO7, "writing letter groups: %s written", i) - ## Do packages - i = 0 - pkgtmpl = os.path.join(templatedir, pkgkid) - kobj = Template(file=pkgtmpl, mkLinkUrl=self.mkLinkUrl, - letters=letters, stats=stats) - for pkgid in packages.keys(): - kobj.package = packages[pkgid] - out = os.path.join(outdir, pkgfile % pkgid) - fh = open(out, 'w') - kobj.write(fh) - fh.close() - i += 1 - RepoIntegrityChecker.logger.log(sentryutil.INFO7, "writing packages: %s written", i) - ## Do index - RepoIntegrityChecker.logger.log(sentryutil.INFO7, "generating index...") - idxtmpl = os.path.join(templatedir, idxkid) - arches.sort() - kobj = Template(file=idxtmpl, mkLinkUrl=self.mkLinkUrl, - letters=letters, groups=groups, stats=stats) - if self.toplevel: - out = os.path.join(lFilepath, idxfile) - else: - out = os.path.join(lFilepath, 'repodata', idxfile) - fh = open(out, 'w') - kobj.write(out) - fh.close() - RepoIntegrityChecker.logger.log(sentryutil.INFO7, "writing checksum...") - chkfile = os.path.join(outdir, 'checksum') - fh = open(chkfile, 'w') - fh.write(repodata['primary']['checksum']) - fh.close() - - - - def _makeExtraGroups(self,groups,packages,letters,maxlatest): - """ - This is a utility method to create the extra groups. Currently, - the extra groups are: - __nogroup__: packages not in any other groups - __latest__: the last NN packages updated - letter groups: All packages get grouped by their uppercased first - letter - Any empty groups are then removed. - """ - nogroup = Group(grid='__nogroup__', - name='Packages not in Groups') - latest = {} - i = 0 - makerpmgroups = 0 - if not len(groups): - makerpmgroups = 1 - for pkgid in packages.keys(): - package = packages[pkgid] - if package.group is None: - if makerpmgroups: - grid = _mkid(package.rpmgroup) - if grid not in groups.keys(): - group = Group(grid=grid, name=package.rpmgroup) - groups[grid] = group - else: - group = groups[grid] - package.group = group - group.packages.append(package) - else: - package.group = nogroup - nogroup.packages.append(package) - letter = pkgid[0].upper() - if letter not in letters.keys(): - group = Group(grid=letter, name='Letter: %s' % letter) - letters[letter] = group - letters[letter].packages.append(package) - # btime is number of seconds since epoch, so reverse logic! - btime = 0 - for arch in package.arches.values(): - if arch.time > btime: btime = arch.time - if len(latest.keys()) < maxlatest: - latest[btime] = package - else: - times = latest.keys() - times.sort() - times.reverse() - oldest = times[-1] - if btime > oldest: - del latest[oldest] - latest[btime] = package - i += 1 - RepoIntegrityChecker.logger.log(sentryutil.INFO7, "creating extra groups: %s entries", i) - if nogroup.packages: - groups[nogroup.grid] = nogroup - times = latest.keys() - times.sort() - times.reverse() - lgroup = Group(grid='__latest__', - name='Last %s Packages Updated' % len(times)) - for time in times: - lgroup.packages.append(latest[time]) - lgroup.sorted = 1 - groups[lgroup.grid] = lgroup - ## Prune empty groups - for grid in groups.keys(): - if not groups[grid].packages: del groups[grid] - - def _mkOutDir(self, templatedir,outdir): - """ - Remove the existing repoview directory if it exists, and create a - new one, copying in the layout dir from templates (if found). - """ - if os.path.isdir(outdir): - RepoIntegrityChecker.logger.log(sentryutil.INFO7, "deleting old repoview...") - shutil.rmtree(outdir) - os.mkdir(outdir) - layoutsrc = os.path.join(templatedir, 'layout') - layoutdst = os.path.join(outdir, 'layout') - if os.path.isdir(layoutsrc): - RepoIntegrityChecker.logger.log(sentryutil.INFO7, "copying layout...") - shutil.copytree(layoutsrc, layoutdst) - -# rv.applyTemplates(DEFAULT_TEMPLATEDIR, 0, 'RepoView') -# mirrorIsValid = '1' # since the file downloaded without raising an exception, we know the mirror is valid -# fileActionFunction = self.determineFileAction(aFile.downloadable_active, fileIsNotValid, aURL) -# self.actionTaskManager.newTask(fileActionFunction, (aMirror, aFile, aURL, errorMessage, mx.DateTime.now(), self.checklevel)) - #except Exception, e: - # something bad happened while downloading a file from a mirror. This means that the status of the - # mirror itself might have to be changed. - # message = e.__str__() - # if message == '': - # message = e.__class__ - # if aMirror.mirror_active == '1': -# # the mirror is bad, but used to be good - take the bad mirror action -# self.actionTaskManager.newTask(self.mirrorActionGoodToBad, (aMirror, None, None, message, mx.DateTime.now(), self.checklevel)) - # MirrorIntegrityChecker.logger.log(sentryutil.INFO6, "%s: mirrorActionGoodToBad: %s", threading.currentThread().getName(), e) - # else: -# # the mirror is bad, but was marked bad before, there is no change in status -# self.actionTaskManager.newTask(self.mirrorActionBadNoChange, (aMirror, None, None, message, mx.DateTime.now(), self.checklevel)) -# RepoIntegrityChecker.logger.log(sentryutil.INFO6, "%s: mirrorActionBadNoChange: %s ", threading.currentThread().getName(), aMirror.mirror_name) -# else: -# printpass -# if aMirror.mirror_active == '1' and mirrorIsValid == '1': -# # the mirror is good and remains good -# self.actionTaskManager.newTask(self.mirrorActionGoodNoChange, (aMirror, None, None, 'the mirror is OK', mx.DateTime.now(), self.checklevel)) -# MirrorIntegrityChecker.logger.log(sentryutil.INFO6, "%s: mirrorActionGoodNoChange: %s", threading.currentThread().getName(), aMirror.mirror_name) -# elif mirrorIsValid == '1': -# # the mirror is good, but used to be marked bad, take the bad to good transition -# self.actionTaskManager.newTask(self.mirrorActionBadToGood, (aMirror, None, None, 'the mirror is OK', mx.DateTime.now(), self.checklevel)) -# MirrorIntegrityChecker.logger.log(sentryutil.INFO6, "%s: mirrorActionBadToGood: %s ", threading.currentThread().getName(), aMirror.mirror_name) -# elif aMirror.mirror_active == '1': -# # we never managed to download anything - assume all of this mirror's files are marked as bad. -# # there are no files to download but the mirror was marked as good, change the status to bad. -# self.actionTaskManager.newTask(self.mirrorActionGoodToBad, (aMirror, None, None, 'all files are bad - full test required', mx.DateTime.now(), self.checklevel)) -# MirrorIntegrityChecker.logger.log(sentryutil.INFO6, "%s: mirrorActionGoodToBad: %s ", threading.currentThread().getName(), aMirror.mirror_name) -# else: -# # we never managed to download anything - assume all of this mirror's files are marked as bad. -# # there are no files to download and the mirror was marked as bad, don't change the status. -# self.actionTaskManager.newTask(self.mirrorActionBadNoChange, (aMirror, None, None, 'all files are bad - full test required', mx.DateTime.now(), self.checklevel)) -# RepoIntegrityChecker.logger.log(sentryutil.INFO6, "%s: mirrorActionBadNoChange: %s ", threading.currentThread().getName(), aMirror.mirror_name) - - - #---------------------------------------- - # n o t i f y O f A c t i o n s T a k e n - #---------------------------------------- - def notifyOfActionsTaken (self): - for x in enumerate(self.humanReadableActionList): - print "%4d %s" % x - - - #-------------------- - # f i l e S t a t u s - #-------------------- - def fileStatus (self, aURL): - """Returns a value indicating the validity of the file using several tests. - - In general, this function will be called only by a worker thread. - - This routine downloads a URL and first checks to see if it returns the - desired MimeType as indicated by the mimeTypeAssociations dictionary. - If it passes that test, it downloads the entire file and creates a hash. - - Parameters: - aURL - the complete URL to try to download - expectedHashCode - a string representing the hash code of the file. The length of - this string will be used to determine which hash algorithm to use. See the - class level variable 'hashLengthHashAlgorithmsAssociations' to see the lengths - and their associations. - - This routine returns a tuple: (ReturnCode, HumanReadableErrorMessage) - See the class level variable 'fileStatusAssociations' for the messages - The ReturnCode is as follows: - 0 - the file is okay - 1 - the server is giving the incorrect MIME type - 2 - the hash values did not match - 3 - an HTTP Error occurred - """ -# print (aURL) -# try: -# urlReader = urllib2.urlopen(aURL) -# try: -# page = urlReader.read() -# print(page) - - - - -# expectedContentType = MirrorIntegrityChecker.mimeTypeAssociations[aURL[aURL.rfind('.')+1:]] -# if urlContentType not in expectedContentType: -# # incorrect MIME type error -# return (1, MirrorIntegrityChecker.fileStatusAssociations[1] % (urlContentType, expectedContentType)) -# except KeyError: pass -# except urllib2.HTTPError, e: -# if 400 <= e.code <= 499: -# return (3, MirrorIntegrityChecker.fileStatusAssociations[3] % e.__str__()) -# raise e - -# expectedHashCodeLength = len(expectedHashCode) -# if expectedHashCodeLength not in MirrorIntegrityChecker.hashLengthHashAlgorithmsAssociations.keys(): -# expectedHashCodeLength = 32 #if the expected hash code is of unexpected length - assume MD5 -# hashCalculator = MirrorIntegrityChecker.hashLengthHashAlgorithmsAssociations[expectedHashCodeLength][1].new() -# while True: -# block = urlReader.read(self.hashReadChunkSize) -# hashCalculator.update(block) -# blockLength = len(block) -# MirrorIntegrityChecker.logger.log(sentryutil.DEBUG0, "%s: downloading: %s, %d bytes read", threading.currentThread().getName(), aURL, blockLength) -# if blockLength < self.hashReadChunkSize: -# break # we're done reading this file - -# urlComputedHashCode = hashCalculator.hexdigest() -# if urlComputedHashCode != expectedHashCode: -# # incorrect hash code error -# return (2, MirrorIntegrityChecker.fileStatusAssociations[2] % (MirrorIntegrityChecker.hashLengthHashAlgorithmsAssociations[expectedHashCodeLength][0], urlComputedHashCode, expectedHashCode)) -# # the file is OK -# return (0, MirrorIntegrityChecker.fileStatusAssociations[0]) + #---------------------------------------------------------------------------------------------- # I n s e r t N e w R e p o s S Q L @@ -845,172 +586,5 @@ repo_primary_timestamp = %s WHERE repo_id = %d""" - -class Archer: - """ - This class handles all possible architectures for a package, since - the listing is done by n-e-v-r.html, and a single release can have more - than one architecture available, e.g. "src". This is effectively where - all packages end up being: there are no further sublevels. - """ - def __init__(self, pkgdata): - self.arch = pkgdata['arch'] - self.time = int(pkgdata['time']) - self.size = int(pkgdata['size']) - self.loc = pkgdata['location'] - self.packager = pkgdata['packager'] - - def getFileName(self): - """ - Get the basename of the RPM file in question. - """ - return os.path.basename(self.loc) - - def getTime(self, format='%c'): - """ - Return the build time of this package in locale format, unless - passed as format='strformat'. - """ - return time.strftime(format, time.localtime(self.time)) - - def getSize(self): - """ - You can access the byte size of the package by looking at arch.size, - but this will return the size in sane units (KiB or MiB). - """ - kbsize = self.size/1024 - if kbsize/1024 < 1: - return '%d KiB' % kbsize - else: - return '%0.2f MiB' % (float(kbsize)/1024) - -class Package: - """ - A bit of a misnomer -- this is "package" in the sense of repoview, not in - the sense of an .rpm file, since it will include multiple architectures. - """ - def __init__(self, n, e, v, r): - self.nevr = (n, e, v, r) - self.n = n - self.e = e - self.v = v - self.r = r - self.group = None - self.rpmgroup = None - self.arches = {} - self.incomplete = 1 - self.changelogs = [] - - def doPackage(self, pkgdata): - """ - Accept a dict with key-value pairs and populate ourselves with it. - """ - if self.incomplete: self._getPrimary(pkgdata) - pkgid = pkgdata['checksum'] - if self.arches.has_key(pkgid): return - arch = Archer(pkgdata) - self.arches[pkgid] = arch - - def addChangelogs(self, changelogs): - """ - Accept changelogs from other-parser and assign them, unless we - already have some (sometimes happens with multiple architectures). - """ - if self.changelogs: return 0 - self.changelogs = changelogs - return 1 - - def _getPrimary(self, pkgdata): - """ - A helper method to grab values from pkgdata dict. - """ - self.summary = pkgdata['summary'] - self.description = pkgdata['description'] - self.url = pkgdata['url'] - self.license = pkgdata['license'] - self.vendor = pkgdata['vendor'] - self.rpmgroup = pkgdata['group'] - self.incomplete = 0 - - def getChangeLogs(self): - """ - Get the changelogs in the [c-formatted date, author, entry] style. - """ - self.changelogs.sort() - self.changelogs.reverse() - retlist = [] - for changelog in self.changelogs: - date, author, entry = changelog - date = time.strftime('%c', time.localtime(date)) - retlist.append ([date, author, entry]) - return retlist -class Group: - """ - Contains a list of packages. - """ - def __init__(self, grid=None, name=None): - self.packages = [] - self.grid = grid - self.name = name - self.sorted = 0 - self.uservisible = 1 - - def getSortedList(self, trim=0, nevr=None): - """ - A utility method for calling from kid templates. This will - return a sorted list of packages, optionally trimmed since - on large repositories this list can be very large, and makes - the display useless. If you pass the trim parameter, you must - pass the nevr parameter, too, so the it knows around which package - to trim. - """ - if not self.sorted: - nevrlist = {} - for package in self.packages: - nevrlist[package.nevr] = package - keys = nevrlist.keys() - keys.sort() - retlist = [] - for nevr in keys: - retlist.append(nevrlist[nevr]) - self.packages = retlist - self.sorted = 1 - if not trim or len(self.packages) <= trim: return self.packages - retlist = [] - i = 0 - for pkg in self.packages: - if pkg.nevr == nevr: break - i += 1 - half = trim/2 - if i - half < 0: - return self.packages[0:trim] - if i + half > len(self.packages): - return self.packages[-trim:] - return self.packages[i-half:i+half] - -class GroupFactory(dict): - """ - A small utility class that extends the dict functionality to aide in - kid template generation. It contains the groups, keyed by group id. - """ - def __init__(self): - dict.__init__(self) - self.sortedlist = None - - def getSortedList(self, showinvisible=0): - """ - Get the sorted list of groups. The sorting is done by group id - in ascending order (locale-specific). - """ - if self.sortedlist is None: - grids = [] - for grid in self.keys(): - if self[grid].uservisible or showinvisible: - grids.append(grid) - grids.sort() - self.sortedlist = [] - for grid in grids: - self.sortedlist.append(self[grid]) - return self.sortedlist \ No newline at end of file Index: sentry.py =================================================================== RCS file: /cvs/fedora/bouncer_r/python/sentry.py,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sentry.py 10 Jul 2005 09:15:28 -0000 1.2 +++ sentry.py 1 Aug 2005 20:38:01 -0000 1.3 @@ -215,7 +215,7 @@ # insure that only one instance of the program runs at a time if we're running a long test # such as anything over checklevel 2 - if workingEnvironment["checklevel"] > 2: + if workingEnvironment["checklevel"] > 4: pidFileName = ("%s/pid" % workingEnvironment["persistentDataPath"]).replace("//", "/") try: f = open(pidFileName, "r") @@ -231,15 +231,15 @@ expectedPid = f.write(`os.getpid()`) f.close() - #try: - # aMirrorIntegrityCheckerClass = createMirrorIntegrityCheckerClass (workingEnvironment) - # aMirrorIntegrityChecker = aMirrorIntegrityCheckerClass(workingEnvironment) - # aMirrorIntegrityChecker.check() - try: - aRepoIntegrityCheckerClass = createRepoIntegrityCheckerClass (workingEnvironment) - aRepoIntegrityChecker = aRepoIntegrityCheckerClass(workingEnvironment) - aRepoIntegrityChecker.check() + aMirrorIntegrityCheckerClass = createMirrorIntegrityCheckerClass (workingEnvironment) + aMirrorIntegrityChecker = aMirrorIntegrityCheckerClass(workingEnvironment) + aMirrorIntegrityChecker.check() + + #try: + # aRepoIntegrityCheckerClass = createRepoIntegrityCheckerClass (workingEnvironment) + # aRepoIntegrityChecker = aRepoIntegrityCheckerClass(workingEnvironment) + # aRepoIntegrityChecker.check() sentryLogger.log(sentryutil.INFO4, "done") except Exception, e: From fedora-extras-commits at redhat.com Mon Aug 1 20:39:29 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Mon, 1 Aug 2005 16:39:29 -0400 Subject: bouncer_r/php/admin login.php,1.2,1.3 index.php,1.2,1.3 Message-ID: <200508012040.j71KeZPj015476@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/php/admin In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13863/php/admin Added Files: login.php index.php Log Message: cvs cleanup for fedora initial commit Index: login.php =================================================================== RCS file: login.php diff -N login.php --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ login.php 1 Aug 2005 20:39:27 -0000 1.3 @@ -0,0 +1,54 @@ +displayHeader("Login"); + +?> +Bouncer Login +'.$msg.'':null?> + + + Username: + + + + + + Password: + + + + + + +displayFooter('$Date$', 1); +?> Index: index.php =================================================================== RCS file: index.php diff -N index.php --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ index.php 1 Aug 2005 20:39:27 -0000 1.3 @@ -0,0 +1,105 @@ +displayHeader('Admin'); + + + + +#$title = 'Dashboard'; +#$nav = INC.'/admin_nav.php'; +#require_once(HEADER); +echo 'Dashboard'; + +echo 'Mirror Network'; +echo ''; + +// total # of mirrors +$mirror_total = db_get_one("SELECT COUNT(mirror_id) FROM mirrors",MYSQL_NUM); +echo ''.$mirror_total[0].' total mirrors.'; + +// # of disabled mirrors +$mirror_disabled = db_get_one("SELECT IF(COUNT(mirror_id)>0,COUNT(mirror_id),'No') FROM mirrors WHERE mirror_active != '1'",MYSQL_NUM); +echo ''.$mirror_disabled[0].' mirrors are inactive.'; + +// # of active mirrors +$mirror_active = db_get_one("SELECT IF(COUNT(mirror_id)>0,COUNT(mirror_id),'No') FROM mirrors WHERE mirror_active = '1' AND mirror_admin_disable = '0'",MYSQL_NUM); +echo ''.$mirror_active[0].' mirrors are active.'; + +// # of admin-disabled mirrors +$mirror_admin_disable= db_get_one("SELECT IF(COUNT(mirror_id)>0,COUNT(mirror_id),'No') FROM mirrors WHERE mirror_admin_disable = '1'",MYSQL_NUM); +echo ''.$mirror_admin_disable[0].' mirrors disabled by an admin.'; + +// total bandwidth +$mirror_total_bandwidth = db_get_one("SELECT SUM(mirror_rating) FROM mirrors",MYSQL_NUM); +$mirror_avail_bandwidth = db_get_one("SELECT SUM(mirror_rating) FROM mirrors WHERE mirror_active = '1' AND mirror_admin_disable = '0'",MYSQL_NUM); +echo ''.$mirror_avail_bandwidth[0].' / '.$mirror_total_bandwidth[0].' Megabits of bandwidth is available.'; + +// files served +$files_served = db_get_one("SELECT IF(COUNT(file_id),COUNT(file_id),'No') FROM downloadables",MYSQL_NUM); +echo ''.$files_served[0].' files currently served by '.$mirror_active[0].' mirrors.'; + +echo ''; + +// product->mirror statistics +//$product_stats = db_get(" +// SELECT +// product_versions.*, +// COUNT(mirrors.mirror_id) as count, +// COUNT(files.file_id) as filecount, +// SUM(mirrors.mirror_rating) as bandwidth +// FROM +// downloadable +// INNER JOIN +// mirrors +// ON +// downloadable.mirror_id=mirrors.mirror_id +// INNER JOIN +// files +// ON +// downloadable.file_id=files.file_id +// INNER JOIN +// product_versions +// ON +// files.pv_id=product_versions.pv_id +// GROUP BY +// files.pv_id +// ORDER BY +// pv_product_name +//"); +//if (!empty($product_stats)) { +// echo 'Product Availability (any lang, any os)'; +// echo ''; +// echo ''; +// foreach ($product_stats as $row) { +// echo ''; +// $row++; +// } +// echo 'Product Version Files Mirrors Bandwidth '.$row['pv_product_name'].' '.$row['pv_version_name'].' '.$row['filecount'].' '.$row['count'].' '.$row['bandwidth'].' Mbits'; +//} + +// recently logged in users +$users = db_get("SELECT users.* FROM sessions INNER JOIN users ON users.username=sessions.username"); +if (!empty($users)) { + echo 'Recent Users'; + echo ''; + foreach ($users as $user) { + echo ''.$user['user_firstname'].' '.$user['user_lastname'].' ('.$user['username'].')'; + } + echo ''; +} + +$template->displayFooter('$Date$'); +?> From fedora-extras-commits at redhat.com Mon Aug 1 20:39:42 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Mon, 1 Aug 2005 16:39:42 -0400 Subject: bouncer_r/php/lib mirror.php,1.2,1.3 Message-ID: <200508012040.j71KegtE015502@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/php/lib In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13863/php/lib Added Files: mirror.php Log Message: cvs cleanup for fedora initial commit View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.2 -r 1.3 mirror.php Index: mirror.php =================================================================== RCS file: mirror.php diff -N mirror.php --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ mirror.php 1 Aug 2005 20:39:40 -0000 1.3 @@ -0,0 +1,2033 @@ + From fedora-extras-commits at redhat.com Mon Aug 1 20:38:34 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Mon, 1 Aug 2005 16:38:34 -0400 Subject: bouncer_r/php/inc/forms subscribe1.php, 1.2, 1.3 region.php, 1.2, 1.3 repo.php, 1.3, 1.4 mirror.php, 1.2, 1.3 user.php, 1.2, 1.3 Message-ID: <200508012040.j71KeZ4n015482@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/php/inc/forms In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13863/php/inc/forms Added Files: subscribe1.php region.php repo.php mirror.php user.php Log Message: cvs cleanup for fedora initial commit Index: subscribe1.php =================================================================== RCS file: subscribe1.php diff -N subscribe1.php --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ subscribe1.php 1 Aug 2005 20:38:31 -0000 1.3 @@ -0,0 +1,18 @@ +'; +form_label('Mirror', 'mirror','label-medium'); +form_select('mirror_id','mirror','',mirror_mirrors_get_select(),$posts['mirror_id']); +echo ' [edit mirrors]'; +echo ' '; + +echo ''; +form_label('Product', 'product','label-medium'); +form_select('product_id','product','',mirror_products_get_select(),$posts['product_id']); +echo ' [edit products]'; +echo ' '; +?> Index: region.php =================================================================== RCS file: region.php diff -N region.php --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ region.php 1 Aug 2005 20:38:31 -0000 1.3 @@ -0,0 +1,27 @@ +'; +form_label('Region Name', 'name','label-small'); +form_text('region_name', 'name', '', $posts['region_name'], 30, 100); +echo ' '; + +echo ''; +form_label('Short Name', 'short_name','label-small'); +form_text('region_short_name', 'short_name', '', $posts['region_short_name'], 30, 100); +echo ' '; + +echo ''; +form_label('Continent', 'continent','label-small'); +form_select('continent_id','continent','',mirror_continent_get_select(),$posts['continent_id'], 30, 100); +echo ' [edit continents]'; +echo ' '; + +echo ''; +form_label('Priority', 'rp','label-small'); +form_text('region_priority', 'rp', '', $posts['region_priority'], 30, 100); +echo ' '; +?> Index: repo.php =================================================================== RCS file: repo.php diff -N repo.php --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ repo.php 1 Aug 2005 20:38:31 -0000 1.4 @@ -0,0 +1,35 @@ +'; +form_label('Product', 'product','label-medium'); +form_select('product_id','product','',mirror_products_get_select(),$posts['product_id']); +echo ' [edit products]'; +echo ' '; + +echo ''; +form_label('Version', 'version','label-medium'); +form_select('version_id','version','',mirror_versions_get_select(),$posts['version_id']); +echo ' [edit versions]'; +echo ' '; + +echo ''; +form_label('Arch', 'arch','label-medium'); +form_select('arch_id','arch','',mirror_arch_get_all_select(),$posts['arch_id']); +echo ' [edit architecture]'; +echo ' '; + +echo ''; +form_label('Meta Data Path', 'md','label-medium'); +form_text('metadata_path', 'md', '', $posts['metadata_path'], 30, 100); +echo ' '; + +echo ''; +form_label('Templates', 'template','label-medium'); +form_select('template_id','template','',mirror_templates_get_select(),$posts['template_id']); +echo ' [edit templates]'; +echo ' '; +?> Index: mirror.php =================================================================== RCS file: mirror.php diff -N mirror.php --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ mirror.php 1 Aug 2005 20:38:31 -0000 1.3 @@ -0,0 +1,54 @@ +'; +form_label('Mirror Name', 'mname','label-small'); +form_text('mirror_name', 'mname', '', $posts['mirror_name'], 30, 100); +echo ' '; + +echo 'Mirror Address Information'; + + +echo ''; +form_label('Type', 'type','label-small'); +form_select('mirror_type','type','',mirror_types_get_select(),$posts['mirror_type']); +echo ' [edit types]'; +echo ' '; + +echo ''; +form_label('Base URL', 'murl','label-small'); +form_text('mirror_baseurl', 'murl', '', $posts['mirror_baseurl'], 30, 100); +echo ' '; + +echo ''; +form_label('Base Path', 'mpath','label-small'); +form_text('mirror_basepath', 'mpath', '', $posts['mirror_basepath'], 30, 100); +echo ' '; + + +echo ' '; + +echo ''; +form_label('Region', 'mregion','label-small'); +form_select('region_id','mregion','',mirror_regions_get_select(),$posts['region_id']); +echo ' [edit regions]'; +echo ' '; + +echo ''; +form_label('Rating', 'mrating','label-small'); +form_text('mirror_rating', 'mrating', '', $posts['mirror_rating'], 30, 100); +echo ' '; + +echo 'Mirror Contact Information'; + +echo ''; +form_label('Contact', 'contact','label-small'); +form_select('contact_id','contact','',mirror_contacts_get_select(),$posts['contact_id']); +echo ' [edit contacts]'; +echo ' '; + +echo ' '; +?> Index: user.php =================================================================== RCS file: user.php diff -N user.php --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ user.php 1 Aug 2005 20:38:32 -0000 1.3 @@ -0,0 +1,28 @@ +'; +form_label('Username', 'uname','label-medium'); +form_text('username', 'uname', '', $posts['username'], 30, 100); +echo ' '; + +echo ''; +form_label('Password', 'password','label-medium'); +form_password('password', 'password', '', 30, 100); +echo ' '; + +echo ''; +form_label('Re-enter Password', 'rpassword','label-medium'); +form_password('rpassword', 'rpassword', '', 30, 100); +echo ' '; + +echo ''; +form_label('Contact', 'contact','label-medium'); +form_select('contact_id','contact','',mirror_contacts_get_select(),$posts['contact_id']); +echo ' [edit contacts]'; +echo ' '; +?> From fedora-extras-commits at redhat.com Mon Aug 1 20:40:17 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Mon, 1 Aug 2005 16:40:17 -0400 Subject: bouncer_r/php index.php,1.3,1.4 Message-ID: <200508012040.j71KeleI015507@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/php In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13863/php Modified Files: index.php Log Message: cvs cleanup for fedora initial commit From fedora-extras-commits at redhat.com Mon Aug 1 20:44:37 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Mon, 1 Aug 2005 16:44:37 -0400 Subject: bouncer_r/python sentry.conf.cvs,NONE,1.1 Message-ID: <200508012044.j71Kibf7015540@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/python In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15524/python Added Files: sentry.conf.cvs Log Message: cvs cleanup for fedora initial commit --- NEW FILE sentry.conf.cvs --- #------------------- # s e n t r y 2 . 0 #------------------- # # test configuration file email emailUserName=EMAILUSERNAME emailSMTPServer=SMTPSERVER emailPassword=PASSWORD emailReturnAddress=RETURNADDRESS emailSendToAddress=SENTTOADDRESS emailCriticalLogEvents databaseName= databaseUserName= databasePassword= databaseServer= notifyFileActionGoodToBad notifyFileActionBadToGood #notifyFileActionGoodNoChange notifyFileActionBadNoChange notifyMirrorActionGoodToBad notifyMirrorActionBadToGood #notifyMirrorActionGoodNoChange #notifyMirrorActionBadNoChange visual benchmarking numberOfThreads=30 persistentDataPath= webpath= From fedora-extras-commits at redhat.com Mon Aug 1 20:46:48 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Mon, 1 Aug 2005 16:46:48 -0400 Subject: bouncer_r/python sentry.conf,1.2,NONE Message-ID: <200508012046.j71Kkm3P015563@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/python In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15548/python Removed Files: sentry.conf Log Message: cvs cleanup for fedora initial commit --- sentry.conf DELETED --- From fedora-extras-commits at redhat.com Mon Aug 1 20:49:20 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Mon, 1 Aug 2005 16:49:20 -0400 Subject: rpms/python-matplotlib/devel .cvsignore,1.3,1.4 sources,1.3,1.4 Message-ID: <200508012049.j71KnK7W015595@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/python-matplotlib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15576 Modified Files: .cvsignore sources Log Message: New source Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-matplotlib/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 28 Jul 2005 20:40:00 -0000 1.3 +++ .cvsignore 1 Aug 2005 20:49:18 -0000 1.4 @@ -1 +1 @@ -matplotlib-0.83.1.tar.gz +matplotlib-0.83.2.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-matplotlib/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 28 Jul 2005 20:40:00 -0000 1.3 +++ sources 1 Aug 2005 20:49:18 -0000 1.4 @@ -1 +1 @@ -6142d63cafd8a4a2ed0c94d772c68611 matplotlib-0.83.1.tar.gz +c5d7c39eeeeafd88a419194fba93a6cb matplotlib-0.83.2.tar.gz From fedora-extras-commits at redhat.com Mon Aug 1 20:49:53 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Mon, 1 Aug 2005 16:49:53 -0400 Subject: bouncer_r/php/cfg config.php.cvs,NONE,1.1 Message-ID: <200508012049.j71KnrXP015651@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/php/cfg In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15635/php/cfg Added Files: config.php.cvs Log Message: cvs cleanup for fedora initial commit --- NEW FILE config.php.cvs --- From fedora-extras-commits at redhat.com Mon Aug 1 20:50:49 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Mon, 1 Aug 2005 16:50:49 -0400 Subject: bouncer_r/python .cvsignore,1.1,1.2 Message-ID: <200508012050.j71Konqw015694@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/python In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15666/python Modified Files: .cvsignore Log Message: cvs cleanup for fedora initial commit Index: .cvsignore =================================================================== RCS file: /cvs/fedora/bouncer_r/python/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 Aug 2005 19:27:43 -0000 1.1 +++ .cvsignore 1 Aug 2005 20:50:47 -0000 1.2 @@ -1 +1,2 @@ sentry.conf-sf +sentry.conf From fedora-extras-commits at redhat.com Mon Aug 1 20:50:49 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Mon, 1 Aug 2005 16:50:49 -0400 Subject: bouncer_r/php/cfg config.php-sf,1.3,NONE config.php,1.4,NONE Message-ID: <200508012050.j71Kon2U015699@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/php/cfg In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15666/php/cfg Removed Files: config.php-sf config.php Log Message: cvs cleanup for fedora initial commit --- config.php-sf DELETED --- --- config.php DELETED --- From fedora-extras-commits at redhat.com Mon Aug 1 20:53:49 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Mon, 1 Aug 2005 16:53:49 -0400 Subject: bouncer_r/php/cfg .cvsignore,NONE,1.1 Message-ID: <200508012053.j71Krn6x015749@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/php/cfg In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15733/php/cfg Added Files: .cvsignore Log Message: cvs cleanup for fedora initial commit --- NEW FILE .cvsignore --- config.php From fedora-extras-commits at redhat.com Mon Aug 1 20:56:28 2005 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Mon, 1 Aug 2005 16:56:28 -0400 Subject: rpms/libkexif/FC-3 libkexif.spec,1.2,1.3 Message-ID: <200508012056.j71KuSQY015817@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/libkexif/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15774/FC-3 Modified Files: libkexif.spec Log Message: - add patch for forward declaration of QComboBox (see bug #162964) Index: libkexif.spec =================================================================== RCS file: /cvs/extras/rpms/libkexif/FC-3/libkexif.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- libkexif.spec 29 Jan 2005 23:32:25 -0000 1.2 +++ libkexif.spec 1 Aug 2005 20:56:26 -0000 1.3 @@ -1,6 +1,6 @@ Name: libkexif Version: 0.2.1 -Release: 1 +Release: 1%{?dist} Epoch: 0 Summary: Allow Kipi plugins to extract EXIF information From fedora-extras-commits at redhat.com Mon Aug 1 20:56:28 2005 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Mon, 1 Aug 2005 16:56:28 -0400 Subject: rpms/libkexif/FC-4 libkexif-0.2.1-qcombobox.patch, NONE, 1.1 libkexif.spec, 1.6, 1.7 Message-ID: <200508012056.j71KuS5k015825@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/libkexif/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15774/FC-4 Modified Files: libkexif.spec Added Files: libkexif-0.2.1-qcombobox.patch Log Message: - add patch for forward declaration of QComboBox (see bug #162964) libkexif-0.2.1-qcombobox.patch: --- NEW FILE libkexif-0.2.1-qcombobox.patch --- --- libkexif-0.2.1/libkexif/kexifdialog.h 2004-12-20 22:00:20.000000000 +0100 +++ libkexif-0.2.1/libkexif/kexifdialog.h.fwddecl 2005-07-11 23:11:48.000000000 +0200 @@ -32,6 +32,7 @@ class QString; class QLabel; class KExifWidget; +class QComboBox; class KExifDialog : public KDialogBase { Index: libkexif.spec =================================================================== RCS file: /cvs/extras/rpms/libkexif/FC-4/libkexif.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- libkexif.spec 23 May 2005 00:16:41 -0000 1.6 +++ libkexif.spec 1 Aug 2005 20:56:26 -0000 1.7 @@ -1,6 +1,6 @@ Name: libkexif Version: 0.2.1 -Release: 3 +Release: 4%{?dist} Summary: Allow Kipi plugins to extract EXIF information @@ -8,6 +8,7 @@ License: GPL URL: http://extragear.kde.org/apps/kipi Source0: http://dl.sf.net/digikam/libkexif-0.2.1.tar.bz2 +Patch0: libkexif-0.2.1-qcombobox.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libexif-devel >= 0.5.7, kdelibs-devel >= 6:3.0 @@ -31,6 +32,7 @@ %prep %setup -q +%patch0 -p1 -b .qcombobox %build @@ -71,6 +73,9 @@ %changelog +* Mon Aug 01 2005 Aurelien Bompard 0.2.1-4 +- add patch for forward declaration of QComboBox (see bug #162964) + * Fri Apr 7 2005 Michael Schwendt - rebuilt From fedora-extras-commits at redhat.com Mon Aug 1 20:56:29 2005 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Mon, 1 Aug 2005 16:56:29 -0400 Subject: rpms/libkexif/devel libkexif-0.2.1-qcombobox.patch, NONE, 1.1 libkexif.spec, 1.6, 1.7 Message-ID: <200508012056.j71KuTdN015831@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/libkexif/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15774/devel Modified Files: libkexif.spec Added Files: libkexif-0.2.1-qcombobox.patch Log Message: - add patch for forward declaration of QComboBox (see bug #162964) libkexif-0.2.1-qcombobox.patch: --- NEW FILE libkexif-0.2.1-qcombobox.patch --- --- libkexif-0.2.1/libkexif/kexifdialog.h 2004-12-20 22:00:20.000000000 +0100 +++ libkexif-0.2.1/libkexif/kexifdialog.h.fwddecl 2005-07-11 23:11:48.000000000 +0200 @@ -32,6 +32,7 @@ class QString; class QLabel; class KExifWidget; +class QComboBox; class KExifDialog : public KDialogBase { Index: libkexif.spec =================================================================== RCS file: /cvs/extras/rpms/libkexif/devel/libkexif.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- libkexif.spec 23 May 2005 00:16:41 -0000 1.6 +++ libkexif.spec 1 Aug 2005 20:56:27 -0000 1.7 @@ -1,6 +1,6 @@ Name: libkexif Version: 0.2.1 -Release: 3 +Release: 4%{?dist} Summary: Allow Kipi plugins to extract EXIF information @@ -8,6 +8,7 @@ License: GPL URL: http://extragear.kde.org/apps/kipi Source0: http://dl.sf.net/digikam/libkexif-0.2.1.tar.bz2 +Patch0: libkexif-0.2.1-qcombobox.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libexif-devel >= 0.5.7, kdelibs-devel >= 6:3.0 @@ -31,6 +32,7 @@ %prep %setup -q +%patch0 -p1 -b .qcombobox %build @@ -71,6 +73,9 @@ %changelog +* Mon Aug 01 2005 Aurelien Bompard 0.2.1-4 +- add patch for forward declaration of QComboBox (see bug #162964) + * Fri Apr 7 2005 Michael Schwendt - rebuilt From fedora-extras-commits at redhat.com Mon Aug 1 21:06:07 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Mon, 1 Aug 2005 17:06:07 -0400 Subject: rpms/python-matplotlib/FC-4 .cvsignore, 1.3, 1.4 python-matplotlib.spec, 1.6, 1.7 sources, 1.3, 1.4 Message-ID: <200508012106.j71L6e9t017001@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/python-matplotlib/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16977 Modified Files: .cvsignore python-matplotlib.spec sources Log Message: - New upstream version matplotlib 0.83.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-matplotlib/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 28 Jul 2005 20:40:00 -0000 1.3 +++ .cvsignore 1 Aug 2005 21:06:05 -0000 1.4 @@ -1 +1 @@ -matplotlib-0.83.1.tar.gz +matplotlib-0.83.2.tar.gz Index: python-matplotlib.spec =================================================================== RCS file: /cvs/extras/rpms/python-matplotlib/FC-4/python-matplotlib.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- python-matplotlib.spec 28 Jul 2005 23:06:28 -0000 1.6 +++ python-matplotlib.spec 1 Aug 2005 21:06:05 -0000 1.7 @@ -1,7 +1,7 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: python-matplotlib -Version: 0.83.1 +Version: 0.83.2 Release: 2%{?dist} Summary: Python plotting library @@ -47,6 +47,9 @@ %{_datadir}/matplotlib/ %changelog +* Mon Aug 01 2005 Orion Poplawski 0.83.2-2 +- New upstream version matplotlib 0.83.2 + * Thu Jul 28 2005 Orion Poplawski 0.83.1-2 - Bump rel to fix botched tag Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-matplotlib/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 28 Jul 2005 20:40:00 -0000 1.3 +++ sources 1 Aug 2005 21:06:05 -0000 1.4 @@ -1 +1 @@ -6142d63cafd8a4a2ed0c94d772c68611 matplotlib-0.83.1.tar.gz +c5d7c39eeeeafd88a419194fba93a6cb matplotlib-0.83.2.tar.gz From fedora-extras-commits at redhat.com Mon Aug 1 21:31:17 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Mon, 1 Aug 2005 17:31:17 -0400 Subject: bouncer_r/scripts - New directory Message-ID: <200508012131.j71LVHCd017173@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/scripts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17159/scripts Log Message: Directory /cvs/fedora/bouncer_r/scripts added to the repository From fedora-extras-commits at redhat.com Mon Aug 1 21:31:46 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Mon, 1 Aug 2005 17:31:46 -0400 Subject: bouncer_r/scripts .cvsignore,NONE,1.1 websync.sh.cvs,NONE,1.1 Message-ID: <200508012131.j71LVkGo017206@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/scripts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17189/scripts Added Files: .cvsignore websync.sh.cvs Log Message: cvs cleanup for fedora initial commit --- NEW FILE .cvsignore --- websync_sf.sh ***** Error reading new file: [Errno 2] No such file or directory: 'websync.sh.cvs' From fedora-extras-commits at redhat.com Mon Aug 1 21:57:59 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 1 Aug 2005 17:57:59 -0400 Subject: rpms/proftpd/devel proftpd.spec,1.8,1.9 Message-ID: <200508012157.j71LvxR3017268@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/proftpd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17221/devel Modified Files: proftpd.spec Log Message: Bump release because of missing source file for the last tag. Index: proftpd.spec =================================================================== RCS file: /cvs/extras/rpms/proftpd/devel/proftpd.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- proftpd.spec 1 Aug 2005 15:17:49 -0000 1.8 +++ proftpd.spec 1 Aug 2005 21:57:57 -0000 1.9 @@ -1,7 +1,7 @@ Summary: Flexible, stable and highly-configurable FTP server Name: proftpd Version: 1.2.10 -Release: 5%{?_with_ldap:_ldap}%{?_with_mysql:_mysql}%{?_with_postgresql:_pgsql}%{?dist} +Release: 6%{?_with_ldap:_ldap}%{?_with_mysql:_mysql}%{?_with_postgresql:_pgsql}%{?dist} License: GPL Group: System Environment/Daemons URL: http://www.proftpd.org/ @@ -140,7 +140,7 @@ %changelog -* Wed Jul 13 2005 Matthias Saou 1.2.10-5 +* Wed Jul 13 2005 Matthias Saou 1.2.10-6 - The provided pam.d file no longer works, use our own based on the one from the vsftpd package (#163026). - Rename the pam.d file we use from 'ftp' to 'proftpd'. From fedora-extras-commits at redhat.com Mon Aug 1 21:57:54 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 1 Aug 2005 17:57:54 -0400 Subject: rpms/proftpd/FC-4 proftpd.spec,1.8,1.9 Message-ID: <200508012158.j71LwO2A017274@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/proftpd/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17221/FC-4 Modified Files: proftpd.spec Log Message: Bump release because of missing source file for the last tag. Index: proftpd.spec =================================================================== RCS file: /cvs/extras/rpms/proftpd/FC-4/proftpd.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- proftpd.spec 1 Aug 2005 15:17:48 -0000 1.8 +++ proftpd.spec 1 Aug 2005 21:57:52 -0000 1.9 @@ -1,7 +1,7 @@ Summary: Flexible, stable and highly-configurable FTP server Name: proftpd Version: 1.2.10 -Release: 5%{?_with_ldap:_ldap}%{?_with_mysql:_mysql}%{?_with_postgresql:_pgsql}%{?dist} +Release: 6%{?_with_ldap:_ldap}%{?_with_mysql:_mysql}%{?_with_postgresql:_pgsql}%{?dist} License: GPL Group: System Environment/Daemons URL: http://www.proftpd.org/ @@ -140,7 +140,7 @@ %changelog -* Wed Jul 13 2005 Matthias Saou 1.2.10-5 +* Wed Jul 13 2005 Matthias Saou 1.2.10-6 - The provided pam.d file no longer works, use our own based on the one from the vsftpd package (#163026). - Rename the pam.d file we use from 'ftp' to 'proftpd'. From fedora-extras-commits at redhat.com Mon Aug 1 21:57:53 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 1 Aug 2005 17:57:53 -0400 Subject: rpms/proftpd/FC-3 proftpd.spec,1.6,1.7 Message-ID: <200508012158.j71LwNqQ017271@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/proftpd/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17221/FC-3 Modified Files: proftpd.spec Log Message: Bump release because of missing source file for the last tag. Index: proftpd.spec =================================================================== RCS file: /cvs/extras/rpms/proftpd/FC-3/proftpd.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- proftpd.spec 1 Aug 2005 15:17:48 -0000 1.6 +++ proftpd.spec 1 Aug 2005 21:57:51 -0000 1.7 @@ -1,7 +1,7 @@ Summary: Flexible, stable and highly-configurable FTP server Name: proftpd Version: 1.2.10 -Release: 5%{?_with_ldap:_ldap}%{?_with_mysql:_mysql}%{?_with_postgresql:_pgsql}%{?dist} +Release: 6%{?_with_ldap:_ldap}%{?_with_mysql:_mysql}%{?_with_postgresql:_pgsql}%{?dist} License: GPL Group: System Environment/Daemons URL: http://www.proftpd.org/ @@ -140,7 +140,7 @@ %changelog -* Wed Jul 13 2005 Matthias Saou 1.2.10-5 +* Wed Jul 13 2005 Matthias Saou 1.2.10-6 - The provided pam.d file no longer works, use our own based on the one from the vsftpd package (#163026). - Rename the pam.d file we use from 'ftp' to 'proftpd'. From thias at spam.spam.spam.spam.spam.spam.spam.egg.and.spam.freshrpms.net Mon Aug 1 22:25:56 2005 From: thias at spam.spam.spam.spam.spam.spam.spam.egg.and.spam.freshrpms.net (Matthias Saou) Date: Tue, 2 Aug 2005 00:25:56 +0200 Subject: rpms/taglib/devel .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 taglib.spec, 1.8, 1.9 In-Reply-To: <200508011854.j71IsIax009993@cvs-int.fedora.redhat.com> References: <200508011854.j71IsIax009993@cvs-int.fedora.redhat.com> Message-ID: <20050802002556.319b4806@python2> Aurelien Bompard wrote : > @@ -61,19 +69,15 @@ > %{_includedir}/* > %{_libdir}/lib*.so > #%{_libdir}/lib*.la > +%{_libdir}/pkgconfig/*.pc > %doc taglib-api/html > %doc examples Maybe the -devel package could now require "pkgconfig"? Also, the explicit "Requires(pre|post): /sbin/ldconfig" are redundant with the use of "%post|%postun -p" since the program executed is automatically required. Both minor issues, though :-) Matthias -- Clean custom Red Hat Linux rpm packages : http://freshrpms.net/ Fedora Core release 4 (Stentz) - Linux kernel 2.6.12-1.1398_FC4 Load : 0.42 0.56 0.78 From fedora-extras-commits at redhat.com Mon Aug 1 23:38:18 2005 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Mon, 1 Aug 2005 19:38:18 -0400 Subject: rpms/perl-Net-CIDR-Lite/devel perl-Net-CIDR-Lite.spec,1.1,1.2 Message-ID: <200508012338.j71NcIsv019961@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Net-CIDR-Lite/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19944 Modified Files: perl-Net-CIDR-Lite.spec Log Message: Add BR Test::Pod and Test::Pod::Coverage for make test Index: perl-Net-CIDR-Lite.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Net-CIDR-Lite/devel/perl-Net-CIDR-Lite.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Net-CIDR-Lite.spec 1 Aug 2005 19:47:09 -0000 1.1 +++ perl-Net-CIDR-Lite.spec 1 Aug 2005 23:38:15 -0000 1.2 @@ -2,7 +2,7 @@ Name: perl-Net-CIDR-Lite Version: 0.18 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Net::CIDR::Lite Perl module License: GPL or Artistic Group: Development/Libraries @@ -11,6 +11,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +# For "make test". +BuildRequires: perl(Test::Pod), perl(Test::Pod::Coverage) %description Faster alternative to Net::CIDR when merging a large number of CIDR @@ -47,5 +49,8 @@ %{_mandir}/man3/* %changelog +* Mon Aug 01 2005 Steven Pritchard 0.18-2 +- Add BR Test::Pod and Test::Pod::Coverage for make test + * Fri Jul 15 2005 Steven Pritchard 0.18-1 - Specfile autogenerated. From fedora-extras-commits at redhat.com Tue Aug 2 00:03:19 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Mon, 1 Aug 2005 20:03:19 -0400 Subject: bouncer_r/php index.php,1.4,1.5 Message-ID: <200508020003.j7203nDS021124@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/php In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21107/php Modified Files: index.php Log Message: cvs cleanup for fedora initial commit From fedora-extras-commits at redhat.com Tue Aug 2 00:04:51 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Mon, 1 Aug 2005 20:04:51 -0400 Subject: bouncer_r/php/lib auth.php,1.2,1.3 Message-ID: <200508020005.j7205L56021144@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/php/lib In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21127/php/lib Added Files: auth.php Log Message: cvs cleanup for fedora initial commit Index: auth.php =================================================================== RCS file: auth.php diff -N auth.php --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ auth.php 2 Aug 2005 00:04:49 -0000 1.3 @@ -0,0 +1,75 @@ +0) { + $buf = db_fetch($res,MYSQL_ASSOC); + // comment line below to disable gc and allow multiple sessions per username + db_query("DELETE FROM sessions WHERE username='{$buf['username']}' AND session_id != '{$_COOKIE['mozilla-mirror-admin']}'"); // garbage collection + $user = db_fetch(db_query("SELECT * FROM users WHERE username='{$buf['username']}'"),MYSQL_ASSOC); + if (empty($_SESSION)) { + auth_create_session($user); // if session isn't started, create it and push user data + } + return true; + } + } + return false; +} + +/** + * Authentication a user. + * @param string $username + * @param string $password + * @return array|bool array containing user data or false on failure + */ +function auth_mysql($username,$password) +{ + if (empty($username)||empty($password)) { + return false; + } + $username = trim(strip_tags(addslashes($username))); + $password = trim(strip_tags(addslashes($password))); + $res = db_query("SELECT * FROM users WHERE username='{$username}' AND password=MD5('{$password}')"); + if ($res && db_numrows($res)>0) { + return db_fetch($res,MYSQL_ASSOC); + } else { + return false; + } +} + +/** + * Start a valid session. + * @param array $user array containing user information. + */ +function auth_create_session($user,$secure=0) +{ + session_name('mozilla-mirror-admin'); + session_set_cookie_params(0,'/',$_SERVER['HTTP_HOST'],$secure); + session_start(); + db_query("INSERT INTO sessions(session_id,username) VALUES('".session_id()."','{$user['username']}')"); + $_SESSION['user']=$user; +} + +/** + * Logout. + */ +function auth_logout() +{ + // comment line below to keep gc from deleting other sessions for this user + db_query("DELETE FROM sessions WHERE session_id='{$_COOKIE['mozilla-mirror-admin']}' OR username='{$_SESSION['user']['username']}'"); + $_COOKIE = array(); + $_SESSION = array(); +} +?> From fedora-extras-commits at redhat.com Tue Aug 2 00:06:11 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Mon, 1 Aug 2005 20:06:11 -0400 Subject: bouncer_r/php/lib csv.php,1.2,1.3 Message-ID: <200508020006.j7206jYe021172@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/php/lib In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21147/php/lib Added Files: csv.php Log Message: cvs cleanup for fedora initial commit Index: csv.php =================================================================== RCS file: csv.php diff -N csv.php --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ csv.php 2 Aug 2005 00:06:09 -0000 1.3 @@ -0,0 +1,177 @@ + + * if ($_GET['csv']) + * { + * $res=db_query("SELECT * FROM fic_courses"); + * send_csv($res); + * exit; + * } + * + * @package mirror + * @subpackage lib + * @author Central Web Services, Oregon State University + * @copyright Oregon State University + */ + +/** + * @param resource $res MySQL resource / result + * @return array $ret_val array of CSV rows, parsed properly (false if $res is not resource) + */ +function export_to_csv($res) +{ + // parse all results, format for CSV + while ( $buf=db_fetch($res,MYSQL_ASSOC) ) + { + // get the keys (headers), if not already done + if ( empty($heads) ) + { + $heads=array_keys($buf); + foreach ($heads as $key=>$val) + { + $heads[$key]=add_quotes(fix_quotes($val)); + } + $heads=implode(',',$heads); + $csv[]=$heads."\n"; + } + // fix inner quotes, add outer quotes for all values + $row=array_to_csv($buf); + $csv[]=$row."\n"; + } + return $csv; +} + +/** + * Use a resource or two dimensional array, then send the CSV results to user. + * @param mixed $res MySQL resource / result, or a two dimensional array + * @param string $name name of the export file + * @return bool true if file sent, false otherwise + */ +function send_csv($res,$name=null) +{ + // set name of the export file + $filename=(is_null($name))?'export-'.date('Y-m-d').'.csv':$name.'.csv'; + // check for valid resource + if ( is_resource($res) ) + { + $csv=export_to_csv($res); + } + elseif( is_array($res) && !empty($res) ) + { + foreach ($res as $row) + { + if ( !is_array($row) ) + ; + else + $csv[] = array_to_csv($row)."\n"; + } + } + + if ( is_array($csv) ) + { + // stream csv to user + header("Content-type: application/x-csv"); + header('Content-disposition: inline; filename="'.$filename.'"'); + header('Cache-Control: private'); + header('Pragma: public'); + foreach ($csv as $row) + { + echo $row; + } + return true; + } + + return false; +} + +/** + * Replace quotes inside of a field with double quotes, which is something CSV requires. + * @param string $string unquoted quotes + * @return string $string quoted quotes + */ +function fix_quotes($string) +{ + return preg_replace('/"/','""',$string); +} + +/** + * Replaces instances of double quotes in a string with a single quote. + * @param string $string the string to perform the replacement on + * @return string the string with "" replaced by " + */ +function unfix_quotes($string) +{ + return preg_replace('/""/', '"', $string); +} + +/** + * Place quotes outside of every field, which inherently solves space, line break issues. + * @param string $string + * @return string $string with quotes around it + */ +function add_quotes($string) +{ + return '"'.$string.'"'; +} + +/** + * Removes quotes from the beginning and the end of a string. + * @param string $string the string to remove the quotes from + * @return string the string, sans quotes at the beginning and end + */ +function remove_quotes($string) +{ + $pattern = "/^\"(.*)\"$/"; + $replacement = "$1"; + return preg_replace($pattern, $replacement, $string); +} + +/** + * Convert an array into a CSV string with quotes around each value. + * @param array $array + * @return string the values in $array surrounded by quotes and separated by commas + */ +function array_to_csv($array) +{ + $csv_arr = array(); + foreach ($array as $value) + { + $csv_arr[]=add_quotes(fix_quotes($value)); + } + $csv_string=implode(',',$csv_arr); + + return $csv_string; +} + +/** + * Convert a CSV string into an array. + * Please use sparingly - this creates temp files + * @param string $string the CSV string + * @return array the elements from the CSV string in an array + */ +function csv_to_array($string) +{ + $return = array(); + $length = strlen($string); + + // create a temp file and write the string to it + $tmpfname = tempnam('/tmp', 'csvlib'); + $fh = fopen($tmpfname, 'w'); + fwrite($fh, $string); + fclose($fh); + + // open the file for csv parsing + $csvh = fopen($tmpfname, 'r'); + while (($arraydata = fgetcsv($csvh, $length, ',')) !== false) + { + $return = array_merge($return, $arraydata); + } + + fclose($csvh); + unlink($tmpfname); + + return $return; +} +?> From fedora-extras-commits at redhat.com Tue Aug 2 00:07:51 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Mon, 1 Aug 2005 20:07:51 -0400 Subject: bouncer_r/php/lib db.php,1.2,1.3 Message-ID: <200508020007.j7207pDi021211@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/php/lib In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21178/php/lib Added Files: db.php Log Message: cvs cleanup for fedora initial commit Index: db.php =================================================================== RCS file: db.php diff -N db.php --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ db.php 2 Aug 2005 00:07:49 -0000 1.3 @@ -0,0 +1,300 @@ + + * db_get("SELECT * FROM table",MYSQL_ASSOC); + * returns... + * Array + * ( + * [0] => Array + * ( + * [id] => 1 + * [field1] => data1 + * [field2] => data2 + * ) + * + * ) + * + */ +function db_get($query,$type=MYSQL_BOTH,$col_id=NULL) +{ + $res = db_query($query); + $list = array(); + if (is_resource($res) && !is_null($col_id) && ($type == MYSQL_BOTH || $type == MYSQL_ASSOC) && @mysql_num_rows($res) !== 0) { + $col_test = db_fetch($res,$type); + @mysql_data_seek($res, 0); + if (array_key_exists($col_id,$col_test)) { + while ( $buf = db_fetch($res,$type) ) { + $list[$buf[$col_id]] = $buf; + } + return $list; + } + } + while ( $buf = db_fetch($res,$type) ) { + $list[] = $buf; + } + return $list; +} + +/** + * Get all of the fieldnames for the specified table. + * @param string $table name of table to describe + * @return array array of column names, must be an array + */ +function db_fieldnames($table) +{ + $dbh = db_connect(); + $results = db_query("DESCRIBE $table"); + if (is_resource($results)) + { + while ($buf=db_fetch($results)) + { + $field_names[] = $buf[0]; + } + } + else + { + $field_names[] = 0; + } + return $field_names; +} + +/** + * Create a MySQL INSERT statement based on $_POST array generated by form submission. + * + * does not work with mysql functions (PASSWORD, etc.) because there are forced double quotes + * do not use clean_in() before this, or you'll have double the slashes + * use the function only when it saves you time, not _always_ + * form items not set will not be processed (unchecked radios, checkboxes) - handle these manually, or don't use the func + * + * @param array $vars array of posts + * @param string $table name of the table that fields will be inserted into + * @return string $query resulting MySQL insert string + */ +function db_makeinsert($vars,$table) +{ + $dbh = db_connect(); + $fields = db_fieldnames($table); + foreach ($fields as $field) + { + if (get_magic_quotes_gpc) $vars[$field] = stripslashes($vars[$field]); + $vars[$field] = addslashes($vars[$field]); + if (isset($vars[$field])) + { + isset($q1)?$q1 .= ','.$field:$q1='INSERT INTO '.$table.'('.$field; + isset($q2)?$q2 .= ",'$vars[$field]'":$q2=" VALUES('$vars[$field]'"; + } + } + $q1 .= ')'; + $q2 .= ')'; + $query = $q1.$q2; + return $query; +} + +/** + * Create a MySQL REPLACE statement based on $_POST array generated by form submission. + * + * does not work with mysql functions (PASSWORD, etc.) because there are forced double quotes + * do not use clean_in() before this, or you'll have double the slashes + * use the function only when it saves you time, not _always_ + * form items not set will not be processed (unchecked radios, checkboxes) - handle these manually, or don't use the func + * + * @param array $vars array of posts + * @param string $table name of the table that fields will be inserted into + * @return string $query resulting MySQL insert string + */ +function db_makereplace($vars,$table) +{ + $dbh = db_connect(); + $fields = db_fieldnames($table); + foreach ($fields as $field) + { + if (get_magic_quotes_gpc) $vars[$field] = stripslashes($vars[$field]); + $vars[$field] = addslashes($vars[$field]); + if (isset($vars[$field])) + { + isset($q1)?$q1 .= ','.$field:$q1='REPLACE INTO '.$table.'('.$field; + isset($q2)?$q2 .= ",'$vars[$field]'":$q2=" VALUES('$vars[$field]'"; + } + } + $q1 .= ')'; + $q2 .= ')'; + $query = $q1.$q2; + return $query; +} + +/** + * Create a MySQL UPDATE statement based on $_POST array generated by form submission. + * + * does not work with mysql functions (PASSWORD, etc.) because there are forced double quotes + * do not use clean_in() before this, or you'll have double the slashes + * use the function only when it saves you time, not _always_ + * form items not set will not be processed (unchecked radios, checkboxes) - handle these manually, or don't use the func + * + * @param array $vars array of posts + * @param string $table name of the table that fields will be inserted into + * @param string $where where clause, describing which records are to be updated + */ +function db_makeupdate($vars,$table,$where) +{ + $dbh = db_connect(); + $fields = db_fieldnames($table); + foreach ($fields as $field) + { + if (isset($vars[$field])) + { + if (get_magic_quotes_gpc()) $vars[$field] = stripslashes($vars[$field]); + $vars[$field]=addslashes($vars[$field]); + $q1 = isset($q1)?$q1 .= ' ,'.$field."='$vars[$field]'":'UPDATE '.$table.' set '.$field."='$vars[$field]'"; + } + } + $query = $q1.' '.$where; + return $query; +} + +/** + * Since PHP's mysql_insert_id() sometimes throws an error, this is the replacement + * @param resource $dbh optional dbh to get the last inserted id from + * @return int the return value of MySQL's last_insert_id() + */ +function db_insert_id($dbh=null) +{ + if(!is_resource($dbh)) $dbh = db_connect(); + $buf = db_fetch(db_query("SELECT LAST_INSERT_ID()", $dbh)); + return empty($buf[0]) ? false : $buf[0]; +} + +/** + * Determine number of rows in result. + * @param resource $result mysql result + * @return int number of rows in query result + */ +function db_numrows($result=null) +{ + return (!is_resource($result))? @mysql_num_rows(db_query()) : @mysql_num_rows($result); +} + +/** + * Close the db connection. If a dbh is not specified, assume the last opened link. + * @param resource $dbh optional dbh to close + */ +function db_close($dbh=null) +{ + return is_resource($dbh)?@mysql_close($dbh):@mysql_close(); +} + +/** + * Get one record. + * @param string $query query + * @param int $type result type + */ +function db_get_one($query,$type=MYSQL_ASSOC) { + $buf = db_get($query.' LIMIT 1',$type); + return $buf[0]; +} + +/** + * Get an ID based on name. + * @param string $table + * @param string $id_col + * @param string $name_col + * @param string $name + */ +function db_name_to_id($table,$id_col,$name_col,$name) +{ + $buf = db_get_one("SELECT {$id_col} FROM {$table} WHERE {$name_col} = '{$name}'", MYSQL_NUM); + return $buf[0]; +} + +/** + * Sets enum booleans to their opposite + * @param string $table + * @param string $pri + * @param string $col + * @param array $id + * @return int + */ +function db_toggle_bool($table, $pri, $col, $id) +{ + return db_query("UPDATE {$table} SET {$col} = IF({$col} = '1', '0', '1') WHERE {$pri} = {$id}"); +} +?> From fedora-extras-commits at redhat.com Tue Aug 2 00:08:53 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Mon, 1 Aug 2005 20:08:53 -0400 Subject: bouncer_r/php/lib util.php,1.2,1.3 Message-ID: <200508020008.j7208r02021252@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/php/lib In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21235/php/lib Added Files: util.php Log Message: cvs cleanup for fedora initial commit Index: util.php =================================================================== RCS file: util.php diff -N util.php --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ util.php 2 Aug 2005 00:08:51 -0000 1.3 @@ -0,0 +1,324 @@ + 0) + { + echo ($class !== NULL) ? '' : ''; + echo ''; + foreach ($_SESSION['messages'] as $message) + echo ''.$message.''; + echo ''; + echo ($class !== NULL) ? '' : ''; + $ret = count($_SESSION['messages']); + } + else + { + $ret = 0; + } + unset($_SESSION['messages']); + return $ret; +} + +/** + * Add an error message to SESSION['errors'] array. + * The $_SESSION['errors'] array stores error messages. + * @param string $str message to add (optional) + */ +function set_error($str=null) +{ + if (!empty($str)) + { + $_SESSION['errors'][]=$str; + } +} + +/** + * Show errors messages. + * Iterates through $_SESSION['errors'] and displays them in a ul. + * @param string $class css class for message style + */ +function show_error($class='error') +{ + if (@is_array($_SESSION['errors']) && count($_SESSION['errors']) > 0) + { + echo ''; + echo ''; + foreach ($_SESSION['errors'] as $error) + echo ''.$error.''; + echo ''; + echo ''; + $ret = count($_SESSION['errors']); + unset($_SESSION['errors']); + } + else + { + $ret = 0; + } + return $ret; +} + +/** + * Print out an varible enclosed by <pre> tags + * @param mixed $var the variable to print by print_r + */ +function debug_r(&$var) +{ + echo ''; + print_r($var); + echo ''; +} + +/** + * Generate a random string good for passwords + * @param in $len the length of the password string + * @return string password + */ +function password_gen($len=6) +{ + + $set = array( '0','1','2','3','4','5','6','7','8','9','a','e','i','o','u','y','b','c','d','f','g','h','j','k','l','m','n','p','q','r','s','t','v','w','x','y','z' ); + $pw = ''; + + while (strlen($pw) <= $len) + { + // random alphanum + $char = $set[array_rand($set)]; + $pw .= $char; + } + + return $pw; +} + +/** + * This recursive function empty values in an 'multi-dimensional' array. + * @param mixed $needle it accepts just one value or an array of values + * @return mixed false if an empty needle passed in, else a copy of the array with needle values replaced with empty strings + */ +function emptify_in_array($array, $needle) +{ + if ($needle == '') + return FALSE; + + foreach ($array as $key=>$val) + { + if (is_array($val)) + $array[$key] = emptify_in_array($val, $needle); + elseif (is_array($needle) && in_array($val, $needle)) + $array[$key] = ''; + elseif ($val === $needle) + $array[$key] = ''; + } + + return $array; +} + +/** + * This function checks for the existence of a particular row in a particular table matching a value. + * Use this with libdb, unless you want lots of problems. :) + * @param string $table name of table + * @param string $column name of column containing value to match + * @param string $val value to match against database (goes in WHERE clause) + * @param string $extra (optional) any AND or ORDER BY or LIMIT or anything you want to add. + * @ret bool if a match exists, return true -- otherwise return false + */ +function record_exists($table,$column,$val,$extra=NULL) +{ + $result = db_query("SELECT * FROM {$table} WHERE {$column}='{$val}' {$extra}"); + if ($result&&mysql_num_rows($result)>0) + { + return true; + } + return false; +} + +/** + * Show user tabs, based on an array. + * @param array $tabs array of tabs (name=>href) + * @param string $current name of tab to highlight + */ +function show_tabs($tabs,$current) +{ + if ( is_array($tabs) ) + { + echo "\n".''; + foreach ( $tabs as $key=>$val ) + { + if ( strtolower($key) == $current) + echo "\n".''.$key.''; + else + echo "\n".''.$key.''; + } + echo "\n".''; + } +} + +/** + * Sort a two dimensional array based on a 'column' key + * @param array $array the array to be sorted + * @param mixed $key the column key to be used for sorting, an array of keys are also acceptable + * @param mixed $order the order of the sort, either 'asc' (ascending) or 'desc' (descending), can also be an array (with matching array keys to the $key param) + * @param bool $retain_keys option to retain the original keys; default to true + * @param bool $case_sensitive option for a case sensitive sort; default to false + * @return array the original array on argument errors, the sorted array on success + */ +function array_order_by(&$array, $key=null, $order=null, $retain_keys=TRUE, $case_sensitive=FALSE) +{ + if (is_array($key) && count($key)==1) + { + $temp = each($key); + $key = $temp['value']; + $order = $order[$temp['key']]; + unset($temp); + } + + if (is_array($key)) + { + if (!is_array($order)) + { + $order = array(); + } + if (count($key) > count($order)) + { + $order = array_pad($order, count($key), 'asc'); + } + + // sort it according to the first key + $temp_sort_key = reset($key); + $temp_order_val = $order[key($key)]; + $return_arr = array_order_by($array, $temp_sort_key, $temp_order_val, $retain_keys, $case_sensitive); + + // set up the arrays for the 'inner', next recursion + $key_copy = $key; + $order_copy = $order; + unset($key_copy[key($key)]); + unset($order_copy[key($key)]); + + // get the sorting column's value in the first row + $temp = current($return_arr); + $temp_prev_sort_val = $temp[$temp_sort_key]; + unset($temp); + + $temp_return_arr = array(); + $temp_partial_array = array(); + + foreach ($return_arr as $return_arr_key=>$return_arr_val) + { + if ($return_arr_val[$temp_sort_key] == $temp_prev_sort_val) + { + $temp_partial_array[$return_arr_key] = $return_arr_val; + } + else + { + if ($retain_keys) + { + $temp_return_arr = $temp_return_arr + array_order_by($temp_partial_array, $key_copy, $order_copy, $retain_keys, $case_sensitive); + } + else + { + $temp = array_order_by($temp_partial_array, $key_copy, $order_copy, $retain_keys, $case_sensitive); + foreach ($temp as $temp_val) + { + $temp_return_arr[] = $temp_val; + } + unset($temp); + } + $temp_prev_sort_val = $return_arr_val[$temp_sort_key]; + $temp_partial_array = array(); + $temp_partial_array[$return_arr_key] = $return_arr_val; + } + } + + // important! if the last n $temp_prev_sort_val has the same value, then they aren't sorted and added to the temp array + if (count($return_arr) > count($temp_return_arr)) + { + if ($retain_keys) + { + $temp_return_arr = $temp_return_arr + array_order_by($temp_partial_array, $key_copy, $order_copy, $retain_keys, $case_sensitive); + } + else + { + $temp = array_order_by($temp_partial_array, $key_copy, $order_copy, $retain_keys, $case_sensitive); + foreach ($temp as $temp_val) + { + $temp_return_arr[] = $temp_val; + } + unset($temp); + } + } + + return $temp_return_arr; + } + + if (empty($array) || is_null($key)) + return $array; + + if (!array_key_exists($key, reset($array))) + return $array; + + $order =& strtolower($order); + if ($order == '' || ($order != 'asc' && $order != 'desc')) + $order = 'asc'; + + // construct an array that will be used to order the keys + foreach($array as $row_key => $row) + { + $x[$row_key] = $row[$key]; + } + + if ($case_sensitive) + natsort($x); + else + natcasesort($x); + + if ($order == 'desc') + $x =& array_reverse($x, TRUE); + + // now use those keys to order the original array + foreach($x as $row_key => $uselessvalue) + { + if ($retain_keys) + $return_arr[$row_key] =& $array[$row_key]; + else + $return_arr[] =& $array[$row_key]; + } + + return $return_arr; +} + +?> From fedora-extras-commits at redhat.com Tue Aug 2 00:09:23 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Mon, 1 Aug 2005 20:09:23 -0400 Subject: bouncer_r/php/lib list.php,1.2,1.3 Message-ID: <200508020009.j7209N3f021275@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/php/lib In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21258/php/lib Added Files: list.php Log Message: cvs cleanup for fedora initial commit Index: list.php =================================================================== RCS file: list.php diff -N list.php --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ list.php 2 Aug 2005 00:09:20 -0000 1.3 @@ -0,0 +1,357 @@ + + * @copyright Oregon State University + * + * Usage example: + * + * $orderby=get_order(); + * $query="SELECT * FROM fic_courses $orderby"; + * $courses=db_get($query,MYSQL_ASSOC); + * $headers=array( + * 'course_id'=>'', + * 'title'=>'Course Title', + * 'date_start_course'=>'Start', + * 'date_end_course'=>'End', + * 'date_start_reg'=>'Reg Starts', + * 'date_end_reg'=>'Reg Ends', + * 'active'=>'Active?', + * 'entry_date'=>'Created' + * ); + * show_list($courses,$headers); + * + * + * Accompanying CSS for table output: + * + * .list + * { + * border:1px solid #999; + * } + * .list th + * { + * background:#eee; + * border:1px solid #000; + * font-weight:bold; + * } + * .list th a + * { + * display:block; + * padding:0 14px; + * } + * .list th a:hover + * { + * background-color:#fff; + * } + * .row1 + * { + * background:#ddd; + * } + * .row2 + * { + * background:#ccc; + * } + * .row1:hover, .row2:hover + * { + * background-color:#fec; + * } + * .current-sort + * { + * background:#fda; + * } + * .sort-desc + * { + * background:#fec url(../img/up.gif) no-repeat right; + * } + * .sort-asc + * { + * background:#fec url(../img/down.gif) no-repeat right; + * } + * + * + * Accompanying JavaScript for select all / inverse: + * + * + * + */ + +/** + * Show a list of values, for forms. + * @param array $list associative array + * @param array $headers column name => column title (for table heads) + * @param string $type checkbox, radio, simple + * @param array $array actions to display in actions select list + * @param string $form_id id of form holding list + * @param bool $sortable whether or not to show sortable column headers (links in th's) + * @param array|string $selected if type is checkbox, array otherwise string with one val + */ +function show_list($list,$headers,$type='checkbox',$actions=null,$form_id=null,$sortable=true,$selected=null) +{ + if ( is_array($list) && count($list)>0 && is_array($headers) ) + { + if ( $type!='simple' && !empty($_GET['sort']) && !empty($_GET['order']) ) + { + form_hidden('sort',$_GET['sort']); + form_hidden('order',$_GET['order']); + } + echo "\n".''; + show_headers($headers,$actions,$type,$sortable); + echo "\n".''; + foreach ($list as $row) + { + show_row($row,$headers,$type,$actions,$count++,$selected); + } + echo "\n".''; + echo "\n".''; + if ($type=='checkbox') + { +echo << +// + +js; + } + } + elseif ( !is_array($headers) ) + { + echo "\n".'FIX HEADERS ARRAY'; + } + else + { + echo "\n".'No records found.'; + } +} + +/** + * Show table headers. + * @param array $headers column name => column title (for table heads) + * @param string $type type of list that is being shown + * @param bool $sortable whether or not to show sortable column headers (links in th's) + */ +function show_headers($headers,$actions,$type,$sortable=true) +{ + echo "\n".'
Actions '.$title.' '.$title.'
'; + echo "\n".''.$title.' '; + echo "\n".' '.$row[$index].' '.$row[$index].'
++ +++
Current Date : Mon Jun 13 02:36:25 2005 (GMT) Last Check : Mon Jun 13 02:36:25 2005 (GMT)
+Zones + +north america + + canada + united states + + + +Report + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +4 sites in 2 countries 1 zones 0 bad -- 3 older than 2.2 days -- 6 unreachable for more than 5 hours last probes : 14 were ok, 10 had no time Fedora Core site -- home type arch i386 ia64 ppc ppc64 s390 x86_64 north america + + canada mirror.cpsc.ucalgary.ca  @ http time-stamp 10.0 days probe renewed 10.0 days no time no time no time no time time-stamp 10.0 days probe renewed united states mirror.linux.duke.edu  @ http time-stamp current probe renewed time-stamp current probe renewed time-stamp current probe renewed time-stamp current probe renewed no time time-stamp current probe renewed fedora.mirrors.tds.net  @ ftp time-stamp current probe renewed current no time current no time time-stamp current probe renewed current no time current no time mirror.linux.duke.edu  @ ftp time-stamp current probe renewed time-stamp current probe renewed time-stamp current probe renewed time-stamp current probe renewed no time time-stamp current probe renewed + -
From fedora-extras-commits at redhat.com Tue Aug 2 09:40:08 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Tue, 2 Aug 2005 05:40:08 -0400 Subject: bouncer_r ChangeLog,1.5,1.6 Message-ID: <200508020940.j729e8ln002863@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2845 Modified Files: ChangeLog Log Message: Added short blurb describing mirror status page Index: ChangeLog =================================================================== RCS file: /cvs/fedora/bouncer_r/ChangeLog,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ChangeLog 2 Aug 2005 08:50:46 -0000 1.5 +++ ChangeLog 2 Aug 2005 09:40:06 -0000 1.6 @@ -1,5 +1,6 @@ 2005-08-02 David T. Farning + * php/status/mirrors/index.php: Added short blurb describing mirror status page * php/status/index.php: Added short blurb describing repositories and mirrors * php/index.php: Pull bouncer intro from mozilla * php/index.php: Modify bouncer intro to fit Fedora. From fedora-extras-commits at redhat.com Tue Aug 2 09:42:56 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Tue, 2 Aug 2005 05:42:56 -0400 Subject: bouncer_r/php/status/mirrors index.php,1.2,1.3 Message-ID: <200508020942.j729guup002898@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r/php/status/mirrors In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2881/php/status/mirrors Modified Files: index.php Log Message: fix typos Index: index.php =================================================================== RCS file: /cvs/fedora/bouncer_r/php/status/mirrors/index.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- index.php 2 Aug 2005 09:39:29 -0000 1.2 +++ index.php 2 Aug 2005 09:42:54 -0000 1.3 @@ -17,10 +17,10 @@ This started me working on a version of mirmon that kept track of repository information . The initial m3d was born. Luke Macken from Fedora suggested that I should replace the flat file data store with a database and provide a php web interface for mirror administrators. - He provided a like to bouncer. + He provided a link to bouncer. Example - Below is an example output mirror status page<\> + Below is an example output mirror status page Status of Fedora Core mirrors From fedora-extras-commits at redhat.com Tue Aug 2 10:19:33 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Tue, 2 Aug 2005 06:19:33 -0400 Subject: bouncer_r CREDITS,NONE,1.1 Message-ID: <200508021019.j72AJXjU004277@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4261 Added Files: CREDITS Log Message: add credits stub ***** Error reading new file: [Errno 2] No such file or directory: 'CREDITS' From fedora-extras-commits at redhat.com Tue Aug 2 10:21:50 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Tue, 2 Aug 2005 06:21:50 -0400 Subject: bouncer_r TODO,NONE,1.1 Message-ID: <200508021021.j72ALoSB004315@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4297 Added Files: TODO Log Message: added TODO stub --- NEW FILE TODO --- $Id$ bouncer_r - Todo ==================== TODO: From fedora-extras-commits at redhat.com Tue Aug 2 10:23:44 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 2 Aug 2005 06:23:44 -0400 Subject: rpms/icu/devel .cvsignore,1.4,1.5 icu.spec,1.4,1.5 sources,1.4,1.5 Message-ID: <200508021023.j72ANiJD004352@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/icu/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4331/devel Modified Files: .cvsignore icu.spec sources Log Message: 3.4. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/icu/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 31 Jul 2005 15:22:41 -0000 1.4 +++ .cvsignore 2 Aug 2005 10:23:41 -0000 1.5 @@ -1 +1 @@ -icu4c-3.4-d02.tgz +icu-3.4.tgz Index: icu.spec =================================================================== RCS file: /cvs/extras/rpms/icu/devel/icu.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- icu.spec 31 Jul 2005 15:22:41 -0000 1.4 +++ icu.spec 2 Aug 2005 10:23:41 -0000 1.5 @@ -2,13 +2,13 @@ Name: icu Version: 3.4 -Release: 0.2.d02 +Release: 2 Summary: International Components for Unicode Group: Applications/Text License: X License URL: http://www.ibm.com/software/globalization/icu/ -Source0: http://download.sourceforge.net/icu/icu4c-%{version}-d02.tgz +Source0: ftp://ftp.software.ibm.com/software/globalization/icu/%{version}/%{name}-%{version}.tgz Patch0: %{name}-dot.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -132,6 +132,9 @@ %changelog +* Tue Aug 2 2005 Ville Skytt?? - 3.4-2 +- 3.4. + * Sun Jul 31 2005 Ville Skytt?? - 3.4-0.2.d02 - 3.4-d02. - Don't ship static libraries. Index: sources =================================================================== RCS file: /cvs/extras/rpms/icu/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 31 Jul 2005 15:22:41 -0000 1.4 +++ sources 2 Aug 2005 10:23:41 -0000 1.5 @@ -1 +1 @@ -009f76a89c008cb9b7d4b1aa77db3a90 icu4c-3.4-d02.tgz +b19f3b9eec1c44fba86b07f287801084 icu-3.4.tgz From fedora-extras-commits at redhat.com Tue Aug 2 10:26:34 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Tue, 2 Aug 2005 06:26:34 -0400 Subject: bouncer_r LICENSE,NONE,1.1 Message-ID: <200508021026.j72AQY9r004428@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4412 Added Files: LICENSE Log Message: added LICENSE --- NEW FILE LICENSE --- GNU GENERAL PUBLIC LICENSE Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 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 From fedora-extras-commits at redhat.com Tue Aug 2 10:49:35 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 2 Aug 2005 06:49:35 -0400 Subject: owners owners.list,1.41,1.42 Message-ID: <200508021049.j72AnZMS004537@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4520 Modified Files: owners.list Log Message: Orphan doctorj, transfer icu to Thorsten. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- owners.list 1 Aug 2005 20:20:47 -0000 1.41 +++ owners.list 2 Aug 2005 10:49:32 -0000 1.42 @@ -120,7 +120,7 @@ Fedora Extras|directfb|Graphics abstraction library for the Linux Framebuffer Device|thomas at apestaart.org|extras-qa at fedoraproject.org| Fedora Extras|djvulibre|DjVu viewers, encoders and utilities|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|dkms|Dynamic Kernel Module Support (DKMS) method for installing module RPMS|tcallawa at redhat.com|extras-qa at fedoraproject.org| -Fedora Extras|doctorj|Java source code analyzer|ville.skytta at iki.fi|extras-qa at fedoraproject.org| +Fedora Extras|doctorj|Java source code analyzer|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|dosbox|An x86/DOS emulator with sound/graphics|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|drivel|A journal or "blog" client|katzj at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|drscheme|Graphical environment for developing programs using Scheme|gemi at bluewin.ch|extras-qa at fedoraproject.org| @@ -290,7 +290,7 @@ Fedora Extras|i8kutils|Dell laptop (Inspiron 8000 and others) SMM BIOS support tools|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|ibmonitor|Interactive bandwidth monitor|adrian at lisas.de|extras-qa at fedoraproject.org| Fedora Extras|icmpdn|ICMP host name utilities|fredrik at dolda2000.com|extras-qa at fedoraproject.org| -Fedora Extras|icu|International Components for Unicode library|ville.skytta at iki.fi|extras-qa at fedoraproject.org| +Fedora Extras|icu|International Components for Unicode library|fedora at leemhuis.info|extras-qa at fedoraproject.org| Fedora Extras|id3lib|An Open-Source library for manipulating ID3v1 and ID3v2 tags|anvil at livna.org|extras-qa at fedoraproject.org| Fedora Extras|id3-py|Python ID3 tag library|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|id3v2|A command line id3v2 tag editor|ville.skytta at iki.fi|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Tue Aug 2 11:50:30 2005 From: fedora-extras-commits at redhat.com (David Farning (dfarning)) Date: Tue, 2 Aug 2005 07:50:30 -0400 Subject: bouncer_r ChangeLog,1.6,1.7 Message-ID: <200508021150.j72BoUOi005772@cvs-int.fedora.redhat.com> Author: dfarning Update of /cvs/fedora/bouncer_r In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5755 Modified Files: ChangeLog Log Message: Index: ChangeLog =================================================================== RCS file: /cvs/fedora/bouncer_r/ChangeLog,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- ChangeLog 2 Aug 2005 09:40:06 -0000 1.6 +++ ChangeLog 2 Aug 2005 11:50:28 -0000 1.7 @@ -1,5 +1,8 @@ 2005-08-02 David T. Farning + * LICENSE: added License + * TODO: added Todo Stub + * CREDITS: added Credits stub * php/status/mirrors/index.php: Added short blurb describing mirror status page * php/status/index.php: Added short blurb describing repositories and mirrors * php/index.php: Pull bouncer intro from mozilla From fedora-extras-commits at redhat.com Tue Aug 2 16:32:37 2005 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Tue, 2 Aug 2005 12:32:37 -0400 Subject: bouncer_r CREDITS, 1.1, 1.2 INSTALL, 1.5, 1.6 README, 1.2, 1.3 TODO, 1.1, 1.2 Message-ID: <200508021632.j72GWblJ012211@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/fedora/bouncer_r In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12188 Modified Files: CREDITS INSTALL README TODO Log Message: Fix headers Index: README =================================================================== RCS file: /cvs/fedora/bouncer_r/README,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- README 2 Aug 2005 04:41:21 -0000 1.2 +++ README 2 Aug 2005 16:32:35 -0000 1.3 @@ -1,3 +1,5 @@ +$Id$ + Bouncer_r - A mirror/distribution manager designed for the Fedora Project. = What is it? From bugs.michael at gmx.net Tue Aug 2 18:19:40 2005 From: bugs.michael at gmx.net (Michael Schwendt) Date: Tue, 2 Aug 2005 20:19:40 +0200 Subject: APPROVED: krecipes Message-ID: <20050802201940.52c19af8.bugs.michael@gmx.net> Package: krecipes Krecipes is a program that lets you to manage your recipes, create shopping lists, choose a recipe based on available ingredients and plan your menu/diet in advance. Maintainer: Dennis Gilmore Reviewer: Michael Schwendt -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 189 bytes Desc: not available URL: From fedora-extras-commits at redhat.com Tue Aug 2 18:40:12 2005 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Tue, 2 Aug 2005 14:40:12 -0400 Subject: rpms/octave/devel .cvsignore, 1.4, 1.5 octave.spec, 1.12, 1.13 sources, 1.4, 1.5 octave-2.1.71-save.patch, 1.1, NONE Message-ID: <200508021840.j72IeCpx014882@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/octave/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14861 Modified Files: .cvsignore octave.spec sources Removed Files: octave-2.1.71-save.patch Log Message: Upgrade to development version (pre 3.0) version of octave. Add dependency on umfpack. Note that this version also can link to GLPK, but it's not in extras yet. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/octave/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 20 May 2005 21:07:49 -0000 1.4 +++ .cvsignore 2 Aug 2005 18:40:09 -0000 1.5 @@ -1 +1 @@ -octave-2.1.71.tar.bz2 +octave-2.9.3.tar.bz2 Index: octave.spec =================================================================== RCS file: /cvs/extras/rpms/octave/devel/octave.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- octave.spec 6 Jul 2005 14:46:17 -0000 1.12 +++ octave.spec 2 Aug 2005 18:40:09 -0000 1.13 @@ -1,21 +1,21 @@ %define __libtoolize /bin/true Name: octave -Version: 2.1.71 -Release: 13%{?dist} +Version: 2.9.3 +Release: 1%{?dist} Summary: A high-level language for numerical computations Epoch: 6 Group: Applications/Engineering License: GPL Source: ftp://ftp.octave.org/pub/octave/bleeding-edge/octave-%{version}.tar.bz2 -Patch0: octave-2.1.71-save.patch URL: http://www.octave.org Requires: gnuplot less info texinfo Requires: /sbin/install-info BuildPrereq: gnuplot bison flex less tetex gcc-gfortran lapack blas BuildPrereq: ncurses-devel zlib-devel libtermcap-devel hdf5-devel BuildPrereq: readline-devel glibc-devel fftw3-devel autoconf gperf +BuildPrereq: umfpack-devel Prereq: /sbin/ldconfig BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: /etc/ld.so.conf.d @@ -48,7 +48,6 @@ %prep %setup -q -%patch0 -p0 ./autogen.sh @@ -128,8 +127,9 @@ %changelog -* Wed Jul 06 2005 Quentin Spencer 2.1.71-13 -- Rebuild +* Tue Jul 26 2005 Quentin Spencer 2.9.3-1 +- Move to new 2.9.x development tree. +- Add umfpack-devel as new build dependency. * Tue Jul 05 2005 Quentin Spencer 2.1.71-12 - Require hdf5-devel for build. Index: sources =================================================================== RCS file: /cvs/extras/rpms/octave/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 20 May 2005 21:07:49 -0000 1.4 +++ sources 2 Aug 2005 18:40:09 -0000 1.5 @@ -1 +1 @@ -2ab06912017c833549035111f0ab592f octave-2.1.71.tar.bz2 +bb2e0ea0159e592c87d74e8d3fdf9125 octave-2.9.3.tar.bz2 --- octave-2.1.71-save.patch DELETED --- From fedora-extras-commits at redhat.com Tue Aug 2 19:01:07 2005 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Tue, 2 Aug 2005 15:01:07 -0400 Subject: rpms/ginac - New directory Message-ID: <200508021901.j72J17J3016101@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/ginac In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16091/ginac Log Message: Directory /cvs/extras/rpms/ginac added to the repository From fedora-extras-commits at redhat.com Tue Aug 2 19:01:28 2005 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Tue, 2 Aug 2005 15:01:28 -0400 Subject: rpms/ginac/devel - New directory Message-ID: <200508021901.j72J1SCp016132@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/ginac/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16091/ginac/devel Log Message: Directory /cvs/extras/rpms/ginac/devel added to the repository From fedora-extras-commits at redhat.com Tue Aug 2 19:03:26 2005 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Tue, 2 Aug 2005 15:03:26 -0400 Subject: rpms/ginac Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200508021903.j72J3Qlt016162@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/ginac In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16148 Added Files: Makefile import.log Log Message: Setup of module ginac --- NEW FILE Makefile --- # Top level Makefile for module ginac all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Tue Aug 2 19:03:55 2005 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Tue, 2 Aug 2005 15:03:55 -0400 Subject: rpms/ginac/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200508021904.j72J3tgj016180@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/ginac/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16148/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module ginac --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Tue Aug 2 19:08:08 2005 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Tue, 2 Aug 2005 15:08:08 -0400 Subject: rpms/ginac/devel ginac.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200508021908.j72J88nh016296@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/ginac/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16259/devel Modified Files: .cvsignore sources Added Files: ginac.spec Log Message: auto-import ginac-1.3.2-1 on branch devel from ginac-1.3.2-1.src.rpm Changing the package name to lowercase to match the newest sources. --- NEW FILE ginac.spec --- Name: ginac Version: 1.3.2 Release: 1%{?dist} Summary: C++ library for symbolic calculations Group: System Environment/Libraries License: GPL URL: http://www.ginac.de/ Source0: ftp://ftpthep.physik.uni-mainz.de/pub/GiNaC/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): /sbin/install-info Requires(preun): /sbin/install-info BuildRequires: cln-devel >= 1.1 gcc-c++ readline-devel BuildRequires: tetex-latex tetex-dvips doxygen transfig Obsoletes: GiNaC < 1.3.2 Provides: GiNaC = %{version}-%{release} %description GiNaC (which stands for "GiNaC is Not a CAS (Computer Algebra System)") is an open framework for symbolic computation within the C++ programming language. %package devel Summary: GiNaC development libraries and header files Group: Development/Libraries Requires: %{name} = %{version}-%{release} cln-devel Obsoletes: GiNaC-devel < 1.3.2 Provides: GiNaC-devel = %{version}-%{release} %description devel GiNaC (which stands for "GiNaC is Not a CAS (Computer Algebra System)") is an open framework for symbolic computation within the C++ programming language. This package contains the libraries, include files and other resources you use to develop GiNaC applications. %package utils Summary: GiNaC-related utilities Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} Obsoletes: GiNaC-utils < 1.3.2 Provides: GiNaC-utils = %{version}-%{release} %description utils GiNaC (which stands for "GiNaC is Not a CAS (Computer Algebra System)") is an open framework for symbolic computation within the C++ programming language. This package includes ginsh ("GiNaC interactive shell") which provides a simple and easy-to-use CAS-like interface to GiNaC for non-programmers, and the tool "viewgar" which displays the contents of GiNaC archives. %prep %setup -q %build %configure make %install rm -rf ${RPM_BUILD_ROOT} %makeinstall %clean rm -rf ${RPM_BUILD_ROOT} %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %post devel /sbin/install-info --info-dir=%{_infodir} %{_infodir}/ginac.info.gz 2>/dev/null || : %preun devel if [ "$1" = 0 ]; then /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/ginac.info.gz 2>/dev/null || : fi %files %defattr(-,root,root) %doc AUTHORS COPYING ChangeLog NEWS README %{_libdir}/*.so.* %files devel %defattr(-,root,root) %{_libdir}/*.a %{_libdir}/*.so %{_libdir}/pkgconfig/ginac.pc %{_includedir}/ginac %{_infodir}/*.info* %{_mandir}/man1/ginac-config.1* %{_bindir}/ginac-config %{_datadir}/aclocal/ginac.m4 %exclude %{_libdir}/*.la %files utils %defattr(-,root,root) %{_bindir}/ginsh %{_bindir}/viewgar %{_mandir}/man1/ginsh.1* %{_mandir}/man1/viewgar.1* %changelog * Tue Aug 2 2005 Quentin Spencer 1.3.2-1 - New upstream release. Changed package name to lowercase letters to mirror upstream sources. Added Provides and Obsoletes for upgrade. * Sat Jun 11 2005 Quentin Spencer 1.3.1-5 - Added cln-devel as dependency of GiNaC-devel * Fri May 27 2005 Quentin Spencer 1.3.1-5 - Removed gmp-devel--it should be in cln-devel instead * Fri May 27 2005 Quentin Spencer 1.3.1-4 - Added gmp-devel to BuildRequires * Thu May 26 2005 Quentin Spencer 1.3.1-3 - Added transfig to BuildRequires * Thu May 26 2005 Quentin Spencer 1.3.1-2 - Added dist tag * Wed May 18 2005 Quentin Spencer 1.3.1-1 - New upstream release. - Added missing BuildRequires (readline-devel, tetex-*, doxygen). * Wed May 11 2005 Quentin Spencer 1.3.0-2 - Exclude .la lib. - Remove processing of info files (this is supposed to be automatic). * Fri Apr 22 2005 Quentin Spencer 1.3.0-2 - Added release to Requires for devel and utils * Thu Apr 21 2005 Quentin Spencer 1.3.0-1 - Adapted spec file for Fedora Extras - Fixed missing BuildRequires - Fixed broken install-info command * Thu Nov 20 2003 Christian Bauer - added pkg-config metadata file to devel package * Thu Nov 1 2001 Christian Bauer - moved ginsh and viewgar to "utils" package * Thu Oct 5 2000 Christian Bauer - cleaned up a bit * Wed Jan 26 2000 Christian Bauer - split into user and devel packages * Wed Dec 1 1999 Christian Bauer - aclocal macros get installed Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/ginac/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 2 Aug 2005 19:03:53 -0000 1.1 +++ .cvsignore 2 Aug 2005 19:08:06 -0000 1.2 @@ -0,0 +1 @@ +ginac-1.3.2.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/ginac/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 2 Aug 2005 19:03:53 -0000 1.1 +++ sources 2 Aug 2005 19:08:06 -0000 1.2 @@ -0,0 +1 @@ +0074aadac59a0ca57293b885ca8f8454 ginac-1.3.2.tar.bz2 From fedora-extras-commits at redhat.com Tue Aug 2 19:08:08 2005 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Tue, 2 Aug 2005 15:08:08 -0400 Subject: rpms/ginac import.log,1.1,1.2 Message-ID: <200508021908.j72J88i3016290@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/ginac In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16259 Modified Files: import.log Log Message: auto-import ginac-1.3.2-1 on branch devel from ginac-1.3.2-1.src.rpm Changing the package name to lowercase to match the newest sources. Index: import.log =================================================================== RCS file: /cvs/extras/rpms/ginac/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 2 Aug 2005 19:03:24 -0000 1.1 +++ import.log 2 Aug 2005 19:08:06 -0000 1.2 @@ -0,0 +1 @@ +ginac-1_3_2-1:HEAD:ginac-1.3.2-1.src.rpm:1123009628 From fedora-extras-commits at redhat.com Tue Aug 2 19:28:39 2005 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Tue, 2 Aug 2005 15:28:39 -0400 Subject: rpms/octave-forge/devel octave-forge.spec,1.10,1.11 Message-ID: <200508021928.j72JSdx8016434@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/octave-forge/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16414 Modified Files: octave-forge.spec Log Message: Update dependencies to reflect name change from GiNaC to ginac. Index: octave-forge.spec =================================================================== RCS file: /cvs/extras/rpms/octave-forge/devel/octave-forge.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- octave-forge.spec 18 Jun 2005 01:32:02 -0000 1.10 +++ octave-forge.spec 2 Aug 2005 19:28:36 -0000 1.11 @@ -1,6 +1,6 @@ Name: octave-forge Version: 2005.06.13 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Contributed functions for octave Group: Applications/Engineering @@ -24,7 +24,7 @@ %define octave_ep %(rpm -q --qf '%%{epoch}' octave) %define octave_ver %(rpm -q --qf '%%{version}' octave) Requires: octave = %{octave_ep}:%{octave_ver} ImageMagick -BuildRequires: octave-devel tetex gcc-gfortran GiNaC-devel fftw3-devel +BuildRequires: octave-devel tetex gcc-gfortran ginac-devel fftw3-devel BuildRequires: xorg-x11-devel libjpeg-devel libpng-devel zlib-devel BuildRequires: ncurses-devel libtermcap-devel gsl-devel qhull-devel BuildRequires: pcre-devel @@ -74,6 +74,9 @@ %changelog +* Tue Aug 2 2005 Quentin Spencer 2005.06.13-2 +- Change GiNaC-devel to ginac-devel to reflect package name change. + * Fri Jun 17 2005 Quentin Spencer 2005.06.13-1 - New upstream release. Now requires pcre-devel to build. - Corrected instructions on creating patched source tarball. From fedora-extras-commits at redhat.com Tue Aug 2 21:35:55 2005 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Tue, 2 Aug 2005 17:35:55 -0400 Subject: rpms/octave/devel octave.spec,1.13,1.14 Message-ID: <200508022135.j72LZtLs019072@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/octave/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19055 Modified Files: octave.spec Log Message: Missed some deps for octave-devel. Index: octave.spec =================================================================== RCS file: /cvs/extras/rpms/octave/devel/octave.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- octave.spec 2 Aug 2005 18:40:09 -0000 1.13 +++ octave.spec 2 Aug 2005 21:35:53 -0000 1.14 @@ -2,7 +2,7 @@ Name: octave Version: 2.9.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A high-level language for numerical computations Epoch: 6 @@ -39,7 +39,8 @@ %package devel Summary: Development headers and files for Octave Group: Development/Libraries -Requires: %{name} = %{epoch}:%{version}-%{release} readline-devel +Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: readline-devel hdf5-devel zlib-devel %description devel The octave-devel package contains files needed for developing @@ -127,6 +128,9 @@ %changelog +* Tue Jul 26 2005 Quentin Spencer 2.9.3-2 +- Add dependencies (hdf5-devel and zlib-devel) for devel + * Tue Jul 26 2005 Quentin Spencer 2.9.3-1 - Move to new 2.9.x development tree. - Add umfpack-devel as new build dependency. From fedora-extras-commits at redhat.com Tue Aug 2 21:37:31 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Tue, 2 Aug 2005 17:37:31 -0400 Subject: rpms/python-matplotlib/devel python-matplotlib.spec,1.7,1.8 Message-ID: <200508022137.j72LbVGS019133@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/python-matplotlib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19116 Modified Files: python-matplotlib.spec Log Message: Add Requires: python-numeric, pytz, python-dateutil Index: python-matplotlib.spec =================================================================== RCS file: /cvs/extras/rpms/python-matplotlib/devel/python-matplotlib.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- python-matplotlib.spec 1 Aug 2005 20:40:06 -0000 1.7 +++ python-matplotlib.spec 2 Aug 2005 21:37:29 -0000 1.8 @@ -2,7 +2,7 @@ Name: python-matplotlib Version: 0.83.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Python plotting library Group: Development/Libraries @@ -12,8 +12,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel, freetype-devel, libpng-devel, zlib-devel -BuildRequires: python-numeric, pygtk2-devel, gtk2-devel -BuildRequires: pytz, python-dateutil +BuildRequires: pygtk2-devel, gtk2-devel +BuildRequires: python-numeric, pytz, python-dateutil +Requires: python-numeric, pytz, python-dateutil %description Matplotlib is a pure python plotting library with the goal of making @@ -47,6 +48,9 @@ %{_datadir}/matplotlib/ %changelog +* Tue Aug 02 2005 Orion Poplawski 0.83.2-2 +- Add Requires: python-numeric, pytz, python-dateutil + * Fri Jul 29 2005 Orion Poplawski 0.83.2-1 - New upstream version matplotlib 0.83.2 From fedora-extras-commits at redhat.com Tue Aug 2 21:38:25 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Tue, 2 Aug 2005 17:38:25 -0400 Subject: rpms/python-matplotlib/FC-4 python-matplotlib.spec,1.7,1.8 Message-ID: <200508022138.j72LcPxo019194@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/python-matplotlib/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19177 Modified Files: python-matplotlib.spec Log Message: Add Requires: python-numeric, pytz, python-dateutil Index: python-matplotlib.spec =================================================================== RCS file: /cvs/extras/rpms/python-matplotlib/FC-4/python-matplotlib.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- python-matplotlib.spec 1 Aug 2005 21:06:05 -0000 1.7 +++ python-matplotlib.spec 2 Aug 2005 21:38:22 -0000 1.8 @@ -12,8 +12,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel, freetype-devel, libpng-devel, zlib-devel -BuildRequires: python-numeric, pygtk2-devel, gtk2-devel -BuildRequires: pytz, python-dateutil +BuildRequires: pygtk2-devel, gtk2-devel +BuildRequires: python-numeric, pytz, python-dateutil +Requires: python-numeric, pytz, python-dateutil %description Matplotlib is a pure python plotting library with the goal of making @@ -47,7 +48,10 @@ %{_datadir}/matplotlib/ %changelog -* Mon Aug 01 2005 Orion Poplawski 0.83.2-2 +* Tue Aug 02 2005 Orion Poplawski 0.83.2-2 +- Add Requires: python-numeric, pytz, python-dateutil + +* Fri Jul 29 2005 Orion Poplawski 0.83.2-1 - New upstream version matplotlib 0.83.2 * Thu Jul 28 2005 Orion Poplawski 0.83.1-2 From fedora-extras-commits at redhat.com Tue Aug 2 21:46:53 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Tue, 2 Aug 2005 17:46:53 -0400 Subject: rpms/python-matplotlib/FC-4 python-matplotlib.spec,1.8,1.9 Message-ID: <200508022146.j72Lkrow019306@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/python-matplotlib/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19289 Modified Files: python-matplotlib.spec Log Message: Fix revisions Index: python-matplotlib.spec =================================================================== RCS file: /cvs/extras/rpms/python-matplotlib/FC-4/python-matplotlib.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- python-matplotlib.spec 2 Aug 2005 21:38:22 -0000 1.8 +++ python-matplotlib.spec 2 Aug 2005 21:46:51 -0000 1.9 @@ -2,7 +2,7 @@ Name: python-matplotlib Version: 0.83.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Python plotting library Group: Development/Libraries @@ -48,10 +48,10 @@ %{_datadir}/matplotlib/ %changelog -* Tue Aug 02 2005 Orion Poplawski 0.83.2-2 +* Tue Aug 02 2005 Orion Poplawski 0.83.2-3 - Add Requires: python-numeric, pytz, python-dateutil -* Fri Jul 29 2005 Orion Poplawski 0.83.2-1 +* Fri Jul 29 2005 Orion Poplawski 0.83.2-2 - New upstream version matplotlib 0.83.2 * Thu Jul 28 2005 Orion Poplawski 0.83.1-2 From fedora-extras-commits at redhat.com Tue Aug 2 21:47:47 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Tue, 2 Aug 2005 17:47:47 -0400 Subject: rpms/python-matplotlib/devel python-matplotlib.spec,1.8,1.9 Message-ID: <200508022147.j72LllaT019367@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/python-matplotlib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19350 Modified Files: python-matplotlib.spec Log Message: bump release Index: python-matplotlib.spec =================================================================== RCS file: /cvs/extras/rpms/python-matplotlib/devel/python-matplotlib.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- python-matplotlib.spec 2 Aug 2005 21:37:29 -0000 1.8 +++ python-matplotlib.spec 2 Aug 2005 21:47:45 -0000 1.9 @@ -2,7 +2,7 @@ Name: python-matplotlib Version: 0.83.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Python plotting library Group: Development/Libraries @@ -48,6 +48,9 @@ %{_datadir}/matplotlib/ %changelog +* Tue Aug 02 2005 Orion Poplawski 0.83.2-3 +- bump release + * Tue Aug 02 2005 Orion Poplawski 0.83.2-2 - Add Requires: python-numeric, pytz, python-dateutil From fedora-extras-commits at redhat.com Tue Aug 2 21:57:39 2005 From: fedora-extras-commits at redhat.com (Ed Hill (edhill)) Date: Tue, 2 Aug 2005 17:57:39 -0400 Subject: rpms/opendap/FC-4 opendap.spec,1.2,1.3 Message-ID: <200508022157.j72LvdoH019464@cvs-int.fedora.redhat.com> Author: edhill Update of /cvs/extras/rpms/opendap/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19447 Modified Files: opendap.spec Log Message: update to match FC-3 which finally succeeded in building Index: opendap.spec =================================================================== RCS file: /cvs/extras/rpms/opendap/FC-4/opendap.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- opendap.spec 1 Aug 2005 02:11:21 -0000 1.2 +++ opendap.spec 2 Aug 2005 21:57:37 -0000 1.3 @@ -1,6 +1,6 @@ Name: opendap Version: 3.4.4 -Release: 6%{?dist} +Release: 8%{?dist} Summary: Open-source Project for a Network Data Access Protocol Group: Applications/Engineering License: LGPL @@ -77,6 +77,7 @@ mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name} mkdir -p $RPM_BUILD_ROOT/%{_bindir} mkdir -p $RPM_BUILD_ROOT/%{_includedir}/opendap +mkdir -p $RPM_BUILD_ROOT/%{_libdir} install -m644 etc/*.pm $RPM_BUILD_ROOT/%{perl_vendorlib}/ install -m644 etc/jgofs_objects_readme $RPM_BUILD_ROOT/%{_datadir}/%{name} @@ -146,6 +147,9 @@ %{perl_vendorlib}/*.pm %changelog +* Mon Aug 1 2005 3.4.4-7 +- try to fix x86_64 build + * Sun Jul 31 2005 Ed Hill 3.4.4-6 - bump version and try to build From fedora-extras-commits at redhat.com Tue Aug 2 23:42:33 2005 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Tue, 2 Aug 2005 19:42:33 -0400 Subject: rpms/perl-BerkeleyDB - New directory Message-ID: <200508022342.j72NgXjA022211@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-BerkeleyDB In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22201/perl-BerkeleyDB Log Message: Directory /cvs/extras/rpms/perl-BerkeleyDB added to the repository From fedora-extras-commits at redhat.com Tue Aug 2 23:42:36 2005 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Tue, 2 Aug 2005 19:42:36 -0400 Subject: rpms/perl-BerkeleyDB/devel - New directory Message-ID: <200508022342.j72NgaiN022230@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-BerkeleyDB/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22201/perl-BerkeleyDB/devel Log Message: Directory /cvs/extras/rpms/perl-BerkeleyDB/devel added to the repository From fedora-extras-commits at redhat.com Tue Aug 2 23:42:55 2005 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Tue, 2 Aug 2005 19:42:55 -0400 Subject: rpms/perl-BerkeleyDB Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200508022342.j72Ngt5L022273@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-BerkeleyDB In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22246 Added Files: Makefile import.log Log Message: Setup of module perl-BerkeleyDB --- NEW FILE Makefile --- # Top level Makefile for module perl-BerkeleyDB all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Tue Aug 2 23:42:55 2005 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Tue, 2 Aug 2005 19:42:55 -0400 Subject: rpms/perl-BerkeleyDB/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200508022343.j72NgtCx022278@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-BerkeleyDB/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22246/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-BerkeleyDB --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Tue Aug 2 23:43:36 2005 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Tue, 2 Aug 2005 19:43:36 -0400 Subject: rpms/perl-BerkeleyDB import.log,1.1,1.2 Message-ID: <200508022343.j72NhaIt022341@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-BerkeleyDB In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22310 Modified Files: import.log Log Message: auto-import perl-BerkeleyDB-0.26-2 on branch devel from perl-BerkeleyDB-0.26-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-BerkeleyDB/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 2 Aug 2005 23:42:53 -0000 1.1 +++ import.log 2 Aug 2005 23:43:34 -0000 1.2 @@ -0,0 +1 @@ +perl-BerkeleyDB-0_26-2:HEAD:perl-BerkeleyDB-0.26-2.src.rpm:1123026204 From fedora-extras-commits at redhat.com Tue Aug 2 23:43:37 2005 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Tue, 2 Aug 2005 19:43:37 -0400 Subject: rpms/perl-BerkeleyDB/devel perl-BerkeleyDB.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200508022343.j72NhbJF022348@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-BerkeleyDB/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22310/devel Modified Files: .cvsignore sources Added Files: perl-BerkeleyDB.spec Log Message: auto-import perl-BerkeleyDB-0.26-2 on branch devel from perl-BerkeleyDB-0.26-2.src.rpm --- NEW FILE perl-BerkeleyDB.spec --- %{!?perl_vendorarch: %define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)} Name: perl-BerkeleyDB Version: 0.26 Release: 2%{?dist} Summary: BerkeleyDB Perl module License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/BerkeleyDB/ Source0: http://www.cpan.org/modules/by-module/BerkeleyDB/BerkeleyDB-0.26.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: db4-devel # For "make test". BuildRequires: perl(Test::Pod), perl(MLDBM) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description BerkeleyDB is a module that allows Perl programs to make use of the facilities provided by Berkeley DB. Berkeley DB is a C library that provides a consistent interface to a number of database formats. BerkeleyDB provides an interface to all four of the database types (hash, btree, queue and recno) currently supported by Berkeley DB. %prep %setup -q -n BerkeleyDB-%{version} %{__perl} -pi -e 's,/local/,/, if ($. == 1)' dbinfo chmod -x Changes README %build %{__perl} Makefile.PL INSTALLDIRS=vendor %{__perl} -pi -e 's/^\tLD_RUN_PATH=[^\s]+\s*/\t/' Makefile make %{?_smp_mflags} OPTIMIZE="$RPM_OPT_FLAGS" %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT install -D -m755 dbinfo $RPM_BUILD_ROOT%{_bindir}/dbinfo find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; find $RPM_BUILD_ROOT -type f -name '*.bs' -size 0 -exec rm -f {} \; find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null \; chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* %check || : make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README Todo %{perl_vendorarch}/BerkeleyDB* %{perl_vendorarch}/auto/* %{_mandir}/man3/* %{_bindir}/* %changelog * Mon Aug 01 2005 Steven Pritchard 0.26-2 - Various fixes from Paul Howarth: - Add description - Fix permissions on docs (also Paul Howarth) - Add OPTIMIZE to make - Don't own perl_vendorarch/auto/ - BuildRequire Test::Pod and MLDBM * Wed Jul 06 2005 Steven Pritchard 0.26-1 - Specfile autogenerated. - Add BuildRequires db4-devel. - Install dbinfo script. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-BerkeleyDB/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 2 Aug 2005 23:42:53 -0000 1.1 +++ .cvsignore 2 Aug 2005 23:43:35 -0000 1.2 @@ -0,0 +1 @@ +BerkeleyDB-0.26.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-BerkeleyDB/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 2 Aug 2005 23:42:53 -0000 1.1 +++ sources 2 Aug 2005 23:43:35 -0000 1.2 @@ -0,0 +1 @@ +6e9882f4e4bac48b24079d082af30e6c BerkeleyDB-0.26.tar.gz From fedora-extras-commits at redhat.com Wed Aug 3 01:46:57 2005 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Tue, 2 Aug 2005 21:46:57 -0400 Subject: rpms/uim/devel .cvsignore, 1.7, 1.8 sources, 1.6, 1.7 uim.spec, 1.15, 1.16 Message-ID: <200508030147.j731lRFn024843@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/uim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24822 Modified Files: .cvsignore sources uim.spec Log Message: * Wed Aug 3 2005 Akira TAGOH - 0.4.7.1-1.fc5 - New upstream release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/uim/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 12 Jul 2005 01:03:48 -0000 1.7 +++ .cvsignore 3 Aug 2005 01:46:55 -0000 1.8 @@ -6,3 +6,4 @@ uim-0.4.5.1.tar.gz uim-0.4.6.tar.gz uim-0.4.7.tar.gz +uim-0.4.7.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/uim/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 12 Jul 2005 01:03:48 -0000 1.6 +++ sources 3 Aug 2005 01:46:55 -0000 1.7 @@ -1 +1 @@ -1ba750aa3ab7b5d1aedd26340ca83b82 uim-0.4.7.tar.gz +88c18b8fffa3a67401c932ac925a6d30 uim-0.4.7.1.tar.gz Index: uim.spec =================================================================== RCS file: /cvs/extras/rpms/uim/devel/uim.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- uim.spec 12 Jul 2005 01:03:48 -0000 1.15 +++ uim.spec 3 Aug 2005 01:46:55 -0000 1.16 @@ -4,7 +4,7 @@ Summary: A multilingual input method library Name: uim -Version: 0.4.7 +Version: 0.4.7.1 Release: 1%{?dist} License: GPL/BSD Group: System Environment/Libraries @@ -288,6 +288,9 @@ %{_datadir}/uim/skk*.scm %changelog +* Wed Aug 3 2005 Akira TAGOH - 0.4.7.1-1.fc5 +- New upstream release. + * Tue Jul 12 2005 Akira TAGOH - 0.4.7-1.fc5 - New upstream release. - removed the patches. fixed in upstream. From fedora-extras-commits at redhat.com Wed Aug 3 01:59:09 2005 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Tue, 2 Aug 2005 21:59:09 -0400 Subject: rpms/uim/FC-3 .cvsignore,1.6,1.7 sources,1.5,1.6 uim.spec,1.5,1.6 Message-ID: <200508030159.j731x9AA024940@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/uim/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24919 Modified Files: .cvsignore sources uim.spec Log Message: * Wed Aug 3 2005 Akira TAGOH - 0.4.7.1-1.fc3 - New upstream release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/uim/FC-3/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 12 Jul 2005 01:30:32 -0000 1.6 +++ .cvsignore 3 Aug 2005 01:59:07 -0000 1.7 @@ -5,3 +5,4 @@ uim-0.4.5-autoreconf.patch.bz2 uim-0.4.5.1.tar.gz uim-0.4.7.tar.gz +uim-0.4.7.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/uim/FC-3/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 12 Jul 2005 01:30:32 -0000 1.5 +++ sources 3 Aug 2005 01:59:07 -0000 1.6 @@ -1 +1 @@ -1ba750aa3ab7b5d1aedd26340ca83b82 uim-0.4.7.tar.gz +88c18b8fffa3a67401c932ac925a6d30 uim-0.4.7.1.tar.gz Index: uim.spec =================================================================== RCS file: /cvs/extras/rpms/uim/FC-3/uim.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- uim.spec 12 Jul 2005 01:30:32 -0000 1.5 +++ uim.spec 3 Aug 2005 01:59:07 -0000 1.6 @@ -4,7 +4,7 @@ Summary: A multilingual input method library Name: uim -Version: 0.4.7 +Version: 0.4.7.1 Release: 1%{?dist} License: GPL/BSD Group: System Environment/Libraries @@ -288,6 +288,9 @@ %{_datadir}/uim/skk*.scm %changelog +* Wed Aug 3 2005 Akira TAGOH - 0.4.7.1-1.fc3 +- New upstream release. + * Tue Jul 12 2005 Akira TAGOH - 0.4.7-1.fc3 - New upstream release. - removed the patches. fixed in upstream. From fedora-extras-commits at redhat.com Wed Aug 3 02:15:24 2005 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Tue, 2 Aug 2005 22:15:24 -0400 Subject: rpms/uim/FC-4 .cvsignore, 1.7, 1.8 sources, 1.6, 1.7 uim.spec, 1.12, 1.13 Message-ID: <200508030215.j732FOct026200@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/uim/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26179 Modified Files: .cvsignore sources uim.spec Log Message: * Wed Aug 3 2005 Akira TAGOH - 0.4.7.1-1.fc4 - New upstream release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/uim/FC-4/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 12 Jul 2005 01:22:47 -0000 1.7 +++ .cvsignore 3 Aug 2005 02:15:22 -0000 1.8 @@ -6,3 +6,4 @@ uim-0.4.5.1.tar.gz uim-0.4.6.tar.gz uim-0.4.7.tar.gz +uim-0.4.7.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/uim/FC-4/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 12 Jul 2005 01:22:47 -0000 1.6 +++ sources 3 Aug 2005 02:15:22 -0000 1.7 @@ -1 +1 @@ -1ba750aa3ab7b5d1aedd26340ca83b82 uim-0.4.7.tar.gz +88c18b8fffa3a67401c932ac925a6d30 uim-0.4.7.1.tar.gz Index: uim.spec =================================================================== RCS file: /cvs/extras/rpms/uim/FC-4/uim.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- uim.spec 12 Jul 2005 01:22:47 -0000 1.12 +++ uim.spec 3 Aug 2005 02:15:22 -0000 1.13 @@ -4,7 +4,7 @@ Summary: A multilingual input method library Name: uim -Version: 0.4.7 +Version: 0.4.7.1 Release: 1%{?dist} License: GPL/BSD Group: System Environment/Libraries @@ -288,6 +288,9 @@ %{_datadir}/uim/skk*.scm %changelog +* Wed Aug 3 2005 Akira TAGOH - 0.4.7.1-1.fc4 +- New upstream release. + * Tue Jul 12 2005 Akira TAGOH - 0.4.7-1.fc4 - New upstream release. - removed the patches. fixed in upstream. From fedora-extras-commits at redhat.com Wed Aug 3 03:41:02 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Tue, 2 Aug 2005 23:41:02 -0400 Subject: rpms/Inventor/devel Inventor.spec,1.13,1.14 Message-ID: <200508030341.j733f2cV027577@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/Inventor/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27560 Modified Files: Inventor.spec Log Message: Check if RH bugzilla #146988 has been fixed. Index: Inventor.spec =================================================================== RCS file: /cvs/extras/rpms/Inventor/devel/Inventor.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- Inventor.spec 2 Aug 2005 07:56:42 -0000 1.13 +++ Inventor.spec 3 Aug 2005 03:41:00 -0000 1.14 @@ -6,7 +6,7 @@ Name: Inventor Version: 2.1.5 -Release: 12%{?dist} +Release: 13%{?dist} Summary: SGI Open Inventor (TM) @@ -169,10 +169,6 @@ # Inventor's build system wants us to install and build everything at once. rm -rf $RPM_BUILD_ROOT export LD_LIBRARY_PATH=${RPM_BUILD_ROOT}%{_libdir} -%ifarch ppc -# Work around g++ ICE bug (RH bugzilla #146988) -export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -O1" -%endif export VCOPTS="${RPM_OPT_FLAGS} -D_REENTRANT" export VCXXOPTS="${RPM_OPT_FLAGS} -D_REENTRANT" make all \ @@ -298,7 +294,10 @@ %{_libdir}/Inventor/examples %changelog -* Tue Jul 02 2005 Ralf Corsepius - 2.1.5-12 +* Tue Aug 03 2005 Ralf Corsepius - 2.1.5-13 +- Let PPC use standard RPM_OPT_FLAGS. + +* Tue Aug 02 2005 Ralf Corsepius - 2.1.5-12 - Add SoTempPath fix. * Sun May 22 2005 Ralf Corsepius - 2.1.5-9 From fedora-extras-commits at redhat.com Wed Aug 3 04:06:55 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Wed, 3 Aug 2005 00:06:55 -0400 Subject: rpms/Inventor/FC-4 Inventor.spec,1.13,1.14 Message-ID: <200508030406.j7346tAQ028807@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/Inventor/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28790 Modified Files: Inventor.spec Log Message: Check if RH bugzilla #146988 has been fixed. Index: Inventor.spec =================================================================== RCS file: /cvs/extras/rpms/Inventor/FC-4/Inventor.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- Inventor.spec 2 Aug 2005 07:56:42 -0000 1.13 +++ Inventor.spec 3 Aug 2005 04:06:39 -0000 1.14 @@ -6,7 +6,7 @@ Name: Inventor Version: 2.1.5 -Release: 12%{?dist} +Release: 13%{?dist} Summary: SGI Open Inventor (TM) @@ -169,10 +169,6 @@ # Inventor's build system wants us to install and build everything at once. rm -rf $RPM_BUILD_ROOT export LD_LIBRARY_PATH=${RPM_BUILD_ROOT}%{_libdir} -%ifarch ppc -# Work around g++ ICE bug (RH bugzilla #146988) -export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -O1" -%endif export VCOPTS="${RPM_OPT_FLAGS} -D_REENTRANT" export VCXXOPTS="${RPM_OPT_FLAGS} -D_REENTRANT" make all \ @@ -298,7 +294,10 @@ %{_libdir}/Inventor/examples %changelog -* Tue Jul 02 2005 Ralf Corsepius - 2.1.5-12 +* Tue Aug 03 2005 Ralf Corsepius - 2.1.5-13 +- Let PPC use standard RPM_OPT_FLAGS. + +* Tue Aug 02 2005 Ralf Corsepius - 2.1.5-12 - Add SoTempPath fix. * Sun May 22 2005 Ralf Corsepius - 2.1.5-9 From fedora-extras-commits at redhat.com Wed Aug 3 04:32:42 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Wed, 3 Aug 2005 00:32:42 -0400 Subject: extras-buildsys/server UserInterface.py,1.38,1.39 Message-ID: <200508030432.j734WgcN028933@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28916/server Modified Files: UserInterface.py Log Message: Fix job killing when not using SSL Index: UserInterface.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/UserInterface.py,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- UserInterface.py 2 Aug 2005 04:10:32 -0000 1.38 +++ UserInterface.py 3 Aug 2005 04:32:40 -0000 1.39 @@ -594,6 +594,6 @@ def kill_job(self, email, jobid): jobid = int(jobid) job = self._bm.get_job(jobid) - return self._kill_job(self, email, job, jobid) + return self._kill_job(email, job, jobid) From fedora-extras-commits at redhat.com Wed Aug 3 04:37:00 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Wed, 3 Aug 2005 00:37:00 -0400 Subject: extras-buildsys ChangeLog,1.84,1.85 Message-ID: <200508030437.j734b0Dg028973@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28944 Modified Files: ChangeLog Log Message: 2005-08-02 Dan Williams Patch from Josh Boyer * client/client.py - Fix up usage printout Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.84 retrieving revision 1.85 diff -u -r1.84 -r1.85 --- ChangeLog 2 Aug 2005 04:10:26 -0000 1.84 +++ ChangeLog 3 Aug 2005 04:36:58 -0000 1.85 @@ -1,3 +1,9 @@ +2005-08-02 Dan Williams + + Patch from Josh Boyer + * client/client.py + - Fix up usage printout + 2005-08-01 Dan Williams * Implement 'finished' state, allow users to move failed/needsign jobs From fedora-extras-commits at redhat.com Wed Aug 3 04:37:01 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Wed, 3 Aug 2005 00:37:01 -0400 Subject: extras-buildsys/client client.py,1.21,1.22 Message-ID: <200508030437.j734b1Mb028979@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/client In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28944/client Modified Files: client.py Log Message: 2005-08-02 Dan Williams Patch from Josh Boyer * client/client.py - Fix up usage printout Index: client.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/client/client.py,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- client.py 2 Aug 2005 04:10:32 -0000 1.21 +++ client.py 3 Aug 2005 04:36:58 -0000 1.22 @@ -313,22 +313,28 @@ return config_email - +def Usage(): + print "Usage:\nplague-client.py \n" + print " is one of:" + print " build [package_name] [cvs_tag | srpm_path] [target]" + print " list" + print " list " + print " list " + print " kill " + print " update_builders" + print " list_builders" + print " pause" + print " unpause" + print " is_paused" + print " requeue " + print " detail " + print " finish " + print " help" + print "" if __name__ == '__main__': if len(sys.argv) < 2: - print "Usage:\npackage-builder.py \n" - print " is one of:" - print " build [package_name] [cvs_tag | srpm_path] [target]" - print " list" - print " list " - print " list " - print " kill " - print " update_builders" - print " list_builders" - print " pause" - print " unpause" - print "" + Usage() sys.exit(1) # Write out config file if it doesn't exist @@ -380,7 +386,11 @@ is_paused(server) elif cmd == 'finish': finish(server, sys.argv[2:]) + elif cmd == 'help': + Usage() + sys.exit(1) else: print "Unknown command." + Usage() sys.exit(1) From fedora-extras-commits at redhat.com Wed Aug 3 08:25:18 2005 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Wed, 3 Aug 2005 04:25:18 -0400 Subject: fedora-security/audit fc4,1.35,1.36 Message-ID: <200508030825.j738PKOF001897@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1880 Modified Files: fc4 Log Message: Up to date with new FC4 releases Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- fc4 2 Aug 2005 03:09:02 -0000 1.35 +++ fc4 3 Aug 2005 08:25:16 -0000 1.36 @@ -1,5 +1,5 @@ -Up to date CVE as of CVE email 20050727 -Up to date FC4 as of 20050727 +Up to date CVE as of CVE email 20050802 +Up to date FC4 as of 20050802 ** are items that need attention @@ -46,7 +46,7 @@ 2005-2096 backport (zlib) [since FEDORA-2005-523] 2005-2096 backport (rpm) [since FEDORA-2005-565] 2005-2095 VULNERABLE (squirrelmail) -2005-2088 VULNERABLE (httpd) +2005-2088 backport (httpd) [since FEDORA-2005-639] 2005-2069 VULNERABLE (nss_ldap) http://bugzilla.padl.com/attachment.cgi?id=10&action=view 2005-2023 version (gnupg, fixed 1.9.15) 2005-1993 backport (sudo, fixed 1.6.8p9) [since FEDORA-2005-472] @@ -123,6 +123,7 @@ 2005-1277 ignore (dupe) 2005-1275 version (ImageMagick, fixed 6.2.2) 2005-1269 version (gaim, fixed 1.3.1) [since FEDORA-2005-411] +2005-1268 backport (httpd) [since FEDORA-2005-639] 2005-1267 backport (tcpdump) [since FEDORA-2005-407] 2005-1266 version (spamassassin, fixed 3.0.4) [since FEDORA-2005-428] 2005-1265 version (kernel) [since FEDORA-2005-510] was backport (kernel) patch-2.6.12-rc5 From fedora-extras-commits at redhat.com Wed Aug 3 11:49:03 2005 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Wed, 3 Aug 2005 07:49:03 -0400 Subject: common tobuild,1.2186,1.2187 Message-ID: <200508031149.j73Bn3TM005987@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5970 Modified Files: tobuild Log Message: request build of rpms/kphone/FC-3 kphone-4_2-1_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2186 retrieving revision 1.2187 diff -u -r1.2186 -r1.2187 --- tobuild 1 Aug 2005 18:36:41 -0000 1.2186 +++ tobuild 3 Aug 2005 11:49:01 -0000 1.2187 @@ -24,3 +24,4 @@ edhill rpms/nco/FC-4 nco-3_0_1-3_fc4 fc4 thomasvs rpms/mach/FC-4 mach-0_4_7-1_fc4 fc4 markmc rpms/sabayon/devel sabayon-2_11_90-1 devel +ausil rpms/kphone/FC-3 kphone-4_2-1_fc3 fc3 From fedora-extras-commits at redhat.com Wed Aug 3 11:52:41 2005 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Wed, 3 Aug 2005 07:52:41 -0400 Subject: owners owners.list,1.42,1.43 Message-ID: <200508031152.j73BqfV4006058@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6041 Modified Files: owners.list Log Message: dd krecipes Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- owners.list 2 Aug 2005 10:49:32 -0000 1.42 +++ owners.list 3 Aug 2005 11:52:39 -0000 1.43 @@ -329,6 +329,7 @@ Fedora Extras|konversation|An easy to use irc client for KDE|dennis at ausil.us|extras-qa at fedoraproject.org| Fedora Extras|kover|WYSIWYG CD cover printer with CDDB support|adrian at lisas.de|extras-qa at fedoraproject.org| Fedora Extras|kphone|A SIP (Session Initiation Protocol) user agent for Linux|dennis at dgilmore.net|extras-qa at fedoraproject.org| +Fedora Extras|krecipes|Application to manage recipes and shopping-lists|dennis at ausil.us|extras-qa at fedoraproject.org| Fedora Extras|ksensors|An lm_sensors frontend for KDE|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|ktrack|Satellite prediction software for KDE|dennis at dgilmore.net|extras-qa at fedoraproject.org| Fedora Extras|kyum|Graphical User Frontend (GUI) for yum|Jochen at herr-schmitt.de|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Wed Aug 3 12:55:08 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 3 Aug 2005 08:55:08 -0400 Subject: devel/sylpheed .cvsignore, 1.10, 1.11 sources, 1.10, 1.11 sylpheed.spec, 1.20, 1.21 Message-ID: <200508031255.j73Ct8fE007356@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/devel/sylpheed In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7335 Modified Files: .cvsignore sources sylpheed.spec Log Message: Update to final release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/devel/sylpheed/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 15 Jul 2005 17:34:59 -0000 1.10 +++ .cvsignore 3 Aug 2005 12:55:06 -0000 1.11 @@ -1 +1 @@ -sylpheed-2.0.0beta6.tar.bz2 +sylpheed-2.0.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/devel/sylpheed/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 15 Jul 2005 17:34:59 -0000 1.10 +++ sources 3 Aug 2005 12:55:06 -0000 1.11 @@ -1 +1 @@ -d1b992d0acf14a40e940ad3c59f20cb8 sylpheed-2.0.0beta6.tar.bz2 +a7754f8820814089229b1ab5f0e4d855 sylpheed-2.0.0.tar.bz2 Index: sylpheed.spec =================================================================== RCS file: /cvs/extras/devel/sylpheed/sylpheed.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sylpheed.spec 15 Jul 2005 17:34:59 -0000 1.20 +++ sylpheed.spec 3 Aug 2005 12:55:06 -0000 1.21 @@ -5,7 +5,7 @@ Summary: GTK+ based, lightweight, and fast email client Name: sylpheed Version: 2.0.0 -Release: 0.4.beta6 +Release: 1 License: GPL URL: http://sylpheed.good-day.net/ Group: Applications/Internet @@ -16,7 +16,7 @@ %{!?_without_compface:BuildRequires: compface-devel} %{?_with_ldap:BuildRequires: openldap-devel} %{?_with_jpilot:BuildRequires: jpilot-devel} -Source0: http://sylpheed.good-day.net/sylpheed/%{name}-2.0.0beta6.tar.bz2 +Source0: http://sylpheed.good-day.net/sylpheed/%{name}-%{version}.tar.bz2 Source1: sylpheed.1 Patch2: sylpheed-default-browser.patch @@ -38,7 +38,7 @@ See /usr/share/doc/sylpheed*/README for more information. %prep -%setup -q -n %{name}-2.0.0beta6 +%setup -q %patch2 -p1 -b .default-browser %patch3 -p1 -b .desktop @@ -81,6 +81,12 @@ %{_mandir}/man1 %changelog +* Sat Jul 30 2005 Michael Schwendt - 2.0.0-1 +- Update to 2.0.0. + +* Tue Jul 26 2005 Michael Schwendt - 2.0.0-0.4.rc +- Update to 2.0.0rc. + * Fri Jul 15 2005 Michael Schwendt - 2.0.0-0.4.beta6 - Update to 2.0.0beta6 (feature freeze). From fedora-extras-commits at redhat.com Wed Aug 3 14:12:00 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Wed, 3 Aug 2005 10:12:00 -0400 Subject: rpms/source-highlight/devel .cvsignore, 1.4, 1.5 source-highlight.spec, 1.7, 1.8 sources, 1.4, 1.5 Message-ID: <200508031412.j73EC061009817@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/source-highlight/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9796 Modified Files: .cvsignore source-highlight.spec sources Log Message: * Wed Aug 03 2005 Adrian Reber - 2.1.1-1 - updated to 2.1.1 (fixes #164861) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/source-highlight/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 20 Jun 2005 09:48:43 -0000 1.4 +++ .cvsignore 3 Aug 2005 14:11:58 -0000 1.5 @@ -1 +1,2 @@ -source-highlight-2.0.tar.gz +source-highlight-2.1.1.tar.gz +source-highlight-2.1.1.tar.gz.sig Index: source-highlight.spec =================================================================== RCS file: /cvs/extras/rpms/source-highlight/devel/source-highlight.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- source-highlight.spec 20 Jun 2005 09:48:43 -0000 1.7 +++ source-highlight.spec 3 Aug 2005 14:11:58 -0000 1.8 @@ -1,10 +1,11 @@ Summary: Produces a document with syntax highlighting Name: source-highlight -Version: 2.0 +Version: 2.1.1 Release: 1%{?dist} Group: Development/Tools License: GPL -Source: ftp://ftp.gnu.org/gnu/src-highlite/source-highlight-2.0.tar.gz +Source0: ftp://ftp.gnu.org/gnu/src-highlite/source-highlight-2.1.1.tar.gz +Source1: ftp://ftp.gnu.org/gnu/src-highlite/source-highlight-2.1.1.tar.gz.sig URL: http://www.gnu.org/software/src-highlite/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: bison, flex, boost-devel @@ -31,6 +32,7 @@ make install DESTDIR=$RPM_BUILD_ROOT mv $RPM_BUILD_ROOT%{_datadir}/doc/ docs +%{__sed} -i 's/\r//' docs/source-highlight/xhtml.css %clean rm -rf $RPM_BUILD_ROOT @@ -57,6 +59,12 @@ %{_infodir}/source-highlight.info* %changelog +* Wed Aug 03 2005 Adrian Reber - 2.1.1-1 +- updated to 2.1.1 (fixes #164861) + +* Mon Aug 01 2005 Adrian Reber - 2.1-1 +- updated to 2.1 + * Sun Jun 19 2005 Adrian Reber - 2.0-1 - updated to 2.0 - added boost-devel, help2man to BR Index: sources =================================================================== RCS file: /cvs/extras/rpms/source-highlight/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 20 Jun 2005 09:48:43 -0000 1.4 +++ sources 3 Aug 2005 14:11:58 -0000 1.5 @@ -1 +1,2 @@ -7501da9ee6f5eba1c9bc9adac9baae18 source-highlight-2.0.tar.gz +b31e7a52a91a8fb8093934b54b4f317a source-highlight-2.1.1.tar.gz +79622b9b9fe571b812e1d5bfc504ac81 source-highlight-2.1.1.tar.gz.sig From fedora-extras-commits at redhat.com Wed Aug 3 14:32:22 2005 From: fedora-extras-commits at redhat.com (Ed Hill (edhill)) Date: Wed, 3 Aug 2005 10:32:22 -0400 Subject: rpms/nco/FC-4 nco.spec,1.1,1.2 Message-ID: <200508031432.j73EWMiW009947@cvs-int.fedora.redhat.com> Author: edhill Update of /cvs/extras/rpms/nco/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9930 Modified Files: nco.spec Log Message: remove (hopefully only temporarily) opendap support Index: nco.spec =================================================================== RCS file: /cvs/extras/rpms/nco/FC-4/nco.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- nco.spec 21 Jul 2005 05:43:23 -0000 1.1 +++ nco.spec 3 Aug 2005 14:32:20 -0000 1.2 @@ -1,6 +1,6 @@ Name: nco Version: 3.0.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Suite of programs for manipulating NetCDF/HDF4 files Group: Applications/Engineering License: GPL @@ -18,8 +18,12 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: netcdf-devel, libtool, automake, autoconf -BuildRequires: udunits, udunits-devel, opendap-devel +# BuildRequires: udunits, udunits-devel, opendap-devel +BuildRequires: udunits, udunits-devel BuildRequires: curl-devel, libxml2-devel, librx-devel +# Unfortunately, opendap does not build on FC-4 or later. When +# its fixed, opendap-devel will be listed as a BuildRequires. +# In the mean time, nco will be built without opendap support. %package devel Summary: Development files for NCO @@ -102,6 +106,9 @@ %changelog +* Wed Aug 3 2005 Ed Hill - 3.0.1-4 +- remove (hopefully only temporarily) opendap support + * Thu Jul 21 2005 Ed Hill - 3.0.1-3 - add LICENSE file From fedora-extras-commits at redhat.com Wed Aug 3 14:41:56 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Wed, 3 Aug 2005 10:41:56 -0400 Subject: rpms/torcs-data/devel torcs-data.spec,1.5,1.6 Message-ID: <200508031441.j73Efueo010025@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/torcs-data/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10003 Modified Files: torcs-data.spec Log Message: Fix default requirement of any of the 3 tracks packages to the one the game expects to have the default quick race work. Index: torcs-data.spec =================================================================== RCS file: /cvs/extras/rpms/torcs-data/devel/torcs-data.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- torcs-data.spec 28 Feb 2005 22:19:39 -0000 1.5 +++ torcs-data.spec 3 Aug 2005 14:41:54 -0000 1.6 @@ -1,7 +1,7 @@ Summary: The Open Racing Car Simulator data files Name: torcs-data Version: 1.2.3 -Release: 2 +Release: 3 License: GPL and Free Art License Group: Amusements/Games URL: http://torcs.org/ @@ -13,7 +13,7 @@ Source5: http://dl.sf.net/torcs/TORCS-%{version}-data-cars-nascar.tgz Source90: Free-Art-License BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -Requires: torcs, %{name}-tracks = %{version} +Requires: torcs, %{name}-tracks-road = %{version} BuildArch: noarch %description @@ -28,7 +28,6 @@ Summary: The Open Racing Car Simulator additional dirt tracks Group: Amusements/Games Requires: torcs -Provides: %{name}-tracks = %{version}-%{release} %description tracks-dirt TORCS is a 3D racing cars simulator using OpenGL. The goal is to have @@ -42,7 +41,6 @@ Summary: The Open Racing Car Simulator additional oval tracks Group: Amusements/Games Requires: torcs -Provides: %{name}-tracks = %{version}-%{release} %description tracks-oval TORCS is a 3D racing cars simulator using OpenGL. The goal is to have @@ -56,7 +54,6 @@ Summary: The Open Racing Car Simulator additional road tracks Group: Amusements/Games Requires: torcs -Provides: %{name}-tracks = %{version}-%{release} %description tracks-road TORCS is a 3D racing cars simulator using OpenGL. The goal is to have @@ -162,6 +159,12 @@ %changelog +* Wed Aug 3 2005 Matthias Saou 1.2.3-3 +- Replace default tracks requirement (provided by all 3 tracks sub-packages) + by tracks-road since those are the ones required for a quick race, and yum + was installing the first available (alphabetically?) package, tracks-dirt. +- Remove now unused virtual provides of tracks sub-packages. + * Mon Feb 28 2005 Matthias Saou 1.2.3-2 - Change %%doc and %%defattr order to fix wrong ownership of doc files. From fedora-extras-commits at redhat.com Wed Aug 3 14:43:55 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Wed, 3 Aug 2005 10:43:55 -0400 Subject: rpms/torcs/devel TORCS-1.2.3-64bit.patch, NONE, 1.1 torcs.spec, 1.8, 1.9 torcs-64bit.patch, 1.1, NONE Message-ID: <200508031443.j73Eht56010069@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/torcs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10039 Modified Files: torcs.spec Added Files: TORCS-1.2.3-64bit.patch Removed Files: torcs-64bit.patch Log Message: Fix available drivers and add cars-extras for the default quick race to work, add olethros that got missed previously. TORCS-1.2.3-64bit.patch: --- NEW FILE TORCS-1.2.3-64bit.patch --- --- torcs-1.2.3/src/modules/graphic/ssggraph/grmain.cpp.64bit 2005-05-26 10:37:04.000000000 -0400 +++ torcs-1.2.3/src/modules/graphic/ssggraph/grmain.cpp 2005-05-26 10:37:44.000000000 -0400 @@ -156,7 +156,7 @@ static void grSplitScreen(void *vp) { - int p = (int)vp; + long p = (long)vp; switch (p) { case GR_SPLIT_ADD: @@ -198,19 +198,19 @@ static void grSetZoom(void *vp) { - grGetcurrentScreen()->setZoom((int)vp); + grGetcurrentScreen()->setZoom((int)(long)vp); } static void grSelectCamera(void *vp) { - grGetcurrentScreen()->selectCamera((int)vp); + grGetcurrentScreen()->selectCamera((int)(long)vp); } static void grSelectBoard(void *vp) { - grGetcurrentScreen()->selectBoard((int)vp); + grGetcurrentScreen()->selectBoard((int)(long)vp); } static void --- torcs-1.2.3/src/libs/tgfclient/guiscrollist.cpp.64bit 2005-05-26 10:29:52.000000000 -0400 +++ torcs-1.2.3/src/libs/tgfclient/guiscrollist.cpp 2005-05-26 10:30:50.000000000 -0400 @@ -45,7 +45,7 @@ tGfuiObject *object; tGfuiScrollList *scrollist; - object = gfuiGetObject(GfuiScreen, (int)(sinfo->userData)); + object = gfuiGetObject(GfuiScreen, (int)(long)(sinfo->userData)); if (object == NULL) { return; } Index: torcs.spec =================================================================== RCS file: /cvs/extras/rpms/torcs/devel/torcs.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- torcs.spec 26 May 2005 15:19:57 -0000 1.8 +++ torcs.spec 3 Aug 2005 14:43:53 -0000 1.9 @@ -3,8 +3,7 @@ Summary: The Open Racing Car Simulator Name: torcs Version: 1.2.3 -Release: 4 - +Release: 5%{?dist} License: GPL Group: Amusements/Games URL: http://torcs.org/ @@ -12,12 +11,11 @@ Source1: http://dl.sf.net/torcs/TORCS-%{version}-src-robots-base.tgz Source2: http://dl.sf.net/torcs/TORCS-%{version}-src-robots-berniw.tgz Source3: http://dl.sf.net/torcs/TORCS-%{version}-src-robots-bt.tgz -Patch0: torcs-64bit.patch +Source4: http://dl.sf.net/torcs/TORCS-%{version}-src-robots-olethros.tgz +Patch0: TORCS-1.2.3-64bit.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -Requires: torcs-data -%{?_without_xorg:BuildRequires: XFree86-devel, XFree86-Mesa-libGLU, XFree86-Mesa-libGL} -%{!?_without_xorg:BuildRequires: xorg-x11-devel, xorg-x11-Mesa-libGLU, xorg-x11-Mesa-libGL} -BuildRequires: gcc-c++, plib-devel >= 1.8.3, freeglut-devel +Requires: torcs-data, torcs-data-cars-extra +BuildRequires: xorg-x11-devel, freeglut-devel, plib-devel >= 1.8.3 BuildRequires: libpng-devel, libjpeg-devel, zlib-devel BuildRequires: desktop-file-utils @@ -30,7 +28,7 @@ %package robots Summary: The Open Racing Car Simulator robots Group: Amusements/Games -Requires: %{name} +Requires: %{name} = %{version} %description robots TORCS is a 3D racing cars simulator using OpenGL. The goal is to have @@ -41,12 +39,11 @@ %prep -%setup -a 1 -a 2 -a 3 +%setup -a 1 -a 2 -a 3 -a 4 +%patch0 -p1 -b .64bit # Put the drivers back where they belong %{__mv} %{name}-%{version}/src/drivers/* src/drivers/ -%patch0 -p1 -b .64bit - %build %configure @@ -65,7 +62,7 @@ Name=TORCS Comment=The Open Racing Car Simulator Exec=torcs -Icon=torcs.png +Icon=%{name}.png Terminal=false Type=Application Encoding=UTF-8 @@ -78,7 +75,7 @@ %{name}.desktop # We need this for proper automatic stripping to take place (still in 1.2.3) -find %{buildroot}%{_libdir}/%{name} -name '*.so' | xargs %{__chmod} +x +find %{buildroot}%{_libdir}/%{name}/ -name '*.so' | xargs %{__chmod} +x %clean @@ -89,42 +86,86 @@ %defattr(-, root, root, 0755) %doc CHANGELOG.html COPYING README.linux TODO.html %{_bindir}/* -%dir %{_libdir}/%{name} -%dir %{_libdir}/%{name}/drivers -%{_libdir}/%{name}/drivers/human -%{_libdir}/%{name}/lib -%{_libdir}/%{name}/modules +%dir %{_libdir}/%{name}/ +%dir %{_libdir}/%{name}/drivers/ +# From main +%{_libdir}/%{name}/drivers/human/ +# From robots-base +%{_libdir}/%{name}/drivers/cylos1/ +%{_libdir}/%{name}/drivers/damned/ +%{_libdir}/%{name}/drivers/inferno/ +%{_libdir}/%{name}/drivers/inferno2/ +%{_libdir}/%{name}/drivers/lliaw/ +%{_libdir}/%{name}/drivers/tanhoj/ +%{_libdir}/%{name}/drivers/tita/ +%{_libdir}/%{name}/lib/ +%{_libdir}/%{name}/modules/ %{_libdir}/%{name}/setup_linux.sh %{_libdir}/%{name}/*-bin %{_datadir}/applications/%{desktop_vendor}-%{name}.desktop -%dir %{_datadir}/games/%{name} -%{_datadir}/games/%{name}/config -%dir %{_datadir}/games/%{name}/drivers -%{_datadir}/games/%{name}/drivers/human -%{_datadir}/games/%{name}/results -%{_datadir}/games/%{name}/telemetry +%dir %{_datadir}/games/%{name}/ +%{_datadir}/games/%{name}/config/ +%dir %{_datadir}/games/%{name}/drivers/ +# From main +%{_datadir}/games/%{name}/drivers/human/ +# From robots-base +%{_datadir}/games/%{name}/drivers/cylos1/ +%{_datadir}/games/%{name}/drivers/damned/ +%{_datadir}/games/%{name}/drivers/inferno/ +%{_datadir}/games/%{name}/drivers/inferno2/ +%{_datadir}/games/%{name}/drivers/lliaw/ +%{_datadir}/games/%{name}/drivers/tanhoj/ +%{_datadir}/games/%{name}/drivers/tita/ +%{_datadir}/games/%{name}/results/ +%{_datadir}/games/%{name}/telemetry/ %{_datadir}/pixmaps/%{name}.png %files robots %defattr(-, root, root, 0755) -%dir %{_libdir}/%{name} -%{_libdir}/%{name}/drivers -# Easier this way, since we package them all-minus-one in ;-) -%exclude %{_libdir}/%{name}/drivers/human -%dir %{_datadir}/games/%{name} -%{_datadir}/games/%{name}/drivers -%exclude %{_datadir}/games/%{name}/drivers/human +%dir %{_libdir}/%{name}/ +%dir %{_libdir}/%{name}/drivers/ +# From robots-berniw +%{_libdir}/%{name}/drivers/berniw/ +%{_libdir}/%{name}/drivers/berniw2/ +%{_libdir}/%{name}/drivers/berniw3/ +%{_libdir}/%{name}/drivers/sparkle/ +# From robots-bt +%{_libdir}/%{name}/drivers/bt/ +# From robots-olethros +%{_libdir}/%{name}/drivers/olethros/ +%dir %{_datadir}/games/%{name}/ +%dir %{_datadir}/games/%{name}/drivers/ +# From robots-berniw +%{_datadir}/games/%{name}/drivers/berniw/ +%{_datadir}/games/%{name}/drivers/berniw2/ +%{_datadir}/games/%{name}/drivers/berniw3/ +%{_datadir}/games/%{name}/drivers/sparkle/ +# From robots-bt +%{_datadir}/games/%{name}/drivers/bt/ +# From robots-olethros +%{_datadir}/games/%{name}/drivers/olethros/ %changelog +* Wed Aug 3 2005 Matthias Saou 1.2.3-5 +- Move base robots from the sub-package to the main one to have the default + quick race work. Hopefully this will change in later versions if the game + checks which drivers are available before starting the default quick race. +- Add torcs-data-cars-extra requirement for the same reason as above : Without, + none of the drivers of the default quick race have a car and the game exits. +- Add olethros robots. +- Change %%files section to explicitly list all robots since the above change + moved many of them to the main package, not just "human". +- Renamed 64bit patch to TORCS-1.2.3-64bit.patch. + * Thu May 26 2005 Jeremy Katz - 1.2.3-4 - fix build on 64bit arches * Sun May 22 2005 Jeremy Katz - 1.2.3-3 - rebuild on all arches -* Fri Apr 7 2005 Michael Schwendt +* Fri Apr 7 2005 Michael Schwendt 1.2.3-2 - rebuilt * Mon Feb 7 2005 Matthias Saou 1.2.3-1 --- torcs-64bit.patch DELETED --- From fedora-extras-commits at redhat.com Wed Aug 3 15:28:48 2005 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Wed, 3 Aug 2005 11:28:48 -0400 Subject: rpms/octave/devel octave.spec,1.14,1.15 Message-ID: <200508031528.j73FSmaT011435@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/octave/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11418 Modified Files: octave.spec Log Message: Add new dependency (fftw3-devel) for octave-devel. Index: octave.spec =================================================================== RCS file: /cvs/extras/rpms/octave/devel/octave.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- octave.spec 2 Aug 2005 21:35:53 -0000 1.14 +++ octave.spec 3 Aug 2005 15:28:45 -0000 1.15 @@ -40,7 +40,7 @@ Summary: Development headers and files for Octave Group: Development/Libraries Requires: %{name} = %{epoch}:%{version}-%{release} -Requires: readline-devel hdf5-devel zlib-devel +Requires: readline-devel fftw3-devel hdf5-devel zlib-devel %description devel The octave-devel package contains files needed for developing @@ -128,6 +128,9 @@ %changelog +* Wed Jul 27 2005 Quentin Spencer 2.9.3-3 +- Add fftw3-devel to dependencies for devel + * Tue Jul 26 2005 Quentin Spencer 2.9.3-2 - Add dependencies (hdf5-devel and zlib-devel) for devel From fedora-extras-commits at redhat.com Wed Aug 3 15:36:40 2005 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Wed, 3 Aug 2005 11:36:40 -0400 Subject: rpms/octave/devel octave.spec,1.15,1.16 Message-ID: <200508031536.j73Faex6011465@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/octave/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11445 Modified Files: octave.spec Log Message: Forgot to increment the release number. Index: octave.spec =================================================================== RCS file: /cvs/extras/rpms/octave/devel/octave.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- octave.spec 3 Aug 2005 15:28:45 -0000 1.15 +++ octave.spec 3 Aug 2005 15:36:37 -0000 1.16 @@ -2,7 +2,7 @@ Name: octave Version: 2.9.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A high-level language for numerical computations Epoch: 6 From fedora-extras-commits at redhat.com Wed Aug 3 15:37:35 2005 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Wed, 3 Aug 2005 11:37:35 -0400 Subject: rpms/octave-forge/devel octave-forge.spec,1.11,1.12 Message-ID: <200508031537.j73FbZtk011501@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/octave-forge/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11484 Modified Files: octave-forge.spec Log Message: Remove some BuildRequires that are now dependencies of octave-devel. Index: octave-forge.spec =================================================================== RCS file: /cvs/extras/rpms/octave-forge/devel/octave-forge.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- octave-forge.spec 2 Aug 2005 19:28:36 -0000 1.11 +++ octave-forge.spec 3 Aug 2005 15:37:33 -0000 1.12 @@ -1,6 +1,6 @@ Name: octave-forge Version: 2005.06.13 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Contributed functions for octave Group: Applications/Engineering @@ -24,10 +24,9 @@ %define octave_ep %(rpm -q --qf '%%{epoch}' octave) %define octave_ver %(rpm -q --qf '%%{version}' octave) Requires: octave = %{octave_ep}:%{octave_ver} ImageMagick -BuildRequires: octave-devel tetex gcc-gfortran ginac-devel fftw3-devel -BuildRequires: xorg-x11-devel libjpeg-devel libpng-devel zlib-devel +BuildRequires: octave-devel tetex gcc-gfortran ginac-devel +BuildRequires: xorg-x11-devel libjpeg-devel libpng-devel pcre-devel BuildRequires: ncurses-devel libtermcap-devel gsl-devel qhull-devel -BuildRequires: pcre-devel %description Octave-forge is a community project for collaborative development of @@ -74,6 +73,9 @@ %changelog +* Wed Aug 3 2005 Quentin Spencer 2005.06.13-3 +- Remove some BuildRequires that are now dependencies of octave-devel. + * Tue Aug 2 2005 Quentin Spencer 2005.06.13-2 - Change GiNaC-devel to ginac-devel to reflect package name change. From fedora-extras-commits at redhat.com Wed Aug 3 15:48:00 2005 From: fedora-extras-commits at redhat.com (Shawn McCann (smccann)) Date: Wed, 3 Aug 2005 11:48:00 -0400 Subject: common tobuild,1.2187,1.2188 Message-ID: <200508031548.j73Fm0BK011594@cvs-int.fedora.redhat.com> Author: smccann Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11577 Modified Files: tobuild Log Message: Remove proj for FC4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2187 retrieving revision 1.2188 diff -u -r1.2187 -r1.2188 --- tobuild 3 Aug 2005 11:49:01 -0000 1.2187 +++ tobuild 3 Aug 2005 15:47:57 -0000 1.2188 @@ -6,7 +6,6 @@ ensc rpms/clamav/FC-4 clamav-0_86_2-4_fc4 fc4 ensc rpms/clamav/devel clamav-0_86_2-4_fc5 devel ensc rpms/clamav/FC-3 clamav-0_86_2-4_fc3 fc3 -smccann rpms/proj/FC-4 proj-4_4_9-1_fc4 fc4 ryo rpms/scim/FC-4 scim-1_4_0-2_2_fc4 fc4 ryo rpms/scim/FC-3 scim-1_4_0-2_2_fc3 fc3 gemi rpms/unison/FC-4 unison-2_12_0-1_fc4 fc4 From ivazquez at ivazquez.net Wed Aug 3 16:05:44 2005 From: ivazquez at ivazquez.net (Ignacio Vazquez-Abrams) Date: Wed, 03 Aug 2005 12:05:44 -0400 Subject: APPROVED: pdftk Message-ID: <1123085144.12131.26.camel@ignacio.lan> If PDF is electronic paper, then pdftk is an electronic staple-remover, hole-punch, binder, secret-decoder-ring, and X-Ray-glasses. Pdftk is a simple tool for doing everyday things with PDF documents. Keep one in the top drawer of your desktop and use it to: * Merge PDF Documents * Split PDF Pages into a New Document * Decrypt Input as Necessary (Password Required) * Encrypt Output as Desired * Burst a PDF Document into Single Pages * Report on PDF Metrics, including Metadata and Bookmarks * Uncompress and Re-Compress Page Streams * Repair Corrupted PDF (Where Possible) Pdftk is also an example of how to use a library of Java classes in a stand-alone C++ program. Specifically, it demonstrates how GCJ and CNI allow C++ code to use iText's (itext-paulo) Java classes. Reviewer: Ignacio Vazquez-Abrams Maintainer: Jochen Schmitt -- Ignacio Vazquez-Abrams http://fedora.ivazquez.net/ gpg --keyserver hkp://subkeys.pgp.net --recv-key 38028b72 -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 189 bytes Desc: This is a digitally signed message part URL: From fedora-extras-commits at redhat.com Wed Aug 3 16:23:05 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Wed, 3 Aug 2005 12:23:05 -0400 Subject: rpms/synergy/devel .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 synergy.spec, 1.8, 1.9 Message-ID: <200508031623.j73GN5o2012886@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/synergy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12831/devel Modified Files: .cvsignore sources synergy.spec Log Message: Update to 1.2.3. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/synergy/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 31 Jan 2005 17:44:34 -0000 1.4 +++ .cvsignore 3 Aug 2005 16:23:03 -0000 1.5 @@ -1 +1 @@ -synergy-1.2.2.tar.gz +synergy-1.2.3.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/synergy/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 31 Jan 2005 17:44:34 -0000 1.4 +++ sources 3 Aug 2005 16:23:03 -0000 1.5 @@ -1 +1 @@ -d43fe74fc3aeb541bb38f0dceaffebb4 synergy-1.2.2.tar.gz +76914a4e62603647eb82bd68017e623d synergy-1.2.3.tar.gz Index: synergy.spec =================================================================== RCS file: /cvs/extras/rpms/synergy/devel/synergy.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- synergy.spec 4 May 2005 16:27:57 -0000 1.8 +++ synergy.spec 3 Aug 2005 16:23:03 -0000 1.9 @@ -1,14 +1,14 @@ Summary: Mouse and keyboard sharing utility Name: synergy -Version: 1.2.2 -Release: 3 +Version: 1.2.3 +Release: 1%{?dist} License: GPL Group: System Environment/Daemons URL: http://synergy2.sourceforge.net/ Source: http://dl.sf.net/synergy2/%{name}-%{version}.tar.gz Patch: synergy-1.2.2-werror.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -BuildRequires: gcc-c++, XFree86-devel, autoconf +BuildRequires: gcc-c++, xorg-x11-devel, autoconf %description Synergy lets you easily share a single mouse and keyboard between @@ -47,6 +47,10 @@ %changelog +* Wed Aug 3 2005 Matthias Saou 1.2.3-1 +- Update to 1.2.3, -Werror patch still required (only for warn_unused_result + anyway). + * Wed May 4 2005 Matthias Saou 1.2.2-3 - Rebuild (my bad with CVS "make tag", I guess). From fedora-extras-commits at redhat.com Wed Aug 3 16:22:59 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Wed, 3 Aug 2005 12:22:59 -0400 Subject: rpms/synergy/FC-3 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 synergy.spec, 1.5, 1.6 Message-ID: <200508031623.j73GNToS012891@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/synergy/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12831/FC-3 Modified Files: .cvsignore sources synergy.spec Log Message: Update to 1.2.3. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/synergy/FC-3/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 31 Jan 2005 17:44:34 -0000 1.4 +++ .cvsignore 3 Aug 2005 16:22:57 -0000 1.5 @@ -1 +1 @@ -synergy-1.2.2.tar.gz +synergy-1.2.3.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/synergy/FC-3/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 31 Jan 2005 17:44:34 -0000 1.4 +++ sources 3 Aug 2005 16:22:57 -0000 1.5 @@ -1 +1 @@ -d43fe74fc3aeb541bb38f0dceaffebb4 synergy-1.2.2.tar.gz +76914a4e62603647eb82bd68017e623d synergy-1.2.3.tar.gz Index: synergy.spec =================================================================== RCS file: /cvs/extras/rpms/synergy/FC-3/synergy.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- synergy.spec 31 Jan 2005 17:44:34 -0000 1.5 +++ synergy.spec 3 Aug 2005 16:22:57 -0000 1.6 @@ -1,13 +1,14 @@ Summary: Mouse and keyboard sharing utility Name: synergy -Version: 1.2.2 -Release: 1 +Version: 1.2.3 +Release: 1%{?dist} License: GPL Group: System Environment/Daemons URL: http://synergy2.sourceforge.net/ Source: http://dl.sf.net/synergy2/%{name}-%{version}.tar.gz +Patch: synergy-1.2.2-werror.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -BuildRequires: gcc-c++, XFree86-devel +BuildRequires: gcc-c++, xorg-x11-devel, autoconf %description Synergy lets you easily share a single mouse and keyboard between @@ -19,6 +20,8 @@ %prep %setup +%patch -p1 -b .werror +%{__autoconf} %build @@ -44,6 +47,16 @@ %changelog +* Wed Aug 3 2005 Matthias Saou 1.2.3-1 +- Update to 1.2.3, -Werror patch still required (only for warn_unused_result + anyway). + +* Wed May 4 2005 Matthias Saou 1.2.2-3 +- Rebuild (my bad with CVS "make tag", I guess). + +* Sun Apr 17 2005 Matthias Saou 1.2.2-2 +- Disable -Werror as build fails with gcc4 otherwise (temporary fix). + * Mon Jan 31 2005 Matthias Saou 1.2.2-1 - Update to 1.2.2. From fedora-extras-commits at redhat.com Wed Aug 3 16:22:59 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Wed, 3 Aug 2005 12:22:59 -0400 Subject: rpms/synergy/FC-4 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 synergy.spec, 1.8, 1.9 Message-ID: <200508031623.j73GNTcl012896@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/synergy/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12831/FC-4 Modified Files: .cvsignore sources synergy.spec Log Message: Update to 1.2.3. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/synergy/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 31 Jan 2005 17:44:34 -0000 1.4 +++ .cvsignore 3 Aug 2005 16:22:57 -0000 1.5 @@ -1 +1 @@ -synergy-1.2.2.tar.gz +synergy-1.2.3.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/synergy/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 31 Jan 2005 17:44:34 -0000 1.4 +++ sources 3 Aug 2005 16:22:57 -0000 1.5 @@ -1 +1 @@ -d43fe74fc3aeb541bb38f0dceaffebb4 synergy-1.2.2.tar.gz +76914a4e62603647eb82bd68017e623d synergy-1.2.3.tar.gz Index: synergy.spec =================================================================== RCS file: /cvs/extras/rpms/synergy/FC-4/synergy.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- synergy.spec 4 May 2005 16:27:57 -0000 1.8 +++ synergy.spec 3 Aug 2005 16:22:57 -0000 1.9 @@ -1,14 +1,14 @@ Summary: Mouse and keyboard sharing utility Name: synergy -Version: 1.2.2 -Release: 3 +Version: 1.2.3 +Release: 1%{?dist} License: GPL Group: System Environment/Daemons URL: http://synergy2.sourceforge.net/ Source: http://dl.sf.net/synergy2/%{name}-%{version}.tar.gz Patch: synergy-1.2.2-werror.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -BuildRequires: gcc-c++, XFree86-devel, autoconf +BuildRequires: gcc-c++, xorg-x11-devel, autoconf %description Synergy lets you easily share a single mouse and keyboard between @@ -47,6 +47,10 @@ %changelog +* Wed Aug 3 2005 Matthias Saou 1.2.3-1 +- Update to 1.2.3, -Werror patch still required (only for warn_unused_result + anyway). + * Wed May 4 2005 Matthias Saou 1.2.2-3 - Rebuild (my bad with CVS "make tag", I guess). From fedora-extras-commits at redhat.com Wed Aug 3 16:40:34 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 3 Aug 2005 12:40:34 -0400 Subject: rpms/mathml-fonts/devel find_symbol_font.sh,NONE,1.1 Message-ID: <200508031640.j73GeYkY013037@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/mathml-fonts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13021 Added Files: find_symbol_font.sh Log Message: import ***** Error reading new file: [Errno 2] No such file or directory: 'find_symbol_font.sh' From fedora-extras-commits at redhat.com Wed Aug 3 17:06:33 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 3 Aug 2005 13:06:33 -0400 Subject: rpms/mathml-fonts/devel mathml-fonts.spec,1.4,1.5 Message-ID: <200508031706.j73H6X6j014199@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/mathml-fonts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14182 Modified Files: mathml-fonts.spec Log Message: - update for acroread7 (and SY_____.PFB) (bug #133709) - include/use find_symbol_font.sh helper script - readd %%postun - update latex-xft-fonts URL - remove legacy crud Index: mathml-fonts.spec =================================================================== RCS file: /cvs/extras/rpms/mathml-fonts/devel/mathml-fonts.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- mathml-fonts.spec 6 Apr 2005 22:12:24 -0000 1.4 +++ mathml-fonts.spec 3 Aug 2005 17:06:31 -0000 1.5 @@ -6,7 +6,7 @@ Summary: Mathematical symbol fonts Name: mathml-fonts Version: 1.0 -Release: 15 +Release: 16 URL: http://www.mozilla.org/projects/mathml/fonts/ License: Distributable @@ -15,13 +15,17 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root ## Sources +Source1: find_symbol_font.sh +# Install as: +%define find_symbol_font %{_libexecdir}/%{name}/find_symbol_font.sh + ## Mathematica fonts Source10: http://support.wolfram.com/mathematica/systems/windows/general/MathFonts_TrueType.exe ## TeX fonts #Source20: ftp://tug.ctan.org/tex-archive/fonts/cm/ps-type1/bakoma/ttf.tar.gz Source20: ftp://tug.ctan.org/tex-archive/fonts/cm/ps-type1/bakoma/ttf/cmbx10.ttf -# Reference: http://wiki.lyx.org/beta/pmwiki.php/LyX/Troubleshooting -Source21: http://www.movement.uklinux.net/latex-xft-fonts-0.1.tar.gz +# Reference: http://wiki.lyx.org/LyX/Troubleshooting +Source21: http://movementarian.org/latex-xft-fonts-0.1.tar.gz ## Design Science fonts # License: http://www.dessci.com/en/support/eula/mtextralic.htm # URL: http://www.dessci.com/en/dl/fonts/ @@ -29,20 +33,12 @@ # (couldn't figure out how extract at build-time -- Rex) Source30: mtextra.ttf -BuildRequires: %{x11bindir}/mkfontdir, %{x11bindir}/mkfontscale -# Help out apt/mach find the above -BuildRequires: XFree86-font-utils BuildRequires: unzip # we're pretty much useless without it, and use fc-cache -# in scriptlets +# in %%post,%%postun,%%triggers Prereq: fontconfig -# Not *strictly* required, for Adobe (PS) Symbol font, expects -# /usr/lib/acroread/Resource/Fonts -# Prereq: acroread -# BuildRequires: acroread - Provides: latex-xft-fonts = 0:0.1 %description @@ -84,40 +80,38 @@ cmbx10.ttf mtextra.ttf \ $RPM_BUILD_ROOT%{fontdir}/ -# Generate fonts.scale, etc... -# don't really *need* this step, as we're Xft only... -%{x11bindir}/mkfontscale $RPM_BUILD_ROOT%{fontdir} -%{x11bindir}/mkfontdir $RPM_BUILD_ROOT%{fontdir} +# find_symbol_font +install -p -m755 -D %{SOURCE1} $RPM_BUILD_ROOT%{find_symbol_font} # "touch" all fonts.dir, fonts.scale, etc files we've got flagged as %ghost -touch $RPM_BUILD_ROOT%{fontdir}/{fonts.{dir,scale,cache-1},encodings.dir,Symbol.pfa} +touch $RPM_BUILD_ROOT%{fontdir}/{fonts.cache-1,Symbol.pfa,SY______.PFB} -%triggerin -- acroread -if [ ! -e %{fontdir}/Symbol.pfa -a \ - -e %{_libdir}/acroread/Resource/Font/Symbol ] ; then - ln -s %{_libdir}/acroread/Resource/Font/Symbol %{fontdir}/Symbol.pfa - ## Rebuild fontcache for now available Symbol.pfa +%triggerin -- acroread,AdobeReader_enu +%{find_symbol_font} ||: + +%triggerun -- acroread,AdobeReader_enu +if [ $2 -eq 0 ]; then fc-cache -f %{fontdir} ||: fi -%triggerun -- acroread -[ $2 -eq 0 ] && rm -f %{fontdir}/Symbol.pfa -## Rebuild fontcache for now missing (or possibly changed) Symbol.pfa -fc-cache -f %{fontdir} ||: - %post +%{find_symbol_font} ||: fc-cache -f %{fontdir} ||: +%postun +if [ $1 -eq 0 ]; then + fc-cache ||: +fi + %files %defattr(-,root,root) +%{find_symbol_font} %dir %{fontdir} %{fontdir}/*.[ot]tf -%{fontdir}/fonts.dir -%{fontdir}/fonts.scale -%{fontdir}/encodings.dir %ghost %{fontdir}/Symbol.pfa +%ghost %{fontdir}/SY______.PFB %ghost %{fontdir}/fonts.cache-1 @@ -126,6 +120,13 @@ %changelog +* Wed Aug 3 2005 Rex Dieter 1.0-16 +- update for acroread7 (and SY_____.PFB) (bug #133709) +- include/use find_symbol_font.sh helper script +- readd %%postun +- update latex-xft-fonts URL +- remove legacy crud + * Fri Apr 7 2005 Michael Schwendt - rebuilt From fedora-extras-commits at redhat.com Wed Aug 3 17:13:57 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Wed, 3 Aug 2005 13:13:57 -0400 Subject: rpms/perl-String-Ediff/FC-4 .cvsignore, 1.5, 1.6 perl-String-Ediff.spec, 1.9, 1.10 sources, 1.5, 1.6 Message-ID: <200508031714.j73HERMP014306@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-String-Ediff/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14268/FC-4 Modified Files: .cvsignore perl-String-Ediff.spec sources Log Message: 0.07, pre-FC2 compat cleanup. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-String-Ediff/FC-4/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 14 Apr 2005 19:46:35 -0000 1.5 +++ .cvsignore 3 Aug 2005 17:13:55 -0000 1.6 @@ -1 +1 @@ -String-Ediff-0.06.tar.gz +String-Ediff-0.07.tar.gz Index: perl-String-Ediff.spec =================================================================== RCS file: /cvs/extras/rpms/perl-String-Ediff/FC-4/perl-String-Ediff.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- perl-String-Ediff.spec 14 Apr 2005 19:46:35 -0000 1.9 +++ perl-String-Ediff.spec 3 Aug 2005 17:13:55 -0000 1.10 @@ -1,7 +1,5 @@ -%{!?perl_vendorarch: %define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)} - Name: perl-String-Ediff -Version: 0.06 +Version: 0.07 Release: 1 Summary: Produce common sub-string indices for two strings @@ -11,7 +9,7 @@ Source0: http://www.cpan.org/authors/id/B/BO/BOXZOU/String-Ediff-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: perl >= 1:5.6.1 +BuildRequires: perl Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -38,7 +36,7 @@ chmod -R u+w $RPM_BUILD_ROOT/* -%check || : +%check make test @@ -49,12 +47,16 @@ %files %defattr(-,root,root,-) %doc ChangeLog README -%{perl_vendorarch}/auto/String -%{perl_vendorarch}/String +%{perl_vendorarch}/auto/String/ +%{perl_vendorarch}/String/ %{_mandir}/man3/*.3* %changelog +* Wed Aug 3 2005 Ville Skytt?? - 0.07-1 +- 0.07. +- Clean up pre-FC2 compatibility stuff from specfile. + * Wed Apr 13 2005 Ville Skytt?? - 0.06-1 - 0.06. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-String-Ediff/FC-4/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 14 Apr 2005 19:46:35 -0000 1.5 +++ sources 3 Aug 2005 17:13:55 -0000 1.6 @@ -1 +1 @@ -30731ab42da42587a5b1e1275d776a65 String-Ediff-0.06.tar.gz +72b977beaef757105c5f1bdde676006b String-Ediff-0.07.tar.gz From fedora-extras-commits at redhat.com Wed Aug 3 17:13:57 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Wed, 3 Aug 2005 13:13:57 -0400 Subject: rpms/perl-String-Ediff/devel .cvsignore, 1.5, 1.6 perl-String-Ediff.spec, 1.9, 1.10 sources, 1.5, 1.6 Message-ID: <200508031714.j73HERW5014311@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-String-Ediff/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14268/devel Modified Files: .cvsignore perl-String-Ediff.spec sources Log Message: 0.07, pre-FC2 compat cleanup. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-String-Ediff/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 14 Apr 2005 19:46:35 -0000 1.5 +++ .cvsignore 3 Aug 2005 17:13:55 -0000 1.6 @@ -1 +1 @@ -String-Ediff-0.06.tar.gz +String-Ediff-0.07.tar.gz Index: perl-String-Ediff.spec =================================================================== RCS file: /cvs/extras/rpms/perl-String-Ediff/devel/perl-String-Ediff.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- perl-String-Ediff.spec 14 Apr 2005 19:46:35 -0000 1.9 +++ perl-String-Ediff.spec 3 Aug 2005 17:13:55 -0000 1.10 @@ -1,8 +1,6 @@ -%{!?perl_vendorarch: %define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)} - Name: perl-String-Ediff -Version: 0.06 -Release: 1 +Version: 0.07 +Release: 2 Summary: Produce common sub-string indices for two strings Group: Development/Libraries @@ -11,7 +9,7 @@ Source0: http://www.cpan.org/authors/id/B/BO/BOXZOU/String-Ediff-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: perl >= 1:5.6.1 +BuildRequires: perl Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -38,7 +36,7 @@ chmod -R u+w $RPM_BUILD_ROOT/* -%check || : +%check make test @@ -49,12 +47,16 @@ %files %defattr(-,root,root,-) %doc ChangeLog README -%{perl_vendorarch}/auto/String -%{perl_vendorarch}/String +%{perl_vendorarch}/auto/String/ +%{perl_vendorarch}/String/ %{_mandir}/man3/*.3* %changelog +* Wed Aug 3 2005 Ville Skytt?? - 0.07-2 +- 0.07. +- Clean up pre-FC2 compatibility stuff from specfile. + * Wed Apr 13 2005 Ville Skytt?? - 0.06-1 - 0.06. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-String-Ediff/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 14 Apr 2005 19:46:35 -0000 1.5 +++ sources 3 Aug 2005 17:13:55 -0000 1.6 @@ -1 +1 @@ -30731ab42da42587a5b1e1275d776a65 String-Ediff-0.06.tar.gz +72b977beaef757105c5f1bdde676006b String-Ediff-0.07.tar.gz From thias at spam.spam.spam.spam.spam.spam.spam.egg.and.spam.freshrpms.net Wed Aug 3 17:43:42 2005 From: thias at spam.spam.spam.spam.spam.spam.spam.egg.and.spam.freshrpms.net (Matthias Saou) Date: Wed, 3 Aug 2005 19:43:42 +0200 Subject: APPROVED : svgalib Message-ID: <20050803194342.1d284bdc@python2> URL : http://www.svgalib.org/ Summary : Low-level fullscreen SVGA graphics library Description : The svgalib package provides the SVGAlib low-level graphics library for Linux. SVGAlib is a library which allows applications to use full screen graphics on a variety of hardware platforms. Some games and utilities use SVGAlib for their graphics. For details on supported chipsets, see man 7 svgalib (when svgalib is installed). Maintainer : Hans de Goede Reviewer : Matthias Saou -- Clean custom Red Hat Linux rpm packages : http://freshrpms.net/ Fedora Core release 4 (Stentz) - Linux kernel 2.6.12-1.1398_FC4 Load : 0.30 0.44 0.50 From fedora-extras-commits at redhat.com Wed Aug 3 17:49:03 2005 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Wed, 3 Aug 2005 13:49:03 -0400 Subject: rpms/pdftk - New directory Message-ID: <200508031749.j73Hn3xR014534@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/pdftk In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14509/pdftk Log Message: Directory /cvs/extras/rpms/pdftk added to the repository From fedora-extras-commits at redhat.com Wed Aug 3 17:49:04 2005 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Wed, 3 Aug 2005 13:49:04 -0400 Subject: rpms/pdftk/devel - New directory Message-ID: <200508031749.j73Hn49q014539@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/pdftk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14509/pdftk/devel Log Message: Directory /cvs/extras/rpms/pdftk/devel added to the repository From fedora-extras-commits at redhat.com Wed Aug 3 17:49:25 2005 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Wed, 3 Aug 2005 13:49:25 -0400 Subject: rpms/pdftk Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200508031749.j73HnPVp014590@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/pdftk In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14563 Added Files: Makefile import.log Log Message: Setup of module pdftk --- NEW FILE Makefile --- # Top level Makefile for module pdftk all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Wed Aug 3 17:49:25 2005 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Wed, 3 Aug 2005 13:49:25 -0400 Subject: rpms/pdftk/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200508031749.j73HnPLZ014593@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/pdftk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14563/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module pdftk --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Wed Aug 3 17:51:02 2005 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Wed, 3 Aug 2005 13:51:02 -0400 Subject: rpms/pdftk import.log,1.1,1.2 Message-ID: <200508031751.j73Hp2ng014712@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/pdftk In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14680 Modified Files: import.log Log Message: auto-import pdftk-1.12-3 on branch devel from pdftk-1.12-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/pdftk/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 3 Aug 2005 17:49:23 -0000 1.1 +++ import.log 3 Aug 2005 17:51:00 -0000 1.2 @@ -0,0 +1 @@ +pdftk-1_12-3:HEAD:pdftk-1.12-3.src.rpm:1123091449 From fedora-extras-commits at redhat.com Wed Aug 3 17:51:03 2005 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Wed, 3 Aug 2005 13:51:03 -0400 Subject: rpms/pdftk/devel gpl.txt, NONE, 1.1 pdftk.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200508031751.j73Hp3ZF014717@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/pdftk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14680/devel Modified Files: .cvsignore sources Added Files: gpl.txt pdftk.spec Log Message: auto-import pdftk-1.12-3 on branch devel from pdftk-1.12-3.src.rpm --- NEW FILE gpl.txt --- GNU GENERAL PUBLIC LICENSE Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 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) 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 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) year 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. --- NEW FILE pdftk.spec --- Summary: The PDF Tool Kit Name: pdftk Version: 1.12 Release: 3 License: GPL URL: http://www.accesspdf.com/pdftk/ Source0: http://www.pdfhacks.com/pdftk/%{name}-%{version}.tar.bz2 Source1: gpl.txt Group: Applications/Publishing BuildRoot: %{_tmppath}/%{name}-root BuildRequires: gcc-java BuildRequires: libgcj-devel %description If PDF is electronic paper, then pdftk is an electronic staple-remover, hole-punch, binder, secret-decoder-ring, and X-Ray-glasses. Pdftk is a simple tool for doing everyday things with PDF documents. Keep one in the top drawer of your desktop and use it to: * Merge PDF Documents * Split PDF Pages into a New Document * Decrypt Input as Necessary (Password Required) * Encrypt Output as Desired * Burst a PDF Document into Single Pages * Report on PDF Metrics, including Metadata and Bookmarks * Uncompress and Re-Compress Page Streams * Repair Corrupted PDF (Where Possible) Pdftk is also an example of how to use a library of Java classes in a stand-alone C++ program. Specifically, it demonstrates how GCJ and CNI allow C++ code to use iText's (itext-paulo) Java classes. %prep %setup -q %build unset CLASSPATH && cd pdftk && make -f Makefile.RedHat && cd - %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/%{_bindir} mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1 install -m 0755 pdftk/pdftk $RPM_BUILD_ROOT/%{_bindir}/pdftk install -m 0644 debian/pdftk.1 $RPM_BUILD_ROOT/%{_mandir}/man1/pdftk.1 cp %{SOURCE1} COPYRIGHT %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) %doc pdftk.1.html pdftk.1.txt COPYRIGHT %{_bindir}/* %{_mandir}/man1/* %changelog * Sun Jul 31 2005 Jochen Schmitt 1.12-3 - Add literal GPL text as Source1 * Wed Jul 27 2005 Jochen Schmitt 1.12-2 - Don't compress man page - Remove pdftk.1.notes - Add COPYRIGHT from debian/copyright * Tue Jul 26 2005 Jochen Schmitt 1.12-1 - Initial RPM release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pdftk/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 3 Aug 2005 17:49:23 -0000 1.1 +++ .cvsignore 3 Aug 2005 17:51:01 -0000 1.2 @@ -0,0 +1 @@ +pdftk-1.12.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/pdftk/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 3 Aug 2005 17:49:23 -0000 1.1 +++ sources 3 Aug 2005 17:51:01 -0000 1.2 @@ -0,0 +1 @@ +ec1b6d9e06109c6f05e19033f1d91d8a pdftk-1.12.tar.bz2 From fedora-extras-commits at redhat.com Wed Aug 3 17:51:35 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 3 Aug 2005 13:51:35 -0400 Subject: rpms/lyx/devel .cvsignore, 1.2, 1.3 lyx-1.3.5-helpers.patch, 1.1, 1.2 lyx.spec, 1.8, 1.9 sources, 1.3, 1.4 lyx-1.3.4-gcc34.patch, 1.1, NONE Message-ID: <200508031751.j73HpZNT014815@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/lyx/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14771/devel Modified Files: .cvsignore lyx-1.3.5-helpers.patch lyx.spec sources Removed Files: lyx-1.3.4-gcc34.patch Log Message: auto-import lyx-1.3.6-2 on branch devel from lyx-1.3.6-2.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/lyx/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:51:01 -0000 1.2 +++ .cvsignore 3 Aug 2005 17:51:33 -0000 1.3 @@ -1 +1 @@ -lyx-1.3.4.tar.bz2 +lyx-1.3.6.tar.gz lyx-1.3.5-helpers.patch: Index: lyx-1.3.5-helpers.patch =================================================================== RCS file: /cvs/extras/rpms/lyx/devel/lyx-1.3.5-helpers.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- lyx-1.3.5-helpers.patch 4 Dec 2004 12:21:23 -0000 1.1 +++ lyx-1.3.5-helpers.patch 3 Aug 2005 17:51:33 -0000 1.2 @@ -5,10 +5,10 @@ # Search something to preview postscript echo $ac_n "checking for a Postscript previewer""... $ac_c" -echo "$ac_t""(gsview32 gv ghostview)" -+echo "$ac_t""(gsview32 gsview ggv kghostview gv ghostview)" ++echo "$ac_t""(evince gsview32 gsview ggv kghostview gv ghostview)" GHOSTVIEW= -for ac_prog in gsview32 gv ghostview -+for ac_prog in gsview32 gsview ggv kghostview gv ghostview ++for ac_prog in evince gsview32 gsview ggv kghostview gv ghostview do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog ; ac_word=$2 @@ -17,10 +17,10 @@ # Search for a program to preview pdf echo $ac_n "checking for a PDF preview""... $ac_c" -echo "$ac_t""(acrobat acrord32 gsview32 acroread gv ghostview xpdf)" -+echo "$ac_t""(acrobat acrord32 gsview32 gsview acroread xpdf ggv kghostview gv ghostview)" ++echo "$ac_t""(evince acrobat acrord32 acroread gsview32 gsview xpdf ggv kghostview gv ghostview)" PDF_VIEWER= -for ac_prog in acrobat acrord32 gsview32 acroread gv ghostview xpdf -+for ac_prog in acrobat acrord32 gsview32 gsview acroread xpdf ggv kghostview gv ghostview ++for ac_prog in evince acrobat acrord32 acroread gsview32 gsview xpdf ggv kghostview gv ghostview do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog ; ac_word=$2 Index: lyx.spec =================================================================== RCS file: /cvs/extras/rpms/lyx/devel/lyx.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- lyx.spec 22 May 2005 23:10:30 -0000 1.8 +++ lyx.spec 3 Aug 2005 17:51:33 -0000 1.9 @@ -1,56 +1,42 @@ # $Id$ Summary: WYSIWYM (What You See Is What You Mean) document processor -Name: lyx -Version: 1.3.5 -Release: 5%{?dist_tag} - +Name: lyx +Version: 1.3.6 +Release: 2 License: GPL -Group: Applications/Publishing -URL: http://www.lyx.org/ -Source: ftp://ftp.lyx.org/pub/lyx/stable/lyx-1.3.5.tar.bz2 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -Patch1: lyx-1.3.5-helpers.patch +Group: Applications/Publishing +Url: http://www.lyx.org/ +Source: ftp://ftp.lyx.org/pub/lyx/stable/lyx-1.3.6.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Patch1: lyx-1.3.5-helpers.patch Source1: lyx.desktop # "borrow" kde's crystal icon for lyx Source2: lyx-crystal.png BuildRequires: desktop-file-utils +BuildRequires: aiksaurus-devel BuildRequires: aspell-devel BuildRequires: tetex-latex BuildRequires: tetex-fonts -BuildRequires: tetex-xdvi -BuildRequires: tetex-dvips -BuildRequires: htmlview -BuildRequires: gsview -BuildRequires: wv # For texhash -Requires(post): tetex -Requires(postun): tetex +Requires(post): tetex-fonts +Requires(postun): tetex-fonts Requires: tetex-latex +Requires: tetex-dvips Requires: mathml-fonts -# These are just helper apps, to display ps,pdf,html content -# not *strictly* required, but what the heck +Requires: ghostscript Requires: htmlview -Requires: gsview BuildRequires: qt-devel >= 1:3.1 -%define qt_ver %(rpm -q --qf '%%{version}' qt-devel | cut -d. -f1,2) +%define qt_ver %(rpm -q --qf '%%{version}' qt-devel ) Requires: qt >= 1:%{qt_ver} -## gcc version in use? -# I *still* build for some rh73 boxes (not sure why (-: ), -# so I need this -- Rex -BuildRequires: gcc-c++ -%define gcc_ver %(rpm -q --qf '%%{version}' gcc-c++ ) -%if "%{gcc_ver}" == "2.96" -%define cxxflags -ftemplate-depth-44 -%endif - %description LyX is a modern approach to writing documents which breaks with the @@ -78,15 +64,17 @@ %build -unset LINGUAS ||: +unset LINGUAS ||: unset QTDIR ||: ; . /etc/profile.d/qt.sh -export CXXFLAGS="$RPM_OPT_FLAGS %{?cxxflags}" +%{?gcc296: export CXXFLAGS="$RPM_OPT_FLAGS -ftemplate-depth-44" } %configure \ - --program-prefix="%{?_program_prefix}" \ --with-frontend=qt \ - --with-pspell + --enable-optimization="$RPM_OPT_FLAGS" \ + --with-aiksaurus \ + --with-pspell \ + --disable-dependency-tracking make %{_smp_mflags} @@ -106,7 +94,7 @@ mv ${RPM_BUILD_ROOT}%{_datadir}/lyx/tex \ ${RPM_BUILD_ROOT}${texmf}/tex/latex/lyx -# KDE has a nice builtin crystalsvg icon, but this is for gnome +# KDE has a nice builtin crystalsvg icon, but this is for gnome's benefit install -p -m644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps/lyx.png mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications @@ -115,7 +103,7 @@ --add-category "X-Fedora" \ %{SOURCE1} -%find_lang %{name} +%find_lang %{name} || touch %{name}.lang %post @@ -124,11 +112,21 @@ # Now configure LyX cd %{_datadir}/lyx && ./configure --srcdir >& /dev/null - %postun # Fix the TeX file hash texhash >& /dev/null ||: +# Catch installed/uninstalled helpers +%triggerin -- acroread,AdobeReader_enu,evince,gsview,kdegraphics,latex2html,tetex-xdvi,wv +if [ $2 -gt 1 ]; then +cd %{_datadir}/lyx && ./configure --srcdir >& /dev/null +fi + +%triggerun -- acroread,AdobeReader_enu,evince,gsview,kdegraphics,latex2html,tetex-xdvi,wv +if [ $2 -eq 0 ]; then +cd %{_datadir}/lyx && ./configure --srcdir >& /dev/null +fi + %clean rm -rf $RPM_BUILD_ROOT @@ -141,11 +139,31 @@ %{_datadir}/pixmaps/* %{_bindir}/* %{_mandir}/man?/* -%{_datadir}/%{name}* +%{_datadir}/%{name} +%verify(not md5 size mtime) %{_datadir}/%{name}/*.lst +%verify(not md5 size mtime) %{_datadir}/%{name}/lyxrc.defaults +%verify(not md5 size mtime) %{_datadir}/%{name}/doc/LaTeXConfig.lyx +%verify(not md5 size mtime) %{_datadir}/%{name}/xfonts/PSres.upr +%verify(not md5 size mtime) %{_datadir}/%{name}/xfonts/fonts.* %{_datadir}/texmf/tex/latex/%{name} -%changelog +%changelog +* Mon Aug 01 2005 Rex Dieter 1.3.6-2 +- use triggers to configure/unconfigure helper (ps/pdf/html) apps + +* Sat Jul 23 2005 Rex Dieter 1.3.6-1 +- 1.3.6 + +* Mon May 23 2005 Rex Dieter 1.3.5-4 +- qt_immodule patch (lyx bug #1830) +- update -helpers patch to look-for/use evince (rh bug #143992) +- drop (not-strictly-required) Req's on helper apps + htmlview, gsview (rh bug #143992) +- %%configure: --with-aiksaurus +- %%configure: --enable-optimization="$$RPM_OPT_FLAGS" +- %%configure: --disable-dependancy-tracking + * Sun May 22 2005 Jeremy Katz - 1.3.5 - rebuild on all arches @@ -153,10 +171,16 @@ - rebuilt * Thu Oct 21 2004 Rex Dieter 0:1.3.5-3 -- BR: htmlview +- BR: htmlview - Requires: htmlview, gsview (so build-time-detected helper apps are available at runtime) + +* Thu Oct 21 2004 Rex Dieter 0:1.3.5-0.fdr.3 +- BR: htmlview +- Requires: htmlview, gsview (so build-time-detected helper apps are + available at runtime) + * Wed Oct 20 2004 Rex Dieter 0:1.3.5-0.fdr.2 - BR: pspell-devel -> aspell-devel - BR: tetex-* (helper detection, fonts) @@ -196,7 +220,7 @@ - Categories=Office * Mon Nov 24 2003 Rex Dieter 0:1.3.3-0.fdr.3 -- Requires: tetex-latex +- Requires: tetex-latex - support MimeType(s): application/x-lyx;text/x-lyx * Sat Nov 22 2003 Rex Dieter 0:1.3.3-0.fdr.2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/lyx/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 4 Dec 2004 12:21:23 -0000 1.3 +++ sources 3 Aug 2005 17:51:33 -0000 1.4 @@ -1 +1 @@ -f4c70d2565ba9c974b1f94fc1dfd63bf lyx-1.3.5.tar.bz2 +20fd8515cc025129d97232dd2583f35f lyx-1.3.6.tar.gz --- lyx-1.3.4-gcc34.patch DELETED --- From fedora-extras-commits at redhat.com Wed Aug 3 17:51:39 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Wed, 3 Aug 2005 13:51:39 -0400 Subject: rpms/synergy/FC-3 synergy-1.2.2-werror.patch,NONE,1.1 Message-ID: <200508031751.j73HpdLk014840@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/synergy/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14783 Added Files: synergy-1.2.2-werror.patch Log Message: Commit missing patch. synergy-1.2.2-werror.patch: --- NEW FILE synergy-1.2.2-werror.patch --- diff -Naupr synergy-1.2.2.orig/configure.in synergy-1.2.2/configure.in --- synergy-1.2.2.orig/configure.in 2005-01-01 21:52:42.000000000 +0100 +++ synergy-1.2.2/configure.in 2005-04-17 20:36:09.000000000 +0200 @@ -203,7 +203,7 @@ dnl checks for system services dnl enable maximum compiler warnings and warnings are errors. ACX_CXX_WARNINGS -ACX_CXX_WARNINGS_ARE_ERRORS +dnl ACX_CXX_WARNINGS_ARE_ERRORS dnl adjust compiler and linker variables CXXFLAGS="$CXXFLAGS $SYNERGY_CXXFLAGS $ARCH_CFLAGS" From fedora-extras-commits at redhat.com Wed Aug 3 17:51:31 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 3 Aug 2005 13:51:31 -0400 Subject: rpms/lyx import.log,1.5,1.6 Message-ID: <200508031752.j73Hq3w3014874@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/lyx In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14771 Modified Files: import.log Log Message: auto-import lyx-1.3.6-2 on branch devel from lyx-1.3.6-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/lyx/import.log,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- import.log 4 Dec 2004 12:17:31 -0000 1.5 +++ import.log 3 Aug 2005 17:51:29 -0000 1.6 @@ -2,3 +2,4 @@ lyx-1_3_4-0_fdr_6_1:HEAD:lyx-1.3.4-0.fdr.6.1.src.rpm:1099889485 lyx-1_3_4-0_fdr_6_1_92:HEAD:lyx-1.3.4-0.fdr.6.1.92.src.rpm:1099889491 lyx-1_3_5-0_fdr_3_2:FC-2:lyx-1.3.5-0.fdr.3.2.src.rpm:1102162539 +lyx-1_3_6-2:HEAD:lyx-1.3.6-2.src.rpm:1123091530 From fedora-extras-commits at redhat.com Wed Aug 3 18:17:50 2005 From: fedora-extras-commits at redhat.com (Ed Hill (edhill)) Date: Wed, 3 Aug 2005 14:17:50 -0400 Subject: rpms/nco/devel nco.spec,1.1,1.2 Message-ID: <200508031817.j73IHo87016453@cvs-int.fedora.redhat.com> Author: edhill Update of /cvs/extras/rpms/nco/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16436 Modified Files: nco.spec Log Message: remove (hopefully only temporarily) opendap support Index: nco.spec =================================================================== RCS file: /cvs/extras/rpms/nco/devel/nco.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- nco.spec 21 Jul 2005 05:43:23 -0000 1.1 +++ nco.spec 3 Aug 2005 18:17:48 -0000 1.2 @@ -1,6 +1,6 @@ Name: nco Version: 3.0.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Suite of programs for manipulating NetCDF/HDF4 files Group: Applications/Engineering License: GPL @@ -18,8 +18,12 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: netcdf-devel, libtool, automake, autoconf -BuildRequires: udunits, udunits-devel, opendap-devel +# BuildRequires: udunits, udunits-devel, opendap-devel +BuildRequires: udunits, udunits-devel BuildRequires: curl-devel, libxml2-devel, librx-devel +# Unfortunately, opendap does not build on FC-4 or later. When +# its fixed, opendap-devel will be listed as a BuildRequires. +# In the mean time, nco will be built without opendap support. %package devel Summary: Development files for NCO @@ -102,6 +106,9 @@ %changelog +* Wed Aug 3 2005 Ed Hill - 3.0.1-4 +- remove (hopefully only temporarily) opendap support + * Thu Jul 21 2005 Ed Hill - 3.0.1-3 - add LICENSE file From fedora-extras-commits at redhat.com Wed Aug 3 18:17:30 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 3 Aug 2005 14:17:30 -0400 Subject: rpms/gsview import.log,1.6,1.7 Message-ID: <200508031818.j73II005016458@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gsview In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16390 Modified Files: import.log Log Message: auto-import gsview-4.7-3 on branch devel from gsview-4.7-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/gsview/import.log,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- import.log 18 Feb 2005 18:00:34 -0000 1.6 +++ import.log 3 Aug 2005 18:17:28 -0000 1.7 @@ -3,3 +3,4 @@ gsview-4_6-0_fdr_8_1:FC-1:gsview-4.6-0.fdr.8.1.src.rpm:1102162863 gsview-4_6-0_fdr_8_2:FC-2:gsview-4.6-0.fdr.8.2.src.rpm:1102162917 gsview-4_6-9:HEAD:gsview-4.6-9.src.rpm:1108749621 +gsview-4_7-3:HEAD:gsview-4.7-3.src.rpm:1123093049 From fedora-extras-commits at redhat.com Wed Aug 3 18:17:30 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 3 Aug 2005 14:17:30 -0400 Subject: rpms/gsview/devel gsview-4.7-dllversion.patch, NONE, 1.1 gsview-4.7-letterpaper.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 gsview-4.6-libgs.patch, 1.1, 1.2 gsview.spec, 1.7, 1.8 sources, 1.2, 1.3 Message-ID: <200508031818.j73II0RK016469@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gsview/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16390/devel Modified Files: .cvsignore gsview-4.6-libgs.patch gsview.spec sources Added Files: gsview-4.7-dllversion.patch gsview-4.7-letterpaper.patch Log Message: auto-import gsview-4.7-3 on branch devel from gsview-4.7-3.src.rpm gsview-4.7-dllversion.patch: --- NEW FILE gsview-4.7-dllversion.patch --- --- gsview-4.7/src/cdll.c.dllversion 2002-02-09 21:46:38.000000000 -0600 +++ gsview-4.7/src/cdll.c 2005-06-23 09:05:39.000000000 -0500 @@ -106,6 +106,10 @@ } dll->revision_number = rv.revision; + /* Hack because FC5's ghostscript-8.15 reports 81500 instead of 815 -- Rex */ + if ( dll->revision_number > (GS_REVISION_MIN*100) ) + dll->revision_number = (long)(dll->revision_number / 100); + if ( (dll->revision_number < GS_REVISION_MIN) || (dll->revision_number > GS_REVISION_MAX) ) { gs_addmessf("\nWrong version of DLL found.\n\ gsview-4.7-letterpaper.patch: --- NEW FILE gsview-4.7-letterpaper.patch --- --- gsview-4.7/src/gvcinit.c.letterpaper 2005-03-01 03:51:38.000000000 -0600 +++ gsview-4.7/src/gvcinit.c 2005-06-23 10:41:42.000000000 -0500 @@ -319,13 +319,13 @@ option.button_show = TRUE; option.fit_page = FALSE; /* Changed after 2.1 */ option.safer = TRUE; - option.media = IDM_A4; - strcpy(option.medianame, "A4"); + option.media = IDM_LETTER; + strcpy(option.medianame, "Letter"); option.media_rotate = FALSE; option.user_width_warn = 5669; /* 2 metres */ option.user_height_warn = 5669; - option.user_width = 595; /* A4 width 210mm */ - option.user_height = 842; /* A4 height 297mm */ + option.user_width = 612; /* Letter width 8.5in */ + option.user_height = 792; /* Letter height 11in */ option.epsf_clip = FALSE; option.epsf_warn = FALSE; option.ignore_dsc = FALSE; Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gsview/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:30:19 -0000 1.2 +++ .cvsignore 3 Aug 2005 18:17:28 -0000 1.3 @@ -1 +1 @@ -gsview-4.6.tar.gz +gsview-4.7.tar.gz gsview-4.6-libgs.patch: Index: gsview-4.6-libgs.patch =================================================================== RCS file: /cvs/extras/rpms/gsview/devel/gsview-4.6-libgs.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gsview-4.6-libgs.patch 4 Dec 2004 12:25:30 -0000 1.1 +++ gsview-4.6-libgs.patch 3 Aug 2005 18:17:28 -0000 1.2 @@ -5,7 +5,7 @@ #define GS_PRODUCT "AFPL Ghostscript" #define GS_REVISION_MIN 704 -#define GS_REVISION 704 -+#define GS_REVISION 707 ++#define GS_REVISION @@GS_REVISION@@ #define GS_REVISION_MAX 919 #ifdef _Windows @@ -14,7 +14,7 @@ #define INIFILE "gsview.ini" #define GS_EXENAME "gs" -#define GS_DLLNAME "libgs.so" -+#define GS_DLLNAME "libgs.so.7" ++#define GS_DLLNAME "libgs.so.@@SOMAJOR@@" #else #define GS_EXENAME "gsos2.exe" #define GS_DLLNAME "gsdll2.dll" Index: gsview.spec =================================================================== RCS file: /cvs/extras/rpms/gsview/devel/gsview.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- gsview.spec 6 Apr 2005 22:11:39 -0000 1.7 +++ gsview.spec 3 Aug 2005 18:17:28 -0000 1.8 @@ -1,47 +1,67 @@ # $Id$ Summary: PostScript and PDF previewer -Name: gsview -Version: 4.6 -Release: 10 +Name: gsview +Version: 4.7 +Release: 3 License: Aladdin Free Public License, Ghostgum Software Pty Ltd -Group: Applications/Publishing -Source: ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/ghostgum/gsview-4.6.tar.gz -URL: http://www.cs.wisc.edu/~ghost/gsview/ +Group: Applications/Publishing +Source: ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/ghostgum/gsview-4.7.tar.gz +URL: http://www.cs.wisc.edu/~ghost/gsview/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Source1: gsview.desktop BuildRequires: gtk+-devel BuildRequires: desktop-file-utils - +BuildRequires: sed >= 4.0 +BuildRequires: ghostscript-devel >= 7.07-15.3 +%define gs_ver %{expand:%%(rpm -q --qf '%%{VERSION}' ghostscript-devel | cut -d. -f-2 )} +%define gs_ver1 %{expand:%%(echo %{gs_ver} | cut -d. -f1)} +%if "%{?gs_ver1}" == "7" # See http://www.redhat.com/archives/fedora-devel-list/2004-August/msg00068.html Requires: ghostscript >= 7.07-15.3 -# Stick with this one for now, allowing for users with custom/older builds to provide libgs -# doesn't work on x86_64 (see http://bugzilla.redhat.com/bugzilla/146223 ) -#Requires: libgs.so.7 +%endif ## Use htmlview instead of hard-coded mozilla Patch1: gsview-4.4-htmlview.patch -# default to libgs.so.7 instead of libgs.so -# will need to rework when/if ghostscript >= 8.0 comes around. (-: +# default to libgs.so.@@SOMAJOR@@ instead of libgs.so Patch2: gsview-4.6-libgs.patch +# attempt to allow/use ghostscript-8.15 reported value of 81500. +# http://bugs.erdhat.com/159912 +Patch3: gsview-4.7-dllversion.patch +# Change Paper default A4 -> Letter +Patch4: gsview-4.7-letterpaper.patch %description GSview is a graphical interface for Ghostscript. -Ghostscript is an interpreter for the PostScript page +Ghostscript is an interpreter for the PostScript page description language used by laser printers. -For documents following the Adobe PostScript Document Structuring +For documents following the Adobe PostScript Document Structuring Conventions, GSview allows selected pages to be viewed or printed. %prep -%setup -q +%setup -q + +echo "gs_ver %{gs_ver}, gs_ver1 %{gs_ver1}" %patch1 -p1 -b .htmlview -%patch2 -p1 -b .libgs7 +%patch2 -p1 -b .libgs +%patch3 -p1 -b .dllversion +%patch4 -p1 -b .letterpaper + +# Determine GS_REVISION/SOMAJOR and substitute values (see patch2) +GS_REVISION=%(echo %{gs_ver} | tr -d '.' ) +sed -i -e "s|@@GS_REVISION@@|${GS_REVISION}|g" src/gvcver.h +# Sanity check to make sure file exists +if [ ! -f "%(ls %{_libdir}/libgs.so.?)" ]; then + echo "Error: %{_libdir}/libgs.so.? doesn't exist"; exit 1 +fi +SOMAJOR=$(basename %{_libdir}/libgs.so.? | sed -e 's at libgs.so.@@' ) +sed -i -e "s|@@SOMAJOR@@|${SOMAJOR}|g" src/gvcver.h %build @@ -71,10 +91,10 @@ desktop-file-install --vendor fedora \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --add-category X-Fedora \ - %{SOURCE1} + %{SOURCE1} ## Unpackaged files -# nuke depcrecated epstool +# nuke depcrecated epstool, to be (hopefully) packaged separately... someday. rm -f $RPM_BUILD_ROOT{%{_bindir}/epstool,%{_docdir}/*/epstool*} @@ -86,7 +106,7 @@ %{_mandir}/man*/* %{_datadir}/applications/*.desktop %{_datadir}/pixmaps/*.png -%doc %{_docdir}/* +%doc %{_docdir}/* %clean @@ -94,6 +114,16 @@ %changelog +* Thu Jul 28 2005 Rex Dieter 4.7-3 +- add file:// to help URL. + +* Thu Jun 23 2005 Rex Dieter 4.7-2 +- fixes for ghostscript-8.15 (#159912) +- Change paper default A4->Letter + +* Wed Apr 20 2005 Rex Dieter 4.7-1 +- 4.7 + * Fri Apr 7 2005 Michael Schwendt - rebuilt @@ -124,8 +154,8 @@ * Sat Apr 24 2004 Rex Dieter 0:4.6-0.fdr.3 - don't include old epstool (to be packaged separately) -- gsview.desktop: - MimeType=image/x-eps;application/postscript;application/pdf; +- gsview.desktop: + MimeType=image/x-eps;application/postscript;application/pdf; Categories=Application;GTK;Graphics;Viewer;Publishing; * Thu Apr 01 2004 Rex Dieter 0:4.6-0.fdr.2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gsview/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 04:30:19 -0000 1.2 +++ sources 3 Aug 2005 18:17:28 -0000 1.3 @@ -1 +1 @@ -35cb5e421faca49eb70c426354e41ba8 gsview-4.6.tar.gz +ce6288cc8597d6b918498d6d02654bb7 gsview-4.7.tar.gz From fedora-extras-commits at redhat.com Wed Aug 3 18:23:05 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 3 Aug 2005 14:23:05 -0400 Subject: rpms/gsview/devel gsview.spec,1.8,1.9 Message-ID: <200508031823.j73IN5oN016574@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gsview/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16557 Modified Files: gsview.spec Log Message: fix a couple of typos Index: gsview.spec =================================================================== RCS file: /cvs/extras/rpms/gsview/devel/gsview.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- gsview.spec 3 Aug 2005 18:17:28 -0000 1.8 +++ gsview.spec 3 Aug 2005 18:23:03 -0000 1.9 @@ -29,7 +29,7 @@ # default to libgs.so.@@SOMAJOR@@ instead of libgs.so Patch2: gsview-4.6-libgs.patch # attempt to allow/use ghostscript-8.15 reported value of 81500. -# http://bugs.erdhat.com/159912 +# http://bugs.redhat.com/159912 Patch3: gsview-4.7-dllversion.patch # Change Paper default A4 -> Letter Patch4: gsview-4.7-letterpaper.patch @@ -46,8 +46,6 @@ %prep %setup -q -echo "gs_ver %{gs_ver}, gs_ver1 %{gs_ver1}" - %patch1 -p1 -b .htmlview %patch2 -p1 -b .libgs %patch3 -p1 -b .dllversion From fedora-extras-commits at redhat.com Wed Aug 3 18:28:44 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 3 Aug 2005 14:28:44 -0400 Subject: rpms/kile import.log,1.6,1.7 Message-ID: <200508031828.j73ISi37016649@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/kile In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16618 Modified Files: import.log Log Message: auto-import kile-1.8.1-1 on branch devel from kile-1.8.1-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/kile/import.log,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- import.log 15 Jan 2005 09:53:21 -0000 1.6 +++ import.log 3 Aug 2005 18:28:42 -0000 1.7 @@ -3,3 +3,4 @@ kile-1_6_3-0_fdr_1_2:HEAD:kile-1.6.3-0.fdr.1.2.src.rpm:1099888767 kile-1_7_1-3:HEAD:kile-1.7.1-3.src.rpm:1105630409 kile-1_7_1-0_fdr_3_2:FC-2:kile-1.7.1-0.fdr.3.2.src.rpm:1105782794 +kile-1_8_1-1:HEAD:kile-1.8.1-1.src.rpm:1123093735 From fedora-extras-commits at redhat.com Wed Aug 3 18:28:45 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 3 Aug 2005 14:28:45 -0400 Subject: rpms/kile/devel .cvsignore, 1.3, 1.4 kile.spec, 1.8, 1.9 sources, 1.3, 1.4 kile-1.7-dt.patch, 1.1, NONE Message-ID: <200508031828.j73ISjU1016657@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/kile/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16618/devel Modified Files: .cvsignore kile.spec sources Removed Files: kile-1.7-dt.patch Log Message: auto-import kile-1.8.1-1 on branch devel from kile-1.8.1-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kile/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 13 Jan 2005 15:32:49 -0000 1.3 +++ .cvsignore 3 Aug 2005 18:28:43 -0000 1.4 @@ -1 +1 @@ -kile-1.7.1.tar.bz2 +kile-1.8.1.tar.bz2 Index: kile.spec =================================================================== RCS file: /cvs/extras/rpms/kile/devel/kile.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- kile.spec 22 May 2005 23:55:08 -0000 1.8 +++ kile.spec 3 Aug 2005 18:28:43 -0000 1.9 @@ -1,31 +1,19 @@ -#$Id$ +#$iD: kile.spec,v 1.49 2005/06/22 16:34:35 rexdieter Exp $ -# for optionally using destkop-file-install (for fc2 mostly) -%define desktop_file 1 - -Name: kile +Name: kile Summary: (La)TeX source editor and TeX shell -Version: 1.7.1 -Release: 5%{?dist_tag} +Version: 1.8.1 +Release: 1 -Group: Applications/Publishing -URL: http://kile.sourceforge.net/ -Source: http://dl.sourceforge.net/sourceforge/kile/kile-1.7.1.tar.bz2 License: GPL -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root - -# Append ; to .desktop Categories -Patch1: kile-1.7-dt.patch +Group: Applications/Publishing +URL: http://kile.sourceforge.net/ +Source0: http://dl.sourceforge.net/sourceforge/kile/kile-1.8.1.tar.bz2 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gettext BuildRequires: libtool -%{?desktop_file:BuildRequires: desktop-file-utils} - -# workarounds for missing Requires in fc1's qt-devel, kdelibs-devel -# and to make fedora.us's buildsystem happy -BuildRequires: XFree86-devel -BuildRequires: libpng-devel zlib-devel libjpeg-devel -BuildRequires: arts-devel libart_lgpl-devel fam-devel +BuildRequires: desktop-file-utils Requires: tetex-latex ## Optional, but recommended @@ -33,13 +21,21 @@ #Requires: xfig BuildRequires: qt-devel >= 1:3.3 -%define qt_ver %(rpm -q --qf '%%{version}' qt-devel | cut -d. -f-2) +%define qt_ver %(rpm -q --qf '%%{version}' qt-devel ) Requires: qt >= 1:%{qt_ver} - -BuildRequires: kdelibs-devel >= 6:3.2 -%define kdelibs_ver %(rpm -q --qf '%%{version}' kdelibs-devel | cut -d. -f-2 ) +BuildRequires: kdelibs-devel >= 6:3.3 +%define kdelibs_ver %(rpm -q --qf '%%{version}' kdelibs-devel ) Requires: kdelibs >= 6:%{kdelibs_ver} +%if "%{is_release}" != "1" +BuildRequires: autoconf >= 2.53 +BuildRequires: automake17 +%endif + +# kile-i18n is no longer separate pkg +Obsoletes: kile-i18n < %{epoch}:%{version}-%{releaes} +#Provides: kile-i18n = %{epoch}:%{version}-%{release} + %description Kile is a user friendly (La)TeX editor. The main features are: * Compile, convert and view your document with one click. @@ -54,19 +50,20 @@ %prep -%setup -q +%setup -q -n %{name}-%{version}%{?beta} -%{?desktop_file:%patch1 -p1 -b .dt} +%if "%{is_release}" != "1" + make -f admin/Makefile.common cvs +%endif %build unset QTDIR || : ; . /etc/profile.d/qt.sh %configure \ - --program-prefix="%{?_program_prefix}" \ --disable-rpath \ %{?debug: --enable-debug --enable-warnings } \ - %{!?debug: --disable-debug --disable-warnings --enable-final } + %{!?debug: --disable-debug --disable-warnings --enable-final --disable-dependency-tracking } make %{?_smp_mflags} @@ -76,42 +73,31 @@ make install%{!?debug_package:-strip} DESTDIR=$RPM_BUILD_ROOT -# Replace absolute symlinks with relative ones -pushd $RPM_BUILD_ROOT%{_docdir}/HTML -for lang in *; do - if [ -d $lang ]; then - pushd $lang - for i in *; do - [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common - done - popd - fi +## File lists +# locale's +%find_lang %{name} || touch %{name}.lang +# HTML +HTML_DIR=$(kde-config --expandvars --install html) +if [ -d $RPM_BUILD_ROOT$HTML_DIR ]; then +for lang_dir in $RPM_BUILD_ROOT$HTML_DIR/* ; do + lang=$(basename $lang_dir) + echo "%lang($lang) %doc $HTML_DIR/$lang/*" >> %{name}.lang done -popd - -%if "%{?desktop_file}" == "1" -mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications -desktop-file-install --delete-original --vendor fedora \ - --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - --add-category "Application" \ - --add-category "X-Fedora" \ - $RPM_BUILD_ROOT%{_datadir}/app*/*/kile.desktop -%endif +fi -## Unpackaged/conflicting files +## conflicting files (with kde > 3.2) rm -rf $RPM_BUILD_ROOT%{_datadir}/apps/katepart -%files +%files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS ChangeLog README TODO -%lang(en) %doc %{_datadir}/doc/HTML/en/* %{_bindir}/* %{_datadir}/apps/kile %{_datadir}/apps/kconf_update/kile* -%config %{_datadir}/config.kcfg/kile.kcfg -%{_datadir}/icons/*/*/*/*.png -%{_datadir}/applications%{!?desktop_file:/kde}/*.desktop +%config %{_datadir}/config*/* +%{_datadir}/icons/*/*/*/* +%{_datadir}/appl*/*/*.desktop %{_datadir}/mimelnk/*/*.desktop @@ -120,6 +106,15 @@ %changelog +* Thu Jun 02 2005 Rex Dieter 1.8.1-1 +- 1.8.1 + +* Tue May 31 2005 Rex Dieter 1.8-2 +- Obsoletes: kile-i18n + +* Mon May 23 2005 Rex Dieter 1.8-1 +- 1.8 + * Sun May 22 2005 Jeremy Katz - 1.7.1 - rebuild on all arches @@ -195,7 +190,7 @@ - fix missing latexhelp.html * Thu Sep 11 2003 Rex Dieter 0:1.5.2-0.fdr.3 -- patch1 +- patch1 * Wed Aug 20 2003 Rex Dieter 0:1.5.2-0.fdr.2 - 1.5.2 @@ -216,7 +211,7 @@ * Fri Apr 25 2003 Rex Dieter 1.40-1.3 - remove %%doc NEWS -* Mon Mar 03 2003 Rex Dieter 1.40-1.2 +* Mon Mar 03 2003 Rex Dieter 1.40-1.2 - version: 1.4 -> 1.40 so silly rpm knows that 1.40 is newer than 1.32 - use epochs in Obsoletes/Provides/Requires. Index: sources =================================================================== RCS file: /cvs/extras/rpms/kile/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 13 Jan 2005 15:32:49 -0000 1.3 +++ sources 3 Aug 2005 18:28:43 -0000 1.4 @@ -1 +1 @@ -940fba9dc62e2687856885dffccf6e80 kile-1.7.1.tar.bz2 +9ac4cd9294c6aff1acca1def68923a7d kile-1.8.1.tar.bz2 --- kile-1.7-dt.patch DELETED --- From paul at city-fan.org Wed Aug 3 18:29:05 2005 From: paul at city-fan.org (Paul Howarth) Date: Wed, 03 Aug 2005 19:29:05 +0100 Subject: rpms/gsview/devel gsview.spec,1.8,1.9 In-Reply-To: <200508031823.j73IN5oN016574@cvs-int.fedora.redhat.com> References: <200508031823.j73IN5oN016574@cvs-int.fedora.redhat.com> Message-ID: <1123093745.2851.370.camel@laurel.intra.city-fan.org> On Wed, 2005-08-03 at 14:23 -0400, Rex Dieter wrote: > Author: rdieter > > Update of /cvs/extras/rpms/gsview/devel > In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16557 > > Modified Files: > gsview.spec > Log Message: > fix a couple of typos > > > > Index: gsview.spec > =================================================================== > RCS file: /cvs/extras/rpms/gsview/devel/gsview.spec,v > retrieving revision 1.8 > retrieving revision 1.9 > diff -u -r1.8 -r1.9 > --- gsview.spec 3 Aug 2005 18:17:28 -0000 1.8 > +++ gsview.spec 3 Aug 2005 18:23:03 -0000 1.9 > @@ -29,7 +29,7 @@ > # default to libgs.so.@@SOMAJOR@@ instead of libgs.so > Patch2: gsview-4.6-libgs.patch > # attempt to allow/use ghostscript-8.15 reported value of 81500. > -# http://bugs.erdhat.com/159912 > +# http://bugs.redhat.com/159912 bugs.redhat.com does not resolve to an IP address, at least not on the Internet. Suggest http://bugzilla.redhat.com/159912 Paul. -- Paul Howarth From fedora-extras-commits at redhat.com Wed Aug 3 18:33:12 2005 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Wed, 3 Aug 2005 14:33:12 -0400 Subject: owners owners.list,1.43,1.44 Message-ID: <200508031833.j73IXCJh016728@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16706 Modified Files: owners.list Log Message: Description: Change description of inadyn to fit with summary line in rpm. Add pdftk. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- owners.list 3 Aug 2005 11:52:39 -0000 1.43 +++ owners.list 3 Aug 2005 18:33:10 -0000 1.44 @@ -298,7 +298,7 @@ Fedora Extras|iftop|Command line tool that displays bandwidth usage on an interface|gauret at free.fr|extras-qa at fedoraproject.org| Fedora Extras|iiimf-le-simplehangul|Romanized Korean Hangul language engine for IIIMF|wtogami at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|imlib2|A graphic library for file loading, saving, rendering, and manipulation|anvil at livna.org|extras-qa at fedoraproject.org| -Fedora Extras|inadyn|A Dynamic DNS-Client|Jochen at herr-schmitt.de|extras-qa at fedoraproject.org| +Fedora Extras|inadyn|A Dynamic DNS Client|Jochen at herr-schmitt.de|extras-qa at fedoraproject.org| Fedora Extras|inkscape|A vector-based drawing program using SVG|compton at pcompton.com|extras-qa at fedoraproject.org| Fedora Extras|inti|Integrated Foundation Classes for GNOME and GTK+|gemi at bluewin.ch|extras-qa at fedoraproject.org| Fedora Extras|Inventor|SGI Open Inventor (TM)|rc040203 at freenet.de|extras-qa at fedoraproject.org| @@ -506,6 +506,7 @@ Fedora Extras|pcsc-lite|PC/SC Lite smart card framework and applications|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|pcsc-perl|Perl interface to the PC/SC smart card library|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|pdfjam|Utilities for join, rotate and align PDFs|jpo at di.uminho.pt|extras-qa at fedoraproject.org| +Fedora Extras|pdftk|The PDF Tool Kit|Jochen at herr-schmitt.de|extras-qa at fedoraproject.org| Fedora Extras|pdftohtml|A PDF to HTML converter|gauret at free.fr|extras-qa at fedoraproject.org| Fedora Extras|perl-AppConfig|Perl module for reading configuration files|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Archive-Zip|Perl library for accessing Zip archives|anvil at livna.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Wed Aug 3 18:35:02 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 3 Aug 2005 14:35:02 -0400 Subject: rpms/kile/devel kile.spec,1.9,1.10 Message-ID: <200508031835.j73IZ2Lj016760@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/kile/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16743 Modified Files: kile.spec Log Message: - x86_64 fix (bug #161343) - remove some crud Index: kile.spec =================================================================== RCS file: /cvs/extras/rpms/kile/devel/kile.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- kile.spec 3 Aug 2005 18:28:43 -0000 1.9 +++ kile.spec 3 Aug 2005 18:35:00 -0000 1.10 @@ -27,11 +27,6 @@ %define kdelibs_ver %(rpm -q --qf '%%{version}' kdelibs-devel ) Requires: kdelibs >= 6:%{kdelibs_ver} -%if "%{is_release}" != "1" -BuildRequires: autoconf >= 2.53 -BuildRequires: automake17 -%endif - # kile-i18n is no longer separate pkg Obsoletes: kile-i18n < %{epoch}:%{version}-%{releaes} #Provides: kile-i18n = %{epoch}:%{version}-%{release} @@ -52,13 +47,11 @@ %prep %setup -q -n %{name}-%{version}%{?beta} -%if "%{is_release}" != "1" - make -f admin/Makefile.common cvs -%endif - %build unset QTDIR || : ; . /etc/profile.d/qt.sh +# x86_64 fix (bug #161343) +export QTLIB=${QTDIR}/lib;QTINC=${QTDIR}/include %configure \ --disable-rpath \ @@ -108,6 +101,7 @@ %changelog * Thu Jun 02 2005 Rex Dieter 1.8.1-1 - 1.8.1 +- x86_64 fix (bug #161343) * Tue May 31 2005 Rex Dieter 1.8-2 - Obsoletes: kile-i18n From fedora-extras-commits at redhat.com Wed Aug 3 18:40:53 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 3 Aug 2005 14:40:53 -0400 Subject: rpms/gtk-qt-engine import.log,1.2,1.3 Message-ID: <200508031840.j73IeroO016841@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gtk-qt-engine In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16810 Modified Files: import.log Log Message: auto-import gtk-qt-engine-0.60-1 on branch devel from gtk-qt-engine-0.60-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/gtk-qt-engine/import.log,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- import.log 8 Nov 2004 04:31:25 -0000 1.2 +++ import.log 3 Aug 2005 18:40:51 -0000 1.3 @@ -1 +1,2 @@ gtk-qt-engine-0_41-0_fdr_4_2:HEAD:gtk-qt-engine-0.41-0.fdr.4.2.src.rpm:1099888285 +gtk-qt-engine-0_60-1:HEAD:gtk-qt-engine-0.60-1.src.rpm:1123094476 From fedora-extras-commits at redhat.com Wed Aug 3 18:40:53 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 3 Aug 2005 14:40:53 -0400 Subject: rpms/gtk-qt-engine/devel .cvsignore, 1.2, 1.3 gtk-qt-engine.spec, 1.5, 1.6 sources, 1.2, 1.3 gtk-qt-engine-x86_64.patch, 1.1, NONE Message-ID: <200508031840.j73Ier71016849@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gtk-qt-engine/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16810/devel Modified Files: .cvsignore gtk-qt-engine.spec sources Removed Files: gtk-qt-engine-x86_64.patch Log Message: auto-import gtk-qt-engine-0.60-1 on branch devel from gtk-qt-engine-0.60-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gtk-qt-engine/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:31:25 -0000 1.2 +++ .cvsignore 3 Aug 2005 18:40:51 -0000 1.3 @@ -1 +1 @@ -gtk-qt-engine-0.41.tar.bz2 +gtk-qt-engine-0.6.tar.bz2 Index: gtk-qt-engine.spec =================================================================== RCS file: /cvs/extras/rpms/gtk-qt-engine/devel/gtk-qt-engine.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- gtk-qt-engine.spec 6 Apr 2005 22:11:39 -0000 1.5 +++ gtk-qt-engine.spec 3 Aug 2005 18:40:51 -0000 1.6 @@ -1,46 +1,43 @@ # $Id$ -Summary: Allow GTK to use Qt widget styles -Name: gtk-qt-engine -Group: User Interface/Desktops -Version: 0.41 -Release: 6%{?dist_tag} +%define real_ver 0.6 + +Summary: A project allowing GTK to use Qt widget styles. +Name: gtk-qt-engine +Group: User Interface/Desktops +Version: 0.60 +Release: 1 License: GPL -Source: http://www.freedesktop.org/Software/gtk-qt/gtk-qt-engine-0.41.tar.bz2 -Patch0: %{name}-x86_64.patch -URL: http://www.freedesktop.org/Software/gtk-qt +Source: http://www.freedesktop.org/~davidsansome/gtk-qt-engine-0.6.tar.bz2 +URL: http://www.freedesktop.org/Software/gtk-qt BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: gtk2-devel >= 2.2 -BuildRequires: qt-devel >= 1:3.1 # workaround for stock qt-devel's missing deps BuildRequires: libpng-devel libmng-devel libjpeg-devel -%define qt_ver %(rpm -q --qf '%%{version}' qt-devel | cut -d. -f1,2) + +BuildRequires: qt-devel >= 1:3.3 +%define qt_ver %(rpm -q --qf '%%{version}' qt-devel ) Requires: qt >= 1:%{qt_ver} -BuildRequires: kdelibs-devel >= 6:3.1 -%define kdelibs_ver %(rpm -q --qf '%%{version}' kdelibs-devel | cut -d. -f1,2 ) +BuildRequires: kdelibs-devel >= 6:3.3 +%define kdelibs_ver %(rpm -q --qf '%%{version}' kdelibs-devel ) Requires: kdelibs >= 6:%{kdelibs_ver} - -# workarounds for missing deps in stock qt-devel/kdelibs-devel -BuildRequires: libpng-devel libmng-devel libjpeg-devel - -# 0.41 tarball runs autoheader for some reason -- Rex -BuildRequires: autoconf +## For KDE Control center (??) +## Not strictly required, leave out for now. -- Rex +#Requires: kdebase %description The GTK-Qt Theme Engine is a project allowing GTK to use Qt widget styles. -It behaves like a normal GTK theme engine, but calls functions from Qt -instead of doing the drawing itself. +It behaves like a normal GTK theme engine, but calls functions from Qt +instead of doing the drawing itself. %prep -%setup -q -%ifarch x86_64 -%patch0 -%endif +%setup -q -n %{name}-%{real_ver} + %build unset QTDIR || : ; . /etc/profile.d/qt.sh @@ -48,9 +45,9 @@ %configure \ --disable-rpath \ %{?debug: --enable-debug --enable-warnings } \ - %{!?debug: --disable-dependency-tracking --disable-debug --disable-warnings --enable-final } + %{!?debug: --disable-debug --disable-warnings } -make %{?_smp_mflags} QTDIR=$QTDIR +make %{?_smp_mflags} %install @@ -59,7 +56,7 @@ make install%{!?debug_package:-strip} DESTDIR=$RPM_BUILD_ROOT ## Unpackaged files -rm -rf $RPM_BUILD_ROOT%{_prefix}/lib/menu +rm -rf $RPM_BUILD_ROOT%{_libdir}/menu %clean @@ -70,17 +67,23 @@ %defattr(-,root,root) %doc AUTHORS ChangeLog README %{_datadir}/themes/Qt +%{_datadir}/gtk-qt-engine +%{_datadir}/applications/*.desktop +%{_datadir}/applnk/Settings/*/*.desktop %{_libdir}/gtk-2.0/*/engines/* -%{_libdir}/kde3/kcm_kcmgtk.[ls][ao] -%{_datadir}/applnk/Settings/LookNFeel/kcmgtk.desktop +%{_libdir}/kde3/kcm_*.* + +%changelog +* Wed Apr 06 2005 Rex Dieter 0.60-1 +- cleanup for Extras -%changelog -* Fri Apr 7 2005 Michael Schwendt -- rebuilt +* Thu Jan 20 2005 Rex Dieter 0.60-0.fdr.1 +- 0.6 -* Sat Feb 12 2005 Thorsten Leemhuis 0.41-5 -- Add patch to fix compile-error on x86_64; Patch was found in a suse srpm +* Tue Aug 31 2004 Rex Dieter 0.50-0.fdr.1 +- 0.5, using Virtual version 0.50 to make sure rpm treats it + as newer than 0.41 * Tue Jul 13 2004 Rex Dieter 0.41-0.fdr.4 - workarounds for missing deps in stock qt-devel/kdelibs-devel Index: sources =================================================================== RCS file: /cvs/extras/rpms/gtk-qt-engine/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 04:31:25 -0000 1.2 +++ sources 3 Aug 2005 18:40:51 -0000 1.3 @@ -1 +1 @@ -d6f9fcfb6aa8a0445c81ea893144591d gtk-qt-engine-0.41.tar.bz2 +9c02c95a6e8d304b1f2801429759e1c0 gtk-qt-engine-0.6.tar.bz2 --- gtk-qt-engine-x86_64.patch DELETED --- From fedora-extras-commits at redhat.com Wed Aug 3 18:43:12 2005 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Wed, 3 Aug 2005 14:43:12 -0400 Subject: owners owners.list,1.44,1.45 Message-ID: <200508031843.j73IhC3Y016940@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16921 Modified Files: owners.list Log Message: Add perl-BerkeleyDB. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- owners.list 3 Aug 2005 18:33:10 -0000 1.44 +++ owners.list 3 Aug 2005 18:43:09 -0000 1.45 @@ -511,6 +511,7 @@ Fedora Extras|perl-AppConfig|Perl module for reading configuration files|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Archive-Zip|Perl library for accessing Zip archives|anvil at livna.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Authen-SASL|SASL Authentication framework for Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-BerkeleyDB|Perl interface to Berkeley DB|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-bioperl|A package of public domain Perl tools for computational molecular biology|thm at duke.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Cache-Cache|Cache-Cache module for perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-CGI-Simple|Simple totally OO CGI interface that is CGI.pm compliant|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Wed Aug 3 18:44:56 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 3 Aug 2005 14:44:56 -0400 Subject: rpms/gtk-qt-engine/devel gtk-qt-engine-x86_64.patch, 1.2, 1.3 gtk-qt-engine.spec, 1.6, 1.7 Message-ID: <200508031844.j73IiuJq016985@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gtk-qt-engine/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16963 Modified Files: gtk-qt-engine.spec Added Files: gtk-qt-engine-x86_64.patch Log Message: keep (unused currently) x86_64 patch around in case we still need it gtk-qt-engine-x86_64.patch: Index: gtk-qt-engine-x86_64.patch =================================================================== RCS file: gtk-qt-engine-x86_64.patch diff -N gtk-qt-engine-x86_64.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ gtk-qt-engine-x86_64.patch 3 Aug 2005 18:44:54 -0000 1.3 @@ -0,0 +1,13 @@ +--- kcm_gtk/Makefile.am ++++ kcm_gtk/Makefile.am +@@ -1,9 +1,7 @@ + INCLUDES = $(all_includes) + METASOURCES = AUTO + +-# Install this plugin in the KDE modules directory +-kcmgtkmoduledir = $(KDE_PREFIX)/lib/kde3/ +-kcmgtkmodule_LTLIBRARIES = kcm_kcmgtk.la ++kde_module_LTLIBRARIES = kcm_kcmgtk.la + + kcm_kcmgtk_la_SOURCES = kcmgtkwidget.ui kcmgtk.cpp + kcm_kcmgtk_la_LIBADD = $(LIB_KDEUI) Index: gtk-qt-engine.spec =================================================================== RCS file: /cvs/extras/rpms/gtk-qt-engine/devel/gtk-qt-engine.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- gtk-qt-engine.spec 3 Aug 2005 18:40:51 -0000 1.6 +++ gtk-qt-engine.spec 3 Aug 2005 18:44:54 -0000 1.7 @@ -13,6 +13,9 @@ URL: http://www.freedesktop.org/Software/gtk-qt BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +# Keep unused patch around in case we still need it -- Rex +Patch0: %{name}-x86_64.patch + BuildRequires: gtk2-devel >= 2.2 # workaround for stock qt-devel's missing deps BuildRequires: libpng-devel libmng-devel libjpeg-devel From fedora-extras-commits at redhat.com Wed Aug 3 18:49:25 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 3 Aug 2005 14:49:25 -0400 Subject: rpms/gsview/devel gsview.spec,1.9,1.10 Message-ID: <200508031849.j73InPJK017054@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gsview/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17028/gsview/devel Modified Files: gsview.spec Log Message: use standard/defaulit BuildRoot Index: gsview.spec =================================================================== RCS file: /cvs/extras/rpms/gsview/devel/gsview.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- gsview.spec 3 Aug 2005 18:23:03 -0000 1.9 +++ gsview.spec 3 Aug 2005 18:49:23 -0000 1.10 @@ -9,7 +9,7 @@ Group: Applications/Publishing Source: ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/ghostgum/gsview-4.7.tar.gz URL: http://www.cs.wisc.edu/~ghost/gsview/ -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source1: gsview.desktop From fedora-extras-commits at redhat.com Wed Aug 3 18:49:26 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 3 Aug 2005 14:49:26 -0400 Subject: rpms/gtk-qt-engine/devel gtk-qt-engine.spec,1.7,1.8 Message-ID: <200508031849.j73InQWk017063@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gtk-qt-engine/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17028/gtk-qt-engine/devel Modified Files: gtk-qt-engine.spec Log Message: use standard/defaulit BuildRoot Index: gtk-qt-engine.spec =================================================================== RCS file: /cvs/extras/rpms/gtk-qt-engine/devel/gtk-qt-engine.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- gtk-qt-engine.spec 3 Aug 2005 18:44:54 -0000 1.7 +++ gtk-qt-engine.spec 3 Aug 2005 18:49:24 -0000 1.8 @@ -11,7 +11,7 @@ License: GPL Source: http://www.freedesktop.org/~davidsansome/gtk-qt-engine-0.6.tar.bz2 URL: http://www.freedesktop.org/Software/gtk-qt -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # Keep unused patch around in case we still need it -- Rex Patch0: %{name}-x86_64.patch From fedora-extras-commits at redhat.com Wed Aug 3 18:51:52 2005 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Wed, 3 Aug 2005 14:51:52 -0400 Subject: rpms/octave/FC-4 octave.spec,1.16,1.17 Message-ID: <200508031851.j73Ipqvc017092@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/octave/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17075 Modified Files: octave.spec Log Message: Add hdf5-devel and zlib-devel to dependencies for octave-devel. Index: octave.spec =================================================================== RCS file: /cvs/extras/rpms/octave/FC-4/octave.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- octave.spec 6 Jul 2005 04:12:39 -0000 1.16 +++ octave.spec 3 Aug 2005 18:51:50 -0000 1.17 @@ -2,7 +2,7 @@ Name: octave Version: 2.1.71 -Release: 13%{?dist} +Release: 14%{?dist} Summary: A high-level language for numerical computations Epoch: 6 @@ -39,7 +39,8 @@ %package devel Summary: Development headers and files for Octave Group: Development/Libraries -Requires: %{name} = %{epoch}:%{version}-%{release} readline-devel +Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: readline-devel fftw3-devel hdf5-devel zlib-devel %description devel The octave-devel package contains files needed for developing @@ -128,6 +129,9 @@ %changelog +* Wed Aug 03 2005 Quentin Spencer 2.1.71-14 +- Add hdf5-devel and zlib-devel to dependencies for octave-devel. + * Tue Jul 05 2005 Quentin Spencer 2.1.71-13 - Require hdf5-devel for build. From fedora-extras-commits at redhat.com Wed Aug 3 19:06:05 2005 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Wed, 3 Aug 2005 15:06:05 -0400 Subject: rpms/perl-BerkeleyDB/devel perl-BerkeleyDB.spec,1.1,1.2 Message-ID: <200508031906.j73J6McW018394@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-BerkeleyDB/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18366 Modified Files: perl-BerkeleyDB.spec Log Message: Move OPTIMIZE to Makefile.PL instead of make. Index: perl-BerkeleyDB.spec =================================================================== RCS file: /cvs/extras/rpms/perl-BerkeleyDB/devel/perl-BerkeleyDB.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-BerkeleyDB.spec 2 Aug 2005 23:43:35 -0000 1.1 +++ perl-BerkeleyDB.spec 3 Aug 2005 19:06:03 -0000 1.2 @@ -2,7 +2,7 @@ Name: perl-BerkeleyDB Version: 0.26 -Release: 2%{?dist} +Release: 3%{?dist} Summary: BerkeleyDB Perl module License: GPL or Artistic Group: Development/Libraries @@ -27,9 +27,9 @@ chmod -x Changes README %build -%{__perl} Makefile.PL INSTALLDIRS=vendor +%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" %{__perl} -pi -e 's/^\tLD_RUN_PATH=[^\s]+\s*/\t/' Makefile -make %{?_smp_mflags} OPTIMIZE="$RPM_OPT_FLAGS" +make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT @@ -59,6 +59,9 @@ %{_bindir}/* %changelog +* Wed Aug 03 2005 Steven Pritchard 0.26-3 +- Move OPTIMIZE to Makefile.PL instead of make + * Mon Aug 01 2005 Steven Pritchard 0.26-2 - Various fixes from Paul Howarth: - Add description From fedora-extras-commits at redhat.com Wed Aug 3 19:07:21 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Wed, 3 Aug 2005 15:07:21 -0400 Subject: rpms/pyparsing - New directory Message-ID: <200508031907.j73J7LbV018415@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/pyparsing In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18405/pyparsing Log Message: Directory /cvs/extras/rpms/pyparsing added to the repository From fedora-extras-commits at redhat.com Wed Aug 3 19:07:23 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Wed, 3 Aug 2005 15:07:23 -0400 Subject: rpms/pyparsing/devel - New directory Message-ID: <200508031907.j73J7NIb018439@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/pyparsing/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18405/pyparsing/devel Log Message: Directory /cvs/extras/rpms/pyparsing/devel added to the repository From fedora-extras-commits at redhat.com Wed Aug 3 19:07:58 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Wed, 3 Aug 2005 15:07:58 -0400 Subject: rpms/pyparsing Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200508031907.j73J7wf0018513@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/pyparsing In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18486 Added Files: Makefile import.log Log Message: Setup of module pyparsing --- NEW FILE Makefile --- # Top level Makefile for module pyparsing all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Wed Aug 3 19:07:58 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Wed, 3 Aug 2005 15:07:58 -0400 Subject: rpms/pyparsing/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200508031907.j73J7weo018518@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/pyparsing/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18486/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module pyparsing --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Wed Aug 3 19:08:37 2005 From: fedora-extras-commits at redhat.com (Than Ngo (than)) Date: Wed, 3 Aug 2005 15:08:37 -0400 Subject: owners owners.list,1.45,1.46 Message-ID: <200508031908.j73J8bmC018567@cvs-int.fedora.redhat.com> Author: than Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18547 Modified Files: owners.list Log Message: The pygsl owner's e-mail address doesn't have a matching bugzilla account. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- owners.list 3 Aug 2005 18:43:09 -0000 1.45 +++ owners.list 3 Aug 2005 19:08:34 -0000 1.46 @@ -692,7 +692,7 @@ Fedora Extras|python-sqlite|Python bindings for SQLite|thomas at apestaart.org|extras-qa at fedoraproject.org| Fedora Extras|python-tpg|Toy Parser Generator|shahms at shahms.com|extras-qa at fedoraproject.org| Fedora Extras|python-twisted|Event-driven networking framework written in Python|thomas at apestaart.org|extras-qa at fedoraproject.org| -Fedora Extras|pygsl|GNU Scientific Library Interface for python|jamatos at fc.up.pt|extras-qa at fedoraproject.org| +Fedora Extras|pygsl|GNU Scientific Library Interface for python|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|pytz|World Timezone Definitions for Python|orion at cora.nwra.com|extras-qa at fedoraproject.org| Fedora Extras|pyzor|Pyzor collaborative spam filtering system|wtogami at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|qa-assistant|Graphical quality assurance report generator|toshio at tiki-lounge.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Wed Aug 3 19:08:46 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 3 Aug 2005 15:08:46 -0400 Subject: rpms/gtk-qt-engine/devel gtk-qt-engine.spec,1.8,1.9 Message-ID: <200508031908.j73J8knX018594@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gtk-qt-engine/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18574 Modified Files: gtk-qt-engine.spec Log Message: fix changelog Index: gtk-qt-engine.spec =================================================================== RCS file: /cvs/extras/rpms/gtk-qt-engine/devel/gtk-qt-engine.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- gtk-qt-engine.spec 3 Aug 2005 18:49:24 -0000 1.8 +++ gtk-qt-engine.spec 3 Aug 2005 19:08:44 -0000 1.9 @@ -11,10 +11,7 @@ License: GPL Source: http://www.freedesktop.org/~davidsansome/gtk-qt-engine-0.6.tar.bz2 URL: http://www.freedesktop.org/Software/gtk-qt -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -# Keep unused patch around in case we still need it -- Rex -Patch0: %{name}-x86_64.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: gtk2-devel >= 2.2 # workaround for stock qt-devel's missing deps @@ -78,15 +75,15 @@ %changelog -* Wed Apr 06 2005 Rex Dieter 0.60-1 +* Wed Apr 8 2005 Rex Dieter 0.60-1 - cleanup for Extras +- 0.6 (#153976) -* Thu Jan 20 2005 Rex Dieter 0.60-0.fdr.1 -- 0.6 +* Fri Apr 7 2005 Michael Schwendt +- rebuilt -* Tue Aug 31 2004 Rex Dieter 0.50-0.fdr.1 -- 0.5, using Virtual version 0.50 to make sure rpm treats it - as newer than 0.41 +* Sat Feb 12 2005 Thorsten Leemhuis 0.41-5 +- Add patch to fix compile-error on x86_64; Patch was found in a suse srpm * Tue Jul 13 2004 Rex Dieter 0.41-0.fdr.4 - workarounds for missing deps in stock qt-devel/kdelibs-devel From fedora-extras-commits at redhat.com Wed Aug 3 19:08:57 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Wed, 3 Aug 2005 15:08:57 -0400 Subject: rpms/pyparsing import.log,1.1,1.2 Message-ID: <200508031908.j73J8vG3018638@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/pyparsing In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18606 Modified Files: import.log Log Message: auto-import pyparsing-1.3-1 on branch devel from pyparsing-1.3-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/pyparsing/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 3 Aug 2005 19:07:56 -0000 1.1 +++ import.log 3 Aug 2005 19:08:55 -0000 1.2 @@ -0,0 +1 @@ +pyparsing-1_3-1:HEAD:pyparsing-1.3-1.src.rpm:1123096309 From fedora-extras-commits at redhat.com Wed Aug 3 19:08:58 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Wed, 3 Aug 2005 15:08:58 -0400 Subject: rpms/pyparsing/devel pyparsing-LICENSE, NONE, 1.1 pyparsing.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200508031909.j73J8wXP018645@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/pyparsing/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18606/devel Modified Files: .cvsignore sources Added Files: pyparsing-LICENSE pyparsing.spec Log Message: auto-import pyparsing-1.3-1 on branch devel from pyparsing-1.3-1.src.rpm --- NEW FILE pyparsing-LICENSE --- Copyright (c) 2003,2004 Paul T. McGuire Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --- NEW FILE pyparsing.spec --- %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: pyparsing Version: 1.3 Release: 1 Summary: An object-oriented approach to text processing Group: Development/Libraries License: MIT URL: http://pyparsing.sourceforge.net/ Source0: http://prdownloads.sourceforge.net/pyparsing/pyparsing-1.3.tar.gz Source1: pyparsing-LICENSE BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: %{__python} %description pyparsing is a module that can be used to easily and directly configure syntax definitions for any number of text parsing applications. %prep %setup -q %build %{__python} setup.py build mv pyparsingClassDiagram.PNG pyparsingClassDiagram.png install -p -m 0644 %{SOURCE1} $RPM_BUILD_DIR/%{name}-%{version}/LICENSE %install rm -rf $RPM_BUILD_ROOT %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc CHANGES examples HowToUsePyparsing.html htmldoc pyparsingClassDiagram.png README LICENSE %{python_sitelib}/pyparsing.py %{python_sitelib}/pyparsing.py[co] %changelog * Wed Aug 3 2005 Ignacio Vazquez-Abrams 1.3-1 - Initial RPM release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pyparsing/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 3 Aug 2005 19:07:56 -0000 1.1 +++ .cvsignore 3 Aug 2005 19:08:56 -0000 1.2 @@ -0,0 +1 @@ +pyparsing-1.3.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/pyparsing/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 3 Aug 2005 19:07:56 -0000 1.1 +++ sources 3 Aug 2005 19:08:56 -0000 1.2 @@ -0,0 +1 @@ +d7e36e248fe9096faa950cb7718e6f04 pyparsing-1.3.tar.gz From fedora-extras-commits at redhat.com Wed Aug 3 19:10:03 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 3 Aug 2005 15:10:03 -0400 Subject: rpms/gtk-qt-engine/devel gtk-qt-engine.spec,1.9,1.10 Message-ID: <200508031910.j73JA3AZ018701@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gtk-qt-engine/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18682 Modified Files: gtk-qt-engine.spec Log Message: re-add x86_64 patch (lost in previous cvsup) Index: gtk-qt-engine.spec =================================================================== RCS file: /cvs/extras/rpms/gtk-qt-engine/devel/gtk-qt-engine.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- gtk-qt-engine.spec 3 Aug 2005 19:08:44 -0000 1.9 +++ gtk-qt-engine.spec 3 Aug 2005 19:10:01 -0000 1.10 @@ -13,6 +13,9 @@ URL: http://www.freedesktop.org/Software/gtk-qt BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +# Not sure if we need this anymore -- Rex +Patch0: gtk-qt-engine-x86_64.patch + BuildRequires: gtk2-devel >= 2.2 # workaround for stock qt-devel's missing deps BuildRequires: libpng-devel libmng-devel libjpeg-devel From fedora-extras-commits at redhat.com Wed Aug 3 19:12:34 2005 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Wed, 3 Aug 2005 15:12:34 -0400 Subject: owners owners.list,1.46,1.47 Message-ID: <200508031912.j73JCYwJ018739@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18722 Modified Files: owners.list Log Message: Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- owners.list 3 Aug 2005 19:08:34 -0000 1.46 +++ owners.list 3 Aug 2005 19:12:32 -0000 1.47 @@ -201,6 +201,7 @@ Fedora Extras|giblib|Simple library and a wrapper for imlib2|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|gif2png|A GIF to PNG converter|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org| Fedora Extras|GiNaC|C++ library for symbolic calculation|qspencer at ieee.org|extras-qa at fedoraproject.org| +Fedora Extras|ginac|C++ library for symbolic calculation|qspencer at ieee.org|extras-qa at fedoraproject.org| Fedora Extras|gkrellm-aclock|Analog clock plugin for GKrellM|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|gkrellm-freq|CPU frequency display plugin for GKrellM|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|gkrellm-hddtemp|Hard disk temperature plugin for GKrellM|ville.skytta at iki.fi|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Wed Aug 3 19:18:17 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 3 Aug 2005 15:18:17 -0400 Subject: rpms/gtk-qt-engine/devel gtk-qt-engine.spec,1.10,1.11 Message-ID: <200508031918.j73JIHeO019205@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gtk-qt-engine/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19188 Modified Files: gtk-qt-engine.spec Log Message: ack, put standard BuildRoot back (ok, I've learned my lesson, no more trying to use 2 different CVSROOT's at the same time) Index: gtk-qt-engine.spec =================================================================== RCS file: /cvs/extras/rpms/gtk-qt-engine/devel/gtk-qt-engine.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- gtk-qt-engine.spec 3 Aug 2005 19:10:01 -0000 1.10 +++ gtk-qt-engine.spec 3 Aug 2005 19:18:15 -0000 1.11 @@ -11,7 +11,7 @@ License: GPL Source: http://www.freedesktop.org/~davidsansome/gtk-qt-engine-0.6.tar.bz2 URL: http://www.freedesktop.org/Software/gtk-qt -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # Not sure if we need this anymore -- Rex Patch0: gtk-qt-engine-x86_64.patch From fedora-extras-commits at redhat.com Wed Aug 3 19:32:33 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 3 Aug 2005 15:32:33 -0400 Subject: rpms/mathml-fonts/devel mathml-fonts.spec,1.5,1.6 Message-ID: <200508031932.j73JWYES019247@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/mathml-fonts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19230 Modified Files: mathml-fonts.spec Log Message: own %{find_font_dir} Index: mathml-fonts.spec =================================================================== RCS file: /cvs/extras/rpms/mathml-fonts/devel/mathml-fonts.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- mathml-fonts.spec 3 Aug 2005 17:06:31 -0000 1.5 +++ mathml-fonts.spec 3 Aug 2005 19:32:31 -0000 1.6 @@ -12,12 +12,13 @@ License: Distributable Group: User Interface/X BuildArch: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ## Sources Source1: find_symbol_font.sh # Install as: -%define find_symbol_font %{_libexecdir}/%{name}/find_symbol_font.sh +%define find_symbol_dir %{_libexecdir}/%{name} +%define find_symbol_font %{find_symbol_dir}/find_symbol_font.sh ## Mathematica fonts Source10: http://support.wolfram.com/mathematica/systems/windows/general/MathFonts_TrueType.exe @@ -107,6 +108,7 @@ %files %defattr(-,root,root) +%dir %{find_symbol_dir} %{find_symbol_font} %dir %{fontdir} %{fontdir}/*.[ot]tf From fedora-extras-commits at redhat.com Wed Aug 3 19:42:06 2005 From: fedora-extras-commits at redhat.com (Dams Nade (anvil)) Date: Wed, 3 Aug 2005 15:42:06 -0400 Subject: rpms/galeon/FC-4 galeon.spec,1.15,1.16 Message-ID: <200508031942.j73Jg642019321@cvs-int.fedora.redhat.com> Author: anvil Update of /cvs/extras/rpms/galeon/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19304 Modified Files: galeon.spec Log Message: galeon: blah Index: galeon.spec =================================================================== RCS file: /cvs/extras/rpms/galeon/FC-4/galeon.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- galeon.spec 29 Jul 2005 05:16:57 -0000 1.15 +++ galeon.spec 3 Aug 2005 19:42:04 -0000 1.16 @@ -1,7 +1,7 @@ Summary: GNOME2 Web browser based on Mozilla Name: galeon Version: 1.3.21 -Release: 11%{?dist} +Release: 12%{?dist} License: GPL Group: Applications/Internet URL: http://galeon.sourceforge.net/ @@ -101,6 +101,9 @@ %changelog +* Wed Aug 3 2005 Dams - 1.3.21 +- Released bumped again.. hoping build system will be able to rebuild this one. + * Fri Jul 29 2005 Dams - 1.3.21-11 - Bumped released From fedora-extras-commits at redhat.com Wed Aug 3 19:42:45 2005 From: fedora-extras-commits at redhat.com (Dams Nade (anvil)) Date: Wed, 3 Aug 2005 15:42:45 -0400 Subject: common tobuild,1.2188,1.2189 Message-ID: <200508031942.j73JgkCt019385@cvs-int.fedora.redhat.com> Author: anvil Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19368 Modified Files: tobuild Log Message: request build of rpms/galeon/FC-4 galeon-1_3_21-12_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2188 retrieving revision 1.2189 diff -u -r1.2188 -r1.2189 --- tobuild 3 Aug 2005 15:47:57 -0000 1.2188 +++ tobuild 3 Aug 2005 19:42:43 -0000 1.2189 @@ -24,3 +24,4 @@ thomasvs rpms/mach/FC-4 mach-0_4_7-1_fc4 fc4 markmc rpms/sabayon/devel sabayon-2_11_90-1 devel ausil rpms/kphone/FC-3 kphone-4_2-1_fc3 fc3 +anvil rpms/galeon/FC-4 galeon-1_3_21-12_fc4 fc4 From fedora-extras-commits at redhat.com Wed Aug 3 19:52:58 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Wed, 3 Aug 2005 15:52:58 -0400 Subject: owners owners.list,1.47,1.48 Message-ID: <200508031952.j73JqwWC019438@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19421 Modified Files: owners.list Log Message: pyparsing Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- owners.list 3 Aug 2005 19:12:32 -0000 1.47 +++ owners.list 3 Aug 2005 19:52:56 -0000 1.48 @@ -664,6 +664,7 @@ Fedora Extras|putty|Putty - a SSH, Telnet & Rlogin client|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|pybliographer|A framework for working with bibliographic databases|z.kota at gmx.net|extras-qa at fedoraproject.org| Fedora Extras|pylint|Analyzes Python code looking for bugs and signs of poor quality|icon at linux.duke.edu|extras-qa at fedoraproject.org| +Fedora Extras|pyparsing|An object-oriented approach to text processing|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| Fedora Extras|PyRTF|Rich Text Format (RTF) Document Generation in Python|mpeters at mac.com|extras-qa at fedoraproject.org| Fedora Extras|python-adns|Python interface for the GNU adns library|colin at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|python-amara|A collection of Pythonic tools for XML data binding|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Wed Aug 3 20:10:27 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 3 Aug 2005 16:10:27 -0400 Subject: rpms/tetex-bytefield/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 tetex-bytefield.spec, 1.3, 1.4 Message-ID: <200508032010.j73KARKW020769@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/tetex-bytefield/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20708/devel Modified Files: .cvsignore sources tetex-bytefield.spec Log Message: Update to 1.2a. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/tetex-bytefield/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 24 Mar 2005 01:58:50 -0000 1.2 +++ .cvsignore 3 Aug 2005 20:10:25 -0000 1.3 @@ -1 +1 @@ -bytefield-1.2-20050315.tar.gz +bytefield-1.2a.zip Index: sources =================================================================== RCS file: /cvs/extras/rpms/tetex-bytefield/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 24 Mar 2005 01:58:50 -0000 1.2 +++ sources 3 Aug 2005 20:10:25 -0000 1.3 @@ -1 +1 @@ -8eca969277b7f9f3de746713f1d941ba bytefield-1.2-20050315.tar.gz +6b1ca98e58d7389e1f0a85c20b9a79c3 bytefield-1.2a.zip Index: tetex-bytefield.spec =================================================================== RCS file: /cvs/extras/rpms/tetex-bytefield/devel/tetex-bytefield.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- tetex-bytefield.spec 12 May 2005 14:21:31 -0000 1.3 +++ tetex-bytefield.spec 3 Aug 2005 20:10:25 -0000 1.4 @@ -5,16 +5,16 @@ %define texpkgdoc %{_texmf}/doc/latex/%{texpkg} Name: tetex-%{texpkg} -Version: 1.2 -Release: 3%{?dist} +Version: 1.2a +Release: 1%{?dist} Summary: Create illustrations for network protocol specifications Group: Applications/Publishing License: LaTeX Project Public License URL: http://www.ctan.org/tex-archive/help/Catalogue/entries/bytefield.html -# DANTE generates CTAN packages tarballs on-the-fly -# ftp://ftp.dante.de/tex-archive/macros/latex/contrib/bytefield.tar.gz -Source0: bytefield-1.2-20050315.tar.gz +# DANTE generates CTAN packages zipfiles on-the-fly +# ftp://ftp.dante.de/tex-archive/macros/latex/contrib/bytefield.zip +Source0: bytefield-1.2a.zip BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -62,6 +62,9 @@ %changelog +* Wed Aug 3 2005 Jose Pedro Oliveira - 1.2a-1 +- Update to 1.2a. + * Thu May 12 2005 Jose Pedro Oliveira - 1.2-3 - Dist tag. From fedora-extras-commits at redhat.com Wed Aug 3 20:10:06 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 3 Aug 2005 16:10:06 -0400 Subject: rpms/tetex-bytefield/FC-3 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 tetex-bytefield.spec, 1.1, 1.2 Message-ID: <200508032010.j73KAn91020783@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/tetex-bytefield/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20708/FC-3 Modified Files: .cvsignore sources tetex-bytefield.spec Log Message: Update to 1.2a. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/tetex-bytefield/FC-3/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 24 Mar 2005 01:58:50 -0000 1.2 +++ .cvsignore 3 Aug 2005 20:10:03 -0000 1.3 @@ -1 +1 @@ -bytefield-1.2-20050315.tar.gz +bytefield-1.2a.zip Index: sources =================================================================== RCS file: /cvs/extras/rpms/tetex-bytefield/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 24 Mar 2005 01:58:50 -0000 1.2 +++ sources 3 Aug 2005 20:10:03 -0000 1.3 @@ -1 +1 @@ -8eca969277b7f9f3de746713f1d941ba bytefield-1.2-20050315.tar.gz +6b1ca98e58d7389e1f0a85c20b9a79c3 bytefield-1.2a.zip Index: tetex-bytefield.spec =================================================================== RCS file: /cvs/extras/rpms/tetex-bytefield/FC-3/tetex-bytefield.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- tetex-bytefield.spec 24 Mar 2005 01:58:50 -0000 1.1 +++ tetex-bytefield.spec 3 Aug 2005 20:10:03 -0000 1.2 @@ -5,16 +5,16 @@ %define texpkgdoc %{_texmf}/doc/latex/%{texpkg} Name: tetex-%{texpkg} -Version: 1.2 -Release: 1 +Version: 1.2a +Release: 1%{?dist} Summary: Create illustrations for network protocol specifications Group: Applications/Publishing License: LaTeX Project Public License URL: http://www.ctan.org/tex-archive/help/Catalogue/entries/bytefield.html -# DANTE generates CTAN packages tarballs on-the-fly -# ftp://ftp.dante.de/tex-archive/macros/latex/contrib/bytefield.tar.gz -Source0: bytefield-1.2-20050315.tar.gz +# DANTE generates CTAN packages zipfiles on-the-fly +# ftp://ftp.dante.de/tex-archive/macros/latex/contrib/bytefield.zip +Source0: bytefield-1.2a.zip BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -62,5 +62,14 @@ %changelog +* Wed Aug 3 2005 Jose Pedro Oliveira - 1.2a-1 +- Update to 1.2a. + +* Thu May 12 2005 Jose Pedro Oliveira - 1.2-3 +- Dist tag. + +* Fri Apr 7 2005 Michael Schwendt - 1.2-2 +- rebuilt + * Tue Mar 15 2005 Jose Pedro Oliveira - 1.2-1 - First build. From fedora-extras-commits at redhat.com Wed Aug 3 20:10:24 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 3 Aug 2005 16:10:24 -0400 Subject: rpms/tetex-bytefield/FC-4 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 tetex-bytefield.spec, 1.3, 1.4 Message-ID: <200508032010.j73KAvTH020806@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/tetex-bytefield/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20708/FC-4 Modified Files: .cvsignore sources tetex-bytefield.spec Log Message: Update to 1.2a. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/tetex-bytefield/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 24 Mar 2005 01:58:50 -0000 1.2 +++ .cvsignore 3 Aug 2005 20:10:06 -0000 1.3 @@ -1 +1 @@ -bytefield-1.2-20050315.tar.gz +bytefield-1.2a.zip Index: sources =================================================================== RCS file: /cvs/extras/rpms/tetex-bytefield/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 24 Mar 2005 01:58:50 -0000 1.2 +++ sources 3 Aug 2005 20:10:06 -0000 1.3 @@ -1 +1 @@ -8eca969277b7f9f3de746713f1d941ba bytefield-1.2-20050315.tar.gz +6b1ca98e58d7389e1f0a85c20b9a79c3 bytefield-1.2a.zip Index: tetex-bytefield.spec =================================================================== RCS file: /cvs/extras/rpms/tetex-bytefield/FC-4/tetex-bytefield.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- tetex-bytefield.spec 12 May 2005 14:21:31 -0000 1.3 +++ tetex-bytefield.spec 3 Aug 2005 20:10:06 -0000 1.4 @@ -5,16 +5,16 @@ %define texpkgdoc %{_texmf}/doc/latex/%{texpkg} Name: tetex-%{texpkg} -Version: 1.2 -Release: 3%{?dist} +Version: 1.2a +Release: 1%{?dist} Summary: Create illustrations for network protocol specifications Group: Applications/Publishing License: LaTeX Project Public License URL: http://www.ctan.org/tex-archive/help/Catalogue/entries/bytefield.html -# DANTE generates CTAN packages tarballs on-the-fly -# ftp://ftp.dante.de/tex-archive/macros/latex/contrib/bytefield.tar.gz -Source0: bytefield-1.2-20050315.tar.gz +# DANTE generates CTAN packages zipfiles on-the-fly +# ftp://ftp.dante.de/tex-archive/macros/latex/contrib/bytefield.zip +Source0: bytefield-1.2a.zip BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -62,6 +62,9 @@ %changelog +* Wed Aug 3 2005 Jose Pedro Oliveira - 1.2a-1 +- Update to 1.2a. + * Thu May 12 2005 Jose Pedro Oliveira - 1.2-3 - Dist tag. From fedora-extras-commits at redhat.com Wed Aug 3 20:11:09 2005 From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith)) Date: Wed, 3 Aug 2005 16:11:09 -0400 Subject: common Makefile.common,1.28,1.29 Message-ID: <200508032011.j73KB9Ot020843@cvs-int.fedora.redhat.com> Author: sopwith Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20778 Modified Files: Makefile.common Log Message: Make 'build' target invoke 'plague' target; update error message when plague-client is missing. Index: Makefile.common =================================================================== RCS file: /cvs/extras/common/Makefile.common,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- Makefile.common 29 Jul 2005 19:36:24 -0000 1.28 +++ Makefile.common 3 Aug 2005 20:10:50 -0000 1.29 @@ -312,7 +312,7 @@ endef USER := $(shell $(find-user)) -build: $(COMMON_DIR)/branches +oldbuild: $(COMMON_DIR)/branches @if [ -z "$(TARGET)" -a ! -d CVS ]; then echo "Must be in a branch subdirectory"; exit 1; fi @cvs status -v $(SPECFILE) 2>/dev/null | grep -q $(TAG); ret=$$? ;\ @@ -325,8 +325,8 @@ cvs commit -m "request build of $(CVS_REPOSITORY) $(TAG) for $(TARGET)" tobuild ;\ popd >/dev/null) -plague: $(COMMON_DIR)/branches - @if [ ! -x /usr/bin/plague-client ]; then echo "Must have plague-client installed"; exit 1; fi +build plague: $(COMMON_DIR)/branches + @if [ ! -x /usr/bin/plague-client ]; then echo "Must have plague-client installed - see http://fedoraproject.org/wiki/Extras/BuildSystemClientSetup"; exit 1; fi @if [ -z "$(TARGET)" -a ! -d CVS ]; then echo "Must be in a branch subdirectory"; exit 1; fi @cvs status -v $(SPECFILE) 2>/dev/null | grep -q $(TAG); ret=$$? ;\ From fedora-extras-commits at redhat.com Wed Aug 3 20:11:00 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 3 Aug 2005 16:11:00 -0400 Subject: rpms/mathml-fonts/FC-3 find_symbol_font.sh, NONE, 1.1 mathml-fonts.spec, 1.2, 1.3 Message-ID: <200508032011.j73KBYAV020849@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/mathml-fonts/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20759/FC-3 Modified Files: mathml-fonts.spec Added Files: find_symbol_font.sh Log Message: sync branches w/-devel ***** Error reading new file: [Errno 2] No such file or directory: 'find_symbol_font.sh' Index: mathml-fonts.spec =================================================================== RCS file: /cvs/extras/rpms/mathml-fonts/FC-3/mathml-fonts.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mathml-fonts.spec 10 Dec 2004 22:03:07 -0000 1.2 +++ mathml-fonts.spec 3 Aug 2005 20:10:57 -0000 1.3 @@ -4,63 +4,60 @@ %define fontdir %{_datadir}/fonts/mathml Summary: Mathematical symbol fonts -Name: mathml-fonts -Epoch: 0 +Name: mathml-fonts Version: 1.0 -Release: 14 -URL: http://www.mozilla.org/projects/mathml/fonts/ +Release: 16 + +URL: http://www.mozilla.org/projects/mathml/fonts/ License: Distributable Group: User Interface/X BuildArch: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ## Sources +Source1: find_symbol_font.sh +# Install as: +%define find_symbol_dir %{_libexecdir}/%{name} +%define find_symbol_font %{find_symbol_dir}/find_symbol_font.sh + ## Mathematica fonts Source10: http://support.wolfram.com/mathematica/systems/windows/general/MathFonts_TrueType.exe ## TeX fonts #Source20: ftp://tug.ctan.org/tex-archive/fonts/cm/ps-type1/bakoma/ttf.tar.gz Source20: ftp://tug.ctan.org/tex-archive/fonts/cm/ps-type1/bakoma/ttf/cmbx10.ttf -# Reference: http://wiki.lyx.org/beta/pmwiki.php/LyX/Troubleshooting -Source21: http://www.movement.uklinux.net/latex-xft-fonts-0.1.tar.gz +# Reference: http://wiki.lyx.org/LyX/Troubleshooting +Source21: http://movementarian.org/latex-xft-fonts-0.1.tar.gz ## Design Science fonts # License: http://www.dessci.com/en/support/eula/mtextralic.htm # URL: http://www.dessci.com/en/dl/fonts/ -# extracted from MTW_Truetype.exe +# extracted from MTW_Truetype.exe # (couldn't figure out how extract at build-time -- Rex) Source30: mtextra.ttf -BuildRequires: %{x11bindir}/mkfontdir, %{x11bindir}/mkfontscale -# Help out apt/mach find the above -BuildRequires: XFree86-font-utils BuildRequires: unzip # we're pretty much useless without it, and use fc-cache -# in scriptlets +# in %%post,%%postun,%%triggers Prereq: fontconfig -# Not *strictly* required, for Adobe (PS) Symbol font, expects -# /usr/lib/acroread/Resource/Fonts -# Prereq: acroread -# BuildRequires: acroread - Provides: latex-xft-fonts = 0:0.1 %description This package contains fonts required to display mathematical -symbols. Applications supported include: +symbols. Applications supported include: * mozilla (and netscape >= 7) to display MathML * lyx * kformula (koffice) %prep -%setup -T -c -n %{name} +%setup -T -c -n %{name} ## Math'ca unzip %{SOURCE10} ## TeX fonts -#setup -T -D -n %{name} -a 20 +#setup -T -D -n %{name} -a 20 cp -a %{SOURCE20} . %setup -T -D -n %{name} -a 21 @@ -84,40 +81,39 @@ cmbx10.ttf mtextra.ttf \ $RPM_BUILD_ROOT%{fontdir}/ -# Generate fonts.scale, etc... -# don't really *need* this step, as we're Xft only... -%{x11bindir}/mkfontscale $RPM_BUILD_ROOT%{fontdir} -%{x11bindir}/mkfontdir $RPM_BUILD_ROOT%{fontdir} +# find_symbol_font +install -p -m755 -D %{SOURCE1} $RPM_BUILD_ROOT%{find_symbol_font} # "touch" all fonts.dir, fonts.scale, etc files we've got flagged as %ghost -touch $RPM_BUILD_ROOT%{fontdir}/{fonts.{dir,scale,cache-1},encodings.dir,Symbol.pfa} +touch $RPM_BUILD_ROOT%{fontdir}/{fonts.cache-1,Symbol.pfa,SY______.PFB} -%triggerin -- acroread -if [ ! -e %{fontdir}/Symbol.pfa -a \ - -e %{_libdir}/acroread/Resource/Font/Symbol ] ; then - ln -s %{_libdir}/acroread/Resource/Font/Symbol %{fontdir}/Symbol.pfa - ## Rebuild fontcache for now available Symbol.pfa +%triggerin -- acroread,AdobeReader_enu +%{find_symbol_font} ||: + +%triggerun -- acroread,AdobeReader_enu +if [ $2 -eq 0 ]; then fc-cache -f %{fontdir} ||: fi - -%triggerun -- acroread -[ $2 -eq 0 ] && rm -f %{fontdir}/Symbol.pfa -## Rebuild fontcache for now missing (or possibly changed) Symbol.pfa -fc-cache -f %{fontdir} ||: %post +%{find_symbol_font} ||: fc-cache -f %{fontdir} ||: +%postun +if [ $1 -eq 0 ]; then + fc-cache ||: +fi + %files %defattr(-,root,root) +%dir %{find_symbol_dir} +%{find_symbol_font} %dir %{fontdir} %{fontdir}/*.[ot]tf -%{fontdir}/fonts.dir -%{fontdir}/fonts.scale -%{fontdir}/encodings.dir %ghost %{fontdir}/Symbol.pfa +%ghost %{fontdir}/SY______.PFB %ghost %{fontdir}/fonts.cache-1 @@ -126,6 +122,16 @@ %changelog +* Wed Aug 3 2005 Rex Dieter 1.0-16 +- update for acroread7 (and SY_____.PFB) (bug #133709) +- include/use find_symbol_font.sh helper script +- readd %%postun +- update latex-xft-fonts URL +- remove legacy crud + +* Fri Apr 7 2005 Michael Schwendt +- rebuilt + * Mon Apr 26 2004 Rex Dieter 0:1.0-0.fdr.14 - remove touch-y Symbol.pfa stuff. (-: - rework acroread triggers @@ -144,7 +150,7 @@ - add comment regarding lyx fonts - remove use of mkfontdir -e which causes build failure on FC2. - remove deprecated Xft1 bits -- add %%trigger for acroread, to rebuild font.cache-1 when/if +- add %%trigger for acroread, to rebuild font.cache-1 when/if Symbol.pfa becomes available/unavailable. * Tue Jan 13 2004 Rex Dieter 0:1.0-0.fdr.10 @@ -187,6 +193,6 @@ * Mon Nov 11 2002 Rex Dieter 1.0-0 - include latest Mathematica 4.1 fonts + CMSY10,CMEX10 - Require type1inst with added/fixed ams/wri font foundries -- prefer Math*.pfa over Math*.pfb as type1inst seems to +- prefer Math*.pfa over Math*.pfb as type1inst seems to incorrectly identify some of the pfb versions. From fedora-extras-commits at redhat.com Wed Aug 3 20:11:02 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 3 Aug 2005 16:11:02 -0400 Subject: rpms/mathml-fonts/FC-4 find_symbol_font.sh, NONE, 1.1 mathml-fonts.spec, 1.4, 1.5 Message-ID: <200508032011.j73KBYPS020850@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/mathml-fonts/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20759/FC-4 Modified Files: mathml-fonts.spec Added Files: find_symbol_font.sh Log Message: sync branches w/-devel ***** Error reading new file: [Errno 2] No such file or directory: 'find_symbol_font.sh' Index: mathml-fonts.spec =================================================================== RCS file: /cvs/extras/rpms/mathml-fonts/FC-4/mathml-fonts.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- mathml-fonts.spec 6 Apr 2005 22:12:24 -0000 1.4 +++ mathml-fonts.spec 3 Aug 2005 20:11:00 -0000 1.5 @@ -6,22 +6,27 @@ Summary: Mathematical symbol fonts Name: mathml-fonts Version: 1.0 -Release: 15 +Release: 16 URL: http://www.mozilla.org/projects/mathml/fonts/ License: Distributable Group: User Interface/X BuildArch: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ## Sources +Source1: find_symbol_font.sh +# Install as: +%define find_symbol_dir %{_libexecdir}/%{name} +%define find_symbol_font %{find_symbol_dir}/find_symbol_font.sh + ## Mathematica fonts Source10: http://support.wolfram.com/mathematica/systems/windows/general/MathFonts_TrueType.exe ## TeX fonts #Source20: ftp://tug.ctan.org/tex-archive/fonts/cm/ps-type1/bakoma/ttf.tar.gz Source20: ftp://tug.ctan.org/tex-archive/fonts/cm/ps-type1/bakoma/ttf/cmbx10.ttf -# Reference: http://wiki.lyx.org/beta/pmwiki.php/LyX/Troubleshooting -Source21: http://www.movement.uklinux.net/latex-xft-fonts-0.1.tar.gz +# Reference: http://wiki.lyx.org/LyX/Troubleshooting +Source21: http://movementarian.org/latex-xft-fonts-0.1.tar.gz ## Design Science fonts # License: http://www.dessci.com/en/support/eula/mtextralic.htm # URL: http://www.dessci.com/en/dl/fonts/ @@ -29,20 +34,12 @@ # (couldn't figure out how extract at build-time -- Rex) Source30: mtextra.ttf -BuildRequires: %{x11bindir}/mkfontdir, %{x11bindir}/mkfontscale -# Help out apt/mach find the above -BuildRequires: XFree86-font-utils BuildRequires: unzip # we're pretty much useless without it, and use fc-cache -# in scriptlets +# in %%post,%%postun,%%triggers Prereq: fontconfig -# Not *strictly* required, for Adobe (PS) Symbol font, expects -# /usr/lib/acroread/Resource/Fonts -# Prereq: acroread -# BuildRequires: acroread - Provides: latex-xft-fonts = 0:0.1 %description @@ -84,40 +81,39 @@ cmbx10.ttf mtextra.ttf \ $RPM_BUILD_ROOT%{fontdir}/ -# Generate fonts.scale, etc... -# don't really *need* this step, as we're Xft only... -%{x11bindir}/mkfontscale $RPM_BUILD_ROOT%{fontdir} -%{x11bindir}/mkfontdir $RPM_BUILD_ROOT%{fontdir} +# find_symbol_font +install -p -m755 -D %{SOURCE1} $RPM_BUILD_ROOT%{find_symbol_font} # "touch" all fonts.dir, fonts.scale, etc files we've got flagged as %ghost -touch $RPM_BUILD_ROOT%{fontdir}/{fonts.{dir,scale,cache-1},encodings.dir,Symbol.pfa} +touch $RPM_BUILD_ROOT%{fontdir}/{fonts.cache-1,Symbol.pfa,SY______.PFB} -%triggerin -- acroread -if [ ! -e %{fontdir}/Symbol.pfa -a \ - -e %{_libdir}/acroread/Resource/Font/Symbol ] ; then - ln -s %{_libdir}/acroread/Resource/Font/Symbol %{fontdir}/Symbol.pfa - ## Rebuild fontcache for now available Symbol.pfa +%triggerin -- acroread,AdobeReader_enu +%{find_symbol_font} ||: + +%triggerun -- acroread,AdobeReader_enu +if [ $2 -eq 0 ]; then fc-cache -f %{fontdir} ||: fi -%triggerun -- acroread -[ $2 -eq 0 ] && rm -f %{fontdir}/Symbol.pfa -## Rebuild fontcache for now missing (or possibly changed) Symbol.pfa -fc-cache -f %{fontdir} ||: - %post +%{find_symbol_font} ||: fc-cache -f %{fontdir} ||: +%postun +if [ $1 -eq 0 ]; then + fc-cache ||: +fi + %files %defattr(-,root,root) +%dir %{find_symbol_dir} +%{find_symbol_font} %dir %{fontdir} %{fontdir}/*.[ot]tf -%{fontdir}/fonts.dir -%{fontdir}/fonts.scale -%{fontdir}/encodings.dir %ghost %{fontdir}/Symbol.pfa +%ghost %{fontdir}/SY______.PFB %ghost %{fontdir}/fonts.cache-1 @@ -126,6 +122,13 @@ %changelog +* Wed Aug 3 2005 Rex Dieter 1.0-16 +- update for acroread7 (and SY_____.PFB) (bug #133709) +- include/use find_symbol_font.sh helper script +- readd %%postun +- update latex-xft-fonts URL +- remove legacy crud + * Fri Apr 7 2005 Michael Schwendt - rebuilt From fedora-extras-commits at redhat.com Wed Aug 3 20:16:00 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Wed, 3 Aug 2005 16:16:00 -0400 Subject: rpms/pyparsing/FC-3 pyparsing.spec,1.1,1.2 Message-ID: <200508032016.j73KG0Nn021137@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/pyparsing/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21096/FC-3 Modified Files: pyparsing.spec Log Message: Add disttag first, *then* request branch creation... Index: pyparsing.spec =================================================================== RCS file: /cvs/extras/rpms/pyparsing/FC-3/pyparsing.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- pyparsing.spec 3 Aug 2005 19:08:56 -0000 1.1 +++ pyparsing.spec 3 Aug 2005 20:15:58 -0000 1.2 @@ -2,7 +2,7 @@ Name: pyparsing Version: 1.3 -Release: 1 +Release: 1%{?dist} Summary: An object-oriented approach to text processing Group: Development/Libraries From fedora-extras-commits at redhat.com Wed Aug 3 20:16:01 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Wed, 3 Aug 2005 16:16:01 -0400 Subject: rpms/pyparsing/devel pyparsing.spec,1.1,1.2 Message-ID: <200508032016.j73KG10U021147@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/pyparsing/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21096/devel Modified Files: pyparsing.spec Log Message: Add disttag first, *then* request branch creation... Index: pyparsing.spec =================================================================== RCS file: /cvs/extras/rpms/pyparsing/devel/pyparsing.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- pyparsing.spec 3 Aug 2005 19:08:56 -0000 1.1 +++ pyparsing.spec 3 Aug 2005 20:15:59 -0000 1.2 @@ -2,7 +2,7 @@ Name: pyparsing Version: 1.3 -Release: 1 +Release: 1%{?dist} Summary: An object-oriented approach to text processing Group: Development/Libraries From fedora-extras-commits at redhat.com Wed Aug 3 20:16:01 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Wed, 3 Aug 2005 16:16:01 -0400 Subject: rpms/pyparsing/FC-4 pyparsing.spec,1.1,1.2 Message-ID: <200508032016.j73KG18x021143@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/pyparsing/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21096/FC-4 Modified Files: pyparsing.spec Log Message: Add disttag first, *then* request branch creation... Index: pyparsing.spec =================================================================== RCS file: /cvs/extras/rpms/pyparsing/FC-4/pyparsing.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- pyparsing.spec 3 Aug 2005 19:08:56 -0000 1.1 +++ pyparsing.spec 3 Aug 2005 20:15:59 -0000 1.2 @@ -2,7 +2,7 @@ Name: pyparsing Version: 1.3 -Release: 1 +Release: 1%{?dist} Summary: An object-oriented approach to text processing Group: Development/Libraries From fedora-extras-commits at redhat.com Wed Aug 3 20:16:51 2005 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Wed, 3 Aug 2005 16:16:51 -0400 Subject: rpms/octave-forge/FC-4 octave-forge.spec,1.14,1.15 Message-ID: <200508032016.j73KGp6m021208@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/octave-forge/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21191 Modified Files: octave-forge.spec Log Message: Remove BuildRequires that are now required by octave-devel. Index: octave-forge.spec =================================================================== RCS file: /cvs/extras/rpms/octave-forge/FC-4/octave-forge.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- octave-forge.spec 22 Jun 2005 20:22:32 -0000 1.14 +++ octave-forge.spec 3 Aug 2005 20:16:49 -0000 1.15 @@ -1,6 +1,6 @@ Name: octave-forge Version: 2005.06.13 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Contributed functions for octave Group: Applications/Engineering @@ -24,10 +24,9 @@ %define octave_ep %(rpm -q --qf '%%{epoch}' octave) %define octave_ver %(rpm -q --qf '%%{version}' octave) Requires: octave = %{octave_ep}:%{octave_ver} ImageMagick -BuildRequires: octave-devel tetex gcc-gfortran GiNaC-devel fftw3-devel -BuildRequires: xorg-x11-devel libjpeg-devel libpng-devel zlib-devel +BuildRequires: octave-devel tetex gcc-gfortran GiNaC-devel +BuildRequires: xorg-x11-devel libjpeg-devel libpng-devel pcre-devel BuildRequires: ncurses-devel libtermcap-devel gsl-devel qhull-devel -BuildRequires: pcre-devel %description Octave-forge is a community project for collaborative development of @@ -74,6 +73,9 @@ %changelog +* Wed Aug 03 2005 Quentin Spencer 2005.06.13-7 +- Remove BuildRequires that are now required by octave-devel. + * Wed Jun 22 2005 Quentin Spencer 2005.06.13-6 - Rebuild. From fedora-extras-commits at redhat.com Wed Aug 3 20:18:16 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 3 Aug 2005 16:18:16 -0400 Subject: rpms/mathml-fonts/FC-4 mathml-fonts.spec,1.5,1.6 Message-ID: <200508032018.j73KIGXp021328@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/mathml-fonts/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21253 Modified Files: mathml-fonts.spec Log Message: use %{?dist} Index: mathml-fonts.spec =================================================================== RCS file: /cvs/extras/rpms/mathml-fonts/FC-4/mathml-fonts.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- mathml-fonts.spec 3 Aug 2005 20:11:00 -0000 1.5 +++ mathml-fonts.spec 3 Aug 2005 20:18:14 -0000 1.6 @@ -6,7 +6,7 @@ Summary: Mathematical symbol fonts Name: mathml-fonts Version: 1.0 -Release: 16 +Release: 16%{?dist} URL: http://www.mozilla.org/projects/mathml/fonts/ License: Distributable From fedora-extras-commits at redhat.com Wed Aug 3 22:12:13 2005 From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith)) Date: Wed, 3 Aug 2005 18:12:13 -0400 Subject: common Makefile.common,1.29,1.30 Message-ID: <200508032212.j73MCDOe023881@cvs-int.fedora.redhat.com> Author: sopwith Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23864 Modified Files: Makefile.common Log Message: undo for now Index: Makefile.common =================================================================== RCS file: /cvs/extras/common/Makefile.common,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- Makefile.common 3 Aug 2005 20:10:50 -0000 1.29 +++ Makefile.common 3 Aug 2005 22:12:11 -0000 1.30 @@ -312,7 +312,7 @@ endef USER := $(shell $(find-user)) -oldbuild: $(COMMON_DIR)/branches +build: $(COMMON_DIR)/branches @if [ -z "$(TARGET)" -a ! -d CVS ]; then echo "Must be in a branch subdirectory"; exit 1; fi @cvs status -v $(SPECFILE) 2>/dev/null | grep -q $(TAG); ret=$$? ;\ @@ -325,7 +325,7 @@ cvs commit -m "request build of $(CVS_REPOSITORY) $(TAG) for $(TARGET)" tobuild ;\ popd >/dev/null) -build plague: $(COMMON_DIR)/branches +plague: $(COMMON_DIR)/branches @if [ ! -x /usr/bin/plague-client ]; then echo "Must have plague-client installed - see http://fedoraproject.org/wiki/Extras/BuildSystemClientSetup"; exit 1; fi @if [ -z "$(TARGET)" -a ! -d CVS ]; then echo "Must be in a branch subdirectory"; exit 1; fi From fedora-extras-commits at redhat.com Thu Aug 4 00:56:24 2005 From: fedora-extras-commits at redhat.com (Ed Hill (edhill)) Date: Wed, 3 Aug 2005 20:56:24 -0400 Subject: rpms/ncview/FC-3 ncview.spec,1.1,1.2 Message-ID: <200508040056.j740uOXf026530@cvs-int.fedora.redhat.com> Author: edhill Update of /cvs/extras/rpms/ncview/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26513 Modified Files: ncview.spec Log Message: fix dist tag Index: ncview.spec =================================================================== RCS file: /cvs/extras/rpms/ncview/FC-3/ncview.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ncview.spec 7 Jul 2005 22:30:53 -0000 1.1 +++ ncview.spec 4 Aug 2005 00:56:22 -0000 1.2 @@ -1,6 +1,6 @@ Name: ncview Version: 1.92e -Release: 4 +Release: 5%{?dist} Summary: A visual browser for netCDF format files Group: Applications/Engineering License: GPL @@ -59,6 +59,9 @@ %changelog +* Wed Aug 3 2005 Ed Hill - 1.92e-5 +- fix dist tag + * Wed Jul 6 2005 Ed Hill - 1.92e-4 - mkstemp() security fix and more cleanups From fedora-extras-commits at redhat.com Thu Aug 4 00:58:09 2005 From: fedora-extras-commits at redhat.com (Ed Hill (edhill)) Date: Wed, 3 Aug 2005 20:58:09 -0400 Subject: rpms/ncview/FC-4 ncview.spec,1.1,1.2 Message-ID: <200508040058.j740w9mo026611@cvs-int.fedora.redhat.com> Author: edhill Update of /cvs/extras/rpms/ncview/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26594 Modified Files: ncview.spec Log Message: fix dist tag Index: ncview.spec =================================================================== RCS file: /cvs/extras/rpms/ncview/FC-4/ncview.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ncview.spec 7 Jul 2005 22:30:53 -0000 1.1 +++ ncview.spec 4 Aug 2005 00:58:06 -0000 1.2 @@ -1,6 +1,6 @@ Name: ncview Version: 1.92e -Release: 4 +Release: 5%{?dist} Summary: A visual browser for netCDF format files Group: Applications/Engineering License: GPL @@ -59,6 +59,9 @@ %changelog +* Wed Aug 3 2005 Ed Hill - 1.92e-5 +- fix dist tag + * Wed Jul 6 2005 Ed Hill - 1.92e-4 - mkstemp() security fix and more cleanups From fedora-extras-commits at redhat.com Thu Aug 4 00:59:08 2005 From: fedora-extras-commits at redhat.com (Ed Hill (edhill)) Date: Wed, 3 Aug 2005 20:59:08 -0400 Subject: rpms/ncview/devel ncview.spec,1.1,1.2 Message-ID: <200508040059.j740x8BY026673@cvs-int.fedora.redhat.com> Author: edhill Update of /cvs/extras/rpms/ncview/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26656 Modified Files: ncview.spec Log Message: fix dist tag Index: ncview.spec =================================================================== RCS file: /cvs/extras/rpms/ncview/devel/ncview.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ncview.spec 7 Jul 2005 22:30:53 -0000 1.1 +++ ncview.spec 4 Aug 2005 00:59:06 -0000 1.2 @@ -1,6 +1,6 @@ Name: ncview Version: 1.92e -Release: 4 +Release: 5%{?dist} Summary: A visual browser for netCDF format files Group: Applications/Engineering License: GPL @@ -59,6 +59,9 @@ %changelog +* Wed Aug 3 2005 Ed Hill - 1.92e-5 +- fix dist tag + * Wed Jul 6 2005 Ed Hill - 1.92e-4 - mkstemp() security fix and more cleanups From fedora-extras-commits at redhat.com Thu Aug 4 04:22:14 2005 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Thu, 4 Aug 2005 00:22:14 -0400 Subject: rpms/mock/devel mock.spec,1.5,1.6 sources,1.3,1.4 Message-ID: <200508040422.j744MEbj031901@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/extras/rpms/mock/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31849/devel Modified Files: mock.spec sources Log Message: 0.4 on all branches update urls all over Index: mock.spec =================================================================== RCS file: /cvs/extras/rpms/mock/devel/mock.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- mock.spec 12 Jun 2005 20:27:25 -0000 1.5 +++ mock.spec 4 Aug 2005 04:22:12 -0000 1.6 @@ -1,11 +1,11 @@ Summary: Builds packages inside chroots Name: mock -Version: 0.3 -Release: 2%{?dist} +Version: 0.4 +Release: 1%{?dist} License: GPL Group: Development/Tools -Source: http://linux.duke.edu/~skvidal/mock/%{name}-%{version}.tar.gz -URL: http://linux.duke.edu/~skvidal/mock/ +Source: http://fedoraproject.org/projects/mock/releases/%{name}-%{version}.tar.gz +URL: http://fedoraproject.org/wiki/Projects/Mock BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: python, yum >= 2.2.1 Requires(pre): shadow-utils @@ -63,6 +63,10 @@ %changelog +* Thu Aug 4 2005 Seth Vidal +- 0.4 +- update urls + * Sun Jun 12 2005 Jeremy Katz - set default.cfg based on both arch and distro built for Index: sources =================================================================== RCS file: /cvs/extras/rpms/mock/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 12 Jun 2005 04:01:34 -0000 1.3 +++ sources 4 Aug 2005 04:22:12 -0000 1.4 @@ -1 +1 @@ -9a9e45a12cb321f60bd9013421be5e6a mock-0.3.tar.gz +37a480a4da61035ac6812aec3684ccf6 mock-0.4.tar.gz \ No newline at end of file From fedora-extras-commits at redhat.com Thu Aug 4 04:22:09 2005 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Thu, 4 Aug 2005 00:22:09 -0400 Subject: rpms/mock/FC-4 .cvsignore, 1.3, 1.4 mock.spec, 1.5, 1.6 sources, 1.3, 1.4 Message-ID: <200508040422.j744MdAq031910@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/extras/rpms/mock/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31849/FC-4 Modified Files: .cvsignore mock.spec sources Log Message: 0.4 on all branches update urls all over Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mock/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 12 Jun 2005 05:27:49 -0000 1.3 +++ .cvsignore 4 Aug 2005 04:22:07 -0000 1.4 @@ -1 +1 @@ -mock-0.3.tar.gz +mock-0.4.tar.gz Index: mock.spec =================================================================== RCS file: /cvs/extras/rpms/mock/FC-4/mock.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- mock.spec 12 Jun 2005 20:28:57 -0000 1.5 +++ mock.spec 4 Aug 2005 04:22:07 -0000 1.6 @@ -1,11 +1,11 @@ Summary: Builds packages inside chroots Name: mock -Version: 0.3 -Release: 2%{?dist} +Version: 0.4 +Release: 1%{?dist} License: GPL Group: Development/Tools -Source: http://linux.duke.edu/~skvidal/mock/%{name}-%{version}.tar.gz -URL: http://linux.duke.edu/~skvidal/mock/ +Source: http://fedoraproject.org/projects/mock/releases/%{name}-%{version}.tar.gz +URL: http://fedoraproject.org/wiki/Projects/Mock BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: python, yum >= 2.2.1 Requires(pre): shadow-utils @@ -63,6 +63,10 @@ %changelog +* Thu Aug 4 2005 Seth Vidal +- 0.4 +- update urls + * Sun Jun 12 2005 Jeremy Katz - set default.cfg based on both arch and distro built for Index: sources =================================================================== RCS file: /cvs/extras/rpms/mock/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 12 Jun 2005 05:27:49 -0000 1.3 +++ sources 4 Aug 2005 04:22:07 -0000 1.4 @@ -1 +1 @@ -9a9e45a12cb321f60bd9013421be5e6a mock-0.3.tar.gz +37a480a4da61035ac6812aec3684ccf6 mock-0.4.tar.gz From fedora-extras-commits at redhat.com Thu Aug 4 04:22:08 2005 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Thu, 4 Aug 2005 00:22:08 -0400 Subject: rpms/mock/FC-3 mock.spec,1.5,1.6 sources,1.3,1.4 Message-ID: <200508040422.j744Mc8k031905@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/extras/rpms/mock/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31849/FC-3 Modified Files: mock.spec sources Log Message: 0.4 on all branches update urls all over Index: mock.spec =================================================================== RCS file: /cvs/extras/rpms/mock/FC-3/mock.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- mock.spec 12 Jun 2005 20:28:24 -0000 1.5 +++ mock.spec 4 Aug 2005 04:22:06 -0000 1.6 @@ -1,11 +1,11 @@ Summary: Builds packages inside chroots Name: mock -Version: 0.3 -Release: 2%{?dist} +Version: 0.4 +Release: 1%{?dist} License: GPL Group: Development/Tools -Source: http://linux.duke.edu/~skvidal/mock/%{name}-%{version}.tar.gz -URL: http://linux.duke.edu/~skvidal/mock/ +Source: http://fedoraproject.org/projects/mock/releases/%{name}-%{version}.tar.gz +URL: http://fedoraproject.org/wiki/Projects/Mock BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: python, yum >= 2.2.1 Requires(pre): shadow-utils @@ -63,6 +63,10 @@ %changelog +* Thu Aug 4 2005 Seth Vidal +- 0.4 +- update urls + * Sun Jun 12 2005 Jeremy Katz - set default.cfg based on both arch and distro built for Index: sources =================================================================== RCS file: /cvs/extras/rpms/mock/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 12 Jun 2005 05:27:49 -0000 1.3 +++ sources 4 Aug 2005 04:22:06 -0000 1.4 @@ -1 +1 @@ -9a9e45a12cb321f60bd9013421be5e6a mock-0.3.tar.gz +37a480a4da61035ac6812aec3684ccf6 mock-0.4.tar.gz \ No newline at end of file From fedora-extras-commits at redhat.com Thu Aug 4 04:26:08 2005 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Thu, 4 Aug 2005 00:26:08 -0400 Subject: rpms/mock/FC-3 .cvsignore,1.3,1.4 sources,1.4,1.5 Message-ID: <200508040426.j744Q85h032055@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/extras/rpms/mock/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32036 Modified Files: .cvsignore sources Log Message: new sources, again, I guess. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mock/FC-3/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 12 Jun 2005 05:27:49 -0000 1.3 +++ .cvsignore 4 Aug 2005 04:26:06 -0000 1.4 @@ -1 +1 @@ -mock-0.3.tar.gz +mock-0.4.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/mock/FC-3/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 4 Aug 2005 04:22:06 -0000 1.4 +++ sources 4 Aug 2005 04:26:06 -0000 1.5 @@ -1 +1 @@ -37a480a4da61035ac6812aec3684ccf6 mock-0.4.tar.gz \ No newline at end of file +37a480a4da61035ac6812aec3684ccf6 mock-0.4.tar.gz From fedora-extras-commits at redhat.com Thu Aug 4 04:26:32 2005 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Thu, 4 Aug 2005 00:26:32 -0400 Subject: rpms/mock/devel .cvsignore,1.3,1.4 sources,1.4,1.5 Message-ID: <200508040426.j744QWGq032086@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/extras/rpms/mock/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32067 Modified Files: .cvsignore sources Log Message: new sources here, too Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mock/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 12 Jun 2005 04:01:34 -0000 1.3 +++ .cvsignore 4 Aug 2005 04:26:30 -0000 1.4 @@ -1 +1 @@ -mock-0.3.tar.gz +mock-0.4.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/mock/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 4 Aug 2005 04:22:12 -0000 1.4 +++ sources 4 Aug 2005 04:26:30 -0000 1.5 @@ -1 +1 @@ -37a480a4da61035ac6812aec3684ccf6 mock-0.4.tar.gz \ No newline at end of file +37a480a4da61035ac6812aec3684ccf6 mock-0.4.tar.gz From fedora-extras-commits at redhat.com Thu Aug 4 05:02:40 2005 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Thu, 4 Aug 2005 01:02:40 -0400 Subject: rpms/mock/FC-4 mock.spec,1.6,1.7 Message-ID: <200508040503.j7453gAt000844@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/extras/rpms/mock/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv789/FC-4 Modified Files: mock.spec Log Message: fix spec files to allow building Index: mock.spec =================================================================== RCS file: /cvs/extras/rpms/mock/FC-4/mock.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- mock.spec 4 Aug 2005 04:22:07 -0000 1.6 +++ mock.spec 4 Aug 2005 05:02:37 -0000 1.7 @@ -1,7 +1,7 @@ Summary: Builds packages inside chroots Name: mock Version: 0.4 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Development/Tools Source: http://fedoraproject.org/projects/mock/releases/%{name}-%{version}.tar.gz @@ -9,7 +9,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: python, yum >= 2.2.1 Requires(pre): shadow-utils - +BuildRequires: libselinux-devel %description Mock takes a srpm and builds it in a chroot @@ -58,14 +58,17 @@ %dir %{_sysconfdir}/%{name} %config(noreplace) %{_sysconfdir}/%{name}/*.cfg %{_bindir}/%{name} +%{_libexecdir}/mock-yum %attr(04750, root, mock) %{_sbindir}/mock-helper %attr(02775, root, mock) %dir /var/lib/mock +%{_libdir}/libselinux-mock.so %changelog * Thu Aug 4 2005 Seth Vidal - 0.4 - update urls +- add in selinux buildreq and mock-yum file * Sun Jun 12 2005 Jeremy Katz - set default.cfg based on both arch and distro built for From fedora-extras-commits at redhat.com Thu Aug 4 05:03:12 2005 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Thu, 4 Aug 2005 01:03:12 -0400 Subject: rpms/mock/devel mock.spec,1.6,1.7 Message-ID: <200508040503.j7453gst000845@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/extras/rpms/mock/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv789/devel Modified Files: mock.spec Log Message: fix spec files to allow building Index: mock.spec =================================================================== RCS file: /cvs/extras/rpms/mock/devel/mock.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- mock.spec 4 Aug 2005 04:22:12 -0000 1.6 +++ mock.spec 4 Aug 2005 05:03:09 -0000 1.7 @@ -1,7 +1,7 @@ Summary: Builds packages inside chroots Name: mock Version: 0.4 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Development/Tools Source: http://fedoraproject.org/projects/mock/releases/%{name}-%{version}.tar.gz @@ -9,7 +9,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: python, yum >= 2.2.1 Requires(pre): shadow-utils - +BuildRequires: libselinux-devel %description Mock takes a srpm and builds it in a chroot @@ -58,14 +58,17 @@ %dir %{_sysconfdir}/%{name} %config(noreplace) %{_sysconfdir}/%{name}/*.cfg %{_bindir}/%{name} +%{_libexecdir}/mock-yum %attr(04750, root, mock) %{_sbindir}/mock-helper %attr(02775, root, mock) %dir /var/lib/mock +%{_libdir}/libselinux-mock.so %changelog * Thu Aug 4 2005 Seth Vidal - 0.4 - update urls +- add in selinux buildreq and mock-yum file * Sun Jun 12 2005 Jeremy Katz - set default.cfg based on both arch and distro built for From fedora-extras-commits at redhat.com Thu Aug 4 05:02:09 2005 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Thu, 4 Aug 2005 01:02:09 -0400 Subject: rpms/mock/FC-3 mock.spec,1.6,1.7 Message-ID: <200508040503.j7453edi000843@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/extras/rpms/mock/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv789/FC-3 Modified Files: mock.spec Log Message: fix spec files to allow building Index: mock.spec =================================================================== RCS file: /cvs/extras/rpms/mock/FC-3/mock.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- mock.spec 4 Aug 2005 04:22:06 -0000 1.6 +++ mock.spec 4 Aug 2005 05:02:06 -0000 1.7 @@ -1,7 +1,7 @@ Summary: Builds packages inside chroots Name: mock Version: 0.4 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Development/Tools Source: http://fedoraproject.org/projects/mock/releases/%{name}-%{version}.tar.gz @@ -9,7 +9,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: python, yum >= 2.2.1 Requires(pre): shadow-utils - +BuildRequires: libselinux-devel %description Mock takes a srpm and builds it in a chroot @@ -58,14 +58,17 @@ %dir %{_sysconfdir}/%{name} %config(noreplace) %{_sysconfdir}/%{name}/*.cfg %{_bindir}/%{name} +%{_libexecdir}/mock-yum %attr(04750, root, mock) %{_sbindir}/mock-helper %attr(02775, root, mock) %dir /var/lib/mock +%{_libdir}/libselinux-mock.so %changelog * Thu Aug 4 2005 Seth Vidal - 0.4 - update urls +- add in selinux buildreq and mock-yum file * Sun Jun 12 2005 Jeremy Katz - set default.cfg based on both arch and distro built for From fedora-extras-commits at redhat.com Thu Aug 4 05:08:58 2005 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Thu, 4 Aug 2005 01:08:58 -0400 Subject: rpms/seahorse/FC-4 seahorse.spec,1.13,1.14 Message-ID: <200508040509.j74590GY000964@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/extras/rpms/seahorse/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv947 Modified Files: seahorse.spec Log Message: fix bug 164678 Index: seahorse.spec =================================================================== RCS file: /cvs/extras/rpms/seahorse/FC-4/seahorse.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- seahorse.spec 29 Jul 2005 04:42:14 -0000 1.13 +++ seahorse.spec 4 Aug 2005 05:08:56 -0000 1.14 @@ -1,6 +1,6 @@ Name: seahorse Version: 0.7.9 -Release: 1%{dist} +Release: 2%{dist} Summary: GNOME2 interface for gnupg Group: User Interface/Desktops License: GPL @@ -69,8 +69,8 @@ ${RPM_BUILD_ROOT}%{_datadir}/applications/seahorse.desktop -find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';' -find ${RPM_BUILD_ROOT} -type f -name "*.a" -exec rm -f {} ';' +#find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';' +#find ${RPM_BUILD_ROOT} -type f -name "*.a" -exec rm -f {} ';' %clean @@ -114,10 +114,16 @@ %{_libdir}/libseahorse-internal* %{_libdir}/gedit-2/plugins/* %{_libdir}/nautilus/extensions-1.0/libnautilus-seahorse.so +%{_libdir}/nautilus/extensions-1.0/libnautilus-seahorse.a +%{_libdir}/nautilus/extensions-1.0/libnautilus-seahorse.la %{_sysconfdir}/gconf/schemas/* %changelog +* Thu Aug 4 2005 Seth Vidal - 0.7.9-2 +- add openldap-devel to make it stop crashing +- fixes rh-bug # 164678 + * Thu Jul 28 2005 Seth Vidal - 0.7.9-1 - 0.7.9 From fedora-extras-commits at redhat.com Thu Aug 4 06:03:47 2005 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Thu, 4 Aug 2005 02:03:47 -0400 Subject: rpms/seahorse/FC-4 seahorse.spec,1.14,1.15 Message-ID: <200508040604.j7464KnR002320@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/extras/rpms/seahorse/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2298 Modified Files: seahorse.spec Log Message: make the changes I said I was going to make Index: seahorse.spec =================================================================== RCS file: /cvs/extras/rpms/seahorse/FC-4/seahorse.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- seahorse.spec 4 Aug 2005 05:08:56 -0000 1.14 +++ seahorse.spec 4 Aug 2005 06:03:45 -0000 1.15 @@ -1,6 +1,6 @@ Name: seahorse Version: 0.7.9 -Release: 2%{dist} +Release: 3%{dist} Summary: GNOME2 interface for gnupg Group: User Interface/Desktops License: GPL @@ -17,6 +17,7 @@ BuildRequires: perl-XML-Parser BuildRequires: scrollkeeper BuildRequires: nautilus-devel +BuildRequires: openldap-devel Requires(post): desktop-file-utils Requires(post): GConf2 Requires(post): scrollkeeper @@ -120,6 +121,9 @@ %changelog +* Thu Aug 4 2005 Seth Vidal - 0.7.9-3 +- actually make the change + * Thu Aug 4 2005 Seth Vidal - 0.7.9-2 - add openldap-devel to make it stop crashing - fixes rh-bug # 164678 From fedora-extras-commits at redhat.com Thu Aug 4 06:51:27 2005 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Thu, 4 Aug 2005 02:51:27 -0400 Subject: extras-buildsys/www failed.psp,NONE,1.1 success.psp,NONE,1.1 Message-ID: <200508040651.j746pR41002464@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/fedora/extras-buildsys/www In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2439 Added Files: failed.psp success.psp Log Message: check in www changes for failed and success pages --- NEW FILE failed.psp --- <% curpage = 'failed' %> <%@ include file="template/main.psp"%> <%@ include file="template/head.psp"%> <% import socket, xmlrpclib try: args = {} args['status'] = 'failed' args['maxrows'] = 100 (e, msg, these_jobs) = server.list_jobs(args) except socket.error, e: msg = str(e) %> Could not contact the server. Error was:<%=msg%> <% except xmlrpclib.Fault, fault: msg = "XMLRPC Fault" e = -1 if e == -1: %> The server could not process the request. Error was:  <%=msg%> <% else: i = 1 %> <% i = 1 for job in these_jobs: top = '' if i == 1: top = '-top' col_mod = '' if int(i / 2.0) == (i / 2.0): col_mod = '-alt' source = job['source'] if '/' in source: import os source = os.path.basename(source) # endif joblink = job_link(job['uid']) despam_user = job['username'].replace('@', ' ') %> <% i = i + 1 # endfor # No jobs... if i == 1: %> <% # endif %> JOB ID PACKAGE NAME SOURCE STATUS TARGET SUBMITTER <%=job['uid']%> <%=job['package']%> <%=source%> <%=job['status']%> <%=job['target']%> <%=despam_user%> No jobs found.
<% # endtry %> <%@ include file="template/foot.psp"%> --- NEW FILE success.psp --- <% curpage = 'success' %> <%@ include file="template/main.psp"%> <%@ include file="template/head.psp"%> <% import socket, xmlrpclib try: args = {} args['status'] = 'needsign' args['maxrows'] = 100 (e, msg, some_jobs) = server.list_jobs(args) args['status'] = 'addtorepo' (e, msg, other_jobs) = server.list_jobs(args) these_jobs = other_jobs + some_jobs except socket.error, e: msg = str(e) %> Could not contact the server. Error was:<%=msg%> <% except xmlrpclib.Fault, fault: msg = "XMLRPC Fault" e = -1 if e == -1: %> The server could not process the request. Error was:  <%=msg%> <% else: i = 1 %> <% i = 1 for job in these_jobs: top = '' if i == 1: top = '-top' col_mod = '' if int(i / 2.0) == (i / 2.0): col_mod = '-alt' source = job['source'] if '/' in source: import os source = os.path.basename(source) # endif joblink = job_link(job['uid']) despam_user = job['username'].replace('@', ' ') %> <% i = i + 1 # endfor # No jobs... if i == 1: %> <% # endif %> JOB ID PACKAGE NAME SOURCE STATUS TARGET SUBMITTER <%=job['uid']%> <%=job['package']%> <%=source%> <%=job['status']%> <%=job['target']%> <%=despam_user%> No jobs found.
<% # endtry %> <%@ include file="template/foot.psp"%> From fedora-extras-commits at redhat.com Thu Aug 4 06:51:27 2005 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Thu, 4 Aug 2005 02:51:27 -0400 Subject: extras-buildsys/www/template head.psp,1.4,1.5 Message-ID: <200508040651.j746pvaE002474@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/fedora/extras-buildsys/www/template In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2439/template Modified Files: head.psp Log Message: check in www changes for failed and success pages Index: head.psp =================================================================== RCS file: /cvs/fedora/extras-buildsys/www/template/head.psp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- head.psp 26 Jul 2005 23:42:17 -0000 1.4 +++ head.psp 4 Aug 2005 06:51:25 -0000 1.5 @@ -20,6 +20,12 @@ main_active = '' if curpage == 'main': main_active = '-active' +failed_active = '' +if curpage == 'failed': + failed_active = '-active' +success_active = '' +if curpage == 'success': + success_active = '-active' builders_active = '' if curpage == 'builders': builders_active = '-active' @@ -63,6 +69,10 @@ Builder Status l My Packages l Failed Builds l Successful Builds

No jobs found. No jobs found.
<%=job['uid']%> <%=job['package']%> <%=source%> <%=job['status']%> <%=job['target']%> <%=username%>
No jobs found. No jobs found.
<%=job['uid']%> <%=job['package']%> <%=source%> <%=job['status']%> <%=job['status']%>/<%=job['result']%> <%=job['target']%>
- - + + + @@ -84,7 +86,7 @@ if i == 1: %> - + <% # endif From fedora-extras-commits at redhat.com Thu Aug 4 20:27:15 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 4 Aug 2005 16:27:15 -0400 Subject: extras-buildsys/www/css style.css,1.4,1.5 Message-ID: <200508042027.j74KRFaq026271@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/www/css In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26158/www/css Modified Files: style.css Log Message: 2005-08-04 Dan Williams * Attempts to reduce network bandwidth usage between client & server - for listing jobs, 'status' item in the arg list is now a list itself which is combined using OR. - New 'orderby' arg for listing jobs - Fixes for both of the above in the web interface, the client, and the server * Small fixes to the web interface to display 'result' as well as 'status' Index: style.css =================================================================== RCS file: /cvs/fedora/extras-buildsys/www/css/style.css,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- style.css 27 Jul 2005 07:25:36 -0000 1.4 +++ style.css 4 Aug 2005 20:27:13 -0000 1.5 @@ -189,7 +189,7 @@ font-size: 12px; } -font.status-addtorepo { +font.status-add_to_repo { color: #aaaa00; font-weight: bold; font-size: 12px; @@ -207,6 +207,23 @@ font-size: 12px; } +font.result-failed { + color: #aa0000; + font-weight: bold; + font-size: 12px; +} + +font.result-success { + color: #00aa00; + font-weight: bold; + font-size: 12px; +} + +font.result-in-progress { + color: #0000aa; + font-weight: bold; + font-size: 12px; +} /* ------------------------------- @@ -247,7 +264,7 @@ } td.archjobs { - padding: 5px 10px 5px 10px; + padding: 5px 5px 5px 5px; } font.archjobtag { From fedora-extras-commits at redhat.com Thu Aug 4 20:53:06 2005 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Thu, 4 Aug 2005 16:53:06 -0400 Subject: mock mock.py,1.25,1.26 Message-ID: <200508042053.j74Kr6DO027765@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/fedora/mock In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27738 Modified Files: mock.py Log Message: check in Jeff Sheltren's patch to fix bug: 165069 Index: mock.py =================================================================== RCS file: /cvs/fedora/mock/mock.py,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- mock.py 4 Aug 2005 07:23:01 -0000 1.25 +++ mock.py 4 Aug 2005 20:53:02 -0000 1.26 @@ -770,6 +770,7 @@ try: my = None # if Root() fails, my will be undefined so we force it to None my = Root(config_opts) + os.umask(0022) # set a umask- protects from paranoid whackjobs with an 002 umask my.prep() my.build(srpm) except Error, e: From tcallawa at redhat.com Thu Aug 4 20:55:37 2005 From: tcallawa at redhat.com (Tom 'spot' Callaway) Date: Thu, 04 Aug 2005 15:55:37 -0500 Subject: APPROVED: perl-Image-ExifTool Message-ID: <1123188937.2613.34.camel@localhost.localdomain> perl-Image-ExifTool: ExifTool is a Perl module with an included command-line application for reading and writing meta information in image files. It reads EXIF, GPS, IPTC, XMP, GeoTIFF, ICC Profile and Photoshop IRB meta information from JPG, JP2, TIFF, GIF, PNG, MNG, JNG, MIFF, EPS, PS, AI, PDF, PSD, BMP, THM, CRW, CR2, MRW, NEF, PEF, ORF and DNG images. ExifTool also extracts information from the maker notes of many digital cameras by various manufacturers including Canon, Casio, FujiFilm, Kodak, Minolta/Konica-Minolta, Nikon, Olympus/Epson, Panasonic/Leica, Pentax/Asahi, Ricoh, Sanyo and Sigma/Foveon. Reviewer: Chris Grau Maintainer: Tom 'spot' Callaway ~spot -- Tom "spot" Callaway: Red Hat Senior Sales Engineer || GPG ID: 93054260 Fedora Extras Steering Committee Member (RPM Standards and Practices) Aurora Linux Project Leader: http://auroralinux.org Lemurs, llamas, and sparcs, oh my! From fedora-extras-commits at redhat.com Thu Aug 4 20:55:26 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 4 Aug 2005 16:55:26 -0400 Subject: rpms/perl-Image-ExifTool - New directory Message-ID: <200508042055.j74KtQxj027839@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Image-ExifTool In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27815/perl-Image-ExifTool Log Message: Directory /cvs/extras/rpms/perl-Image-ExifTool added to the repository From fedora-extras-commits at redhat.com Thu Aug 4 20:55:26 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 4 Aug 2005 16:55:26 -0400 Subject: rpms/perl-Image-ExifTool/devel - New directory Message-ID: <200508042055.j74KtQiV027844@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Image-ExifTool/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27815/perl-Image-ExifTool/devel Log Message: Directory /cvs/extras/rpms/perl-Image-ExifTool/devel added to the repository From fedora-extras-commits at redhat.com Thu Aug 4 20:55:34 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 4 Aug 2005 16:55:34 -0400 Subject: rpms/perl-Image-ExifTool Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200508042055.j74KtYar027887@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Image-ExifTool In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27860 Added Files: Makefile import.log Log Message: Setup of module perl-Image-ExifTool --- NEW FILE Makefile --- # Top level Makefile for module perl-Image-ExifTool all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Thu Aug 4 20:55:34 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 4 Aug 2005 16:55:34 -0400 Subject: rpms/perl-Image-ExifTool/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200508042055.j74KtYT0027892@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Image-ExifTool/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27860/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Image-ExifTool --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Thu Aug 4 20:55:52 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 4 Aug 2005 16:55:52 -0400 Subject: rpms/perl-Image-ExifTool import.log,1.1,1.2 Message-ID: <200508042056.j74KuMeP028151@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Image-ExifTool In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27971 Modified Files: import.log Log Message: auto-import perl-Image-ExifTool-5.53-1 on branch devel from perl-Image-ExifTool-5.53-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Image-ExifTool/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 4 Aug 2005 20:55:32 -0000 1.1 +++ import.log 4 Aug 2005 20:55:50 -0000 1.2 @@ -0,0 +1 @@ +perl-Image-ExifTool-5_53-1:HEAD:perl-Image-ExifTool-5.53-1.src.rpm:1123189009 From fedora-extras-commits at redhat.com Thu Aug 4 20:55:52 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 4 Aug 2005 16:55:52 -0400 Subject: rpms/perl-Image-ExifTool/devel perl-Image-ExifTool.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200508042056.j74KuN3W028155@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Image-ExifTool/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27971/devel Modified Files: .cvsignore sources Added Files: perl-Image-ExifTool.spec Log Message: auto-import perl-Image-ExifTool-5.53-1 on branch devel from perl-Image-ExifTool-5.53-1.src.rpm --- NEW FILE perl-Image-ExifTool.spec --- Name: perl-Image-ExifTool Version: 5.53 Release: 1%{?dist} License: GPL or Artistic Group: Applications/Multimedia Summary: Utility for reading and writing image meta info URL: http://www.sno.phy.queensu.ca/%7Ephil/exiftool/ Source0: http://www.sno.phy.queensu.ca/%7Ephil/exiftool/Image-ExifTool-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl >= 1:5.6.1 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description ExifTool is a Perl module with an included command-line application for reading and writing meta information in image files. It reads EXIF, GPS, IPTC, XMP, GeoTIFF, ICC Profile and Photoshop IRB meta information from JPG, JP2, TIFF, GIF, PNG, MNG, JNG, MIFF, EPS, PS, AI, PDF, PSD, BMP, THM, CRW, CR2, MRW, NEF, PEF, ORF and DNG images. ExifTool also extracts information from the maker notes of many digital cameras by various manufacturers including Canon, Casio, FujiFilm, Kodak, Minolta/Konica-Minolta, Nikon, Olympus/Epson, Panasonic/Leica, Pentax/Asahi, Ricoh, Sanyo and Sigma/Foveon. %prep %setup -q -n Image-ExifTool-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' chmod -R u+w $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc README Changes %{_bindir}/exiftool %{perl_vendorlib}/* %{_mandir}/man1/*.1* %{_mandir}/man3/*.3* %changelog * Thu Aug 4 2005 Tom "spot" Callaway 5.53-1 - initial package for Fedora Extras Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Image-ExifTool/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 4 Aug 2005 20:55:32 -0000 1.1 +++ .cvsignore 4 Aug 2005 20:55:50 -0000 1.2 @@ -0,0 +1 @@ +Image-ExifTool-5.53.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Image-ExifTool/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 4 Aug 2005 20:55:32 -0000 1.1 +++ sources 4 Aug 2005 20:55:50 -0000 1.2 @@ -0,0 +1 @@ +61cb796b444d16d2af7bb1c9c4d4991d Image-ExifTool-5.53.tar.gz From fedora-extras-commits at redhat.com Thu Aug 4 21:11:33 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 4 Aug 2005 17:11:33 -0400 Subject: rpms/stripesnoop - New directory Message-ID: <200508042111.j74LBXYF030355@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/stripesnoop In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30335/stripesnoop Log Message: Directory /cvs/extras/rpms/stripesnoop added to the repository From fedora-extras-commits at redhat.com Thu Aug 4 21:11:33 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 4 Aug 2005 17:11:33 -0400 Subject: rpms/stripesnoop/devel - New directory Message-ID: <200508042111.j74LBXJg030360@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/stripesnoop/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30335/stripesnoop/devel Log Message: Directory /cvs/extras/rpms/stripesnoop/devel added to the repository From fedora-extras-commits at redhat.com Thu Aug 4 21:11:45 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 4 Aug 2005 17:11:45 -0400 Subject: rpms/stripesnoop Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200508042111.j74LBjxX030411@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/stripesnoop In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30380 Added Files: Makefile import.log Log Message: Setup of module stripesnoop --- NEW FILE Makefile --- # Top level Makefile for module stripesnoop all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Thu Aug 4 21:11:46 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 4 Aug 2005 17:11:46 -0400 Subject: rpms/stripesnoop/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200508042111.j74LBkhB030416@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/stripesnoop/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30380/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module stripesnoop --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Thu Aug 4 21:12:01 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 4 Aug 2005 17:12:01 -0400 Subject: rpms/stripesnoop import.log,1.1,1.2 Message-ID: <200508042112.j74LCVQ8030496@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/stripesnoop In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30454 Modified Files: import.log Log Message: auto-import stripesnoop-1.5-2 on branch devel from stripesnoop-1.5-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/stripesnoop/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 4 Aug 2005 21:11:43 -0000 1.1 +++ import.log 4 Aug 2005 21:11:59 -0000 1.2 @@ -0,0 +1 @@ +stripesnoop-1_5-2:HEAD:stripesnoop-1.5-2.src.rpm:1123189978 From fedora-extras-commits at redhat.com Thu Aug 4 21:12:01 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 4 Aug 2005 17:12:01 -0400 Subject: rpms/stripesnoop/devel stripesnoop-1.5-deflinux.patch, NONE, 1.1 stripesnoop-1.5-rpmoptflags.patch, NONE, 1.1 stripesnoop.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200508042112.j74LCWMv030500@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/stripesnoop/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30454/devel Modified Files: .cvsignore sources Added Files: stripesnoop-1.5-deflinux.patch stripesnoop-1.5-rpmoptflags.patch stripesnoop.spec Log Message: auto-import stripesnoop-1.5-2 on branch devel from stripesnoop-1.5-2.src.rpm stripesnoop-1.5-deflinux.patch: --- NEW FILE stripesnoop-1.5-deflinux.patch --- --- stripesnoop-1.5/ss.cpp.BAD 2005-08-04 13:31:42.000000000 -0500 +++ stripesnoop-1.5/ss.cpp 2005-08-04 13:32:06.000000000 -0500 @@ -31,9 +31,9 @@ #define EVEN 0 /* select the OS to compile for? */ -#define WIN9X 1 +/*#define WIN9X 1*/ /*#define WINNT 1*/ -/*#define LINUX 1*/ +#define LINUX /* Standard Includes */ #include stripesnoop-1.5-rpmoptflags.patch: --- NEW FILE stripesnoop-1.5-rpmoptflags.patch --- --- stripesnoop-1.5/Makefile.BAD 2005-08-04 13:23:14.000000000 -0500 +++ stripesnoop-1.5/Makefile 2005-08-04 13:24:07.000000000 -0500 @@ -4,17 +4,17 @@ all: ss bitgen mod10 ss: ss.o parser.o - $(CXX) ss.o parser.o -o ss + $(CXX) $(RPM_OPT_FLAGS) ss.o parser.o -o ss ss.o: ss.cpp - $(CXX) -c ss.cpp + $(CXX) $(RPM_OPT_FLAGS) -c ss.cpp parser.o: parser.cpp parser.h - $(CXX) -c parser.cpp + $(CXX) $(RPM_OPT_FLAGS) -c parser.cpp bitgen: bitgen.c - $(CC) -o bitgen bitgen.c + $(CC) $(RPM_OPT_FLAGS) -o bitgen bitgen.c mod10: mod10.c - $(CC) -o mod10 mod10.c + $(CC) $(RPM_OPT_FLAGS) -o mod10 mod10.c clean: rm -f *.o --- NEW FILE stripesnoop.spec --- Name: stripesnoop Version: 1.5 Release: 2%{?dist} License: GPL Group: Applications/System Summary: Magnetic Stripe Reader URL: http://stripesnoop.sourceforge.net Source0: http://download.sourceforge.net/stripesnoop/ss-%{version}-src.zip BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch0: stripesnoop-1.5-rpmoptflags.patch Patch1: stripesnoop-1.5-deflinux.patch %description Stripe Snoop is a suite of research tools that captures, modifies, validates, generates, analyzes, and shares data from magstripe cards. Numerous readers are supported to gather this information. In addition to simply displaying the raw characters that are encoded on the card, Stripe Snoop has a database of known card formats. It uses this to give you more detailed information about the card. %package devel Summary: Headers for stripesnoop Requires: %{name} = %{version}-%{release} Group: Development/System %description devel %{summary}. %prep %setup -q -c %{name}-%{version} %patch0 -p1 %patch1 -p1 chmod -x cards.txt ChangeLog.txt COPYING.txt README.txt visa-pre.txt \ hardware/* samples/* %build make %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/%{_includedir}/%{name} mkdir -p $RPM_BUILD_ROOT/%{_bindir} install -m0644 *.h dl-iin.csv $RPM_BUILD_ROOT/%{_includedir}/%{name} install -m0755 bitgen mod10 ss $RPM_BUILD_ROOT/%{_bindir} %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc ChangeLog.txt COPYING.txt README.txt hardware/ samples/ visa-pre.txt %{_bindir}/ss %{_bindir}/bitgen %{_bindir}/mod10 %files devel %defattr(-,root,root,-) %{_includedir}/%{name} %changelog * Thu Aug 4 2005 Tom "spot" Callaway 1.5-2 - fix devel requires typo * Thu Aug 4 2005 Tom "spot" Callaway 1.5-1 - initial package for Fedora Extras Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/stripesnoop/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 4 Aug 2005 21:11:44 -0000 1.1 +++ .cvsignore 4 Aug 2005 21:11:59 -0000 1.2 @@ -0,0 +1 @@ +ss-1.5-src.zip Index: sources =================================================================== RCS file: /cvs/extras/rpms/stripesnoop/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 4 Aug 2005 21:11:44 -0000 1.1 +++ sources 4 Aug 2005 21:11:59 -0000 1.2 @@ -0,0 +1 @@ +a8837f6596b8eaaeb6c33c6f014ac8c8 ss-1.5-src.zip From fedora-extras-commits at redhat.com Thu Aug 4 21:12:56 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 4 Aug 2005 17:12:56 -0400 Subject: extras-buildsys/www/template head.psp,1.5,1.6 Message-ID: <200508042112.j74LCu10030609@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/www/template In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30502/www/template Modified Files: head.psp Log Message: 2005-08-04 Dan Williams * server/UserInterface.py - Accept asc/desc ordering in addition to field order. You now do e.x.: args['orderby'] = ['package asc', 'endtime desc'] * www/indiv.psp - Stick in-progress jobs at the top of the list * www/template/head.psp - Keep user's email address through the success/failed pages Index: head.psp =================================================================== RCS file: /cvs/fedora/extras-buildsys/www/template/head.psp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- head.psp 4 Aug 2005 06:51:25 -0000 1.5 +++ head.psp 4 Aug 2005 21:12:54 -0000 1.6 @@ -70,9 +70,9 @@ - + - +

- <%=aj['arch']%>: - <%=aj['builder_addr']%> - <%=aj['arch']%>: <%=aj['builder_addr']%> Status: <%=aj['status']%>/<%=aj['builder_status']%> Index: success.psp =================================================================== RCS file: /cvs/fedora/extras-buildsys/www/success.psp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- success.psp 4 Aug 2005 06:51:25 -0000 1.1 +++ success.psp 4 Aug 2005 20:27:12 -0000 1.2 @@ -8,11 +8,13 @@ <% import socket, xmlrpclib try: + # show any jobs that have successfully built args = {} - args['status'] = 'needsign' + args['result'] = 'success' args['maxrows'] = 100 (e, msg, some_jobs) = server.list_jobs(args) - args['status'] = 'addtorepo' + args['status'] = ['add_to_repo'] + args['maxrows'] = 100 (e, msg, other_jobs) = server.list_jobs(args) these_jobs = other_jobs + some_jobs except socket.error, e: @@ -66,7 +68,7 @@ # endif joblink = job_link(job['uid']) - despam_user = job['username'].replace('@', ' ') + despam_user = job['username'].replace('@', ' ') %>
<%=job['uid']%>
No jobs found. No jobs found.
l My Packages l Failed Builds Failed Builds l Successful Builds Successful Builds

Target: <%=str(job['target'])%>

Submitter: <%=str(job['username'])%>

Source: <%=str(job['source'])%>
Started: <%=str(time.ctime(job['starttime']))%>
Build Time: <%=str(total_time)%> minutes
Ended: <%=str(time.ctime(job['endtime']))%> (ran for <%=str(total_time)%> minutes)

+ + +
+ <% for aj in job['archjobs']: i = 1 %> - - - <% # endfor %> +
- @@ -108,12 +109,12 @@ %> -

<%=aj['arch']%>:
-
+

From fedora-extras-commits at redhat.com Fri Aug 5 16:42:48 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 5 Aug 2005 12:42:48 -0400 Subject: rpms/mathml-fonts/devel mathml-fonts.spec,1.7,1.8 Message-ID: <200508051642.j75Ggm1m027873@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/mathml-fonts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27850 Modified Files: mathml-fonts.spec Log Message: grr... can't share tags across branches... fine. Using %{?dist} Index: mathml-fonts.spec =================================================================== RCS file: /cvs/extras/rpms/mathml-fonts/devel/mathml-fonts.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- mathml-fonts.spec 5 Aug 2005 16:06:29 -0000 1.7 +++ mathml-fonts.spec 5 Aug 2005 16:42:46 -0000 1.8 @@ -6,7 +6,7 @@ Summary: Mathematical symbol fonts Name: mathml-fonts Version: 1.0 -Release: 17 +Release: 17%{?dist} URL: http://www.mozilla.org/projects/mathml/fonts/ License: Distributable From fedora-extras-commits at redhat.com Fri Aug 5 16:44:18 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 5 Aug 2005 12:44:18 -0400 Subject: rpms/mathml-fonts/FC-4 mathml-fonts.spec,1.7,1.8 Message-ID: <200508051644.j75GiIRq027944@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/mathml-fonts/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27927 Modified Files: mathml-fonts.spec Log Message: use %{?dist} Index: mathml-fonts.spec =================================================================== RCS file: /cvs/extras/rpms/mathml-fonts/FC-4/mathml-fonts.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- mathml-fonts.spec 5 Aug 2005 16:41:14 -0000 1.7 +++ mathml-fonts.spec 5 Aug 2005 16:44:16 -0000 1.8 @@ -6,7 +6,7 @@ Summary: Mathematical symbol fonts Name: mathml-fonts Version: 1.0 -Release: 17 +Release: 17%{?dist} URL: http://www.mozilla.org/projects/mathml/fonts/ License: Distributable From fedora-extras-commits at redhat.com Fri Aug 5 16:44:55 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 5 Aug 2005 12:44:55 -0400 Subject: rpms/mathml-fonts/FC-3 find_symbol_font.sh, 1.1, 1.2 mathml-fonts.spec, 1.3, 1.4 Message-ID: <200508051644.j75Gittb028012@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/mathml-fonts/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27993 Modified Files: find_symbol_font.sh mathml-fonts.spec Log Message: sync w/-devel branch Index: mathml-fonts.spec =================================================================== RCS file: /cvs/extras/rpms/mathml-fonts/FC-3/mathml-fonts.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- mathml-fonts.spec 3 Aug 2005 20:10:57 -0000 1.3 +++ mathml-fonts.spec 5 Aug 2005 16:44:53 -0000 1.4 @@ -6,7 +6,7 @@ Summary: Mathematical symbol fonts Name: mathml-fonts Version: 1.0 -Release: 16 +Release: 17%{?dist} URL: http://www.mozilla.org/projects/mathml/fonts/ License: Distributable @@ -122,7 +122,7 @@ %changelog -* Wed Aug 3 2005 Rex Dieter 1.0-16 +* Wed Aug 3 2005 Rex Dieter 1.0-17 - update for acroread7 (and SY_____.PFB) (bug #133709) - include/use find_symbol_font.sh helper script - readd %%postun From fedora-extras-commits at redhat.com Fri Aug 5 16:48:17 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 5 Aug 2005 12:48:17 -0400 Subject: rpms/gsview/devel gsview.spec,1.10,1.11 Message-ID: <200508051648.j75GmH91028108@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gsview/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28091 Modified Files: gsview.spec Log Message: use %{?dist} Index: gsview.spec =================================================================== RCS file: /cvs/extras/rpms/gsview/devel/gsview.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- gsview.spec 3 Aug 2005 18:49:23 -0000 1.10 +++ gsview.spec 5 Aug 2005 16:48:15 -0000 1.11 @@ -3,7 +3,7 @@ Summary: PostScript and PDF previewer Name: gsview Version: 4.7 -Release: 3 +Release: 3%{?dist} License: Aladdin Free Public License, Ghostgum Software Pty Ltd Group: Applications/Publishing From fedora-extras-commits at redhat.com Fri Aug 5 16:50:54 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 5 Aug 2005 12:50:54 -0400 Subject: rpms/gsview/FC-4 gsview-4.7-dllversion.patch, NONE, 1.1 gsview-4.7-letterpaper.patch, NONE, 1.1 gsview-4.6-libgs.patch, 1.1, 1.2 gsview.spec, 1.7, 1.8 sources, 1.2, 1.3 Message-ID: <200508051650.j75GoscR028205@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gsview/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28175 Modified Files: gsview-4.6-libgs.patch gsview.spec sources Added Files: gsview-4.7-dllversion.patch gsview-4.7-letterpaper.patch Log Message: sync w/-devel branch gsview-4.7-dllversion.patch: --- NEW FILE gsview-4.7-dllversion.patch --- --- gsview-4.7/src/cdll.c.dllversion 2002-02-09 21:46:38.000000000 -0600 +++ gsview-4.7/src/cdll.c 2005-06-23 09:05:39.000000000 -0500 @@ -106,6 +106,10 @@ } dll->revision_number = rv.revision; + /* Hack because FC5's ghostscript-8.15 reports 81500 instead of 815 -- Rex */ + if ( dll->revision_number > (GS_REVISION_MIN*100) ) + dll->revision_number = (long)(dll->revision_number / 100); + if ( (dll->revision_number < GS_REVISION_MIN) || (dll->revision_number > GS_REVISION_MAX) ) { gs_addmessf("\nWrong version of DLL found.\n\ gsview-4.7-letterpaper.patch: --- NEW FILE gsview-4.7-letterpaper.patch --- --- gsview-4.7/src/gvcinit.c.letterpaper 2005-03-01 03:51:38.000000000 -0600 +++ gsview-4.7/src/gvcinit.c 2005-06-23 10:41:42.000000000 -0500 @@ -319,13 +319,13 @@ option.button_show = TRUE; option.fit_page = FALSE; /* Changed after 2.1 */ option.safer = TRUE; - option.media = IDM_A4; - strcpy(option.medianame, "A4"); + option.media = IDM_LETTER; + strcpy(option.medianame, "Letter"); option.media_rotate = FALSE; option.user_width_warn = 5669; /* 2 metres */ option.user_height_warn = 5669; - option.user_width = 595; /* A4 width 210mm */ - option.user_height = 842; /* A4 height 297mm */ + option.user_width = 612; /* Letter width 8.5in */ + option.user_height = 792; /* Letter height 11in */ option.epsf_clip = FALSE; option.epsf_warn = FALSE; option.ignore_dsc = FALSE; gsview-4.6-libgs.patch: Index: gsview-4.6-libgs.patch =================================================================== RCS file: /cvs/extras/rpms/gsview/FC-4/gsview-4.6-libgs.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gsview-4.6-libgs.patch 4 Dec 2004 12:25:30 -0000 1.1 +++ gsview-4.6-libgs.patch 5 Aug 2005 16:50:52 -0000 1.2 @@ -5,7 +5,7 @@ #define GS_PRODUCT "AFPL Ghostscript" #define GS_REVISION_MIN 704 -#define GS_REVISION 704 -+#define GS_REVISION 707 ++#define GS_REVISION @@GS_REVISION@@ #define GS_REVISION_MAX 919 #ifdef _Windows @@ -14,7 +14,7 @@ #define INIFILE "gsview.ini" #define GS_EXENAME "gs" -#define GS_DLLNAME "libgs.so" -+#define GS_DLLNAME "libgs.so.7" ++#define GS_DLLNAME "libgs.so.@@SOMAJOR@@" #else #define GS_EXENAME "gsos2.exe" #define GS_DLLNAME "gsdll2.dll" Index: gsview.spec =================================================================== RCS file: /cvs/extras/rpms/gsview/FC-4/gsview.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- gsview.spec 6 Apr 2005 22:11:39 -0000 1.7 +++ gsview.spec 5 Aug 2005 16:50:52 -0000 1.8 @@ -1,47 +1,65 @@ # $Id$ Summary: PostScript and PDF previewer -Name: gsview -Version: 4.6 -Release: 10 +Name: gsview +Version: 4.7 +Release: 3%{?dist} License: Aladdin Free Public License, Ghostgum Software Pty Ltd -Group: Applications/Publishing -Source: ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/ghostgum/gsview-4.6.tar.gz -URL: http://www.cs.wisc.edu/~ghost/gsview/ -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +Group: Applications/Publishing +Source: ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/ghostgum/gsview-4.7.tar.gz +URL: http://www.cs.wisc.edu/~ghost/gsview/ +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source1: gsview.desktop BuildRequires: gtk+-devel BuildRequires: desktop-file-utils - +BuildRequires: sed >= 4.0 +BuildRequires: ghostscript-devel >= 7.07-15.3 +%define gs_ver %{expand:%%(rpm -q --qf '%%{VERSION}' ghostscript-devel | cut -d. -f-2 )} +%define gs_ver1 %{expand:%%(echo %{gs_ver} | cut -d. -f1)} +%if "%{?gs_ver1}" == "7" # See http://www.redhat.com/archives/fedora-devel-list/2004-August/msg00068.html Requires: ghostscript >= 7.07-15.3 -# Stick with this one for now, allowing for users with custom/older builds to provide libgs -# doesn't work on x86_64 (see http://bugzilla.redhat.com/bugzilla/146223 ) -#Requires: libgs.so.7 +%endif ## Use htmlview instead of hard-coded mozilla Patch1: gsview-4.4-htmlview.patch -# default to libgs.so.7 instead of libgs.so -# will need to rework when/if ghostscript >= 8.0 comes around. (-: +# default to libgs.so.@@SOMAJOR@@ instead of libgs.so Patch2: gsview-4.6-libgs.patch +# attempt to allow/use ghostscript-8.15 reported value of 81500. +# http://bugs.redhat.com/159912 +Patch3: gsview-4.7-dllversion.patch +# Change Paper default A4 -> Letter +Patch4: gsview-4.7-letterpaper.patch %description GSview is a graphical interface for Ghostscript. -Ghostscript is an interpreter for the PostScript page +Ghostscript is an interpreter for the PostScript page description language used by laser printers. -For documents following the Adobe PostScript Document Structuring +For documents following the Adobe PostScript Document Structuring Conventions, GSview allows selected pages to be viewed or printed. %prep -%setup -q +%setup -q %patch1 -p1 -b .htmlview -%patch2 -p1 -b .libgs7 +%patch2 -p1 -b .libgs +%patch3 -p1 -b .dllversion +%patch4 -p1 -b .letterpaper + +# Determine GS_REVISION/SOMAJOR and substitute values (see patch2) +GS_REVISION=%(echo %{gs_ver} | tr -d '.' ) +sed -i -e "s|@@GS_REVISION@@|${GS_REVISION}|g" src/gvcver.h +# Sanity check to make sure file exists +if [ ! -f "%(ls %{_libdir}/libgs.so.?)" ]; then + echo "Error: %{_libdir}/libgs.so.? doesn't exist"; exit 1 +fi +SOMAJOR=$(basename %{_libdir}/libgs.so.? | sed -e 's at libgs.so.@@' ) +sed -i -e "s|@@SOMAJOR@@|${SOMAJOR}|g" src/gvcver.h %build @@ -71,10 +89,10 @@ desktop-file-install --vendor fedora \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --add-category X-Fedora \ - %{SOURCE1} + %{SOURCE1} ## Unpackaged files -# nuke depcrecated epstool +# nuke depcrecated epstool, to be (hopefully) packaged separately... someday. rm -f $RPM_BUILD_ROOT{%{_bindir}/epstool,%{_docdir}/*/epstool*} @@ -86,7 +104,7 @@ %{_mandir}/man*/* %{_datadir}/applications/*.desktop %{_datadir}/pixmaps/*.png -%doc %{_docdir}/* +%doc %{_docdir}/* %clean @@ -94,6 +112,16 @@ %changelog +* Thu Jul 28 2005 Rex Dieter 4.7-3 +- add file:// to help URL. + +* Thu Jun 23 2005 Rex Dieter 4.7-2 +- fixes for ghostscript-8.15 (#159912) +- Change paper default A4->Letter + +* Wed Apr 20 2005 Rex Dieter 4.7-1 +- 4.7 + * Fri Apr 7 2005 Michael Schwendt - rebuilt @@ -124,8 +152,8 @@ * Sat Apr 24 2004 Rex Dieter 0:4.6-0.fdr.3 - don't include old epstool (to be packaged separately) -- gsview.desktop: - MimeType=image/x-eps;application/postscript;application/pdf; +- gsview.desktop: + MimeType=image/x-eps;application/postscript;application/pdf; Categories=Application;GTK;Graphics;Viewer;Publishing; * Thu Apr 01 2004 Rex Dieter 0:4.6-0.fdr.2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gsview/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 04:30:19 -0000 1.2 +++ sources 5 Aug 2005 16:50:52 -0000 1.3 @@ -1 +1 @@ -35cb5e421faca49eb70c426354e41ba8 gsview-4.6.tar.gz +ce6288cc8597d6b918498d6d02654bb7 gsview-4.7.tar.gz From fedora-extras-commits at redhat.com Fri Aug 5 16:53:37 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 5 Aug 2005 12:53:37 -0400 Subject: rpms/gsview/FC-3 gsview-4.7-dllversion.patch, NONE, 1.1 gsview-4.7-letterpaper.patch, NONE, 1.1 gsview-4.6-libgs.patch, 1.1, 1.2 gsview.spec, 1.4, 1.5 sources, 1.2, 1.3 Message-ID: <200508051653.j75GrbRV028296@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gsview/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28266 Modified Files: gsview-4.6-libgs.patch gsview.spec sources Added Files: gsview-4.7-dllversion.patch gsview-4.7-letterpaper.patch Log Message: sync w/-devel branch gsview-4.7-dllversion.patch: --- NEW FILE gsview-4.7-dllversion.patch --- --- gsview-4.7/src/cdll.c.dllversion 2002-02-09 21:46:38.000000000 -0600 +++ gsview-4.7/src/cdll.c 2005-06-23 09:05:39.000000000 -0500 @@ -106,6 +106,10 @@ } dll->revision_number = rv.revision; + /* Hack because FC5's ghostscript-8.15 reports 81500 instead of 815 -- Rex */ + if ( dll->revision_number > (GS_REVISION_MIN*100) ) + dll->revision_number = (long)(dll->revision_number / 100); + if ( (dll->revision_number < GS_REVISION_MIN) || (dll->revision_number > GS_REVISION_MAX) ) { gs_addmessf("\nWrong version of DLL found.\n\ gsview-4.7-letterpaper.patch: --- NEW FILE gsview-4.7-letterpaper.patch --- --- gsview-4.7/src/gvcinit.c.letterpaper 2005-03-01 03:51:38.000000000 -0600 +++ gsview-4.7/src/gvcinit.c 2005-06-23 10:41:42.000000000 -0500 @@ -319,13 +319,13 @@ option.button_show = TRUE; option.fit_page = FALSE; /* Changed after 2.1 */ option.safer = TRUE; - option.media = IDM_A4; - strcpy(option.medianame, "A4"); + option.media = IDM_LETTER; + strcpy(option.medianame, "Letter"); option.media_rotate = FALSE; option.user_width_warn = 5669; /* 2 metres */ option.user_height_warn = 5669; - option.user_width = 595; /* A4 width 210mm */ - option.user_height = 842; /* A4 height 297mm */ + option.user_width = 612; /* Letter width 8.5in */ + option.user_height = 792; /* Letter height 11in */ option.epsf_clip = FALSE; option.epsf_warn = FALSE; option.ignore_dsc = FALSE; gsview-4.6-libgs.patch: Index: gsview-4.6-libgs.patch =================================================================== RCS file: /cvs/extras/rpms/gsview/FC-3/gsview-4.6-libgs.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gsview-4.6-libgs.patch 4 Dec 2004 12:25:30 -0000 1.1 +++ gsview-4.6-libgs.patch 5 Aug 2005 16:53:35 -0000 1.2 @@ -5,7 +5,7 @@ #define GS_PRODUCT "AFPL Ghostscript" #define GS_REVISION_MIN 704 -#define GS_REVISION 704 -+#define GS_REVISION 707 ++#define GS_REVISION @@GS_REVISION@@ #define GS_REVISION_MAX 919 #ifdef _Windows @@ -14,7 +14,7 @@ #define INIFILE "gsview.ini" #define GS_EXENAME "gs" -#define GS_DLLNAME "libgs.so" -+#define GS_DLLNAME "libgs.so.7" ++#define GS_DLLNAME "libgs.so.@@SOMAJOR@@" #else #define GS_EXENAME "gsos2.exe" #define GS_DLLNAME "gsdll2.dll" Index: gsview.spec =================================================================== RCS file: /cvs/extras/rpms/gsview/FC-3/gsview.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- gsview.spec 18 Feb 2005 18:00:34 -0000 1.4 +++ gsview.spec 5 Aug 2005 16:53:35 -0000 1.5 @@ -2,31 +2,37 @@ Summary: PostScript and PDF previewer Name: gsview -Epoch: 0 -Version: 4.6 -Release: 9 +Version: 4.7 +Release: 3%{?dist} + License: Aladdin Free Public License, Ghostgum Software Pty Ltd Group: Applications/Publishing -Source: ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/ghostgum/gsview-4.6.tar.gz +Source: ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/ghostgum/gsview-4.7.tar.gz URL: http://www.cs.wisc.edu/~ghost/gsview/ -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source1: gsview.desktop BuildRequires: gtk+-devel BuildRequires: desktop-file-utils - +BuildRequires: sed >= 4.0 +BuildRequires: ghostscript-devel >= 7.07-15.3 +%define gs_ver %{expand:%%(rpm -q --qf '%%{VERSION}' ghostscript-devel | cut -d. -f-2 )} +%define gs_ver1 %{expand:%%(echo %{gs_ver} | cut -d. -f1)} +%if "%{?gs_ver1}" == "7" # See http://www.redhat.com/archives/fedora-devel-list/2004-August/msg00068.html Requires: ghostscript >= 7.07-15.3 -# Stick with this one for now, allowing for users with custom/older builds to provide libgs -# doesn't work on x86_64 (see http://bugzilla.redhat.com/bugzilla/146223 ) -#Requires: libgs.so.7 +%endif ## Use htmlview instead of hard-coded mozilla Patch1: gsview-4.4-htmlview.patch -# default to libgs.so.7 instead of libgs.so -# will need to rework when/if ghostscript >= 8.0 comes around. (-: +# default to libgs.so.@@SOMAJOR@@ instead of libgs.so Patch2: gsview-4.6-libgs.patch +# attempt to allow/use ghostscript-8.15 reported value of 81500. +# http://bugs.redhat.com/159912 +Patch3: gsview-4.7-dllversion.patch +# Change Paper default A4 -> Letter +Patch4: gsview-4.7-letterpaper.patch %description @@ -41,7 +47,19 @@ %setup -q %patch1 -p1 -b .htmlview -%patch2 -p1 -b .libgs7 +%patch2 -p1 -b .libgs +%patch3 -p1 -b .dllversion +%patch4 -p1 -b .letterpaper + +# Determine GS_REVISION/SOMAJOR and substitute values (see patch2) +GS_REVISION=%(echo %{gs_ver} | tr -d '.' ) +sed -i -e "s|@@GS_REVISION@@|${GS_REVISION}|g" src/gvcver.h +# Sanity check to make sure file exists +if [ ! -f "%(ls %{_libdir}/libgs.so.?)" ]; then + echo "Error: %{_libdir}/libgs.so.? doesn't exist"; exit 1 +fi +SOMAJOR=$(basename %{_libdir}/libgs.so.? | sed -e 's at libgs.so.@@' ) +sed -i -e "s|@@SOMAJOR@@|${SOMAJOR}|g" src/gvcver.h %build @@ -74,7 +92,7 @@ %{SOURCE1} ## Unpackaged files -# nuke depcrecated epstool +# nuke depcrecated epstool, to be (hopefully) packaged separately... someday. rm -f $RPM_BUILD_ROOT{%{_bindir}/epstool,%{_docdir}/*/epstool*} @@ -94,6 +112,19 @@ %changelog +* Thu Jul 28 2005 Rex Dieter 4.7-3 +- add file:// to help URL. + +* Thu Jun 23 2005 Rex Dieter 4.7-2 +- fixes for ghostscript-8.15 (#159912) +- Change paper default A4->Letter + +* Wed Apr 20 2005 Rex Dieter 4.7-1 +- 4.7 + +* Fri Apr 7 2005 Michael Schwendt +- rebuilt + * Wed Jan 26 2005 Rex Dieter 0:4.6-9 - back to Req: ghostscript >= 7.07-15.3 for x86_64 (#146223) Index: sources =================================================================== RCS file: /cvs/extras/rpms/gsview/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 04:30:19 -0000 1.2 +++ sources 5 Aug 2005 16:53:35 -0000 1.3 @@ -1 +1 @@ -35cb5e421faca49eb70c426354e41ba8 gsview-4.6.tar.gz +ce6288cc8597d6b918498d6d02654bb7 gsview-4.7.tar.gz From paul at city-fan.org Fri Aug 5 16:57:55 2005 From: paul at city-fan.org (Paul Howarth) Date: Fri, 05 Aug 2005 17:57:55 +0100 Subject: rpms/gsview/FC-4 gsview-4.7-dllversion.patch, NONE, 1.1 gsview-4.7-letterpaper.patch, NONE, 1.1 gsview-4.6-libgs.patch, 1.1, 1.2 gsview.spec, 1.7, 1.8 sources, 1.2, 1.3 In-Reply-To: <200508051650.j75GoscR028205@cvs-int.fedora.redhat.com> References: <200508051650.j75GoscR028205@cvs-int.fedora.redhat.com> Message-ID: <42F39A93.5080909@city-fan.org> Rex Dieter (rdieter) wrote: > diff -u -r1.7 -r1.8 > --- gsview.spec 6 Apr 2005 22:11:39 -0000 1.7 > +++ gsview.spec 5 Aug 2005 16:50:52 -0000 1.8 ... > ## Use htmlview instead of hard-coded mozilla > Patch1: gsview-4.4-htmlview.patch > -# default to libgs.so.7 instead of libgs.so > -# will need to rework when/if ghostscript >= 8.0 comes around. (-: > +# default to libgs.so.@@SOMAJOR@@ instead of libgs.so > Patch2: gsview-4.6-libgs.patch > +# attempt to allow/use ghostscript-8.15 reported value of 81500. > +# http://bugs.redhat.com/159912 bugs.redhat.com does not resolve, as I mentioned when this was commited in the devel branch. I suggest http://bugzilla.redhat.com/159912 instead. Paul. From rc040203 at freenet.de Fri Aug 5 17:03:19 2005 From: rc040203 at freenet.de (Ralf Corsepius) Date: Fri, 05 Aug 2005 19:03:19 +0200 Subject: rpms/highlight/devel highlight-2.4-makefile.patch, NONE, 1.1 highlight-2.4-rpmoptflags.patch, NONE, 1.1 highlight.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 In-Reply-To: <200508041538.j74FcW1u017980@cvs-int.fedora.redhat.com> References: <200508041538.j74FcW1u017980@cvs-int.fedora.redhat.com> Message-ID: <1123261399.4364.217.camel@mccallum.corsepiu.local> On Thu, 2005-08-04 at 11:38 -0400, Jochen Schmitt wrote: > Author: s4504kr > --- NEW FILE highlight-2.4-rpmoptflags.patch --- > --- highlight-2.4-1/highlight/makefile.BAD 2005-08-03 10:44:08.000000000 -0500 > +++ highlight-2.4-1/highlight/makefile 2005-08-03 10:44:36.000000000 -0500 > @@ -15,7 +15,7 @@ > > CXX=c++ > > -CFLAGS := -O2 -Wall -pedantic -DHL_DATA_DIR=\"${HL_DATA_DIR}\" > +CFLAGS := $(RPM_OPT_FLAGS) -DHL_DATA_DIR=\"${HL_DATA_DIR}\" > > LDFLAGS = -L/usr/lib -s This -s is very doubtful. If it is what I think it is (ld's --strip-all) this prevents functional debuginfo-rpms. Ralf From fedora-extras-commits at redhat.com Fri Aug 5 17:12:17 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 5 Aug 2005 13:12:17 -0400 Subject: rpms/gsview/devel gsview.spec,1.11,1.12 Message-ID: <200508051712.j75HCH9p029511@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gsview/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29494 Modified Files: gsview.spec Log Message: ExcludeArch: ppc (sed busted?) Index: gsview.spec =================================================================== RCS file: /cvs/extras/rpms/gsview/devel/gsview.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- gsview.spec 5 Aug 2005 16:48:15 -0000 1.11 +++ gsview.spec 5 Aug 2005 17:12:15 -0000 1.12 @@ -10,6 +10,8 @@ Source: ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/ghostgum/gsview-4.7.tar.gz URL: http://www.cs.wisc.edu/~ghost/gsview/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +# ppc: FIXME. +ExcludeArch: ppc Source1: gsview.desktop @@ -51,6 +53,8 @@ %patch3 -p1 -b .dllversion %patch4 -p1 -b .letterpaper +## It appears PPC's sed doesn't make these substitutions properly (???) Rex +## ppc: FIXME # Determine GS_REVISION/SOMAJOR and substitute values (see patch2) GS_REVISION=%(echo %{gs_ver} | tr -d '.' ) sed -i -e "s|@@GS_REVISION@@|${GS_REVISION}|g" src/gvcver.h From fedora-extras-commits at redhat.com Fri Aug 5 17:13:21 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 5 Aug 2005 13:13:21 -0400 Subject: rpms/gsview/devel gsview.spec,1.12,1.13 Message-ID: <200508051713.j75HDLCW029534@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gsview/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29517 Modified Files: gsview.spec Log Message: Release++, note ppc build failure Index: gsview.spec =================================================================== RCS file: /cvs/extras/rpms/gsview/devel/gsview.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- gsview.spec 5 Aug 2005 17:12:15 -0000 1.12 +++ gsview.spec 5 Aug 2005 17:13:19 -0000 1.13 @@ -3,7 +3,7 @@ Summary: PostScript and PDF previewer Name: gsview Version: 4.7 -Release: 3%{?dist} +Release: 4%{?dist} License: Aladdin Free Public License, Ghostgum Software Pty Ltd Group: Applications/Publishing @@ -116,6 +116,9 @@ %changelog +* Fri Aug 5 2005 Rex Dieter 4.7-4 +- ExcludeArch: ppc (sed busted?) + * Thu Jul 28 2005 Rex Dieter 4.7-3 - add file:// to help URL. From fedora-extras-commits at redhat.com Fri Aug 5 17:14:20 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 5 Aug 2005 13:14:20 -0400 Subject: rpms/gsview/FC-4 gsview.spec,1.8,1.9 Message-ID: <200508051714.j75HEKA4029597@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gsview/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29578 Modified Files: gsview.spec Log Message: sync w/-devel Index: gsview.spec =================================================================== RCS file: /cvs/extras/rpms/gsview/FC-4/gsview.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- gsview.spec 5 Aug 2005 16:50:52 -0000 1.8 +++ gsview.spec 5 Aug 2005 17:14:18 -0000 1.9 @@ -3,13 +3,15 @@ Summary: PostScript and PDF previewer Name: gsview Version: 4.7 -Release: 3%{?dist} +Release: 4%{?dist} License: Aladdin Free Public License, Ghostgum Software Pty Ltd Group: Applications/Publishing Source: ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/ghostgum/gsview-4.7.tar.gz URL: http://www.cs.wisc.edu/~ghost/gsview/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +# ppc: FIXME. +ExcludeArch: ppc Source1: gsview.desktop @@ -51,6 +53,8 @@ %patch3 -p1 -b .dllversion %patch4 -p1 -b .letterpaper +## It appears PPC's sed doesn't make these substitutions properly (???) Rex +## ppc: FIXME # Determine GS_REVISION/SOMAJOR and substitute values (see patch2) GS_REVISION=%(echo %{gs_ver} | tr -d '.' ) sed -i -e "s|@@GS_REVISION@@|${GS_REVISION}|g" src/gvcver.h @@ -112,6 +116,9 @@ %changelog +* Fri Aug 5 2005 Rex Dieter 4.7-4 +- ExcludeArch: ppc (sed busted?) + * Thu Jul 28 2005 Rex Dieter 4.7-3 - add file:// to help URL. From fedora-extras-commits at redhat.com Fri Aug 5 17:15:45 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 5 Aug 2005 13:15:45 -0400 Subject: rpms/gsview/FC-3 gsview.spec,1.5,1.6 Message-ID: <200508051715.j75HFjdg029697@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gsview/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29680 Modified Files: gsview.spec Log Message: sync w/-devel branch Index: gsview.spec =================================================================== RCS file: /cvs/extras/rpms/gsview/FC-3/gsview.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- gsview.spec 5 Aug 2005 16:53:35 -0000 1.5 +++ gsview.spec 5 Aug 2005 17:15:43 -0000 1.6 @@ -3,13 +3,15 @@ Summary: PostScript and PDF previewer Name: gsview Version: 4.7 -Release: 3%{?dist} +Release: 4%{?dist} License: Aladdin Free Public License, Ghostgum Software Pty Ltd Group: Applications/Publishing Source: ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/ghostgum/gsview-4.7.tar.gz URL: http://www.cs.wisc.edu/~ghost/gsview/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +# ppc: FIXME. +ExcludeArch: ppc Source1: gsview.desktop @@ -51,6 +53,8 @@ %patch3 -p1 -b .dllversion %patch4 -p1 -b .letterpaper +## It appears PPC's sed doesn't make these substitutions properly (???) Rex +## ppc: FIXME # Determine GS_REVISION/SOMAJOR and substitute values (see patch2) GS_REVISION=%(echo %{gs_ver} | tr -d '.' ) sed -i -e "s|@@GS_REVISION@@|${GS_REVISION}|g" src/gvcver.h @@ -112,6 +116,9 @@ %changelog +* Fri Aug 5 2005 Rex Dieter 4.7-4 +- ExcludeArch: ppc (sed busted?) + * Thu Jul 28 2005 Rex Dieter 4.7-3 - add file:// to help URL. From fedora-extras-commits at redhat.com Fri Aug 5 17:25:08 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 5 Aug 2005 13:25:08 -0400 Subject: rpms/kile/devel kile.spec,1.10,1.11 Message-ID: <200508051725.j75HP84B029817@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/kile/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29800 Modified Files: kile.spec Log Message: drop BR: gettext, libtool use desktop-file-install use %{/dist} Index: kile.spec =================================================================== RCS file: /cvs/extras/rpms/kile/devel/kile.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- kile.spec 3 Aug 2005 18:35:00 -0000 1.10 +++ kile.spec 5 Aug 2005 17:25:06 -0000 1.11 @@ -1,9 +1,9 @@ -#$iD: kile.spec,v 1.49 2005/06/22 16:34:35 rexdieter Exp $ +# $id: $ Name: kile Summary: (La)TeX source editor and TeX shell Version: 1.8.1 -Release: 1 +Release: 1%{?dist} License: GPL Group: Applications/Publishing @@ -11,8 +11,6 @@ Source0: http://dl.sourceforge.net/sourceforge/kile/kile-1.8.1.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: gettext -BuildRequires: libtool BuildRequires: desktop-file-utils Requires: tetex-latex @@ -66,6 +64,13 @@ make install%{!?debug_package:-strip} DESTDIR=$RPM_BUILD_ROOT +desktop-file-install --vendor fedora \ + --dir $RPM_BUILD_ROOT%{_datadir}/applications \ + --add-category X-Fedora \ + --delete-original \ + $RPM_BUILD_ROOT%{_datadir}/appl*/*/*.desktop + + ## File lists # locale's %find_lang %{name} || touch %{name}.lang @@ -90,7 +95,7 @@ %{_datadir}/apps/kconf_update/kile* %config %{_datadir}/config*/* %{_datadir}/icons/*/*/*/* -%{_datadir}/appl*/*/*.desktop +%{_datadir}/applications/*.desktop %{_datadir}/mimelnk/*/*.desktop From fedora-extras-commits at redhat.com Fri Aug 5 17:28:20 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 5 Aug 2005 13:28:20 -0400 Subject: rpms/tetex-lgrind/devel tetex-lgrind.spec,1.10,1.11 Message-ID: <200508051728.j75HSKgP029888@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/tetex-lgrind/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29871 Modified Files: tetex-lgrind.spec Log Message: Install the dvi file where it can be found by texdoc. URL updated. disttag added. Index: tetex-lgrind.spec =================================================================== RCS file: /cvs/extras/rpms/tetex-lgrind/devel/tetex-lgrind.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- tetex-lgrind.spec 23 Jul 2005 19:44:32 -0000 1.10 +++ tetex-lgrind.spec 5 Aug 2005 17:28:18 -0000 1.11 @@ -6,8 +6,8 @@ Summary: Source-code pretty-printer for LaTeX Name: tetex-lgrind Version: 3.67 -Release: 7 -URL: http://www.ctan.org/tex-archive/support/lgrind +Release: 8%{?dist} +URL: http://www.ctan.org/tex-archive/help/Catalogue/entries/lgrind.html License: BSD Group: Applications/Publishing # NOTE: This tarball cannot be verified directly as it is @@ -15,7 +15,7 @@ # file contained in the tarballs have to be verified one by one. Source0: ftp://ftp.dante.de/tex-archive/support/lgrind.tar.gz Patch0: lgrind-3.67-parsevartab.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): tetex Requires(postun): tetex Requires: tetex-latex @@ -49,17 +49,21 @@ # Install TeX files. mkdir -p %{buildroot}%{texmf}/tex/latex/%{tdsname}/ -install -m 644 lgrind.sty %{buildroot}%{texmf}/tex/latex/%{tdsname}/ -install -m 644 lgrindef %{buildroot}%{texmf}/tex/latex/%{tdsname}/ +install -p -m 644 lgrind.sty %{buildroot}%{texmf}/tex/latex/%{tdsname}/ +install -p -m 644 lgrindef %{buildroot}%{texmf}/tex/latex/%{tdsname}/ + +# Install LaTeX package doc file. +mkdir -p %{buildroot}%{texmf}/doc/latex/%{tdsname}/ +install -p -m 644 lgrind.dvi %{buildroot}%{texmf}/doc/latex/%{tdsname}/ # Install binaries. mkdir -p %{buildroot}%{_bindir}/ -install -m 755 source/lgrind %{buildroot}%{_bindir}/ +install -p -m 755 source/lgrind %{buildroot}%{_bindir}/ # Install man pages. mkdir -p %{buildroot}%{_mandir}/man{1,5} -install -m 644 source/lgrind.1 %{buildroot}%{_mandir}/man1 -install -m 644 source/lgrindef.5 %{buildroot}%{_mandir}/man5 +install -p -m 644 source/lgrind.1 %{buildroot}%{_mandir}/man1 +install -p -m 644 source/lgrindef.5 %{buildroot}%{_mandir}/man5 %clean rm -rf %{buildroot} @@ -72,13 +76,19 @@ %files %defattr(-,root,root,-) -%doc README FAQ lgrind.dvi +%doc README FAQ %{_bindir}/* %{_mandir}/man1/* %{_mandir}/man5/* %{texmf}/tex/latex/%{tdsname} +%{texmf}/doc/ %changelog +* Thu Aug 4 2005 Jose Pedro Oliveira - 3.67-8 +- Install the dvi file where it can be found by texdoc. +- URL updated. +- disttag added. + * Sat Jul 23 2005 Michael Schwendt - 3.67-7 - Fix "missing expression in return statement" (#150297). From fedora-extras-commits at redhat.com Fri Aug 5 17:35:54 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 5 Aug 2005 13:35:54 -0400 Subject: rpms/kile/FC-4 kile.spec,1.8,1.9 sources,1.3,1.4 Message-ID: <200508051735.j75HZsiR029960@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/kile/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29941 Modified Files: kile.spec sources Log Message: sync w/-devel branch Index: kile.spec =================================================================== RCS file: /cvs/extras/rpms/kile/FC-4/kile.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- kile.spec 22 May 2005 23:55:08 -0000 1.8 +++ kile.spec 5 Aug 2005 17:35:52 -0000 1.9 @@ -1,31 +1,17 @@ -#$Id$ +# $id: $ -# for optionally using destkop-file-install (for fc2 mostly) -%define desktop_file 1 - -Name: kile +Name: kile Summary: (La)TeX source editor and TeX shell -Version: 1.7.1 -Release: 5%{?dist_tag} +Version: 1.8.1 +Release: 1%{?dist} -Group: Applications/Publishing -URL: http://kile.sourceforge.net/ -Source: http://dl.sourceforge.net/sourceforge/kile/kile-1.7.1.tar.bz2 License: GPL -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root - -# Append ; to .desktop Categories -Patch1: kile-1.7-dt.patch +Group: Applications/Publishing +URL: http://kile.sourceforge.net/ +Source0: http://dl.sourceforge.net/sourceforge/kile/kile-1.8.1.tar.bz2 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: gettext -BuildRequires: libtool -%{?desktop_file:BuildRequires: desktop-file-utils} - -# workarounds for missing Requires in fc1's qt-devel, kdelibs-devel -# and to make fedora.us's buildsystem happy -BuildRequires: XFree86-devel -BuildRequires: libpng-devel zlib-devel libjpeg-devel -BuildRequires: arts-devel libart_lgpl-devel fam-devel +BuildRequires: desktop-file-utils Requires: tetex-latex ## Optional, but recommended @@ -33,13 +19,16 @@ #Requires: xfig BuildRequires: qt-devel >= 1:3.3 -%define qt_ver %(rpm -q --qf '%%{version}' qt-devel | cut -d. -f-2) +%define qt_ver %(rpm -q --qf '%%{version}' qt-devel ) Requires: qt >= 1:%{qt_ver} - -BuildRequires: kdelibs-devel >= 6:3.2 -%define kdelibs_ver %(rpm -q --qf '%%{version}' kdelibs-devel | cut -d. -f-2 ) +BuildRequires: kdelibs-devel >= 6:3.3 +%define kdelibs_ver %(rpm -q --qf '%%{version}' kdelibs-devel ) Requires: kdelibs >= 6:%{kdelibs_ver} +# kile-i18n is no longer separate pkg +Obsoletes: kile-i18n < %{epoch}:%{version}-%{releaes} +#Provides: kile-i18n = %{epoch}:%{version}-%{release} + %description Kile is a user friendly (La)TeX editor. The main features are: * Compile, convert and view your document with one click. @@ -54,19 +43,18 @@ %prep -%setup -q - -%{?desktop_file:%patch1 -p1 -b .dt} +%setup -q -n %{name}-%{version}%{?beta} %build unset QTDIR || : ; . /etc/profile.d/qt.sh +# x86_64 fix (bug #161343) +export QTLIB=${QTDIR}/lib;QTINC=${QTDIR}/include %configure \ - --program-prefix="%{?_program_prefix}" \ --disable-rpath \ %{?debug: --enable-debug --enable-warnings } \ - %{!?debug: --disable-debug --disable-warnings --enable-final } + %{!?debug: --disable-debug --disable-warnings --enable-final --disable-dependency-tracking } make %{?_smp_mflags} @@ -76,42 +64,38 @@ make install%{!?debug_package:-strip} DESTDIR=$RPM_BUILD_ROOT -# Replace absolute symlinks with relative ones -pushd $RPM_BUILD_ROOT%{_docdir}/HTML -for lang in *; do - if [ -d $lang ]; then - pushd $lang - for i in *; do - [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common - done - popd - fi -done -popd - -%if "%{?desktop_file}" == "1" -mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications -desktop-file-install --delete-original --vendor fedora \ +desktop-file-install --vendor fedora \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - --add-category "Application" \ - --add-category "X-Fedora" \ - $RPM_BUILD_ROOT%{_datadir}/app*/*/kile.desktop -%endif + --add-category X-Fedora \ + --delete-original \ + $RPM_BUILD_ROOT%{_datadir}/appl*/*/*.desktop + + +## File lists +# locale's +%find_lang %{name} || touch %{name}.lang +# HTML +HTML_DIR=$(kde-config --expandvars --install html) +if [ -d $RPM_BUILD_ROOT$HTML_DIR ]; then +for lang_dir in $RPM_BUILD_ROOT$HTML_DIR/* ; do + lang=$(basename $lang_dir) + echo "%lang($lang) %doc $HTML_DIR/$lang/*" >> %{name}.lang +done +fi -## Unpackaged/conflicting files +## conflicting files (with kde > 3.2) rm -rf $RPM_BUILD_ROOT%{_datadir}/apps/katepart -%files +%files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS ChangeLog README TODO -%lang(en) %doc %{_datadir}/doc/HTML/en/* %{_bindir}/* %{_datadir}/apps/kile %{_datadir}/apps/kconf_update/kile* -%config %{_datadir}/config.kcfg/kile.kcfg -%{_datadir}/icons/*/*/*/*.png -%{_datadir}/applications%{!?desktop_file:/kde}/*.desktop +%config %{_datadir}/config*/* +%{_datadir}/icons/*/*/*/* +%{_datadir}/applications/*.desktop %{_datadir}/mimelnk/*/*.desktop @@ -120,6 +104,16 @@ %changelog +* Thu Jun 02 2005 Rex Dieter 1.8.1-1 +- 1.8.1 +- x86_64 fix (bug #161343) + +* Tue May 31 2005 Rex Dieter 1.8-2 +- Obsoletes: kile-i18n + +* Mon May 23 2005 Rex Dieter 1.8-1 +- 1.8 + * Sun May 22 2005 Jeremy Katz - 1.7.1 - rebuild on all arches @@ -195,7 +189,7 @@ - fix missing latexhelp.html * Thu Sep 11 2003 Rex Dieter 0:1.5.2-0.fdr.3 -- patch1 +- patch1 * Wed Aug 20 2003 Rex Dieter 0:1.5.2-0.fdr.2 - 1.5.2 @@ -216,7 +210,7 @@ * Fri Apr 25 2003 Rex Dieter 1.40-1.3 - remove %%doc NEWS -* Mon Mar 03 2003 Rex Dieter 1.40-1.2 +* Mon Mar 03 2003 Rex Dieter 1.40-1.2 - version: 1.4 -> 1.40 so silly rpm knows that 1.40 is newer than 1.32 - use epochs in Obsoletes/Provides/Requires. Index: sources =================================================================== RCS file: /cvs/extras/rpms/kile/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 13 Jan 2005 15:32:49 -0000 1.3 +++ sources 5 Aug 2005 17:35:52 -0000 1.4 @@ -1 +1 @@ -940fba9dc62e2687856885dffccf6e80 kile-1.7.1.tar.bz2 +9ac4cd9294c6aff1acca1def68923a7d kile-1.8.1.tar.bz2 From fedora-extras-commits at redhat.com Fri Aug 5 17:37:04 2005 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Fri, 5 Aug 2005 13:37:04 -0400 Subject: rpms/libgda/devel libgda.spec,1.4,1.5 Message-ID: <200508051737.j75Hb4Hv029988@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/libgda/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29971 Modified Files: libgda.spec Log Message: Remove libgda.la file from devel package Index: libgda.spec =================================================================== RCS file: /cvs/extras/rpms/libgda/devel/libgda.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- libgda.spec 25 Jun 2005 19:09:54 -0000 1.4 +++ libgda.spec 5 Aug 2005 17:37:02 -0000 1.5 @@ -38,7 +38,7 @@ Summary: Library for writing gnome database programs Name: libgda Version: 1.2.0 -Release: 7 +Release: 8 Epoch: 1 Source: %{name}-%{version}.tar.bz2 URL: http://www.gnome-db.org/ @@ -292,6 +292,7 @@ # Cleanup unnecessary, unpackaged files rm -f %{buildroot}/%{_libdir}/libgda/providers/*.{a,la} +rm -f %{buildroot}/%{_libdir}/*.la %find_lang libgda-2 @@ -330,7 +331,6 @@ %{_datadir}/omf/* %{_includedir}/* %{_libdir}/*.a -%{_libdir}/*.la %{_libdir}/*.so %{_libdir}/pkgconfig/* @@ -396,6 +396,9 @@ %changelog +* Fri Aug 5 2005 Hans de Goede 1:1.2.0-8 +- Remove libgda.la file from devel package. + * Sat Jun 25 2005 Hans de Goede 1:1.2.0-7 - Added Patch4: libgda-1.2.0-libdir.patch which fixes loading of database providers on platforms with a lib64 dir. Thanks to: From fedora-extras-commits at redhat.com Fri Aug 5 17:41:05 2005 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Fri, 5 Aug 2005 13:41:05 -0400 Subject: rpms/libgnomedb/devel libgnomedb.spec,1.1,1.2 Message-ID: <200508051741.j75Hf5ZP030064@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/libgnomedb/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30047 Modified Files: libgnomedb.spec Log Message: Remove libgnomedb.la file from devel package Index: libgnomedb.spec =================================================================== RCS file: /cvs/extras/rpms/libgnomedb/devel/libgnomedb.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libgnomedb.spec 15 Mar 2005 08:14:35 -0000 1.1 +++ libgnomedb.spec 5 Aug 2005 17:41:03 -0000 1.2 @@ -1,7 +1,7 @@ Summary: Library for writing gnome database programs Name: libgnomedb Version: 1.2.0 -Release: 3 +Release: 4 Epoch: 1 Source: %{name}-%{version}.tar.bz2 URL: http://www.gnome-db.org/ @@ -58,6 +58,9 @@ --vendor=database --delete-original \ $RPM_BUILD_ROOT/%{_datadir}/control-center-2.0/capplets/database-properties.desktop +# remove unpackaged files +rm -f %{buildroot}/%{_libdir}/*.la + %post /sbin/ldconfig export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` @@ -93,12 +96,14 @@ %defattr(-,root,root) %{_includedir}/libgnomedb-1.2 %{_libdir}/*.a -%{_libdir}/*.la %{_libdir}/*.so %{_libdir}/pkgconfig/* %changelog +* Fri Aug 5 2005 Hans de Goede 1.2.0-4 +- Remove libgnomedb.la file from devel package. + * Wed Mar 02 2005 Caolan McNamara 1.2.0-3 - rebuild with gcc4 From fedora-extras-commits at redhat.com Fri Aug 5 17:47:47 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 5 Aug 2005 13:47:47 -0400 Subject: rpms/kile/FC-4 kile-1.7-dt.patch,1.1,NONE Message-ID: <200508051747.j75Hllma030186@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/kile/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30171 Removed Files: kile-1.7-dt.patch Log Message: remove deprecated patch --- kile-1.7-dt.patch DELETED --- From fedora-extras-commits at redhat.com Fri Aug 5 17:48:01 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 5 Aug 2005 13:48:01 -0400 Subject: rpms/kile/FC-3 kile.spec, 1.5, 1.6 sources, 1.3, 1.4 kile-1.7-dt.patch, 1.1, NONE Message-ID: <200508051748.j75Hm18x030214@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/kile/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30192 Modified Files: kile.spec sources Removed Files: kile-1.7-dt.patch Log Message: sync w/-devel branch Index: kile.spec =================================================================== RCS file: /cvs/extras/rpms/kile/FC-3/kile.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- kile.spec 13 Jan 2005 15:32:49 -0000 1.5 +++ kile.spec 5 Aug 2005 17:47:59 -0000 1.6 @@ -1,31 +1,17 @@ -#$Id$ - -# for optionally using destkop-file-install (for fc2 mostly) -%define desktop_file 1 +# $id: $ Name: kile Summary: (La)TeX source editor and TeX shell -Epoch: 0 -Version: 1.7.1 -Release: 3%{?dist_tag} +Version: 1.8.1 +Release: 1%{?dist} + +License: GPL Group: Applications/Publishing URL: http://kile.sourceforge.net/ -Source: http://dl.sourceforge.net/sourceforge/kile/kile-1.7.1.tar.bz2 -License: GPL -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +Source0: http://dl.sourceforge.net/sourceforge/kile/kile-1.8.1.tar.bz2 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -# Append ; to .desktop Categories -Patch1: kile-1.7-dt.patch - -BuildRequires: gettext -BuildRequires: libtool -%{?desktop_file:BuildRequires: desktop-file-utils} - -# workarounds for missing Requires in fc1's qt-devel, kdelibs-devel -# and to make fedora.us's buildsystem happy -BuildRequires: XFree86-devel -BuildRequires: libpng-devel zlib-devel libjpeg-devel -BuildRequires: arts-devel libart_lgpl-devel fam-devel +BuildRequires: desktop-file-utils Requires: tetex-latex ## Optional, but recommended @@ -33,13 +19,16 @@ #Requires: xfig BuildRequires: qt-devel >= 1:3.3 -%define qt_ver %(rpm -q --qf '%%{version}' qt-devel | cut -d. -f-2) +%define qt_ver %(rpm -q --qf '%%{version}' qt-devel ) Requires: qt >= 1:%{qt_ver} - -BuildRequires: kdelibs-devel >= 6:3.2 -%define kdelibs_ver %(rpm -q --qf '%%{version}' kdelibs-devel | cut -d. -f-2 ) +BuildRequires: kdelibs-devel >= 6:3.3 +%define kdelibs_ver %(rpm -q --qf '%%{version}' kdelibs-devel ) Requires: kdelibs >= 6:%{kdelibs_ver} +# kile-i18n is no longer separate pkg +Obsoletes: kile-i18n < %{epoch}:%{version}-%{releaes} +#Provides: kile-i18n = %{epoch}:%{version}-%{release} + %description Kile is a user friendly (La)TeX editor. The main features are: * Compile, convert and view your document with one click. @@ -54,19 +43,18 @@ %prep -%setup -q - -%{?desktop_file:%patch1 -p1 -b .dt} +%setup -q -n %{name}-%{version}%{?beta} %build unset QTDIR || : ; . /etc/profile.d/qt.sh +# x86_64 fix (bug #161343) +export QTLIB=${QTDIR}/lib;QTINC=${QTDIR}/include %configure \ - --program-prefix="%{?_program_prefix}" \ --disable-rpath \ %{?debug: --enable-debug --enable-warnings } \ - %{!?debug: --disable-debug --disable-warnings --enable-final } + %{!?debug: --disable-debug --disable-warnings --enable-final --disable-dependency-tracking } make %{?_smp_mflags} @@ -76,42 +64,38 @@ make install%{!?debug_package:-strip} DESTDIR=$RPM_BUILD_ROOT -# Replace absolute symlinks with relative ones -pushd $RPM_BUILD_ROOT%{_docdir}/HTML -for lang in *; do - if [ -d $lang ]; then - pushd $lang - for i in *; do - [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common - done - popd - fi -done -popd - -%if "%{?desktop_file}" == "1" -mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications -desktop-file-install --delete-original --vendor fedora \ +desktop-file-install --vendor fedora \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - --add-category "Application" \ - --add-category "X-Fedora" \ - $RPM_BUILD_ROOT%{_datadir}/app*/*/kile.desktop -%endif + --add-category X-Fedora \ + --delete-original \ + $RPM_BUILD_ROOT%{_datadir}/appl*/*/*.desktop + + +## File lists +# locale's +%find_lang %{name} || touch %{name}.lang +# HTML +HTML_DIR=$(kde-config --expandvars --install html) +if [ -d $RPM_BUILD_ROOT$HTML_DIR ]; then +for lang_dir in $RPM_BUILD_ROOT$HTML_DIR/* ; do + lang=$(basename $lang_dir) + echo "%lang($lang) %doc $HTML_DIR/$lang/*" >> %{name}.lang +done +fi -## Unpackaged/conflicting files +## conflicting files (with kde > 3.2) rm -rf $RPM_BUILD_ROOT%{_datadir}/apps/katepart -%files +%files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS ChangeLog README TODO -%lang(en) %doc %{_datadir}/doc/HTML/en/* %{_bindir}/* %{_datadir}/apps/kile %{_datadir}/apps/kconf_update/kile* -%config %{_datadir}/config.kcfg/kile.kcfg -%{_datadir}/icons/*/*/*/*.png -%{_datadir}/applications%{!?desktop_file:/kde}/*.desktop +%config %{_datadir}/config*/* +%{_datadir}/icons/*/*/*/* +%{_datadir}/applications/*.desktop %{_datadir}/mimelnk/*/*.desktop @@ -120,6 +104,22 @@ %changelog +* Thu Jun 02 2005 Rex Dieter 1.8.1-1 +- 1.8.1 +- x86_64 fix (bug #161343) + +* Tue May 31 2005 Rex Dieter 1.8-2 +- Obsoletes: kile-i18n + +* Mon May 23 2005 Rex Dieter 1.8-1 +- 1.8 + +* Sun May 22 2005 Jeremy Katz - 1.7.1 +- rebuild on all arches + +* Fri Apr 7 2005 Michael Schwendt +- rebuilt + * Wed Jan 12 2005 Rex Dieter 0:1.7.1-3 - fix (katepart) conflicts with kde >= 3.2 - update %%description Index: sources =================================================================== RCS file: /cvs/extras/rpms/kile/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 13 Jan 2005 15:32:49 -0000 1.3 +++ sources 5 Aug 2005 17:47:59 -0000 1.4 @@ -1 +1 @@ -940fba9dc62e2687856885dffccf6e80 kile-1.7.1.tar.bz2 +9ac4cd9294c6aff1acca1def68923a7d kile-1.8.1.tar.bz2 --- kile-1.7-dt.patch DELETED --- From fedora-extras-commits at redhat.com Fri Aug 5 17:49:49 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 5 Aug 2005 13:49:49 -0400 Subject: rpms/tetex-lgrind/FC-3 tetex-lgrind.spec,1.6,1.7 Message-ID: <200508051749.j75HnnF3030257@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/tetex-lgrind/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30228/FC-3 Modified Files: tetex-lgrind.spec Log Message: Install the dvi file where it can be found by texdoc. URL updated. disttag added. Index: tetex-lgrind.spec =================================================================== RCS file: /cvs/extras/rpms/tetex-lgrind/FC-3/tetex-lgrind.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- tetex-lgrind.spec 23 Jul 2005 20:00:53 -0000 1.6 +++ tetex-lgrind.spec 5 Aug 2005 17:49:47 -0000 1.7 @@ -6,8 +6,8 @@ Summary: Source-code pretty-printer for LaTeX Name: tetex-lgrind Version: 3.67 -Release: 4.1 -URL: http://www.ctan.org/tex-archive/support/lgrind +Release: 5%{?dist} +URL: http://www.ctan.org/tex-archive/help/Catalogue/entries/lgrind.html License: BSD Group: Applications/Publishing # NOTE: This tarball cannot be verified directly as it is @@ -15,7 +15,7 @@ # file contained in the tarballs have to be verified one by one. Source0: ftp://ftp.dante.de/tex-archive/support/lgrind.tar.gz Patch0: lgrind-3.67-parsevartab.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): tetex Requires(postun): tetex Requires: tetex-latex @@ -49,17 +49,21 @@ # Install TeX files. mkdir -p %{buildroot}%{texmf}/tex/latex/%{tdsname}/ -install -m 644 lgrind.sty %{buildroot}%{texmf}/tex/latex/%{tdsname}/ -install -m 644 lgrindef %{buildroot}%{texmf}/tex/latex/%{tdsname}/ +install -p -m 644 lgrind.sty %{buildroot}%{texmf}/tex/latex/%{tdsname}/ +install -p -m 644 lgrindef %{buildroot}%{texmf}/tex/latex/%{tdsname}/ + +# Install LaTeX package doc file. +mkdir -p %{buildroot}%{texmf}/doc/latex/%{tdsname}/ +install -p -m 644 lgrind.dvi %{buildroot}%{texmf}/doc/latex/%{tdsname}/ # Install binaries. mkdir -p %{buildroot}%{_bindir}/ -install -m 755 source/lgrind %{buildroot}%{_bindir}/ +install -p -m 755 source/lgrind %{buildroot}%{_bindir}/ # Install man pages. mkdir -p %{buildroot}%{_mandir}/man{1,5} -install -m 644 source/lgrind.1 %{buildroot}%{_mandir}/man1 -install -m 644 source/lgrindef.5 %{buildroot}%{_mandir}/man5 +install -p -m 644 source/lgrind.1 %{buildroot}%{_mandir}/man1 +install -p -m 644 source/lgrindef.5 %{buildroot}%{_mandir}/man5 %clean rm -rf %{buildroot} @@ -72,13 +76,19 @@ %files %defattr(-,root,root,-) -%doc README FAQ lgrind.dvi +%doc README FAQ %{_bindir}/* %{_mandir}/man1/* %{_mandir}/man5/* %{texmf}/tex/latex/%{tdsname} +%{texmf}/doc/ %changelog +* Thu Aug 4 2005 Jose Pedro Oliveira - 3.67-5 +- Install the dvi file where it can be found by texdoc. +- URL updated. +- disttag added. + * Sat Jul 23 2005 Michael Schwendt - 3.67-4.1 - Fix "missing expression in return statement" (#150297). - Drop explicit Epoch 0. From fedora-extras-commits at redhat.com Fri Aug 5 17:49:50 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 5 Aug 2005 13:49:50 -0400 Subject: rpms/tetex-lgrind/FC-4 tetex-lgrind.spec,1.10,1.11 Message-ID: <200508051749.j75Hno69030263@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/tetex-lgrind/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30228/FC-4 Modified Files: tetex-lgrind.spec Log Message: Install the dvi file where it can be found by texdoc. URL updated. disttag added. Index: tetex-lgrind.spec =================================================================== RCS file: /cvs/extras/rpms/tetex-lgrind/FC-4/tetex-lgrind.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- tetex-lgrind.spec 23 Jul 2005 19:57:35 -0000 1.10 +++ tetex-lgrind.spec 5 Aug 2005 17:49:48 -0000 1.11 @@ -6,8 +6,8 @@ Summary: Source-code pretty-printer for LaTeX Name: tetex-lgrind Version: 3.67 -Release: 6.1 -URL: http://www.ctan.org/tex-archive/support/lgrind +Release: 7%{?dist} +URL: http://www.ctan.org/tex-archive/help/Catalogue/entries/lgrind.html License: BSD Group: Applications/Publishing # NOTE: This tarball cannot be verified directly as it is @@ -15,7 +15,7 @@ # file contained in the tarballs have to be verified one by one. Source0: ftp://ftp.dante.de/tex-archive/support/lgrind.tar.gz Patch0: lgrind-3.67-parsevartab.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): tetex Requires(postun): tetex Requires: tetex-latex @@ -49,17 +49,21 @@ # Install TeX files. mkdir -p %{buildroot}%{texmf}/tex/latex/%{tdsname}/ -install -m 644 lgrind.sty %{buildroot}%{texmf}/tex/latex/%{tdsname}/ -install -m 644 lgrindef %{buildroot}%{texmf}/tex/latex/%{tdsname}/ +install -p -m 644 lgrind.sty %{buildroot}%{texmf}/tex/latex/%{tdsname}/ +install -p -m 644 lgrindef %{buildroot}%{texmf}/tex/latex/%{tdsname}/ + +# Install LaTeX package doc file. +mkdir -p %{buildroot}%{texmf}/doc/latex/%{tdsname}/ +install -p -m 644 lgrind.dvi %{buildroot}%{texmf}/doc/latex/%{tdsname}/ # Install binaries. mkdir -p %{buildroot}%{_bindir}/ -install -m 755 source/lgrind %{buildroot}%{_bindir}/ +install -p -m 755 source/lgrind %{buildroot}%{_bindir}/ # Install man pages. mkdir -p %{buildroot}%{_mandir}/man{1,5} -install -m 644 source/lgrind.1 %{buildroot}%{_mandir}/man1 -install -m 644 source/lgrindef.5 %{buildroot}%{_mandir}/man5 +install -p -m 644 source/lgrind.1 %{buildroot}%{_mandir}/man1 +install -p -m 644 source/lgrindef.5 %{buildroot}%{_mandir}/man5 %clean rm -rf %{buildroot} @@ -72,13 +76,19 @@ %files %defattr(-,root,root,-) -%doc README FAQ lgrind.dvi +%doc README FAQ %{_bindir}/* %{_mandir}/man1/* %{_mandir}/man5/* %{texmf}/tex/latex/%{tdsname} +%{texmf}/doc/ %changelog +* Thu Aug 4 2005 Jose Pedro Oliveira - 3.67-7 +- Install the dvi file where it can be found by texdoc. +- URL updated. +- disttag added. + * Sat Jul 23 2005 Michael Schwendt - 3.67-6.1 - Fix "missing expression in return statement" (#150297). From fedora-extras-commits at redhat.com Fri Aug 5 17:51:43 2005 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Fri, 5 Aug 2005 13:51:43 -0400 Subject: rpms/svgalib/devel svgalib.spec,1.2,1.3 Message-ID: <200508051751.j75HphOO030390@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/svgalib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30373 Modified Files: svgalib.spec Log Message: Disable ppc for now Index: svgalib.spec =================================================================== RCS file: /cvs/extras/rpms/svgalib/devel/svgalib.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- svgalib.spec 5 Aug 2005 16:20:21 -0000 1.2 +++ svgalib.spec 5 Aug 2005 17:51:41 -0000 1.3 @@ -1,6 +1,7 @@ Name: svgalib Version: 1.9.21 Release: 3 +Exclusivearch: %{ix86} x86_64 Summary: Low-level fullscreen SVGA graphics library Group: System Environment/Libraries @@ -50,7 +51,8 @@ %ifnarch %{ix86} %patch7 -p1 -b .x86_64 %endif -%patch8 -p1 -b .ppc +#%patch8 -p1 -b .ppc + #the testlinear demo needs svgalib's internal libvga header, so copy it to the #demo dir cp src/libvga.h demos @@ -132,7 +134,10 @@ %changelog * Fri Aug 5 2005 Hans de Goede 1.9.21-3 -- Add patch 7 to fix compilation on ppc +- Add patch 8 to try to fix compilation on ppc. +- PPC has issues with the use of iopl ioperm inb and outb + functions, upstream has svgalib working on PPC afaik? +- Disabling PPC builds for now, will look into this together with upstream. * Wed Aug 3 2005 Hans de Goede 1.9.21-2 - I've been working with upstream to get most patches intergrated, so From fedora-extras-commits at redhat.com Fri Aug 5 17:56:59 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 5 Aug 2005 13:56:59 -0400 Subject: rpms/libgnomedb/FC-4 libgnomedb.spec,1.1,1.2 Message-ID: <200508051756.j75HuxfX030524@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/libgnomedb/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30495/FC-4 Modified Files: libgnomedb.spec Log Message: Remove the lonely tabulation marks. Index: libgnomedb.spec =================================================================== RCS file: /cvs/extras/rpms/libgnomedb/FC-4/libgnomedb.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libgnomedb.spec 15 Mar 2005 08:14:35 -0000 1.1 +++ libgnomedb.spec 5 Aug 2005 17:56:57 -0000 1.2 @@ -2,17 +2,17 @@ Name: libgnomedb Version: 1.2.0 Release: 3 -Epoch: 1 +Epoch: 1 Source: %{name}-%{version}.tar.bz2 URL: http://www.gnome-db.org/ Group: System Environment/Libraries License: LGPL BuildRoot: %{_tmppath}/%{name}-%{version}-root Requires: gtk2 >= 1.3.6, libglade2, libgnomeui >= 1.103.0 -Requires: libgda >= 1.2.0 +Requires: libgda >= 1.2.0 PreReq: desktop-file-utils >= %{desktop_file_utils_version} BuildRequires: pkgconfig >= 0.8, libgnomeui-devel >= 1.103.0 -BuildRequires: gtk2-devel >= 1.3.6, libglade2-devel, scrollkeeper +BuildRequires: gtk2-devel >= 1.3.6, libglade2-devel, scrollkeeper BuildRequires: desktop-file-utils >= %{desktop_file_utils_version} BuildRequires: libgda-devel >= 1.2.0 @@ -25,7 +25,7 @@ %package devel Summary: Development libraries and header files for libgnomedb. Group: Development/Libraries -Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: %{name} = %{epoch}:%{version}-%{release} Requires: pkgconfig >= 0.8 Requires: libgnomeui >= 1.103.0 Requires: libgnomeui-devel >= 1.103.0 From fedora-extras-commits at redhat.com Fri Aug 5 17:57:00 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 5 Aug 2005 13:57:00 -0400 Subject: rpms/libgnomedb/devel libgnomedb.spec,1.2,1.3 Message-ID: <200508051757.j75Hv0RI030530@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/libgnomedb/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30495/devel Modified Files: libgnomedb.spec Log Message: Remove the lonely tabulation marks. Index: libgnomedb.spec =================================================================== RCS file: /cvs/extras/rpms/libgnomedb/devel/libgnomedb.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- libgnomedb.spec 5 Aug 2005 17:41:03 -0000 1.2 +++ libgnomedb.spec 5 Aug 2005 17:56:58 -0000 1.3 @@ -2,17 +2,17 @@ Name: libgnomedb Version: 1.2.0 Release: 4 -Epoch: 1 +Epoch: 1 Source: %{name}-%{version}.tar.bz2 URL: http://www.gnome-db.org/ Group: System Environment/Libraries License: LGPL BuildRoot: %{_tmppath}/%{name}-%{version}-root Requires: gtk2 >= 1.3.6, libglade2, libgnomeui >= 1.103.0 -Requires: libgda >= 1.2.0 +Requires: libgda >= 1.2.0 PreReq: desktop-file-utils >= %{desktop_file_utils_version} BuildRequires: pkgconfig >= 0.8, libgnomeui-devel >= 1.103.0 -BuildRequires: gtk2-devel >= 1.3.6, libglade2-devel, scrollkeeper +BuildRequires: gtk2-devel >= 1.3.6, libglade2-devel, scrollkeeper BuildRequires: desktop-file-utils >= %{desktop_file_utils_version} BuildRequires: libgda-devel >= 1.2.0 @@ -25,7 +25,7 @@ %package devel Summary: Development libraries and header files for libgnomedb. Group: Development/Libraries -Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: %{name} = %{epoch}:%{version}-%{release} Requires: pkgconfig >= 0.8 Requires: libgnomeui >= 1.103.0 Requires: libgnomeui-devel >= 1.103.0 From fedora-extras-commits at redhat.com Fri Aug 5 18:37:20 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 5 Aug 2005 14:37:20 -0400 Subject: rpms/lyx/devel lyx.spec,1.9,1.10 Message-ID: <200508051837.j75IbKq5031801@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/lyx/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31784 Modified Files: lyx.spec Log Message: use %{?dist} BR: qt >= 3.3 Index: lyx.spec =================================================================== RCS file: /cvs/extras/rpms/lyx/devel/lyx.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- lyx.spec 3 Aug 2005 17:51:33 -0000 1.9 +++ lyx.spec 5 Aug 2005 18:37:18 -0000 1.10 @@ -3,7 +3,7 @@ Summary: WYSIWYM (What You See Is What You Mean) document processor Name: lyx Version: 1.3.6 -Release: 2 +Release: 2%{?dist} License: GPL Group: Applications/Publishing @@ -33,7 +33,7 @@ Requires: ghostscript Requires: htmlview -BuildRequires: qt-devel >= 1:3.1 +BuildRequires: qt-devel >= 1:3.3 %define qt_ver %(rpm -q --qf '%%{version}' qt-devel ) Requires: qt >= 1:%{qt_ver} From fedora-extras-commits at redhat.com Fri Aug 5 18:39:48 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 5 Aug 2005 14:39:48 -0400 Subject: rpms/lyx/FC-4 lyx-1.3.5-helpers.patch, 1.1, 1.2 lyx.spec, 1.8, 1.9 sources, 1.3, 1.4 lyx-1.3.4-gcc34.patch, 1.1, NONE Message-ID: <200508051839.j75IdnNA031888@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/lyx/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31864 Modified Files: lyx-1.3.5-helpers.patch lyx.spec sources Removed Files: lyx-1.3.4-gcc34.patch Log Message: sync w/-devel branch lyx-1.3.5-helpers.patch: Index: lyx-1.3.5-helpers.patch =================================================================== RCS file: /cvs/extras/rpms/lyx/FC-4/lyx-1.3.5-helpers.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- lyx-1.3.5-helpers.patch 4 Dec 2004 12:21:23 -0000 1.1 +++ lyx-1.3.5-helpers.patch 5 Aug 2005 18:39:46 -0000 1.2 @@ -5,10 +5,10 @@ # Search something to preview postscript echo $ac_n "checking for a Postscript previewer""... $ac_c" -echo "$ac_t""(gsview32 gv ghostview)" -+echo "$ac_t""(gsview32 gsview ggv kghostview gv ghostview)" ++echo "$ac_t""(evince gsview32 gsview ggv kghostview gv ghostview)" GHOSTVIEW= -for ac_prog in gsview32 gv ghostview -+for ac_prog in gsview32 gsview ggv kghostview gv ghostview ++for ac_prog in evince gsview32 gsview ggv kghostview gv ghostview do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog ; ac_word=$2 @@ -17,10 +17,10 @@ # Search for a program to preview pdf echo $ac_n "checking for a PDF preview""... $ac_c" -echo "$ac_t""(acrobat acrord32 gsview32 acroread gv ghostview xpdf)" -+echo "$ac_t""(acrobat acrord32 gsview32 gsview acroread xpdf ggv kghostview gv ghostview)" ++echo "$ac_t""(evince acrobat acrord32 acroread gsview32 gsview xpdf ggv kghostview gv ghostview)" PDF_VIEWER= -for ac_prog in acrobat acrord32 gsview32 acroread gv ghostview xpdf -+for ac_prog in acrobat acrord32 gsview32 gsview acroread xpdf ggv kghostview gv ghostview ++for ac_prog in evince acrobat acrord32 acroread gsview32 gsview xpdf ggv kghostview gv ghostview do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog ; ac_word=$2 Index: lyx.spec =================================================================== RCS file: /cvs/extras/rpms/lyx/FC-4/lyx.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- lyx.spec 22 May 2005 23:10:30 -0000 1.8 +++ lyx.spec 5 Aug 2005 18:39:46 -0000 1.9 @@ -1,56 +1,42 @@ # $Id$ Summary: WYSIWYM (What You See Is What You Mean) document processor -Name: lyx -Version: 1.3.5 -Release: 5%{?dist_tag} - +Name: lyx +Version: 1.3.6 +Release: 2%{?dist} License: GPL -Group: Applications/Publishing -URL: http://www.lyx.org/ -Source: ftp://ftp.lyx.org/pub/lyx/stable/lyx-1.3.5.tar.bz2 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -Patch1: lyx-1.3.5-helpers.patch +Group: Applications/Publishing +Url: http://www.lyx.org/ +Source: ftp://ftp.lyx.org/pub/lyx/stable/lyx-1.3.6.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Patch1: lyx-1.3.5-helpers.patch Source1: lyx.desktop # "borrow" kde's crystal icon for lyx Source2: lyx-crystal.png BuildRequires: desktop-file-utils +BuildRequires: aiksaurus-devel BuildRequires: aspell-devel BuildRequires: tetex-latex BuildRequires: tetex-fonts -BuildRequires: tetex-xdvi -BuildRequires: tetex-dvips -BuildRequires: htmlview -BuildRequires: gsview -BuildRequires: wv # For texhash -Requires(post): tetex -Requires(postun): tetex +Requires(post): tetex-fonts +Requires(postun): tetex-fonts Requires: tetex-latex +Requires: tetex-dvips Requires: mathml-fonts -# These are just helper apps, to display ps,pdf,html content -# not *strictly* required, but what the heck +Requires: ghostscript Requires: htmlview -Requires: gsview -BuildRequires: qt-devel >= 1:3.1 -%define qt_ver %(rpm -q --qf '%%{version}' qt-devel | cut -d. -f1,2) +BuildRequires: qt-devel >= 1:3.3 +%define qt_ver %(rpm -q --qf '%%{version}' qt-devel ) Requires: qt >= 1:%{qt_ver} -## gcc version in use? -# I *still* build for some rh73 boxes (not sure why (-: ), -# so I need this -- Rex -BuildRequires: gcc-c++ -%define gcc_ver %(rpm -q --qf '%%{version}' gcc-c++ ) -%if "%{gcc_ver}" == "2.96" -%define cxxflags -ftemplate-depth-44 -%endif - %description LyX is a modern approach to writing documents which breaks with the @@ -78,15 +64,17 @@ %build -unset LINGUAS ||: +unset LINGUAS ||: unset QTDIR ||: ; . /etc/profile.d/qt.sh -export CXXFLAGS="$RPM_OPT_FLAGS %{?cxxflags}" +%{?gcc296: export CXXFLAGS="$RPM_OPT_FLAGS -ftemplate-depth-44" } %configure \ - --program-prefix="%{?_program_prefix}" \ --with-frontend=qt \ - --with-pspell + --enable-optimization="$RPM_OPT_FLAGS" \ + --with-aiksaurus \ + --with-pspell \ + --disable-dependency-tracking make %{_smp_mflags} @@ -106,7 +94,7 @@ mv ${RPM_BUILD_ROOT}%{_datadir}/lyx/tex \ ${RPM_BUILD_ROOT}${texmf}/tex/latex/lyx -# KDE has a nice builtin crystalsvg icon, but this is for gnome +# KDE has a nice builtin crystalsvg icon, but this is for gnome's benefit install -p -m644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps/lyx.png mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications @@ -115,7 +103,7 @@ --add-category "X-Fedora" \ %{SOURCE1} -%find_lang %{name} +%find_lang %{name} || touch %{name}.lang %post @@ -124,11 +112,21 @@ # Now configure LyX cd %{_datadir}/lyx && ./configure --srcdir >& /dev/null - %postun # Fix the TeX file hash texhash >& /dev/null ||: +# Catch installed/uninstalled helpers +%triggerin -- acroread,AdobeReader_enu,evince,gsview,kdegraphics,latex2html,tetex-xdvi,wv +if [ $2 -gt 1 ]; then +cd %{_datadir}/lyx && ./configure --srcdir >& /dev/null +fi + +%triggerun -- acroread,AdobeReader_enu,evince,gsview,kdegraphics,latex2html,tetex-xdvi,wv +if [ $2 -eq 0 ]; then +cd %{_datadir}/lyx && ./configure --srcdir >& /dev/null +fi + %clean rm -rf $RPM_BUILD_ROOT @@ -141,11 +139,31 @@ %{_datadir}/pixmaps/* %{_bindir}/* %{_mandir}/man?/* -%{_datadir}/%{name}* +%{_datadir}/%{name} +%verify(not md5 size mtime) %{_datadir}/%{name}/*.lst +%verify(not md5 size mtime) %{_datadir}/%{name}/lyxrc.defaults +%verify(not md5 size mtime) %{_datadir}/%{name}/doc/LaTeXConfig.lyx +%verify(not md5 size mtime) %{_datadir}/%{name}/xfonts/PSres.upr +%verify(not md5 size mtime) %{_datadir}/%{name}/xfonts/fonts.* %{_datadir}/texmf/tex/latex/%{name} -%changelog +%changelog +* Mon Aug 01 2005 Rex Dieter 1.3.6-2 +- use triggers to configure/unconfigure helper (ps/pdf/html) apps + +* Sat Jul 23 2005 Rex Dieter 1.3.6-1 +- 1.3.6 + +* Mon May 23 2005 Rex Dieter 1.3.5-4 +- qt_immodule patch (lyx bug #1830) +- update -helpers patch to look-for/use evince (rh bug #143992) +- drop (not-strictly-required) Req's on helper apps + htmlview, gsview (rh bug #143992) +- %%configure: --with-aiksaurus +- %%configure: --enable-optimization="$$RPM_OPT_FLAGS" +- %%configure: --disable-dependancy-tracking + * Sun May 22 2005 Jeremy Katz - 1.3.5 - rebuild on all arches @@ -153,10 +171,16 @@ - rebuilt * Thu Oct 21 2004 Rex Dieter 0:1.3.5-3 -- BR: htmlview +- BR: htmlview - Requires: htmlview, gsview (so build-time-detected helper apps are available at runtime) + +* Thu Oct 21 2004 Rex Dieter 0:1.3.5-0.fdr.3 +- BR: htmlview +- Requires: htmlview, gsview (so build-time-detected helper apps are + available at runtime) + * Wed Oct 20 2004 Rex Dieter 0:1.3.5-0.fdr.2 - BR: pspell-devel -> aspell-devel - BR: tetex-* (helper detection, fonts) @@ -196,7 +220,7 @@ - Categories=Office * Mon Nov 24 2003 Rex Dieter 0:1.3.3-0.fdr.3 -- Requires: tetex-latex +- Requires: tetex-latex - support MimeType(s): application/x-lyx;text/x-lyx * Sat Nov 22 2003 Rex Dieter 0:1.3.3-0.fdr.2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/lyx/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 4 Dec 2004 12:21:23 -0000 1.3 +++ sources 5 Aug 2005 18:39:46 -0000 1.4 @@ -1 +1 @@ -f4c70d2565ba9c974b1f94fc1dfd63bf lyx-1.3.5.tar.bz2 +20fd8515cc025129d97232dd2583f35f lyx-1.3.6.tar.gz --- lyx-1.3.4-gcc34.patch DELETED --- From fedora-extras-commits at redhat.com Fri Aug 5 18:40:04 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 5 Aug 2005 14:40:04 -0400 Subject: rpms/lyx/FC-3 lyx-1.3.5-helpers.patch, 1.1, 1.2 lyx.spec, 1.5, 1.6 lyx-1.3.4-gcc34.patch, 1.1, NONE Message-ID: <200508051840.j75Ie4pX031916@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/lyx/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31894 Modified Files: lyx-1.3.5-helpers.patch lyx.spec Removed Files: lyx-1.3.4-gcc34.patch Log Message: sync w/-devel branch lyx-1.3.5-helpers.patch: Index: lyx-1.3.5-helpers.patch =================================================================== RCS file: /cvs/extras/rpms/lyx/FC-3/lyx-1.3.5-helpers.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- lyx-1.3.5-helpers.patch 4 Dec 2004 12:21:23 -0000 1.1 +++ lyx-1.3.5-helpers.patch 5 Aug 2005 18:40:02 -0000 1.2 @@ -5,10 +5,10 @@ # Search something to preview postscript echo $ac_n "checking for a Postscript previewer""... $ac_c" -echo "$ac_t""(gsview32 gv ghostview)" -+echo "$ac_t""(gsview32 gsview ggv kghostview gv ghostview)" ++echo "$ac_t""(evince gsview32 gsview ggv kghostview gv ghostview)" GHOSTVIEW= -for ac_prog in gsview32 gv ghostview -+for ac_prog in gsview32 gsview ggv kghostview gv ghostview ++for ac_prog in evince gsview32 gsview ggv kghostview gv ghostview do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog ; ac_word=$2 @@ -17,10 +17,10 @@ # Search for a program to preview pdf echo $ac_n "checking for a PDF preview""... $ac_c" -echo "$ac_t""(acrobat acrord32 gsview32 acroread gv ghostview xpdf)" -+echo "$ac_t""(acrobat acrord32 gsview32 gsview acroread xpdf ggv kghostview gv ghostview)" ++echo "$ac_t""(evince acrobat acrord32 acroread gsview32 gsview xpdf ggv kghostview gv ghostview)" PDF_VIEWER= -for ac_prog in acrobat acrord32 gsview32 acroread gv ghostview xpdf -+for ac_prog in acrobat acrord32 gsview32 gsview acroread xpdf ggv kghostview gv ghostview ++for ac_prog in evince acrobat acrord32 acroread gsview32 gsview xpdf ggv kghostview gv ghostview do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog ; ac_word=$2 Index: lyx.spec =================================================================== RCS file: /cvs/extras/rpms/lyx/FC-3/lyx.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- lyx.spec 4 Dec 2004 12:21:23 -0000 1.5 +++ lyx.spec 5 Aug 2005 18:40:02 -0000 1.6 @@ -2,14 +2,14 @@ Summary: WYSIWYM (What You See Is What You Mean) document processor Name: lyx -Epoch: 0 -Version: 1.3.5 -Release: 3%{?dist_tag} +Version: 1.3.6 +Release: 2%{?dist} License: GPL + Group: Applications/Publishing Url: http://www.lyx.org/ -Source: ftp://ftp.lyx.org/pub/lyx/stable/lyx-1.3.5.tar.bz2 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +Source: ftp://ftp.lyx.org/pub/lyx/stable/lyx-1.3.6.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch1: lyx-1.3.5-helpers.patch @@ -18,39 +18,25 @@ Source2: lyx-crystal.png BuildRequires: desktop-file-utils +BuildRequires: aiksaurus-devel BuildRequires: aspell-devel BuildRequires: tetex-latex BuildRequires: tetex-fonts -BuildRequires: tetex-xdvi -BuildRequires: tetex-dvips -BuildRequires: htmlview -BuildRequires: gsview -BuildRequires: wv # For texhash -Requires(post): tetex -Requires(postun): tetex +Requires(post): tetex-fonts +Requires(postun): tetex-fonts Requires: tetex-latex +Requires: tetex-dvips Requires: mathml-fonts -# These are just helper apps, to display ps,pdf,html content -# not *strictly* required, but what the heck +Requires: ghostscript Requires: htmlview -Requires: gsview -BuildRequires: qt-devel >= 1:3.1 -%define qt_ver %(rpm -q --qf '%%{version}' qt-devel | cut -d. -f1,2) +BuildRequires: qt-devel >= 1:3.3 +%define qt_ver %(rpm -q --qf '%%{version}' qt-devel ) Requires: qt >= 1:%{qt_ver} -## gcc version in use? -# I *still* build for some rh73 boxes (not sure why (-: ), -# so I need this -- Rex -BuildRequires: gcc-c++ -%define gcc_ver %(rpm -q --qf '%%{version}' gcc-c++ ) -%if "%{gcc_ver}" == "2.96" -%define cxxflags -ftemplate-depth-44 -%endif - %description LyX is a modern approach to writing documents which breaks with the @@ -81,12 +67,14 @@ unset LINGUAS ||: unset QTDIR ||: ; . /etc/profile.d/qt.sh -export CXXFLAGS="$RPM_OPT_FLAGS %{?cxxflags}" +%{?gcc296: export CXXFLAGS="$RPM_OPT_FLAGS -ftemplate-depth-44" } %configure \ - --program-prefix="%{?_program_prefix}" \ --with-frontend=qt \ - --with-pspell + --enable-optimization="$RPM_OPT_FLAGS" \ + --with-aiksaurus \ + --with-pspell \ + --disable-dependency-tracking make %{_smp_mflags} @@ -106,7 +94,7 @@ mv ${RPM_BUILD_ROOT}%{_datadir}/lyx/tex \ ${RPM_BUILD_ROOT}${texmf}/tex/latex/lyx -# KDE has a nice builtin crystalsvg icon, but this is for gnome +# KDE has a nice builtin crystalsvg icon, but this is for gnome's benefit install -p -m644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps/lyx.png mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications @@ -115,7 +103,7 @@ --add-category "X-Fedora" \ %{SOURCE1} -%find_lang %{name} +%find_lang %{name} || touch %{name}.lang %post @@ -124,11 +112,21 @@ # Now configure LyX cd %{_datadir}/lyx && ./configure --srcdir >& /dev/null - %postun # Fix the TeX file hash texhash >& /dev/null ||: +# Catch installed/uninstalled helpers +%triggerin -- acroread,AdobeReader_enu,evince,gsview,kdegraphics,latex2html,tetex-xdvi,wv +if [ $2 -gt 1 ]; then +cd %{_datadir}/lyx && ./configure --srcdir >& /dev/null +fi + +%triggerun -- acroread,AdobeReader_enu,evince,gsview,kdegraphics,latex2html,tetex-xdvi,wv +if [ $2 -eq 0 ]; then +cd %{_datadir}/lyx && ./configure --srcdir >& /dev/null +fi + %clean rm -rf $RPM_BUILD_ROOT @@ -141,12 +139,44 @@ %{_datadir}/pixmaps/* %{_bindir}/* %{_mandir}/man?/* -%{_datadir}/%{name}* +%{_datadir}/%{name} +%verify(not md5 size mtime) %{_datadir}/%{name}/*.lst +%verify(not md5 size mtime) %{_datadir}/%{name}/lyxrc.defaults +%verify(not md5 size mtime) %{_datadir}/%{name}/doc/LaTeXConfig.lyx +%verify(not md5 size mtime) %{_datadir}/%{name}/xfonts/PSres.upr +%verify(not md5 size mtime) %{_datadir}/%{name}/xfonts/fonts.* %{_datadir}/texmf/tex/latex/%{name} %changelog +* Mon Aug 01 2005 Rex Dieter 1.3.6-2 +- use triggers to configure/unconfigure helper (ps/pdf/html) apps + +* Sat Jul 23 2005 Rex Dieter 1.3.6-1 +- 1.3.6 + +* Mon May 23 2005 Rex Dieter 1.3.5-4 +- qt_immodule patch (lyx bug #1830) +- update -helpers patch to look-for/use evince (rh bug #143992) +- drop (not-strictly-required) Req's on helper apps + htmlview, gsview (rh bug #143992) +- %%configure: --with-aiksaurus +- %%configure: --enable-optimization="$$RPM_OPT_FLAGS" +- %%configure: --disable-dependancy-tracking + +* Sun May 22 2005 Jeremy Katz - 1.3.5 +- rebuild on all arches + +* Fri Apr 7 2005 Michael Schwendt +- rebuilt + * Thu Oct 21 2004 Rex Dieter 0:1.3.5-3 +- BR: htmlview +- Requires: htmlview, gsview (so build-time-detected helper apps are + available at runtime) + + +* Thu Oct 21 2004 Rex Dieter 0:1.3.5-0.fdr.3 - BR: htmlview - Requires: htmlview, gsview (so build-time-detected helper apps are available at runtime) --- lyx-1.3.4-gcc34.patch DELETED --- From fedora-extras-commits at redhat.com Fri Aug 5 19:07:19 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 5 Aug 2005 15:07:19 -0400 Subject: rpms/lyx/devel lyx-1.3.5-helpers.patch,1.2,1.3 lyx.spec,1.10,1.11 Message-ID: <200508051907.j75J7JsB000671@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/lyx/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv652 Modified Files: lyx-1.3.5-helpers.patch lyx.spec Log Message: * Fri Aug 05 2005 Rex Dieter 1.3.6-3 - touchup helpers script - fix for (sometimes missing) PSres.upr lyx-1.3.5-helpers.patch: Index: lyx-1.3.5-helpers.patch =================================================================== RCS file: /cvs/extras/rpms/lyx/devel/lyx-1.3.5-helpers.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- lyx-1.3.5-helpers.patch 3 Aug 2005 17:51:33 -0000 1.2 +++ lyx-1.3.5-helpers.patch 5 Aug 2005 19:07:02 -0000 1.3 @@ -44,7 +44,7 @@ +echo "$ac_t""("htmlview file://\$\$p\$\$i" "mozilla file://\$\$p\$\$i" netscape)" HTML_VIEWER= -for ac_prog in "mozilla file://\$\$p\$\$i" netscape -+for ac_prog in ""htmlview file://\$\$p\$\$i" mozilla file://\$\$p\$\$i" netscape ++for ac_prog in "htmlview file://\$\$p\$\$i" "mozilla file://\$\$p\$\$i" netscape do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog ; ac_word=$2 Index: lyx.spec =================================================================== RCS file: /cvs/extras/rpms/lyx/devel/lyx.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- lyx.spec 5 Aug 2005 18:37:18 -0000 1.10 +++ lyx.spec 5 Aug 2005 19:07:02 -0000 1.11 @@ -1,11 +1,10 @@ -# $Id$ Summary: WYSIWYM (What You See Is What You Mean) document processor Name: lyx Version: 1.3.6 -Release: 2%{?dist} -License: GPL +Release: 3%{?dist} +License: GPL Group: Applications/Publishing Url: http://www.lyx.org/ Source: ftp://ftp.lyx.org/pub/lyx/stable/lyx-1.3.6.tar.gz @@ -22,6 +21,8 @@ BuildRequires: aspell-devel BuildRequires: tetex-latex BuildRequires: tetex-fonts +#BuildRequires: /usr/X11R6/bin/makepsres +BuildRequires: xorg-x11 # For texhash Requires(post): tetex-fonts @@ -105,6 +106,8 @@ %find_lang %{name} || touch %{name}.lang +touch $RPM_BUILD_ROOT%{_datadir}/%{name}/xfonts/PSres.upr + %post # Make TeX understand where LyX-specific packages are @@ -149,6 +152,10 @@ %changelog +* Fri Aug 05 2005 Rex Dieter 1.3.6-3 +- touchup helpers script +- fix for (sometimes missing) PSres.upr + * Mon Aug 01 2005 Rex Dieter 1.3.6-2 - use triggers to configure/unconfigure helper (ps/pdf/html) apps From fedora-extras-commits at redhat.com Fri Aug 5 19:24:51 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Fri, 5 Aug 2005 15:24:51 -0400 Subject: extras-buildsys/builder builder.py,1.28,1.29 Message-ID: <200508051924.j75JOpMh000791@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/builder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv774/builder Modified Files: builder.py Log Message: Wait to quit until the clean finishes Index: builder.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/builder/builder.py,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- builder.py 5 Aug 2005 16:24:07 -0000 1.28 +++ builder.py 5 Aug 2005 19:24:49 -0000 1.29 @@ -761,6 +761,13 @@ (curjob, status) = bcs.get_cur_job() if curjob: bcs.die(curjob) + # wait for the job to clean up before quitting + while True: + (curjob, status) = bcs.get_cur_job() + if status == 'idle' or curjob == 0: + break + bcs.process() + time.sleep(0.5) break cur_time = time.time() From fedora-extras-commits at redhat.com Fri Aug 5 19:31:58 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 5 Aug 2005 15:31:58 -0400 Subject: rpms/gsview/devel gsview.spec,1.13,1.14 Message-ID: <200508051931.j75JVw2e000820@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gsview/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv803 Modified Files: gsview.spec Log Message: fix bugzilla URL Index: gsview.spec =================================================================== RCS file: /cvs/extras/rpms/gsview/devel/gsview.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- gsview.spec 5 Aug 2005 17:13:19 -0000 1.13 +++ gsview.spec 5 Aug 2005 19:31:56 -0000 1.14 @@ -31,7 +31,7 @@ # default to libgs.so.@@SOMAJOR@@ instead of libgs.so Patch2: gsview-4.6-libgs.patch # attempt to allow/use ghostscript-8.15 reported value of 81500. -# http://bugs.redhat.com/159912 +# http://bugzilla.redhat.com/159912 Patch3: gsview-4.7-dllversion.patch # Change Paper default A4 -> Letter Patch4: gsview-4.7-letterpaper.patch From fedora-extras-commits at redhat.com Fri Aug 5 19:35:44 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 5 Aug 2005 15:35:44 -0400 Subject: rpms/stripesnoop/FC-3 stripesnoop-1.5-pathing.patch, NONE, 1.1 stripesnoop.spec, 1.2, 1.3 Message-ID: <200508051935.j75JZiv1000889@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/stripesnoop/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv843/FC-3 Modified Files: stripesnoop.spec Added Files: stripesnoop-1.5-pathing.patch Log Message: fix ppc compile only, remove -devel, fix pathing. stripesnoop-1.5-pathing.patch: --- NEW FILE stripesnoop-1.5-pathing.patch --- --- stripesnoop-1.5/parser.h.BAD 2005-08-05 14:32:06.000000000 -0500 +++ stripesnoop-1.5/parser.h 2005-08-05 14:32:39.000000000 -0500 @@ -50,8 +50,8 @@ //define the field seperators, and filenames for the DB #define TRACK2DELIM ":<>=?" -#define VISADATABASE "visa-pre.txt" -#define AAMVADATABASE "dl-iin.csv" +#define VISADATABASE "/usr/share/stripesnoop/visa-pre.txt" +#define AAMVADATABASE "/usr/share/stripesnoop/dl-iin.csv" /* * bool isDelim(char ch, char* delim) Index: stripesnoop.spec =================================================================== RCS file: /cvs/extras/rpms/stripesnoop/FC-3/stripesnoop.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- stripesnoop.spec 4 Aug 2005 21:51:44 -0000 1.2 +++ stripesnoop.spec 5 Aug 2005 19:35:42 -0000 1.3 @@ -1,6 +1,6 @@ Name: stripesnoop Version: 1.5 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: Applications/System Summary: Magnetic Stripe Reader @@ -10,6 +10,7 @@ Patch0: stripesnoop-1.5-rpmoptflags.patch Patch1: stripesnoop-1.5-deflinux.patch Patch2: stripesnoop-1.5-asmio.patch +Patch3: stripesnoop-1.5-pathing.patch %description Stripe Snoop is a suite of research tools that captures, modifies, validates, @@ -19,19 +20,14 @@ of known card formats. It uses this to give you more detailed information about the card. -%package devel -Summary: Headers for stripesnoop -Requires: %{name} = %{version}-%{release} -Group: Development/System - -%description devel -%{summary}. - %prep %setup -q -c %{name}-%{version} %patch0 -p1 %patch1 -p1 +%ifarch ppc %patch2 -p1 +%endif +%patch3 -p1 chmod -x cards.txt ChangeLog.txt COPYING.txt README.txt visa-pre.txt \ hardware/* samples/* @@ -42,7 +38,7 @@ rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/%{_includedir}/%{name} mkdir -p $RPM_BUILD_ROOT/%{_bindir} -install -m0644 *.h dl-iin.csv $RPM_BUILD_ROOT/%{_includedir}/%{name} +install -m0644 dl-iin.csv visa-pre.txt $RPM_BUILD_ROOT/%{_datadir}/%{name} install -m0755 bitgen mod10 ss $RPM_BUILD_ROOT/%{_bindir} %clean @@ -50,16 +46,18 @@ %files %defattr(-,root,root,-) -%doc ChangeLog.txt COPYING.txt README.txt hardware/ samples/ visa-pre.txt +%doc ChangeLog.txt COPYING.txt README.txt hardware/ samples/ %{_bindir}/ss %{_bindir}/bitgen %{_bindir}/mod10 - -%files devel -%defattr(-,root,root,-) -%{_includedir}/%{name} +%{_datadir}/%{name}/ %changelog +* Fri Aug 5 2005 Tom "spot" Callaway 1.5-4 +- only use asm/io.h for ppc +- get rid of devel package (unnecessary) +- fix path for dl-iin.csv, visa-pre.txt + * Thu Aug 4 2005 Tom "spot" Callaway 1.5-3 - use asm/io.h to enable ppc to build From fedora-extras-commits at redhat.com Fri Aug 5 19:35:45 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 5 Aug 2005 15:35:45 -0400 Subject: rpms/stripesnoop/devel stripesnoop-1.5-pathing.patch, NONE, 1.1 stripesnoop.spec, 1.2, 1.3 Message-ID: <200508051935.j75JZjl9000905@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/stripesnoop/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv843/devel Modified Files: stripesnoop.spec Added Files: stripesnoop-1.5-pathing.patch Log Message: fix ppc compile only, remove -devel, fix pathing. stripesnoop-1.5-pathing.patch: --- NEW FILE stripesnoop-1.5-pathing.patch --- --- stripesnoop-1.5/parser.h.BAD 2005-08-05 14:32:06.000000000 -0500 +++ stripesnoop-1.5/parser.h 2005-08-05 14:32:39.000000000 -0500 @@ -50,8 +50,8 @@ //define the field seperators, and filenames for the DB #define TRACK2DELIM ":<>=?" -#define VISADATABASE "visa-pre.txt" -#define AAMVADATABASE "dl-iin.csv" +#define VISADATABASE "/usr/share/stripesnoop/visa-pre.txt" +#define AAMVADATABASE "/usr/share/stripesnoop/dl-iin.csv" /* * bool isDelim(char ch, char* delim) Index: stripesnoop.spec =================================================================== RCS file: /cvs/extras/rpms/stripesnoop/devel/stripesnoop.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- stripesnoop.spec 4 Aug 2005 21:51:50 -0000 1.2 +++ stripesnoop.spec 5 Aug 2005 19:35:42 -0000 1.3 @@ -1,6 +1,6 @@ Name: stripesnoop Version: 1.5 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: Applications/System Summary: Magnetic Stripe Reader @@ -10,6 +10,7 @@ Patch0: stripesnoop-1.5-rpmoptflags.patch Patch1: stripesnoop-1.5-deflinux.patch Patch2: stripesnoop-1.5-asmio.patch +Patch3: stripesnoop-1.5-pathing.patch %description Stripe Snoop is a suite of research tools that captures, modifies, validates, @@ -19,19 +20,14 @@ of known card formats. It uses this to give you more detailed information about the card. -%package devel -Summary: Headers for stripesnoop -Requires: %{name} = %{version}-%{release} -Group: Development/System - -%description devel -%{summary}. - %prep %setup -q -c %{name}-%{version} %patch0 -p1 %patch1 -p1 +%ifarch ppc %patch2 -p1 +%endif +%patch3 -p1 chmod -x cards.txt ChangeLog.txt COPYING.txt README.txt visa-pre.txt \ hardware/* samples/* @@ -42,7 +38,7 @@ rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/%{_includedir}/%{name} mkdir -p $RPM_BUILD_ROOT/%{_bindir} -install -m0644 *.h dl-iin.csv $RPM_BUILD_ROOT/%{_includedir}/%{name} +install -m0644 dl-iin.csv visa-pre.txt $RPM_BUILD_ROOT/%{_datadir}/%{name} install -m0755 bitgen mod10 ss $RPM_BUILD_ROOT/%{_bindir} %clean @@ -50,16 +46,18 @@ %files %defattr(-,root,root,-) -%doc ChangeLog.txt COPYING.txt README.txt hardware/ samples/ visa-pre.txt +%doc ChangeLog.txt COPYING.txt README.txt hardware/ samples/ %{_bindir}/ss %{_bindir}/bitgen %{_bindir}/mod10 - -%files devel -%defattr(-,root,root,-) -%{_includedir}/%{name} +%{_datadir}/%{name}/ %changelog +* Fri Aug 5 2005 Tom "spot" Callaway 1.5-4 +- only use asm/io.h for ppc +- get rid of devel package (unnecessary) +- fix path for dl-iin.csv, visa-pre.txt + * Thu Aug 4 2005 Tom "spot" Callaway 1.5-3 - use asm/io.h to enable ppc to build From fedora-extras-commits at redhat.com Fri Aug 5 19:35:44 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 5 Aug 2005 15:35:44 -0400 Subject: rpms/stripesnoop/FC-4 stripesnoop-1.5-pathing.patch, NONE, 1.1 stripesnoop.spec, 1.2, 1.3 Message-ID: <200508051935.j75JZigF000897@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/stripesnoop/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv843/FC-4 Modified Files: stripesnoop.spec Added Files: stripesnoop-1.5-pathing.patch Log Message: fix ppc compile only, remove -devel, fix pathing. stripesnoop-1.5-pathing.patch: --- NEW FILE stripesnoop-1.5-pathing.patch --- --- stripesnoop-1.5/parser.h.BAD 2005-08-05 14:32:06.000000000 -0500 +++ stripesnoop-1.5/parser.h 2005-08-05 14:32:39.000000000 -0500 @@ -50,8 +50,8 @@ //define the field seperators, and filenames for the DB #define TRACK2DELIM ":<>=?" -#define VISADATABASE "visa-pre.txt" -#define AAMVADATABASE "dl-iin.csv" +#define VISADATABASE "/usr/share/stripesnoop/visa-pre.txt" +#define AAMVADATABASE "/usr/share/stripesnoop/dl-iin.csv" /* * bool isDelim(char ch, char* delim) Index: stripesnoop.spec =================================================================== RCS file: /cvs/extras/rpms/stripesnoop/FC-4/stripesnoop.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- stripesnoop.spec 4 Aug 2005 21:51:45 -0000 1.2 +++ stripesnoop.spec 5 Aug 2005 19:35:42 -0000 1.3 @@ -1,6 +1,6 @@ Name: stripesnoop Version: 1.5 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: Applications/System Summary: Magnetic Stripe Reader @@ -10,6 +10,7 @@ Patch0: stripesnoop-1.5-rpmoptflags.patch Patch1: stripesnoop-1.5-deflinux.patch Patch2: stripesnoop-1.5-asmio.patch +Patch3: stripesnoop-1.5-pathing.patch %description Stripe Snoop is a suite of research tools that captures, modifies, validates, @@ -19,19 +20,14 @@ of known card formats. It uses this to give you more detailed information about the card. -%package devel -Summary: Headers for stripesnoop -Requires: %{name} = %{version}-%{release} -Group: Development/System - -%description devel -%{summary}. - %prep %setup -q -c %{name}-%{version} %patch0 -p1 %patch1 -p1 +%ifarch ppc %patch2 -p1 +%endif +%patch3 -p1 chmod -x cards.txt ChangeLog.txt COPYING.txt README.txt visa-pre.txt \ hardware/* samples/* @@ -42,7 +38,7 @@ rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/%{_includedir}/%{name} mkdir -p $RPM_BUILD_ROOT/%{_bindir} -install -m0644 *.h dl-iin.csv $RPM_BUILD_ROOT/%{_includedir}/%{name} +install -m0644 dl-iin.csv visa-pre.txt $RPM_BUILD_ROOT/%{_datadir}/%{name} install -m0755 bitgen mod10 ss $RPM_BUILD_ROOT/%{_bindir} %clean @@ -50,16 +46,18 @@ %files %defattr(-,root,root,-) -%doc ChangeLog.txt COPYING.txt README.txt hardware/ samples/ visa-pre.txt +%doc ChangeLog.txt COPYING.txt README.txt hardware/ samples/ %{_bindir}/ss %{_bindir}/bitgen %{_bindir}/mod10 - -%files devel -%defattr(-,root,root,-) -%{_includedir}/%{name} +%{_datadir}/%{name}/ %changelog +* Fri Aug 5 2005 Tom "spot" Callaway 1.5-4 +- only use asm/io.h for ppc +- get rid of devel package (unnecessary) +- fix path for dl-iin.csv, visa-pre.txt + * Thu Aug 4 2005 Tom "spot" Callaway 1.5-3 - use asm/io.h to enable ppc to build From fedora-extras-commits at redhat.com Fri Aug 5 19:36:51 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 5 Aug 2005 15:36:51 -0400 Subject: rpms/stripesnoop/devel stripesnoop.spec,1.3,1.4 Message-ID: <200508051936.j75JapWl000960@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/stripesnoop/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv911/devel Modified Files: stripesnoop.spec Log Message: Actually make the %{_datadir}/%{name}. Index: stripesnoop.spec =================================================================== RCS file: /cvs/extras/rpms/stripesnoop/devel/stripesnoop.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- stripesnoop.spec 5 Aug 2005 19:35:42 -0000 1.3 +++ stripesnoop.spec 5 Aug 2005 19:36:49 -0000 1.4 @@ -36,7 +36,7 @@ %install rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT/%{_includedir}/%{name} +mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name} mkdir -p $RPM_BUILD_ROOT/%{_bindir} install -m0644 dl-iin.csv visa-pre.txt $RPM_BUILD_ROOT/%{_datadir}/%{name} install -m0755 bitgen mod10 ss $RPM_BUILD_ROOT/%{_bindir} From fedora-extras-commits at redhat.com Fri Aug 5 19:36:45 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 5 Aug 2005 15:36:45 -0400 Subject: rpms/stripesnoop/FC-3 stripesnoop.spec,1.3,1.4 Message-ID: <200508051937.j75JbGVK000968@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/stripesnoop/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv911/FC-3 Modified Files: stripesnoop.spec Log Message: Actually make the %{_datadir}/%{name}. Index: stripesnoop.spec =================================================================== RCS file: /cvs/extras/rpms/stripesnoop/FC-3/stripesnoop.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- stripesnoop.spec 5 Aug 2005 19:35:42 -0000 1.3 +++ stripesnoop.spec 5 Aug 2005 19:36:43 -0000 1.4 @@ -36,7 +36,7 @@ %install rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT/%{_includedir}/%{name} +mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name} mkdir -p $RPM_BUILD_ROOT/%{_bindir} install -m0644 dl-iin.csv visa-pre.txt $RPM_BUILD_ROOT/%{_datadir}/%{name} install -m0755 bitgen mod10 ss $RPM_BUILD_ROOT/%{_bindir} From fedora-extras-commits at redhat.com Fri Aug 5 19:36:46 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 5 Aug 2005 15:36:46 -0400 Subject: rpms/stripesnoop/FC-4 stripesnoop.spec,1.3,1.4 Message-ID: <200508051937.j75JbGff000971@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/stripesnoop/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv911/FC-4 Modified Files: stripesnoop.spec Log Message: Actually make the %{_datadir}/%{name}. Index: stripesnoop.spec =================================================================== RCS file: /cvs/extras/rpms/stripesnoop/FC-4/stripesnoop.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- stripesnoop.spec 5 Aug 2005 19:35:42 -0000 1.3 +++ stripesnoop.spec 5 Aug 2005 19:36:44 -0000 1.4 @@ -36,7 +36,7 @@ %install rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT/%{_includedir}/%{name} +mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name} mkdir -p $RPM_BUILD_ROOT/%{_bindir} install -m0644 dl-iin.csv visa-pre.txt $RPM_BUILD_ROOT/%{_datadir}/%{name} install -m0755 bitgen mod10 ss $RPM_BUILD_ROOT/%{_bindir} From fedora-extras-commits at redhat.com Fri Aug 5 19:37:34 2005 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Fri, 5 Aug 2005 15:37:34 -0400 Subject: rpms/octave-forge/devel octave-forge.spec,1.12,1.13 Message-ID: <200508051937.j75JbYVr000994@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/octave-forge/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv977 Modified Files: octave-forge.spec Log Message: Hardcode the octave version dependency. Index: octave-forge.spec =================================================================== RCS file: /cvs/extras/rpms/octave-forge/devel/octave-forge.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- octave-forge.spec 3 Aug 2005 15:37:33 -0000 1.12 +++ octave-forge.spec 5 Aug 2005 19:37:32 -0000 1.13 @@ -1,6 +1,6 @@ Name: octave-forge Version: 2005.06.13 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Contributed functions for octave Group: Applications/Engineering @@ -21,8 +21,8 @@ ## Octave-forge installs in a directory tree specific to the installed ## version of octave, so the following version dependency is necessary. -%define octave_ep %(rpm -q --qf '%%{epoch}' octave) -%define octave_ver %(rpm -q --qf '%%{version}' octave) +%define octave_ep 6 +%define octave_ver 2.9.3 Requires: octave = %{octave_ep}:%{octave_ver} ImageMagick BuildRequires: octave-devel tetex gcc-gfortran ginac-devel BuildRequires: xorg-x11-devel libjpeg-devel libpng-devel pcre-devel @@ -73,6 +73,10 @@ %changelog +* Wed Aug 3 2005 Quentin Spencer 2005.06.13-4 +- Hardcode the octave version dependency. Using rpm to query for this + information was producing wrong results on the new build system. + * Wed Aug 3 2005 Quentin Spencer 2005.06.13-3 - Remove some BuildRequires that are now dependencies of octave-devel. From fedora-extras-commits at redhat.com Fri Aug 5 19:39:08 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 5 Aug 2005 15:39:08 -0400 Subject: rpms/lyx/FC-4 lyx-1.3.5-helpers.patch,1.2,1.3 lyx.spec,1.9,1.10 Message-ID: <200508051939.j75Jd9UH001053@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/lyx/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1031 Modified Files: lyx-1.3.5-helpers.patch lyx.spec Log Message: * Fri Aug 05 2005 Rex Dieter 1.3.6-3 - touchup helpers script - fix for (sometimes missing) PSres.upr lyx-1.3.5-helpers.patch: Index: lyx-1.3.5-helpers.patch =================================================================== RCS file: /cvs/extras/rpms/lyx/FC-4/lyx-1.3.5-helpers.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- lyx-1.3.5-helpers.patch 5 Aug 2005 18:39:46 -0000 1.2 +++ lyx-1.3.5-helpers.patch 5 Aug 2005 19:39:06 -0000 1.3 @@ -44,7 +44,7 @@ +echo "$ac_t""("htmlview file://\$\$p\$\$i" "mozilla file://\$\$p\$\$i" netscape)" HTML_VIEWER= -for ac_prog in "mozilla file://\$\$p\$\$i" netscape -+for ac_prog in ""htmlview file://\$\$p\$\$i" mozilla file://\$\$p\$\$i" netscape ++for ac_prog in "htmlview file://\$\$p\$\$i" "mozilla file://\$\$p\$\$i" netscape do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog ; ac_word=$2 Index: lyx.spec =================================================================== RCS file: /cvs/extras/rpms/lyx/FC-4/lyx.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- lyx.spec 5 Aug 2005 18:39:46 -0000 1.9 +++ lyx.spec 5 Aug 2005 19:39:06 -0000 1.10 @@ -1,11 +1,10 @@ -# $Id$ Summary: WYSIWYM (What You See Is What You Mean) document processor Name: lyx Version: 1.3.6 -Release: 2%{?dist} -License: GPL +Release: 3%{?dist} +License: GPL Group: Applications/Publishing Url: http://www.lyx.org/ Source: ftp://ftp.lyx.org/pub/lyx/stable/lyx-1.3.6.tar.gz @@ -22,6 +21,8 @@ BuildRequires: aspell-devel BuildRequires: tetex-latex BuildRequires: tetex-fonts +#BuildRequires: /usr/X11R6/bin/makepsres +BuildRequires: xorg-x11 # For texhash Requires(post): tetex-fonts @@ -105,6 +106,8 @@ %find_lang %{name} || touch %{name}.lang +touch $RPM_BUILD_ROOT%{_datadir}/%{name}/xfonts/PSres.upr + %post # Make TeX understand where LyX-specific packages are @@ -149,6 +152,10 @@ %changelog +* Fri Aug 05 2005 Rex Dieter 1.3.6-3 +- touchup helpers script +- fix for (sometimes missing) PSres.upr + * Mon Aug 01 2005 Rex Dieter 1.3.6-2 - use triggers to configure/unconfigure helper (ps/pdf/html) apps @@ -175,7 +182,6 @@ - Requires: htmlview, gsview (so build-time-detected helper apps are available at runtime) - * Thu Oct 21 2004 Rex Dieter 0:1.3.5-0.fdr.3 - BR: htmlview - Requires: htmlview, gsview (so build-time-detected helper apps are From fedora-extras-commits at redhat.com Fri Aug 5 19:39:27 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 5 Aug 2005 15:39:27 -0400 Subject: rpms/lyx/FC-3 lyx-1.3.5-helpers.patch,1.2,1.3 lyx.spec,1.6,1.7 Message-ID: <200508051939.j75JdRWg001088@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/lyx/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1066 Modified Files: lyx-1.3.5-helpers.patch lyx.spec Log Message: * Fri Aug 05 2005 Rex Dieter 1.3.6-3 - touchup helpers script - fix for (sometimes missing) PSres.upr lyx-1.3.5-helpers.patch: Index: lyx-1.3.5-helpers.patch =================================================================== RCS file: /cvs/extras/rpms/lyx/FC-3/lyx-1.3.5-helpers.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- lyx-1.3.5-helpers.patch 5 Aug 2005 18:40:02 -0000 1.2 +++ lyx-1.3.5-helpers.patch 5 Aug 2005 19:39:25 -0000 1.3 @@ -44,7 +44,7 @@ +echo "$ac_t""("htmlview file://\$\$p\$\$i" "mozilla file://\$\$p\$\$i" netscape)" HTML_VIEWER= -for ac_prog in "mozilla file://\$\$p\$\$i" netscape -+for ac_prog in ""htmlview file://\$\$p\$\$i" mozilla file://\$\$p\$\$i" netscape ++for ac_prog in "htmlview file://\$\$p\$\$i" "mozilla file://\$\$p\$\$i" netscape do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog ; ac_word=$2 Index: lyx.spec =================================================================== RCS file: /cvs/extras/rpms/lyx/FC-3/lyx.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- lyx.spec 5 Aug 2005 18:40:02 -0000 1.6 +++ lyx.spec 5 Aug 2005 19:39:25 -0000 1.7 @@ -1,11 +1,10 @@ -# $Id$ Summary: WYSIWYM (What You See Is What You Mean) document processor Name: lyx Version: 1.3.6 -Release: 2%{?dist} -License: GPL +Release: 3%{?dist} +License: GPL Group: Applications/Publishing Url: http://www.lyx.org/ Source: ftp://ftp.lyx.org/pub/lyx/stable/lyx-1.3.6.tar.gz @@ -22,6 +21,8 @@ BuildRequires: aspell-devel BuildRequires: tetex-latex BuildRequires: tetex-fonts +#BuildRequires: /usr/X11R6/bin/makepsres +BuildRequires: xorg-x11 # For texhash Requires(post): tetex-fonts @@ -105,6 +106,8 @@ %find_lang %{name} || touch %{name}.lang +touch $RPM_BUILD_ROOT%{_datadir}/%{name}/xfonts/PSres.upr + %post # Make TeX understand where LyX-specific packages are @@ -149,6 +152,10 @@ %changelog +* Fri Aug 05 2005 Rex Dieter 1.3.6-3 +- touchup helpers script +- fix for (sometimes missing) PSres.upr + * Mon Aug 01 2005 Rex Dieter 1.3.6-2 - use triggers to configure/unconfigure helper (ps/pdf/html) apps @@ -175,7 +182,6 @@ - Requires: htmlview, gsview (so build-time-detected helper apps are available at runtime) - * Thu Oct 21 2004 Rex Dieter 0:1.3.5-0.fdr.3 - BR: htmlview - Requires: htmlview, gsview (so build-time-detected helper apps are From fedora-extras-commits at redhat.com Fri Aug 5 19:42:31 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 5 Aug 2005 15:42:31 -0400 Subject: rpms/lyx/FC-3 sources,1.3,1.4 Message-ID: <200508051942.j75JgVYo001187@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/lyx/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1170 Modified Files: sources Log Message: correct sources Index: sources =================================================================== RCS file: /cvs/extras/rpms/lyx/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 4 Dec 2004 12:21:23 -0000 1.3 +++ sources 5 Aug 2005 19:42:29 -0000 1.4 @@ -1 +1 @@ -f4c70d2565ba9c974b1f94fc1dfd63bf lyx-1.3.5.tar.bz2 +20fd8515cc025129d97232dd2583f35f lyx-1.3.6.tar.gz From tcallawa at redhat.com Fri Aug 5 19:44:03 2005 From: tcallawa at redhat.com (Tom 'spot' Callaway) Date: Fri, 05 Aug 2005 14:44:03 -0500 Subject: rpms/stripesnoop/devel stripesnoop-1.5-deflinux.patch, NONE, 1.1 stripesnoop-1.5-rpmoptflags.patch, NONE, 1.1 stripesnoop.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 In-Reply-To: <20050805133013.66b6c039.bugs.michael@gmx.net> References: <200508042112.j74LCWMv030500@cvs-int.fedora.redhat.com> <20050805133013.66b6c039.bugs.michael@gmx.net> Message-ID: <1123271043.2758.7.camel@localhost.localdomain> On Fri, 2005-08-05 at 13:30 +0200, Michael Schwendt wrote: > On Thu, 4 Aug 2005 17:12:01 -0400, Tom Callaway wrote: > > > Author: spot > > > > Update of /cvs/extras/rpms/stripesnoop/devel > > > %package devel > > Summary: Headers for stripesnoop > > Requires: %{name} = %{version}-%{release} > > Group: Development/System > > > %files devel > > %defattr(-,root,root,-) > > %{_includedir}/%{name} > > What's the purpose of shipping C/C++ declarations without any library or > object files to link against? You're right. This is wrong. Force of habit. :) Fixed in CVS. Thanks, ~spot -- Tom "spot" Callaway: Red Hat Senior Sales Engineer || GPG ID: 93054260 Fedora Extras Steering Committee Member (RPM Standards and Practices) Aurora Linux Project Leader: http://auroralinux.org Lemurs, llamas, and sparcs, oh my! From fedora-extras-commits at redhat.com Fri Aug 5 19:43:47 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 5 Aug 2005 15:43:47 -0400 Subject: rpms/lyx/devel lyx.spec,1.11,1.12 Message-ID: <200508051943.j75JhlKw001313@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/lyx/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1285 Modified Files: lyx.spec Log Message: respin Index: lyx.spec =================================================================== RCS file: /cvs/extras/rpms/lyx/devel/lyx.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- lyx.spec 5 Aug 2005 19:07:02 -0000 1.11 +++ lyx.spec 5 Aug 2005 19:43:45 -0000 1.12 @@ -2,7 +2,7 @@ Summary: WYSIWYM (What You See Is What You Mean) document processor Name: lyx Version: 1.3.6 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: Applications/Publishing @@ -152,7 +152,7 @@ %changelog -* Fri Aug 05 2005 Rex Dieter 1.3.6-3 +* Fri Aug 05 2005 Rex Dieter 1.3.6-4 - touchup helpers script - fix for (sometimes missing) PSres.upr @@ -182,7 +182,6 @@ - Requires: htmlview, gsview (so build-time-detected helper apps are available at runtime) - * Thu Oct 21 2004 Rex Dieter 0:1.3.5-0.fdr.3 - BR: htmlview - Requires: htmlview, gsview (so build-time-detected helper apps are From fedora-extras-commits at redhat.com Fri Aug 5 19:43:59 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 5 Aug 2005 15:43:59 -0400 Subject: rpms/lyx/FC-4 lyx.spec,1.10,1.11 Message-ID: <200508051943.j75JhxFI001347@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/lyx/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1330 Modified Files: lyx.spec Log Message: respin Index: lyx.spec =================================================================== RCS file: /cvs/extras/rpms/lyx/FC-4/lyx.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- lyx.spec 5 Aug 2005 19:39:06 -0000 1.10 +++ lyx.spec 5 Aug 2005 19:43:57 -0000 1.11 @@ -2,7 +2,7 @@ Summary: WYSIWYM (What You See Is What You Mean) document processor Name: lyx Version: 1.3.6 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: Applications/Publishing @@ -152,7 +152,7 @@ %changelog -* Fri Aug 05 2005 Rex Dieter 1.3.6-3 +* Fri Aug 05 2005 Rex Dieter 1.3.6-4 - touchup helpers script - fix for (sometimes missing) PSres.upr From fedora-extras-commits at redhat.com Fri Aug 5 19:44:24 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 5 Aug 2005 15:44:24 -0400 Subject: rpms/lyx/FC-3 lyx.spec,1.7,1.8 Message-ID: <200508051944.j75JiOvY001379@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/lyx/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1362 Modified Files: lyx.spec Log Message: respin Index: lyx.spec =================================================================== RCS file: /cvs/extras/rpms/lyx/FC-3/lyx.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- lyx.spec 5 Aug 2005 19:39:25 -0000 1.7 +++ lyx.spec 5 Aug 2005 19:44:22 -0000 1.8 @@ -2,7 +2,7 @@ Summary: WYSIWYM (What You See Is What You Mean) document processor Name: lyx Version: 1.3.6 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: Applications/Publishing @@ -152,7 +152,7 @@ %changelog -* Fri Aug 05 2005 Rex Dieter 1.3.6-3 +* Fri Aug 05 2005 Rex Dieter 1.3.6-4 - touchup helpers script - fix for (sometimes missing) PSres.upr From fedora-extras-commits at redhat.com Fri Aug 5 20:50:41 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Fri, 5 Aug 2005 16:50:41 -0400 Subject: rpms/perl-Razor-Agent/devel .cvsignore, 1.4, 1.5 perl-Razor-Agent.spec, 1.8, 1.9 sources, 1.4, 1.5 Message-ID: <200508052050.j75KofeH002872@cvs-int.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/perl-Razor-Agent/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2850 Modified Files: .cvsignore perl-Razor-Agent.spec sources Log Message: 2.75 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Razor-Agent/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 16 Jun 2005 20:28:50 -0000 1.4 +++ .cvsignore 5 Aug 2005 20:50:39 -0000 1.5 @@ -1 +1 @@ -razor-agents-2.71.tar.gz +razor-agents-2.75.tar.bz2 Index: perl-Razor-Agent.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Razor-Agent/devel/perl-Razor-Agent.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- perl-Razor-Agent.spec 16 Jun 2005 20:32:18 -0000 1.8 +++ perl-Razor-Agent.spec 5 Aug 2005 20:50:39 -0000 1.9 @@ -2,15 +2,15 @@ %define perl_vendorlib %(eval "`perl -V:installvendorlib`"; echo $installvendorlib) Name: perl-Razor-Agent -Version: 2.71 +Version: 2.75 Release: 1%{?dist} Summary: Use a Razor catalogue server to filter spam messages Group: Applications/Internet License: Artistic URL: http://razor.sourceforge.net/ -Source0: http://dl.sf.net/razor/razor-agents-2.71.tar.gz -Patch0: razor-agents-2.71-buildroot.patch +Source0: http://dl.sf.net/razor/razor-agents-2.75.tar.bz2 +#Patch0: razor-agents-2.71-buildroot.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # autodep misses this, razor-admin -register fails @@ -39,7 +39,7 @@ %prep %setup -q -n razor-agents-%{version} # don't use -b for backup files, because these would be installed, too -%patch0 -p1 +#%patch0 -p1 %build @@ -63,10 +63,6 @@ INSTALLMAN5DIR=%{_mandir}/man5 \ PERL5LIB=$RPM_BUILD_ROOT%{perl_vendorarch} -for i in check report admin revoke; do - ln -s razor-client $RPM_BUILD_ROOT%{_bindir}/razor-$i -done - find $RPM_BUILD_ROOT -type f -a $ -name perllocal.pod -o -name .packlist \ -o \( -name '*.bs' -a -empty $ \) -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' @@ -93,6 +89,9 @@ %changelog +* Fri Aug 05 2005 Warren Togami - 2.75-1 +- 2.75 + * Thu Jun 16 2005 Warren Togami - 2.71-1 - 2.71 and buildroot patch (#160629 mschwendt) Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Razor-Agent/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 16 Jun 2005 20:28:50 -0000 1.4 +++ sources 5 Aug 2005 20:50:39 -0000 1.5 @@ -1 +1 @@ -5534f03b24320d8407272e564e3e1ea0 razor-agents-2.71.tar.gz +72e7a381523067edfa233ef2116e3140 razor-agents-2.75.tar.bz2 From fedora-extras-commits at redhat.com Fri Aug 5 20:51:10 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Fri, 5 Aug 2005 16:51:10 -0400 Subject: common tobuild,1.2190,1.2191 Message-ID: <200508052051.j75KpAeP002968@cvs-int.fedora.redhat.com> Author: wtogami Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2948 Modified Files: tobuild Log Message: request build of rpms/perl-Razor-Agent/devel perl-Razor-Agent-2_75-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2190 retrieving revision 1.2191 diff -u -r1.2190 -r1.2191 --- tobuild 4 Aug 2005 07:53:23 -0000 1.2190 +++ tobuild 5 Aug 2005 20:51:08 -0000 1.2191 @@ -26,3 +26,4 @@ ausil rpms/kphone/FC-3 kphone-4_2-1_fc3 fc3 anvil rpms/galeon/FC-4 galeon-1_3_21-12_fc4 fc4 gemi rpms/unison/FC-3 unison-2_12_0-1_fc3 fc3 +wtogami rpms/perl-Razor-Agent/devel perl-Razor-Agent-2_75-1_fc5 devel From fedora-extras-commits at redhat.com Fri Aug 5 21:00:52 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Fri, 5 Aug 2005 17:00:52 -0400 Subject: rpms/perl-Razor-Agent/devel razor-agents-2.71-buildroot.patch, 1.1, NONE Message-ID: <200508052100.j75L0qse003065@cvs-int.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/perl-Razor-Agent/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3046 Removed Files: razor-agents-2.71-buildroot.patch Log Message: remove old patch --- razor-agents-2.71-buildroot.patch DELETED --- From fedora-extras-commits at redhat.com Fri Aug 5 21:01:17 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Fri, 5 Aug 2005 17:01:17 -0400 Subject: rpms/perl-Razor-Agent/FC-4 .cvsignore, 1.4, 1.5 perl-Razor-Agent.spec, 1.7, 1.8 sources, 1.4, 1.5 razor-agents-2.71-buildroot.patch, 1.1, NONE Message-ID: <200508052101.j75L1Hxp004240@cvs-int.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/perl-Razor-Agent/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4221 Modified Files: .cvsignore perl-Razor-Agent.spec sources Removed Files: razor-agents-2.71-buildroot.patch Log Message: 2.75 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Razor-Agent/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 16 Jun 2005 20:33:14 -0000 1.4 +++ .cvsignore 5 Aug 2005 21:01:08 -0000 1.5 @@ -1 +1 @@ -razor-agents-2.71.tar.gz +razor-agents-2.75.tar.bz2 Index: perl-Razor-Agent.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Razor-Agent/FC-4/perl-Razor-Agent.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- perl-Razor-Agent.spec 16 Jun 2005 20:33:14 -0000 1.7 +++ perl-Razor-Agent.spec 5 Aug 2005 21:01:15 -0000 1.8 @@ -2,15 +2,15 @@ %define perl_vendorlib %(eval "`perl -V:installvendorlib`"; echo $installvendorlib) Name: perl-Razor-Agent -Version: 2.71 +Version: 2.75 Release: 1%{?dist} Summary: Use a Razor catalogue server to filter spam messages Group: Applications/Internet License: Artistic URL: http://razor.sourceforge.net/ -Source0: http://dl.sf.net/razor/razor-agents-2.71.tar.gz -Patch0: razor-agents-2.71-buildroot.patch +Source0: http://dl.sf.net/razor/razor-agents-2.75.tar.bz2 +#Patch0: razor-agents-2.71-buildroot.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # autodep misses this, razor-admin -register fails @@ -39,7 +39,7 @@ %prep %setup -q -n razor-agents-%{version} # don't use -b for backup files, because these would be installed, too -%patch0 -p1 +#%patch0 -p1 %build @@ -63,10 +63,6 @@ INSTALLMAN5DIR=%{_mandir}/man5 \ PERL5LIB=$RPM_BUILD_ROOT%{perl_vendorarch} -for i in check report admin revoke; do - ln -s razor-client $RPM_BUILD_ROOT%{_bindir}/razor-$i -done - find $RPM_BUILD_ROOT -type f -a $ -name perllocal.pod -o -name .packlist \ -o \( -name '*.bs' -a -empty $ \) -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' @@ -93,6 +89,9 @@ %changelog +* Fri Aug 05 2005 Warren Togami - 2.75-1 +- 2.75 + * Thu Jun 16 2005 Warren Togami - 2.71-1 - 2.71 and buildroot patch (#160629 mschwendt) Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Razor-Agent/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 16 Jun 2005 20:33:14 -0000 1.4 +++ sources 5 Aug 2005 21:01:15 -0000 1.5 @@ -1 +1 @@ -5534f03b24320d8407272e564e3e1ea0 razor-agents-2.71.tar.gz +72e7a381523067edfa233ef2116e3140 razor-agents-2.75.tar.bz2 --- razor-agents-2.71-buildroot.patch DELETED --- From fedora-extras-commits at redhat.com Fri Aug 5 21:02:59 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Fri, 5 Aug 2005 17:02:59 -0400 Subject: rpms/perl-Razor-Agent/FC-3 .cvsignore, 1.4, 1.5 perl-Razor-Agent.spec, 1.6, 1.7 sources, 1.4, 1.5 razor-agents-2.71-buildroot.patch, 1.1, NONE Message-ID: <200508052102.j75L2xU0004352@cvs-int.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/perl-Razor-Agent/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4296 Modified Files: .cvsignore perl-Razor-Agent.spec sources Removed Files: razor-agents-2.71-buildroot.patch Log Message: 2.75 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Razor-Agent/FC-3/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 16 Jun 2005 20:37:16 -0000 1.4 +++ .cvsignore 5 Aug 2005 21:02:52 -0000 1.5 @@ -1 +1 @@ -razor-agents-2.71.tar.gz +razor-agents-2.75.tar.bz2 Index: perl-Razor-Agent.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Razor-Agent/FC-3/perl-Razor-Agent.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- perl-Razor-Agent.spec 16 Jun 2005 20:38:05 -0000 1.6 +++ perl-Razor-Agent.spec 5 Aug 2005 21:02:52 -0000 1.7 @@ -2,15 +2,15 @@ %define perl_vendorlib %(eval "`perl -V:installvendorlib`"; echo $installvendorlib) Name: perl-Razor-Agent -Version: 2.71 -Release: 1%{?dist}.1 +Version: 2.75 +Release: 1%{?dist} Summary: Use a Razor catalogue server to filter spam messages Group: Applications/Internet License: Artistic URL: http://razor.sourceforge.net/ -Source0: http://dl.sf.net/razor/razor-agents-2.71.tar.gz -Patch0: razor-agents-2.71-buildroot.patch +Source0: http://dl.sf.net/razor/razor-agents-2.75.tar.bz2 +#Patch0: razor-agents-2.71-buildroot.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # autodep misses this, razor-admin -register fails @@ -39,7 +39,7 @@ %prep %setup -q -n razor-agents-%{version} # don't use -b for backup files, because these would be installed, too -%patch0 -p1 +#%patch0 -p1 %build @@ -63,10 +63,6 @@ INSTALLMAN5DIR=%{_mandir}/man5 \ PERL5LIB=$RPM_BUILD_ROOT%{perl_vendorarch} -for i in check report admin revoke; do - ln -s razor-client $RPM_BUILD_ROOT%{_bindir}/razor-$i -done - find $RPM_BUILD_ROOT -type f -a $ -name perllocal.pod -o -name .packlist \ -o \( -name '*.bs' -a -empty $ \) -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' @@ -93,6 +89,9 @@ %changelog +* Fri Aug 05 2005 Warren Togami - 2.75-1 +- 2.75 + * Thu Jun 16 2005 Warren Togami - 2.71-1 - 2.71 and buildroot patch (#160629 mschwendt) Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Razor-Agent/FC-3/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 16 Jun 2005 20:37:16 -0000 1.4 +++ sources 5 Aug 2005 21:02:52 -0000 1.5 @@ -1 +1 @@ -5534f03b24320d8407272e564e3e1ea0 razor-agents-2.71.tar.gz +72e7a381523067edfa233ef2116e3140 razor-agents-2.75.tar.bz2 --- razor-agents-2.71-buildroot.patch DELETED --- From fedora-extras-commits at redhat.com Fri Aug 5 21:08:41 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Fri, 5 Aug 2005 17:08:41 -0400 Subject: rpms/perl-Razor-Agent/FC-2 .cvsignore, 1.3, 1.4 perl-Razor-Agent.spec, 1.4, 1.5 sources, 1.4, 1.5 razor-agents-2.71-buildroot.patch, 1.1, NONE Message-ID: <200508052108.j75L8fdF004519@cvs-int.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/perl-Razor-Agent/FC-2 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4497 Modified Files: .cvsignore perl-Razor-Agent.spec sources Removed Files: razor-agents-2.71-buildroot.patch Log Message: 2.75 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Razor-Agent/FC-2/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 16 Jun 2005 20:39:27 -0000 1.3 +++ .cvsignore 5 Aug 2005 21:08:39 -0000 1.4 @@ -1 +1 @@ -razor-agents-2.71.tar.gz +razor-agents-2.75.tar.bz2 Index: perl-Razor-Agent.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Razor-Agent/FC-2/perl-Razor-Agent.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-Razor-Agent.spec 16 Jun 2005 20:39:27 -0000 1.4 +++ perl-Razor-Agent.spec 5 Aug 2005 21:08:39 -0000 1.5 @@ -2,15 +2,15 @@ %define perl_vendorlib %(eval "`perl -V:installvendorlib`"; echo $installvendorlib) Name: perl-Razor-Agent -Version: 2.71 +Version: 2.75 Release: 1.fc2 Summary: Use a Razor catalogue server to filter spam messages Group: Applications/Internet License: Artistic URL: http://razor.sourceforge.net/ -Source0: http://dl.sf.net/razor/razor-agents-2.71.tar.gz -Patch0: razor-agents-2.71-buildroot.patch +Source0: http://dl.sf.net/razor/razor-agents-2.75.tar.bz2 +#Patch0: razor-agents-2.71-buildroot.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # autodep misses this, razor-admin -register fails @@ -39,7 +39,7 @@ %prep %setup -q -n razor-agents-%{version} # don't use -b for backup files, because these would be installed, too -%patch0 -p1 +#%patch0 -p1 %build @@ -63,10 +63,6 @@ INSTALLMAN5DIR=%{_mandir}/man5 \ PERL5LIB=$RPM_BUILD_ROOT%{perl_vendorarch} -for i in check report admin revoke; do - ln -s razor-client $RPM_BUILD_ROOT%{_bindir}/razor-$i -done - find $RPM_BUILD_ROOT -type f -a $ -name perllocal.pod -o -name .packlist \ -o \( -name '*.bs' -a -empty $ \) -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' @@ -93,6 +89,9 @@ %changelog +* Fri Aug 05 2005 Warren Togami - 2.75-1 +- 2.75 + * Thu Jun 16 2005 Warren Togami - 2.71-1 - 2.71 and buildroot patch (#160629 mschwendt) Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Razor-Agent/FC-2/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 16 Jun 2005 20:39:27 -0000 1.4 +++ sources 5 Aug 2005 21:08:39 -0000 1.5 @@ -1 +1 @@ -5534f03b24320d8407272e564e3e1ea0 razor-agents-2.71.tar.gz +72e7a381523067edfa233ef2116e3140 razor-agents-2.75.tar.bz2 --- razor-agents-2.71-buildroot.patch DELETED --- From fedora-extras-commits at redhat.com Fri Aug 5 21:11:38 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Fri, 5 Aug 2005 17:11:38 -0400 Subject: rpms/perl-Razor-Agent/FC-1 .cvsignore, 1.3, 1.4 perl-Razor-Agent.spec, 1.2, 1.3 sources, 1.3, 1.4 razor-agents-2.40-manerror.patch, 1.1, NONE razor-agents-2.71-buildroot.patch, 1.1, NONE Message-ID: <200508052111.j75LBcjY004619@cvs-int.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/perl-Razor-Agent/FC-1 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4597 Modified Files: .cvsignore perl-Razor-Agent.spec sources Removed Files: razor-agents-2.40-manerror.patch razor-agents-2.71-buildroot.patch Log Message: 2.75 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Razor-Agent/FC-1/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 16 Jun 2005 20:41:17 -0000 1.3 +++ .cvsignore 5 Aug 2005 21:11:36 -0000 1.4 @@ -1 +1 @@ -razor-agents-2.71.tar.gz +razor-agents-2.75.tar.bz2 Index: perl-Razor-Agent.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Razor-Agent/FC-1/perl-Razor-Agent.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Razor-Agent.spec 16 Jun 2005 20:41:17 -0000 1.2 +++ perl-Razor-Agent.spec 5 Aug 2005 21:11:36 -0000 1.3 @@ -2,15 +2,15 @@ %define perl_vendorlib %(eval "`perl -V:installvendorlib`"; echo $installvendorlib) Name: perl-Razor-Agent -Version: 2.71 +Version: 2.75 Release: 1.fc1 Summary: Use a Razor catalogue server to filter spam messages Group: Applications/Internet License: Artistic URL: http://razor.sourceforge.net/ -Source0: http://dl.sf.net/razor/razor-agents-2.71.tar.gz -Patch0: razor-agents-2.71-buildroot.patch +Source0: http://dl.sf.net/razor/razor-agents-2.75.tar.bz2 +#Patch0: razor-agents-2.71-buildroot.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # autodep misses this, razor-admin -register fails @@ -39,7 +39,7 @@ %prep %setup -q -n razor-agents-%{version} # don't use -b for backup files, because these would be installed, too -%patch0 -p1 +#%patch0 -p1 %build @@ -63,10 +63,6 @@ INSTALLMAN5DIR=%{_mandir}/man5 \ PERL5LIB=$RPM_BUILD_ROOT%{perl_vendorarch} -for i in check report admin revoke; do - ln -s razor-client $RPM_BUILD_ROOT%{_bindir}/razor-$i -done - find $RPM_BUILD_ROOT -type f -a $ -name perllocal.pod -o -name .packlist \ -o \( -name '*.bs' -a -empty $ \) -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' @@ -93,6 +89,9 @@ %changelog +* Fri Aug 05 2005 Warren Togami - 2.75-1 +- 2.75 + * Thu Jun 16 2005 Warren Togami - 2.71-1 - 2.71 and buildroot patch (#160629 mschwendt) Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Razor-Agent/FC-1/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 16 Jun 2005 20:41:17 -0000 1.3 +++ sources 5 Aug 2005 21:11:36 -0000 1.4 @@ -1 +1 @@ -5534f03b24320d8407272e564e3e1ea0 razor-agents-2.71.tar.gz +72e7a381523067edfa233ef2116e3140 razor-agents-2.75.tar.bz2 --- razor-agents-2.40-manerror.patch DELETED --- --- razor-agents-2.71-buildroot.patch DELETED --- From fedora-extras-commits at redhat.com Fri Aug 5 22:14:37 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Fri, 5 Aug 2005 18:14:37 -0400 Subject: rpms/hdf/FC-4 hdf.spec,1.1,1.2 Message-ID: <200508052214.j75MEbJN005960@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/hdf/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5943 Modified Files: hdf.spec Log Message: - Exclude ppc/ppc64 - HDF does not recognize it Index: hdf.spec =================================================================== RCS file: /cvs/extras/rpms/hdf/FC-4/hdf.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- hdf.spec 25 Jul 2005 18:07:39 -0000 1.1 +++ hdf.spec 5 Aug 2005 22:14:35 -0000 1.2 @@ -11,6 +11,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: autoconf flex byacc libjpeg-devel zlib-devel BuildRequires: gcc-gfortran +ExcludeArch: ppc ppc64 %description HDF is a general purpose library and file format for storing scientific data. @@ -70,6 +71,9 @@ %{_libdir}/%{name}/ %changelog +* Fri Aug 05 2005 Orion Poplawski 4.2r1-3 +- Exclude ppc/ppc64 - HDF does not recognize it + * Wed Jul 20 2005 Orion Poplawski 4.2r1-2 - Fix BuildRequires to have autoconf From fedora-extras-commits at redhat.com Fri Aug 5 22:15:23 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Fri, 5 Aug 2005 18:15:23 -0400 Subject: rpms/hdf/FC-4 hdf.spec,1.2,1.3 Message-ID: <200508052215.j75MFOtW006012@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/hdf/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5998 Modified Files: hdf.spec Log Message: Bump release Index: hdf.spec =================================================================== RCS file: /cvs/extras/rpms/hdf/FC-4/hdf.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- hdf.spec 5 Aug 2005 22:14:35 -0000 1.2 +++ hdf.spec 5 Aug 2005 22:15:20 -0000 1.3 @@ -1,6 +1,6 @@ Name: hdf Version: 4.2r1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A general purpose library and file format for storing scientific data License: BSD-ish Group: System Environment/Libraries From fedora-extras-commits at redhat.com Sat Aug 6 02:30:10 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 5 Aug 2005 22:30:10 -0400 Subject: rpms/perl-Class-Whitehole - New directory Message-ID: <200508060230.j762UAo0011176@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Class-Whitehole In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11152/perl-Class-Whitehole Log Message: Directory /cvs/extras/rpms/perl-Class-Whitehole added to the repository From fedora-extras-commits at redhat.com Sat Aug 6 02:30:11 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 5 Aug 2005 22:30:11 -0400 Subject: rpms/perl-Class-Whitehole/devel - New directory Message-ID: <200508060230.j762UBG6011181@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Class-Whitehole/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11152/perl-Class-Whitehole/devel Log Message: Directory /cvs/extras/rpms/perl-Class-Whitehole/devel added to the repository From fedora-extras-commits at redhat.com Sat Aug 6 02:30:27 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 5 Aug 2005 22:30:27 -0400 Subject: rpms/perl-Class-Whitehole Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200508060230.j762URpE011224@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Class-Whitehole In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11197 Added Files: Makefile import.log Log Message: Setup of module perl-Class-Whitehole --- NEW FILE Makefile --- # Top level Makefile for module perl-Class-Whitehole all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Sat Aug 6 02:30:28 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 5 Aug 2005 22:30:28 -0400 Subject: rpms/perl-Class-Whitehole/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200508060230.j762USHr011229@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Class-Whitehole/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11197/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Class-Whitehole --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Sat Aug 6 02:30:55 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 5 Aug 2005 22:30:55 -0400 Subject: rpms/perl-Class-Whitehole import.log,1.1,1.2 Message-ID: <200508060231.j762VPJN011300@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Class-Whitehole In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11261 Modified Files: import.log Log Message: auto-import perl-Class-Whitehole-0.04-2 on branch devel from perl-Class-Whitehole-0.04-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Whitehole/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 6 Aug 2005 02:30:25 -0000 1.1 +++ import.log 6 Aug 2005 02:30:53 -0000 1.2 @@ -0,0 +1 @@ +perl-Class-Whitehole-0_04-2:HEAD:perl-Class-Whitehole-0.04-2.src.rpm:1123295508 From fedora-extras-commits at redhat.com Sat Aug 6 02:30:55 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 5 Aug 2005 22:30:55 -0400 Subject: rpms/perl-Class-Whitehole/devel perl-Class-Whitehole.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200508060231.j762VQ93011304@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Class-Whitehole/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11261/devel Modified Files: .cvsignore sources Added Files: perl-Class-Whitehole.spec Log Message: auto-import perl-Class-Whitehole-0.04-2 on branch devel from perl-Class-Whitehole-0.04-2.src.rpm --- NEW FILE perl-Class-Whitehole.spec --- Name: perl-Class-Whitehole Version: 0.04 Release: 2%{?dist} Summary: Base class to treat unhandled method calls as errors Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/Class-WhiteHole/ Source0: http://search.cpan.org/CPAN/authors/id/M/MS/MSCHWERN/Class-WhiteHole-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl >= 1:5.6.1 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description %{summary}. %prep %setup -q -n Class-WhiteHole-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes %{perl_vendorlib}/Class %{_mandir}/man3/*.3* %changelog * Fri Jul 8 2005 Tom "spot" Callaway 0.04-2 - cleanups * Wed Jul 6 2005 Tom "spot" Callaway 0.04-1 - Initial package for Fedora Extras Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Whitehole/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 6 Aug 2005 02:30:26 -0000 1.1 +++ .cvsignore 6 Aug 2005 02:30:53 -0000 1.2 @@ -0,0 +1 @@ +Class-WhiteHole-0.04.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Whitehole/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 6 Aug 2005 02:30:26 -0000 1.1 +++ sources 6 Aug 2005 02:30:53 -0000 1.2 @@ -0,0 +1 @@ +43b986ad7d5d186a9a43d2d69a2ef327 Class-WhiteHole-0.04.tar.gz From fedora-extras-commits at redhat.com Sat Aug 6 02:33:07 2005 From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer)) Date: Fri, 5 Aug 2005 22:33:07 -0400 Subject: rpms/ctrlproxy/FC-4 ctrlproxy.spec,1.4,1.5 Message-ID: <200508060233.j762X76P011370@cvs-int.fedora.redhat.com> Author: jwboyer Update of /cvs/extras/rpms/ctrlproxy/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11341/FC-4 Modified Files: ctrlproxy.spec Log Message: Bug 161690: Fix file modes. Patch from Michael Schwendt Index: ctrlproxy.spec =================================================================== RCS file: /cvs/extras/rpms/ctrlproxy/FC-4/ctrlproxy.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ctrlproxy.spec 23 Jun 2005 11:07:46 -0000 1.4 +++ ctrlproxy.spec 6 Aug 2005 02:33:05 -0000 1.5 @@ -1,7 +1,7 @@ Summary: ctrlproxy Name: ctrlproxy Version: 2.6.2 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: Applications/Internet Source: http://jelmer.vernstok.nl/releases/ctrlproxy-%{version}.tar.gz @@ -45,14 +45,15 @@ moddir=$RPM_BUILD_ROOT/%{_libdir}/ctrlproxy \ cdatadir=$RPM_BUILD_ROOT/%{_datadir}/ctrlproxy install -m 0755 ctrlproxy-setup $RPM_BUILD_ROOT/%{_bindir} +chmod 0644 ${RPM_BUILD_ROOT}%{_datadir}/ctrlproxy/motd cd doc /usr/bin/install -d ${RPM_BUILD_ROOT}/%{_mandir}/man1 -/usr/bin/install ctrlproxy.1 ${RPM_BUILD_ROOT}/%{_mandir}/man1 +/usr/bin/install -m 0644 ctrlproxy.1 ${RPM_BUILD_ROOT}/%{_mandir}/man1 /usr/bin/install -d ${RPM_BUILD_ROOT}/%{_mandir}/man5 -/usr/bin/install ctrlproxyrc.5 ${RPM_BUILD_ROOT}/%{_mandir}/man5 +/usr/bin/install -m 0644 ctrlproxyrc.5 ${RPM_BUILD_ROOT}/%{_mandir}/man5 /usr/bin/install -d ${RPM_BUILD_ROOT}/%{_mandir}/man7 -/usr/bin/install *.7ctrlproxy ${RPM_BUILD_ROOT}/%{_mandir}/man7 +/usr/bin/install -m 0644 *.7ctrlproxy ${RPM_BUILD_ROOT}/%{_mandir}/man7 %clean [ -d "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT @@ -68,6 +69,10 @@ %{_datadir}/ctrlproxy/* %changelog +* Fri Aug 7 2005 Josh Boyer 2.6.2-4 +- Fix file modes... again +- Fixes bug 161690 (patch from Michael Schwendt) + * Wed Jun 22 2005 Josh Boyer 2.6.2-3 - Fix file modes From fedora-extras-commits at redhat.com Sat Aug 6 02:33:08 2005 From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer)) Date: Fri, 5 Aug 2005 22:33:08 -0400 Subject: rpms/ctrlproxy/devel ctrlproxy.spec,1.4,1.5 Message-ID: <200508060233.j762X8lf011376@cvs-int.fedora.redhat.com> Author: jwboyer Update of /cvs/extras/rpms/ctrlproxy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11341/devel Modified Files: ctrlproxy.spec Log Message: Bug 161690: Fix file modes. Patch from Michael Schwendt Index: ctrlproxy.spec =================================================================== RCS file: /cvs/extras/rpms/ctrlproxy/devel/ctrlproxy.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ctrlproxy.spec 23 Jun 2005 11:10:27 -0000 1.4 +++ ctrlproxy.spec 6 Aug 2005 02:33:06 -0000 1.5 @@ -1,7 +1,7 @@ Summary: ctrlproxy Name: ctrlproxy Version: 2.6.2 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: Applications/Internet Source: http://jelmer.vernstok.nl/releases/ctrlproxy-%{version}.tar.gz @@ -45,14 +45,15 @@ moddir=$RPM_BUILD_ROOT/%{_libdir}/ctrlproxy \ cdatadir=$RPM_BUILD_ROOT/%{_datadir}/ctrlproxy install -m 0755 ctrlproxy-setup $RPM_BUILD_ROOT/%{_bindir} +chmod 0644 ${RPM_BUILD_ROOT}%{_datadir}/ctrlproxy/motd cd doc /usr/bin/install -d ${RPM_BUILD_ROOT}/%{_mandir}/man1 -/usr/bin/install ctrlproxy.1 ${RPM_BUILD_ROOT}/%{_mandir}/man1 +/usr/bin/install -m 0644 ctrlproxy.1 ${RPM_BUILD_ROOT}/%{_mandir}/man1 /usr/bin/install -d ${RPM_BUILD_ROOT}/%{_mandir}/man5 -/usr/bin/install ctrlproxyrc.5 ${RPM_BUILD_ROOT}/%{_mandir}/man5 +/usr/bin/install -m 0644 ctrlproxyrc.5 ${RPM_BUILD_ROOT}/%{_mandir}/man5 /usr/bin/install -d ${RPM_BUILD_ROOT}/%{_mandir}/man7 -/usr/bin/install *.7ctrlproxy ${RPM_BUILD_ROOT}/%{_mandir}/man7 +/usr/bin/install -m 0644 *.7ctrlproxy ${RPM_BUILD_ROOT}/%{_mandir}/man7 %clean [ -d "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT @@ -68,12 +69,13 @@ %{_datadir}/ctrlproxy/* %changelog +* Fri Aug 7 2005 Josh Boyer 2.6.2-4 +- Fix file modes... again +- Fixes bug 161690 (patch from Michael Schwendt) + * Wed Jun 22 2005 Josh Boyer 2.6.2-3 - Fix file modes -* Tue Jun 21 2005 David Woodhouse 2.6.2-2%{?dist} -- Add %%{?dist} tag to release - * Sun Jun 19 2005 David Woodhouse 2.6.2-2 - Fix file modes - Drop ctrlproxy.h from package From fedora-extras-commits at redhat.com Sat Aug 6 02:34:05 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 5 Aug 2005 22:34:05 -0400 Subject: owners owners.list,1.53,1.54 Message-ID: <200508060234.j762Y5eh011434@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11413 Modified Files: owners.list Log Message: add new packages Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- owners.list 5 Aug 2005 09:44:02 -0000 1.53 +++ owners.list 6 Aug 2005 02:34:02 -0000 1.54 @@ -517,8 +517,9 @@ Fedora Extras|perl-Cache-Cache|Cache-Cache module for perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-CGI-Simple|Simple totally OO CGI interface that is CGI.pm compliant|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Chart|Perl modules for producing many types of charts|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com -Fedora Extras|perl-Class-Data-Inheritable|Inheritable, overridable class data|tcallawa at redhat.com|extras-qa at fedoraproject.org| +Fedora Extras|perl-Class-Data-Inheritable|Inheritable, overridable class data|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Class-MethodMaker|Create generic methods for OO Perl|dgregor at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Class-Whitehole|Base class to treat unhandled method calls as errors|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Config-General|Generic configuration module for Perl|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Config-IniFiles|A module for reading .ini-style configuration files|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Config-Record|Perl module for Configuration file access|dgregor at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com @@ -553,6 +554,7 @@ Fedora Extras|perl-HTML-Template|Perl module to use HTML Templates|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-HTML-Tree|HTML tree handling modules for Perl|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Image-Base|Base class for loading, manipulating and saving images in Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Image-ExifTool|Utility for reading and writing image meta info|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Image-Info|Image meta information extraction module for Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Image-Size|Determine the size of images in several common formats in Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Image-Xbm|Load, create, manipulate and save xbm image files in Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com @@ -775,6 +777,7 @@ Fedora Extras|stellarium|A photo-realistic nightsky renderer|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|stow|Manage the installation of software packages from source|gauret at free.fr|extras-qa at fedoraproject.org| Fedora Extras|straw|GNOME desktop news aggregator|colin at fedoraproject.org|extras-qa at fedoraproject.org| +Fedora Extras|stripesnoop|Magnetic Stripe Reader|tcallawa at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|suck|Suck - download news from remote NNTP server|Jochen at herr-schmitt.de|extras-qa at fedoraproject.org| Fedora Extras|supertux|SuperTux is a jump'n run like game similar to Mario Bros|pmatilai at laiskiainen.org|extras-qa at fedoraproject.org| Fedora Extras|svgalib|Low-level fullscreen SVGA graphics library|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sat Aug 6 02:35:08 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Fri, 5 Aug 2005 22:35:08 -0400 Subject: extras-buildsys ChangeLog,1.90,1.91 Message-ID: <200508060235.j762Z81v011714@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11669 Modified Files: ChangeLog Log Message: 2005-08-05 Dan Williams * Rework builder tracking code to always keep Builder objects around, and to mark them as active/unavailable rather than dropping unavailable builders. Unavailable builders are pinged every 5 minutes to see if they are alive or not. Admins can still manually ping builders. * Remove lots of locking code in between the Builders, ArchJobs, and the BuildMaster since it was only relevant when pyOpenSSL still sucked. Communication with the builder's XMLRPC server only happens from each Builder object's thread now. * Consolidate job-killing code in both the ArchJob and the PackageJob Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.90 retrieving revision 1.91 diff -u -r1.90 -r1.91 --- ChangeLog 5 Aug 2005 16:24:06 -0000 1.90 +++ ChangeLog 6 Aug 2005 02:35:06 -0000 1.91 @@ -1,5 +1,19 @@ 2005-08-05 Dan Williams + * Rework builder tracking code to always keep Builder objects around, and + to mark them as active/unavailable rather than dropping unavailable + builders. Unavailable builders are pinged every 5 minutes to see if + they are alive or not. Admins can still manually ping builders. + + * Remove lots of locking code in between the Builders, ArchJobs, and the + BuildMaster since it was only relevant when pyOpenSSL still sucked. + Communication with the builder's XMLRPC server only happens from each + Builder object's thread now. + + * Consolidate job-killing code in both the ArchJob and the PackageJob + +2005-08-05 Dan Williams + * builder/builder.py - (_mock_done): hand-wavy attempt to ensure the mock child process is always reaped From fedora-extras-commits at redhat.com Sat Aug 6 02:35:09 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Fri, 5 Aug 2005 22:35:09 -0400 Subject: extras-buildsys/client client.py,1.24,1.25 Message-ID: <200508060235.j762Z9ix011720@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/client In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11669/client Modified Files: client.py Log Message: 2005-08-05 Dan Williams * Rework builder tracking code to always keep Builder objects around, and to mark them as active/unavailable rather than dropping unavailable builders. Unavailable builders are pinged every 5 minutes to see if they are alive or not. Admins can still manually ping builders. * Remove lots of locking code in between the Builders, ArchJobs, and the BuildMaster since it was only relevant when pyOpenSSL still sucked. Communication with the builder's XMLRPC server only happens from each Builder object's thread now. * Consolidate job-killing code in both the ArchJob and the PackageJob Index: client.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/client/client.py,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- client.py 5 Aug 2005 16:24:07 -0000 1.24 +++ client.py 6 Aug 2005 02:35:06 -0000 1.25 @@ -191,9 +191,9 @@ print msg -def print_builders(banner, builder_list): - print "\n%s:" % banner - print "-" * 70 +def print_builders(builder_list): + print "\nBuilders:" + print "-" * 90 for builder in builder_list: string = " " + builder['address'] string = string + " " * (40 - len(builder['address'])) @@ -206,16 +206,15 @@ def update_builders(server, email): """ - Tell the build server to requery its builder list and re-add dropped - builders that are now alive. + Tell the build server to requery its builder list ASAP. """ try: (e, msg, builder_list) = server.update_builders() if len(builder_list) > 0: - print_builders("New Builders", builder_list) + print_builders(builder_list) else: - print "No new builders found." + print "No builders found." except socket.error, e: print "Error connecting to build server: '%s'" % e @@ -228,9 +227,9 @@ try: (e, msg, builder_list) = server.list_builders() if len(builder_list) > 0: - print_builders("Active Builders", builder_list) + print_builders(builder_list) else: - print "No active builders found." + print "No builders found." except socket.error, e: print "Error connecting to build server: '%s'" % e From fedora-extras-commits at redhat.com Sat Aug 6 02:35:09 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Fri, 5 Aug 2005 22:35:09 -0400 Subject: extras-buildsys/server ArchJob.py, 1.8, 1.9 Builder.py, 1.9, 1.10 BuilderManager.py, 1.9, 1.10 PackageJob.py, 1.18, 1.19 UserInterface.py, 1.42, 1.43 Message-ID: <200508060235.j762Z9qa011727@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11669/server Modified Files: ArchJob.py Builder.py BuilderManager.py PackageJob.py UserInterface.py Log Message: 2005-08-05 Dan Williams * Rework builder tracking code to always keep Builder objects around, and to mark them as active/unavailable rather than dropping unavailable builders. Unavailable builders are pinged every 5 minutes to see if they are alive or not. Admins can still manually ping builders. * Remove lots of locking code in between the Builders, ArchJobs, and the BuildMaster since it was only relevant when pyOpenSSL still sucked. Communication with the builder's XMLRPC server only happens from each Builder object's thread now. * Consolidate job-killing code in both the ArchJob and the PackageJob Index: ArchJob.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/ArchJob.py,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- ArchJob.py 25 Jul 2005 19:24:24 -0000 1.8 +++ ArchJob.py 6 Aug 2005 02:35:07 -0000 1.9 @@ -52,6 +52,8 @@ self.downloads = {} self.starttime = time.time() self.endtime = 0 + self._die = False + self._die_lock = threading.Lock() def _builder_finished(self): if self.builder_status == 'done' or self.builder_status == 'killed' or self.builder_status == 'failed' or self.builder_status == 'orphaned': @@ -109,7 +111,6 @@ del attrdict def _send_repo_unlocked(self): - self.builder.xmlrpc_lock_acquire() try: self._server.repo_unlocked(self.jobid) except socket.error, e: @@ -118,11 +119,9 @@ self.par_job.package, self.arch, self.bci.address(), e) except xmlrpclib.ProtocolError, e: pass - self.builder.xmlrpc_lock_release() def _dl_files(self): files = [] - self.builder.xmlrpc_lock_acquire() try: files = self._server.files(self.jobid) except socket.error, e: @@ -131,13 +130,22 @@ self.par_job.package, self.arch, self.bci.address(), e) except xmlrpclib.ProtocolError, e: pass - self.builder.xmlrpc_lock_release() return files def process(self): if self.status == 'done': return - elif self.status == 'running': + + # If we're supposed to die, tell the builder and clean up + self._die_lock.acquire() + should_die = self._die + self._die_lock.release() + if should_die: + self._server.die(self.jobid) + self._set_status('done') + return + + if self.status == 'running': # Builders pause before they enter the 'prep' state (which accesses # the repo for this target), and wait for the server to allow them # to proceed when the repo is unlocked. @@ -247,10 +255,10 @@ self.par_job.remove_arch_job(self) def die(self): + # Can be called from other threads if self.status == 'initialize' or self.status == 'running': - self.builder.xmlrpc_lock_acquire() - self._server.die(self.jobid) - self.builder.xmlrpc_lock_release() - self._set_status('done') + self._die_lock.acquire() + self._die = True + self._die_lock.release() Index: Builder.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/Builder.py,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- Builder.py 2 Aug 2005 00:58:16 -0000 1.9 +++ Builder.py 6 Aug 2005 02:35:07 -0000 1.10 @@ -25,6 +25,7 @@ from plague import CommonErrors import OpenSSL import ArchJob +import EmailUtils # Load in the config execfile("/etc/plague/server/CONFIG.py") @@ -37,57 +38,58 @@ certs['peer_ca_cert'] = config_opts['ca_cert'] -# Python's xmlrpclib & httplib are a bit dodgy with -# threads, so lets lock xmlrpc operations -builder_xmlrpc_lock = threading.Lock() - - class Builder(threading.Thread): """ Tracks all jobs on a builder instance """ + _BUILDER_PING_INTERVAL = 60 * 5 # In seconds + def __init__(self, manager, address): self._cur_jobid = None self._manager = manager self._jobs = {} self._address = address + self._alive = True + self._stop = False + self._prepping_jobs = False + self._unavail_count = 0 + self._target_arches = {} + self._ping_timeout = 0 + self._cur_ping_interval = self._BUILDER_PING_INTERVAL + self._when_died = 0 + if config_opts['ssl_builders']: self._server = XMLRPCServerProxy.PlgXMLRPCServerProxy(self._address, certs) else: self._server = XMLRPCServerProxy.PlgXMLRPCServerProxy(self._address, None) self._server_lock = threading.Lock() - self._unavail_count = 0 - self._target_arches = [] - builder_xmlrpc_lock.acquire() - try: - self._target_arches = self._server.supported_target_arches() - for target in self._target_arches.keys(): - self._target_arches[target].append('noarch') - except socket.error: - builder_xmlrpc_lock.release() - raise RuntimeError - builder_xmlrpc_lock.release() - self._alive = True - self._stop = False - self._prepping_jobs = False + (self._alive, arches) = self._ping_builder() + if self._alive: + self._init_builder(arches) + + threading.Thread.__init__(self) + + def _init_builder(self, arches): + self._target_arches = arches + for target in self._target_arches.keys(): + self._target_arches[target].append('noarch') # Kill any jobs currently running on the builder (jobid, status) = self._get_cur_job_and_status() if jobid and jobid != 0: - builder_xmlrpc_lock.acquire() try: self._server.die(jobid) except: pass - builder_xmlrpc_lock.release() - - threading.Thread.__init__(self) - def xmlrpc_lock_acquire(self): - builder_xmlrpc_lock.acquire() - - def xmlrpc_lock_release(self): - builder_xmlrpc_lock.release() + def _ping_builder(self): + target_arches = {} + alive = True + try: + target_arches = self._server.supported_target_arches() + except socket.error: + alive = False + return (alive, target_arches) def arches(self, target): arches = None @@ -107,34 +109,34 @@ return self._address def alive(self): - """ - Is the builder responding to requests? - """ + """ Is the builder responding to requests? """ return self._alive def start_job(self, par_job, target, arch, srpm_url): + self._server_lock.acquire() if not self.available(): + self._server_lock.release() raise RuntimeError if not self._target_arches.has_key(target) or len(self._target_arches[target]) == 0: + self._server_lock.release() raise RuntimeError if not arch in self._target_arches[target]: + self._server_lock.release() raise RuntimeError - builder_xmlrpc_lock.acquire() - self._server_lock.acquire() try: jobid = self._server.start(target, arch, srpm_url) except (socket.error, socket.timeout, OpenSSL.SSL.SysCallError, xmlrpclib.ProtocolError): jobid = 0 - self._server_lock.release() - builder_xmlrpc_lock.release() if jobid == 0: + self._server_lock.release() raise RuntimeError job = ArchJob.ArchJob(self, self._server, par_job, jobid, target, arch) self._jobs[jobid] = job self._update_cur_job() + self._server_lock.release() return job @@ -142,16 +144,12 @@ jobid = None status = None - builder_xmlrpc_lock.acquire() - self._server_lock.acquire() try: (jobid, status) = self._server.get_cur_job() except (socket.error, socket.timeout, OpenSSL.SSL.SysCallError, xmlrpclib.ProtocolError): self._unavail_count = self._unavail_count + 1 else: self._unavail_count = 0 - self._server_lock.release() - builder_xmlrpc_lock.release() return (jobid, status) @@ -175,24 +173,76 @@ def stop(self): self._stop = True + def ping_asap(self): + # Reduce the ping interval to ping the builder right away + self._cur_ping_interval = 0 + + def _handle_builder_suspend(self): + for jobid in self._jobs.keys(): + job = self._jobs[jobid] + job.builder_gone() + del self._jobs[jobid] + self._jobs = {} + self._alive = False + self._unavail_count = 0 + self._prepping_jobs = False + self._ping_timeout = time.time() + self._when_died = time.time() + # Reset current ping interval to default + self._cur_ping_interval = self._BUILDER_PING_INTERVAL + + # Notify admins + print "Suspending builder '%s' because it timed out." % self._address + subject = "Builder Timeout: %s" % self._address + msg = "The builder '%s' timed out and was suspended." % self._address + for addr in config_opts['admin_emails']: + EmailUtils.email_result(addr, msg, subject) + + def _handle_builder_reactivate(self, target_arches): + self._alive = True + self._ping_timeout = 0 + + self._init_builder(target_arches) + + print "Re-activating builder '%s'." % self._address + subject = "Builder Re-activated: %s" % self._address + msg = """The builder '%s' was re-activated. + + Suspended at: %s + Re-Enabled at: %s +""" % (self._address, time.ctime(self._when_died), time.ctime(time.time())) + for addr in config_opts['admin_emails']: + EmailUtils.email_result(addr, msg, subject) + self._when_died = 0 + def run(self): while not self._stop: - self._update_cur_job() + self._server_lock.acquire() - # Kill all jobs on the client if it went away - if self._unavail_count > 2: - for jobid in self._jobs.keys(): - job = self._jobs[jobid] - job.builder_gone() - del self._jobs[jobid] - self._alive = False - self._stop = True - self._manager.builder_gone() - continue - - # Update status of all jobs - for j in self._jobs.values(): - j.process() + if self._alive: + self._update_cur_job() + + if self._unavail_count > 2: + # Kill all jobs on the client if it went away + self._handle_builder_suspend() + else: + # Update status of all archjobs on this builder + for j in self._jobs.values(): + j.process() + else: + # Ping the builder every so often to see if it responds again + if time.time() > (self._ping_timeout + self._cur_ping_interval): + (alive, target_arches) = self._ping_builder() + if alive: + self._handle_builder_reactivate(target_arches) + else: + # Wait and ping again + self._ping_timeout = time.time() + + # Reset current ping interval to default + self._cur_ping_interval = self._BUILDER_PING_INTERVAL + + self._server_lock.release() time.sleep(3) @@ -218,9 +268,12 @@ if not arch in arches: arches.append(arch) builder_dict['arches'] = arches - if self._cur_jobid: - builder_dict['status'] = 'building' + if self._alive: + if self._cur_jobid: + builder_dict['status'] = 'building' + else: + builder_dict['status'] = 'idle' else: - builder_dict['status'] = 'idle' + builder_dict['status'] = 'unavailable' return builder_dict Index: BuilderManager.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/BuilderManager.py,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- BuilderManager.py 29 Jul 2005 06:05:37 -0000 1.9 +++ BuilderManager.py 6 Aug 2005 02:35:07 -0000 1.10 @@ -40,17 +40,22 @@ self._builders_lock.acquire() self.possible_builders = config_opts['builders'] self._builders_lock.release() - self.running_builders = [] - builder_list = self.update_builders() + + self._builders = [] + self.add_new_builders() # Print out builder list when starting up print "\nBuilders:" - print "-" * 60 - for builder in builder_list: - string = " " + builder['address'] - string = string + " " * (40 - len(builder['address'])) - for arch in builder['arches']: + print "-" * 90 + for builder in self._builders: + string = " " + builder.address() + string = string + " " * (40 - len(builder.address())) + builder_dict = builder.to_dict() + for arch in builder_dict['arches']: string = string + arch + " " + string = string + " " * (80 - len(string)) + string = string + builder_dict['status'] + del builder_dict print string print "" @@ -60,23 +65,20 @@ self._have_work = False def __del__(self): - for builder in self.running_builders: + for builder in self._builders: builder.stop() time.sleep(2) - for builder in self.running_builders: - del builder def set_build_master(self, build_master): self._build_master = build_master - def update_builders(self): + def add_new_builders(self): self._builders_lock.acquire() # Load in any new builders from the config file execfile("/etc/plague/server/CONFIG.py") self.possible_builders = config_opts['builders'] - builder_list = [] for address in self.possible_builders: # If the address is "https" but we aren't set up for SSL, exit if address.startswith('https') and not config_opts['ssl_builders']: @@ -86,79 +88,46 @@ print "Builder address (%s) starts with 'http', but the 'ssl_builders' option is set to True." % address os._exit(1) - # If the address is already in our running_builders list, skip it + # If the address is already in our _builders list, skip it skip = False - for builder in self.running_builders: + for builder in self._builders: if address == builder.address(): skip = True if skip == True: continue - # Try to connect to builder and add it to our builder - # list if we can - try: - builder = Builder.Builder(self, address) - except RuntimeError: - pass - else: - builder_list.append(builder.to_dict()) - builder.start() - self.running_builders.append(builder) + # Add the builder to our build list + builder = Builder.Builder(self, address) + builder.start() + self._builders.append(builder) self._builders_lock.release() - return builder_list + + def ping_suspended_builders(self): + self._builders_lock.acquire() + for builder in self._builders: + if not builder.alive(): + builder.ping_asap() + self._builders_lock.release() def list_builders(self): builder_list = [] - for builder in self.running_builders: + for builder in self._builders: builder_list.append(builder.to_dict()) - - # Add unavailable builders - for builder in self.possible_builders: - found = False - for tmp in builder_list: - if builder == tmp['address']: - found = True - if found: - continue - builder_dict = {} - builder_dict['address'] = builder - builder_dict['arches'] = [] - builder_dict['status'] = "unavailable" - builder_list.append(builder_dict) - return builder_list def have_work(self, paused): avail = False - for builder in self.running_builders: + for builder in self._builders: if builder.available(): avail = True if not paused and len(self._queue) > 0 and avail: return True return self._have_work - def builder_gone(self): - self._have_work = True - def process(self, paused): self._have_work = False - # Deal with dead/unreachable builders - for builder in self.running_builders: - if not builder.alive(): - print "Removing builder '%s' because it timed out." % builder.address() - - # Notify admins - subject = "Builder Timeout: %s" % builder.address() - msg = "The builder '%s' timed out and was removed from the active builder list." % builder.address() - for addr in config_opts['admin_emails']: - EmailUtils.email_result(addr, msg, subject) - - # Forget about the builder - builder.stop() - self.running_builders.remove(builder) - # Don't queue any new jobs if we are paused if paused: return @@ -173,7 +142,7 @@ self._queue.remove(req) continue # Find a free builder for this request - for builder in self.running_builders: + for builder in self._builders: if builder.available() and builder.can_build_arch_on_target(req['arch'], req['target']): try: job = builder.start_job(parent, req['target'], req['arch'], req['srpm_url']) @@ -213,7 +182,7 @@ def any_prepping_builders(self): # query each build builder for any jobs that are in the 'prepping' state - for builder in self.running_builders: + for builder in self._builders: if builder.alive() and builder.any_prepping_jobs(): return True return False Index: PackageJob.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/PackageJob.py,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- PackageJob.py 4 Aug 2005 20:27:12 -0000 1.18 +++ PackageJob.py 6 Aug 2005 02:35:07 -0000 1.19 @@ -137,6 +137,8 @@ self.archjobs = {} self._archjobs_lock = threading.Lock() self._event = threading.Event() + self._killer = None + self._die = False first_stage = 'initialize' if self.no_cvs == True: @@ -449,13 +451,27 @@ return False def die(self, username): - # Kill any building jobs - resultstring = "%s (%s): Build on target %s was killed by %s." % (self.uid, self.name, self.target, username) + self._killer = username + self._die = True + self.wake() + def _handle_death(self): + resultstring = "%s (%s): Build on target %s was killed by %s." % (self.uid, self.name, self.target, self._killer) self.result = 'killed' self._set_cur_stage('finished', resultstring) self.email_result(self.username, resultstring) + # Kill any building jobs + self._kill_all_archjobs() + + # Wake us up if the Controller thread is still running + if not self._event.isSet(): + self._event.set() + + self.endtime = time.time() + self.bm.notify_job_done(self) + + def _kill_all_archjobs(self): self._archjobs_lock.acquire() for job in self.archjobs.values(): if job: @@ -463,9 +479,6 @@ self.archjobs = {} self._archjobs_lock.release() - self.endtime = time.time() - self.bm.notify_job_done(self) - def wake(self): self._event.set() @@ -473,6 +486,10 @@ if self.is_done(): return + if self._die: + self._handle_death() + return + try: func = getattr(self, "_stage_%s" % self.curstage) if func(): @@ -494,11 +511,7 @@ msg = "%s\n-------------------------------------------------\n\n%s\n" % (msg, logtail) self.email_result(self.username, resultstring=msg, subject=subj) # Kill remaining jobs on other arches - self._archjobs_lock.acquire() - for job in self.archjobs.values(): - if job: - job.die() - self._archjobs_lock.release() + self._kill_all_archjobs() self._stage_failed(e.msg) def _stage_building(self): Index: UserInterface.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/UserInterface.py,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- UserInterface.py 5 Aug 2005 16:24:13 -0000 1.42 +++ UserInterface.py 6 Aug 2005 02:35:07 -0000 1.43 @@ -452,8 +452,10 @@ def update_builders(self): - execfile("/etc/plague/server/CONFIG.py") - builder_list = self._builder_manager.update_builders() + self._builder_manager.add_new_builders() + self._builder_manager.ping_suspended_builders() + time.sleep(2) + builder_list = self._builder_manager.list_builders() return (0, "Success.", builder_list) From fedora-extras-commits at redhat.com Sat Aug 6 02:54:24 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 5 Aug 2005 22:54:24 -0400 Subject: rpms/perl-UNIVERSAL-moniker - New directory Message-ID: <200508060254.j762sOci011927@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-UNIVERSAL-moniker In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11903/perl-UNIVERSAL-moniker Log Message: Directory /cvs/extras/rpms/perl-UNIVERSAL-moniker added to the repository From fedora-extras-commits at redhat.com Sat Aug 6 02:54:24 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 5 Aug 2005 22:54:24 -0400 Subject: rpms/perl-UNIVERSAL-moniker/devel - New directory Message-ID: <200508060254.j762sOPr011932@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-UNIVERSAL-moniker/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11903/perl-UNIVERSAL-moniker/devel Log Message: Directory /cvs/extras/rpms/perl-UNIVERSAL-moniker/devel added to the repository From fedora-extras-commits at redhat.com Sat Aug 6 02:54:37 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 5 Aug 2005 22:54:37 -0400 Subject: rpms/perl-UNIVERSAL-moniker/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200508060254.j762sbCe011984@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-UNIVERSAL-moniker/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11948/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-UNIVERSAL-moniker --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Sat Aug 6 02:54:36 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 5 Aug 2005 22:54:36 -0400 Subject: rpms/perl-UNIVERSAL-moniker Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200508060254.j762sa09011979@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-UNIVERSAL-moniker In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11948 Added Files: Makefile import.log Log Message: Setup of module perl-UNIVERSAL-moniker --- NEW FILE Makefile --- # Top level Makefile for module perl-UNIVERSAL-moniker all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Sat Aug 6 02:57:20 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 5 Aug 2005 22:57:20 -0400 Subject: owners owners.list,1.54,1.55 Message-ID: <200508060257.j762vKdF012009@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11992 Modified Files: owners.list Log Message: add perl-UNIVERSAL-moniker Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- owners.list 6 Aug 2005 02:34:02 -0000 1.54 +++ owners.list 6 Aug 2005 02:57:18 -0000 1.55 @@ -630,6 +630,7 @@ Fedora Extras|perl-Unicode-Map|Perl module for mapping charsets from and to utf16 unicode|gauret at free.fr|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Unicode-MapUTF8|Conversions to and from arbitrary character sets and UTF8|gauret at free.fr|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Unicode-String|Perl modules to handle various Unicode issues|gauret at free.fr|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-UNIVERSAL-moniker|Real world naming for classes|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Unix-Syslog|Perl interface to the UNIX syslog(3) calls|anvil at livna.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Want|Perl module implementing a generalisation of wantarray|rc040203 at freenet.de|extras-qa at fedoraproject.org| Fedora Extras|perl-XML-LibXSLT|Perl module for interfacing to GNOME's libxslt|shishz at hotpop.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Sat Aug 6 03:00:08 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 5 Aug 2005 23:00:08 -0400 Subject: rpms/perl-UNIVERSAL-moniker import.log,1.1,1.2 Message-ID: <200508060300.j7630cM2012290@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-UNIVERSAL-moniker In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12256 Modified Files: import.log Log Message: auto-import perl-UNIVERSAL-moniker-0.08-3 on branch devel from perl-UNIVERSAL-moniker-0.08-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-UNIVERSAL-moniker/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 6 Aug 2005 02:54:34 -0000 1.1 +++ import.log 6 Aug 2005 03:00:06 -0000 1.2 @@ -0,0 +1 @@ +perl-UNIVERSAL-moniker-0_08-3:HEAD:perl-UNIVERSAL-moniker-0.08-3.src.rpm:1123297261 From fedora-extras-commits at redhat.com Sat Aug 6 03:00:08 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 5 Aug 2005 23:00:08 -0400 Subject: rpms/perl-UNIVERSAL-moniker/devel perl-UNIVERSAL-moniker.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200508060300.j7630dr4012294@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-UNIVERSAL-moniker/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12256/devel Modified Files: .cvsignore sources Added Files: perl-UNIVERSAL-moniker.spec Log Message: auto-import perl-UNIVERSAL-moniker-0.08-3 on branch devel from perl-UNIVERSAL-moniker-0.08-3.src.rpm --- NEW FILE perl-UNIVERSAL-moniker.spec --- Name: perl-UNIVERSAL-moniker Version: 0.08 Release: 3%{?dist} Summary: Real world naming for classes Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/UNIVERSAL-moniker/ Source0: http://search.cpan.org/CPAN/authors/id/K/KA/KASEI/UNIVERSAL-moniker-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl >= 1:5.6.1, perl(Lingua::EN::Inflect) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description UNIVERSAL::moniker enables classes to make a good guess at what they would be called in the real world. %prep %setup -q -n UNIVERSAL-moniker-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README %{perl_vendorlib}/UNIVERSAL %{_mandir}/man3/*.3* %changelog * Fri Aug 5 2005 Tom "spot" Callaway 0.08-3 - add BR: perl(Lingua::EN::Inflect) to improve test coverage - add README to %doc * Fri Jul 8 2005 Tom "spot" Callaway 0.08-2 - cleanups * Wed Jul 6 2005 Tom "spot" Callaway 0.08-1 - Initial package for Fedora Extras Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-UNIVERSAL-moniker/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 6 Aug 2005 02:54:35 -0000 1.1 +++ .cvsignore 6 Aug 2005 03:00:06 -0000 1.2 @@ -0,0 +1 @@ +UNIVERSAL-moniker-0.08.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-UNIVERSAL-moniker/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 6 Aug 2005 02:54:35 -0000 1.1 +++ sources 6 Aug 2005 03:00:06 -0000 1.2 @@ -0,0 +1 @@ +e59b97ccf88f9fa68c3e5c18d7059d57 UNIVERSAL-moniker-0.08.tar.gz From fedora-extras-commits at redhat.com Sat Aug 6 03:03:49 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 5 Aug 2005 23:03:49 -0400 Subject: rpms/perl-UNIVERSAL-moniker/FC-3 perl-UNIVERSAL-moniker.spec, NONE, 1.1 sources, 1.1, 1.2 Message-ID: <200508060304.j7634jpq013511@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-UNIVERSAL-moniker/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13466/FC-3 Modified Files: sources Added Files: perl-UNIVERSAL-moniker.spec Log Message: Fix slightly mangled commit (due to VPN timeout) --- NEW FILE perl-UNIVERSAL-moniker.spec --- Name: perl-UNIVERSAL-moniker Version: 0.08 Release: 3%{?dist} Summary: Real world naming for classes Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/UNIVERSAL-moniker/ Source0: http://search.cpan.org/CPAN/authors/id/K/KA/KASEI/UNIVERSAL-moniker-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl >= 1:5.6.1, perl(Lingua::EN::Inflect) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description UNIVERSAL::moniker enables classes to make a good guess at what they would be called in the real world. %prep %setup -q -n UNIVERSAL-moniker-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README %{perl_vendorlib}/UNIVERSAL %{_mandir}/man3/*.3* %changelog * Fri Aug 5 2005 Tom "spot" Callaway 0.08-3 - add BR: perl(Lingua::EN::Inflect) to improve test coverage - add README to %doc * Fri Jul 8 2005 Tom "spot" Callaway 0.08-2 - cleanups * Wed Jul 6 2005 Tom "spot" Callaway 0.08-1 - Initial package for Fedora Extras Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-UNIVERSAL-moniker/FC-3/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 6 Aug 2005 02:54:35 -0000 1.1 +++ sources 6 Aug 2005 03:03:47 -0000 1.2 @@ -0,0 +1 @@ +e59b97ccf88f9fa68c3e5c18d7059d57 UNIVERSAL-moniker-0.08.tar.gz From fedora-extras-commits at redhat.com Sat Aug 6 03:04:13 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 5 Aug 2005 23:04:13 -0400 Subject: rpms/perl-UNIVERSAL-moniker/FC-4 perl-UNIVERSAL-moniker.spec, NONE, 1.1 sources, 1.1, 1.2 Message-ID: <200508060304.j7634jwT013510@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-UNIVERSAL-moniker/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13466/FC-4 Modified Files: sources Added Files: perl-UNIVERSAL-moniker.spec Log Message: Fix slightly mangled commit (due to VPN timeout) --- NEW FILE perl-UNIVERSAL-moniker.spec --- Name: perl-UNIVERSAL-moniker Version: 0.08 Release: 3%{?dist} Summary: Real world naming for classes Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/UNIVERSAL-moniker/ Source0: http://search.cpan.org/CPAN/authors/id/K/KA/KASEI/UNIVERSAL-moniker-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl >= 1:5.6.1, perl(Lingua::EN::Inflect) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description UNIVERSAL::moniker enables classes to make a good guess at what they would be called in the real world. %prep %setup -q -n UNIVERSAL-moniker-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README %{perl_vendorlib}/UNIVERSAL %{_mandir}/man3/*.3* %changelog * Fri Aug 5 2005 Tom "spot" Callaway 0.08-3 - add BR: perl(Lingua::EN::Inflect) to improve test coverage - add README to %doc * Fri Jul 8 2005 Tom "spot" Callaway 0.08-2 - cleanups * Wed Jul 6 2005 Tom "spot" Callaway 0.08-1 - Initial package for Fedora Extras Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-UNIVERSAL-moniker/FC-4/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 6 Aug 2005 02:54:35 -0000 1.1 +++ sources 6 Aug 2005 03:03:53 -0000 1.2 @@ -0,0 +1 @@ +e59b97ccf88f9fa68c3e5c18d7059d57 UNIVERSAL-moniker-0.08.tar.gz From fedora-extras-commits at redhat.com Sat Aug 6 03:10:53 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 5 Aug 2005 23:10:53 -0400 Subject: rpms/perl-DBD-SQLite2 - New directory Message-ID: <200508060310.j763AroI013740@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-DBD-SQLite2 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13716/perl-DBD-SQLite2 Log Message: Directory /cvs/extras/rpms/perl-DBD-SQLite2 added to the repository From fedora-extras-commits at redhat.com Sat Aug 6 03:10:53 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 5 Aug 2005 23:10:53 -0400 Subject: rpms/perl-DBD-SQLite2/devel - New directory Message-ID: <200508060310.j763ArDf013745@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-DBD-SQLite2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13716/perl-DBD-SQLite2/devel Log Message: Directory /cvs/extras/rpms/perl-DBD-SQLite2/devel added to the repository From fedora-extras-commits at redhat.com Sat Aug 6 03:11:10 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 5 Aug 2005 23:11:10 -0400 Subject: rpms/perl-DBD-SQLite2 Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200508060311.j763BAYY013788@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-DBD-SQLite2 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13761 Added Files: Makefile import.log Log Message: Setup of module perl-DBD-SQLite2 --- NEW FILE Makefile --- # Top level Makefile for module perl-DBD-SQLite2 all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Sat Aug 6 03:11:11 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 5 Aug 2005 23:11:11 -0400 Subject: rpms/perl-DBD-SQLite2/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200508060311.j763BBpT013793@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-DBD-SQLite2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13761/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-DBD-SQLite2 --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Sat Aug 6 03:11:44 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 5 Aug 2005 23:11:44 -0400 Subject: rpms/perl-DBD-SQLite2 import.log,1.1,1.2 Message-ID: <200508060311.j763Bibo013856@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-DBD-SQLite2 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13825 Modified Files: import.log Log Message: auto-import perl-DBD-SQLite2-0.33-3 on branch devel from perl-DBD-SQLite2-0.33-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-DBD-SQLite2/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 6 Aug 2005 03:11:08 -0000 1.1 +++ import.log 6 Aug 2005 03:11:42 -0000 1.2 @@ -0,0 +1 @@ +perl-DBD-SQLite2-0_33-3:HEAD:perl-DBD-SQLite2-0.33-3.src.rpm:1123297957 From fedora-extras-commits at redhat.com Sat Aug 6 03:11:44 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 5 Aug 2005 23:11:44 -0400 Subject: rpms/perl-DBD-SQLite2/devel perl-DBD-SQLite2.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200508060311.j763BiDu013863@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-DBD-SQLite2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13825/devel Modified Files: .cvsignore sources Added Files: perl-DBD-SQLite2.spec Log Message: auto-import perl-DBD-SQLite2-0.33-3 on branch devel from perl-DBD-SQLite2-0.33-3.src.rpm --- NEW FILE perl-DBD-SQLite2.spec --- Name: perl-DBD-SQLite2 Version: 0.33 Release: 3%{?dist} Summary: Self Contained RDBMS in a DBI Driver (sqlite 2.x) Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/DBD-SQLite2 Source0: http://search.cpan.org/CPAN/authors/id/M/MS/MSERGEANT/DBD-SQLite2-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl >= 1:5.6.1, perl(DBI) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description %{summary}. %prep %setup -q -n DBD-SQLite2-%{version} %build CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} OPTIMIZE="$RPM_OPT_FLAGS" %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type f -name '*.bs' -a -size 0 -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README %{perl_vendorarch}/auto/* %{perl_vendorarch}/DBD %{_mandir}/man3/*.3* %changelog * Fri Aug 5 2005 Tom "spot" Callaway 0.33-3 - add BR: perl(DBI) - add README to %doc * Fri Jul 8 2005 Tom "spot" Callaway 0.33-2 - cleanups * Wed Jul 6 2005 Tom "spot" Callaway 0.33-1 - Initial package for Fedora Extras Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-DBD-SQLite2/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 6 Aug 2005 03:11:08 -0000 1.1 +++ .cvsignore 6 Aug 2005 03:11:42 -0000 1.2 @@ -0,0 +1 @@ +DBD-SQLite2-0.33.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-DBD-SQLite2/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 6 Aug 2005 03:11:08 -0000 1.1 +++ sources 6 Aug 2005 03:11:42 -0000 1.2 @@ -0,0 +1 @@ +babd83fd5eb9ba7560ad4bab4c76c0eb DBD-SQLite2-0.33.tar.gz From fedora-extras-commits at redhat.com Sat Aug 6 03:13:03 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 5 Aug 2005 23:13:03 -0400 Subject: owners owners.list,1.55,1.56 Message-ID: <200508060313.j763D3Zx013913@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13895 Modified Files: owners.list Log Message: perl-DBD-SQLite2 Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- owners.list 6 Aug 2005 02:57:18 -0000 1.55 +++ owners.list 6 Aug 2005 03:13:01 -0000 1.56 @@ -530,6 +530,7 @@ Fedora Extras|perl-Crypt-Blowfish|XS Blowfish implementation for Perl|andreas at bawue.net|extras-qa at fedoraproject.org| Fedora Extras|perl-Crypt-CBC|Encrypt Data with Cipher Block Chaining Mode|andreas at bawue.net|extras-qa at fedoraproject.org| Fedora Extras|perl-DBD-SQLite|Self Contained RDBMS in a DBI Driver|jpo at di.uminho.pt|extras-qa at fedoraproject.org| +Fedora Extras|perl-DBD-SQLite2|Self Contained RDBMS in a DBI Driver (sqlite 2.x)|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Devel-Cycle|Find memory cycles in objects|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Digest-Nilsimsa|Perl interface to the Nilsima Algorithm|wtogami at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Error|Error Perl module|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Sat Aug 6 10:42:29 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Sat, 6 Aug 2005 06:42:29 -0400 Subject: rpms/kasumi/devel - New directory Message-ID: <200508061042.j76AgTeY023508@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/kasumi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23479/kasumi/devel Log Message: Directory /cvs/extras/rpms/kasumi/devel added to the repository From fedora-extras-commits at redhat.com Sat Aug 6 10:42:26 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Sat, 6 Aug 2005 06:42:26 -0400 Subject: rpms/kasumi - New directory Message-ID: <200508061042.j76AgQ3h023489@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/kasumi In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23479/kasumi Log Message: Directory /cvs/extras/rpms/kasumi added to the repository From fedora-extras-commits at redhat.com Sat Aug 6 10:42:48 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Sat, 6 Aug 2005 06:42:48 -0400 Subject: rpms/kasumi Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200508061042.j76Agmqk023555@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/kasumi In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23524 Added Files: Makefile import.log Log Message: Setup of module kasumi --- NEW FILE Makefile --- # Top level Makefile for module kasumi all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Sat Aug 6 10:42:48 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Sat, 6 Aug 2005 06:42:48 -0400 Subject: rpms/kasumi/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200508061042.j76AgmHK023560@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/kasumi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23524/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module kasumi --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Sat Aug 6 10:43:44 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Sat, 6 Aug 2005 06:43:44 -0400 Subject: rpms/kasumi import.log,1.1,1.2 Message-ID: <200508061044.j76AiER3023628@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/kasumi In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23593 Modified Files: import.log Log Message: auto-import kasumi-0.9-1 on branch devel from kasumi-0.9-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/kasumi/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 6 Aug 2005 10:42:46 -0000 1.1 +++ import.log 6 Aug 2005 10:43:42 -0000 1.2 @@ -0,0 +1 @@ +kasumi-0_9-1:HEAD:kasumi-0.9-1.src.rpm:1123325009 From fedora-extras-commits at redhat.com Sat Aug 6 10:43:44 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Sat, 6 Aug 2005 06:43:44 -0400 Subject: rpms/kasumi/devel kasumi.desktop, NONE, 1.1 kasumi.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200508061044.j76AiFSI023630@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/kasumi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23593/devel Modified Files: .cvsignore sources Added Files: kasumi.desktop kasumi.spec Log Message: auto-import kasumi-0.9-1 on branch devel from kasumi-0.9-1.src.rpm --- NEW FILE kasumi.desktop --- [Desktop Entry] Version=1.0 Encoding=UTF-8 Name=Kasumi Name[ja]=??? Comment=Edit Anthy dictionary. Comment[ja]=Anthy??????????????????????????? Exec=kasumi --add Icon=/usr/share/kasumi/kasumi.png Terminal=false Type=Application Categories=Applications;Settings; --- NEW FILE kasumi.spec --- Name: kasumi Version: 0.9 Release: 1%{?dist} Summary: An anthy dictionary management tool. License: GPL Group: Applications/Text URL: http://kasumi.sourceforge.jp/ BuildRequires: desktop-file-utils, gtk2-devel Source0: %{name}-%{version}.tar.gz Source1: kasumi.desktop BuildRoot: %{_tmppath}/%{name}-root %description Dictionary management tool for anthy. %prep %setup -q %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT %makeinstall mkdir -p ${RPM_BUILD_ROOT}/%{_datadir}/applications cp %{SOURCE1} ${RPM_BUILD_ROOT}/%{_datadir}/applications desktop-file-install \ --delete-original \ --vendor fedora \ --dir ${RPM_BUILD_ROOT}/%{_datadir}/applications \ --add-category X-Fedora \ ${RPM_BUILD_ROOT}/%{_datadir}/applications/kasumi.desktop %find_lang %{name} %clean rm -rf $RPM_BUILD_ROOT %post /sbin/ldconfig %postun /sbin/ldconfig %files -f %{name}.lang %defattr(-,root,root, -) %{_bindir}/kasumi %{_datadir}/kasumi %{_datadir}/applications/fedora-kasumi.desktop %doc AUTHORS COPYING ChangeLog INSTALL NEWS README %changelog * Wed Jun 29 2005 Ryo Dairiki - 0.9-1 - Initial packaging for Fedora Extras Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kasumi/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 6 Aug 2005 10:42:46 -0000 1.1 +++ .cvsignore 6 Aug 2005 10:43:42 -0000 1.2 @@ -0,0 +1 @@ +kasumi-0.9.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/kasumi/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 6 Aug 2005 10:42:46 -0000 1.1 +++ sources 6 Aug 2005 10:43:42 -0000 1.2 @@ -0,0 +1 @@ +9f34a65e757e942938d34528f8869344 kasumi-0.9.tar.gz From fedora-extras-commits at redhat.com Sat Aug 6 14:33:17 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sat, 6 Aug 2005 10:33:17 -0400 Subject: rpms/perl-DBD-SQLite2/devel DBD-SQLite2-systemlibs.patch, NONE, 1.1 perl-DBD-SQLite2.spec, 1.1, 1.2 Message-ID: <200508061433.j76EXHEO028790@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-DBD-SQLite2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28734/devel Modified Files: perl-DBD-SQLite2.spec Added Files: DBD-SQLite2-systemlibs.patch Log Message: Use system sqlite2 instead of defaulting to local copy DBD-SQLite2-systemlibs.patch: --- NEW FILE DBD-SQLite2-systemlibs.patch --- --- DBD-SQLite2-0.33/Makefile.PL.BAD 2005-08-06 09:05:23.000000000 -0500 +++ DBD-SQLite2-0.33/Makefile.PL 2005-08-06 09:27:08.000000000 -0500 @@ -7,12 +7,79 @@ use Config; use strict; +# 2005/8/6, by tcallawa at redhat.com +# +# Determine if we are going to use the provided SQLite2 code, or an +# already-installed copy. To this end, look for two command line +# parameters: +# +# USE_LOCAL_SQLITE -- If non-false, force use of the installed version +# SQLITE_LOCATION -- If passed, look for headers and libs under this root +# +# In absense of either of those, expect SQLite 2.X.X libs and headers in the +# common places known to Perl or the C compiler. +require File::Spec; +my ($force_local, $sqlite_base, $sqlite_lib, $sqlite_inc); +if ($sqlite_base = (grep(/SQLITE_LOCATION=.*/, @ARGV))[0]) { + $sqlite_base =~ /=(.*)/; + $sqlite_base = $1; + $sqlite_lib = File::Spec->catdir($sqlite_base, 'lib'); + $sqlite_inc = File::Spec->catdir($sqlite_base, 'include'); +} +if ($force_local = (grep(/USE_LOCAL_SQLITE=.*/, @ARGV))[0]) { + $force_local =~ /=(.*)/; + $force_local = "$1" ? 1 : 0; + if ($force_local) { + undef $sqlite_lib; # Keep these from making into CFLAGS/LDFLAGS + undef $sqlite_inc; + } +} + +# Now, check for sqlite2 +unless ($force_local) { + my ($dir, $file, $fh, $found); + print "Checking for SQLite2...\n"; + if ($sqlite_inc) { + open($fh, '< ' . File::Spec->catfile($sqlite_inc, 'sqlite.h')) + or die "Error opening sqlite.h in $sqlite_inc: $!"; + while (defined($_ = <$fh>)) { + $found = 1; + } + close($fh); + } else { + # Go hunting for the file + for $dir ([ qw(usr include) ], [ qw(usr local include) ]) { + $file = File::Spec->catfile('', @$dir, 'sqlite.h'); + next unless (-f $file); + open($fh, "< $file") or die "Error opening $file: $!"; + while (defined($_ = <$fh>)) { + $found = 1; + } + close($fh); + last if $found; + } + } + unless ($found) { + warn "No SQLite 2 header file was found. Using the local version instead.\n"; + $force_local = 1; + undef $sqlite_lib; + undef $sqlite_inc; + } else { + print "Looks good\n"; + } +} + + at ARGV = grep(! /SQLITE_LOCATION|USE_LOCAL_SQLITE/, @ARGV); + WriteMakefile( 'NAME' => 'DBD::SQLite2', 'VERSION_FROM' => 'lib/DBD/SQLite2.pm', # finds $VERSION 'PREREQ_PM' => {DBI => 1.21}, # e.g., Module::Name => 1.1 - 'OBJECT' => '$(O_FILES)', - 'INC' => '-I$(DBI_INSTARCH_DIR)', + 'OBJECT' => ($force_local) ? '$(O_FILES)' : 'SQLite2.o dbdimp.o', + 'INC' => '-I. -I$(DBI_INSTARCH_DIR)' . + (($sqlite_inc) ? " -I$sqlite_inc" : ''), + $force_local ? () : ('LIBS' => '-lsqlite'), + $sqlite_lib ? ('dynamic_lib' => { OTHERLDFLAGS => "-L$sqlite_lib" }) : (), 'OPTIMIZE' => "-O2", 'DEFINE' => "-DNDEBUG=1 -DSQLITE_PTR_SZ=$Config{ptrsize}" . ($Config{d_usleep} ? " -DHAVE_USLEEP=1" : ""), Index: perl-DBD-SQLite2.spec =================================================================== RCS file: /cvs/extras/rpms/perl-DBD-SQLite2/devel/perl-DBD-SQLite2.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-DBD-SQLite2.spec 6 Aug 2005 03:11:42 -0000 1.1 +++ perl-DBD-SQLite2.spec 6 Aug 2005 14:33:15 -0000 1.2 @@ -1,12 +1,13 @@ Name: perl-DBD-SQLite2 Version: 0.33 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Self Contained RDBMS in a DBI Driver (sqlite 2.x) Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/DBD-SQLite2 Source0: http://search.cpan.org/CPAN/authors/id/M/MS/MSERGEANT/DBD-SQLite2-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Patch0: DBD-SQLite2-systemlibs.patch BuildRequires: perl >= 1:5.6.1, perl(DBI) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) @@ -16,6 +17,7 @@ %prep %setup -q -n DBD-SQLite2-%{version} +%patch0 -p1 %build CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor @@ -44,6 +46,9 @@ %changelog +* Sat Aug 6 2005 Tom "spot" Callaway 0.33-4 +- use system sqlite2 libs if found + * Fri Aug 5 2005 Tom "spot" Callaway 0.33-3 - add BR: perl(DBI) - add README to %doc From fedora-extras-commits at redhat.com Sat Aug 6 14:33:11 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sat, 6 Aug 2005 10:33:11 -0400 Subject: rpms/perl-DBD-SQLite2/FC-3 DBD-SQLite2-systemlibs.patch, NONE, 1.1 perl-DBD-SQLite2.spec, 1.1, 1.2 Message-ID: <200508061433.j76EXfdK028793@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-DBD-SQLite2/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28734/FC-3 Modified Files: perl-DBD-SQLite2.spec Added Files: DBD-SQLite2-systemlibs.patch Log Message: Use system sqlite2 instead of defaulting to local copy DBD-SQLite2-systemlibs.patch: --- NEW FILE DBD-SQLite2-systemlibs.patch --- --- DBD-SQLite2-0.33/Makefile.PL.BAD 2005-08-06 09:05:23.000000000 -0500 +++ DBD-SQLite2-0.33/Makefile.PL 2005-08-06 09:27:08.000000000 -0500 @@ -7,12 +7,79 @@ use Config; use strict; +# 2005/8/6, by tcallawa at redhat.com +# +# Determine if we are going to use the provided SQLite2 code, or an +# already-installed copy. To this end, look for two command line +# parameters: +# +# USE_LOCAL_SQLITE -- If non-false, force use of the installed version +# SQLITE_LOCATION -- If passed, look for headers and libs under this root +# +# In absense of either of those, expect SQLite 2.X.X libs and headers in the +# common places known to Perl or the C compiler. +require File::Spec; +my ($force_local, $sqlite_base, $sqlite_lib, $sqlite_inc); +if ($sqlite_base = (grep(/SQLITE_LOCATION=.*/, @ARGV))[0]) { + $sqlite_base =~ /=(.*)/; + $sqlite_base = $1; + $sqlite_lib = File::Spec->catdir($sqlite_base, 'lib'); + $sqlite_inc = File::Spec->catdir($sqlite_base, 'include'); +} +if ($force_local = (grep(/USE_LOCAL_SQLITE=.*/, @ARGV))[0]) { + $force_local =~ /=(.*)/; + $force_local = "$1" ? 1 : 0; + if ($force_local) { + undef $sqlite_lib; # Keep these from making into CFLAGS/LDFLAGS + undef $sqlite_inc; + } +} + +# Now, check for sqlite2 +unless ($force_local) { + my ($dir, $file, $fh, $found); + print "Checking for SQLite2...\n"; + if ($sqlite_inc) { + open($fh, '< ' . File::Spec->catfile($sqlite_inc, 'sqlite.h')) + or die "Error opening sqlite.h in $sqlite_inc: $!"; + while (defined($_ = <$fh>)) { + $found = 1; + } + close($fh); + } else { + # Go hunting for the file + for $dir ([ qw(usr include) ], [ qw(usr local include) ]) { + $file = File::Spec->catfile('', @$dir, 'sqlite.h'); + next unless (-f $file); + open($fh, "< $file") or die "Error opening $file: $!"; + while (defined($_ = <$fh>)) { + $found = 1; + } + close($fh); + last if $found; + } + } + unless ($found) { + warn "No SQLite 2 header file was found. Using the local version instead.\n"; + $force_local = 1; + undef $sqlite_lib; + undef $sqlite_inc; + } else { + print "Looks good\n"; + } +} + + at ARGV = grep(! /SQLITE_LOCATION|USE_LOCAL_SQLITE/, @ARGV); + WriteMakefile( 'NAME' => 'DBD::SQLite2', 'VERSION_FROM' => 'lib/DBD/SQLite2.pm', # finds $VERSION 'PREREQ_PM' => {DBI => 1.21}, # e.g., Module::Name => 1.1 - 'OBJECT' => '$(O_FILES)', - 'INC' => '-I$(DBI_INSTARCH_DIR)', + 'OBJECT' => ($force_local) ? '$(O_FILES)' : 'SQLite2.o dbdimp.o', + 'INC' => '-I. -I$(DBI_INSTARCH_DIR)' . + (($sqlite_inc) ? " -I$sqlite_inc" : ''), + $force_local ? () : ('LIBS' => '-lsqlite'), + $sqlite_lib ? ('dynamic_lib' => { OTHERLDFLAGS => "-L$sqlite_lib" }) : (), 'OPTIMIZE' => "-O2", 'DEFINE' => "-DNDEBUG=1 -DSQLITE_PTR_SZ=$Config{ptrsize}" . ($Config{d_usleep} ? " -DHAVE_USLEEP=1" : ""), Index: perl-DBD-SQLite2.spec =================================================================== RCS file: /cvs/extras/rpms/perl-DBD-SQLite2/FC-3/perl-DBD-SQLite2.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-DBD-SQLite2.spec 6 Aug 2005 03:11:42 -0000 1.1 +++ perl-DBD-SQLite2.spec 6 Aug 2005 14:33:09 -0000 1.2 @@ -1,12 +1,13 @@ Name: perl-DBD-SQLite2 Version: 0.33 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Self Contained RDBMS in a DBI Driver (sqlite 2.x) Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/DBD-SQLite2 Source0: http://search.cpan.org/CPAN/authors/id/M/MS/MSERGEANT/DBD-SQLite2-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Patch0: DBD-SQLite2-systemlibs.patch BuildRequires: perl >= 1:5.6.1, perl(DBI) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) @@ -16,6 +17,7 @@ %prep %setup -q -n DBD-SQLite2-%{version} +%patch0 -p1 %build CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor @@ -44,6 +46,9 @@ %changelog +* Sat Aug 6 2005 Tom "spot" Callaway 0.33-4 +- use system sqlite2 libs if found + * Fri Aug 5 2005 Tom "spot" Callaway 0.33-3 - add BR: perl(DBI) - add README to %doc From fedora-extras-commits at redhat.com Sat Aug 6 14:33:12 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sat, 6 Aug 2005 10:33:12 -0400 Subject: rpms/perl-DBD-SQLite2/FC-4 DBD-SQLite2-systemlibs.patch, NONE, 1.1 perl-DBD-SQLite2.spec, 1.1, 1.2 Message-ID: <200508061433.j76EXgrv028796@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-DBD-SQLite2/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28734/FC-4 Modified Files: perl-DBD-SQLite2.spec Added Files: DBD-SQLite2-systemlibs.patch Log Message: Use system sqlite2 instead of defaulting to local copy DBD-SQLite2-systemlibs.patch: --- NEW FILE DBD-SQLite2-systemlibs.patch --- --- DBD-SQLite2-0.33/Makefile.PL.BAD 2005-08-06 09:05:23.000000000 -0500 +++ DBD-SQLite2-0.33/Makefile.PL 2005-08-06 09:27:08.000000000 -0500 @@ -7,12 +7,79 @@ use Config; use strict; +# 2005/8/6, by tcallawa at redhat.com +# +# Determine if we are going to use the provided SQLite2 code, or an +# already-installed copy. To this end, look for two command line +# parameters: +# +# USE_LOCAL_SQLITE -- If non-false, force use of the installed version +# SQLITE_LOCATION -- If passed, look for headers and libs under this root +# +# In absense of either of those, expect SQLite 2.X.X libs and headers in the +# common places known to Perl or the C compiler. +require File::Spec; +my ($force_local, $sqlite_base, $sqlite_lib, $sqlite_inc); +if ($sqlite_base = (grep(/SQLITE_LOCATION=.*/, @ARGV))[0]) { + $sqlite_base =~ /=(.*)/; + $sqlite_base = $1; + $sqlite_lib = File::Spec->catdir($sqlite_base, 'lib'); + $sqlite_inc = File::Spec->catdir($sqlite_base, 'include'); +} +if ($force_local = (grep(/USE_LOCAL_SQLITE=.*/, @ARGV))[0]) { + $force_local =~ /=(.*)/; + $force_local = "$1" ? 1 : 0; + if ($force_local) { + undef $sqlite_lib; # Keep these from making into CFLAGS/LDFLAGS + undef $sqlite_inc; + } +} + +# Now, check for sqlite2 +unless ($force_local) { + my ($dir, $file, $fh, $found); + print "Checking for SQLite2...\n"; + if ($sqlite_inc) { + open($fh, '< ' . File::Spec->catfile($sqlite_inc, 'sqlite.h')) + or die "Error opening sqlite.h in $sqlite_inc: $!"; + while (defined($_ = <$fh>)) { + $found = 1; + } + close($fh); + } else { + # Go hunting for the file + for $dir ([ qw(usr include) ], [ qw(usr local include) ]) { + $file = File::Spec->catfile('', @$dir, 'sqlite.h'); + next unless (-f $file); + open($fh, "< $file") or die "Error opening $file: $!"; + while (defined($_ = <$fh>)) { + $found = 1; + } + close($fh); + last if $found; + } + } + unless ($found) { + warn "No SQLite 2 header file was found. Using the local version instead.\n"; + $force_local = 1; + undef $sqlite_lib; + undef $sqlite_inc; + } else { + print "Looks good\n"; + } +} + + at ARGV = grep(! /SQLITE_LOCATION|USE_LOCAL_SQLITE/, @ARGV); + WriteMakefile( 'NAME' => 'DBD::SQLite2', 'VERSION_FROM' => 'lib/DBD/SQLite2.pm', # finds $VERSION 'PREREQ_PM' => {DBI => 1.21}, # e.g., Module::Name => 1.1 - 'OBJECT' => '$(O_FILES)', - 'INC' => '-I$(DBI_INSTARCH_DIR)', + 'OBJECT' => ($force_local) ? '$(O_FILES)' : 'SQLite2.o dbdimp.o', + 'INC' => '-I. -I$(DBI_INSTARCH_DIR)' . + (($sqlite_inc) ? " -I$sqlite_inc" : ''), + $force_local ? () : ('LIBS' => '-lsqlite'), + $sqlite_lib ? ('dynamic_lib' => { OTHERLDFLAGS => "-L$sqlite_lib" }) : (), 'OPTIMIZE' => "-O2", 'DEFINE' => "-DNDEBUG=1 -DSQLITE_PTR_SZ=$Config{ptrsize}" . ($Config{d_usleep} ? " -DHAVE_USLEEP=1" : ""), Index: perl-DBD-SQLite2.spec =================================================================== RCS file: /cvs/extras/rpms/perl-DBD-SQLite2/FC-4/perl-DBD-SQLite2.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-DBD-SQLite2.spec 6 Aug 2005 03:11:42 -0000 1.1 +++ perl-DBD-SQLite2.spec 6 Aug 2005 14:33:10 -0000 1.2 @@ -1,12 +1,13 @@ Name: perl-DBD-SQLite2 Version: 0.33 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Self Contained RDBMS in a DBI Driver (sqlite 2.x) Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/DBD-SQLite2 Source0: http://search.cpan.org/CPAN/authors/id/M/MS/MSERGEANT/DBD-SQLite2-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Patch0: DBD-SQLite2-systemlibs.patch BuildRequires: perl >= 1:5.6.1, perl(DBI) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) @@ -16,6 +17,7 @@ %prep %setup -q -n DBD-SQLite2-%{version} +%patch0 -p1 %build CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor @@ -44,6 +46,9 @@ %changelog +* Sat Aug 6 2005 Tom "spot" Callaway 0.33-4 +- use system sqlite2 libs if found + * Fri Aug 5 2005 Tom "spot" Callaway 0.33-3 - add BR: perl(DBI) - add README to %doc From fedora-extras-commits at redhat.com Sat Aug 6 14:35:38 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sat, 6 Aug 2005 10:35:38 -0400 Subject: rpms/perl-DBD-SQLite2/devel perl-DBD-SQLite2.spec,1.2,1.3 Message-ID: <200508061435.j76EZcbs028849@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-DBD-SQLite2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28802/devel Modified Files: perl-DBD-SQLite2.spec Log Message: Add BR: sqlite2-devel Index: perl-DBD-SQLite2.spec =================================================================== RCS file: /cvs/extras/rpms/perl-DBD-SQLite2/devel/perl-DBD-SQLite2.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-DBD-SQLite2.spec 6 Aug 2005 14:33:15 -0000 1.2 +++ perl-DBD-SQLite2.spec 6 Aug 2005 14:35:36 -0000 1.3 @@ -10,6 +10,7 @@ Patch0: DBD-SQLite2-systemlibs.patch BuildRequires: perl >= 1:5.6.1, perl(DBI) +BuildRequires: sqlite2-devel Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description From fedora-extras-commits at redhat.com Sat Aug 6 14:35:32 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sat, 6 Aug 2005 10:35:32 -0400 Subject: rpms/perl-DBD-SQLite2/FC-3 perl-DBD-SQLite2.spec,1.2,1.3 Message-ID: <200508061436.j76Ea2SI028852@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-DBD-SQLite2/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28802/FC-3 Modified Files: perl-DBD-SQLite2.spec Log Message: Add BR: sqlite2-devel Index: perl-DBD-SQLite2.spec =================================================================== RCS file: /cvs/extras/rpms/perl-DBD-SQLite2/FC-3/perl-DBD-SQLite2.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-DBD-SQLite2.spec 6 Aug 2005 14:33:09 -0000 1.2 +++ perl-DBD-SQLite2.spec 6 Aug 2005 14:35:30 -0000 1.3 @@ -10,6 +10,7 @@ Patch0: DBD-SQLite2-systemlibs.patch BuildRequires: perl >= 1:5.6.1, perl(DBI) +BuildRequires: sqlite2-devel Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description From fedora-extras-commits at redhat.com Sat Aug 6 14:35:32 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sat, 6 Aug 2005 10:35:32 -0400 Subject: rpms/perl-DBD-SQLite2/FC-4 perl-DBD-SQLite2.spec,1.2,1.3 Message-ID: <200508061436.j76Ea3Os028855@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-DBD-SQLite2/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28802/FC-4 Modified Files: perl-DBD-SQLite2.spec Log Message: Add BR: sqlite2-devel Index: perl-DBD-SQLite2.spec =================================================================== RCS file: /cvs/extras/rpms/perl-DBD-SQLite2/FC-4/perl-DBD-SQLite2.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-DBD-SQLite2.spec 6 Aug 2005 14:33:10 -0000 1.2 +++ perl-DBD-SQLite2.spec 6 Aug 2005 14:35:30 -0000 1.3 @@ -10,6 +10,7 @@ Patch0: DBD-SQLite2-systemlibs.patch BuildRequires: perl >= 1:5.6.1, perl(DBI) +BuildRequires: sqlite2-devel Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description From fedora-extras-commits at redhat.com Sat Aug 6 16:02:04 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sat, 6 Aug 2005 12:02:04 -0400 Subject: extras-buildsys/server PackageJob.py,1.19,1.20 Message-ID: <200508061602.j76G2Y5R031353@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31336/server Modified Files: PackageJob.py Log Message: Beautify error messages, remove uneeded output from make_srpm failure message Index: PackageJob.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/PackageJob.py,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- PackageJob.py 6 Aug 2005 02:35:07 -0000 1.19 +++ PackageJob.py 6 Aug 2005 16:01:38 -0000 1.20 @@ -289,7 +289,7 @@ debugprint("%d: Running %s" % (self.uid, cmd)) s, o = commands.getstatusoutput(cmd) if s != 0: - err_msg = "could not check out %s from %s - output was:\n %s" % (self.cvs_tag, self.target, o) + err_msg = "Erro: could not check out %s from %s - output was:\n\n%s" % (self.cvs_tag, self.target, o) else: # Just in case the 'common' directory didn't come along for the ride, # get it from CVS @@ -299,7 +299,7 @@ debugprint("%d: Running %s" % (self.uid, cmd)) s, o = commands.getstatusoutput(cmd) if s != 0: - err_msg = "could not check out common directory - output was:\n %s" % (self.cvs_tag, self.target, o) + err_msg = "Error: could not check out common directory - output was:\n\n%s" % (self.cvs_tag, self.target, o) self.bm.notify_checkout_done(self) @@ -328,7 +328,14 @@ debugprint("%d: Running %s in %s" % (self.uid, cmd, srpm_dir)) s, o = commands.getstatusoutput(cmd) if s != 0: - msg = "could not make srpm for %s - output was:\n %s" % (self.cvs_tag, o) + # Don't include download progress lines in output + lines = o.split('\n') + output_lines = [] + for line in lines: + if line.find('..........') == -1 and len(line) > 0: + output_lines.append(line) + o = string.join(output_lines, '\n') + msg = "Error: could not make srpm for %s - output was:\n\n%s" % (self.cvs_tag, o) raise PrepError(msg) srpmpath = None @@ -339,7 +346,7 @@ srpmpath = path.strip() break if not srpmpath: - msg = "could not find srpm for %s - output was:\n %s" % (self.cvs_tag, o) + msg = "Error: could not find srpm for %s - output was:\n\n%s" % (self.cvs_tag, o) raise PrepError(msg) self.srpm_path = srpmpath From fedora-extras-commits at redhat.com Sat Aug 6 16:06:43 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sat, 6 Aug 2005 12:06:43 -0400 Subject: extras-buildsys/www/css style.css,1.6,1.7 Message-ID: <200508061606.j76G6hi5031384@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/www/css In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31367/www/css Modified Files: style.css Log Message: Align job detail labels to the top of their cell Index: style.css =================================================================== RCS file: /cvs/fedora/extras-buildsys/www/css/style.css,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- style.css 4 Aug 2005 21:12:48 -0000 1.6 +++ style.css 6 Aug 2005 16:06:41 -0000 1.7 @@ -317,6 +317,7 @@ td.jobdetail-tag { padding: 4px 2px 0px 2px; + vertical-align: top; text-align: right; width: 15%; } From fedora-extras-commits at redhat.com Sat Aug 6 16:25:07 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sat, 6 Aug 2005 12:25:07 -0400 Subject: extras-buildsys/www failed.psp, 1.3, 1.4 index.psp, 1.6, 1.7 indiv.psp, 1.6, 1.7 job.psp, 1.7, 1.8 success.psp, 1.3, 1.4 Message-ID: <200508061625.j76GPcGh031521@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/www In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31482/www Modified Files: failed.psp index.psp indiv.psp job.psp success.psp Log Message: Consolidate email despamming into a single function, other misc cleanups of joblinks Index: failed.psp =================================================================== RCS file: /cvs/fedora/extras-buildsys/www/failed.psp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- failed.psp 4 Aug 2005 21:12:47 -0000 1.3 +++ failed.psp 6 Aug 2005 16:25:05 -0000 1.4 @@ -65,17 +65,14 @@ import os source = os.path.basename(source) # endif - - joblink = job_link(job['uid']) - despam_user = job['username'].replace('@', ' ') %>
<%=job['uid']%> <%=job['uid']%> <%=job['package']%> <%=source%> <%=job['status']%> <%=job['target']%> <%=despam_user%> <%=despam_user(job['username'])%>
<%=job['uid']%> <%=job['uid']%> <%=job['package']%> <%=source%> <%=job['status']%> <%=job['target']%> <%=username%> <%=despam_user(job['username'])%>
<%=job['uid']%> <%=job['uid']%> <%=job['package']%> <%=source%> <%=job['status']%>/<%=job['result']%>
- + <% Index: success.psp =================================================================== RCS file: /cvs/fedora/extras-buildsys/www/success.psp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- success.psp 4 Aug 2005 21:12:47 -0000 1.3 +++ success.psp 6 Aug 2005 16:25:05 -0000 1.4 @@ -63,17 +63,14 @@ import os source = os.path.basename(source) # endif - - joblink = job_link(job['uid']) - despam_user = job['username'].replace('@', ' ') %> - + - + <% i = i + 1 From fedora-extras-commits at redhat.com Sat Aug 6 16:25:08 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sat, 6 Aug 2005 12:25:08 -0400 Subject: extras-buildsys/www/template head.psp,1.6,1.7 Message-ID: <200508061625.j76GPcR7031525@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/www/template In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31482/www/template Modified Files: head.psp Log Message: Consolidate email despamming into a single function, other misc cleanups of joblinks Index: head.psp =================================================================== RCS file: /cvs/fedora/extras-buildsys/www/template/head.psp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- head.psp 4 Aug 2005 21:12:54 -0000 1.6 +++ head.psp 6 Aug 2005 16:25:06 -0000 1.7 @@ -16,6 +16,10 @@ string = "?uid=%d" % uid return string +def despam_user(email): + user, server = email.split('@') + server = server.replace('.', ' ') + return user + ' ' + server main_active = '' if curpage == 'main': From fedora-extras-commits at redhat.com Sat Aug 6 17:58:36 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sat, 6 Aug 2005 13:58:36 -0400 Subject: extras-buildsys/server BuildMaster.py, 1.28, 1.29 PackageJob.py, 1.20, 1.21 Message-ID: <200508061758.j76Hwa86000386@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv367/server Modified Files: BuildMaster.py PackageJob.py Log Message: Ensure existing status updates get written to the db before the job gets finished, and make sure job result gets written on job finish as well Index: BuildMaster.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/BuildMaster.py,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- BuildMaster.py 5 Aug 2005 16:24:12 -0000 1.28 +++ BuildMaster.py 6 Aug 2005 17:58:34 -0000 1.29 @@ -269,8 +269,17 @@ for job in self._done_queue: uid = job.get_uid() + + # Write any existing status update first + self._status_updates_lock.acquire() + if self._status_updates.has_key(uid): + self._write_job_status_to_db(uid, self._status_updates[uid]) + del self._status_updates[uid] + self._status_updates_lock.release() + attrdict = {} attrdict['status'] = job.get_cur_stage() + attrdict['result'] = job.get_result() self._write_job_status_to_db(uid, attrdict) # Update job end time @@ -280,12 +289,6 @@ print "DB Error: could not access jobs database. Reason: '%s'" % e self.dbcx.commit() - # If there are any status updates in the queue for this job, remove them - self._status_updates_lock.acquire() - if self._status_updates.has_key(uid): - del self._status_updates[uid] - self._status_updates_lock.release() - print "%s (%s): Job finished." % (uid, job.package) self._building_jobs_lock.acquire() Index: PackageJob.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/PackageJob.py,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- PackageJob.py 6 Aug 2005 16:01:38 -0000 1.20 +++ PackageJob.py 6 Aug 2005 17:58:34 -0000 1.21 @@ -149,6 +149,9 @@ def get_cur_stage(self): return self.curstage + def get_result(self): + return self.result + def _set_cur_stage(self, stage, result_msg=None): """ Update our internal job stage, and notify the BuildMaster that we've changed as well. @@ -158,8 +161,7 @@ if oldstage != stage: attrdict = {} attrdict['status'] = copy.copy(stage) - if self.result: - attrdict['result'] = copy.copy(self.result) + attrdict['result'] = copy.copy(self.result) if self.name and self.epoch and self.ver and self.release: attrdict['epoch'] = self.epoch attrdict['version'] = self.ver From fedora-extras-commits at redhat.com Sun Aug 7 02:37:49 2005 From: fedora-extras-commits at redhat.com (Zing Zing Shishak (shishz)) Date: Sat, 6 Aug 2005 22:37:49 -0400 Subject: rpms/snownews/devel snownews-1.5.7-charset.patch, NONE, 1.1 snownews-1.5.7-manpath.patch, NONE, 1.1 snownews-1.5.7-softlink.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 snownews.spec, 1.5, 1.6 sources, 1.3, 1.4 snownews-1.5.6.1-destdir.patch, 1.1, NONE snownews-1.5.6.1-manpath.patch, 1.1, NONE Message-ID: <200508070237.j772boAv011518@cvs-int.fedora.redhat.com> Author: shishz Update of /cvs/extras/rpms/snownews/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11488 Modified Files: .cvsignore snownews.spec sources Added Files: snownews-1.5.7-charset.patch snownews-1.5.7-manpath.patch snownews-1.5.7-softlink.patch Removed Files: snownews-1.5.6.1-destdir.patch snownews-1.5.6.1-manpath.patch Log Message: * Mon Aug 6 2005 Zing - 1.5.7-2 - add runtime charset detection, #155073 - use dist macro * Fri Jul 29 2005 Zing - 1.5.7-1 - update to 1.5.7 - drop destdir patch, fixed upstream - fixup softlink for snow2opml snownews-1.5.7-charset.patch: --- NEW FILE snownews-1.5.7-charset.patch --- --- snownews-1.5.7/config.h.orig 2005-06-05 05:50:22.000000000 -0400 +++ snownews-1.5.7/config.h 2005-08-01 21:44:51.000000000 -0400 @@ -27,10 +27,9 @@ #include "version.h" #include "netio.h" -/* Set your charset here. ISO-8859-1 is default. */ -#ifndef TARGET_CHARSET -#define TARGET_CHARSET "ISO-8859-1" -#endif +/* Set your charset here. This overrides the CODESET setting + as reported by nl_langinfo() */ +/* #define TARGET_CHARSET "UTF-8" */ struct feed { char *feedurl; /* Non hashified URL */ @@ -126,10 +125,16 @@ #ifdef LOCALEPATH # include # include +#ifndef TARGET_CHARSET +# include +#endif #endif #ifdef LOCALEPATH # define _(String) gettext (String) +#ifndef TARGET_CHARSET +# define TARGET_CHARSET nl_langinfo(CODESET) +#endif #else # define _(String) (String) # define ngettext(Singular, Plural, n) (Plural) --- snownews-1.5.7/interface.c.orig 2005-06-05 05:50:22.000000000 -0400 +++ snownews-1.5.7/interface.c 2005-08-01 21:46:30.000000000 -0400 @@ -1151,7 +1151,8 @@ else columns = COLS-9-strlen(_("new")); - mvaddnstr (ypos, 1, cur_ptr->title, columns); + localized_msg = iconvert(cur_ptr->title); + mvaddnstr (ypos, 1, localized_msg, columns); if (xmlStrlen((xmlChar *)cur_ptr->title) > columns) mvaddstr (ypos, columns+1, "..."); snownews-1.5.7-manpath.patch: --- NEW FILE snownews-1.5.7-manpath.patch --- --- snownews-1.5.7/Makefile.orig 2005-07-29 10:09:33.000000000 -0400 +++ snownews-1.5.7/Makefile 2005-07-29 10:14:02.000000000 -0400 @@ -75,17 +75,17 @@ done install-man: manpages - if [ ! -d "$(DESTDIR)$(PREFIX)/man/man1" ]; then \ - mkdir -p $(DESTDIR)$(PREFIX)/man/man1; \ + if [ ! -d "$(DESTDIR)$(PREFIX)/share/man/man1" ]; then \ + mkdir -p $(DESTDIR)$(PREFIX)/share/man/man1; \ fi - $(INSTALL) -m 0644 $(MAN)/snownews.1 $(DESTDIR)$(PREFIX)/man/man1 - $(INSTALL) -m 0644 $(MAN)/opml2snow.1 $(DESTDIR)$(PREFIX)/man/man1 + $(INSTALL) -m 0644 $(MAN)/snownews.1 $(DESTDIR)$(PREFIX)/share/man/man1 + $(INSTALL) -m 0644 $(MAN)/opml2snow.1 $(DESTDIR)$(PREFIX)/share/man/man1 for L in $(LANGS); do \ - if [ ! -d "$(DESTDIR)$(PREFIX)/man/$$L/man1" ]; then \ - mkdir -p $(DESTDIR)$(PREFIX)/man/$$L/man1; \ + if [ ! -d "$(DESTDIR)$(PREFIX)/share/man/$$L/man1" ]; then \ + mkdir -p $(DESTDIR)$(PREFIX)/share/man/$$L/man1; \ fi; \ - $(INSTALL) -m 0644 $(MAN)/$$L/snownews.1 $(DESTDIR)$(PREFIX)/man/$$L/man1; \ + $(INSTALL) -m 0644 $(MAN)/$$L/snownews.1 $(DESTDIR)$(PREFIX)/share/man/$$L/man1; \ done ### Cleanup ### snownews-1.5.7-softlink.patch: --- NEW FILE snownews-1.5.7-softlink.patch --- --- snownews-1.5.7/Makefile.orig 2005-07-29 10:09:33.000000000 -0400 +++ snownews-1.5.7/Makefile 2005-07-29 10:27:07.000000000 -0400 @@ -62,7 +62,7 @@ $(INSTALL) -s snownews $(DESTDIR)$(PREFIX)/bin $(INSTALL) opml2snow $(DESTDIR)$(PREFIX)/bin if [ ! -f "$(DESTDIR)$(PREFIX)/bin/snow2opml" ]; then \ - ln -sf $(DESTDIR)$(PREFIX)/bin/opml2snow $(DESTDIR)$(PREFIX)/bin/snow2opml; \ + ln -sf opml2snow $(DESTDIR)$(PREFIX)/bin/snow2opml; \ fi; $(INSTALL) snowsync $(DESTDIR)$(PREFIX)/bin Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/snownews/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 25 Mar 2005 10:17:52 -0000 1.3 +++ .cvsignore 7 Aug 2005 02:37:47 -0000 1.4 @@ -1,2 +1,2 @@ -snownews-1.5.3.tar.gz -snownews-1.5.6.1.tar.gz +snownews-1.5.7.tar.gz +clog Index: snownews.spec =================================================================== RCS file: /cvs/extras/rpms/snownews/devel/snownews.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- snownews.spec 25 Mar 2005 10:18:18 -0000 1.5 +++ snownews.spec 7 Aug 2005 02:37:47 -0000 1.6 @@ -1,15 +1,16 @@ Name: snownews -Version: 1.5.6.1 -Release: 3.FC4 +Version: 1.5.7 +Release: 2%{?dist} Summary: A text mode RSS/RDF newsreader Group: Applications/Internet License: GPL Url: http://home.kcore.de/~kiza/software/snownews -Source0: http://home.kcore.de/~kiza/software/snownews/download/snownews-1.5.6.1.tar.gz +Source0: http://home.kcore.de/~kiza/software/snownews/download/snownews-1.5.7.tar.gz Patch0: snownews-1.5.3-nocheck.patch -Patch1: snownews-1.5.6.1-manpath.patch +Patch1: snownews-1.5.7-manpath.patch Patch2: snownews-1.5.6.1-nostrip.patch -Patch3: snownews-1.5.6.1-destdir.patch +Patch3: snownews-1.5.7-softlink.patch +Patch4: snownews-1.5.7-charset.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libxml2-devel BuildRequires: ncurses-devel @@ -29,6 +30,7 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 %build ./configure --prefix=%{_prefix} --charset=UTF-8 @@ -46,12 +48,22 @@ %defattr(-,root,root) %doc README* AUTHOR COPYING CREDITS Changelog %{_bindir}/opml2snow +%{_bindir}/snow2opml %{_bindir}/snownews %{_bindir}/snowsync %{_mandir}/man1/* %{_mandir}/*/man1/* %changelog +* Mon Aug 6 2005 Zing - 1.5.7-2 +- add runtime charset detection, #155073 +- use dist macro + +* Fri Jul 29 2005 Zing - 1.5.7-1 +- update to 1.5.7 +- drop destdir patch, fixed upstream +- fixup softlink for snow2opml + * Thu Mar 24 2005 Warren Togami - 1.5.6.1-3 - macroize dirs Index: sources =================================================================== RCS file: /cvs/extras/rpms/snownews/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 25 Mar 2005 10:17:52 -0000 1.3 +++ sources 7 Aug 2005 02:37:47 -0000 1.4 @@ -1 +1 @@ -466ca82e8df03d6126d6cc0f20772025 snownews-1.5.6.1.tar.gz +75ffa004e755a233f49b1cdfcd9e3d85 snownews-1.5.7.tar.gz --- snownews-1.5.6.1-destdir.patch DELETED --- --- snownews-1.5.6.1-manpath.patch DELETED --- From fedora-extras-commits at redhat.com Sun Aug 7 07:49:55 2005 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Sun, 7 Aug 2005 03:49:55 -0400 Subject: rpms/svgalib/devel svgalib-1.9.21-wip3.patch, NONE, 1.1 svgalib-todo, 1.1, 1.2 svgalib.spec, 1.3, 1.4 Message-ID: <200508070749.j777ntoH017674@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/svgalib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17652 Modified Files: svgalib-todo svgalib.spec Added Files: svgalib-1.9.21-wip3.patch Log Message: fix 320x200x256(mode 5) on atleast radeons and probably others too svgalib-1.9.21-wip3.patch: --- NEW FILE svgalib-1.9.21-wip3.patch --- Only in svgalib-1.9.21: log Only in svgalib-1.9.21: log2 diff -ur svgalib-1.9.21.orig/src/vga.c svgalib-1.9.21/src/vga.c --- svgalib-1.9.21.orig/src/vga.c 2005-08-05 18:17:09.000000000 +0200 +++ svgalib-1.9.21/src/vga.c 2005-08-07 09:19:31.000000000 +0200 @@ -2166,7 +2166,6 @@ if (__svgalib_emulatepage && (modeinfo->flags & CAPABLE_LINEAR) && !(modeinfo->flags & LINEAR_USE)) { __svgalib_driverspecs->linear(LINEAR_ENABLE, 0); - __svgalib_modeinfo_linearset |= IS_LINEAR; } if (!flip) /* set graphics mode termio */ @@ -2302,11 +2301,10 @@ modeinfo.flags &= modeinfo_mask; /* Many cards have problems with linear 320x200x256 mode */ - if(mode==G320x200x256)modeinfo.flags &= (~CAPABLE_LINEAR) & (~IS_LINEAR) ; + if(mode==G320x200x256)modeinfo.flags &= (~CAPABLE_LINEAR) & (~LINEAR_USE); - /* If all needed info is here, signal if linear support has been enabled */ - if ((modeinfo.flags & (CAPABLE_LINEAR | EXT_INFO_AVAILABLE)) == - (CAPABLE_LINEAR | EXT_INFO_AVAILABLE)) { + /* Signal if linear support has been enabled */ + if (modeinfo.flags & CAPABLE_LINEAR) { modeinfo.flags |= __svgalib_modeinfo_linearset; } @@ -2329,15 +2327,14 @@ infotable[mode].ydimmaxy) return 0; - if(__svgalib_emulatepage && STDVGAMODE(mode) && (mode!=G320x200x256)) + if(__svgalib_emulatepage && STDVGAMODE(mode)) return 0; if (!chipset_modeavailable(mode)) return 0; modeinfo = vga_getmodeinfo(mode); - if (__svgalib_emulatepage && (mode!=G320x200x256) && - !(modeinfo->flags & (CAPABLE_LINEAR|LINEAR_USE))) + if (__svgalib_emulatepage && !(modeinfo->flags & CAPABLE_LINEAR)) return 0; return 1; @@ -2621,7 +2618,8 @@ size = VMEM; alloc_graph_buf(size); - if(__svgalib_modeinfo_linearset & LINEAR_USE) { + if((__svgalib_modeinfo_linearset & LINEAR_USE) && + (CM != G320x200x256)) { memcpy(graph_buf, LINEAR_POINTER, size); } else { page = 0; @@ -2642,6 +2640,7 @@ static void restorestate(void) { int i; + vga_modeinfo *modeinfo; vga_screenoff(); @@ -2656,7 +2655,13 @@ if(saved_linear) vga_setlinearaddressing(); - + + modeinfo = vga_getmodeinfo(CM); + if (__svgalib_emulatepage && (modeinfo->flags & CAPABLE_LINEAR) && + !(modeinfo->flags & LINEAR_USE)) { + __svgalib_driverspecs->linear(LINEAR_ENABLE, 0); + } + if (CM == G320x200x256 && VMEM <= 65536) { memcpy(GM, graph_buf, 65536); } else if (MODEX || CM == G800x600x16 || (STDVGAMODE(CM) && CM != G320x200x256)) { @@ -2715,7 +2720,8 @@ DPRINTF("Restoring %dK of video memory.\n", (size + 2) / 1024); - if(__svgalib_modeinfo_linearset & LINEAR_USE) { + if((__svgalib_modeinfo_linearset & LINEAR_USE) && + (CM != G320x200x256)) { memcpy(LINEAR_POINTER, graph_buf, size); } else { page = 0; @@ -4034,10 +4040,8 @@ /* we don't have /dev/mem available so we can't do runinbackground with the real banked mem, see if we do have an fd for the LFB and if it is ok to switch to emulating pages. */ - if ((__svgalib_linear_mem_fd != -1) && ( (CM == TEXT) || ( - ( (modeinfo->flags & CAPABLE_LINEAR) || - (modeinfo->flags & LINEAR_USE) ) && - (!STDVGAMODE(CM) || (CM == G320x200x256)) ))) { + if ((__svgalib_linear_mem_fd != -1) && ( (CM == TEXT) || + (modeinfo->flags & CAPABLE_LINEAR) ) ) { /* only do this if we are not already emulating pages */ if (!__svgalib_emulatepage) { @@ -4049,7 +4053,6 @@ if ((modeinfo->flags & CAPABLE_LINEAR) && !(modeinfo->flags & LINEAR_USE)) { __svgalib_driverspecs->linear(LINEAR_ENABLE, 0); - __svgalib_modeinfo_linearset |= IS_LINEAR; } } map_banked(MAP_FIXED); @@ -4087,10 +4090,8 @@ with the real banked mem, see if we do have an fd for the LFB and if it is ok to switch to emulating pages. */ modeinfo = vga_getmodeinfo(CM); - if ((__svgalib_linear_mem_fd != -1) && ( (CM == TEXT) || ( - ( (modeinfo->flags & CAPABLE_LINEAR) || - (modeinfo->flags & LINEAR_USE) ) && - (!STDVGAMODE(CM) || (CM == G320x200x256)) ))) + if ((__svgalib_linear_mem_fd != -1) && ( (CM == TEXT) || + (modeinfo->flags & CAPABLE_LINEAR) ) ) return 3; return 0; Only in svgalib-1.9.21/src: vga.c~ diff -ur svgalib-1.9.21.orig/src/vgamisc.c svgalib-1.9.21/src/vgamisc.c --- svgalib-1.9.21.orig/src/vgamisc.c 2005-08-05 18:17:09.000000000 +0200 +++ svgalib-1.9.21/src/vgamisc.c 2005-08-07 08:15:54.000000000 +0200 @@ -55,7 +55,7 @@ /* * The way IS_LINEAR gets indicated is rather convoluted; if the driver - * has EXT_INFO_AVAILABLE, setlinearaddressing will enable + * is CAPABLE_LINEAR, setlinearaddressing will enable * the flag in __svgalib_linearset which gets set in the modeinfo by * vga_getmodeinfo(). The driver must turn off the flag in * __svgalib_linearset if linear addressing gets disabled (e.g. when Only in svgalib-1.9.21/src: vgamisc.c~ diff -ur svgalib-1.9.21.orig/src/vgapix.c svgalib-1.9.21/src/vgapix.c --- svgalib-1.9.21.orig/src/vgapix.c 2005-08-05 18:17:09.000000000 +0200 +++ svgalib-1.9.21/src/vgapix.c 2005-08-07 09:10:54.000000000 +0200 @@ -45,7 +45,8 @@ case 1: offset = y * CI.xbytes + x; - if (__svgalib_modeinfo_linearset & LINEAR_USE ) { + if((__svgalib_modeinfo_linearset & LINEAR_USE) && + (CM != G320x200x256)) { *(LINEAR_POINTER+offset)=COL; } else { /* select segment */ @@ -144,7 +145,8 @@ return pix; case 1: offset = y * CI.xbytes + x; - if (__svgalib_modeinfo_linearset & LINEAR_USE ) { + if((__svgalib_modeinfo_linearset & LINEAR_USE) && + (CM != G320x200x256)) { return *(LINEAR_POINTER+offset); } /* select segment */ Only in svgalib-1.9.21/src: vgapix.c~ Index: svgalib-todo =================================================================== RCS file: /cvs/extras/rpms/svgalib/devel/svgalib-todo,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- svgalib-todo 5 Aug 2005 09:37:40 -0000 1.1 +++ svgalib-todo 7 Aug 2005 07:49:52 -0000 1.2 @@ -36,14 +36,33 @@ vga_runinbackgroundversion to determine if runinbackground is ok. -add fbdev_novga docs to libvga.config - - - +wip3: +-vga_getmodeinfo used to check for EXT_INFO_AVAILABLE in modeinfo.flags, + before adding __svgalib_modeinfo_linearset to modeinfo.flags. This seems wrong, + since lots of drivers don't set EXT_INFO_AVAILABLE but do support linear + just fine, so the check has been simplified to just checking for + CAPABLE_LINEAR . Otherwise a program could get/do: + -call getmodeinfo, see that mode is linear capable + -call setlinearaddressing, which indicates success + -call getmodeinfo again, still don't see the IS_LINEAR flag. +-in setmode don't set IS_LINEAR in __svgalib_modeinfo_linearset when enabling + LFB because of emulating page, although the LFB has been explicitly + enabled, this was not on the users request, so we mustnot return + LINEAR_POINTER, but GM in getgraphmem hence IS_LINEAR shouldnot be set. + And it is also not correct to report IS_LINEAR in getmodeinfo when not + explicitly requested. + (all this happened only for cards which need the LFB explicitly enabled). +-in restorestate enable linear mode when emulating pages on cards which + need it explictly enabled, checking saved_linear is no longer enough, + since we no longer set IS_LINEAR in this case unless explicitly requested + by the user. +-320x200x256 is linear because it fits within one page, but it should be + accessed through GM not through LINEAR_POINTER. Fix this in: vga.c & vgapix.c. +-Because of the above we cannot do 320x200x256 when emulating pages, + update vga_hasmode for this. todo: --check mode 5 (320x200x256, vgadriver, 146 works fine) and 145 - (400x300 modeX) with radeon. -VESA on x86_64 ?! cleanups: Index: svgalib.spec =================================================================== RCS file: /cvs/extras/rpms/svgalib/devel/svgalib.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- svgalib.spec 5 Aug 2005 17:51:41 -0000 1.3 +++ svgalib.spec 7 Aug 2005 07:49:52 -0000 1.4 @@ -1,6 +1,6 @@ Name: svgalib Version: 1.9.21 -Release: 3 +Release: 4 Exclusivearch: %{ix86} x86_64 Summary: Low-level fullscreen SVGA graphics library @@ -18,6 +18,7 @@ Patch6: svgalib-1.9.21-cfg.patch Patch7: svgalib-1.9.21-x86_64.patch Patch8: svgalib-1.9.21-ppc.patch +Patch9: svgalib-1.9.21-wip3.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Provides: libvga = %{version}-%{release} @@ -52,6 +53,7 @@ %patch7 -p1 -b .x86_64 %endif #%patch8 -p1 -b .ppc +%patch9 -p1 -b .wip3 #the testlinear demo needs svgalib's internal libvga header, so copy it to the #demo dir @@ -133,6 +135,10 @@ %{_mandir}/man3/* %changelog +* Sun Aug 7 2005 Hans de Goede 1.9.21-4 +- Add patch 9 which fixes 320x200x256(mode 5) on atleast radeons and probably + others too. + * Fri Aug 5 2005 Hans de Goede 1.9.21-3 - Add patch 8 to try to fix compilation on ppc. - PPC has issues with the use of iopl ioperm inb and outb From fedora-extras-commits at redhat.com Sun Aug 7 09:54:03 2005 From: fedora-extras-commits at redhat.com (Roland McGrath (roland)) Date: Sun, 7 Aug 2005 05:54:03 -0400 Subject: rpms/monotone/FC-4 monotone-0.21-xfail-if-root.patch, NONE, 1.1 monotone.spec, 1.2, 1.3 Message-ID: <200508070954.j779s3ng024143@cvs-int.fedora.redhat.com> Author: roland Update of /cvs/extras/rpms/monotone/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24122 Modified Files: monotone.spec Added Files: monotone-0.21-xfail-if-root.patch Log Message: Work around non-root build user owning / in mock chroot builds. monotone-0.21-xfail-if-root.patch: --- NEW FILE monotone-0.21-xfail-if-root.patch --- --- monotone-0.21/tests/t_checkout_dir.at +++ monotone-0.21/tests/t_checkout_dir.at @@ -16,7 +16,7 @@ AT_CHECK(MONOTONE --branch=testbranch ch mkdir test_dir3 chmod 444 test_dir3 # XFAIL if run as root (hi Gentoo!) -AT_XFAIL_IF(test -O /) +AT_XFAIL_IF(test -O /usr) AT_CHECK(MONOTONE --branch=testbranch checkout test_dir3, [1], [ignore], [ignore]) AT_CHECK(MONOTONE --branch=testbranch checkout test_dir3/subdir, --- monotone-0.21/testsuite +++ monotone-0.21/testsuite @@ -67905,7 +67905,7 @@ $at_traceon at_desc='checkout validates target directory' $at_quiet $ECHO_N " 64: checkout validates target directory $ECHO_C" at_xfail=no - test -O / && at_xfail=yes + test -O /usr && at_xfail=yes ( echo "64. t_checkout_dir.at:1: testing ..." $at_traceon Index: monotone.spec =================================================================== RCS file: /cvs/extras/rpms/monotone/FC-4/monotone.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- monotone.spec 27 Jul 2005 19:38:53 -0000 1.2 +++ monotone.spec 7 Aug 2005 09:54:01 -0000 1.3 @@ -1,6 +1,6 @@ Name: monotone Version: 0.21 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A free, distributed version control system Group: Development/Tools @@ -9,6 +9,8 @@ URL: http://www.venge.net/monotone/ Source0: http://www.venge.net/monotone/downloads/%{name}-%{version}.tar.gz +Patch1: monotone-0.21-xfail-if-root.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: boost-devel >= 1.32.0 @@ -24,6 +26,7 @@ # The test suite needs cvs. BuildRequires: cvs +# We need Emacs to byte-compile the Emacs Lisp code. BuildRequires: emacs Requires(post): /sbin/install-info @@ -41,6 +44,8 @@ %prep %setup -q +%patch1 -p1 + %build %configure --with-bundled-lua=no --with-bundled-sqlite=%{bundled_sqlite} make %{?_smp_mflags} @@ -84,6 +89,9 @@ %{_datadir}/emacs/site-lisp/monotone*.el* %changelog +* Sun Aug 7 2005 Roland McGrath - 0.21-3 +- Work around non-root build user owning / in mock chroot builds. + * Wed Jul 27 2005 Roland McGrath - 0.21-2 - Include monotone-nav.el too. - Add BuildRequires on cvs so the test suite can run. From fedora-extras-commits at redhat.com Sun Aug 7 09:55:04 2005 From: fedora-extras-commits at redhat.com (Roland McGrath (roland)) Date: Sun, 7 Aug 2005 05:55:04 -0400 Subject: common tobuild,1.2191,1.2192 Message-ID: <200508070955.j779t4lj024205@cvs-int.fedora.redhat.com> Author: roland Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24188 Modified Files: tobuild Log Message: request build of rpms/monotone/FC-4 monotone-0_21-3_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2191 retrieving revision 1.2192 diff -u -r1.2191 -r1.2192 --- tobuild 5 Aug 2005 20:51:08 -0000 1.2191 +++ tobuild 7 Aug 2005 09:55:02 -0000 1.2192 @@ -27,3 +27,4 @@ anvil rpms/galeon/FC-4 galeon-1_3_21-12_fc4 fc4 gemi rpms/unison/FC-3 unison-2_12_0-1_fc3 fc3 wtogami rpms/perl-Razor-Agent/devel perl-Razor-Agent-2_75-1_fc5 devel +roland rpms/monotone/FC-4 monotone-0_21-3_fc4 fc4 From fedora-extras-commits at redhat.com Sun Aug 7 10:06:42 2005 From: fedora-extras-commits at redhat.com (Roland McGrath (roland)) Date: Sun, 7 Aug 2005 06:06:42 -0400 Subject: rpms/monotone/devel monotone-0.21-xfail-if-root.patch, NONE, 1.1 monotone.spec, 1.2, 1.3 Message-ID: <200508071006.j77A6gwW025431@cvs-int.fedora.redhat.com> Author: roland Update of /cvs/extras/rpms/monotone/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25411 Modified Files: monotone.spec Added Files: monotone-0.21-xfail-if-root.patch Log Message: Work around non-root build user owning / in mock chroot builds. monotone-0.21-xfail-if-root.patch: --- NEW FILE monotone-0.21-xfail-if-root.patch --- --- monotone-0.21/tests/t_checkout_dir.at +++ monotone-0.21/tests/t_checkout_dir.at @@ -16,7 +16,7 @@ AT_CHECK(MONOTONE --branch=testbranch ch mkdir test_dir3 chmod 444 test_dir3 # XFAIL if run as root (hi Gentoo!) -AT_XFAIL_IF(test -O /) +AT_XFAIL_IF(test -O /usr) AT_CHECK(MONOTONE --branch=testbranch checkout test_dir3, [1], [ignore], [ignore]) AT_CHECK(MONOTONE --branch=testbranch checkout test_dir3/subdir, --- monotone-0.21/testsuite +++ monotone-0.21/testsuite @@ -67905,7 +67905,7 @@ $at_traceon at_desc='checkout validates target directory' $at_quiet $ECHO_N " 64: checkout validates target directory $ECHO_C" at_xfail=no - test -O / && at_xfail=yes + test -O /usr && at_xfail=yes ( echo "64. t_checkout_dir.at:1: testing ..." $at_traceon Index: monotone.spec =================================================================== RCS file: /cvs/extras/rpms/monotone/devel/monotone.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- monotone.spec 27 Jul 2005 19:38:53 -0000 1.2 +++ monotone.spec 7 Aug 2005 10:06:40 -0000 1.3 @@ -1,6 +1,6 @@ Name: monotone Version: 0.21 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A free, distributed version control system Group: Development/Tools @@ -9,6 +9,8 @@ URL: http://www.venge.net/monotone/ Source0: http://www.venge.net/monotone/downloads/%{name}-%{version}.tar.gz +Patch1: monotone-0.21-xfail-if-root.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: boost-devel >= 1.32.0 @@ -24,6 +26,7 @@ # The test suite needs cvs. BuildRequires: cvs +# We need Emacs to byte-compile the Emacs Lisp code. BuildRequires: emacs Requires(post): /sbin/install-info @@ -41,6 +44,8 @@ %prep %setup -q +%patch1 -p1 + %build %configure --with-bundled-lua=no --with-bundled-sqlite=%{bundled_sqlite} make %{?_smp_mflags} @@ -84,6 +89,9 @@ %{_datadir}/emacs/site-lisp/monotone*.el* %changelog +* Sun Aug 7 2005 Roland McGrath - 0.21-3 +- Work around non-root build user owning / in mock chroot builds. + * Wed Jul 27 2005 Roland McGrath - 0.21-2 - Include monotone-nav.el too. - Add BuildRequires on cvs so the test suite can run. From fedora-extras-commits at redhat.com Sun Aug 7 10:14:58 2005 From: fedora-extras-commits at redhat.com (Roland McGrath (roland)) Date: Sun, 7 Aug 2005 06:14:58 -0400 Subject: common tobuild,1.2192,1.2193 Message-ID: <200508071014.j77AEw3x025543@cvs-int.fedora.redhat.com> Author: roland Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25526 Modified Files: tobuild Log Message: revert Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2192 retrieving revision 1.2193 diff -u -r1.2192 -r1.2193 --- tobuild 7 Aug 2005 09:55:02 -0000 1.2192 +++ tobuild 7 Aug 2005 10:14:55 -0000 1.2193 @@ -27,4 +27,3 @@ anvil rpms/galeon/FC-4 galeon-1_3_21-12_fc4 fc4 gemi rpms/unison/FC-3 unison-2_12_0-1_fc3 fc3 wtogami rpms/perl-Razor-Agent/devel perl-Razor-Agent-2_75-1_fc5 devel -roland rpms/monotone/FC-4 monotone-0_21-3_fc4 fc4 From fedora-extras-commits at redhat.com Sun Aug 7 10:27:19 2005 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Sun, 7 Aug 2005 06:27:19 -0400 Subject: rpms/spamass-milter/FC-4 spamass-milter-wrapper, NONE, 1.1 spamass-milter.spec, 1.4, 1.5 Message-ID: <200508071027.j77ARJXu025589@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/spamass-milter/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25571 Modified Files: spamass-milter.spec Added Files: spamass-milter-wrapper Log Message: resync with devel --- NEW FILE spamass-milter-wrapper --- #!/bin/bash # # spamass-milter-wrapper - wrapper script for spamass-milter # # This script backgrounds itself and then runs spamass-milter in a loop. # If the daemon exits then the script restarts it automatically. # wrapper_dir=$(dirname "$0") daemon=spamass-milter ( while : do # start the daemon in the foreground $wrapper_dir/$daemon "$@" milter_status=$? milter_date=$(date) # exit if we're shutting down [ -f /etc/nologin ] && exit sleep 1 # exit if we're deliberately stopped [ ! -f /var/lock/subsys/spamass-milter ] && exit # otherwise, send a notification about the daemon crash # and then restart sleep 9 ( echo "$daemon exited at $milter_date with status $milter_status" echo "You may wish to check /var/log/messages and/or /var/log/maillog" ) | mail -s "$daemon on `hostname` restarted" root done ) >& /dev/null & disown -ar Index: spamass-milter.spec =================================================================== RCS file: /cvs/extras/rpms/spamass-milter/FC-4/spamass-milter.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- spamass-milter.spec 16 Jun 2005 12:52:54 -0000 1.4 +++ spamass-milter.spec 7 Aug 2005 10:27:16 -0000 1.5 @@ -1,12 +1,13 @@ Summary: Sendmail milter for spamassassin Name: spamass-milter Version: 0.3.0 -Release: 7%{?dist} +Release: 8%{?dist} License: GPL Group: System Environment/Daemons URL: http://savannah.nongnu.org/projects/spamass-milt/ -Source: http://savannah.nongnu.org/download/spamass-milt/spamass-milter-%{version}.tar.gz +Source0: http://savannah.nongnu.org/download/spamass-milt/spamass-milter-%{version}.tar.gz +Source1: spamass-milter-wrapper BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: spamassassin, sendmail-devel @@ -26,16 +27,21 @@ %prep %setup -q +%{__cp} %{SOURCE1} . %{__sed} -i -e 's at local:/var/run/sendmail/spamass.sock at unix:/var/run/spamass-milter/spamass-milter.sock@' README %{__cat} <spamass-milter.sysconfig ### Override for your different local config #SOCKET=%{_localstatedir}/run/spamass-milter/spamass-milter.sock -### Default parameters for spamass-milter are: -### -f (work in the background) +### Standard parameters for spamass-milter are: ### -P %{_localstatedir}/run/spamass-milter.pid (PID file) -### you may add another parameters here, see spamass-milter(1) +### +### Note that the -f parameter for running the milter in the background +### is not required because the milter runs in a wrapper script that +### backgrounds itself +### +### You may add another parameters here, see spamass-milter(1) #EXTRA_FLAGS="-m -r 15" EOF @@ -77,7 +83,7 @@ echo -n $"Starting $desc ($prog): " touch $pidfile chown sa-milt:sa-milt $pidfile - daemon --user sa-milt %{_sbindir}/$prog -p $SOCKET -P $pidfile -f $EXTRA_FLAGS + daemon --user sa-milt %{_sbindir}/${prog}-wrapper -p $SOCKET -P $pidfile $EXTRA_FLAGS RETVAL=$? echo [ $RETVAL -eq 0 ] && touch %{_localstatedir}/lock/subsys/spamass-milter @@ -96,6 +102,7 @@ restart() { stop + sleep 2 start } @@ -137,6 +144,7 @@ %{__install} -D -m0755 spamass-milter.sysv %{buildroot}%{_initrddir}/spamass-milter %{__install} -D -m0644 spamass-milter.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/spamass-milter %{__install} -d -m0700 %{buildroot}%{_localstatedir}/run/spamass-milter +%{__install} -m0755 spamass-milter-wrapper %{buildroot}%{_sbindir}/spamass-milter-wrapper %pre %{_sbindir}/useradd -r -s /sbin/nologin -d %{_localstatedir}/run/spamass-milter \ @@ -160,26 +168,30 @@ %files %defattr(-, root, root, 0755) %doc AUTHORS ChangeLog NEWS README -%doc %{_mandir}/man1/spamass-milter.1* +%{_mandir}/man1/spamass-milter.1* %config(noreplace) %{_sysconfdir}/sysconfig/spamass-milter %{_initrddir}/spamass-milter %{_sbindir}/spamass-milter +%{_sbindir}/spamass-milter-wrapper %dir %attr(-,sa-milt,sa-milt) %{_localstatedir}/run/spamass-milter %changelog -* Thu Jun 16 2005 Paul Howarth - 0.3.0-7%{?dist} +* Mon Aug 1 2005 Paul Howarth - 0.3.0-8 +- Run the milter in a wrapper script that restarts it if it scrashes + +* Thu Jun 16 2005 Paul Howarth - 0.3.0-7 - Bump and rebuild due to transient build system failure -* Wed Jun 15 2005 Paul Howarth - 0.3.0-6%{?dist} +* Wed Jun 15 2005 Paul Howarth - 0.3.0-6 - Adjust initscript chkconfig values so it starts before sendmail -* Mon Jun 13 2005 Paul Howarth - 0.3.0-5%{?dist} +* Mon Jun 13 2005 Paul Howarth - 0.3.0-5 - Help the configure script find sendmail -* Mon Jun 13 2005 Paul Howarth - 0.3.0-4%{?dist} +* Mon Jun 13 2005 Paul Howarth - 0.3.0-4 - Bump and rebuild -* Mon Jun 06 2005 Paul Howarth - 0.3.0-3%{?dist} +* Mon Jun 06 2005 Paul Howarth - 0.3.0-3 - Use Extras standard buildroot - Unpack tarball quietly - Create account sa-milt and run the milter using that instead of root From fedora-extras-commits at redhat.com Sun Aug 7 10:28:42 2005 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Sun, 7 Aug 2005 06:28:42 -0400 Subject: rpms/spamass-milter/FC-3 spamass-milter-wrapper, NONE, 1.1 spamass-milter.spec, 1.4, 1.5 Message-ID: <200508071028.j77ASgY0025656@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/spamass-milter/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25638 Modified Files: spamass-milter.spec Added Files: spamass-milter-wrapper Log Message: resync with devel --- NEW FILE spamass-milter-wrapper --- #!/bin/bash # # spamass-milter-wrapper - wrapper script for spamass-milter # # This script backgrounds itself and then runs spamass-milter in a loop. # If the daemon exits then the script restarts it automatically. # wrapper_dir=$(dirname "$0") daemon=spamass-milter ( while : do # start the daemon in the foreground $wrapper_dir/$daemon "$@" milter_status=$? milter_date=$(date) # exit if we're shutting down [ -f /etc/nologin ] && exit sleep 1 # exit if we're deliberately stopped [ ! -f /var/lock/subsys/spamass-milter ] && exit # otherwise, send a notification about the daemon crash # and then restart sleep 9 ( echo "$daemon exited at $milter_date with status $milter_status" echo "You may wish to check /var/log/messages and/or /var/log/maillog" ) | mail -s "$daemon on `hostname` restarted" root done ) >& /dev/null & disown -ar Index: spamass-milter.spec =================================================================== RCS file: /cvs/extras/rpms/spamass-milter/FC-3/spamass-milter.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- spamass-milter.spec 15 Jun 2005 09:10:51 -0000 1.4 +++ spamass-milter.spec 7 Aug 2005 10:28:40 -0000 1.5 @@ -1,12 +1,13 @@ Summary: Sendmail milter for spamassassin Name: spamass-milter Version: 0.3.0 -Release: 6%{?dist} +Release: 8%{?dist} License: GPL Group: System Environment/Daemons URL: http://savannah.nongnu.org/projects/spamass-milt/ -Source: http://savannah.nongnu.org/download/spamass-milt/spamass-milter-%{version}.tar.gz +Source0: http://savannah.nongnu.org/download/spamass-milt/spamass-milter-%{version}.tar.gz +Source1: spamass-milter-wrapper BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: spamassassin, sendmail-devel @@ -26,16 +27,21 @@ %prep %setup -q +%{__cp} %{SOURCE1} . %{__sed} -i -e 's at local:/var/run/sendmail/spamass.sock at unix:/var/run/spamass-milter/spamass-milter.sock@' README %{__cat} <spamass-milter.sysconfig ### Override for your different local config #SOCKET=%{_localstatedir}/run/spamass-milter/spamass-milter.sock -### Default parameters for spamass-milter are: -### -f (work in the background) +### Standard parameters for spamass-milter are: ### -P %{_localstatedir}/run/spamass-milter.pid (PID file) -### you may add another parameters here, see spamass-milter(1) +### +### Note that the -f parameter for running the milter in the background +### is not required because the milter runs in a wrapper script that +### backgrounds itself +### +### You may add another parameters here, see spamass-milter(1) #EXTRA_FLAGS="-m -r 15" EOF @@ -77,7 +83,7 @@ echo -n $"Starting $desc ($prog): " touch $pidfile chown sa-milt:sa-milt $pidfile - daemon --user sa-milt %{_sbindir}/$prog -p $SOCKET -P $pidfile -f $EXTRA_FLAGS + daemon --user sa-milt %{_sbindir}/${prog}-wrapper -p $SOCKET -P $pidfile $EXTRA_FLAGS RETVAL=$? echo [ $RETVAL -eq 0 ] && touch %{_localstatedir}/lock/subsys/spamass-milter @@ -96,6 +102,7 @@ restart() { stop + sleep 2 start } @@ -137,6 +144,7 @@ %{__install} -D -m0755 spamass-milter.sysv %{buildroot}%{_initrddir}/spamass-milter %{__install} -D -m0644 spamass-milter.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/spamass-milter %{__install} -d -m0700 %{buildroot}%{_localstatedir}/run/spamass-milter +%{__install} -m0755 spamass-milter-wrapper %{buildroot}%{_sbindir}/spamass-milter-wrapper %pre %{_sbindir}/useradd -r -s /sbin/nologin -d %{_localstatedir}/run/spamass-milter \ @@ -160,23 +168,30 @@ %files %defattr(-, root, root, 0755) %doc AUTHORS ChangeLog NEWS README -%doc %{_mandir}/man1/spamass-milter.1* +%{_mandir}/man1/spamass-milter.1* %config(noreplace) %{_sysconfdir}/sysconfig/spamass-milter %{_initrddir}/spamass-milter %{_sbindir}/spamass-milter +%{_sbindir}/spamass-milter-wrapper %dir %attr(-,sa-milt,sa-milt) %{_localstatedir}/run/spamass-milter %changelog -* Wed Jun 15 2005 Paul Howarth - 0.3.0-6%{?dist} +* Mon Aug 1 2005 Paul Howarth - 0.3.0-8 +- Run the milter in a wrapper script that restarts it if it scrashes + +* Thu Jun 16 2005 Paul Howarth - 0.3.0-7 +- Bump and rebuild due to transient build system failure + +* Wed Jun 15 2005 Paul Howarth - 0.3.0-6 - Adjust initscript chkconfig values so it starts before sendmail -* Mon Jun 13 2005 Paul Howarth - 0.3.0-5%{?dist} +* Mon Jun 13 2005 Paul Howarth - 0.3.0-5 - Help the configure script find sendmail -* Mon Jun 13 2005 Paul Howarth - 0.3.0-4%{?dist} +* Mon Jun 13 2005 Paul Howarth - 0.3.0-4 - Bump and rebuild -* Mon Jun 06 2005 Paul Howarth - 0.3.0-3%{?dist} +* Mon Jun 06 2005 Paul Howarth - 0.3.0-3 - Use Extras standard buildroot - Unpack tarball quietly - Create account sa-milt and run the milter using that instead of root From fedora-extras-commits at redhat.com Sun Aug 7 15:40:02 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sun, 7 Aug 2005 11:40:02 -0400 Subject: extras-buildsys/www/template head.psp,1.7,1.8 Message-ID: <200508071540.j77Fe217031952@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/www/template In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31935/www/template Modified Files: head.psp Log Message: Use build system name as page title too Index: head.psp =================================================================== RCS file: /cvs/fedora/extras-buildsys/www/template/head.psp,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- head.psp 6 Aug 2005 16:25:06 -0000 1.7 +++ head.psp 7 Aug 2005 15:40:00 -0000 1.8 @@ -41,7 +41,7 @@ - Fedora Extras Build System + <%=config_opts['system_name']%> From fedora-extras-commits at redhat.com Mon Aug 8 02:54:18 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sun, 7 Aug 2005 22:54:18 -0400 Subject: extras-buildsys/client client.py,1.25,1.26 Message-ID: <200508080254.j782sInA017185@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/client In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17109/client Modified Files: client.py Log Message: 2005-08-07 Dan Williams Play nicely when running more than one builder instance on the same machine. * builder/builder.py - Try to delete actual mock work dir rather than just the buildroot * client/client.py - Prettier printing of job detail command output - Show builder port numbers * server/ArchJob.py - Save builder port number * server/BuildMaster.py - Add a builder port # to the archjobs table, and save builder port # when writing archjob status to the DB * server/Builder.py - (to_dict): return builder port # too * server/BuilderManager.py - Don't exit when adding new builders that have wrong connection protocol, just ignore them * server/UserInterface.py - Retrieve and return builder port numbers too * www/builders.psp - Differentiate builders and their jobs by port # - Only show building archjobs, not 'downloading' or 'downloaded' ones * www/job.psp - Show builder port numbers Index: client.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/client/client.py,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- client.py 6 Aug 2005 02:35:06 -0000 1.25 +++ client.py 8 Aug 2005 02:54:15 -0000 1.26 @@ -173,9 +173,20 @@ return if err == -1: print msg - else: - print jobrec + return + print "\nDetail for Job ID %d (%s):" % (int(jobrec['uid']), jobrec['package']) + print "-" * 80 + print "Source: %s" % jobrec['source'] + print "Target: %s" % jobrec['target'] + print "Submitter: %s" % jobrec['username'] + print "Status: %s/%s" % (jobrec['status'], jobrec['result']) + + print "Archjobs:" + for aj in jobrec['archjobs']: + print " %s: %s %s/%s" % (aj['arch'], aj['builder_addr'], aj['status'], aj['builder_status']) + + print "" def kill(server, email, jobid): """ @@ -195,8 +206,9 @@ print "\nBuilders:" print "-" * 90 for builder in builder_list: - string = " " + builder['address'] - string = string + " " * (40 - len(builder['address'])) + builder_addr = builder['address'] + ":" + builder['port'] + string = " " + builder_addr + string = string + " " * (40 - len(builder_addr)) for arch in builder['arches']: string = string + arch + " " string = string + " " + builder['status'] @@ -362,6 +374,9 @@ sys.exit(1) if cmd == 'build': + if len(sys.argv) < 5: + Usage() + exit(1) item = sys.argv[3] try: if item.endswith(".src.rpm") and os.path.exists(item): From fedora-extras-commits at redhat.com Mon Aug 8 02:54:18 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sun, 7 Aug 2005 22:54:18 -0400 Subject: extras-buildsys/server ArchJob.py, 1.9, 1.10 BuildMaster.py, 1.29, 1.30 Builder.py, 1.10, 1.11 BuilderManager.py, 1.10, 1.11 UserInterface.py, 1.43, 1.44 Message-ID: <200508080254.j782sIIX017193@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17109/server Modified Files: ArchJob.py BuildMaster.py Builder.py BuilderManager.py UserInterface.py Log Message: 2005-08-07 Dan Williams Play nicely when running more than one builder instance on the same machine. * builder/builder.py - Try to delete actual mock work dir rather than just the buildroot * client/client.py - Prettier printing of job detail command output - Show builder port numbers * server/ArchJob.py - Save builder port number * server/BuildMaster.py - Add a builder port # to the archjobs table, and save builder port # when writing archjob status to the DB * server/Builder.py - (to_dict): return builder port # too * server/BuilderManager.py - Don't exit when adding new builders that have wrong connection protocol, just ignore them * server/UserInterface.py - Retrieve and return builder port numbers too * www/builders.psp - Differentiate builders and their jobs by port # - Only show building archjobs, not 'downloading' or 'downloaded' ones * www/job.psp - Show builder port numbers Index: ArchJob.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/ArchJob.py,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- ArchJob.py 6 Aug 2005 02:35:07 -0000 1.9 +++ ArchJob.py 8 Aug 2005 02:54:16 -0000 1.10 @@ -84,6 +84,7 @@ host_port, path = urllib.splithost(addr) host, port = urllib.splitport(host_port) attrdict['builder_addr'] = host + attrdict['builder_port'] = port attrdict['status'] = self.status attrdict['builder_status'] = self.builder_status attrdict['starttime'] = self.starttime Index: BuildMaster.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/BuildMaster.py,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- BuildMaster.py 6 Aug 2005 17:58:34 -0000 1.29 +++ BuildMaster.py 8 Aug 2005 02:54:16 -0000 1.30 @@ -82,6 +82,7 @@ 'endtime BIGINT, ' \ 'arch VARCHAR(15), ' \ 'builder_addr VARCHAR(100), ' \ + 'builder_port VARCHAR(6), ' \ 'status VARCHAR(15), ' \ 'builder_status VARCHAR(15)' \ ')') @@ -321,9 +322,12 @@ self.dbcx.commit() if len(self.curs.fetchall()) == 0: try: - self.curs.execute('INSERT INTO archjobs (jobid, parent_uid, starttime, endtime, arch, builder_addr, status, builder_status) ' \ - 'VALUES ("%s", %d, %d, %d, "%s", "%s", "%s", "%s")' % (uid, attrdict['parent_uid'], attrdict['starttime'], attrdict['endtime'], \ - attrdict['arch'], attrdict['builder_addr'], attrdict['status'], attrdict['builder_status'])) + self.curs.execute('INSERT INTO archjobs (jobid, parent_uid, starttime, ' \ + 'endtime, arch, builder_addr, builder_port, status, builder_status) ' \ + 'VALUES ("%s", %d, %d, %d, "%s", "%s", "%s", "%s", "%s")' % (uid, attrdict['parent_uid'], \ + attrdict['starttime'], attrdict['endtime'], attrdict['arch'], \ + attrdict['builder_addr'], attrdict['builder_port'], attrdict['status'], \ + attrdict['builder_status'])) except sqlite.OperationalError, e: print "DB Error: could not access jobs database. Reason: '%s'" % e else: Index: Builder.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/Builder.py,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- Builder.py 6 Aug 2005 02:35:07 -0000 1.10 +++ Builder.py 8 Aug 2005 02:54:16 -0000 1.11 @@ -20,6 +20,7 @@ import sys import socket import os +import urllib import threading from plague import XMLRPCServerProxy from plague import CommonErrors @@ -261,7 +262,18 @@ def to_dict(self): builder_dict = {} - builder_dict['address'] = self._address + + addr = self._address + # for some reason, splithost doesn't like the protocol + # method, you have to give it a string starting with "//" + if addr.startswith("http"): + idx = addr.find('//') + addr = addr[idx:] + host_port, path = urllib.splithost(addr) + host, port = urllib.splitport(host_port) + builder_dict['address'] = host + builder_dict['port'] = port + arches = [] for target in self._target_arches.keys(): for arch in self._target_arches[target]: Index: BuilderManager.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/BuilderManager.py,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- BuilderManager.py 6 Aug 2005 02:35:07 -0000 1.10 +++ BuilderManager.py 8 Aug 2005 02:54:16 -0000 1.11 @@ -83,10 +83,10 @@ # If the address is "https" but we aren't set up for SSL, exit if address.startswith('https') and not config_opts['ssl_builders']: print "Builder address (%s) starts with 'https', but the 'ssl_builders' option is set to False." % address - os._exit(1) + continue elif address.startswith('http:') and config_opts['ssl_builders']: print "Builder address (%s) starts with 'http', but the 'ssl_builders' option is set to True." % address - os._exit(1) + continue # If the address is already in our _builders list, skip it skip = False Index: UserInterface.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/UserInterface.py,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- UserInterface.py 6 Aug 2005 02:35:07 -0000 1.43 +++ UserInterface.py 8 Aug 2005 02:54:16 -0000 1.44 @@ -365,7 +365,8 @@ # Get all archjobs for this job if len(uids) > 0: - sql = "SELECT jobid, parent_uid, starttime, endtime, arch, builder_addr, status, builder_status FROM archjobs WHERE " + uids + sql = "SELECT jobid, parent_uid, starttime, endtime, arch, builder_addr, " \ + "builder_port, status, builder_status FROM archjobs WHERE " + uids curs.execute(sql) data = curs.fetchall() for row in data: @@ -376,6 +377,7 @@ ajrec['endtime'] = row['endtime'] ajrec['arch'] = row['arch'] ajrec['builder_addr'] = row['builder_addr'] + ajrec['builder_port'] = row['builder_port'] ajrec['status'] = row['status'] ajrec['builder_status'] = row['builder_status'] for job in jobs: @@ -428,8 +430,8 @@ jobrec['archjobs'] = [] # Get all archjobs for this job - sql = "SELECT jobid, parent_uid, starttime, endtime, arch, builder_addr, status, " \ - "builder_status FROM archjobs WHERE parent_uid=%d " % uid + sql = "SELECT jobid, parent_uid, starttime, endtime, arch, builder_addr, builder_port, " \ + "status, builder_status FROM archjobs WHERE parent_uid=%d " % uid curs.execute(sql) data = curs.fetchall() for row in data: @@ -440,6 +442,7 @@ ajrec['endtime'] = row['endtime'] ajrec['arch'] = row['arch'] ajrec['builder_addr'] = row['builder_addr'] + ajrec['builder_port'] = row['builder_port'] ajrec['status'] = row['status'] ajrec['builder_status'] = row['builder_status'] jobrec['archjobs'].append(ajrec) From fedora-extras-commits at redhat.com Mon Aug 8 02:54:19 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sun, 7 Aug 2005 22:54:19 -0400 Subject: extras-buildsys/www builders.psp,1.5,1.6 job.psp,1.8,1.9 Message-ID: <200508080254.j782sJRp017202@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/www In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17109/www Modified Files: builders.psp job.psp Log Message: 2005-08-07 Dan Williams Play nicely when running more than one builder instance on the same machine. * builder/builder.py - Try to delete actual mock work dir rather than just the buildroot * client/client.py - Prettier printing of job detail command output - Show builder port numbers * server/ArchJob.py - Save builder port number * server/BuildMaster.py - Add a builder port # to the archjobs table, and save builder port # when writing archjob status to the DB * server/Builder.py - (to_dict): return builder port # too * server/BuilderManager.py - Don't exit when adding new builders that have wrong connection protocol, just ignore them * server/UserInterface.py - Retrieve and return builder port numbers too * www/builders.psp - Differentiate builders and their jobs by port # - Only show building archjobs, not 'downloading' or 'downloaded' ones * www/job.psp - Show builder port numbers Index: builders.psp =================================================================== RCS file: /cvs/fedora/extras-buildsys/www/builders.psp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- builders.psp 4 Aug 2005 20:27:12 -0000 1.5 +++ builders.psp 8 Aug 2005 02:54:16 -0000 1.6 @@ -32,11 +32,6 @@ <% else: for builder in builders: - import urllib - type, rest = urllib.splittype(builder['address']) - addr, port = urllib.splitport(rest) - addr = addr[2:] - arch_list = "" for arch in builder['arches']: arch_list = arch_list + arch @@ -54,7 +49,7 @@ @@ -62,11 +57,13 @@ <% bjob = None for job in jobs: - archjobs = job['archjobs'] - if not archjobs: + if not job['archjobs']: continue - for aj in archjobs: - if aj['builder_addr'] == addr: + for aj in job['archjobs']: + # Only show actually building archjobs + if aj['status'] == 'downloading' or aj['status'] == 'downloaded': + continue + if aj['builder_addr'] == builder['address'] and aj['builder_port'] == builder['port']: joblink = job_link(job['uid']) if aj['status'] != 'done': %> Index: job.psp =================================================================== RCS file: /cvs/fedora/extras-buildsys/www/job.psp,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- job.psp 6 Aug 2005 16:25:05 -0000 1.8 +++ job.psp 8 Aug 2005 02:54:16 -0000 1.9 @@ -91,7 +91,7 @@ - +

<%=str(job['uid'])%>: <%=title%>  (<%=job['status']%>)

Target: <%=str(job['target'])%>
Submitter: <%=str(job['username'])%>
Submitter: <%=despam_user(job['username'])%>

Source: <%=str(job['source'])%>

Started: <%=str(time.ctime(job['starttime']))%>
<%=job['uid']%> <%=job['uid']%> <%=job['package']%> <%=source%> <%=job['status']%> <%=job['target']%> <%=despam_user%> <%=despam_user(job['username'])%>
- ><%=addr%>  (<%=builder['status']%>)
+ ><%=builder['address']%>:<%=builder['port']%>  (<%=builder['status']%>)
<%=arch_list%>
<%=aj['arch']%>: <%=aj['builder_addr']%> <%=aj['builder_addr']%>:<%=aj['builder_port']%> Status: <%=aj['status']%>/<%=aj['builder_status']%> From fedora-extras-commits at redhat.com Mon Aug 8 02:54:11 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sun, 7 Aug 2005 22:54:11 -0400 Subject: extras-buildsys ChangeLog,1.91,1.92 Message-ID: <200508080254.j782sfEe017205@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17109 Modified Files: ChangeLog Log Message: 2005-08-07 Dan Williams Play nicely when running more than one builder instance on the same machine. * builder/builder.py - Try to delete actual mock work dir rather than just the buildroot * client/client.py - Prettier printing of job detail command output - Show builder port numbers * server/ArchJob.py - Save builder port number * server/BuildMaster.py - Add a builder port # to the archjobs table, and save builder port # when writing archjob status to the DB * server/Builder.py - (to_dict): return builder port # too * server/BuilderManager.py - Don't exit when adding new builders that have wrong connection protocol, just ignore them * server/UserInterface.py - Retrieve and return builder port numbers too * www/builders.psp - Differentiate builders and their jobs by port # - Only show building archjobs, not 'downloading' or 'downloaded' ones * www/job.psp - Show builder port numbers Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.91 retrieving revision 1.92 diff -u -r1.91 -r1.92 --- ChangeLog 6 Aug 2005 02:35:06 -0000 1.91 +++ ChangeLog 8 Aug 2005 02:54:09 -0000 1.92 @@ -1,3 +1,36 @@ +2005-08-07 Dan Williams + + * builder/builder.py + - Try to delete actual mock work dir rather than just the buildroot + + * client/client.py + - Prettier printing of job detail command output + - Show builder port numbers + + * server/ArchJob.py + - Save builder port number + + * server/BuildMaster.py + - Add a builder port # to the archjobs table, and save builder port # + when writing archjob status to the DB + + * server/Builder.py + - (to_dict): return builder port # too + + * server/BuilderManager.py + - Don't exit when adding new builders that have wrong connection + protocol, just ignore them + + * server/UserInterface.py + - Retrieve and return builder port numbers too + + * www/builders.psp + - Differentiate builders and their jobs by port # + - Only show building archjobs, not 'downloading' or 'downloaded' ones + + * www/job.psp + - Show builder port numbers + 2005-08-05 Dan Williams * Rework builder tracking code to always keep Builder objects around, and From fedora-extras-commits at redhat.com Mon Aug 8 02:54:12 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sun, 7 Aug 2005 22:54:12 -0400 Subject: extras-buildsys/builder builder.py,1.29,1.30 Message-ID: <200508080254.j782sgXn017208@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/builder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17109/builder Modified Files: builder.py Log Message: 2005-08-07 Dan Williams Play nicely when running more than one builder instance on the same machine. * builder/builder.py - Try to delete actual mock work dir rather than just the buildroot * client/client.py - Prettier printing of job detail command output - Show builder port numbers * server/ArchJob.py - Save builder port number * server/BuildMaster.py - Add a builder port # to the archjobs table, and save builder port # when writing archjob status to the DB * server/Builder.py - (to_dict): return builder port # too * server/BuilderManager.py - Don't exit when adding new builders that have wrong connection protocol, just ignore them * server/UserInterface.py - Retrieve and return builder port numbers too * www/builders.psp - Differentiate builders and their jobs by port # - Only show building archjobs, not 'downloading' or 'downloaded' ones * www/job.psp - Show builder port numbers Index: builder.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/builder/builder.py,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- builder.py 5 Aug 2005 19:24:49 -0000 1.29 +++ builder.py 8 Aug 2005 02:54:10 -0000 1.30 @@ -358,11 +358,17 @@ if exit_status >= 0: # We ignore mock errors when cleaning the buildroot self._status = self._done_status - # FIXME: remove the last dir off the end of 'rootdir' here to get - # the real basedir and kill it. At least what's here removes the - # buildroot which is where most of the space is used - if self._mock_config and self._mock_config.has_key('rootdir'): - shutil.rmtree(self._mock_config['rootdir'], ignore_errors=True) + if self._mock_config and self._mock_config.has_key('rootdir') and self._mock_config.has_key('statedir'): + # Kill the entire job dir, not just the rootdir + job_dir = os.path.normpath(self._mock_config['rootdir'] + "/../") + job_dir2 = os.path.normpath(self._mock_config['statedir'] + "/../") + # Be a little paranoid about randomly removing an entire directory. + # Compare the rootdir's parent to the statedir's parent and remove the + # parent only if they match. + if job_dir == job_dir2: + shutil.rmtree(job_dir, ignore_errors=True) + else: + shutil.rmtree(self._mock_config['rootdir'], ignore_errors=True) else: # mock still running pass From fedora-extras-commits at redhat.com Mon Aug 8 02:55:27 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sun, 7 Aug 2005 22:55:27 -0400 Subject: extras-buildsys ChangeLog,1.92,1.93 Message-ID: <200508080255.j782tRHN017236@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17219 Modified Files: ChangeLog Log Message: Add generalized explanation for recent changes Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.92 retrieving revision 1.93 diff -u -r1.92 -r1.93 --- ChangeLog 8 Aug 2005 02:54:09 -0000 1.92 +++ ChangeLog 8 Aug 2005 02:55:24 -0000 1.93 @@ -1,5 +1,8 @@ 2005-08-07 Dan Williams + Play nicely when running more than one builder instance on the same + machine. + * builder/builder.py - Try to delete actual mock work dir rather than just the buildroot From fedora-extras-commits at redhat.com Mon Aug 8 03:12:32 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sun, 7 Aug 2005 23:12:32 -0400 Subject: extras-buildsys/www success.psp,1.4,1.5 Message-ID: <200508080312.j783CWQY018436@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/www In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18419/www Modified Files: success.psp Log Message: Show add_to_repo jobs at the top of the list Index: success.psp =================================================================== RCS file: /cvs/fedora/extras-buildsys/www/success.psp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- success.psp 6 Aug 2005 16:25:05 -0000 1.4 +++ success.psp 8 Aug 2005 03:12:30 -0000 1.5 @@ -11,7 +11,7 @@ # show any jobs that have successfully built args = {} args['status'] = ['add_to_repo', 'needsign', 'repodone'] - args['orderby'] = ['endtime desc'] + args['orderby'] = ['status', 'endtime desc'] args['maxrows'] = 100 (e, msg, jobs) = server.list_jobs(args) except socket.error, e: From fedora-extras-commits at redhat.com Mon Aug 8 07:50:01 2005 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Mon, 8 Aug 2005 03:50:01 -0400 Subject: fedora-security/audit fc4,1.36,1.37 Message-ID: <200508080750.j787o1Yx025244@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25227 Modified Files: fc4 Log Message: Catch up on weekends issues; some investigation needed on a few of the new names Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- fc4 3 Aug 2005 08:25:16 -0000 1.36 +++ fc4 8 Aug 2005 07:49:58 -0000 1.37 @@ -1,8 +1,16 @@ -Up to date CVE as of CVE email 20050802 -Up to date FC4 as of 20050802 +Up to date CVE as of CVE email 20050807 +Up to date FC4 as of 20050807 ** are items that need attention +2005-2475 ** unzip +2005-2471 ** netpbm +2005-2456 ** kernel +2005-2452 ** libtiff +2005-2448 ** libgadu/ekg +2005-2447 ** libgadu/ekg +2005-2446 ** libgadu/ekg +2005-2414 ** xpcom library 2005-2410 backport (NetworkManager) [since FEDORA-2005-680] 2005-2395 ** firefox 2005-2370 version (kdenetwork, fixed 3.4.2) [since FEDORA-2005-670] was backport since FEDORA-2005-624 @@ -15,6 +23,7 @@ 2005-2363 version (ethereal, fixed 0.10.12) [since FEDORA-2005-655] 2005-2362 version (ethereal, fixed 0.10.12) [since FEDORA-2005-655] 2005-2361 version (ethereal, fixed 0.10.12) [since FEDORA-2005-655] +2005-2353 ignore (thunderbird) debug mode only 2005-2335 backport (fetchmail) [since FEDORA-2005-613] 2005-2270 version (firefox, fixed 1.0.5) [since FEDORA-2005-605] 2005-2270 version (mozilla, fixed 1.7.9) [since FEDORA-2005-619] @@ -62,6 +71,7 @@ 2005-1831 ignore (sudo) unsubstantiated report 2005-1769 VULNERABLE (squirrelmail, fixed 1.4.5) 2005-1768 version (kernel, fixed 2.6.6) +2005-1767 version (kernel, fixed 2.6.7) 2005-1766 version (HelixPlayer, fixed 1.0.5) [since FEDORA-2005-483] 2005-1765 version (kernel, fixed 2.6.12) [since FEDORA-2005-510] 2005-1764 version (kernel, fixed 2.6.12) [since FEDORA-2005-510] @@ -997,6 +1007,7 @@ older, happened to deal with at same time: +2002-2103 version (apache, not 2.0) 2002-1963 version (kernel, not 2.6) 2002-1976 ignore (ifconfig) "use ip" 2002-1914 version (dump, fixed 0.4b29) From fedora-extras-commits at redhat.com Mon Aug 8 08:28:55 2005 From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris)) Date: Mon, 8 Aug 2005 04:28:55 -0400 Subject: rpms/hmmer - New directory Message-ID: <200508080828.j788StS9027047@cvs-int.fedora.redhat.com> Author: c4chris Update of /cvs/extras/rpms/hmmer In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27023/hmmer Log Message: Directory /cvs/extras/rpms/hmmer added to the repository From fedora-extras-commits at redhat.com Mon Aug 8 08:28:55 2005 From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris)) Date: Mon, 8 Aug 2005 04:28:55 -0400 Subject: rpms/hmmer/devel - New directory Message-ID: <200508080828.j788Sudq027052@cvs-int.fedora.redhat.com> Author: c4chris Update of /cvs/extras/rpms/hmmer/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27023/hmmer/devel Log Message: Directory /cvs/extras/rpms/hmmer/devel added to the repository From fedora-extras-commits at redhat.com Mon Aug 8 08:29:12 2005 From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris)) Date: Mon, 8 Aug 2005 04:29:12 -0400 Subject: rpms/hmmer/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200508080829.j788TCDw027104@cvs-int.fedora.redhat.com> Author: c4chris Update of /cvs/extras/rpms/hmmer/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27068/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module hmmer --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Mon Aug 8 08:29:11 2005 From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris)) Date: Mon, 8 Aug 2005 04:29:11 -0400 Subject: rpms/hmmer Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200508080829.j788TBik027099@cvs-int.fedora.redhat.com> Author: c4chris Update of /cvs/extras/rpms/hmmer In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27068 Added Files: Makefile import.log Log Message: Setup of module hmmer --- NEW FILE Makefile --- # Top level Makefile for module hmmer all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Mon Aug 8 08:29:47 2005 From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris)) Date: Mon, 8 Aug 2005 04:29:47 -0400 Subject: rpms/hmmer import.log,1.1,1.2 Message-ID: <200508080829.j788Tlmb027163@cvs-int.fedora.redhat.com> Author: c4chris Update of /cvs/extras/rpms/hmmer In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27132 Modified Files: import.log Log Message: auto-import hmmer-2.3.2-2 on branch devel from hmmer-2.3.2-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/hmmer/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 8 Aug 2005 08:29:09 -0000 1.1 +++ import.log 8 Aug 2005 08:29:45 -0000 1.2 @@ -0,0 +1 @@ +hmmer-2_3_2-2:HEAD:hmmer-2.3.2-2.src.rpm:1123489777 From fedora-extras-commits at redhat.com Mon Aug 8 08:29:47 2005 From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris)) Date: Mon, 8 Aug 2005 04:29:47 -0400 Subject: rpms/hmmer/devel hmmer.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200508080829.j788TlqD027170@cvs-int.fedora.redhat.com> Author: c4chris Update of /cvs/extras/rpms/hmmer/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27132/devel Modified Files: .cvsignore sources Added Files: hmmer.spec Log Message: auto-import hmmer-2.3.2-2 on branch devel from hmmer-2.3.2-2.src.rpm --- NEW FILE hmmer.spec --- Name: hmmer Version: 2.3.2 Release: 2%{?dist} Summary: Profile HMM software for protein sequence analysis Group: Applications/Engineering License: GPL URL: http://hmmer.wustl.edu Source0: ftp://ftp.genetics.wustl.edu/pub/eddy/hmmer/%{version}/hmmer-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) #BuildRequires: #Requires: %description Profile hidden Markov models (profile HMMs) can be used to do sensitive database searching using statistical descriptions of a sequence family's consensus. HMMER is a freely distributable implementation of profile HMM software for protein sequence analysis. %prep %setup -q %build %configure \ %ifarch ppc --enable-altivec \ %endif --enable-lfs \ --enable-threads make %{?_smp_mflags} %check make check %install rm -rf $RPM_BUILD_ROOT make install BINDIR=$RPM_BUILD_ROOT%{_bindir} MANDIR=$RPM_BUILD_ROOT%{_mandir} %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc 00README COPYRIGHT LICENSE NOTES Userguide.pdf tutorial/ %{_bindir}/* %{_mandir}/man1/* %changelog * Sat Aug 06 2005 Christian Iseli 2.3.2-2 - Fix spec file according to review. * Fri Aug 05 2005 Christian Iseli 2.3.2-1 - Create spec file. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/hmmer/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 8 Aug 2005 08:29:10 -0000 1.1 +++ .cvsignore 8 Aug 2005 08:29:45 -0000 1.2 @@ -0,0 +1 @@ +hmmer-2.3.2.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/hmmer/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 8 Aug 2005 08:29:10 -0000 1.1 +++ sources 8 Aug 2005 08:29:45 -0000 1.2 @@ -0,0 +1 @@ +5f073340c0cf761288f961a73821228a hmmer-2.3.2.tar.gz From fedora-extras-commits at redhat.com Mon Aug 8 09:24:50 2005 From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris)) Date: Mon, 8 Aug 2005 05:24:50 -0400 Subject: rpms/hmmer/devel hmmer.spec,1.1,1.2 Message-ID: <200508080924.j789OotS028522@cvs-int.fedora.redhat.com> Author: c4chris Update of /cvs/extras/rpms/hmmer/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28505 Modified Files: hmmer.spec Log Message: Removed altivec switch for ppc. Index: hmmer.spec =================================================================== RCS file: /cvs/extras/rpms/hmmer/devel/hmmer.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- hmmer.spec 8 Aug 2005 08:29:45 -0000 1.1 +++ hmmer.spec 8 Aug 2005 09:24:48 -0000 1.2 @@ -1,6 +1,6 @@ Name: hmmer Version: 2.3.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Profile HMM software for protein sequence analysis Group: Applications/Engineering @@ -25,9 +25,6 @@ %build %configure \ -%ifarch ppc - --enable-altivec \ -%endif --enable-lfs \ --enable-threads make %{?_smp_mflags} @@ -54,6 +51,10 @@ %changelog +* Mon Aug 08 2005 Christian Iseli 2.3.2-3 + - Removed altivec switch for ppc: apparently, it only works using Apple's + GCC compiler. + * Sat Aug 06 2005 Christian Iseli 2.3.2-2 - Fix spec file according to review. From fedora-extras-commits at redhat.com Mon Aug 8 13:22:50 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Mon, 8 Aug 2005 09:22:50 -0400 Subject: rpms/loudmouth/devel loudmouth.spec,1.5,1.6 Message-ID: <200508081322.j78DMo7s001166@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/loudmouth/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1147 Modified Files: loudmouth.spec Log Message: * Mon Aug 8 2005 Brian Pepple - 0.90-5 - Rebuild due to new gnutls. Index: loudmouth.spec =================================================================== RCS file: /cvs/extras/rpms/loudmouth/devel/loudmouth.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- loudmouth.spec 30 Jul 2005 16:40:01 -0000 1.5 +++ loudmouth.spec 8 Aug 2005 13:22:47 -0000 1.6 @@ -2,7 +2,7 @@ Name: loudmouth Version: 0.90 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Loudmouth is a Jabber programming library written in C Group: System Environment/Libraries @@ -84,6 +84,9 @@ %changelog +* Mon Aug 8 2005 Brian Pepple - 0.90-5 +- Rebuild due to new gnutls. + * Sat Jul 30 2005 Brian Pepple - 0.90-4 - Fix description. From fedora-extras-commits at redhat.com Mon Aug 8 13:49:05 2005 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Mon, 8 Aug 2005 09:49:05 -0400 Subject: rpms/octave/FC-4 octave.spec,1.17,1.18 Message-ID: <200508081349.j78Dn5gr001287@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/octave/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1264 Modified Files: octave.spec Log Message: Cleanup of spec file to remove old cruft that doesn't appear to be needed any more. Most of the things being removed have been in the file for years and are workarounds for old problems that don't exist any longer. Index: octave.spec =================================================================== RCS file: /cvs/extras/rpms/octave/FC-4/octave.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- octave.spec 3 Aug 2005 18:51:50 -0000 1.17 +++ octave.spec 8 Aug 2005 13:49:03 -0000 1.18 @@ -1,8 +1,6 @@ -%define __libtoolize /bin/true - Name: octave Version: 2.1.71 -Release: 14%{?dist} +Release: 15%{?dist} Summary: A high-level language for numerical computations Epoch: 6 @@ -19,7 +17,6 @@ Prereq: /sbin/ldconfig BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: /etc/ld.so.conf.d -ExcludeArch: ppc64 s390x %description GNU Octave is a high-level language, primarily intended for numerical @@ -53,15 +50,7 @@ ./autogen.sh -%ifarch s390 -(cd readline && libtoolize --copy --force) -(cd glob && libtoolize --copy --force) -(cd kpathsea && libtoolize --copy --force) -%endif - %build -LC_ALL=POSIX -export LC_ALL CXXFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" ./configure \ --enable-shared=yes --enable-lite-kernel --enable-static=no \ --prefix=%{_prefix} --infodir=%{_infodir} --libdir=%{_libdir} @@ -129,6 +118,11 @@ %changelog +* Mon Aug 08 2005 Quentin Spencer 2.1.71-15 +- Cleanup: remove redefinition of __libtoolize, ExcludeArch of two platforms, + old s390 workarounds, and LC_ALL setting. None of these appear to be + necessary any longer, even if the platforms were supported. + * Wed Aug 03 2005 Quentin Spencer 2.1.71-14 - Add hdf5-devel and zlib-devel to dependencies for octave-devel. From fedora-extras-commits at redhat.com Mon Aug 8 13:50:18 2005 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Mon, 8 Aug 2005 09:50:18 -0400 Subject: rpms/octave/devel octave.spec,1.16,1.17 Message-ID: <200508081350.j78DoIlr001312@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/octave/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1293 Modified Files: octave.spec Log Message: Cleanup of spec file to remove old cruft that doesn't appear to be needed any more. Most of the things being removed have been in the file for years and are workarounds for old problems that don't exist any longer. Enabled support for 64-bit extensions on x86_64 (to allow large arrays that exceed the capabilities of 32-bit indexing). Index: octave.spec =================================================================== RCS file: /cvs/extras/rpms/octave/devel/octave.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- octave.spec 3 Aug 2005 15:36:37 -0000 1.16 +++ octave.spec 8 Aug 2005 13:50:15 -0000 1.17 @@ -1,8 +1,6 @@ -%define __libtoolize /bin/true - Name: octave Version: 2.9.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A high-level language for numerical computations Epoch: 6 @@ -19,7 +17,6 @@ Prereq: /sbin/ldconfig BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: /etc/ld.so.conf.d -ExcludeArch: ppc64 s390x %description GNU Octave is a high-level language, primarily intended for numerical @@ -52,16 +49,13 @@ ./autogen.sh -%ifarch s390 -(cd readline && libtoolize --copy --force) -(cd glob && libtoolize --copy --force) -(cd kpathsea && libtoolize --copy --force) -%endif - %build -LC_ALL=POSIX -export LC_ALL -CXXFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" ./configure \ +%ifarch x86_64 +%define enable64 --enable-64=yes +%else +%define enable64 --enable-64=no +%endif +CXXFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" ./configure %enable64 \ --enable-shared=yes --enable-lite-kernel --enable-static=no \ --prefix=%{_prefix} --infodir=%{_infodir} --libdir=%{_libdir} make %{?_smp_mflags} @@ -128,6 +122,12 @@ %changelog +* Mon Aug 08 2005 Quentin Spencer 2.9.3-4 +- Cleanup: remove redefinition of __libtoolize, ExcludeArch of two platforms, + old s390 workarounds, and LC_ALL setting. None of these appear to be + necessary any longer, even if the platforms were supported. +- Add --enable-64 to configure to enable 64-bit array indexing on x86_64. + * Wed Jul 27 2005 Quentin Spencer 2.9.3-3 - Add fftw3-devel to dependencies for devel From fedora-extras-commits at redhat.com Mon Aug 8 14:31:42 2005 From: fedora-extras-commits at redhat.com (Zing Zing Shishak (shishz)) Date: Mon, 8 Aug 2005 10:31:42 -0400 Subject: rpms/snownews/FC-4 snownews-1.5.7-manpath.patch, NONE, 1.1 snownews-1.5.7-softlink.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 snownews.spec, 1.5, 1.6 sources, 1.3, 1.4 snownews-1.5.6.1-destdir.patch, 1.1, NONE snownews-1.5.6.1-manpath.patch, 1.1, NONE Message-ID: <200508081431.j78EVgda002590@cvs-int.fedora.redhat.com> Author: shishz Update of /cvs/extras/rpms/snownews/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2564 Modified Files: .cvsignore snownews.spec sources Added Files: snownews-1.5.7-manpath.patch snownews-1.5.7-softlink.patch Removed Files: snownews-1.5.6.1-destdir.patch snownews-1.5.6.1-manpath.patch Log Message: * Mon Aug 6 2005 Zing - 1.5.7-2 - use dist macro * Fri Jul 29 2005 Zing - 1.5.7-1 - update to 1.5.7 - drop destdir patch, fixed upstream - fixup softlink for snow2opml snownews-1.5.7-manpath.patch: --- NEW FILE snownews-1.5.7-manpath.patch --- --- snownews-1.5.7/Makefile.orig 2005-07-29 10:09:33.000000000 -0400 +++ snownews-1.5.7/Makefile 2005-07-29 10:14:02.000000000 -0400 @@ -75,17 +75,17 @@ done install-man: manpages - if [ ! -d "$(DESTDIR)$(PREFIX)/man/man1" ]; then \ - mkdir -p $(DESTDIR)$(PREFIX)/man/man1; \ + if [ ! -d "$(DESTDIR)$(PREFIX)/share/man/man1" ]; then \ + mkdir -p $(DESTDIR)$(PREFIX)/share/man/man1; \ fi - $(INSTALL) -m 0644 $(MAN)/snownews.1 $(DESTDIR)$(PREFIX)/man/man1 - $(INSTALL) -m 0644 $(MAN)/opml2snow.1 $(DESTDIR)$(PREFIX)/man/man1 + $(INSTALL) -m 0644 $(MAN)/snownews.1 $(DESTDIR)$(PREFIX)/share/man/man1 + $(INSTALL) -m 0644 $(MAN)/opml2snow.1 $(DESTDIR)$(PREFIX)/share/man/man1 for L in $(LANGS); do \ - if [ ! -d "$(DESTDIR)$(PREFIX)/man/$$L/man1" ]; then \ - mkdir -p $(DESTDIR)$(PREFIX)/man/$$L/man1; \ + if [ ! -d "$(DESTDIR)$(PREFIX)/share/man/$$L/man1" ]; then \ + mkdir -p $(DESTDIR)$(PREFIX)/share/man/$$L/man1; \ fi; \ - $(INSTALL) -m 0644 $(MAN)/$$L/snownews.1 $(DESTDIR)$(PREFIX)/man/$$L/man1; \ + $(INSTALL) -m 0644 $(MAN)/$$L/snownews.1 $(DESTDIR)$(PREFIX)/share/man/$$L/man1; \ done ### Cleanup ### snownews-1.5.7-softlink.patch: --- NEW FILE snownews-1.5.7-softlink.patch --- --- snownews-1.5.7/Makefile.orig 2005-07-29 10:09:33.000000000 -0400 +++ snownews-1.5.7/Makefile 2005-07-29 10:27:07.000000000 -0400 @@ -62,7 +62,7 @@ $(INSTALL) -s snownews $(DESTDIR)$(PREFIX)/bin $(INSTALL) opml2snow $(DESTDIR)$(PREFIX)/bin if [ ! -f "$(DESTDIR)$(PREFIX)/bin/snow2opml" ]; then \ - ln -sf $(DESTDIR)$(PREFIX)/bin/opml2snow $(DESTDIR)$(PREFIX)/bin/snow2opml; \ + ln -sf opml2snow $(DESTDIR)$(PREFIX)/bin/snow2opml; \ fi; $(INSTALL) snowsync $(DESTDIR)$(PREFIX)/bin Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/snownews/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 25 Mar 2005 10:17:52 -0000 1.3 +++ .cvsignore 8 Aug 2005 14:31:40 -0000 1.4 @@ -1,2 +1 @@ -snownews-1.5.3.tar.gz -snownews-1.5.6.1.tar.gz +snownews-1.5.7.tar.gz Index: snownews.spec =================================================================== RCS file: /cvs/extras/rpms/snownews/FC-4/snownews.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- snownews.spec 25 Mar 2005 10:18:18 -0000 1.5 +++ snownews.spec 8 Aug 2005 14:31:40 -0000 1.6 @@ -1,15 +1,15 @@ Name: snownews -Version: 1.5.6.1 -Release: 3.FC4 +Version: 1.5.7 +Release: 2%{?dist} Summary: A text mode RSS/RDF newsreader Group: Applications/Internet License: GPL Url: http://home.kcore.de/~kiza/software/snownews -Source0: http://home.kcore.de/~kiza/software/snownews/download/snownews-1.5.6.1.tar.gz +Source0: http://home.kcore.de/~kiza/software/snownews/download/snownews-1.5.7.tar.gz Patch0: snownews-1.5.3-nocheck.patch -Patch1: snownews-1.5.6.1-manpath.patch +Patch1: snownews-1.5.7-manpath.patch Patch2: snownews-1.5.6.1-nostrip.patch -Patch3: snownews-1.5.6.1-destdir.patch +Patch3: snownews-1.5.7-softlink.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libxml2-devel BuildRequires: ncurses-devel @@ -46,12 +46,21 @@ %defattr(-,root,root) %doc README* AUTHOR COPYING CREDITS Changelog %{_bindir}/opml2snow +%{_bindir}/snow2opml %{_bindir}/snownews %{_bindir}/snowsync %{_mandir}/man1/* %{_mandir}/*/man1/* %changelog +* Mon Aug 6 2005 Zing - 1.5.7-2 +- use dist macro + +* Fri Jul 29 2005 Zing - 1.5.7-1 +- update to 1.5.7 +- drop destdir patch, fixed upstream +- fixup softlink for snow2opml + * Thu Mar 24 2005 Warren Togami - 1.5.6.1-3 - macroize dirs Index: sources =================================================================== RCS file: /cvs/extras/rpms/snownews/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 25 Mar 2005 10:17:52 -0000 1.3 +++ sources 8 Aug 2005 14:31:40 -0000 1.4 @@ -1 +1 @@ -466ca82e8df03d6126d6cc0f20772025 snownews-1.5.6.1.tar.gz +75ffa004e755a233f49b1cdfcd9e3d85 snownews-1.5.7.tar.gz --- snownews-1.5.6.1-destdir.patch DELETED --- --- snownews-1.5.6.1-manpath.patch DELETED --- From fedora-extras-commits at redhat.com Mon Aug 8 14:38:09 2005 From: fedora-extras-commits at redhat.com (Zing Zing Shishak (shishz)) Date: Mon, 8 Aug 2005 10:38:09 -0400 Subject: rpms/snownews/FC-3 snownews-1.5.7-manpath.patch, NONE, 1.1 snownews-1.5.7-softlink.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 snownews.spec, 1.3, 1.4 sources, 1.3, 1.4 snownews-1.5.6.1-destdir.patch, 1.1, NONE snownews-1.5.6.1-manpath.patch, 1.1, NONE Message-ID: <200508081438.j78Ec9rb002685@cvs-int.fedora.redhat.com> Author: shishz Update of /cvs/extras/rpms/snownews/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2658 Modified Files: .cvsignore snownews.spec sources Added Files: snownews-1.5.7-manpath.patch snownews-1.5.7-softlink.patch Removed Files: snownews-1.5.6.1-destdir.patch snownews-1.5.6.1-manpath.patch Log Message: * Mon Aug 6 2005 Zing - 1.5.7-2 - use dist macro * Fri Jul 29 2005 Zing - 1.5.7-1 - update to 1.5.7 - drop destdir patch, fixed upstream - fixup softlink for snow2opml snownews-1.5.7-manpath.patch: --- NEW FILE snownews-1.5.7-manpath.patch --- --- snownews-1.5.7/Makefile.orig 2005-07-29 10:09:33.000000000 -0400 +++ snownews-1.5.7/Makefile 2005-07-29 10:14:02.000000000 -0400 @@ -75,17 +75,17 @@ done install-man: manpages - if [ ! -d "$(DESTDIR)$(PREFIX)/man/man1" ]; then \ - mkdir -p $(DESTDIR)$(PREFIX)/man/man1; \ + if [ ! -d "$(DESTDIR)$(PREFIX)/share/man/man1" ]; then \ + mkdir -p $(DESTDIR)$(PREFIX)/share/man/man1; \ fi - $(INSTALL) -m 0644 $(MAN)/snownews.1 $(DESTDIR)$(PREFIX)/man/man1 - $(INSTALL) -m 0644 $(MAN)/opml2snow.1 $(DESTDIR)$(PREFIX)/man/man1 + $(INSTALL) -m 0644 $(MAN)/snownews.1 $(DESTDIR)$(PREFIX)/share/man/man1 + $(INSTALL) -m 0644 $(MAN)/opml2snow.1 $(DESTDIR)$(PREFIX)/share/man/man1 for L in $(LANGS); do \ - if [ ! -d "$(DESTDIR)$(PREFIX)/man/$$L/man1" ]; then \ - mkdir -p $(DESTDIR)$(PREFIX)/man/$$L/man1; \ + if [ ! -d "$(DESTDIR)$(PREFIX)/share/man/$$L/man1" ]; then \ + mkdir -p $(DESTDIR)$(PREFIX)/share/man/$$L/man1; \ fi; \ - $(INSTALL) -m 0644 $(MAN)/$$L/snownews.1 $(DESTDIR)$(PREFIX)/man/$$L/man1; \ + $(INSTALL) -m 0644 $(MAN)/$$L/snownews.1 $(DESTDIR)$(PREFIX)/share/man/$$L/man1; \ done ### Cleanup ### snownews-1.5.7-softlink.patch: --- NEW FILE snownews-1.5.7-softlink.patch --- --- snownews-1.5.7/Makefile.orig 2005-07-29 10:09:33.000000000 -0400 +++ snownews-1.5.7/Makefile 2005-07-29 10:27:07.000000000 -0400 @@ -62,7 +62,7 @@ $(INSTALL) -s snownews $(DESTDIR)$(PREFIX)/bin $(INSTALL) opml2snow $(DESTDIR)$(PREFIX)/bin if [ ! -f "$(DESTDIR)$(PREFIX)/bin/snow2opml" ]; then \ - ln -sf $(DESTDIR)$(PREFIX)/bin/opml2snow $(DESTDIR)$(PREFIX)/bin/snow2opml; \ + ln -sf opml2snow $(DESTDIR)$(PREFIX)/bin/snow2opml; \ fi; $(INSTALL) snowsync $(DESTDIR)$(PREFIX)/bin Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/snownews/FC-3/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 05:20:53 -0000 1.2 +++ .cvsignore 8 Aug 2005 14:38:07 -0000 1.3 @@ -1 +1 @@ -snownews-1.5.3.tar.gz +snownews-1.5.7.tar.gz Index: snownews.spec =================================================================== RCS file: /cvs/extras/rpms/snownews/FC-3/snownews.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- snownews.spec 25 Mar 2005 10:20:16 -0000 1.3 +++ snownews.spec 8 Aug 2005 14:38:07 -0000 1.4 @@ -1,15 +1,15 @@ Name: snownews -Version: 1.5.6.1 -Release: 3.FC3 +Version: 1.5.7 +Release: 2%{?dist} Summary: A text mode RSS/RDF newsreader Group: Applications/Internet License: GPL Url: http://home.kcore.de/~kiza/software/snownews -Source0: http://home.kcore.de/~kiza/software/snownews/download/snownews-1.5.6.1.tar.gz +Source0: http://home.kcore.de/~kiza/software/snownews/download/snownews-1.5.7.tar.gz Patch0: snownews-1.5.3-nocheck.patch -Patch1: snownews-1.5.6.1-manpath.patch +Patch1: snownews-1.5.7-manpath.patch Patch2: snownews-1.5.6.1-nostrip.patch -Patch3: snownews-1.5.6.1-destdir.patch +Patch3: snownews-1.5.7-softlink.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libxml2-devel BuildRequires: ncurses-devel @@ -46,12 +46,21 @@ %defattr(-,root,root) %doc README* AUTHOR COPYING CREDITS Changelog %{_bindir}/opml2snow +%{_bindir}/snow2opml %{_bindir}/snownews %{_bindir}/snowsync %{_mandir}/man1/* %{_mandir}/*/man1/* %changelog +* Mon Aug 6 2005 Zing - 1.5.7-2 +- use dist macro + +* Fri Jul 29 2005 Zing - 1.5.7-1 +- update to 1.5.7 +- drop destdir patch, fixed upstream +- fixup softlink for snow2opml + * Thu Mar 24 2005 Warren Togami - 1.5.6.1-3 - macroize dirs Index: sources =================================================================== RCS file: /cvs/extras/rpms/snownews/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 25 Mar 2005 10:20:16 -0000 1.3 +++ sources 8 Aug 2005 14:38:07 -0000 1.4 @@ -1 +1 @@ -466ca82e8df03d6126d6cc0f20772025 snownews-1.5.6.1.tar.gz +75ffa004e755a233f49b1cdfcd9e3d85 snownews-1.5.7.tar.gz --- snownews-1.5.6.1-destdir.patch DELETED --- --- snownews-1.5.6.1-manpath.patch DELETED --- From fedora-extras-commits at redhat.com Mon Aug 8 15:32:11 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 8 Aug 2005 11:32:11 -0400 Subject: rpms/kickpim/devel kickpim.spec,1.8,1.9 Message-ID: <200508081532.j78FWBse004054@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/kickpim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4037 Modified Files: kickpim.spec Log Message: cleanup BR's use %%find_lang use --enable-final Index: kickpim.spec =================================================================== RCS file: /cvs/extras/rpms/kickpim/devel/kickpim.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- kickpim.spec 23 May 2005 00:25:25 -0000 1.8 +++ kickpim.spec 8 Aug 2005 15:32:09 -0000 1.9 @@ -3,37 +3,31 @@ Name: kickpim Summary: KDE kicker applet to access addressbook Version: 0.5.3 -Release: 7%{?dist_tag} +Release: 7%{?dist} License: GPL Group: Applications/Productivity URL: http://kickpim.sourceforge.net/ Source: http://dl.sourceforge.net/sourceforge/kickpim/kickpim-0.5.3.tar.bz2 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # remove build dep on qt-3.2 Patch1: kickpim-0.5.3-qtdesigner.patch BuildRequires: autoconf >= 2.53 -# to workaround missing Requires in redhat's qt-devel, kdelibs-devel -# and to make fedora's buildsystem happy -BuildRequires: XFree86-devel -BuildRequires: libpng-devel zlib-devel libjpeg-devel -BuildRequires: arts-devel libart_lgpl-devel - -BuildRequires: kdepim-devel >= 6:3.1 -Requires: kdebase - -# Dynamically determine qt,kdelibs dependancies, depending on -# what we're built against. -BuildRequires: qt-devel >= 1:3.1 -%define qt_ver %(rpm -q --qf '%%{version}' qt-devel | cut -d. -f-2) +# Dynamically determine qt/kde dependancies, +# depending on what we're built against. +BuildRequires: qt-devel >= 1:3.3 +%define qt_ver %(rpm -q --qf '%%{version}' qt-devel ) Requires: qt >= 1:%{qt_ver} - -BuildRequires: kdelibs-devel >= 6:3.1 +BuildRequires: kdelibs-devel >= 6:3.3 %define kdelibs_ver %(rpm -q --qf '%%{version}' kdelibs-devel ) Requires: kdelibs >= 6:%{kdelibs_ver} +BuildRequires: kdepim-devel >= 6:3.3 +#define kdepim_ver %(rpm -q --qf '%%{version}' kdepim-devel ) +#Requires: kdepim >= 6:%{kdepim_ver} +Requires: kdebase %description KickPIM is a panel applet for quickly editing and accessing the KDE @@ -57,7 +51,7 @@ %configure \ --disable-rpath \ %{?debug: --enable-debug --enable-warnings } \ - %{!?debug: --disable-debug --disable-warnings } + %{!?debug: --disable-debug --disable-warnings --enable-final --disable-dependency-tracking } make %{?_smp_mflags} @@ -67,7 +61,17 @@ make install%{!?debug_package:-strip} DESTDIR=$RPM_BUILD_ROOT -%find_lang %{name} +## File lists +# locale's +%find_lang %{name} || touch %{name}.lang +# HTML +HTML_DIR=$(kde-config --expandvars --install html) +if [ -d $RPM_BUILD_ROOT$HTML_DIR ]; then +for lang_dir in $RPM_BUILD_ROOT$HTML_DIR/* ; do + lang=$(basename $lang_dir) + echo "%lang($lang) %doc $HTML_DIR/$lang/*" >> %{name}.lang +done +fi %files -f %{name}.lang @@ -76,13 +80,13 @@ %{_libdir}/lib* %{_datadir}/apps/kicker/applets/*.desktop %{_datadir}/apps/kickpim -%lang(en) %doc %{_docdir}/HTML/en/* %clean rm -rf $RPM_BUILD_ROOT + %changelog * Sun May 22 2005 Jeremy Katz - 0.5.3 - rebuild on all arches From fedora-extras-commits at redhat.com Mon Aug 8 15:42:03 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 8 Aug 2005 11:42:03 -0400 Subject: rpms/gc/devel gc6.5-opendl.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 gc.spec, 1.8, 1.9 sources, 1.4, 1.5 gc6.4-opendl.patch, 1.1, NONE Message-ID: <200508081542.j78Fg3dQ004126@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4102 Modified Files: .cvsignore gc.spec sources Added Files: gc6.5-opendl.patch Removed Files: gc6.4-opendl.patch Log Message: * Wed May 25 2005 Rex Dieter 6.5-1 - 6.5 gc6.5-opendl.patch: --- NEW FILE gc6.5-opendl.patch --- --- gc6.5/Makefile.in.opendl 2005-05-16 18:28:28.000000000 -0500 +++ gc6.5/Makefile.in 2005-05-25 10:27:00.341398988 -0500 @@ -336,7 +336,7 @@ # Include THREADDLLIBS here to ensure that the correct versions of # linuxthread semaphore functions get linked: -libgc_la_LIBADD = @addobjs@ $(THREADDLLIBS) $(UNWINDLIBS) +libgc_la_LIBADD = @addobjs@ $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS) libgc_la_DEPENDENCIES = @addobjs@ libgc_la_LDFLAGS = -version-info 1:2:0 EXTRA_libgc_la_SOURCES = alpha_mach_dep.S \ @@ -345,7 +345,7 @@ sparc_sunos4_mach_dep.s ia64_save_regs_in_stack.s libgccpp_la_SOURCES = gc_cpp.cc -libgccpp_la_LIBADD = $(THREADDLLIBS) $(UNWINDLIBS) +libgccpp_la_LIBADD = $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS) libgccpp_la_LDFLAGS = -version-info 1:2:0 AM_CXXFLAGS = @GC_CFLAGS@ AM_CFLAGS = @GC_CFLAGS@ @@ -354,9 +354,9 @@ # gctest_OBJECTS = test.o gctest_SOURCES = tests/test.c -gctest_LDADD = ./libgc.la $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS) +gctest_LDADD = ./libgc.la test_cpp_SOURCES = tests/test_cpp.cc -test_cpp_LDADD = ./libgc.la ./libgccpp.la $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS) +test_cpp_LDADD = ./libgc.la ./libgccpp.la TESTS = gctest $(extra_checks) all_objs = @addobjs@ $(libgc_la_OBJECTS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) \ --- gc6.5/Makefile.am.opendl 2005-05-16 17:11:08.000000000 -0500 +++ gc6.5/Makefile.am 2005-05-25 10:25:35.953868785 -0500 @@ -55,7 +55,7 @@ # Include THREADDLLIBS here to ensure that the correct versions of # linuxthread semaphore functions get linked: -libgc_la_LIBADD = @addobjs@ $(THREADDLLIBS) $(UNWINDLIBS) +libgc_la_LIBADD = @addobjs@ $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS) libgc_la_DEPENDENCIES = @addobjs@ libgc_la_LDFLAGS = -version-info 1:2:0 @@ -65,7 +65,7 @@ sparc_sunos4_mach_dep.s ia64_save_regs_in_stack.s libgccpp_la_SOURCES = gc_cpp.cc -libgccpp_la_LIBADD = $(THREADDLLIBS) $(UNWINDLIBS) +libgccpp_la_LIBADD = $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS) libgccpp_la_LDFLAGS = -version-info 1:2:0 EXTRA_DIST += alpha_mach_dep.S mips_sgi_mach_dep.s sparc_mach_dep.S @@ -91,9 +91,9 @@ ## are included in the distribution # gctest_OBJECTS = test.o gctest_SOURCES = tests/test.c -gctest_LDADD = ./libgc.la $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS) +gctest_LDADD = ./libgc.la test_cpp_SOURCES = tests/test_cpp.cc -test_cpp_LDADD = ./libgc.la ./libgccpp.la $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS) +test_cpp_LDADD = ./libgc.la ./libgccpp.la TESTS = gctest $(extra_checks) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gc/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 29 Jan 2005 16:28:30 -0000 1.4 +++ .cvsignore 8 Aug 2005 15:42:01 -0000 1.5 @@ -1 +1 @@ -gc6.4.tar.gz +gc6.5.tar.gz Index: gc.spec =================================================================== RCS file: /cvs/extras/rpms/gc/devel/gc.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- gc.spec 6 Apr 2005 22:11:37 -0000 1.8 +++ gc.spec 8 Aug 2005 15:42:01 -0000 1.9 @@ -1,32 +1,29 @@ # $Id$ -Summary: C++ Garbage Collector -Name: gc -Version: 6.4 -# For Extras -Release: 3 +Summary: C++ Garbage Collector +Name: gc +Version: 6.5 -# For kde-redhat -#Release: 0.2%{?dist_tag}.kde +Release: 1%{?dist} Group: System Environment/Libraries License: BSD -Url: http://www.hpl.hp.com/personal/Hans_Boehm/gc/ -Source: http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc6.4.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +Url: http://www.hpl.hp.com/personal/Hans_Boehm/gc/ +Source: http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc6.5.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Patch1: gc6.4-opendl.patch +Patch1: gc6.5-opendl.patch %description -The Boehm-Demers-Weiser conservative garbage collector can be used as a garbage +The Boehm-Demers-Weiser conservative garbage collector can be used as a garbage collecting replacement for C malloc or C++ new. %package devel -Summary: Libraries and header files for gc development +Summary: Libraries and header files for %{name} development Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel -Libraries and header files for gc development. +Libraries and header files for %{name} development. %prep @@ -55,7 +52,7 @@ make install DESTDIR=$RPM_BUILD_ROOT -install -p -D -m644 doc/gc.man $RPM_BUILD_ROOT%{_mandir}/man3/gc.3 +install -p -D -m644 doc/gc.man $RPM_BUILD_ROOT%{_mandir}/man3/gc.3 ## Unpackaged files rm -rf $RPM_BUILD_ROOT%{_datadir}/gc @@ -63,14 +60,15 @@ %clean -rm -rf "$RPM_BUILD_ROOT" +rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig + %postun -p /sbin/ldconfig -%files +%files %defattr(-,root,root) %doc doc/README doc/README.changes doc/README.contributors %{_libdir}/lib*.so.* @@ -80,11 +78,13 @@ %doc doc/*.html %{_includedir}/* %{_libdir}/lib*.so -#{_libdir}/lib*.*a %{_mandir}/man?/* %changelog +* Wed May 25 2005 Rex Dieter 6.5-1 +- 6.5 + * Fri Apr 7 2005 Michael Schwendt - rebuilt @@ -117,16 +117,16 @@ - OK, put manpage in man3. * Thu Oct 02 2003 Rex Dieter 0:6.2-0.fdr.2 -- drop manpage pending feedback from developer. +- drop manpage pending feedback from developer. * Tue Sep 30 2003 Rex Dieter 0:6.2-0.fdr.1 -- fix manpage location +- fix manpage location - remove .la file (it appears unnecessary after all, thanks to opendl patch) - remove cvs tag from description - touchup -devel desc/summary. - macro update to support Fedora Core -* Thu Sep 11 2003 Rex Dieter 0:6.2-0.fdr.0 +* Thu Sep 11 2003 Rex Dieter 0:6.2-0.fdr.0 - 6.2 release. - update license (BSD) - Consider building with: --enable-parallel-mark Index: sources =================================================================== RCS file: /cvs/extras/rpms/gc/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 29 Jan 2005 16:28:30 -0000 1.4 +++ sources 8 Aug 2005 15:42:01 -0000 1.5 @@ -1 +1 @@ -ef03495e980b834a99c0e27eedaa546e gc6.4.tar.gz +00bf95cdcbedfa7321d14e0133b31cdb gc6.5.tar.gz --- gc6.4-opendl.patch DELETED --- From fedora-extras-commits at redhat.com Mon Aug 8 15:46:33 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 8 Aug 2005 11:46:33 -0400 Subject: rpms/libfac/devel libfac.spec,1.8,1.9 Message-ID: <200508081546.j78FkXxF004156@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/libfac/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4139 Modified Files: libfac.spec Log Message: cleanup drop extraneous Obsoletes/Provides Index: libfac.spec =================================================================== RCS file: /cvs/extras/rpms/libfac/devel/libfac.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- libfac.spec 23 May 2005 00:00:21 -0000 1.8 +++ libfac.spec 8 Aug 2005 15:46:31 -0000 1.9 @@ -3,14 +3,14 @@ Summary: Extension to Singular-factory Name: libfac Version: 2.0.5 -Release: 3%{?dist_tag} +Release: 3%{?dist} License: GPL Url: http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/Libfac/ # http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/Libfac/libfac-2-0-5.tar,gz Source: libfac-2-0-5.tar.gz Group: System Environment/Libraries -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: factory-devel >= 2.0.5 #BuildRequires: autoconf >= 2.53 @@ -24,8 +24,8 @@ %package devel Summary: An extension to Singular-factory -Obsoletes: %{name} < %{version}-%{release} -Provides: %{name} = %{version}-%{release} +#Obsoletes: %{name} < %{version}-%{release} +#Provides: %{name} = %{version}-%{release} Group: Development/Libraries %description devel Singular-libfac is an extension to Singular-factory which implements @@ -65,8 +65,7 @@ %files devel %defattr(-,root,root) %doc 00README ChangeLog COPYING -#{_libdir}/lib*.so -%{_libdir}/lib*.*a +%{_libdir}/lib*.a %{_includedir}/* From fedora-extras-commits at redhat.com Mon Aug 8 15:53:10 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 8 Aug 2005 11:53:10 -0400 Subject: rpms/factory/devel factory.spec,1.10,1.11 Message-ID: <200508081553.j78FrAXi004226@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/factory/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4209 Modified Files: factory.spec Log Message: cleanup drop extraneous Obsoletes/Provides Index: factory.spec =================================================================== RCS file: /cvs/extras/rpms/factory/devel/factory.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- factory.spec 26 May 2005 14:36:37 -0000 1.10 +++ factory.spec 8 Aug 2005 15:53:08 -0000 1.11 @@ -9,7 +9,7 @@ URL: http://www.mathematik.uni-kl.de/ftp/pub/Math/Factory Source: http://www.mathematik.uni-kl.de/ftp/pub/Math/Factory/factory-2-0-5.tar.gz Group: System Environment/Libraries -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch1: factory-2.0.5-gcc34.patch Patch2: factory-64bit.patch @@ -25,8 +25,8 @@ Summary: %{summary} Group: Development/Libraries Requires: gmp-devel -Obsoletes: %{name} < %{version}-%{release} -Provides: %{name} = %{version}-%{release} +#Obsoletes: %{name} < %{version}-%{release} +#Provides: %{name} = %{version}-%{release} %description devel Factory is a C++ class library that implements a recursive representation of multivariate polynomial data. @@ -41,7 +41,7 @@ %build # Macaulay2's build instructions say to use --disable-streamio -# *not* using --disable-streamio requires patching for gcc3 anyway. +# *not* using --disable-streamio requires patching for gcc3+ anyway. %configure --disable-streamio # smp broken? @@ -49,28 +49,20 @@ %install -rm -rf "$RPM_BUILD_ROOT" +rm -rf $RPM_BUILD_ROOT # make install DESTDIR fails %makeinstall %clean -rm -rf "$RPM_BUILD_ROOT" +rm -rf $RPM_BUILD_ROOT -# We're waiting on a shared-lib configuration -%if 0 -%files -%doc README NEWS ChangeLog -%{_libdir}/lib*.so.* -%endif - %files devel %defattr(-,root,root) %doc README NEWS ChangeLog -#{_libdir}/lib*.so -%{_libdir}/lib*.*a +%{_libdir}/lib*.a %{_includedir}/* From fedora-extras-commits at redhat.com Mon Aug 8 15:59:06 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 8 Aug 2005 11:59:06 -0400 Subject: rpms/Macaulay2/devel Macaulay2.spec,1.7,1.8 Message-ID: <200508081559.j78Fx6eP004258@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/Macaulay2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4241 Modified Files: Macaulay2.spec Log Message: cleanup drop not-needed %%preun BR: gc-devel >= 6.5 Index: Macaulay2.spec =================================================================== RCS file: /cvs/extras/rpms/Macaulay2/devel/Macaulay2.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- Macaulay2.spec 27 May 2005 09:23:20 -0000 1.7 +++ Macaulay2.spec 8 Aug 2005 15:59:03 -0000 1.8 @@ -11,7 +11,7 @@ Group: Applications/Engineering URL: http://www.math.uiuc.edu/Macaulay2/ Source: http://www.math.uiuc.edu/Macaulay2/ftp-site/Macaulay2-0.9.2-src.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source1: Macaulay2.png Source2: Macaulay2.desktop @@ -25,7 +25,7 @@ Patch5: Macaulay2-0.9.2-gcc4.patch BuildRequires: desktop-file-utils -BuildRequires: gc-devel >= 6.3 +BuildRequires: gc-devel >= 6.5 BuildRequires: factory-devel >= 2.0.5 BuildRequires: libfac-devel >= 2.0.5 BuildRequires: gdbm-devel @@ -37,21 +37,20 @@ and Michael E. Stillman %package doc -Summary: Macaulay2 documentation +Summary: %{name} documentation Group: Documentation Requires: %{name} = %{version} Requires: htmlview -Summary: Macaulay2 documentation %description doc -Macaulay2 documentation. +%{name} documentation. %package emacs -Summary: Macaulay2 emacs mode +Summary: %{name} emacs mode Group: Applications/Editors Requires: emacs Requires: %{name} = %{version} %description emacs -Macaulay2 emacs mode. +%{name} emacs mode. @@ -67,6 +66,7 @@ %patch4 -p1 -b .gcc34 %patch5 -p1 -b .gcc4 + %build %configure \ --enable-gc-for-new \ @@ -94,17 +94,19 @@ perl -pi -e "s@$RPM_BUILD_ROOT@@g" $RPM_BUILD_ROOT%{m2home}/emacs/* ## emacs files -install -d $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp -cp -alf $RPM_BUILD_ROOT%{m2home}/emacs/*.el \ - $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/ +install -d $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp +cp -alf $RPM_BUILD_ROOT%{m2home}/emacs/*.el \ + $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/ # app img -install -p -D -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png +install -p -D -m644 \ + %{SOURCE1} \ + $RPM_BUILD_ROOT%{_datadir}/pixmaps/Macaulay2.png mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/applications desktop-file-install \ - --vendor fedora \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ + --vendor fedora \ --add-category "X-Fedora" \ %{SOURCE2} @@ -123,9 +125,9 @@ rm -rf $RPM_BUILD_ROOT -%preun +#preun # Handle possibly existing dumpdata -rm -f %{m2home}/libexec/Macaulay2-*-data ||: +#rm -f %{m2home}/libexec/Macaulay2-*-data ||: %files From fedora-extras-commits at redhat.com Mon Aug 8 16:00:01 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 8 Aug 2005 12:00:01 -0400 Subject: rpms/Macaulay2/devel Macaulay2.spec,1.8,1.9 Message-ID: <200508081600.j78G01Cq004283@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/Macaulay2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4266 Modified Files: Macaulay2.spec Log Message: do 'make check' by default (for now) Index: Macaulay2.spec =================================================================== RCS file: /cvs/extras/rpms/Macaulay2/devel/Macaulay2.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- Macaulay2.spec 8 Aug 2005 15:59:03 -0000 1.8 +++ Macaulay2.spec 8 Aug 2005 15:59:58 -0000 1.9 @@ -80,7 +80,7 @@ # Takes a *long* time, default off %check || : -%{?_with_check:make check } +%{!?_without_check:make check } %install From fedora-extras-commits at redhat.com Mon Aug 8 16:15:20 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 8 Aug 2005 12:15:20 -0400 Subject: extras-buildsys/utils user-manager.py,1.2,1.3 Message-ID: <200508081615.j78GFKvv005545@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/utils In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5519 Modified Files: user-manager.py Log Message: Fix up some stuff in the user manager, allow listing of every user at the same time Index: user-manager.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/utils/user-manager.py,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- user-manager.py 2 Aug 2005 04:10:33 -0000 1.2 +++ user-manager.py 8 Aug 2005 16:15:18 -0000 1.3 @@ -60,13 +60,13 @@ def dispatch(self, prog, command, args): if command == 'add': - um.add_user(args) + self.add_user(args) elif command == 'del': - um.del_user(args) + self.del_user(args) elif command == 'mod': - um.mod_user(args) + self.mod_user(args) elif command == 'find': - um.find_user(args) + self.find_user(args) else: print_usage(prog) @@ -169,11 +169,12 @@ own_jobs, job_admin, user_admin, server_admin) def find_user(self, args): - if len(args) < 1: - raise UserManagerException("Invalid command, too few options.") + sql = "SELECT * FROM users" - email = args[0] - self.curs.execute('SELECT * FROM users WHERE email LIKE "%%%s%%"' % email) + if len(args) > 0: + sql = sql + ' WHERE email LIKE "%%%s%%"' % args[0] + + self.curs.execute(sql) self.dbcx.commit() data = self.curs.fetchall() if not len(data): From fedora-extras-commits at redhat.com Mon Aug 8 16:35:44 2005 From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl)) Date: Mon, 8 Aug 2005 12:35:44 -0400 Subject: rpms/revelation/devel .cvsignore, 1.6, 1.7 revelation.spec, 1.9, 1.10 sources, 1.6, 1.7 Message-ID: <200508081635.j78GZiSH005593@cvs-int.fedora.redhat.com> Author: thl Update of /cvs/extras/rpms/revelation/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5572 Modified Files: .cvsignore revelation.spec sources Log Message: Update to 0.4.4; Use dist-macro; New BR gnome-panel-devel gnome-python2-extras Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/revelation/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 2 Apr 2005 11:32:55 -0000 1.6 +++ .cvsignore 8 Aug 2005 16:35:42 -0000 1.7 @@ -1 +1 @@ -revelation-0.4.3.tar.bz2 +revelation-0.4.4.tar.bz2 Index: revelation.spec =================================================================== RCS file: /cvs/extras/rpms/revelation/devel/revelation.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- revelation.spec 6 May 2005 17:14:11 -0000 1.9 +++ revelation.spec 8 Aug 2005 16:35:42 -0000 1.10 @@ -3,11 +3,11 @@ Summary: Password manager for GNOME 2 Name: revelation -Version: 0.4.3 -Release: 3 +Version: 0.4.4 +Release: 1%{?dist} License: GPL Group: Applications/Productivity -Source: ftp://oss.codepoet.no/revelation/revelation-0.4.3.tar.bz2 +Source: ftp://oss.codepoet.no/revelation/revelation-0.4.4.tar.bz2 URL: http://oss.codepoet.no/revelation/ Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") Requires: python-crypto >= 2.0 @@ -25,6 +25,7 @@ BuildRequires: python-crypto >= 2.0 BuildRequires: cracklib BuildRequires: words +BuildRequires: gnome-panel-devel gnome-python2-extras BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot-%(%{__id_u} -n) Requires(post): GConf2 shared-mime-info desktop-file-utils Requires(preun): GConf2 @@ -85,24 +86,28 @@ %{_datadir}/applications/*.desktop %{_datadir}/revelation/ %{_datadir}/icons/hicolor/??x??/mimetypes/gnome-mime-application-x-revelation.png -%{_datadir}/icons/hicolor/*/apps/%{name}.png +%{_datadir}/icons/hicolor/*/apps/%{name}*.png %{_datadir}/icons/hicolor/scalable/filesystems/%{name}* -# the next two entries should be python_sitearch, but the packages currently does it -# wrong on install and during execution. So leave them in {python_sitelib} for now -#dir %{python_sitearch}/revelation/ -%{python_sitelib}/revelation/authmanager.so -%{python_sitelib}/revelation/crack.so -%dir %{python_sitelib}/revelation/ -%dir %{python_sitelib}/revelation/datahandler/ +%{python_sitearch}/revelation/gnomemisc.so +%{python_sitearch}/revelation/crack.so +%dir %{python_sitearch}/revelation/ +%dir %{python_sitearch}/revelation/datahandler/ %{_datadir}/mime/packages/* -%{python_sitelib}/revelation/*.py -%{python_sitelib}/revelation/*.pyc -%ghost %{python_sitelib}/revelation/*.pyo -%{python_sitelib}/revelation/datahandler/*.py -%{python_sitelib}/revelation/datahandler/*.pyc -%ghost %{python_sitelib}/revelation/datahandler/*.pyo +%{python_sitearch}/revelation/*.py +%{python_sitearch}/revelation/*.pyc +%ghost %{python_sitearch}/revelation/*.pyo +%{python_sitearch}/revelation/datahandler/*.py +%{python_sitearch}/revelation/datahandler/*.pyc +%ghost %{python_sitearch}/revelation/datahandler/*.pyo +%{_libdir}/bonobo/servers/GNOME_RevelationApplet.server +%{_libexecdir}/revelation-applet %changelog +* Mon Aug 08 2005 Thorsten Leemhuis 0.4.4-1 +- Update to 0.4.4 +- Use dist-macro +- New BR gnome-panel-devel gnome-python2-extras + * Fri May 06 2005 Thorsten Leemhuis 0.4.3-3 - Update the GTK+ theme icon cache on (un)install Index: sources =================================================================== RCS file: /cvs/extras/rpms/revelation/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 2 Apr 2005 11:32:55 -0000 1.6 +++ sources 8 Aug 2005 16:35:42 -0000 1.7 @@ -1 +1 @@ -80c36c740c5e02da54f77da69800325a revelation-0.4.3.tar.bz2 +79c5af34e19c0d1eb25de15b47567060 revelation-0.4.4.tar.bz2 From fedora-extras-commits at redhat.com Mon Aug 8 16:49:14 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 8 Aug 2005 12:49:14 -0400 Subject: rpms/gc/devel gc.spec,1.9,1.10 Message-ID: <200508081649.j78GnE38005671@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5654 Modified Files: gc.spec Log Message: %%check section Index: gc.spec =================================================================== RCS file: /cvs/extras/rpms/gc/devel/gc.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- gc.spec 8 Aug 2005 15:42:01 -0000 1.9 +++ gc.spec 8 Aug 2005 16:48:56 -0000 1.10 @@ -44,6 +44,7 @@ make %{?_smp_mflags} +%check || : make check From fedora-extras-commits at redhat.com Mon Aug 8 18:18:07 2005 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Mon, 8 Aug 2005 14:18:07 -0400 Subject: rpms/highlight/devel highlight-2.4-etcdir.patch, NONE, 1.1 highlight-2.4-makefile.patch, 1.1, 1.2 highlight.spec, 1.2, 1.3 Message-ID: <200508081818.j78II7pr008166@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/highlight/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8139 Modified Files: highlight-2.4-makefile.patch highlight.spec Added Files: highlight-2.4-etcdir.patch Log Message: Description: Move extension.conf and scriptre.conf to /etc/highlight highlight-2.4-etcdir.patch: --- NEW FILE highlight-2.4-etcdir.patch --- --- highlight-2.4-1/highlight/main.cpp.org 2005-08-08 20:00:11.000000000 +0200 +++ highlight-2.4-1/highlight/main.cpp 2005-08-08 20:00:46.000000000 +0200 @@ -132,7 +132,7 @@ } bool HighlightApp::loadMapConfig(const string& name, StringMap* map){ - string extPath=dataDir.getDir() + name + ".conf"; + string extPath="/etc/highlight/" + name + ".conf"; ConfigurationReader config(extPath); if (config.found() ) { highlight-2.4-makefile.patch: Index: highlight-2.4-makefile.patch =================================================================== RCS file: /cvs/extras/rpms/highlight/devel/highlight-2.4-makefile.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- highlight-2.4-makefile.patch 4 Aug 2005 15:38:30 -0000 1.1 +++ highlight-2.4-makefile.patch 8 Aug 2005 18:18:05 -0000 1.2 @@ -1,5 +1,5 @@ --- highlight-2.4-1/makefile.org 2005-07-19 11:27:46.000000000 +0200 -+++ highlight-2.4-1/makefile 2005-07-24 22:24:39.000000000 +0200 ++++ highlight-2.4-1/makefile 2005-08-08 20:07:16.000000000 +0200 @@ -7,7 +7,7 @@ data_dir = ${DESTDIR}/usr/share/highlight/ @@ -9,16 +9,18 @@ # Location where the highlight man page will be installed: man_dir = ${DESTDIR}/usr/share/man/man1/ -@@ -16,7 +16,7 @@ +@@ -16,8 +16,9 @@ doc_dir = ${DESTDIR}/usr/share/doc/highlight/ # Location where the highlight examples will be installed: -examples_dir = ${doc_dir}examples/ +examples_dir = $(DESTDIR)/${doc_dir}examples/ ++etc_dir = $(DESTDIR)/etc/highlight # Commands: -@@ -40,12 +40,6 @@ + INSTALL_DATA=install -m644 +@@ -40,12 +41,6 @@ @echo "Binary directory: ${bin_dir}" @echo @@ -31,7 +33,16 @@ ${MKDIR} ${data_dir} \ ${data_dir}themes \ ${data_dir}langDefs \ -@@ -60,18 +54,6 @@ +@@ -53,25 +48,14 @@ + ${data_dir}helpmsg + ${MKDIR} ${man_dir} + ${MKDIR} ${bin_dir} ++ $(MKDIR) $(etc_dir) + + ${INSTALL_DATA} ./langDefs/*.lang ${data_dir}langDefs/ +- ${INSTALL_DATA} ./*.conf ${data_dir} ++ ${INSTALL_DATA} ./*.conf ${etc_dir} + ${INSTALL_DATA} ./themes/*.style ${data_dir}themes/ ${INSTALL_DATA} ./indentSchemes/*.indent ${data_dir}indentSchemes/ ${INSTALL_DATA} ./helpmsg/*.help ${data_dir}helpmsg/ ${INSTALL_DATA} ./man/highlight.1.gz ${man_dir} Index: highlight.spec =================================================================== RCS file: /cvs/extras/rpms/highlight/devel/highlight.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- highlight.spec 4 Aug 2005 15:42:26 -0000 1.2 +++ highlight.spec 8 Aug 2005 18:18:05 -0000 1.3 @@ -1,7 +1,7 @@ Name: highlight Summary: Universal source code to formatted text converter Version: 2.4.1 -Release: 3%{?dist} +Release: 4%{?dist} Group: Development/Tools License: GPL @@ -10,6 +10,7 @@ Source0: http://www.andre-simon.de/zip/%{name}-2.4-1.tar.bz2 Patch1: highlight-2.4-makefile.patch Patch2: highlight-2.4-rpmoptflags.patch +Patch3: highlight-2.4-etcdir.patch Buildroot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n) @@ -23,8 +24,9 @@ %prep %setup -q -n %{name}-2.4-1 -%patch1 -p1 +%patch1 -p1 -b .org %patch2 -p1 +%patch3 -p1 %build make %{?_smp_mflags} @@ -46,9 +48,14 @@ %{_datadir}/highlight/ %{_mandir}/man1/highlight.1* +%config /etc/highlight/ + %doc ChangeLog AUTHORS README* COPYING TODO examples/ %changelog +* Mon Aug 8 2005 Jochen Schmitt 2.4.1-4 +- Move extension.conf and scriptre.conf to /etc/highlight + * Wed Aug 3 2005 Jochen Schmitt 2.4.1-3 - Remove leading 'A' from summary line From fedora-extras-commits at redhat.com Mon Aug 8 18:20:37 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 8 Aug 2005 14:20:37 -0400 Subject: rpms/tidy/devel .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 tidy.spec, 1.9, 1.10 Message-ID: <200508081820.j78IKbGQ008249@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/tidy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8228 Modified Files: .cvsignore sources tidy.spec Log Message: * Mon Aug 8 2005 Rex Dieter 0.99.0-5.20050803 - Update to 050803 and docs to 050705 - simplify (fedora.us bug #2071) - drop missing manpage Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/tidy/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 17 Dec 2004 19:22:39 -0000 1.5 +++ .cvsignore 8 Aug 2005 18:20:35 -0000 1.6 @@ -1,2 +1,2 @@ -tidy_docs_041206.tgz -tidy_src_041214.tgz +tidy_docs_050705.tgz +tidy_src_050803.tgz Index: sources =================================================================== RCS file: /cvs/extras/rpms/tidy/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 17 Dec 2004 19:22:39 -0000 1.5 +++ sources 8 Aug 2005 18:20:35 -0000 1.6 @@ -1,2 +1,2 @@ -4ac92cbb22d86ae1a42c3d56b6c3f424 tidy_docs_041206.tgz -dc87c8acba1e71690c5104911aee6ed7 tidy_src_041214.tgz +2e6533fc48b077ff6243deaf21a781de tidy_docs_050705.tgz +c923202a85b3a430b61e780e4441e5e0 tidy_src_050803.tgz Index: tidy.spec =================================================================== RCS file: /cvs/extras/rpms/tidy/devel/tidy.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- tidy.spec 23 May 2005 00:00:44 -0000 1.9 +++ tidy.spec 8 Aug 2005 18:20:35 -0000 1.10 @@ -1,17 +1,24 @@ -Name: tidy -Version: 0.99.0 -Release: 4.20041214 - -Summary: Utility to clean up and pretty print HTML/XHTML/XML - -Group: Applications/Text -License: W3C Software License -URL: http://tidy.sourceforge.net/ -Source0: http://tidy.sourceforge.net/src/tidy_src_041214.tgz -Source1: http://tidy.sourceforge.net/docs/tidy_docs_041206.tgz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: libtool, doxygen +Name: tidy +Summary: Utility to clean up and pretty print HTML/XHTML/XML +Version: 0.99.0 +Release: 5.20050803%{?dist} + +Group: Applications/Text +License: W3C Software License +URL: http://tidy.sourceforge.net/ +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: http://tidy.sourceforge.net/src/tidy_src_050803.tgz +# When next snapshot is released, to become: +#Source0: http://tidy.sourceforge.net/src/old/tidy_src_050803.tgz +Source1: http://tidy.sourceforge.net/docs/tidy_docs_050705.tgz + +BuildRequires: libtool +BuildRequires: doxygen + +Obsoletes: libtidy < %{version}-%{release} +#Provides: libtidy = %{epoch}:%{version}-%{release} %description When editing HTML it's easy to make mistakes. Wouldn't it be nice if @@ -23,78 +30,82 @@ identify where you need to pay further attention on making your pages more accessible to people with disabilities. -%package -n lib%{name} -Summary: Shared libraries for tidy -Group: System Environment/Libraries - -%description -n lib%{name} -%{summary}. - -%package -n lib%{name}-devel -Summary: Development files for tidy -Group: Development/Libraries -Requires: lib%{name} = %{version}-%{release} - -%description -n lib%{name}-devel +%package devel +Summary: Development files for %{name} +Group: Development/Libraries +Obsoletes: libtidy-devel < %{version}-%{release} +#Provides: libtidy-devel = %{version}-%{release} +Requires: %{name} = %{version}-%{release} +%description devel %{summary}. %prep %setup -q -n %{name} + %setup -q -n %{name} -T -D -b1 rm -rf htmldoc/api mv htmldoc/doxygen.cfg Doxyfile +sh build/gnuauto/setup.sh + %build -sh build/gnuauto/setup.sh -%configure --disable-dependency-tracking +%configure \ + --disable-static \ + --disable-dependancy-tracking + make %{?_smp_mflags} doxygen %install rm -rf $RPM_BUILD_ROOT _api -make install DESTDIR=$RPM_BUILD_ROOT -install -Dpm 644 htmldoc/man_page.txt $RPM_BUILD_ROOT%{_mandir}/man1/tidy.1 + +make install%{!?debug_package:-strip} DESTDIR=$RPM_BUILD_ROOT + +#install -D -p -m644 htmldoc/man_page.txt $RPM_BUILD_ROOT%{_mandir}/man1/tidy.1 + mv htmldoc/api _api +## Unpackaged files +rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la + %clean rm -rf $RPM_BUILD_ROOT -%post -n lib%{name} -p /sbin/ldconfig +%post -p /sbin/ldconfig -%postun -n lib%{name} -p /sbin/ldconfig +%postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc htmldoc/* -%{_bindir}/tidy -%{_bindir}/tab2space -%{_mandir}/man1/tidy.1* - -%files -n lib%{name} -%defattr(-,root,root,-) -%{_libdir}/libtidy*.so.* +%{_bindir}/* +#{_mandir}/man1/* +%{_libdir}/lib*.so.* -%files -n lib%{name}-devel +%files devel %defattr(-,root,root,-) %doc _api/* -%{_includedir}/*.h -%{_libdir}/libtidy.so -%{_libdir}/libtidy.a -%exclude %{_libdir}/libtidy.la +%{_includedir}/* +%{_libdir}/lib*.so %changelog +* Mon Aug 8 2005 Rex Dieter 0.99.0-5.20050803 +- Update to 050803 and docs to 050705 +- simplify (fedora.us bug #2071) +- drop missing manpage + * Sun May 22 2005 Jeremy Katz - 0.99.0-4.20041214 - rebuild on all arches * Fri Apr 7 2005 Michael Schwendt -- rebuilt +- rebuilt * Thu Dec 16 2004 Ville Skytt?? - 0:0.99.0-2.20041214 - Update to 041214 and docs to 041206. From fedora-extras-commits at redhat.com Mon Aug 8 18:24:28 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 8 Aug 2005 14:24:28 -0400 Subject: rpms/perl-GD/FC-3 .cvsignore, 1.5, 1.6 perl-GD.spec, 1.5, 1.6 sources, 1.5, 1.6 Message-ID: <200508081824.j78IOT16008337@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-GD/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8288/FC-3 Modified Files: .cvsignore perl-GD.spec sources Log Message: Update to 2.28. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-GD/FC-3/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 19 Jul 2005 12:17:24 -0000 1.5 +++ .cvsignore 8 Aug 2005 18:24:26 -0000 1.6 @@ -1 +1 @@ -GD-2.25.tar.gz +GD-2.28.tar.gz Index: perl-GD.spec =================================================================== RCS file: /cvs/extras/rpms/perl-GD/FC-3/perl-GD.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-GD.spec 19 Jul 2005 12:17:24 -0000 1.5 +++ perl-GD.spec 8 Aug 2005 18:24:26 -0000 1.6 @@ -1,5 +1,5 @@ Name: perl-GD -Version: 2.25 +Version: 2.28 Release: 1%{?dist} Summary: Perl interface to the GD graphics library @@ -64,6 +64,9 @@ %changelog +* Mon Aug 8 2005 Jose Pedro Oliveira - 2.28-1 +- Update to 2.28. + * Tue Jul 19 2005 Jose Pedro Oliveira - 2.25-1 - Update to 2.25. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-GD/FC-3/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 19 Jul 2005 12:17:24 -0000 1.5 +++ sources 8 Aug 2005 18:24:26 -0000 1.6 @@ -1 +1 @@ -aab3f7730ebc54eb6a2a485bc2aa4864 GD-2.25.tar.gz +de591245f779e2ed11851d1470d4e9df GD-2.28.tar.gz From fedora-extras-commits at redhat.com Mon Aug 8 18:24:29 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 8 Aug 2005 14:24:29 -0400 Subject: rpms/perl-GD/FC-4 .cvsignore, 1.5, 1.6 perl-GD.spec, 1.7, 1.8 sources, 1.5, 1.6 Message-ID: <200508081824.j78IOTkw008345@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-GD/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8288/FC-4 Modified Files: .cvsignore perl-GD.spec sources Log Message: Update to 2.28. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-GD/FC-4/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 19 Jul 2005 12:17:24 -0000 1.5 +++ .cvsignore 8 Aug 2005 18:24:27 -0000 1.6 @@ -1 +1 @@ -GD-2.25.tar.gz +GD-2.28.tar.gz Index: perl-GD.spec =================================================================== RCS file: /cvs/extras/rpms/perl-GD/FC-4/perl-GD.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- perl-GD.spec 19 Jul 2005 12:17:24 -0000 1.7 +++ perl-GD.spec 8 Aug 2005 18:24:27 -0000 1.8 @@ -1,5 +1,5 @@ Name: perl-GD -Version: 2.25 +Version: 2.28 Release: 1%{?dist} Summary: Perl interface to the GD graphics library @@ -64,6 +64,9 @@ %changelog +* Mon Aug 8 2005 Jose Pedro Oliveira - 2.28-1 +- Update to 2.28. + * Tue Jul 19 2005 Jose Pedro Oliveira - 2.25-1 - Update to 2.25. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-GD/FC-4/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 19 Jul 2005 12:17:24 -0000 1.5 +++ sources 8 Aug 2005 18:24:27 -0000 1.6 @@ -1 +1 @@ -aab3f7730ebc54eb6a2a485bc2aa4864 GD-2.25.tar.gz +de591245f779e2ed11851d1470d4e9df GD-2.28.tar.gz From fedora-extras-commits at redhat.com Mon Aug 8 18:24:29 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 8 Aug 2005 14:24:29 -0400 Subject: rpms/perl-GD/devel .cvsignore, 1.5, 1.6 perl-GD.spec, 1.7, 1.8 sources, 1.5, 1.6 Message-ID: <200508081824.j78IOT6U008353@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-GD/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8288/devel Modified Files: .cvsignore perl-GD.spec sources Log Message: Update to 2.28. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-GD/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 19 Jul 2005 12:17:25 -0000 1.5 +++ .cvsignore 8 Aug 2005 18:24:27 -0000 1.6 @@ -1 +1 @@ -GD-2.25.tar.gz +GD-2.28.tar.gz Index: perl-GD.spec =================================================================== RCS file: /cvs/extras/rpms/perl-GD/devel/perl-GD.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- perl-GD.spec 19 Jul 2005 12:17:25 -0000 1.7 +++ perl-GD.spec 8 Aug 2005 18:24:27 -0000 1.8 @@ -1,5 +1,5 @@ Name: perl-GD -Version: 2.25 +Version: 2.28 Release: 1%{?dist} Summary: Perl interface to the GD graphics library @@ -64,6 +64,9 @@ %changelog +* Mon Aug 8 2005 Jose Pedro Oliveira - 2.28-1 +- Update to 2.28. + * Tue Jul 19 2005 Jose Pedro Oliveira - 2.25-1 - Update to 2.25. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-GD/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 19 Jul 2005 12:17:25 -0000 1.5 +++ sources 8 Aug 2005 18:24:27 -0000 1.6 @@ -1 +1 @@ -aab3f7730ebc54eb6a2a485bc2aa4864 GD-2.25.tar.gz +de591245f779e2ed11851d1470d4e9df GD-2.28.tar.gz From paul at city-fan.org Tue Aug 9 11:02:48 2005 From: paul at city-fan.org (Paul Howarth) Date: Tue, 09 Aug 2005 12:02:48 +0100 Subject: rpms/tidy/devel .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 tidy.spec, 1.9, 1.10 In-Reply-To: <200508081820.j78IKbGQ008249@cvs-int.fedora.redhat.com> References: <200508081820.j78IKbGQ008249@cvs-int.fedora.redhat.com> Message-ID: <42F88D58.1020309@city-fan.org> Rex Dieter (rdieter) wrote: > Author: rdieter > > Update of /cvs/extras/rpms/tidy/devel > In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8228 > > Modified Files: > .cvsignore sources tidy.spec > Log Message: > * Mon Aug 8 2005 Rex Dieter 0.99.0-5.20050803 > - Update to 050803 and docs to 050705 > - simplify (fedora.us bug #2071) > - drop missing manpage Attached patch restores dropped manpage. Paul. -------------- next part -------------- A non-text attachment was scrubbed... Name: tidy-manpage.patch Type: text/x-patch Size: 1445 bytes Desc: not available URL: From fedora-extras-commits at redhat.com Tue Aug 9 11:21:03 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 9 Aug 2005 07:21:03 -0400 Subject: rpms/WindowMaker/devel WindowMaker.spec,1.9,1.10 Message-ID: <200508091121.j79BL3fP025803@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/WindowMaker/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25786 Modified Files: WindowMaker.spec Log Message: - try to fix x86_64 build Index: WindowMaker.spec =================================================================== RCS file: /cvs/extras/rpms/WindowMaker/devel/WindowMaker.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- WindowMaker.spec 9 Aug 2005 01:29:26 -0000 1.9 +++ WindowMaker.spec 9 Aug 2005 11:21:00 -0000 1.10 @@ -1,7 +1,7 @@ Summary: A fast, feature rich Window Manager Name: WindowMaker Version: 0.92.0 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: User Interface/Desktops @@ -47,6 +47,10 @@ # disable mmx for now sed -i -e's/#define ASM_X86_MMX 1/#undef ASM_X86_MMX/' src/config.h +%ifarch x86_64 +sed -i -e's/#define ASM_X86 1/#undef ASM_X86/' src/config.h +%endif + make %{?_smp_mflags} @@ -97,6 +101,10 @@ %changelog * Tue Aug 09 2005 Andreas Bierfert +0.92.0-2 +- try to fix x86_64 build + +* Tue Aug 09 2005 Andreas Bierfert 0.92.0-1 - upgrade to new version - use dist tag From fedora-extras-commits at redhat.com Tue Aug 9 11:20:14 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 9 Aug 2005 07:20:14 -0400 Subject: rpms/WindowMaker/FC-3 WindowMaker.spec,1.7,1.8 Message-ID: <200508091120.j79BKEuR025742@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/WindowMaker/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25725 Modified Files: WindowMaker.spec Log Message: - try to fix x86_64 build Index: WindowMaker.spec =================================================================== RCS file: /cvs/extras/rpms/WindowMaker/FC-3/WindowMaker.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- WindowMaker.spec 9 Aug 2005 01:28:11 -0000 1.7 +++ WindowMaker.spec 9 Aug 2005 11:20:12 -0000 1.8 @@ -1,7 +1,7 @@ Summary: A fast, feature rich Window manager. Name: WindowMaker Version: 0.92.0 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 0 License: GPL Group: User Interface/Desktops @@ -44,6 +44,11 @@ %configure --enable-gnome --enable-kde --enable-usermenu --enable-xinerama \ --enable-fast-install --enable-modelock +%ifarch x86_64 +sed -i -e's/#define ASM_X86 1/#undef ASM_X86/' src/config.h +sed -i -e's/#define ASM_X86_MMX 1/#undef ASM_X86_MMX/' src/config.h +%endif + make %{?_smp_mflags} %install @@ -91,6 +96,10 @@ %changelog * Tue Aug 09 2005 Andreas Bierfert +0.92.0-2 +- try to fix x86_64 build + +* Tue Aug 09 2005 Andreas Bierfert 0.92.0-1 - upgrade to new version - use dist tag From fedora-extras-commits at redhat.com Tue Aug 9 11:03:13 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 9 Aug 2005 07:03:13 -0400 Subject: rpms/WindowMaker/FC-4 WindowMaker.spec,1.9,1.10 Message-ID: <200508091103.j79B3iBZ025640@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/WindowMaker/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25626 Modified Files: WindowMaker.spec Log Message: - try to fix x86_64 build Index: WindowMaker.spec =================================================================== RCS file: /cvs/extras/rpms/WindowMaker/FC-4/WindowMaker.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- WindowMaker.spec 9 Aug 2005 01:28:40 -0000 1.9 +++ WindowMaker.spec 9 Aug 2005 11:03:11 -0000 1.10 @@ -1,7 +1,7 @@ Summary: A fast, feature rich Window Manager Name: WindowMaker Version: 0.92.0 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: User Interface/Desktops @@ -47,6 +47,10 @@ # disable mmx for now sed -i -e's/#define ASM_X86_MMX 1/#undef ASM_X86_MMX/' src/config.h +%ifarch x86_64 +sed -i -e's/#define ASM_X86 1/#undef ASM_X86/' src/config.h +%endif + make %{?_smp_mflags} @@ -97,6 +101,10 @@ %changelog * Tue Aug 09 2005 Andreas Bierfert +0.92.0-2 +- try to fix x86_64 build + +* Tue Aug 09 2005 Andreas Bierfert 0.92.0-1 - upgrade to new version - use dist tag From fedora-extras-commits at redhat.com Tue Aug 9 03:06:36 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 8 Aug 2005 23:06:36 -0400 Subject: extras-buildsys plague.spec,1.22,1.23 Message-ID: <200508090307.j79377WM021701@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21684 Modified Files: plague.spec Log Message: Fix specfile error Index: plague.spec =================================================================== RCS file: /cvs/fedora/extras-buildsys/plague.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- plague.spec 8 Aug 2005 19:51:33 -0000 1.22 +++ plague.spec 9 Aug 2005 03:06:32 -0000 1.23 @@ -145,7 +145,7 @@ %files utils %defattr(-, root, root) %{_bindir}/%{name}-user-manager.py* -%{_binder}/%{name}-certhelper.py* +%{_bindir}/%{name}-certhelper.py* %changelog From fedora-extras-commits at redhat.com Tue Aug 9 01:28:42 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Mon, 8 Aug 2005 21:28:42 -0400 Subject: rpms/WindowMaker/FC-4 WindowMaker.desktop, NONE, 1.1 WindowMaker.xsession, NONE, 1.1 .cvsignore, 1.3, 1.4 WindowMaker.spec, 1.8, 1.9 sources, 1.3, 1.4 Message-ID: <200508090128.j791Sgx7019093@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/WindowMaker/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19070 Modified Files: .cvsignore WindowMaker.spec sources Added Files: WindowMaker.desktop WindowMaker.xsession Log Message: - upgrade to new version - use dist tag - use smp_mflags - fix #163459 --- NEW FILE WindowMaker.desktop --- [Desktop Entry] Encoding=UTF-8 Name=WindowMaker Comment=Start Window Maker Exec=wmaker Type=Application [Window Manager] SessionManaged=true --- NEW FILE WindowMaker.xsession --- #!/bin/sh exec /etc/X11/xdm/Xsession wmaker Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/WindowMaker/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 31 May 2005 11:02:20 -0000 1.3 +++ .cvsignore 9 Aug 2005 01:28:40 -0000 1.4 @@ -1 +1 @@ -WindowMaker-0.91.0.tar.bz2 +WindowMaker-0.92.0.tar.bz2 Index: WindowMaker.spec =================================================================== RCS file: /cvs/extras/rpms/WindowMaker/FC-4/WindowMaker.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- WindowMaker.spec 31 May 2005 12:09:53 -0000 1.8 +++ WindowMaker.spec 9 Aug 2005 01:28:40 -0000 1.9 @@ -1,12 +1,14 @@ Summary: A fast, feature rich Window Manager Name: WindowMaker -Version: 0.91.0 -Release: 2.fc4 +Version: 0.92.0 +Release: 1%{?dist} License: GPL Group: User Interface/Desktops URL: http://www.windowmaker.org/ -Source0: ftp://windowmaker.org/pub/source/release/WindowMaker-0.91.0.tar.bz2 +Source0: ftp://windowmaker.org/pub/source/release/WindowMaker-0.92.0.tar.bz2 +Source1: WindowMaker.xsession +Source2: WindowMaker.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: xorg-x11-devel libpng-devel libjpeg-devel libungif-devel BuildRequires: libtiff-devel zlib-devel gettext-devel @@ -44,8 +46,8 @@ --enable-fast-install --enable-modelock # disable mmx for now sed -i -e's/#define ASM_X86_MMX 1/#undef ASM_X86_MMX/' src/config.h -# Dont use _smp_mflags. Race condition. -make + +make %{?_smp_mflags} %install @@ -56,6 +58,10 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libwraster.la +install -D -m0755 %{SOURCE1} \ +%{buildroot}%{_sysconfdir}/X11/gdm/Sessions/WindowMaker +install -D -m0644 %{SOURCE2} \ +%{buildroot}%{_sysconfdir}/X11/dm/Sessions/WindowMaker.desktop %clean rm -rf $RPM_BUILD_ROOT @@ -65,7 +71,8 @@ %defattr(-,root,root,-) %doc AUTHORS ChangeLog NEWS FAQ* README* COPYING* %config %{_sysconfdir}/%{name} -%exclude %{_bindir}/get-*-flags +%{_sysconfdir}/X11/gdm/Sessions/WindowMaker +%{_sysconfdir}/X11/dm/Sessions/WindowMaker.desktop %{_bindir}/* %{_datadir}/%{name} %{_datadir}/WINGs @@ -73,6 +80,7 @@ %{_libdir}/libwraster.so.* %{_mandir}/man1/*.1x* %{_mandir}/sk/man1/*.1x* +%exclude %{_bindir}/get-*-flags %files devel %defattr(-,root,root,-) @@ -88,6 +96,13 @@ %changelog +* Tue Aug 09 2005 Andreas Bierfert +0.92.0-1 +- upgrade to new version +- use dist tag +- use smp_mflags +- fix #163459 + * Tue May 31 2005 Andreas Bierfert - add disttag fc3 Author: awjb Update of /cvs/extras/rpms/WindowMaker/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19104 Modified Files: .cvsignore WindowMaker.spec sources Added Files: WindowMaker.desktop WindowMaker.xsession Log Message: - upgrade to new version - use dist tag - use smp_mflags - fix #163459 --- NEW FILE WindowMaker.desktop --- [Desktop Entry] Encoding=UTF-8 Name=WindowMaker Comment=Start Window Maker Exec=wmaker Type=Application [Window Manager] SessionManaged=true --- NEW FILE WindowMaker.xsession --- #!/bin/sh exec /etc/X11/xdm/Xsession wmaker Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/WindowMaker/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 31 May 2005 11:02:20 -0000 1.3 +++ .cvsignore 9 Aug 2005 01:29:26 -0000 1.4 @@ -1 +1 @@ -WindowMaker-0.91.0.tar.bz2 +WindowMaker-0.92.0.tar.bz2 Index: WindowMaker.spec =================================================================== RCS file: /cvs/extras/rpms/WindowMaker/devel/WindowMaker.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- WindowMaker.spec 31 May 2005 12:09:53 -0000 1.8 +++ WindowMaker.spec 9 Aug 2005 01:29:26 -0000 1.9 @@ -1,12 +1,14 @@ Summary: A fast, feature rich Window Manager Name: WindowMaker -Version: 0.91.0 -Release: 2.fc4 +Version: 0.92.0 +Release: 1%{?dist} License: GPL Group: User Interface/Desktops URL: http://www.windowmaker.org/ -Source0: ftp://windowmaker.org/pub/source/release/WindowMaker-0.91.0.tar.bz2 +Source0: ftp://windowmaker.org/pub/source/release/WindowMaker-0.92.0.tar.bz2 +Source1: WindowMaker.xsession +Source2: WindowMaker.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: xorg-x11-devel libpng-devel libjpeg-devel libungif-devel BuildRequires: libtiff-devel zlib-devel gettext-devel @@ -44,8 +46,8 @@ --enable-fast-install --enable-modelock # disable mmx for now sed -i -e's/#define ASM_X86_MMX 1/#undef ASM_X86_MMX/' src/config.h -# Dont use _smp_mflags. Race condition. -make + +make %{?_smp_mflags} %install @@ -56,6 +58,10 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libwraster.la +install -D -m0755 %{SOURCE1} \ +%{buildroot}%{_sysconfdir}/X11/gdm/Sessions/WindowMaker +install -D -m0644 %{SOURCE2} \ +%{buildroot}%{_sysconfdir}/X11/dm/Sessions/WindowMaker.desktop %clean rm -rf $RPM_BUILD_ROOT @@ -65,7 +71,8 @@ %defattr(-,root,root,-) %doc AUTHORS ChangeLog NEWS FAQ* README* COPYING* %config %{_sysconfdir}/%{name} -%exclude %{_bindir}/get-*-flags +%{_sysconfdir}/X11/gdm/Sessions/WindowMaker +%{_sysconfdir}/X11/dm/Sessions/WindowMaker.desktop %{_bindir}/* %{_datadir}/%{name} %{_datadir}/WINGs @@ -73,6 +80,7 @@ %{_libdir}/libwraster.so.* %{_mandir}/man1/*.1x* %{_mandir}/sk/man1/*.1x* +%exclude %{_bindir}/get-*-flags %files devel %defattr(-,root,root,-) @@ -88,6 +96,13 @@ %changelog +* Tue Aug 09 2005 Andreas Bierfert +0.92.0-1 +- upgrade to new version +- use dist tag +- use smp_mflags +- fix #163459 + * Tue May 31 2005 Andreas Bierfert - add disttag fc3 Author: awjb Update of /cvs/extras/rpms/WindowMaker/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19041 Modified Files: .cvsignore WindowMaker.spec sources Added Files: WindowMaker.desktop WindowMaker.xsession Log Message: - upgrade to new version - use dist tag - use smp_mflags - fix #163459 --- NEW FILE WindowMaker.desktop --- [Desktop Entry] Encoding=UTF-8 Name=WindowMaker Comment=Start Window Maker Exec=wmaker Type=Application [Window Manager] SessionManaged=true --- NEW FILE WindowMaker.xsession --- #!/bin/sh exec /etc/X11/xdm/Xsession wmaker Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/WindowMaker/FC-3/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 31 May 2005 11:36:57 -0000 1.3 +++ .cvsignore 9 Aug 2005 01:28:11 -0000 1.4 @@ -1 +1 @@ -WindowMaker-0.91.0.tar.bz2 +WindowMaker-0.92.0.tar.bz2 Index: WindowMaker.spec =================================================================== RCS file: /cvs/extras/rpms/WindowMaker/FC-3/WindowMaker.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- WindowMaker.spec 31 May 2005 12:11:18 -0000 1.6 +++ WindowMaker.spec 9 Aug 2005 01:28:11 -0000 1.7 @@ -1,12 +1,14 @@ Summary: A fast, feature rich Window manager. Name: WindowMaker -Version: 0.91.0 -Release: 2%{?dist} +Version: 0.92.0 +Release: 1%{?dist} Epoch: 0 License: GPL Group: User Interface/Desktops URL: http://www.windowmaker.org/ -Source0: ftp://windowmaker.org/pub/source/release/WindowMaker-0.91.0.tar.bz2 +Source0: ftp://windowmaker.org/pub/source/release/WindowMaker-0.92.0.tar.bz2 +Source1: WindowMaker.xsession +Source2: WindowMaker.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: XFree86-devel libpng-devel libjpeg-devel libungif-devel BuildRequires: libtiff-devel zlib-devel gettext @@ -41,8 +43,8 @@ export LINGUAS NLSDIR GNUSTEP_LOCAL_ROOT %configure --enable-gnome --enable-kde --enable-usermenu --enable-xinerama \ --enable-fast-install --enable-modelock -# Dont use _smp_mflags. Race condition. -make + +make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT @@ -52,6 +54,11 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libwraster.la +install -D -m0755 %{SOURCE1} \ +%{buildroot}%{_sysconfdir}/X11/gdm/Sessions/WindowMaker +install -D -m0644 %{SOURCE2} \ +%{buildroot}%{_sysconfdir}/X11/dm/Sessions/WindowMaker.desktop + %clean rm -rf $RPM_BUILD_ROOT @@ -59,7 +66,8 @@ %defattr(-,root,root,-) %doc AUTHORS ChangeLog NEWS FAQ* README* COPYING* %config %{_sysconfdir}/%{name} -%exclude %{_bindir}/get-*-flags +%{_sysconfdir}/X11/gdm/Sessions/WindowMaker +%{_sysconfdir}/X11/dm/Sessions/WindowMaker.desktop %{_bindir}/* %{_datadir}/%{name} %{_datadir}/WINGs @@ -67,6 +75,7 @@ %{_libdir}/libwraster.so.* %{_mandir}/man1/*.1x* %{_mandir}/sk/man1/*.1x* +%exclude %{_bindir}/get-*-flags %files devel %defattr(-,root,root,-) @@ -81,6 +90,13 @@ %{_libdir}/pkgconfig/*pc %changelog +* Tue Aug 09 2005 Andreas Bierfert +0.92.0-1 +- upgrade to new version +- use dist tag +- use smp_mflags +- fix #163459 + * Tue May 31 2005 Andreas Bierfert - add dist macro... Index: sources =================================================================== RCS file: /cvs/extras/rpms/WindowMaker/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 31 May 2005 11:36:57 -0000 1.3 +++ sources 9 Aug 2005 01:28:11 -0000 1.4 @@ -1 +1 @@ -9d5e583e6cce5b4d16bb686b0c26c5dc WindowMaker-0.91.0.tar.bz2 +aaac5421b686ed2d3e6ab65229c98097 WindowMaker-0.92.0.tar.bz2 From fedora-extras-commits at redhat.com Tue Aug 9 00:16:35 2005 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Mon, 8 Aug 2005 20:16:35 -0400 Subject: rpms/xprobe2 - New directory Message-ID: <200508090016.j790GZqY017467@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/rpms/xprobe2 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17447/xprobe2 Log Message: Directory /cvs/extras/rpms/xprobe2 added to the repository From fedora-extras-commits at redhat.com Tue Aug 9 00:16:36 2005 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Mon, 8 Aug 2005 20:16:36 -0400 Subject: rpms/xprobe2/devel - New directory Message-ID: <200508090016.j790Ga93017472@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/rpms/xprobe2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17447/xprobe2/devel Log Message: Directory /cvs/extras/rpms/xprobe2/devel added to the repository From fedora-extras-commits at redhat.com Tue Aug 9 00:16:51 2005 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Mon, 8 Aug 2005 20:16:51 -0400 Subject: rpms/xprobe2/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200508090016.j790Gpx6017524@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/rpms/xprobe2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17492/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module xprobe2 --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Tue Aug 9 00:16:50 2005 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Mon, 8 Aug 2005 20:16:50 -0400 Subject: rpms/xprobe2 Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200508090016.j790GoiH017519@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/rpms/xprobe2 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17492 Added Files: Makefile import.log Log Message: Setup of module xprobe2 --- NEW FILE Makefile --- # Top level Makefile for module xprobe2 all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Tue Aug 9 00:17:30 2005 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Mon, 8 Aug 2005 20:17:30 -0400 Subject: rpms/xprobe2 import.log,1.1,1.2 Message-ID: <200508090017.j790HUaR017587@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/rpms/xprobe2 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17556 Modified Files: import.log Log Message: auto-import xprobe2-0.3-1 on branch devel from xprobe2-0.3-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/xprobe2/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 9 Aug 2005 00:16:48 -0000 1.1 +++ import.log 9 Aug 2005 00:17:28 -0000 1.2 @@ -0,0 +1 @@ +xprobe2-0_3-1:HEAD:xprobe2-0.3-1.src.rpm:1123546738 From fedora-extras-commits at redhat.com Tue Aug 9 00:34:34 2005 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Mon, 8 Aug 2005 20:34:34 -0400 Subject: owners owners.list,1.58,1.59 Message-ID: <200508090034.j790YYw8017843@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17826 Modified Files: owners.list Log Message: Add xprobe2 component Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- owners.list 8 Aug 2005 20:12:23 -0000 1.58 +++ owners.list 9 Aug 2005 00:34:32 -0000 1.59 @@ -910,6 +910,7 @@ Fedora Extras|xmms|The X MultiMedia System, a media player which resembles Winamp|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|xosd|On-screen display library for X|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|xplanet|Render a planetary image into an X window|jylitalo at iki.fi|extras-qa at fedoraproject.org| +Fedora Extras|xprobe2|An active operating system fingerprinting tool|lmacken at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|xtide|A program for calculating tide all over the world|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|xvattr|Utility for getting and setting Xv attributes|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|yap|High-performance Prolog Compiler|gemi at bluewin.ch|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Tue Aug 9 00:17:30 2005 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Mon, 8 Aug 2005 20:17:30 -0400 Subject: rpms/xprobe2/devel xprobe2.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200508090017.j790HURg017594@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/rpms/xprobe2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17556/devel Modified Files: .cvsignore sources Added Files: xprobe2.spec Log Message: auto-import xprobe2-0.3-1 on branch devel from xprobe2-0.3-1.src.rpm --- NEW FILE xprobe2.spec --- Name: xprobe2 Version: 0.3 Release: 1%{?dist} Summary: Xprobe2 is an active operating system fingerprinting tool Group: Applications/Internet License: GPL URL: http://www.sys-security.com/index.php?page=xprobe Source0: http://dl.sf.net/xprobe/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libpcap %description Xprobe is an alternative to some tools which are heavily dependent upon the usage of the TCP protocol for remote active operating system fingerprinting. Xprobe I combines various remote active operating system fingerprinting methods using the ICMP protocol, which were discovered during the "ICMP Usage in Scanning" research project, into a simple, fast, efficient and a powerful way to detect an underlying operating system a targeted host is using. Xprobe2 is an active operating system fingerprinting tool with a different approach to operating system fingerprinting. Xprobe2 rely on fuzzy signature matching, probabilistic guesses, multiple matches simultaneously, and a signature database. %prep %setup -q chmod 644 docs/* COPYING TODO %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc AUTHORS CHANGELOG README CREDITS COPYING TODO docs/* %dir %{_sysconfdir}/xprobe2 %config(noreplace) %{_sysconfdir}/xprobe2/xprobe2.conf %{_bindir}/xprobe2 %{_mandir}/*/* %changelog * Fri Aug 05 2005 Luke Macken 0.3-1 - Packaged for Fedora Extras Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xprobe2/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 9 Aug 2005 00:16:49 -0000 1.1 +++ .cvsignore 9 Aug 2005 00:17:28 -0000 1.2 @@ -0,0 +1 @@ +xprobe2-0.3.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/xprobe2/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 9 Aug 2005 00:16:49 -0000 1.1 +++ sources 9 Aug 2005 00:17:28 -0000 1.2 @@ -0,0 +1 @@ +3ebb89ed9380038d368327816e34ec54 xprobe2-0.3.tar.gz From fedora-extras-commits at redhat.com Mon Aug 8 22:52:11 2005 From: fedora-extras-commits at redhat.com (Zing Zing Shishak (shishz)) Date: Mon, 8 Aug 2005 18:52:11 -0400 Subject: common tobuild,1.2193,1.2194 Message-ID: <200508082252.j78MqB8e015011@cvs-int.fedora.redhat.com> Author: shishz Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14994 Modified Files: tobuild Log Message: request build of rpms/snownews/devel snownews-1_5_7-2_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2193 retrieving revision 1.2194 diff -u -r1.2193 -r1.2194 --- tobuild 7 Aug 2005 10:14:55 -0000 1.2193 +++ tobuild 8 Aug 2005 22:52:08 -0000 1.2194 @@ -27,3 +27,4 @@ anvil rpms/galeon/FC-4 galeon-1_3_21-12_fc4 fc4 gemi rpms/unison/FC-3 unison-2_12_0-1_fc3 fc3 wtogami rpms/perl-Razor-Agent/devel perl-Razor-Agent-2_75-1_fc5 devel +shishz rpms/snownews/devel snownews-1_5_7-2_fc5 devel From fedora-extras-commits at redhat.com Mon Aug 8 20:55:48 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 8 Aug 2005 16:55:48 -0400 Subject: rpms/libksba/FC-4 libksba-0.9.12.tar.bz2.sig,1.1,NONE Message-ID: <200508082055.j78KtmAk012482@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/libksba/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12454/FC-4 Removed Files: libksba-0.9.12.tar.bz2.sig Log Message: remove .sig from cvs --- libksba-0.9.12.tar.bz2.sig DELETED --- From fedora-extras-commits at redhat.com Mon Aug 8 20:55:48 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 8 Aug 2005 16:55:48 -0400 Subject: rpms/libksba/FC-3 libksba-0.9.12.tar.bz2.sig,1.1,NONE Message-ID: <200508082055.j78KtmUQ012477@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/libksba/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12454/FC-3 Removed Files: libksba-0.9.12.tar.bz2.sig Log Message: remove .sig from cvs --- libksba-0.9.12.tar.bz2.sig DELETED --- From fedora-extras-commits at redhat.com Mon Aug 8 20:55:54 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 8 Aug 2005 16:55:54 -0400 Subject: rpms/libksba/devel libksba-0.9.12.tar.bz2.sig,1.1,NONE Message-ID: <200508082055.j78Ktsx9012501@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/libksba/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12454/devel Removed Files: libksba-0.9.12.tar.bz2.sig Log Message: remove .sig from cvs --- libksba-0.9.12.tar.bz2.sig DELETED --- From fedora-extras-commits at redhat.com Mon Aug 8 20:37:21 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 8 Aug 2005 16:37:21 -0400 Subject: rpms/libassuan/FC-3 libassuan-0.6.10.tar.gz.sig,1.1,NONE Message-ID: <200508082037.j78KbLTJ012153@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/libassuan/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12138 Removed Files: libassuan-0.6.10.tar.gz.sig Log Message: don't need a local copy --- libassuan-0.6.10.tar.gz.sig DELETED --- From fedora-extras-commits at redhat.com Mon Aug 8 20:52:53 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 8 Aug 2005 16:52:53 -0400 Subject: rpms/libksba/FC-4 .cvsignore,1.5,1.6 sources,1.5,1.6 Message-ID: <200508082052.j78KqrhN012322@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/libksba/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12302 Modified Files: .cvsignore sources Log Message: add .sig source Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libksba/FC-4/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 8 Aug 2005 20:12:05 -0000 1.5 +++ .cvsignore 8 Aug 2005 20:52:51 -0000 1.6 @@ -1 +1,2 @@ libksba-0.9.12.tar.bz2 +libksba-0.9.12.tar.bz2.sig Index: sources =================================================================== RCS file: /cvs/extras/rpms/libksba/FC-4/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 8 Aug 2005 20:12:05 -0000 1.5 +++ sources 8 Aug 2005 20:52:51 -0000 1.6 @@ -1 +1,2 @@ 4d40a09134c5a0d2dcc6416f9abdcc98 libksba-0.9.12.tar.bz2 +9465c78bcdac0ea609cf37c2275a54af libksba-0.9.12.tar.bz2.sig From fedora-extras-commits at redhat.com Mon Aug 8 20:53:37 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 8 Aug 2005 16:53:37 -0400 Subject: rpms/libksba/FC-3 .cvsignore,1.4,1.5 sources,1.4,1.5 Message-ID: <200508082054.j78Ks8Xb012381@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/libksba/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12345/FC-3 Modified Files: .cvsignore sources Log Message: add .sig source Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libksba/FC-3/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 8 Aug 2005 20:10:38 -0000 1.4 +++ .cvsignore 8 Aug 2005 20:53:35 -0000 1.5 @@ -1 +1,2 @@ libksba-0.9.12.tar.bz2 +libksba-0.9.12.tar.bz2.sig Index: sources =================================================================== RCS file: /cvs/extras/rpms/libksba/FC-3/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 8 Aug 2005 20:10:38 -0000 1.4 +++ sources 8 Aug 2005 20:53:35 -0000 1.5 @@ -1 +1,2 @@ 4d40a09134c5a0d2dcc6416f9abdcc98 libksba-0.9.12.tar.bz2 +9465c78bcdac0ea609cf37c2275a54af libksba-0.9.12.tar.bz2.sig From fedora-extras-commits at redhat.com Mon Aug 8 20:53:38 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 8 Aug 2005 16:53:38 -0400 Subject: rpms/libksba/devel .cvsignore,1.5,1.6 sources,1.5,1.6 Message-ID: <200508082054.j78Ks826012385@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/libksba/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12345/devel Modified Files: .cvsignore sources Log Message: add .sig source Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libksba/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 8 Aug 2005 18:37:17 -0000 1.5 +++ .cvsignore 8 Aug 2005 20:53:36 -0000 1.6 @@ -1 +1,2 @@ libksba-0.9.12.tar.bz2 +libksba-0.9.12.tar.bz2.sig Index: sources =================================================================== RCS file: /cvs/extras/rpms/libksba/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 8 Aug 2005 18:37:17 -0000 1.5 +++ sources 8 Aug 2005 20:53:36 -0000 1.6 @@ -1 +1,2 @@ 4d40a09134c5a0d2dcc6416f9abdcc98 libksba-0.9.12.tar.bz2 +9465c78bcdac0ea609cf37c2275a54af libksba-0.9.12.tar.bz2.sig From fedora-extras-commits at redhat.com Mon Aug 8 20:49:47 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 8 Aug 2005 16:49:47 -0400 Subject: rpms/gpgme/devel .cvsignore, 1.3, 1.4 gpgme.spec, 1.9, 1.10 sources, 1.3, 1.4 gpgme-1.0.2.tar.bz2.sig, 1.1, NONE Message-ID: <200508082049.j78KnlZ5012287@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gpgme/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12266 Modified Files: .cvsignore gpgme.spec sources Removed Files: gpgme-1.0.2.tar.bz2.sig Log Message: * Mon Aug 8 2005 Rex Dieter - 1.0.3-1 - 1.0.3 - --disable-static Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gpgme/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 1 Feb 2005 19:47:28 -0000 1.3 +++ .cvsignore 8 Aug 2005 20:49:45 -0000 1.4 @@ -1 +1,2 @@ -gpgme-1.0.2.tar.bz2 +gpgme-1.0.3.tar.bz2 +gpgme-1.0.3.tar.bz2.sig Index: gpgme.spec =================================================================== RCS file: /cvs/extras/rpms/gpgme/devel/gpgme.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- gpgme.spec 12 May 2005 05:46:49 -0000 1.9 +++ gpgme.spec 8 Aug 2005 20:49:45 -0000 1.10 @@ -1,15 +1,18 @@ + Name: gpgme -Version: 1.0.2 -Release: 3%{?dist} Summary: GnuPG Made Easy - high level crypto API +Version: 1.0.3 +Release: 1%{?dist} + License: LGPL Group: Applications/System URL: http://www.gnupg.org/related_software/gpgme/ Source0: ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-%{version}.tar.bz2 Source1: ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-%{version}.tar.bz2.sig -Patch0: gpgme-1.0.2-macro.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Patch0: gpgme-1.0.2-macro.patch + BuildRequires: gnupg >= 1.2.2 BuildRequires: gnupg2 >= 1.9.6 BuildRequires: pth-devel @@ -33,28 +36,30 @@ Requires: libgpg-error-devel Requires(post): /sbin/install-info Requires(postun): /sbin/install-info -%description devel +%description devel Static libraries and header files from GPGME, GnuPG Made Easy. %prep %setup -q + %patch0 -p0 %build %configure \ - --program-prefix="%{?_program_prefix}" \ - --enable-static + --disable-static make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT + make install DESTDIR=$RPM_BUILD_ROOT -rm -f $RPM_BUILD_ROOT{%{_infodir}/dir,%{_libdir}/*.la} +rm -f $RPM_BUILD_ROOT%{_infodir}/dir +rm -f $RPM_BUILD_ROOT%{_libdir}/*.la %check || : @@ -66,8 +71,8 @@ %post -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%postun -p /sbin/ldconfig %post devel /sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir 2>/dev/null || : @@ -81,19 +86,23 @@ %files %defattr(-,root,root,-) %doc AUTHORS COPYING* ChangeLog NEWS README* THANKS TODO VERSION -%{_libdir}/libgpgme*.so.* +%{_libdir}/lib*.so.* %files devel %defattr(-,root,root,-) %{_bindir}/gpgme-config -%{_includedir}/gpgme.h -%{_libdir}/libgpgme*.a -%{_libdir}/libgpgme*.so +%{_includedir}/* +#{_libdir}/lib*.a +%{_libdir}/lib*.so %{_datadir}/aclocal/gpgme.m4 %{_infodir}/gpgme.info* %changelog +* Mon Aug 8 2005 Rex Dieter - 1.0.3-1 +- 1.0.3 +- --disable-static + * Thu May 12 2005 Michael Schwendt - 1.0.2-3 - rebuilt Index: sources =================================================================== RCS file: /cvs/extras/rpms/gpgme/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 1 Feb 2005 19:47:28 -0000 1.3 +++ sources 8 Aug 2005 20:49:45 -0000 1.4 @@ -1 +1,2 @@ -25513fd35593bad08c1e486878296b40 gpgme-1.0.2.tar.bz2 +84f85671d63164fb1d338c23010f023d gpgme-1.0.3.tar.bz2 +f91f3a341c0070aef7cec52e3cb4d770 gpgme-1.0.3.tar.bz2.sig --- gpgme-1.0.2.tar.bz2.sig DELETED --- From fedora-extras-commits at redhat.com Mon Aug 8 20:35:19 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 8 Aug 2005 16:35:19 -0400 Subject: rpms/libassuan/FC-3 libassuan-0.6.10.tar.gz.sig, NONE, 1.1 .cvsignore, 1.3, 1.4 libassuan.spec, 1.4, 1.5 sources, 1.3, 1.4 libassuan-0.6.9.tar.gz.sig, 1.1, NONE Message-ID: <200508082035.j78KZJwo012079@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/libassuan/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12057 Modified Files: .cvsignore libassuan.spec sources Added Files: libassuan-0.6.10.tar.gz.sig Removed Files: libassuan-0.6.9.tar.gz.sig Log Message: 0.6.10 --- NEW FILE libassuan-0.6.10.tar.gz.sig --- ?? Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libassuan/FC-3/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 1 Feb 2005 19:30:20 -0000 1.3 +++ .cvsignore 8 Aug 2005 20:35:17 -0000 1.4 @@ -1 +1,2 @@ -libassuan-0.6.9.tar.gz +libassuan-0.6.10.tar.gz +libassuan-0.6.10.tar.gz.sig Index: libassuan.spec =================================================================== RCS file: /cvs/extras/rpms/libassuan/FC-3/libassuan.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- libassuan.spec 3 Feb 2005 12:34:21 -0000 1.4 +++ libassuan.spec 8 Aug 2005 20:35:17 -0000 1.5 @@ -1,13 +1,12 @@ - -Summary: GnuPG IPC library -Name: libassuan -Version: 0.6.9 -Release: 2%{?dist_tag} -Source0: ftp://ftp.gnupg.org/pub/gcrypt/alpha/libassuan/libassuan-0.6.9.tar.gz -Source1: ftp://ftp.gnupg.org/pub/gcrypt/alpha/libassuan/libassuan-0.6.9.tar.gz.sig -URL: http://www.gnupg.org/ +Summary: GnuPG IPC library +Name: libassuan +Version: 0.6.10 +Release: 2%{?dist} +Source0: ftp://ftp.gnupg.org/gcrypt/alpha/libassuan/libassuan-%{version}.tar.gz +Source1: ftp://ftp.gnupg.org/gcrypt/alpha/libassuan/libassuan-%{version}.tar.gz.sig +URL: http://www.gnupg.org/ License: GPL -Group: System Environment/Libraries +Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -15,25 +14,29 @@ packages. %package devel -Summary: Development files for the %{name} package. +Summary: Development files for the %{name} package Group: Development/Libraries Requires(post): /sbin/install-info Requires(postun): /sbin/install-info + %description devel This is the IPC library used by GnuPG 1.9, GPGME and a few other -packages. +packages. This package contains files needed to develop applications using %{name}. %prep -%setup -q +%setup -q %build +%ifarch x86_64 +export CFLAGS="$RPM_OPT_FLAGS -fPIC" +%endif %configure -make CFLAGS="$RPM_OPT_FLAGS -fPIC -DPIC" %{?_smp_mflags} +make %{?_smp_mflags} %install @@ -79,6 +82,18 @@ %changelog +* Mon Jul 4 2005 Michael Schwendt - 0.6.10-2 +- Build PIC only for x86_64. + +* Fri Jul 1 2005 Ville Skytt?? - 0.6.10-1 +- 0.6.10, macro patch no longer needed (#162262). + +* Sun May 8 2005 Michael Schwendt - 0.6.9-4 +- rebuilt + +* Fri Mar 18 2005 Ville Skytt?? - 0.6.9-3 +- Fix FC4 build and source URLs. + * Thu Feb 3 2005 Michael Schwendt - 0.6.9-2 - Build PIC to fix x86_64 linking. Index: sources =================================================================== RCS file: /cvs/extras/rpms/libassuan/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 1 Feb 2005 19:30:20 -0000 1.3 +++ sources 8 Aug 2005 20:35:17 -0000 1.4 @@ -1 +1,2 @@ -7f8aff75d034159b84faf2358263f444 libassuan-0.6.9.tar.gz +4cde037c3fcb2f0eeb695b1db6e56bba libassuan-0.6.10.tar.gz +c36f1a8597c4836809005325dfa40244 libassuan-0.6.10.tar.gz.sig --- libassuan-0.6.9.tar.gz.sig DELETED --- From fedora-extras-commits at redhat.com Mon Aug 8 20:46:33 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 8 Aug 2005 16:46:33 -0400 Subject: rpms/gnupg2/FC-4 gnupg-1.9.18-lvalue.patch, NONE, 1.1 gnupg-1.9.18.tar.bz2.sig, NONE, 1.1 .cvsignore, 1.3, 1.4 gnupg2.spec, 1.11, 1.12 sources, 1.4, 1.5 gnupg-1.9.16-pth.patch, 1.1, NONE gnupg-1.9.16-signal-info.patch, 1.1, NONE gnupg-1.9.16.tar.bz2.sig, 1.1, NONE Message-ID: <200508082046.j78KkX1d012207@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gnupg2/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12183 Modified Files: .cvsignore gnupg2.spec sources Added Files: gnupg-1.9.18-lvalue.patch gnupg-1.9.18.tar.bz2.sig Removed Files: gnupg-1.9.16-pth.patch gnupg-1.9.16-signal-info.patch gnupg-1.9.16.tar.bz2.sig Log Message: * Mon Aug 8 2005 Rex Dieter - 1.9.18-5 - 1.9.18 - drop pth patch (--enable-gpg build fixed) - update description (from README) gnupg-1.9.18-lvalue.patch: --- NEW FILE gnupg-1.9.18-lvalue.patch --- --- gnupg-1.9.18/g10/misc.c.lvalue 2005-07-27 09:18:04.000000000 -0500 +++ gnupg-1.9.18/g10/misc.c 2005-08-08 14:00:37.000000000 -0500 @@ -986,7 +986,7 @@ } else { int rc; - char *buffer; + unsigned char *buffer; rc = gcry_mpi_aprint( GCRYMPI_FMT_HEX, &buffer, NULL, a ); assert( !rc ); --- NEW FILE gnupg-1.9.18.tar.bz2.sig --- ?? Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnupg2/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 10 May 2005 16:23:11 -0000 1.3 +++ .cvsignore 8 Aug 2005 20:46:31 -0000 1.4 @@ -1 +1 @@ -gnupg-1.9.16.tar.bz2 +gnupg-1.9.18.tar.bz2 Index: gnupg2.spec =================================================================== RCS file: /cvs/extras/rpms/gnupg2/FC-4/gnupg2.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- gnupg2.spec 13 May 2005 18:01:21 -0000 1.11 +++ gnupg2.spec 8 Aug 2005 20:46:31 -0000 1.12 @@ -1,7 +1,12 @@ +# pcsc-lite library major: 0 in 1.2.0, 1 in 1.2.9+ (dlopen()'d in pcsc-wrapper) +# Note: this is just the name of the default shared lib to load in scdaemon, +# it can use other implementations too (including non-pcsc ones). +%define pcsc_lib libpcsclite.so.0 + Summary: GNU utility for secure communication and data storage Name: gnupg2 -Version: 1.9.16 -Release: 4%{?dist} +Version: 1.9.18 +Release: 5%{?dist} License: GPL Group: Applications/System Source0: ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/gnupg-%{version}.tar.bz2 @@ -9,8 +14,7 @@ URL: http://www.gnupg.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Patch0: gnupg-1.9.16-pth.patch -Patch1: gnupg-1.9.16-signal-info.patch +Patch1: gnupg-1.9.18-lvalue.patch Patch2: gnupg-1.9.16-testverbose.patch Obsoletes: newpg < 0.9.5 @@ -18,20 +22,17 @@ Requires(post): /sbin/install-info Requires(postun): /sbin/install-info -## gcc version in use? -BuildRequires: gcc -%define gcc_ver %(rpm -q --qf '%%{version}' gcc ) -%if "%{gcc_ver}" >= "3.2.3" -%define pie 1 -%endif +%{!?_without_pie:%define _with_pie --with pie} +BuildRequires: libassuan-devel >= 0.6.10 BuildRequires: libgcrypt-devel => 1.2.0 BuildRequires: libgpg-error-devel => 1.0 -Requires: libgpg-error >= 1.0 -BuildRequires: libassuan-devel >= 0.6.9 -BuildRequires: libksba-devel >= 0.9.11 -BuildRequires: opensc-devel >= 0.9 -BuildRequires: pcsc-lite-devel +# We can probably get away without this explicit Requires: now. -- Rex +#Requires: libgpg-error >= 1.0 +BuildRequires: libksba-devel >= 0.9.12 +# No longer used (?) -- Rex +#BuildRequires: opensc-devel >= 0.9 + BuildRequires: gettext BuildRequires: openldap-devel BuildRequires: libusb-devel @@ -48,33 +49,36 @@ Provides: openpgp %description -GnuPG 1.9 is the development version of GnuPG; it is based on some old -GnuPG 1.3 code and the previous NewPG package. It will eventually -lead to a GnuPG 2.0 release. Note that GnuPG 1.4 and 1.9 are not yet -in sync and thus features and bug fixes done in 1.4 are not available -in 1.9. *Please keep on using 1.4.x for OpenPGP*; 1.9.x and 1.4.x may -be installed simultaneously. - -You should use GnuPG 1.9 if you want to use the gpg-agent or gpgsm -(the S/MIME variant of gpg). The gpg-agent is also helpful when using -the stable gpg version 1.4 (as well as the old 1.2 series). +GnuPG 1.9 is the future version of GnuPG; it is based on some gnupg-1.3 +code and the previous newpg package. It will eventually lead to a +GnuPG 2.0 release. Note that GnuPG 1.4 and 1.9 are not always in sync +and thus features and bug fixes done in 1.4 are not necessarily +available in 1.9. + +You should use this GnuPG version if you want to use the gpg-agent or +gpgsm (the S/MIME variant of gpg). Note that the gpg-agent is also +helpful when using the standard gpg versions (1.4.x as well as some of +the old 1.2.x). There are no problems installing 1.4 and 1.9 +alongside; in act we suggest to do this. + %prep %setup -q -n gnupg-%{version} -%patch0 -p1 -b .pth -%patch1 -p1 -b .strsignal +%patch1 -p1 -b .lvalue %patch2 -p1 -b .testverbose +sed -i -e 's/"libpcsclite\.so"/"%{pcsc_lib}"/' scd/{scdaemon,pcsc-wrapper}.c + %build -%{?pie:CFLAGS="$RPM_OPT_FLAGS -fPIE" ; export CFLAGS} -%{?pie:LDFLAGS="$RPM_OPT_FLAGS -pie" ; export LDFLAG} +%{?_with_pie:CFLAGS="$RPM_OPT_FLAGS -fPIE" ; export CFLAGS} +%{?_with_pie:LDFLAGS="$RPM_OPT_FLAGS -pie" ; export LDFLAG} %configure \ - --program-prefix="%{?_program_prefix}" \ + --disable-dependency-tracking \ --disable-rpath \ --enable-gpg @@ -111,17 +115,17 @@ #docs say to install suid root, but we won't, for now. #attr(4755,root,root) %{_bindir}/gpg2 %{_bindir}/gpg2 +%{_bindir}/gpgv2 +%{_datadir}/gnupg %{_bindir}/gpg-connect-agent %{_bindir}/gpg-agent %{_bindir}/gpgconf +%{_bindir}/gpgkey2ssh %{_bindir}/gpgsm* -%{_bindir}/gpgv2 %{_bindir}/kbxutil -%{_bindir}/sc-copykeys %{_bindir}/scdaemon %{_bindir}/watchgnupg %{_sbindir}/* -%{_datadir}/gnupg %{_libdir}/gnupg %{_libexecdir}/* %{_infodir}/* @@ -132,6 +136,17 @@ %changelog +* Mon Aug 8 2005 Rex Dieter - 1.9.18-5 +- 1.9.18 +- drop pth patch (--enable-gpg build fixed) +- update description (from README) + +* Fri Jul 1 2005 Ville Skytt?? - 1.9.17-1 +- 1.9.17, signal info patch applied upstream (#162264). +- Patch to fix lvalue build error with gcc4 (upstream #485). +- Patch scdaemon and pcsc-wrapper to load the versioned (non-devel) + pcsc-lite lib by default. + * Fri May 13 2005 Michael Schwendt - 1.9.16-3 - Include upstream's patch for signal.c. Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnupg2/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 10 May 2005 16:23:11 -0000 1.4 +++ sources 8 Aug 2005 20:46:31 -0000 1.5 @@ -1 +1 @@ -1282755dce9cf4a84e904ca0191017a3 gnupg-1.9.16.tar.bz2 +221d843dc23b4f33cdb8a91788a00e4d gnupg-1.9.18.tar.bz2 --- gnupg-1.9.16-pth.patch DELETED --- --- gnupg-1.9.16-signal-info.patch DELETED --- --- gnupg-1.9.16.tar.bz2.sig DELETED --- From fedora-extras-commits at redhat.com Mon Aug 8 20:11:31 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 8 Aug 2005 16:11:31 -0400 Subject: rpms/libksba/FC-3 libksba-0.9.9-underquoted.patch, 1.1, NONE libksba-0.9.9.tar.gz.sig, 1.1, NONE Message-ID: <200508082011.j78KBViJ011536@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/libksba/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11521 Removed Files: libksba-0.9.9-underquoted.patch libksba-0.9.9.tar.gz.sig Log Message: drop old extras --- libksba-0.9.9-underquoted.patch DELETED --- --- libksba-0.9.9.tar.gz.sig DELETED --- From fedora-extras-commits at redhat.com Mon Aug 8 20:23:34 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 8 Aug 2005 16:23:34 -0400 Subject: rpms/gnupg2/FC-3 gnupg2.spec,1.4,1.5 Message-ID: <200508082023.j78KNYZA011753@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gnupg2/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11736 Modified Files: gnupg2.spec Log Message: respin Index: gnupg2.spec =================================================================== RCS file: /cvs/extras/rpms/gnupg2/FC-3/gnupg2.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- gnupg2.spec 8 Aug 2005 20:22:27 -0000 1.4 +++ gnupg2.spec 8 Aug 2005 20:23:32 -0000 1.5 @@ -6,7 +6,7 @@ Summary: GNU utility for secure communication and data storage Name: gnupg2 Version: 1.9.18 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Applications/System Source0: ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/gnupg-%{version}.tar.bz2 @@ -142,7 +142,7 @@ %changelog -* Mon Aug 8 2005 Rex Dieter - 1.9.18-1 +* Mon Aug 8 2005 Rex Dieter - 1.9.18-2 - 1.9.18 - drop pth patch (--enable-gpg build fixed) - update description (from README) From fedora-extras-commits at redhat.com Mon Aug 8 20:29:59 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 8 Aug 2005 16:29:59 -0400 Subject: rpms/gnupg2/FC-3 gnupg-1.9.18.tar.bz2.sig, NONE, 1.1 gnupg2.spec, 1.7, 1.8 Message-ID: <200508082029.j78KTx4r011976@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gnupg2/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11956 Modified Files: gnupg2.spec Added Files: gnupg-1.9.18.tar.bz2.sig Log Message: missing .sig SOURCE file --- NEW FILE gnupg-1.9.18.tar.bz2.sig --- ?? Index: gnupg2.spec =================================================================== RCS file: /cvs/extras/rpms/gnupg2/FC-3/gnupg2.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- gnupg2.spec 8 Aug 2005 20:27:13 -0000 1.7 +++ gnupg2.spec 8 Aug 2005 20:29:57 -0000 1.8 @@ -6,7 +6,7 @@ Summary: GNU utility for secure communication and data storage Name: gnupg2 Version: 1.9.18 -Release: 4%{?dist} +Release: 5%{?dist} License: GPL Group: Applications/System Source0: ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/gnupg-%{version}.tar.bz2 @@ -136,7 +136,7 @@ %changelog -* Mon Aug 8 2005 Rex Dieter - 1.9.18-4 +* Mon Aug 8 2005 Rex Dieter - 1.9.18-5 - 1.9.18 - drop pth patch (--enable-gpg build fixed) - update description (from README) From fedora-extras-commits at redhat.com Mon Aug 8 20:12:25 2005 From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris)) Date: Mon, 8 Aug 2005 16:12:25 -0400 Subject: owners owners.list,1.57,1.58 Message-ID: <200508082012.j78KCPnJ011601@cvs-int.fedora.redhat.com> Author: c4chris Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11584 Modified Files: owners.list Log Message: Add hmmer package. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- owners.list 8 Aug 2005 19:15:55 -0000 1.57 +++ owners.list 8 Aug 2005 20:12:23 -0000 1.58 @@ -282,6 +282,7 @@ Fedora Extras|Hermes|HERMES pixel format conversion library|thomas at apestaart.org|extras-qa at fedoraproject.org| Fedora Extras|hfsplusutils|Tools for reading Macintosh HFS+ volumes|dwmw2 at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|highlight|Universal source code to formatted text converter|Jochen at herr-schmitt.de|extras-qa at fedoraproject.org| +Fedora Extras|hmmer|Profile HMM software for protein sequence analysis|Christian.Iseli at licr.org|extras-qa at fedoraproject.org| Fedora Extras|hping2|A software to do TCP/IP stack auditing and much more|kuko at maarmas.com|extras-qa at fedoraproject.org| Fedora Extras|htb-util|Another tool to make your life easier with HTB|mihai at xcyb.org|extras-qa at fedoraproject.org| Fedora Extras|htmltmpl|Templating engine for separation of code and HTML|ville.skytta at iki.fi|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Mon Aug 8 20:27:15 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 8 Aug 2005 16:27:15 -0400 Subject: rpms/gnupg2/FC-3 gnupg-1.9.16-testverbose.patch, NONE, 1.1 gnupg-1.9.18-lvalue.patch, NONE, 1.1 gnupg2.spec, 1.6, 1.7 Message-ID: <200508082027.j78KRF6v011900@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gnupg2/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11877 Modified Files: gnupg2.spec Added Files: gnupg-1.9.16-testverbose.patch gnupg-1.9.18-lvalue.patch Log Message: don't forget to check in the patches respin build one more time gnupg-1.9.16-testverbose.patch: --- NEW FILE gnupg-1.9.16-testverbose.patch --- diff -Nur gnupg-1.9.16-orig/tests/runtest gnupg-1.9.16/tests/runtest --- gnupg-1.9.16-orig/tests/runtest 2004-02-20 14:46:35.000000000 +0100 +++ gnupg-1.9.16/tests/runtest 2005-05-10 07:49:56.000000000 +0200 @@ -1,4 +1,4 @@ #!/bin/sh [ -x "$1" ] && exec $1 $2 -exec ./asschk --no-echo -DGPGSM=${GPGSM} <"$1" +exec ./asschk --verbose --no-echo -DGPGSM=${GPGSM} <"$1" gnupg-1.9.18-lvalue.patch: --- NEW FILE gnupg-1.9.18-lvalue.patch --- --- gnupg-1.9.18/g10/misc.c.lvalue 2005-07-27 09:18:04.000000000 -0500 +++ gnupg-1.9.18/g10/misc.c 2005-08-08 14:00:37.000000000 -0500 @@ -986,7 +986,7 @@ } else { int rc; - char *buffer; + unsigned char *buffer; rc = gcry_mpi_aprint( GCRYMPI_FMT_HEX, &buffer, NULL, a ); assert( !rc ); Index: gnupg2.spec =================================================================== RCS file: /cvs/extras/rpms/gnupg2/FC-3/gnupg2.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- gnupg2.spec 8 Aug 2005 20:25:29 -0000 1.6 +++ gnupg2.spec 8 Aug 2005 20:27:13 -0000 1.7 @@ -6,7 +6,7 @@ Summary: GNU utility for secure communication and data storage Name: gnupg2 Version: 1.9.18 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: Applications/System Source0: ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/gnupg-%{version}.tar.bz2 @@ -136,7 +136,7 @@ %changelog -* Mon Aug 8 2005 Rex Dieter - 1.9.18-3 +* Mon Aug 8 2005 Rex Dieter - 1.9.18-4 - 1.9.18 - drop pth patch (--enable-gpg build fixed) - update description (from README) From fedora-extras-commits at redhat.com Mon Aug 8 20:25:31 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 8 Aug 2005 16:25:31 -0400 Subject: rpms/gnupg2/FC-3 gnupg2.spec,1.5,1.6 Message-ID: <200508082025.j78KPVde011814@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gnupg2/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11797 Modified Files: gnupg2.spec Log Message: drop gcc version check, use --with pie by default Index: gnupg2.spec =================================================================== RCS file: /cvs/extras/rpms/gnupg2/FC-3/gnupg2.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- gnupg2.spec 8 Aug 2005 20:23:32 -0000 1.5 +++ gnupg2.spec 8 Aug 2005 20:25:29 -0000 1.6 @@ -6,7 +6,7 @@ Summary: GNU utility for secure communication and data storage Name: gnupg2 Version: 1.9.18 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Applications/System Source0: ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/gnupg-%{version}.tar.bz2 @@ -22,12 +22,6 @@ Requires(post): /sbin/install-info Requires(postun): /sbin/install-info -# Build with -pie/-fPIE? -BuildRequires: gcc -%define gcc_ver %(gcc -dumpversion) -%if "%{gcc_ver}" < "3.2.3" -%define _without_pie --without pie -%endif %{!?_without_pie:%define _with_pie --with pie} BuildRequires: libassuan-devel >= 0.6.10 @@ -142,7 +136,7 @@ %changelog -* Mon Aug 8 2005 Rex Dieter - 1.9.18-2 +* Mon Aug 8 2005 Rex Dieter - 1.9.18-3 - 1.9.18 - drop pth patch (--enable-gpg build fixed) - update description (from README) From fedora-extras-commits at redhat.com Mon Aug 8 20:12:07 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 8 Aug 2005 16:12:07 -0400 Subject: rpms/libksba/FC-4 libksba-0.9.12.tar.bz2.sig, NONE, 1.1 .cvsignore, 1.4, 1.5 libksba.spec, 1.10, 1.11 sources, 1.4, 1.5 libksba-0.9.11.tar.gz.sig, 1.1, NONE Message-ID: <200508082012.j78KC7VI011578@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/libksba/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11556 Modified Files: .cvsignore libksba.spec sources Added Files: libksba-0.9.12.tar.bz2.sig Removed Files: libksba-0.9.11.tar.gz.sig Log Message: * Mon Aug 8 2005 Rex Dieter 0.9.12-1 - 0.9.12 - --disable-static --- NEW FILE libksba-0.9.12.tar.bz2.sig --- ?? Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libksba/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 10 May 2005 16:04:32 -0000 1.4 +++ .cvsignore 8 Aug 2005 20:12:05 -0000 1.5 @@ -1 +1 @@ -libksba-0.9.11.tar.gz +libksba-0.9.12.tar.bz2 Index: libksba.spec =================================================================== RCS file: /cvs/extras/rpms/libksba/FC-4/libksba.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- libksba.spec 10 May 2005 16:04:32 -0000 1.10 +++ libksba.spec 8 Aug 2005 20:12:05 -0000 1.11 @@ -1,12 +1,12 @@ Summary: X.509 library Name: libksba -Version: 0.9.11 +Version: 0.9.12 Release: 1%{?dist} License: GPL Group: System Environment/Libraries URL: http://www.gnupg.org/ -Source0: ftp://ftp.gnupg.org/gcrypt/alpha/libksba/libksba-%{version}.tar.gz -Source1: ftp://ftp.gnupg.org/gcrypt/alpha/libksba/libksba-%{version}.tar.gz.sig +Source0: ftp://ftp.gnupg.org/gcrypt/alpha/libksba/libksba-%{version}.tar.bz2 +Source1: ftp://ftp.gnupg.org/gcrypt/alpha/libksba/libksba-%{version}.tar.bz2.sig BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libgpg-error >= 0.7 @@ -23,7 +23,7 @@ Requires(post): /sbin/install-info Requires(preun): /sbin/install-info %description devel -Development headers and libraries for %{name}. +%{summary}. %prep @@ -31,10 +31,11 @@ %build -%configure +%configure \ + --disable-dependency-tracking \ + --disable-static -# not smp safe -make +make %{?_smp_mflags} %check || : @@ -46,7 +47,8 @@ make install DESTDIR=$RPM_BUILD_ROOT -rm -f $RPM_BUILD_ROOT{%{_infodir}/dir,%{_libdir}/*.la} +rm -f $RPM_BUILD_ROOT%{_infodir}/dir +rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la %clean @@ -54,6 +56,7 @@ %post -p /sbin/ldconfig + %postun -p /sbin/ldconfig %post devel @@ -73,7 +76,6 @@ %files devel %defattr(-,root,root,-) %{_bindir}/* -%{_libdir}/lib*.a %{_libdir}/lib*.so %{_includedir}/* %{_datadir}/aclocal/* @@ -81,6 +83,10 @@ %changelog +* Mon Aug 8 2005 Rex Dieter 0.9.12-1 +- 0.9.12 +- --disable-static + * Thu Apr 21 2005 Rex Dieter 0.9.11-1 - 0.9.11 - drop upstreamed acquote patch Index: sources =================================================================== RCS file: /cvs/extras/rpms/libksba/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 10 May 2005 16:04:32 -0000 1.4 +++ sources 8 Aug 2005 20:12:05 -0000 1.5 @@ -1 +1 @@ -f21912398467e0c93ae1abeb8f6b3a3d libksba-0.9.11.tar.gz +4d40a09134c5a0d2dcc6416f9abdcc98 libksba-0.9.12.tar.bz2 --- libksba-0.9.11.tar.gz.sig DELETED --- From fedora-extras-commits at redhat.com Mon Aug 8 20:10:41 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 8 Aug 2005 16:10:41 -0400 Subject: rpms/libksba/FC-3 libksba-0.9.12.tar.bz2.sig, NONE, 1.1 .cvsignore, 1.3, 1.4 libksba.spec, 1.6, 1.7 sources, 1.3, 1.4 Message-ID: <200508082010.j78KAf4Q011470@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/libksba/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11448 Modified Files: .cvsignore libksba.spec sources Added Files: libksba-0.9.12.tar.bz2.sig Log Message: * Mon Aug 8 2005 Rex Dieter 0.9.12-1 - 0.9.12 - --disable-static --- NEW FILE libksba-0.9.12.tar.bz2.sig --- ?? Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libksba/FC-3/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 1 Feb 2005 19:32:51 -0000 1.3 +++ .cvsignore 8 Aug 2005 20:10:38 -0000 1.4 @@ -1 +1 @@ -libksba-0.9.9.tar.gz +libksba-0.9.12.tar.bz2 Index: libksba.spec =================================================================== RCS file: /cvs/extras/rpms/libksba/FC-3/libksba.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- libksba.spec 1 Feb 2005 19:32:51 -0000 1.6 +++ libksba.spec 8 Aug 2005 20:10:38 -0000 1.7 @@ -1,19 +1,16 @@ - Summary: X.509 library -Name: libksba -Epoch: 0 -Version: 0.9.9 -Release: 1%{?dist_tag} +Name: libksba +Version: 0.9.12 +Release: 1%{?dist} License: GPL Group: System Environment/Libraries URL: http://www.gnupg.org/ -Source0: ftp://ftp.gnupg.org/gcrypt/alpha/libksba/libksba-0.9.9.tar.gz -Source1: ftp://ftp.gnupg.org/gcrypt/alpha/libksba/libksba-0.9.9.tar.gz.sig -Patch0: libksba-0.9.9-underquoted.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +Source0: ftp://ftp.gnupg.org/gcrypt/alpha/libksba/libksba-%{version}.tar.bz2 +Source1: ftp://ftp.gnupg.org/gcrypt/alpha/libksba/libksba-%{version}.tar.bz2.sig +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: libgpg-error >= 0:0.7 -BuildRequires: libgcrypt-devel >= 0:1.2.0 +BuildRequires: libgpg-error >= 0.7 +BuildRequires: libgcrypt-devel >= 1.2.0 %description KSBA is a library designed to build software based on the X.509 and @@ -22,24 +19,26 @@ %package devel Summary: Development headers and libraries for %{name} Group: Development/Libraries -Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: %{name} = %{version}-%{release} Requires(post): /sbin/install-info Requires(preun): /sbin/install-info %description devel -Development headers and libraries for %{name}. +%{summary}. %prep %setup -q -%patch -p1 -b .underquoted %build -%configure +%configure \ + --disable-dependency-tracking \ + --disable-static + +make %{?_smp_mflags} -# not smp safe -make +%check || : make check @@ -48,7 +47,8 @@ make install DESTDIR=$RPM_BUILD_ROOT -rm -f $RPM_BUILD_ROOT{%{_infodir}/dir,%{_libdir}/*.la} +rm -f $RPM_BUILD_ROOT%{_infodir}/dir +rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la %clean @@ -56,18 +56,19 @@ %post -p /sbin/ldconfig + %postun -p /sbin/ldconfig %post devel -install-info %{_infodir}/ksba.info.gz %{_infodir}/dir ||: +install-info %{_infodir}/ksba.info %{_infodir}/dir ||: %postun devel if [ $1 -eq 0 ]; then - install-info --delete %{_infodir}/ksba.info.gz %{_infodir}/dir ||: + install-info --delete %{_infodir}/ksba.info %{_infodir}/dir ||: fi -%files +%files %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README* THANKS TODO VERSION %{_libdir}/*.so.* @@ -75,17 +76,31 @@ %files devel %defattr(-,root,root,-) %{_bindir}/* -%{_libdir}/*.a -%{_libdir}/*.so +%{_libdir}/lib*.so %{_includedir}/* %{_datadir}/aclocal/* %{_infodir}/* %changelog +* Mon Aug 8 2005 Rex Dieter 0.9.12-1 +- 0.9.12 +- --disable-static + +* Thu Apr 21 2005 Rex Dieter 0.9.11-1 +- 0.9.11 +- drop upstreamed acquote patch + +* Fri Apr 7 2005 Michael Schwendt - 0.9.9-2 +- rebuilt + * Tue Feb 1 2005 Michael Schwendt - 0:0.9.9-1 - Minus BR libtool, add epoch to -devel req, fix underquoted ksba.m4. +* Fri Oct 22 2004 Rex Dieter 0:0.9.9-0.fdr.2 +- remove hard-coded .gz from %%post/%%postun +- add %%check section + * Tue Oct 19 2004 Rex Dieter 0:0.9.9-0.fdr.1 - 0.9.9 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libksba/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 1 Feb 2005 19:32:51 -0000 1.3 +++ sources 8 Aug 2005 20:10:38 -0000 1.4 @@ -1 +1 @@ -49085f4435e7506c790ae23342b01b37 libksba-0.9.9.tar.gz +4d40a09134c5a0d2dcc6416f9abdcc98 libksba-0.9.12.tar.bz2 From fedora-extras-commits at redhat.com Mon Aug 8 20:22:29 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 8 Aug 2005 16:22:29 -0400 Subject: rpms/gnupg2/FC-3 .cvsignore, 1.2, 1.3 gnupg2.spec, 1.3, 1.4 sources, 1.3, 1.4 gnupg-1.9.15.tar.bz2.sig, 1.1, NONE Message-ID: <200508082022.j78KMT26011695@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gnupg2/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11674 Modified Files: .cvsignore gnupg2.spec sources Removed Files: gnupg-1.9.15.tar.bz2.sig Log Message: * Mon Aug 8 2005 Rex Dieter - 1.9.18-1 - 1.9.18 - drop pth patch (--enable-gpg build fixed) - update description (from README) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnupg2/FC-3/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 1 Feb 2005 22:40:35 -0000 1.2 +++ .cvsignore 8 Aug 2005 20:22:27 -0000 1.3 @@ -1 +1 @@ -gnupg-1.9.14.tar.bz2 +gnupg-1.9.18.tar.bz2 Index: gnupg2.spec =================================================================== RCS file: /cvs/extras/rpms/gnupg2/FC-3/gnupg2.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gnupg2.spec 2 Jul 2005 08:26:44 -0000 1.3 +++ gnupg2.spec 8 Aug 2005 20:22:27 -0000 1.4 @@ -1,38 +1,43 @@ -# $Id$ +# pcsc-lite library major: 0 in 1.2.0, 1 in 1.2.9+ (dlopen()'d in pcsc-wrapper) +# Note: this is just the name of the default shared lib to load in scdaemon, +# it can use other implementations too (including non-pcsc ones). +%define pcsc_lib libpcsclite.so.0 Summary: GNU utility for secure communication and data storage -Name: gnupg2 -Epoch: 0 -Version: 1.9.15 +Name: gnupg2 +Version: 1.9.18 Release: 1%{?dist} License: GPL -Group: Applications/System +Group: Applications/System Source0: ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/gnupg-%{version}.tar.bz2 Source1: ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/gnupg-%{version}.tar.bz2.sig -URL: http://www.gnupg.org/ -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +URL: http://www.gnupg.org/ +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Obsoletes: newpg < 0:0.9.5 +Patch1: gnupg-1.9.18-lvalue.patch +Patch2: gnupg-1.9.16-testverbose.patch + +Obsoletes: newpg < 0.9.5 Requires(post): /sbin/install-info Requires(postun): /sbin/install-info -## gcc version in use? +# Build with -pie/-fPIE? BuildRequires: gcc -%define gcc_ver %(rpm -q --qf '%%{version}' gcc ) -%if "%{gcc_ver}" >= "3.2.3" -%define pie 1 +%define gcc_ver %(gcc -dumpversion) +%if "%{gcc_ver}" < "3.2.3" +%define _without_pie --without pie %endif +%{!?_without_pie:%define _with_pie --with pie} -BuildRequires: libgcrypt-devel => 0:1.2.0 +BuildRequires: libassuan-devel >= 0.6.10 +BuildRequires: libgcrypt-devel => 1.2.0 BuildRequires: libgpg-error-devel => 1.0 -Requires: libgpg-error >= 1.0 -BuildRequires: libassuan-devel >= 0.6.9 -BuildRequires: libksba-devel >= 0:0.9.7 -# to build without opensc support: --without opensc -%{!?_without_opensc:BuildRequires: opensc-devel >= 0.9} -%{!?_without_opensc:BuildRequires: pcsc-lite-devel } -%{?_without_opensc:BuildConflicts: opensc-devel } +# We can probably get away without this explicit Requires: now. -- Rex +#Requires: libgpg-error >= 1.0 +BuildRequires: libksba-devel >= 0.9.12 +# No longer used (?) -- Rex +#BuildRequires: opensc-devel >= 0.9 BuildRequires: gettext BuildRequires: openldap-devel @@ -43,44 +48,51 @@ Buildrequires: libusb-devel BuildRequires: docbook-utils -Requires: pinentry >= 0:0.7.1 +Requires: pinentry >= 0.7.1 # Should these be versioned? -- Rex -Provides: gpg -Provides: openpgp +Provides: gpg +Provides: openpgp %description -GnuPG 1.9 is the future version of GnuPG; it is based on the gnupg-1.3 +GnuPG 1.9 is the future version of GnuPG; it is based on some gnupg-1.3 code and the previous newpg package. It will eventually lead to a -GnuPG 2.0 release. Note that GnuPG 1.3 and 1.9 are not always in sync -and thus features and bug fixes done in 1.3 are not necessary +GnuPG 2.0 release. Note that GnuPG 1.4 and 1.9 are not always in sync +and thus features and bug fixes done in 1.4 are not necessarily available in 1.9. You should use this GnuPG version if you want to use the gpg-agent or gpgsm (the S/MIME variant of gpg). Note that the gpg-agent is also -helpful when using the standard gpg versions (1.2.x or 1.3.x). +helpful when using the standard gpg versions (1.4.x as well as some of +the old 1.2.x). There are no problems installing 1.4 and 1.9 +alongside; in act we suggest to do this. + %prep %setup -q -n gnupg-%{version} +%patch1 -p1 -b .lvalue +%patch2 -p1 -b .testverbose + +sed -i -e 's/"libpcsclite\.so"/"%{pcsc_lib}"/' scd/{scdaemon,pcsc-wrapper}.c + %build -%{?pie:CFLAGS="$RPM_OPT_FLAGS -fPIE" ; export CFLAGS} -%{?pie:LDFLAGS="$RPM_OPT_FLAGS -pie" ; export LDFLAG} +%{?_with_pie:CFLAGS="$RPM_OPT_FLAGS -fPIE" ; export CFLAGS} +%{?_with_pie:LDFLAGS="$RPM_OPT_FLAGS -pie" ; export LDFLAG} %configure \ - --program-prefix="%{?_program_prefix}" \ - --disable-rpath + --disable-dependency-tracking \ + --disable-rpath \ + --enable-gpg make %{?_smp_mflags} -make check - -%clean -rm -rf $RPM_BUILD_ROOT +%check || : +make check %install @@ -94,11 +106,11 @@ %post -/sbin/install-info %{_infodir}/gnupg.info.gz %{_infodir}/dir 2>/dev/null ||: +/sbin/install-info %{_infodir}/gnupg.info %{_infodir}/dir 2>/dev/null ||: %preun if [ $1 -eq 0 ]; then - /sbin/install-info --delete %{_infodir}/gnupg.info.gz %{_infodir}/dir \ + /sbin/install-info --delete %{_infodir}/gnupg.info %{_infodir}/dir \ 2>/dev/null ||: fi @@ -106,24 +118,65 @@ %files -f %{name}.lang %defattr(-,root,root) %doc AUTHORS COPYING ChangeLog NEWS README THANKS TODO +#docs say to install suid root, but we won't, for now. #attr(4755,root,root) %{_bindir}/gpg2 %{_bindir}/gpg2 +%{_bindir}/gpgv2 +%{_datadir}/gnupg +%{_bindir}/gpg-connect-agent %{_bindir}/gpg-agent %{_bindir}/gpgconf +%{_bindir}/gpgkey2ssh %{_bindir}/gpgsm* -%{_bindir}/gpgv2 %{_bindir}/kbxutil -%{_bindir}/sc-copykeys %{_bindir}/scdaemon %{_bindir}/watchgnupg %{_sbindir}/* -%{_datadir}/gnupg %{_libdir}/gnupg %{_libexecdir}/* %{_infodir}/* +%clean +rm -rf $RPM_BUILD_ROOT + + %changelog +* Mon Aug 8 2005 Rex Dieter - 1.9.18-1 +- 1.9.18 +- drop pth patch (--enable-gpg build fixed) +- update description (from README) + +* Fri Jul 1 2005 Ville Skytt?? - 1.9.17-1 +- 1.9.17, signal info patch applied upstream (#162264). +- Patch to fix lvalue build error with gcc4 (upstream #485). +- Patch scdaemon and pcsc-wrapper to load the versioned (non-devel) + pcsc-lite lib by default. + +* Fri May 13 2005 Michael Schwendt - 1.9.16-3 +- Include upstream's patch for signal.c. + +* Tue May 10 2005 Michael Schwendt - 1.9.16-1 +- Merge changes from Rex's 1.9.16-1 (Thu Apr 21): +- opensc support unconditional +- remove hard-coded .gz from %%post/%%postun +- add %%check section +- add pth patch +- Put back patch modified from 1.9.15-4 to make tests verbose + and change signal.c to describe received signals better. + +* Sun May 8 2005 Michael Schwendt +- Drop patch0 again. + +* Sun May 8 2005 Michael Schwendt - 1.9.15-4 +- Add patch0 temporarily to get some output from failing test. + +* Sat May 7 2005 David Woodhouse 1.9.15-3 +- Rebuild. + +* Fri Apr 7 2005 Michael Schwendt +- rebuilt + * Tue Feb 1 2005 Michael Schwendt - 0:1.9.15-1 - Make install-info in scriptlets less noisy. @@ -139,7 +192,7 @@ - BR: libassuan-devel >= 0.6.9 * Thu Oct 21 2004 Rex Dieter 1.9.11-0.fdr.4 -- remove suid. +- remove suid. * Thu Oct 21 2004 Rex Dieter 1.9.11-0.fdr.3 - remove Provides: newpg @@ -150,6 +203,6 @@ - update description * Tue Oct 19 2004 Rex Dieter 1.9.11-0.fdr.1 -- first try +- first try - leave out opensc support (for now), enable --with-opensc Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnupg2/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 2 Feb 2005 17:20:20 -0000 1.3 +++ sources 8 Aug 2005 20:22:27 -0000 1.4 @@ -1 +1 @@ -7b1d0562b66b1853b77d511feb786629 gnupg-1.9.15.tar.bz2 +221d843dc23b4f33cdb8a91788a00e4d gnupg-1.9.18.tar.bz2 --- gnupg-1.9.15.tar.bz2.sig DELETED --- From fedora-extras-commits at redhat.com Mon Aug 8 19:51:35 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 8 Aug 2005 15:51:35 -0400 Subject: extras-buildsys ChangeLog,1.94,1.95 plague.spec,1.21,1.22 Message-ID: <200508081951.j78JpZRN010191@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10172 Modified Files: ChangeLog plague.spec Log Message: 2005-08-08 Dan Williams * Tag plague-0_3_RELEASE Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.94 retrieving revision 1.95 diff -u -r1.94 -r1.95 --- ChangeLog 8 Aug 2005 19:11:24 -0000 1.94 +++ ChangeLog 8 Aug 2005 19:51:33 -0000 1.95 @@ -1,5 +1,9 @@ 2005-08-08 Dan Williams + * Tag plague-0_3_RELEASE + +2005-08-08 Dan Williams + * README plague.spec utils/Makefile Index: plague.spec =================================================================== RCS file: /cvs/fedora/extras-buildsys/plague.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- plague.spec 8 Aug 2005 19:11:24 -0000 1.21 +++ plague.spec 8 Aug 2005 19:51:33 -0000 1.22 @@ -2,7 +2,7 @@ Summary: Distributed build system for RPMs Name: plague -Version: 0.2 +Version: 0.3 Release: 1 License: GPL Group: Development/Tools @@ -149,6 +149,9 @@ %changelog +* Mon Aug 8 2005 Dan Williams 0.3-1 +- Version 0.3 + * Sat Jul 16 2005 Dan Williams - Bump version to 0.2 - Grab python files from /usr/lib, not %{_libdir} until the From fedora-extras-commits at redhat.com Mon Aug 8 19:12:05 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 8 Aug 2005 15:12:05 -0400 Subject: extras-buildsys/utils certhelper.py,1.1,1.2 Message-ID: <200508081912.j78JC5Vh009933@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/utils In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9916/utils Modified Files: certhelper.py Log Message: Remove obsolete args from usage text Index: certhelper.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/utils/certhelper.py,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- certhelper.py 8 Aug 2005 19:11:25 -0000 1.1 +++ certhelper.py 8 Aug 2005 19:12:03 -0000 1.2 @@ -23,8 +23,8 @@ def print_usage(prog): print "\nUsage:\n" - print " %s gen ca --outdir= --name=\n" % prog - print " %s gen normal --outdir= --name= --cadir= --ca_name=" % prog + print " %s ca --outdir= --name=\n" % prog + print " %s normal --outdir= --name= --cadir= --ca_name=" % prog print "" print " Types:" print " ca - Build system Certificate Authority key & certificate" From fedora-extras-commits at redhat.com Mon Aug 8 18:37:19 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 8 Aug 2005 14:37:19 -0400 Subject: rpms/libksba/devel libksba-0.9.12.tar.bz2.sig, NONE, 1.1 .cvsignore, 1.4, 1.5 libksba.spec, 1.10, 1.11 sources, 1.4, 1.5 libksba-0.9.11.tar.gz.sig, 1.1, NONE Message-ID: <200508081837.j78IbJlM008579@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/libksba/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8557 Modified Files: .cvsignore libksba.spec sources Added Files: libksba-0.9.12.tar.bz2.sig Removed Files: libksba-0.9.11.tar.gz.sig Log Message: * Mon Aug 8 2005 Rex Dieter 0.9.12-1 - 0.9.12 - --disable-static --- NEW FILE libksba-0.9.12.tar.bz2.sig --- ?? Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libksba/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 10 May 2005 16:04:32 -0000 1.4 +++ .cvsignore 8 Aug 2005 18:37:17 -0000 1.5 @@ -1 +1 @@ -libksba-0.9.11.tar.gz +libksba-0.9.12.tar.bz2 Index: libksba.spec =================================================================== RCS file: /cvs/extras/rpms/libksba/devel/libksba.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- libksba.spec 10 May 2005 16:04:32 -0000 1.10 +++ libksba.spec 8 Aug 2005 18:37:17 -0000 1.11 @@ -1,12 +1,12 @@ Summary: X.509 library Name: libksba -Version: 0.9.11 +Version: 0.9.12 Release: 1%{?dist} License: GPL Group: System Environment/Libraries URL: http://www.gnupg.org/ -Source0: ftp://ftp.gnupg.org/gcrypt/alpha/libksba/libksba-%{version}.tar.gz -Source1: ftp://ftp.gnupg.org/gcrypt/alpha/libksba/libksba-%{version}.tar.gz.sig +Source0: ftp://ftp.gnupg.org/gcrypt/alpha/libksba/libksba-%{version}.tar.bz2 +Source1: ftp://ftp.gnupg.org/gcrypt/alpha/libksba/libksba-%{version}.tar.bz2.sig BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libgpg-error >= 0.7 @@ -23,7 +23,7 @@ Requires(post): /sbin/install-info Requires(preun): /sbin/install-info %description devel -Development headers and libraries for %{name}. +%{summary}. %prep @@ -31,10 +31,11 @@ %build -%configure +%configure \ + --disable-dependency-tracking \ + --disable-static -# not smp safe -make +make %{?_smp_mflags} %check || : @@ -46,7 +47,8 @@ make install DESTDIR=$RPM_BUILD_ROOT -rm -f $RPM_BUILD_ROOT{%{_infodir}/dir,%{_libdir}/*.la} +rm -f $RPM_BUILD_ROOT%{_infodir}/dir +rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la %clean @@ -54,6 +56,7 @@ %post -p /sbin/ldconfig + %postun -p /sbin/ldconfig %post devel @@ -73,7 +76,6 @@ %files devel %defattr(-,root,root,-) %{_bindir}/* -%{_libdir}/lib*.a %{_libdir}/lib*.so %{_includedir}/* %{_datadir}/aclocal/* @@ -81,6 +83,10 @@ %changelog +* Mon Aug 8 2005 Rex Dieter 0.9.12-1 +- 0.9.12 +- --disable-static + * Thu Apr 21 2005 Rex Dieter 0.9.11-1 - 0.9.11 - drop upstreamed acquote patch Index: sources =================================================================== RCS file: /cvs/extras/rpms/libksba/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 10 May 2005 16:04:32 -0000 1.4 +++ sources 8 Aug 2005 18:37:17 -0000 1.5 @@ -1 +1 @@ -f21912398467e0c93ae1abeb8f6b3a3d libksba-0.9.11.tar.gz +4d40a09134c5a0d2dcc6416f9abdcc98 libksba-0.9.12.tar.bz2 --- libksba-0.9.11.tar.gz.sig DELETED --- From fedora-extras-commits at redhat.com Mon Aug 8 19:20:01 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 8 Aug 2005 15:20:01 -0400 Subject: rpms/gnupg2/devel gnupg-1.9.18-lvalue.patch, NONE, 1.1 gnupg-1.9.18.tar.bz2.sig, NONE, 1.1 .cvsignore, 1.4, 1.5 gnupg2.spec, 1.12, 1.13 sources, 1.5, 1.6 gnupg-1.9.16-pth.patch, 1.1, NONE Message-ID: <200508081920.j78JK1P2010038@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gnupg2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10013 Modified Files: .cvsignore gnupg2.spec sources Added Files: gnupg-1.9.18-lvalue.patch gnupg-1.9.18.tar.bz2.sig Removed Files: gnupg-1.9.16-pth.patch Log Message: * Mon Aug 8 2005 Rex Dieter - 1.9.18-1 - 1.9.18 - drop pth patch (--enable-gpg build fixed) - update description (from README) gnupg-1.9.18-lvalue.patch: --- NEW FILE gnupg-1.9.18-lvalue.patch --- --- gnupg-1.9.18/g10/misc.c.lvalue 2005-07-27 09:18:04.000000000 -0500 +++ gnupg-1.9.18/g10/misc.c 2005-08-08 14:00:37.000000000 -0500 @@ -986,7 +986,7 @@ } else { int rc; - char *buffer; + unsigned char *buffer; rc = gcry_mpi_aprint( GCRYMPI_FMT_HEX, &buffer, NULL, a ); assert( !rc ); --- NEW FILE gnupg-1.9.18.tar.bz2.sig --- ?? Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnupg2/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 2 Jul 2005 08:39:51 -0000 1.4 +++ .cvsignore 8 Aug 2005 19:19:59 -0000 1.5 @@ -1,2 +1 @@ -gnupg-1.9.17.tar.bz2 -gnupg-1.9.17.tar.bz2.sig +gnupg-1.9.18.tar.bz2 Index: gnupg2.spec =================================================================== RCS file: /cvs/extras/rpms/gnupg2/devel/gnupg2.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- gnupg2.spec 2 Jul 2005 08:39:51 -0000 1.12 +++ gnupg2.spec 8 Aug 2005 19:19:59 -0000 1.13 @@ -5,7 +5,7 @@ Summary: GNU utility for secure communication and data storage Name: gnupg2 -Version: 1.9.17 +Version: 1.9.18 Release: 1%{?dist} License: GPL Group: Applications/System @@ -14,8 +14,7 @@ URL: http://www.gnupg.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Patch0: gnupg-1.9.16-pth.patch -Patch1: gnupg-1.9.17-lvalue.patch +Patch1: gnupg-1.9.18-lvalue.patch Patch2: gnupg-1.9.16-testverbose.patch Obsoletes: newpg < 0.9.5 @@ -23,19 +22,23 @@ Requires(post): /sbin/install-info Requires(postun): /sbin/install-info -## gcc version in use? +# Build with -pie/-fPIE? BuildRequires: gcc -%define gcc_ver %(rpm -q --qf '%%{version}' gcc ) -%if "%{gcc_ver}" >= "3.2.3" -%define pie 1 +%define gcc_ver %(gcc -dumpversion) +%if "%{gcc_ver}" < "3.2.3" +%define _without_pie --without pie %endif +%{!?_without_pie:%define _with_pie --with pie} +BuildRequires: libassuan-devel >= 0.6.10 BuildRequires: libgcrypt-devel => 1.2.0 BuildRequires: libgpg-error-devel => 1.0 -Requires: libgpg-error >= 1.0 -BuildRequires: libassuan-devel >= 0.6.10 -BuildRequires: libksba-devel >= 0.9.11 -BuildRequires: opensc-devel >= 0.9 +# We can probably get away without this explicit Requires: now. -- Rex +#Requires: libgpg-error >= 1.0 +BuildRequires: libksba-devel >= 0.9.12 +# No longer used (?) -- Rex +#BuildRequires: opensc-devel >= 0.9 + BuildRequires: gettext BuildRequires: openldap-devel BuildRequires: libusb-devel @@ -52,23 +55,24 @@ Provides: openpgp %description -GnuPG 1.9 is the development version of GnuPG; it is based on some old -GnuPG 1.3 code and the previous NewPG package. It will eventually -lead to a GnuPG 2.0 release. Note that GnuPG 1.4 and 1.9 are not yet -in sync and thus features and bug fixes done in 1.4 are not available -in 1.9. *Please keep on using 1.4.x for OpenPGP*; 1.9.x and 1.4.x may -be installed simultaneously. - -You should use GnuPG 1.9 if you want to use the gpg-agent or gpgsm -(the S/MIME variant of gpg). The gpg-agent is also helpful when using -the stable gpg version 1.4 (as well as the old 1.2 series). +GnuPG 1.9 is the future version of GnuPG; it is based on some gnupg-1.3 +code and the previous newpg package. It will eventually lead to a +GnuPG 2.0 release. Note that GnuPG 1.4 and 1.9 are not always in sync +and thus features and bug fixes done in 1.4 are not necessarily +available in 1.9. + +You should use this GnuPG version if you want to use the gpg-agent or +gpgsm (the S/MIME variant of gpg). Note that the gpg-agent is also +helpful when using the standard gpg versions (1.4.x as well as some of +the old 1.2.x). There are no problems installing 1.4 and 1.9 +alongside; in act we suggest to do this. + %prep %setup -q -n gnupg-%{version} -%patch0 -p1 -b .pth -%patch1 -p0 -b .lvalue +%patch1 -p1 -b .lvalue %patch2 -p1 -b .testverbose sed -i -e 's/"libpcsclite\.so"/"%{pcsc_lib}"/' scd/{scdaemon,pcsc-wrapper}.c @@ -76,11 +80,11 @@ %build -%{?pie:CFLAGS="$RPM_OPT_FLAGS -fPIE" ; export CFLAGS} -%{?pie:LDFLAGS="$RPM_OPT_FLAGS -pie" ; export LDFLAG} +%{?_with_pie:CFLAGS="$RPM_OPT_FLAGS -fPIE" ; export CFLAGS} +%{?_with_pie:LDFLAGS="$RPM_OPT_FLAGS -pie" ; export LDFLAG} %configure \ - --program-prefix="%{?_program_prefix}" \ + --disable-dependency-tracking \ --disable-rpath \ --enable-gpg @@ -117,17 +121,17 @@ #docs say to install suid root, but we won't, for now. #attr(4755,root,root) %{_bindir}/gpg2 %{_bindir}/gpg2 +%{_bindir}/gpgv2 +%{_datadir}/gnupg %{_bindir}/gpg-connect-agent %{_bindir}/gpg-agent %{_bindir}/gpgconf %{_bindir}/gpgkey2ssh %{_bindir}/gpgsm* -%{_bindir}/gpgv2 %{_bindir}/kbxutil %{_bindir}/scdaemon %{_bindir}/watchgnupg %{_sbindir}/* -%{_datadir}/gnupg %{_libdir}/gnupg %{_libexecdir}/* %{_infodir}/* @@ -138,6 +142,11 @@ %changelog +* Mon Aug 8 2005 Rex Dieter - 1.9.18-1 +- 1.9.18 +- drop pth patch (--enable-gpg build fixed) +- update description (from README) + * Fri Jul 1 2005 Ville Skytt?? - 1.9.17-1 - 1.9.17, signal info patch applied upstream (#162264). - Patch to fix lvalue build error with gcc4 (upstream #485). Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnupg2/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 2 Jul 2005 08:39:51 -0000 1.5 +++ sources 8 Aug 2005 19:19:59 -0000 1.6 @@ -1,2 +1 @@ -a1bf98c5ec0c5c316b4ae6f017f02fa3 gnupg-1.9.17.tar.bz2 -9c60e57f39a65d7be048344f2c03a4b2 gnupg-1.9.17.tar.bz2.sig +221d843dc23b4f33cdb8a91788a00e4d gnupg-1.9.18.tar.bz2 --- gnupg-1.9.16-pth.patch DELETED --- From fedora-extras-commits at redhat.com Mon Aug 8 19:15:57 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 8 Aug 2005 15:15:57 -0400 Subject: owners owners.list,1.56,1.57 Message-ID: <200508081915.j78JFvdk009986@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9969 Modified Files: owners.list Log Message: Added fedora-perl-devel-list at redhat.com to the initialcclist field of several perl packages. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- owners.list 6 Aug 2005 03:13:01 -0000 1.56 +++ owners.list 8 Aug 2005 19:15:55 -0000 1.57 @@ -90,7 +90,7 @@ Fedora Extras|contact-lookup-applet|Applet which allows you to search your Evolution address book|bdpepple at ameritech.net|extras-qa at fedoraproject.org| Fedora Extras|convmv|Convert filename encodings.|nphilipp at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|cook|A file construction tool|gemi at bluewin.ch|extras-qa at fedoraproject.org| -Fedora Extras|cpan2rpm|Perl module packager|ghenry at suretecsystems.com|extras-qa at fedoraproject.org| +Fedora Extras|cpan2rpm|Perl module packager|ghenry at suretecsystems.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|cryptplug|Cryptography plugin for mutt & kmail|dennis at dgilmore.net|extras-qa at fedoraproject.org| Fedora Extras|csmash|3D tabletennis game|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|ctrlproxy|IRC server with multiserver support|dwmw2 at infradead.org|extras-qa at fedoraproject.org| @@ -527,8 +527,8 @@ Fedora Extras|perl-Convert-BinHex|Macintosh BinHex extractor library for Perl|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Convert-TNEF|Perl module to read TNEF files|anvil at livna.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Convert-UUlib|A perl interface to the uulib library|Nicolas.Mailhot at laPoste.net|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com -Fedora Extras|perl-Crypt-Blowfish|XS Blowfish implementation for Perl|andreas at bawue.net|extras-qa at fedoraproject.org| -Fedora Extras|perl-Crypt-CBC|Encrypt Data with Cipher Block Chaining Mode|andreas at bawue.net|extras-qa at fedoraproject.org| +Fedora Extras|perl-Crypt-Blowfish|XS Blowfish implementation for Perl|andreas at bawue.net|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Crypt-CBC|Encrypt Data with Cipher Block Chaining Mode|andreas at bawue.net|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-DBD-SQLite|Self Contained RDBMS in a DBI Driver|jpo at di.uminho.pt|extras-qa at fedoraproject.org| Fedora Extras|perl-DBD-SQLite2|Self Contained RDBMS in a DBI Driver (sqlite 2.x)|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Devel-Cycle|Find memory cycles in objects|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com @@ -539,8 +539,8 @@ Fedora Extras|perl-ExtUtils-Depends|Easily build XS extensions that depend on XS extensions|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-ExtUtils-ParseXS|Module and a script for converting Perl XS code into C code|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-ExtUtils-PkgConfig|Simplistic interface to pkg-config|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com -Fedora Extras|perl-ExtUtils-XSBuilder| Modules that parse C header files and create XS glue code|tcallawa at redhat.com|extras-qa at fedoraproject.org| -Fedora Extras|perl-File-BOM|Utilities for reading Byte Order Marks|mpeters at mac.com|extras-qa at fedoraproject.org| +Fedora Extras|perl-ExtUtils-XSBuilder| Modules that parse C header files and create XS glue code|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-File-BOM|Utilities for reading Byte Order Marks|mpeters at mac.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-File-Tail|Perl extension for reading from continously updated files|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-FreezeThaw|Convert Perl structures to strings and back|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-GDGraph3d|3D graph generation package for Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com @@ -618,22 +618,22 @@ Fedora Extras|perl-TeX-Hyphen|Hyphenate words using TeX's patterns|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Text-Autoformat|Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Text-Iconv|Perl interface to iconv() codeset conversion function|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com -Fedora Extras|perl-Text-Kakasi|Kakasi library module for perl|tagoh at redhat.com|extras-qa at fedoraproject.org| +Fedora Extras|perl-Text-Kakasi|Kakasi library module for perl|tagoh at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Text-Reform|Manual text wrapping and reformatting|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Text-Shellwords|A thin wrapper around the shellwords.pl package|thm at duke.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perltidy|Tool for indenting and reformatting Perl scripts|ville.skytta at iki.fi|extras-qa at fedoraproject.org| -Fedora Extras|perl-Tie-DBI| Tie hashes to DBI relational databases|tcallawa at redhat.com|extras-qa at fedoraproject.org| +Fedora Extras|perl-Tie-DBI|Tie hashes to DBI relational databases|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Tie-IxHash|Ordered associative arrays for Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com -Fedora Extras|perl-Time-modules|Perl modules for parsing dates and times|kaboom at oobleck.net|extras-qa at fedoraproject.org| -Fedora Extras|perl-Tk|Perl Graphical User Interface ToolKit|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| -Fedora Extras|perl-Tree-DAG_Node|Class for representing nodes in a tree|jpo at di.uminho.pt|extras-qa at fedoraproject.org| +Fedora Extras|perl-Time-modules|Perl modules for parsing dates and times|kaboom at oobleck.net|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Tk|Perl Graphical User Interface ToolKit|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Tree-DAG_Node|Class for representing nodes in a tree|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Unicode-Map8|Mapping table between 8-bit chars and Unicode for Perl|gauret at free.fr|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Unicode-Map|Perl module for mapping charsets from and to utf16 unicode|gauret at free.fr|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Unicode-MapUTF8|Conversions to and from arbitrary character sets and UTF8|gauret at free.fr|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Unicode-String|Perl modules to handle various Unicode issues|gauret at free.fr|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-UNIVERSAL-moniker|Real world naming for classes|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Unix-Syslog|Perl interface to the UNIX syslog(3) calls|anvil at livna.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com -Fedora Extras|perl-Want|Perl module implementing a generalisation of wantarray|rc040203 at freenet.de|extras-qa at fedoraproject.org| +Fedora Extras|perl-Want|Perl module implementing a generalisation of wantarray|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-XML-LibXSLT|Perl module for interfacing to GNOME's libxslt|shishz at hotpop.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-XML-RSS|Perl module for managing RDF Site Summary (RSS) files|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-XML-Simple|Easy API to maintain XML in Perl|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Mon Aug 8 19:11:27 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 8 Aug 2005 15:11:27 -0400 Subject: extras-buildsys/utils certhelper.py,NONE,1.1 Makefile,1.4,1.5 Message-ID: <200508081911.j78JBRUD009905@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/utils In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9865/utils Modified Files: Makefile Added Files: certhelper.py Log Message: 2005-08-08 Dan Williams * README plague.spec utils/Makefile utils/certhelper.py - Make creation of SSL certificates not suck --- NEW FILE certhelper.py --- #!/usr/bin/python # # 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 Library 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. # # Copyright 2005 Dan Williams and Red Hat, Inc. import sys, os, tempfile OPENSSL_PROG = '/usr/bin/openssl' def print_usage(prog): print "\nUsage:\n" print " %s gen ca --outdir= --name=\n" % prog print " %s gen normal --outdir= --name= --cadir= --ca_name=" % prog print "" print " Types:" print " ca - Build system Certificate Authority key & certificate" print " normal - Key & certificate that works with the build server and builders" print "" print "Examples:\n" print " %s gencert ca --outdir=/etc/plague/ca --name=my_ca" % prog print " %s gencert normal --outdir=/etc/plague/server/certs --name=server --cadir=/etc/plague/ca --caname=my_ca" % prog print " %s gencert normal --outdir=/etc/plague/builder/certs --name=builder1 --cadir=/etc/plage/ca --caname=my_ca" % prog print "\n" class CertHelperException: def __init__(self, message): self.message = message class CertHelper: def __init__(self, prog, outdir, name): self._prog = prog self._outdir = outdir self._name = name def dispatch(self, cmd, argslist): if cmd.lower() == 'ca': self._gencert_ca(argslist) elif cmd.lower() == 'normal': self._gencert_normal(argslist) else: print_usage(self._prog) def _gencert_ca(self, args): # Set up CA directory if not os.path.exists(self._outdir): os.makedirs(self._outdir) try: os.makedirs(os.path.join(self._outdir, 'certs')) os.makedirs(os.path.join(self._outdir, 'crl')) os.makedirs(os.path.join(self._outdir, 'newcerts')) os.makedirs(os.path.join(self._outdir, 'private')) except: pass cert_db = os.path.join(self._outdir, "index.txt") os.system("/bin/touch %s" % cert_db) serial = os.path.join(self._outdir, "serial") if not os.path.exists(serial): os.system("/bin/echo '01' > %s" % serial) cnf = write_openssl_cnf(self._outdir, self._name, {}) # Create the CA key key_file = os.path.join(self._outdir, "private", "%s_ca_key.pem" % self._name) cmd = "%s genrsa -out %s 2048" % (OPENSSL_PROG, key_file) if os.system(cmd) != 0: raise CertHelperException("\n\nERROR: Command '%s' was not successful.\n" % cmd) # Make the self-signed CA certificate cert_file = os.path.join(self._outdir, "%s_ca_cert.pem" % self._name) cmd = "%s req -config %s -new -x509 -key %s -out %s -extensions v3_ca" % (OPENSSL_PROG, cnf, key_file, cert_file) if os.system(cmd) != 0: raise CertHelperException("\n\nERROR: Command '%s' was not successful.\n" % cmd) os.remove(cnf) print "Success. Your Certificate Authority directory is: %s\n" % self._outdir def _gencert_normal(self, args): cadir = argfind(args, 'cadir') if not cadir: print_usage(self._prog) sys.exit(1) caname = argfind(args, 'caname') if not caname: print_usage(self._prog) sys.exit(1) cnf = write_openssl_cnf(cadir, caname, {}) # Generate key key_file = os.path.join(self._outdir, "%s_key.pem" % self._name) cmd = "%s genrsa -out %s 2048" % (OPENSSL_PROG, key_file) if os.system(cmd) != 0: raise CertHelperException("\n\nERROR: Command '%s' was not successful.\n" % cmd) print "" # Generate the certificate request req_file = os.path.join(self._outdir, "%s_req.pem" % self._name) cmd = '%s req -config %s -new -nodes -out %s -key %s' % (OPENSSL_PROG, cnf, req_file, key_file) if os.system(cmd) != 0: raise CertHelperException("\n\nERROR: Command '%s' was not successful.\n" % cmd) print "" # Sign the request with the CA's certificate and key cert_file = os.path.join(self._outdir, "%s_cert.pem" % self._name) cmd = '%s ca -config %s -out %s -infiles %s' % (OPENSSL_PROG, cnf, cert_file, req_file) if os.system(cmd) != 0: raise CertHelperException("\n\nERROR: Command '%s' was not successful.\n" % cmd) print "" # Cat the normal cert and key together key_and_cert = os.path.join(self._outdir, "%s_key_and_cert.pem" % self._name) cmd = '/bin/cat %s %s > %s' % (key_file, cert_file, key_and_cert) if os.system(cmd) != 0: raise CertHelperException("\n\nERROR: Command '%s' was not successful.\n" % cmd) # Cleanup: remove the cert, key, and request files cmd = "/bin/rm -f %s %s %s" % (key_file, req_file, cert_file) if os.system(cmd) != 0: raise CertHelperException("\n\nERROR: Command '%s' was not successful.\n" % cmd) os.remove(cnf) print "Success. Your certificate and key file is: %s\n" % key_and_cert def write_openssl_cnf(home, ca_name, opt_dict): (fd, name) = tempfile.mkstemp('', 'openssl_cnf_', dir=None, text=True) os.write(fd, """ ############################## HOME = %s RANDFILE = .rand ############################## [ ca ] default_ca = CA_default\n ############################## [ CA_default ] dir = $HOME certs = $dir/certs crl_dir = $dir/crl database = $dir/index.txt new_certs_dir = $dir/newcerts certificate = $dir/%s_ca_cert.pem private_key = $dir/private/%s_ca_key.pem serial = $dir/serial crl = $dir/crl.pem x509_extensions = usr_cert name_opt = ca_default cert_opt = ca_default default_days = 3650 default_crl_days= 30 default_md = md5 preserve = no policy = policy_match [ policy_match ] countryName = match stateOrProvinceName = match organizationName = match organizationalUnitName = optional commonName = supplied emailAddress = optional ############################## [ req ] default_bits = 1024 default_keyfile = privkey.pem distinguished_name = req_distinguished_name attributes = req_attributes x509_extensions = v3_ca # The extentions to add to the self signed cert string_mask = MASK:0x2002 [ req_distinguished_name ] countryName = Country Name (2 letter code) countryName_default = US countryName_min = 2 countryName_max = 2 stateOrProvinceName = State or Province Name (full name) stateOrProvinceName_default = Berkshire localityName = Locality Name (eg, city) localityName_default = Newbury 0.organizationName = Organization Name (eg, company) 0.organizationName_default = My Company Ltd organizationalUnitName = Organizational Unit Name (eg, section) commonName = Common Name (eg, your name or your server\'s hostname) commonName_max = 64 emailAddress = Email Address emailAddress_max = 64 [ req_attributes ] challengePassword = A challenge password challengePassword_min = 4 challengePassword_max = 20 unstructuredName = An optional company name ############################## [ usr_cert ] basicConstraints=CA:FALSE nsComment = "OpenSSL Generated Certificate" subjectKeyIdentifier=hash authorityKeyIdentifier=keyid,issuer:always ############################## [ v3_ca ] subjectKeyIdentifier=hash authorityKeyIdentifier=keyid:always,issuer:always basicConstraints = CA:true """ % (home, ca_name, ca_name)) return name def argfind(arglist, prefix): val = None for arg in arglist: if arg.startswith('--%s=' % prefix): val = arg break if not val: return None val = val.replace('--%s=' % prefix, '') return val if __name__ == '__main__': prog = sys.argv[0] if len(sys.argv) < 3: print_usage(prog) sys.exit(1) outdir = argfind(sys.argv, 'outdir') if not outdir: print_usage(prog) sys.exit(1) name = argfind(sys.argv, 'name') if not name: print_usage(prog) sys.exit(1) ch = CertHelper(prog, outdir, name) try: ch.dispatch(sys.argv[1], sys.argv) except CertHelperException, e: print e.message sys.exit(1) sys.exit(0) Index: Makefile =================================================================== RCS file: /cvs/fedora/extras-buildsys/utils/Makefile,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- Makefile 28 Jun 2005 01:41:34 -0000 1.4 +++ Makefile 8 Aug 2005 19:11:25 -0000 1.5 @@ -12,3 +12,4 @@ install: $(MKDIR) -p $(DESTDIR)/$(BINDIR) $(INSTALL) -m 755 user-manager.py $(DESTDIR)/$(BINDIR)/$(PKGNAME)-user-manager.py + $(INSTALL) -m 755 certhelper.py $(DESTDIR)/$(BINDIR)/$(PKGNAME)-certhelper.py From fedora-extras-commits at redhat.com Mon Aug 8 19:11:26 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 8 Aug 2005 15:11:26 -0400 Subject: extras-buildsys ChangeLog, 1.93, 1.94 README, 1.10, 1.11 plague.spec, 1.20, 1.21 Message-ID: <200508081911.j78JBQlC009899@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9865 Modified Files: ChangeLog README plague.spec Log Message: 2005-08-08 Dan Williams * README plague.spec utils/Makefile utils/certhelper.py - Make creation of SSL certificates not suck Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.93 retrieving revision 1.94 diff -u -r1.93 -r1.94 --- ChangeLog 8 Aug 2005 02:55:24 -0000 1.93 +++ ChangeLog 8 Aug 2005 19:11:24 -0000 1.94 @@ -1,3 +1,11 @@ +2005-08-08 Dan Williams + + * README + plague.spec + utils/Makefile + utils/certhelper.py + - Make creation of SSL certificates not suck + 2005-08-07 Dan Williams Play nicely when running more than one builder instance on the same Index: README =================================================================== RCS file: /cvs/fedora/extras-buildsys/README,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- README 4 Aug 2005 20:24:06 -0000 1.10 +++ README 8 Aug 2005 19:11:24 -0000 1.11 @@ -223,8 +223,7 @@ The Certificates on the Server: -config_opts['server_cert'] -> server SSL certificate -config_opts['server_key'] -> server private key +config_opts['server_key_and_cert'] -> server SSL certificate and private key config_opts['ca_cert'] -> CA certificate used to sign both server and builder certificates config_opts['ui_ca_cert'] -> CA cert that signs package maintainer's @@ -232,84 +231,116 @@ plague-clients are authorized The Certificates on the Builders: -config_opts['client_cert'] -> builder SSL certificate -config_opts['client_key'] -> builder private key +config_opts['builder_key_and_cert'] -> builder SSL certificate and private key config_opts['ca_cert'] -> _same_ as server's 'ca_cert', the CA certificate used to sign both server and builder certificates -Package Maintainer certificates (used by /usr/bin/plague-client, -from ~/.plague-client.cfg) -server-ca-cert -> _same_ as server and client's 'ca_cert' -user-ca-cert -> CA cert that signed the package maintainer's 'user-cert' -user-key -> package maintainer's private key, can be blank if private key and - certificate are in the same file -user-cert -> package maintainer's certificate, signed by 'user-ca-cert' and - sent to build server to validate the plague-client's connection +Setting up the Certificates: +A tool called "certhelper.py" is included in the utils/ directory, or +possibly as /usr/bin/plague-certhelper if installed from a package. Here we +use certhelper.py for either program. -Setting up the Build System Certificate Authority -1. Set up the CA directory -cd -mkdir CA -cd CA -mkdir newcerts private -touch index.txt -echo '01' > serial +1. Create the Build System Certificate Authority key and certificate: +certhelper.py ca --outdir=/etc/plague/ca_dir --name=buildsystem -2. Generate a BSCA private key: +After entering the certificate's details, if there are no errors, you end up +with a self-signed certificate in /etc/plague/ca_dir/buildsystem_ca_cert.pem, +and a CA private key in /etc/plague/ca_dir/private/buildsystem_ca_key.pem. You +will need buildsystem_ca_cert.pem later. -openssl genrsa -out private/ca_key.pem 2048 +2. Create a certificate and key for the build server: -3. Generate the BSCA certificate +certhelper.py normal --outdir=/etc/plague/server/certs --name=server \ + --cadir=/etc/plague/ca_dir --caname=buildsystem -openssl req -new -x509 -key private/ca_key.pem -out ca_cert.pem \ - -extensions v3_ca -days 3650 +After entering details for the server's certificate, you end up with a combined +certificate and private key file in /etc/plague/server/certs/, +server_key_and_cert.pem. Copy the buildsystem_ca_cert.pem file from step 1 into +/etc/plague/server/certs as well. +Update the server's config file in /etc/plague/server/CONFIG.py to match the +absolute path to server_key_and_cert.pem (the 'server_key_and_cert' config +option) and also the absolute path to buildsystem_ca_cert.pem (the 'ca_cert' +config option). Both should be based in /etc/plague/server if you follow the +directions here. -4. Generate a build server key +IMPORTANT: make sure only the build server's user (normally root) can read +server_key_and_cert.pem, since it contains the server's private key. -cd -mkdir -p buildsystem/server -cd buildsystem/server -openssl genrsa -out server_key.pem 2048 +3. For each builder you plan to deploy, you will need to generate a certificate +for that builder as well. -5. Generate a build server certificate request +certhelper.py normal --outdir=/etc/plague/builder/certs --name=builder1 \ + --cadir=/etc/plague/ca_dir --caname=buildsystem -openssl req -new -nodes -out server_req.pem -key server_key.pem +After entering details for the builder's certificate, you end up with a single +file, /etc/plague/builder/certs/builder1_key_and_cert.pem. By default, the +plague-builder is set up to look for the file ".pem" where +is the host name of the builder machine. You will need to rename the +builder1_key_and_cert.pem file to the builder's hostname with a .pem extension. +If the builder is on a separate machine, you will need to copy the certificate +file to that machine along with the CA's certificate, buildsystem_ca_cert.pem, +and the server's plain certificate, server_cert.pem. +Update the builder's config file (normally in /etc/plague/builder/CONFIG.py) to +match the absolute paths to the builder's key_and_cert file, and to the +build system CA certificate, buildsystem_ca_cert.pem. -6. Sign the build server certificate request with the BSCA certificate +IMPORTANT: make sure only root can read builder1_key_and_cert.pem, since it +contains the buidler's private key. -openssl ca -out server_cert.pem -infiles server_req.pem +------------------ +Package Maintainer Certificates: -7. For each build client you have, you will need to do the following: generate a -build client key, certificate request, and sign it: -cd /buildsystem -mkdir client1 -cd client1 -openssl genrsa -out client1_key.pem 2048 -openssl req -new -nodes -out client1_req.pem -key client1_key.pem -openssl ca -out client1_cert.pem -infiles client1_req.pem +Config options from ~/.plague-client.cfg, used by /usr/bin/plague-client: -8. Use the certificates. You now have certificates for the build server and one -or more clients. You may add clients using step 7 to create and sign their -certificate requests. +server-ca-cert -> _same_ as build server and builder's 'ca_cert' +user-ca-cert -> CA cert that signed the package maintainer's 'user-cert' +user-key -> package maintainer's private key, can be blank if private key and + certificate are in the same file +user-cert -> package maintainer's certificate, signed by 'user-ca-cert' and + sent to build server to validate the plague-client's connection -9. Copy server_cert.pem, server_key.pem, and ca_cert.pem to a directory on the -build server. IMPORTANT: make sure only the build server's user can read -server_key.pem, since it is the server's private key. Then, modify the -server's CONFIG.py file and point the respective config options to the _full_ -path to each file. -10. Copy client1_cert.pem, client1_key.pem, and ca_cert.pem to a direcrory on -the build client. IMPORTANT: make sure only the build client's user can read -client1_key.pem, since it is the client's private key. Then, modify the -client's CONFIG.py file and point the respective config options to the _full_ -path to each file. +To allow package maintainers to connect and queue up packages, it is best to use +a completely separate Certificate Authority to sign user certificates. If you +use the same CA as you use for the build server and builders, any maintainer +could set up a rogue builder using his/her certificate. To prevent this, create +a new certificate authority for package maintainer certificates. + +1. The procedure closely follows the steps for the build system certificate +setup. Create the CA in the same way (using a different --outdir and --name of +course). The *_ca_cert.pem file that certhelper.py spits out should be added to +the build server's CONFIG.py file for the 'ui_ca_cert' config option. It should +also be distributed to package maintainers, who enter this certificate in their +~/.plague-client.cfg file as the 'user-ca-cert' config option. + +certhelper.py ca --outdir=/etc/plague/user_ca_dir --name=users + + +2. To create user certificates, do the same steps as for creating builder +certificates above, except MAKE SURE to enter that user's email address at the +certificate information entry's "Email Address []:" prompt. This is essential +for user validation and notification of build status. + +certhelper.py normal --outdir=/tmp/user_certs --name=user1 \ + --cadir=/etc/plague/user_ca_dir --caname=users + +Here, certhelper.py will produce a file called user1_key_and_cert.pem in +/tmp/user_certs. Send this file, along with users_ca_cert.pem and +buildsystem_ca_cert.pem, to the package maintainer whose email address you +entered for this certificate. The package maintainer then sets up his/her +~/.plague-client.cfg to point to the correct files: + +'user-ca-cert' => users_ca_cert.pem +'server-ca-cert' => buildsystem_ca_cert.pem +'user-cert' => user1_key_and_cert.pem +'user-key' => should be blank Index: plague.spec =================================================================== RCS file: /cvs/fedora/extras-buildsys/plague.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- plague.spec 28 Jul 2005 21:46:05 -0000 1.20 +++ plague.spec 8 Aug 2005 19:11:24 -0000 1.21 @@ -145,6 +145,7 @@ %files utils %defattr(-, root, root) %{_bindir}/%{name}-user-manager.py* +%{_binder}/%{name}-certhelper.py* %changelog From fedora-extras-commits at redhat.com Tue Aug 9 12:53:34 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Tue, 9 Aug 2005 08:53:34 -0400 Subject: rpms/tidy/devel tidy.spec,1.10,1.11 Message-ID: <200508091253.j79CrYjq027092@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/tidy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27075 Modified Files: tidy.spec Log Message: * Tue Aug 9 2005 Rex Dieter 0.99.0-6.20050803 - cleanup doc generation - add/restore missing docs (manpage, quickref.html) Index: tidy.spec =================================================================== RCS file: /cvs/extras/rpms/tidy/devel/tidy.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- tidy.spec 8 Aug 2005 18:20:35 -0000 1.10 +++ tidy.spec 9 Aug 2005 12:53:32 -0000 1.11 @@ -2,7 +2,7 @@ Name: tidy Summary: Utility to clean up and pretty print HTML/XHTML/XML Version: 0.99.0 -Release: 5.20050803%{?dist} +Release: 6.20050803%{?dist} Group: Applications/Text License: W3C Software License @@ -12,10 +12,12 @@ Source0: http://tidy.sourceforge.net/src/tidy_src_050803.tgz # When next snapshot is released, to become: #Source0: http://tidy.sourceforge.net/src/old/tidy_src_050803.tgz + Source1: http://tidy.sourceforge.net/docs/tidy_docs_050705.tgz BuildRequires: libtool BuildRequires: doxygen +BuildRequires: libxslt Obsoletes: libtidy < %{version}-%{release} #Provides: libtidy = %{epoch}:%{version}-%{release} @@ -44,8 +46,6 @@ %setup -q -n %{name} %setup -q -n %{name} -T -D -b1 -rm -rf htmldoc/api -mv htmldoc/doxygen.cfg Doxyfile sh build/gnuauto/setup.sh @@ -56,17 +56,25 @@ --disable-dependancy-tracking make %{?_smp_mflags} -doxygen + +# api docs +doxygen htmldoc/doxygen.cfg + +# make doc steps gleaned from build/gmake/Makefile +pushd htmldoc +../console/tidy -xml-config > tidy-config.xml +../console/tidy -xml-help > tidy-help.xml +xsltproc -o tidy.1 tidy1.xsl tidy-help.xml +xsltproc -o quickref.html quickref-html.xsl tidy-config.xml +popd %install -rm -rf $RPM_BUILD_ROOT _api +rm -rf $RPM_BUILD_ROOT make install%{!?debug_package:-strip} DESTDIR=$RPM_BUILD_ROOT -#install -D -p -m644 htmldoc/man_page.txt $RPM_BUILD_ROOT%{_mandir}/man1/tidy.1 - -mv htmldoc/api _api +install -D -p -m644 htmldoc/tidy.1 $RPM_BUILD_ROOT%{_mandir}/man1/tidy.1 ## Unpackaged files rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la @@ -83,20 +91,24 @@ %files %defattr(-,root,root,-) -%doc htmldoc/* +%doc htmldoc/*.html htmldoc/*.css htmldoc/*.gif %{_bindir}/* -#{_mandir}/man1/* +%{_mandir}/man1/* %{_libdir}/lib*.so.* %files devel %defattr(-,root,root,-) -%doc _api/* +%doc htmldoc/api/* %{_includedir}/* %{_libdir}/lib*.so %changelog -* Mon Aug 8 2005 Rex Dieter 0.99.0-5.20050803 +* Tue Aug 9 2005 Rex Dieter 0.99.0-6.20050803 +- cleanup doc generation +- add/restore missing docs (manpage, quickref.html) + +* Mon Aug 8 2005 Rex Dieter 0.99.0-5.20050803 - Update to 050803 and docs to 050705 - simplify (fedora.us bug #2071) - drop missing manpage From fedora-extras-commits at redhat.com Tue Aug 9 13:00:26 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Tue, 9 Aug 2005 09:00:26 -0400 Subject: rpms/gnupg2/devel gnupg2.spec, 1.13, 1.14 gnupg-1.9.17-lvalue.patch, 1.1, NONE Message-ID: <200508091300.j79D0QDY027186@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gnupg2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27169 Modified Files: gnupg2.spec Removed Files: gnupg-1.9.17-lvalue.patch Log Message: drop old patch 'make check' now optional, default off, since FE4+ & buildsystem borks it up (FC3 is fine?) Index: gnupg2.spec =================================================================== RCS file: /cvs/extras/rpms/gnupg2/devel/gnupg2.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- gnupg2.spec 8 Aug 2005 19:19:59 -0000 1.13 +++ gnupg2.spec 9 Aug 2005 13:00:24 -0000 1.14 @@ -6,7 +6,7 @@ Summary: GNU utility for secure communication and data storage Name: gnupg2 Version: 1.9.18 -Release: 1%{?dist} +Release: 5%{?dist} License: GPL Group: Applications/System Source0: ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/gnupg-%{version}.tar.bz2 @@ -22,12 +22,6 @@ Requires(post): /sbin/install-info Requires(postun): /sbin/install-info -# Build with -pie/-fPIE? -BuildRequires: gcc -%define gcc_ver %(gcc -dumpversion) -%if "%{gcc_ver}" < "3.2.3" -%define _without_pie --without pie -%endif %{!?_without_pie:%define _with_pie --with pie} BuildRequires: libassuan-devel >= 0.6.10 @@ -92,7 +86,7 @@ %check || : -make check +%{?_with_check:make check} %install @@ -142,7 +136,7 @@ %changelog -* Mon Aug 8 2005 Rex Dieter - 1.9.18-1 +* Mon Aug 8 2005 Rex Dieter - 1.9.18-5 - 1.9.18 - drop pth patch (--enable-gpg build fixed) - update description (from README) --- gnupg-1.9.17-lvalue.patch DELETED --- From ed at eh3.com Tue Aug 9 14:34:58 2005 From: ed at eh3.com (Ed Hill) Date: Tue, 09 Aug 2005 10:34:58 -0400 Subject: APPROVED: glpk Message-ID: <1123598098.2263.30.camel@ernie> Name: glpk Summary: GNU Linear Programming Kit Maintainer: Quentin Spencer Reviewer: Ed Hill Description: The GLPK (GNU Linear Programming Kit) package is intended for solving large-scale linear programming (LP), mixed integer programming (MIP), and other related problems. It is a set of routines written in ANSI C and organized in the form of a callable library. GLPK supports the GNU MathProg language, which is a subset of the AMPL language. The GLPK package includes the following main components: * Revised simplex method. * Primal-dual interior point method. * Branch-and-bound method. * Translator for GNU MathProg. * Application program interface (API). * Stand-alone LP/MIP solver. -- Edward H. Hill III, PhD office: MIT Dept. of EAPS; Rm 54-1424; 77 Massachusetts Ave. Cambridge, MA 02139-4307 emails: eh3 at mit.edu ed at eh3.com URLs: http://web.mit.edu/eh3/ http://eh3.com/ phone: 617-253-0098 fax: 617-253-4464 From fedora-extras-commits at redhat.com Tue Aug 9 14:41:24 2005 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Tue, 9 Aug 2005 10:41:24 -0400 Subject: rpms/highlight/devel highlight.spec,1.3,1.4 Message-ID: <200508091441.j79EfOBh029718@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/highlight/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29700 Modified Files: highlight.spec Log Message: Description: Fix #165302 Index: highlight.spec =================================================================== RCS file: /cvs/extras/rpms/highlight/devel/highlight.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- highlight.spec 8 Aug 2005 18:18:05 -0000 1.3 +++ highlight.spec 9 Aug 2005 14:41:22 -0000 1.4 @@ -1,7 +1,7 @@ Name: highlight Summary: Universal source code to formatted text converter Version: 2.4.1 -Release: 4%{?dist} +Release: 5%{?dist} Group: Development/Tools License: GPL @@ -24,12 +24,12 @@ %prep %setup -q -n %{name}-2.4-1 -%patch1 -p1 -b .org +%patch1 -p1 %patch2 -p1 %patch3 -p1 %build -make %{?_smp_mflags} +make %{?_smp_mflags} LDFLAGS= %install rm -rf $RPM_BUILD_ROOT @@ -53,6 +53,9 @@ %doc ChangeLog AUTHORS README* COPYING TODO examples/ %changelog +* Tue Aug 9 2005 Jochen Schmitt 2.4-1-5 +- Fix #165302 + * Mon Aug 8 2005 Jochen Schmitt 2.4.1-4 - Move extension.conf and scriptre.conf to /etc/highlight From fedora-extras-commits at redhat.com Tue Aug 9 15:02:25 2005 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Tue, 9 Aug 2005 11:02:25 -0400 Subject: rpms/glpk - New directory Message-ID: <200508091502.j79F2PCG030982@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/glpk In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30971/glpk Log Message: Directory /cvs/extras/rpms/glpk added to the repository From fedora-extras-commits at redhat.com Tue Aug 9 15:02:27 2005 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Tue, 9 Aug 2005 11:02:27 -0400 Subject: rpms/glpk/devel - New directory Message-ID: <200508091502.j79F2Rpv030993@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/glpk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30971/glpk/devel Log Message: Directory /cvs/extras/rpms/glpk/devel added to the repository From fedora-extras-commits at redhat.com Tue Aug 9 15:04:06 2005 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Tue, 9 Aug 2005 11:04:06 -0400 Subject: rpms/glpk Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200508091504.j79F46OJ031032@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/glpk In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31018 Added Files: Makefile import.log Log Message: Setup of module glpk --- NEW FILE Makefile --- # Top level Makefile for module glpk all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Tue Aug 9 15:04:37 2005 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Tue, 9 Aug 2005 11:04:37 -0400 Subject: rpms/glpk/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200508091504.j79F4bZ8031047@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/glpk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31018/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module glpk --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Tue Aug 9 15:07:36 2005 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Tue, 9 Aug 2005 11:07:36 -0400 Subject: rpms/glpk/devel glpk.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200508091507.j79F7aSZ031122@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/glpk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31086/devel Modified Files: .cvsignore sources Added Files: glpk.spec Log Message: auto-import glpk-4.8-1 on branch devel from glpk-4.8-1.src.rpm --- NEW FILE glpk.spec --- Name: glpk Version: 4.8 Release: 1 Summary: GNU Linear Programming Kit Group: System Environment/Libraries License: GPL URL: http://www.gnu.org/software/glpk/glpk.html Source0: ftp://ftp.gnu.org/gnu/glpk/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description The GLPK (GNU Linear Programming Kit) package is intended for solving large-scale linear programming (LP), mixed integer programming (MIP), and other related problems. It is a set of routines written in ANSI C and organized in the form of a callable library. GLPK supports the GNU MathProg language, which is a subset of the AMPL language. The GLPK package includes the following main components: * Revised simplex method. * Primal-dual interior point method. * Branch-and-bound method. * Translator for GNU MathProg. * Application program interface (API). * Stand-alone LP/MIP solver. %package devel Summary: Development headers and files for GLPK Group: Development/Libraries %description devel The glpk-devel package contains libraries and headers for developing applications which use GLPK (GNU Linear Programming Kit). %package utils Summary: GLPK-related utilities and examples Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description utils The glpk-utils package contains the standalone solver programs glpksol and tspsol that use GLPK (GNU Linear Programming Kit). %prep %setup -q %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install prefix=$RPM_BUILD_ROOT%{_prefix} \ bindir=$RPM_BUILD_ROOT%{_bindir} libdir=$RPM_BUILD_ROOT%{_libdir} \ includedir=$RPM_BUILD_ROOT%{_includedir}/%name ## Clean up directories that are included in docs make clean rm -Rf examples/.deps examples/Makefile* doc/*.dvi doc/*.latex %clean rm -rf $RPM_BUILD_ROOT ### This section is for future use when shared libraries are supported. #%files #%defattr(-,root,root) #%doc AUTHORS ChangeLog COPYING NEWS README #%{_libdir}/*.so* %files devel %defattr(-,root,root) %doc AUTHORS ChangeLog COPYING NEWS README doc %{_includedir}/glpk %{_libdir}/*.a %files utils %defattr(-,root,root) %doc COPYING examples %{_bindir}/* %changelog * Fri Jul 22 2005 Quentin Spencer 4.8-1 - First version. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/glpk/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 9 Aug 2005 15:04:35 -0000 1.1 +++ .cvsignore 9 Aug 2005 15:07:34 -0000 1.2 @@ -0,0 +1 @@ +glpk-4.8.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/glpk/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 9 Aug 2005 15:04:35 -0000 1.1 +++ sources 9 Aug 2005 15:07:34 -0000 1.2 @@ -0,0 +1 @@ +ec4df7a56a4ed98369c9f0bc7c82322b glpk-4.8.tar.gz From fedora-extras-commits at redhat.com Tue Aug 9 15:07:35 2005 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Tue, 9 Aug 2005 11:07:35 -0400 Subject: rpms/glpk import.log,1.1,1.2 Message-ID: <200508091507.j79F7ZoR031117@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/glpk In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31086 Modified Files: import.log Log Message: auto-import glpk-4.8-1 on branch devel from glpk-4.8-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/glpk/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 9 Aug 2005 15:04:04 -0000 1.1 +++ import.log 9 Aug 2005 15:07:33 -0000 1.2 @@ -0,0 +1 @@ +glpk-4_8-1:HEAD:glpk-4.8-1.src.rpm:1123600018 From fedora-extras-commits at redhat.com Tue Aug 9 15:23:24 2005 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Tue, 9 Aug 2005 11:23:24 -0400 Subject: rpms/octave/devel octave.spec,1.17,1.18 Message-ID: <200508091523.j79FNOQ7031311@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/octave/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31294 Modified Files: octave.spec Log Message: Add GLPK support (new build dependency and CPPFLAGS for configure. Index: octave.spec =================================================================== RCS file: /cvs/extras/rpms/octave/devel/octave.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- octave.spec 8 Aug 2005 13:50:15 -0000 1.17 +++ octave.spec 9 Aug 2005 15:23:22 -0000 1.18 @@ -13,7 +13,7 @@ BuildPrereq: gnuplot bison flex less tetex gcc-gfortran lapack blas BuildPrereq: ncurses-devel zlib-devel libtermcap-devel hdf5-devel BuildPrereq: readline-devel glibc-devel fftw3-devel autoconf gperf -BuildPrereq: umfpack-devel +BuildPrereq: umfpack-devel glpk-devel Prereq: /sbin/ldconfig BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: /etc/ld.so.conf.d @@ -55,6 +55,7 @@ %else %define enable64 --enable-64=no %endif +CPPFLAGS=-I%{_includedir}/glpk \ CXXFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" ./configure %enable64 \ --enable-shared=yes --enable-lite-kernel --enable-static=no \ --prefix=%{_prefix} --infodir=%{_infodir} --libdir=%{_libdir} @@ -127,6 +128,7 @@ old s390 workarounds, and LC_ALL setting. None of these appear to be necessary any longer, even if the platforms were supported. - Add --enable-64 to configure to enable 64-bit array indexing on x86_64. +- Add support for GLPK (new build dependency and CPPFLAGS for configure). * Wed Jul 27 2005 Quentin Spencer 2.9.3-3 - Add fftw3-devel to dependencies for devel From fedora-extras-commits at redhat.com Tue Aug 9 15:37:38 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 9 Aug 2005 11:37:38 -0400 Subject: rpms/perl-String-Ediff/FC-4 .cvsignore, 1.6, 1.7 perl-String-Ediff.spec, 1.10, 1.11 sources, 1.6, 1.7 Message-ID: <200508091538.j79Fc9lN031460@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-String-Ediff/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31422/FC-4 Modified Files: .cvsignore perl-String-Ediff.spec sources Log Message: * Mon Aug 8 2005 Ville Skytt?? - 0.08-1 - 0.08. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-String-Ediff/FC-4/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 3 Aug 2005 17:13:55 -0000 1.6 +++ .cvsignore 9 Aug 2005 15:37:36 -0000 1.7 @@ -1 +1 @@ -String-Ediff-0.07.tar.gz +String-Ediff-0.08.tar.gz Index: perl-String-Ediff.spec =================================================================== RCS file: /cvs/extras/rpms/perl-String-Ediff/FC-4/perl-String-Ediff.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- perl-String-Ediff.spec 3 Aug 2005 17:13:55 -0000 1.10 +++ perl-String-Ediff.spec 9 Aug 2005 15:37:36 -0000 1.11 @@ -1,6 +1,6 @@ Name: perl-String-Ediff -Version: 0.07 -Release: 1 +Version: 0.08 +Release: 1%{?dist} Summary: Produce common sub-string indices for two strings Group: Development/Libraries @@ -53,7 +53,10 @@ %changelog -* Wed Aug 3 2005 Ville Skytt?? - 0.07-1 +* Mon Aug 8 2005 Ville Skytt?? - 0.08-1 +- 0.08. + +* Wed Aug 3 2005 Ville Skytt?? - 0.07-2 - 0.07. - Clean up pre-FC2 compatibility stuff from specfile. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-String-Ediff/FC-4/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 3 Aug 2005 17:13:55 -0000 1.6 +++ sources 9 Aug 2005 15:37:36 -0000 1.7 @@ -1 +1 @@ -72b977beaef757105c5f1bdde676006b String-Ediff-0.07.tar.gz +ec44726a6023042910aeb0d2d5dc81c1 String-Ediff-0.08.tar.gz From fedora-extras-commits at redhat.com Tue Aug 9 15:37:39 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 9 Aug 2005 11:37:39 -0400 Subject: rpms/perl-String-Ediff/devel .cvsignore, 1.6, 1.7 perl-String-Ediff.spec, 1.10, 1.11 sources, 1.6, 1.7 Message-ID: <200508091538.j79Fc9bJ031465@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-String-Ediff/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31422/devel Modified Files: .cvsignore perl-String-Ediff.spec sources Log Message: * Mon Aug 8 2005 Ville Skytt?? - 0.08-1 - 0.08. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-String-Ediff/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 3 Aug 2005 17:13:55 -0000 1.6 +++ .cvsignore 9 Aug 2005 15:37:37 -0000 1.7 @@ -1 +1 @@ -String-Ediff-0.07.tar.gz +String-Ediff-0.08.tar.gz Index: perl-String-Ediff.spec =================================================================== RCS file: /cvs/extras/rpms/perl-String-Ediff/devel/perl-String-Ediff.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- perl-String-Ediff.spec 3 Aug 2005 17:13:55 -0000 1.10 +++ perl-String-Ediff.spec 9 Aug 2005 15:37:37 -0000 1.11 @@ -1,6 +1,6 @@ Name: perl-String-Ediff -Version: 0.07 -Release: 2 +Version: 0.08 +Release: 1%{?dist} Summary: Produce common sub-string indices for two strings Group: Development/Libraries @@ -53,6 +53,9 @@ %changelog +* Mon Aug 8 2005 Ville Skytt?? - 0.08-1 +- 0.08. + * Wed Aug 3 2005 Ville Skytt?? - 0.07-2 - 0.07. - Clean up pre-FC2 compatibility stuff from specfile. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-String-Ediff/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 3 Aug 2005 17:13:55 -0000 1.6 +++ sources 9 Aug 2005 15:37:37 -0000 1.7 @@ -1 +1 @@ -72b977beaef757105c5f1bdde676006b String-Ediff-0.07.tar.gz +ec44726a6023042910aeb0d2d5dc81c1 String-Ediff-0.08.tar.gz From fedora-extras-commits at redhat.com Tue Aug 9 15:53:14 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Tue, 9 Aug 2005 11:53:14 -0400 Subject: rpms/tidy/devel tidy.spec,1.11,1.12 Message-ID: <200508091553.j79FrEUV031633@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/tidy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31616 Modified Files: tidy.spec Log Message: * Tue Aug 9 2005 Rex Dieter 0.99.0-7.20050803 - -devel: Provides: libtidy-devel (#165452) Index: tidy.spec =================================================================== RCS file: /cvs/extras/rpms/tidy/devel/tidy.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- tidy.spec 9 Aug 2005 12:53:32 -0000 1.11 +++ tidy.spec 9 Aug 2005 15:53:12 -0000 1.12 @@ -2,7 +2,7 @@ Name: tidy Summary: Utility to clean up and pretty print HTML/XHTML/XML Version: 0.99.0 -Release: 6.20050803%{?dist} +Release: 7.20050803%{?dist} Group: Applications/Text License: W3C Software License @@ -20,7 +20,7 @@ BuildRequires: libxslt Obsoletes: libtidy < %{version}-%{release} -#Provides: libtidy = %{epoch}:%{version}-%{release} +#Provides: libtidy = %{version}-%{release} %description When editing HTML it's easy to make mistakes. Wouldn't it be nice if @@ -36,7 +36,7 @@ Summary: Development files for %{name} Group: Development/Libraries Obsoletes: libtidy-devel < %{version}-%{release} -#Provides: libtidy-devel = %{version}-%{release} +Provides: libtidy-devel = %{version}-%{release} Requires: %{name} = %{version}-%{release} %description devel %{summary}. @@ -104,6 +104,9 @@ %changelog +* Tue Aug 9 2005 Rex Dieter 0.99.0-7.20050803 +- -devel: Provides: libtidy-devel (#165452) + * Tue Aug 9 2005 Rex Dieter 0.99.0-6.20050803 - cleanup doc generation - add/restore missing docs (manpage, quickref.html) From fedora-extras-commits at redhat.com Tue Aug 9 15:55:50 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Tue, 9 Aug 2005 11:55:50 -0400 Subject: rpms/libassuan/FC-4 libassuan.spec,1.9,1.10 Message-ID: <200508091555.j79Fto4B031704@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/libassuan/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31687 Modified Files: libassuan.spec Log Message: (and respin to make newer than fc3's 0.6.10-2.fc3 build) * Mon Jul 4 2005 Michael Schwendt - 0.6.10-2 - Build PIC only for x86_64. Index: libassuan.spec =================================================================== RCS file: /cvs/extras/rpms/libassuan/FC-4/libassuan.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- libassuan.spec 2 Jul 2005 07:31:45 -0000 1.9 +++ libassuan.spec 9 Aug 2005 15:55:48 -0000 1.10 @@ -1,7 +1,7 @@ Summary: GnuPG IPC library Name: libassuan Version: 0.6.10 -Release: 1%{?dist} +Release: 2%{?dist} Source0: ftp://ftp.gnupg.org/gcrypt/alpha/libassuan/libassuan-%{version}.tar.gz Source1: ftp://ftp.gnupg.org/gcrypt/alpha/libassuan/libassuan-%{version}.tar.gz.sig URL: http://www.gnupg.org/ @@ -18,6 +18,7 @@ Group: Development/Libraries Requires(post): /sbin/install-info Requires(postun): /sbin/install-info + %description devel This is the IPC library used by GnuPG 1.9, GPGME and a few other packages. @@ -30,9 +31,12 @@ %build +%ifarch x86_64 +export CFLAGS="$RPM_OPT_FLAGS -fPIC" +%endif %configure -make CFLAGS="$RPM_OPT_FLAGS -fPIC -DPIC" %{?_smp_mflags} +make %{?_smp_mflags} %install @@ -78,6 +82,9 @@ %changelog +* Mon Jul 4 2005 Michael Schwendt - 0.6.10-2 +- Build PIC only for x86_64. + * Fri Jul 1 2005 Ville Skytt?? - 0.6.10-1 - 0.6.10, macro patch no longer needed (#162262). From fedora-extras-commits at redhat.com Tue Aug 9 16:06:28 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Tue, 9 Aug 2005 12:06:28 -0400 Subject: rpms/gnupg2/FC-4 gnupg2.spec,1.12,1.13 Message-ID: <200508091606.j79G6SXc000482@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gnupg2/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv453/FC-4 Modified Files: gnupg2.spec Log Message: * Tue Aug 9 2005 Rex Dieter - 1.9.18-6 - don't 'make check' by default (regular builds pass, but FC4/5+plague fails) Index: gnupg2.spec =================================================================== RCS file: /cvs/extras/rpms/gnupg2/FC-4/gnupg2.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- gnupg2.spec 8 Aug 2005 20:46:31 -0000 1.12 +++ gnupg2.spec 9 Aug 2005 16:06:26 -0000 1.13 @@ -6,7 +6,7 @@ Summary: GNU utility for secure communication and data storage Name: gnupg2 Version: 1.9.18 -Release: 5%{?dist} +Release: 6%{?dist} License: GPL Group: Applications/System Source0: ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/gnupg-%{version}.tar.bz2 @@ -22,8 +22,6 @@ Requires(post): /sbin/install-info Requires(postun): /sbin/install-info -%{!?_without_pie:%define _with_pie --with pie} - BuildRequires: libassuan-devel >= 0.6.10 BuildRequires: libgcrypt-devel => 1.2.0 BuildRequires: libgpg-error-devel => 1.0 @@ -74,8 +72,8 @@ %build -%{?_with_pie:CFLAGS="$RPM_OPT_FLAGS -fPIE" ; export CFLAGS} -%{?_with_pie:LDFLAGS="$RPM_OPT_FLAGS -pie" ; export LDFLAG} +%{!?_without_pie:CFLAGS="$RPM_OPT_FLAGS -fPIE" ; export CFLAGS} +%{!?_without_pie:LDFLAGS="$RPM_OPT_FLAGS -pie" ; export LDFLAG} %configure \ --disable-dependency-tracking \ @@ -86,7 +84,7 @@ %check || : -make check +%{?_with_check:make check} %install @@ -136,6 +134,9 @@ %changelog +* Tue Aug 9 2005 Rex Dieter - 1.9.18-6 +- don't 'make check' by default (regular builds pass, but FC4/5+plague fails) + * Mon Aug 8 2005 Rex Dieter - 1.9.18-5 - 1.9.18 - drop pth patch (--enable-gpg build fixed) From fedora-extras-commits at redhat.com Tue Aug 9 16:06:45 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Tue, 9 Aug 2005 12:06:45 -0400 Subject: rpms/gnupg2/devel gnupg2.spec,1.14,1.15 Message-ID: <200508091606.j79G6jli000489@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gnupg2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv453/devel Modified Files: gnupg2.spec Log Message: * Tue Aug 9 2005 Rex Dieter - 1.9.18-6 - don't 'make check' by default (regular builds pass, but FC4/5+plague fails) Index: gnupg2.spec =================================================================== RCS file: /cvs/extras/rpms/gnupg2/devel/gnupg2.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- gnupg2.spec 9 Aug 2005 13:00:24 -0000 1.14 +++ gnupg2.spec 9 Aug 2005 16:06:27 -0000 1.15 @@ -6,7 +6,7 @@ Summary: GNU utility for secure communication and data storage Name: gnupg2 Version: 1.9.18 -Release: 5%{?dist} +Release: 6%{?dist} License: GPL Group: Applications/System Source0: ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/gnupg-%{version}.tar.bz2 @@ -22,8 +22,6 @@ Requires(post): /sbin/install-info Requires(postun): /sbin/install-info -%{!?_without_pie:%define _with_pie --with pie} - BuildRequires: libassuan-devel >= 0.6.10 BuildRequires: libgcrypt-devel => 1.2.0 BuildRequires: libgpg-error-devel => 1.0 @@ -74,8 +72,8 @@ %build -%{?_with_pie:CFLAGS="$RPM_OPT_FLAGS -fPIE" ; export CFLAGS} -%{?_with_pie:LDFLAGS="$RPM_OPT_FLAGS -pie" ; export LDFLAG} +%{!?_without_pie:CFLAGS="$RPM_OPT_FLAGS -fPIE" ; export CFLAGS} +%{!?_without_pie:LDFLAGS="$RPM_OPT_FLAGS -pie" ; export LDFLAG} %configure \ --disable-dependency-tracking \ @@ -136,6 +134,9 @@ %changelog +* Tue Aug 9 2005 Rex Dieter - 1.9.18-6 +- don't 'make check' by default (regular builds pass, but FC4/5+plague fails) + * Mon Aug 8 2005 Rex Dieter - 1.9.18-5 - 1.9.18 - drop pth patch (--enable-gpg build fixed) From fedora-extras-commits at redhat.com Tue Aug 9 16:12:07 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Tue, 9 Aug 2005 12:12:07 -0400 Subject: rpms/gnupg2/devel .cvsignore, 1.5, 1.6 sources, 1.6, 1.7 gnupg-1.9.18.tar.bz2.sig, 1.1, NONE Message-ID: <200508091612.j79GCbZ7000635@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gnupg2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv600/devel Modified Files: .cvsignore sources Removed Files: gnupg-1.9.18.tar.bz2.sig Log Message: add .sig to sources, remove from cvs Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnupg2/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 8 Aug 2005 19:19:59 -0000 1.5 +++ .cvsignore 9 Aug 2005 16:12:05 -0000 1.6 @@ -1 +1,2 @@ gnupg-1.9.18.tar.bz2 +gnupg-1.9.18.tar.bz2.sig Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnupg2/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 8 Aug 2005 19:19:59 -0000 1.6 +++ sources 9 Aug 2005 16:12:05 -0000 1.7 @@ -1 +1,2 @@ 221d843dc23b4f33cdb8a91788a00e4d gnupg-1.9.18.tar.bz2 +0026e7686e0efb106743d58c17afffb5 gnupg-1.9.18.tar.bz2.sig --- gnupg-1.9.18.tar.bz2.sig DELETED --- From fedora-extras-commits at redhat.com Tue Aug 9 16:12:07 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Tue, 9 Aug 2005 12:12:07 -0400 Subject: rpms/gnupg2/FC-4 .cvsignore, 1.4, 1.5 sources, 1.5, 1.6 gnupg-1.9.18.tar.bz2.sig, 1.1, NONE Message-ID: <200508091612.j79GCbN5000639@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gnupg2/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv600/FC-4 Modified Files: .cvsignore sources Removed Files: gnupg-1.9.18.tar.bz2.sig Log Message: add .sig to sources, remove from cvs Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnupg2/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 8 Aug 2005 20:46:31 -0000 1.4 +++ .cvsignore 9 Aug 2005 16:12:05 -0000 1.5 @@ -1 +1,2 @@ gnupg-1.9.18.tar.bz2 +gnupg-1.9.18.tar.bz2.sig Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnupg2/FC-4/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 8 Aug 2005 20:46:31 -0000 1.5 +++ sources 9 Aug 2005 16:12:05 -0000 1.6 @@ -1 +1,2 @@ 221d843dc23b4f33cdb8a91788a00e4d gnupg-1.9.18.tar.bz2 +0026e7686e0efb106743d58c17afffb5 gnupg-1.9.18.tar.bz2.sig --- gnupg-1.9.18.tar.bz2.sig DELETED --- From fedora-extras-commits at redhat.com Tue Aug 9 17:52:23 2005 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Tue, 9 Aug 2005 13:52:23 -0400 Subject: rpms/glpk/devel glpk.spec,1.1,1.2 Message-ID: <200508091752.j79HqNDW002535@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/glpk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2518 Modified Files: glpk.spec Log Message: Add -fPIC to compile flags. Index: glpk.spec =================================================================== RCS file: /cvs/extras/rpms/glpk/devel/glpk.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- glpk.spec 9 Aug 2005 15:07:34 -0000 1.1 +++ glpk.spec 9 Aug 2005 17:52:21 -0000 1.2 @@ -1,6 +1,6 @@ Name: glpk Version: 4.8 -Release: 1 +Release: 2 Summary: GNU Linear Programming Kit Group: System Environment/Libraries @@ -51,7 +51,7 @@ %setup -q %build -%configure +CFLAGS="$RPM_OPT_FLAGS -fPIC" %configure make %{?_smp_mflags} %install @@ -85,5 +85,8 @@ %{_bindir}/* %changelog +* Tue Aug 09 2005 Quentin Spencer 4.8-2 +- Add -fPIC to compile flags. + * Fri Jul 22 2005 Quentin Spencer 4.8-1 - First version. From fedora-extras-commits at redhat.com Tue Aug 9 17:56:25 2005 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Tue, 9 Aug 2005 13:56:25 -0400 Subject: owners owners.list,1.59,1.60 Message-ID: <200508091756.j79HuP7S002608@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2591 Modified Files: owners.list Log Message: Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- owners.list 9 Aug 2005 00:34:32 -0000 1.59 +++ owners.list 9 Aug 2005 17:56:22 -0000 1.60 @@ -215,6 +215,7 @@ Fedora Extras|glibmm24|A C++ interface for GTK2 (a GUI library for X)|denisleroy at yahoo.com|extras-qa at fedoraproject.org| Fedora Extras|Glide3|Glide3 runtime for the 3Dfx Voodoo family of cards|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org| Fedora Extras|global|A source code tag system|gemi at bluewin.ch|extras-qa at fedoraproject.org| +Fedora Extras|glpk|GNU Linear Programming Kit|qspencer at ieee.org|extras-qa at fedoraproject.org| Fedora Extras|glunarclock|GNOME applet that displays the current lunar phase|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|gmime|GMime library -- creation and parsing of MIME-messages|fedora at leemhuis.info|extras-qa at fedoraproject.org| Fedora Extras|gmpc|GNOME frontend for the MPD|gauret at free.fr|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Tue Aug 9 18:03:54 2005 From: fedora-extras-commits at redhat.com (Ed Hill (edhill)) Date: Tue, 9 Aug 2005 14:03:54 -0400 Subject: rpms/emacs-auctex/devel - New directory Message-ID: <200508091803.j79I3s97003859@cvs-int.fedora.redhat.com> Author: edhill Update of /cvs/extras/rpms/emacs-auctex/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3841/emacs-auctex/devel Log Message: Directory /cvs/extras/rpms/emacs-auctex/devel added to the repository From fedora-extras-commits at redhat.com Tue Aug 9 18:03:54 2005 From: fedora-extras-commits at redhat.com (Ed Hill (edhill)) Date: Tue, 9 Aug 2005 14:03:54 -0400 Subject: rpms/emacs-auctex - New directory Message-ID: <200508091804.j79I3sEu003861@cvs-int.fedora.redhat.com> Author: edhill Update of /cvs/extras/rpms/emacs-auctex In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3841/emacs-auctex Log Message: Directory /cvs/extras/rpms/emacs-auctex added to the repository From fedora-extras-commits at redhat.com Tue Aug 9 18:05:17 2005 From: fedora-extras-commits at redhat.com (Ed Hill (edhill)) Date: Tue, 9 Aug 2005 14:05:17 -0400 Subject: rpms/emacs-auctex Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200508091805.j79I5HOO003900@cvs-int.fedora.redhat.com> Author: edhill Update of /cvs/extras/rpms/emacs-auctex In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3886 Added Files: Makefile import.log Log Message: Setup of module emacs-auctex --- NEW FILE Makefile --- # Top level Makefile for module emacs-auctex all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Tue Aug 9 18:05:46 2005 From: fedora-extras-commits at redhat.com (Ed Hill (edhill)) Date: Tue, 9 Aug 2005 14:05:46 -0400 Subject: rpms/emacs-auctex/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200508091805.j79I5kLT003918@cvs-int.fedora.redhat.com> Author: edhill Update of /cvs/extras/rpms/emacs-auctex/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3886/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module emacs-auctex --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Tue Aug 9 18:08:02 2005 From: fedora-extras-commits at redhat.com (Ed Hill (edhill)) Date: Tue, 9 Aug 2005 14:08:02 -0400 Subject: rpms/emacs-auctex/devel emacs-auctex.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200508091808.j79I82v0004009@cvs-int.fedora.redhat.com> Author: edhill Update of /cvs/extras/rpms/emacs-auctex/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3977/devel Modified Files: .cvsignore sources Added Files: emacs-auctex.spec Log Message: auto-import emacs-auctex-11.55-3.fc4 on branch devel from emacs-auctex-11.55-3.fc4.src.rpm --- NEW FILE emacs-auctex.spec --- %define startupdir %{_datadir}/emacs/site-lisp/site-start.d/ %define startupfile %{startupdir}/auctex-init.el Summary: Enhanced TeX modes for Emacsen Name: emacs-auctex Version: 11.55 Release: 3%{?dist} License: GPL Group: Applications/Editors URL: http://www.gnu.org/software/auctex/ Source0: ftp://ftp.gnu.org/pub/gnu/auctex/auctex-%{version}.tar.gz BuildArchitectures: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Obsoletes: auctex Conflicts: emacspeak < 18 Provides: auctex Requires: emacs emacs-el BuildRequires: emacs tetex tetex-dvips texinfo %description AUCTeX is an extensible package that supports writing and formatting TeX files for most variants of Emacs. AUCTeX supports many different TeX macro packages, including AMS-TeX, LaTeX, Texinfo and basic support for ConTeXt. Documentation can be found under /usr/share/doc, e.g. the reference card (tex-ref.pdf) and the FAQ. The AUCTeX manual is available in Emacs info (C-h i d m AUCTeX RET). On the AUCTeX home page, we provide manuals in various formats. This package is for GNU Emacs. %prep %setup -q -n auctex-%{version} %build # --with-texmf-dir overrides local docstrip configurations. %configure "--with-emacs" '--with-texmf-dir=%{_datadir}/texmf' make pushd doc make auctex.info tex-ref.pdf popd %install rm -rf %{buildroot} mkdir -p %{buildroot}{%{_datadir}/emacs/site-lisp,%{_infodir}} %makeinstall install-contrib install-info mkdir -p %{buildroot}%{startupdir} echo "; Autoactivation of AUCTeX" > %{buildroot}%{startupfile} echo "; Created for %{name}-%{version}-%{release}.noarch.rpm" >> \ %{buildroot}%{startupfile} echo "(require 'tex-site)" >> %{buildroot}%{startupfile} rm -rf %{buildroot}%{_var} rm -f %{buildroot}%{_datadir}/emacs/site-lisp/auctex/style/.nosearch # Remove dir file that has been created by the makeinfo calls because this # file will not been included in the rpm distribution (make RPM 4.1+ happy) # rm -f '%{buildroot}%{_infodir}/dir' %clean rm -rf %{buildroot} %post /sbin/install-info %{_infodir}/auctex.info %{_infodir}/dir 2>/dev/null || : %preun if [ $1 -eq 0 ]; then /sbin/install-info --delete %{_infodir}/auctex.info %{_infodir}/dir 2>/dev/null || : fi %files %defattr(-,root,root,-) %doc RELEASE COPYING INSTALL README TODO FAQ CHANGES %doc doc/tex-ref.pdf %doc %{_infodir}/*.info* %exclude %{_infodir}/dir %{_datadir}/emacs/site-lisp/auctex %{startupfile} %{_datadir}/emacs/site-lisp/tex-site.el %changelog * Tue Aug 9 2005 Ed Hill - 11.55-3 - add Requires and BuildRequires * Mon Aug 8 2005 Ed Hill - 11.55-2 - modify for acceptance into Fedora Extras * Fri Jan 21 2005 David Kastrup - Conflict with outdated Emacspeak versions * Fri Jan 14 2005 David Kastrup - Install and remove auctex.info, not auctex * Thu Aug 19 2004 David Kastrup - Change tex-site.el to overwriting config file mode. New naming scheme. * Mon Aug 16 2004 David Kastrup - Attempt a bit of SuSEism. Might work if we are lucky. * Sat Dec 7 2002 David Kastrup - Change addresses to fit move to Savannah. * Mon Apr 15 2002 Jan-Ake Larsson - Adjusted TeX-macro-global and put autoactivation in preinstall script so that it can be chosen at install time. * Tue Feb 19 2002 Jan-Ake Larsson - Added site-start.el support * Sat Feb 16 2002 Jan-Ake Larsson - Prerelease 11.11 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/emacs-auctex/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 9 Aug 2005 18:05:43 -0000 1.1 +++ .cvsignore 9 Aug 2005 18:08:00 -0000 1.2 @@ -0,0 +1 @@ +auctex-11.55.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/emacs-auctex/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 9 Aug 2005 18:05:43 -0000 1.1 +++ sources 9 Aug 2005 18:08:00 -0000 1.2 @@ -0,0 +1 @@ +f22ae1ecc513d14b3b5ce3076f461395 auctex-11.55.tar.gz From fedora-extras-commits at redhat.com Tue Aug 9 18:07:59 2005 From: fedora-extras-commits at redhat.com (Ed Hill (edhill)) Date: Tue, 9 Aug 2005 14:07:59 -0400 Subject: rpms/emacs-auctex import.log,1.1,1.2 Message-ID: <200508091808.j79I8Trg004026@cvs-int.fedora.redhat.com> Author: edhill Update of /cvs/extras/rpms/emacs-auctex In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3977 Modified Files: import.log Log Message: auto-import emacs-auctex-11.55-3.fc4 on branch devel from emacs-auctex-11.55-3.fc4.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/emacs-auctex/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 9 Aug 2005 18:05:15 -0000 1.1 +++ import.log 9 Aug 2005 18:07:39 -0000 1.2 @@ -0,0 +1 @@ +emacs-auctex-11_55-3_fc4:HEAD:emacs-auctex-11.55-3.fc4.src.rpm:1123610855 From fedora-extras-commits at redhat.com Tue Aug 9 18:23:08 2005 From: fedora-extras-commits at redhat.com (Ed Hill (edhill)) Date: Tue, 9 Aug 2005 14:23:08 -0400 Subject: rpms/emacs-auctex/devel emacs-auctex.spec,1.1,1.2 Message-ID: <200508091823.j79IN8Sn004136@cvs-int.fedora.redhat.com> Author: edhill Update of /cvs/extras/rpms/emacs-auctex/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4119 Modified Files: emacs-auctex.spec Log Message: call it BuildArch Index: emacs-auctex.spec =================================================================== RCS file: /cvs/extras/rpms/emacs-auctex/devel/emacs-auctex.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- emacs-auctex.spec 9 Aug 2005 18:08:00 -0000 1.1 +++ emacs-auctex.spec 9 Aug 2005 18:23:06 -0000 1.2 @@ -4,12 +4,12 @@ Summary: Enhanced TeX modes for Emacsen Name: emacs-auctex Version: 11.55 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: Applications/Editors URL: http://www.gnu.org/software/auctex/ Source0: ftp://ftp.gnu.org/pub/gnu/auctex/auctex-%{version}.tar.gz -BuildArchitectures: noarch +BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Obsoletes: auctex Conflicts: emacspeak < 18 @@ -81,6 +81,9 @@ %{_datadir}/emacs/site-lisp/tex-site.el %changelog +* Tue Aug 9 2005 Ed Hill - 11.55-4 +- call it BuildArch + * Tue Aug 9 2005 Ed Hill - 11.55-3 - add Requires and BuildRequires From fedora-extras-commits at redhat.com Tue Aug 9 18:29:10 2005 From: fedora-extras-commits at redhat.com (Ed Hill (edhill)) Date: Tue, 9 Aug 2005 14:29:10 -0400 Subject: owners owners.list,1.60,1.61 Message-ID: <200508091829.j79ITAMl004217@cvs-int.fedora.redhat.com> Author: edhill Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4200 Modified Files: owners.list Log Message: emacs-auctex Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- owners.list 9 Aug 2005 17:56:22 -0000 1.60 +++ owners.list 9 Aug 2005 18:29:08 -0000 1.61 @@ -132,6 +132,7 @@ Fedora Extras|edb|A database convenience library wrapped around BDB|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| Fedora Extras|eet|A library designed to write an arbitary set of chunks of data to a file|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| Fedora Extras|elmo|Terminal-based mail client|gauret at free.fr|extras-qa at fedoraproject.org| +Fedora Extras|emacs-auctex|Enhanced TeX modes for Emacsen|ed at eh3.com|extras-qa at fedoraproject.org| Fedora Extras|enchant|An Enchanting Spell Checking Library|j.m.maurer at student.utwente.nl|extras-qa at fedoraproject.org| Fedora Extras|enemies-of-carlotta|A simple mailing list manager|redhat-bugzilla at camperquake.de|extras-qa at fedoraproject.org| Fedora Extras|enigma|Clone of the ATARI game Oxyd|fedora at leemhuis.info|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Tue Aug 9 19:05:15 2005 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Tue, 9 Aug 2005 15:05:15 -0400 Subject: rpms/gnupg2/FC-3 sources, 1.4, 1.5 .cvsignore, 1.3, 1.4 gnupg-1.9.18.tar.bz2.sig, 1.1, NONE Message-ID: <200508091905.j79J5j2r005455@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gnupg2/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5436 Modified Files: sources .cvsignore Removed Files: gnupg-1.9.18.tar.bz2.sig Log Message: move .sig to sources Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnupg2/FC-3/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 8 Aug 2005 20:22:27 -0000 1.4 +++ sources 9 Aug 2005 19:05:09 -0000 1.5 @@ -1 +1,2 @@ 221d843dc23b4f33cdb8a91788a00e4d gnupg-1.9.18.tar.bz2 +0026e7686e0efb106743d58c17afffb5 gnupg-1.9.18.tar.bz2.sig Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnupg2/FC-3/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Aug 2005 20:22:27 -0000 1.3 +++ .cvsignore 9 Aug 2005 19:05:09 -0000 1.4 @@ -1 +1,2 @@ gnupg-1.9.18.tar.bz2 +gnupg-1.9.18.tar.bz2.sig --- gnupg-1.9.18.tar.bz2.sig DELETED --- From fedora-extras-commits at redhat.com Tue Aug 9 19:31:34 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Tue, 9 Aug 2005 15:31:34 -0400 Subject: owners owners.list,1.61,1.62 Message-ID: <200508091931.j79JVYT7005549@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5532 Modified Files: owners.list Log Message: transfer abicheck to me Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- owners.list 9 Aug 2005 18:29:08 -0000 1.61 +++ owners.list 9 Aug 2005 19:31:32 -0000 1.62 @@ -11,7 +11,7 @@ Fedora Extras|aalib|An ASCII art library|anvil at livna.org|extras-qa at fedoraproject.org| Fedora Extras|abcde|A Better CD Encoder|nphilipp at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|abe|A scrolling, platform-jumping, ancient pyramid exploring game|pmatilai at laiskiainen.org|extras-qa at fedoraproject.org| -Fedora Extras|abicheck|ABI checking tool|anvil at livna.org|extras-qa at fedoraproject.org| +Fedora Extras|abicheck|ABI checking tool|bugs.michael at gmx.net|extras-qa at fedoraproject.org| Fedora Extras|abiword|The AbiWord word processor|j.m.maurer at student.utwente.nl|extras-qa at fedoraproject.org| Fedora Extras|adns|Advanced, easy to use, asynchronous-capable DNS client library|colin at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|advancecomp|Recompression utilities for .PNG, .MNG and .ZIP files|matthias at rpmforge.net|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Tue Aug 9 19:46:35 2005 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Tue, 9 Aug 2005 15:46:35 -0400 Subject: rpms/galeon/FC-4 galeon.spec,1.16,1.17 Message-ID: <200508091946.j79JkZev005579@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/extras/rpms/galeon/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5562 Modified Files: galeon.spec Log Message: make it build on FC-4/ppc Index: galeon.spec =================================================================== RCS file: /cvs/extras/rpms/galeon/FC-4/galeon.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- galeon.spec 3 Aug 2005 19:42:04 -0000 1.16 +++ galeon.spec 9 Aug 2005 19:46:33 -0000 1.17 @@ -1,14 +1,14 @@ Summary: GNOME2 Web browser based on Mozilla Name: galeon Version: 1.3.21 -Release: 12%{?dist} +Release: 13%{?dist} License: GPL Group: Applications/Internet URL: http://galeon.sourceforge.net/ Source0: http://download.sourceforge.net/galeon/galeon-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n) Requires: scrollkeeper -Requires: mozilla = %(rpm -q mozilla-devel --qf='%%{epoch}:%%{version}' 2>/dev/null) +Requires: mozilla = 37:1.7.10 BuildRequires: gettext mozilla-nspr-devel desktop-file-utils BuildRequires: gtk2-devel >= 2.4.0 gnome-desktop-devel BuildRequires: mozilla-devel >= 37:1.7.2 @@ -101,6 +101,9 @@ %changelog +* Tue Aug 9 2005 Seth Vidal +- get rid of requires with rpm -q in string so ppc will build. + * Wed Aug 3 2005 Dams - 1.3.21 - Released bumped again.. hoping build system will be able to rebuild this one. From fedora-extras-commits at redhat.com Tue Aug 9 20:44:20 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 9 Aug 2005 16:44:20 -0400 Subject: rpms/perl-HTML-Template-Expr - New directory Message-ID: <200508092044.j79KiKnx006956@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-HTML-Template-Expr In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6936/perl-HTML-Template-Expr Log Message: Directory /cvs/extras/rpms/perl-HTML-Template-Expr added to the repository From fedora-extras-commits at redhat.com Tue Aug 9 20:44:20 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 9 Aug 2005 16:44:20 -0400 Subject: rpms/perl-HTML-Template-Expr/devel - New directory Message-ID: <200508092044.j79KiKfF006961@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-HTML-Template-Expr/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6936/perl-HTML-Template-Expr/devel Log Message: Directory /cvs/extras/rpms/perl-HTML-Template-Expr/devel added to the repository From fedora-extras-commits at redhat.com Tue Aug 9 20:44:39 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 9 Aug 2005 16:44:39 -0400 Subject: rpms/perl-HTML-Template-Expr Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200508092044.j79Kid9P007008@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-HTML-Template-Expr In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6981 Added Files: Makefile import.log Log Message: Setup of module perl-HTML-Template-Expr --- NEW FILE Makefile --- # Top level Makefile for module perl-HTML-Template-Expr all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Tue Aug 9 20:44:40 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 9 Aug 2005 16:44:40 -0400 Subject: rpms/perl-HTML-Template-Expr/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200508092044.j79KieOV007013@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-HTML-Template-Expr/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6981/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-HTML-Template-Expr --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Tue Aug 9 20:45:14 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 9 Aug 2005 16:45:14 -0400 Subject: rpms/perl-HTML-Template-Expr import.log,1.1,1.2 Message-ID: <200508092045.j79KjiN3007081@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-HTML-Template-Expr In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7047 Modified Files: import.log Log Message: auto-import perl-HTML-Template-Expr-0.04-0.2 on branch devel from perl-HTML-Template-Expr-0.04-0.2.src.rpm Initial import (#165472). Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-HTML-Template-Expr/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 9 Aug 2005 20:44:36 -0000 1.1 +++ import.log 9 Aug 2005 20:45:12 -0000 1.2 @@ -0,0 +1 @@ +perl-HTML-Template-Expr-0_04-0_2:HEAD:perl-HTML-Template-Expr-0.04-0.2.src.rpm:1123620304 From fedora-extras-commits at redhat.com Tue Aug 9 20:45:14 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 9 Aug 2005 16:45:14 -0400 Subject: rpms/perl-HTML-Template-Expr/devel perl-HTML-Template-Expr.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200508092045.j79Kjj3P007085@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-HTML-Template-Expr/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7047/devel Modified Files: .cvsignore sources Added Files: perl-HTML-Template-Expr.spec Log Message: auto-import perl-HTML-Template-Expr-0.04-0.2 on branch devel from perl-HTML-Template-Expr-0.04-0.2.src.rpm Initial import (#165472). --- NEW FILE perl-HTML-Template-Expr.spec --- Name: perl-HTML-Template-Expr Version: 0.04 Release: 0.2 Summary: Expression support extension for HTML::Template Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/HTML-Template-Expr/ Source0: http://www.cpan.org/authors/id/S/SA/SAMTREGAR/HTML-Template-Expr-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(HTML::Template) BuildRequires: perl(Parse::RecDescent) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description This module provides an extension to HTML::Template which allows expressions in the template syntax. This is purely an addition - all the normal HTML::Template options, syntax and behaviors will still work. Expression support includes comparisons, math operations, string operations and a mechanism to allow you add your own functions at runtime. %prep %setup -q -n HTML-Template-Expr-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc ANNOUNCE ARTISTIC Changes GPL README %{perl_vendorlib}/HTML/ %{_mandir}/man3/HTML::Template::Expr.3* %changelog * Sat Jul 9 2005 Ville Skytt?? - 0.04-0.2 - Minor specfile cleanups. * Tue Jun 14 2005 Ville Skytt?? - 0.04-0.1 - Rebuild for FC4. * Sat Dec 11 2004 Ville Skytt?? - 0:0.04-0.fdr.1 - First build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-HTML-Template-Expr/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 9 Aug 2005 20:44:37 -0000 1.1 +++ .cvsignore 9 Aug 2005 20:45:12 -0000 1.2 @@ -0,0 +1 @@ +HTML-Template-Expr-0.04.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-HTML-Template-Expr/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 9 Aug 2005 20:44:37 -0000 1.1 +++ sources 9 Aug 2005 20:45:12 -0000 1.2 @@ -0,0 +1 @@ +7b34e122677342475cfde168a70d7cab HTML-Template-Expr-0.04.tar.gz From fedora-extras-commits at redhat.com Tue Aug 9 20:47:59 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 9 Aug 2005 16:47:59 -0400 Subject: rpms/perl-HTML-Template-Expr/devel perl-HTML-Template-Expr.spec, 1.1, 1.2 Message-ID: <200508092047.j79KlxtL007149@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-HTML-Template-Expr/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7132 Modified Files: perl-HTML-Template-Expr.spec Log Message: * Tue Aug 9 2005 Ville Skytt?? - 0.04-1 - Bump for first FE build. Index: perl-HTML-Template-Expr.spec =================================================================== RCS file: /cvs/extras/rpms/perl-HTML-Template-Expr/devel/perl-HTML-Template-Expr.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-HTML-Template-Expr.spec 9 Aug 2005 20:45:12 -0000 1.1 +++ perl-HTML-Template-Expr.spec 9 Aug 2005 20:47:57 -0000 1.2 @@ -1,6 +1,6 @@ Name: perl-HTML-Template-Expr Version: 0.04 -Release: 0.2 +Release: 1%{?dist} Summary: Expression support extension for HTML::Template Group: Development/Libraries @@ -56,6 +56,9 @@ %changelog +* Tue Aug 9 2005 Ville Skytt?? - 0.04-1 +- Bump for first FE build. + * Sat Jul 9 2005 Ville Skytt?? - 0.04-0.2 - Minor specfile cleanups. From fedora-extras-commits at redhat.com Tue Aug 9 20:52:48 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 9 Aug 2005 16:52:48 -0400 Subject: owners owners.list,1.62,1.63 Message-ID: <200508092052.j79Kqm9I007222@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7205 Modified Files: owners.list Log Message: Add perl-HTML-Template-Expr (#165472). Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- owners.list 9 Aug 2005 19:31:32 -0000 1.62 +++ owners.list 9 Aug 2005 20:52:46 -0000 1.63 @@ -556,6 +556,7 @@ Fedora Extras|perl-Gtk2|Perl interface to the 2.x series of the Gimp Toolkit library|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Heap|A collection of routines for managing a heap data structure|thm at duke.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-HTML-Template|Perl module to use HTML Templates|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-HTML-Template-Expr|Expression support extension for HTML::Template|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-HTML-Tree|HTML tree handling modules for Perl|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Image-Base|Base class for loading, manipulating and saving images in Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Image-ExifTool|Utility for reading and writing image meta info|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Wed Aug 10 01:44:23 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Tue, 9 Aug 2005 21:44:23 -0400 Subject: fedora-rpmdevtools COPYING,1.1,1.2 Message-ID: <200508100144.j7A1iNZC014461@cvs-int.fedora.redhat.com> Author: wtogami Update of /cvs/fedora/fedora-rpmdevtools In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14441 Modified Files: COPYING Log Message: test commit Index: COPYING =================================================================== RCS file: /cvs/fedora/fedora-rpmdevtools/COPYING,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- COPYING 27 May 2003 17:39:57 -0000 1.1 +++ COPYING 10 Aug 2005 01:44:20 -0000 1.2 @@ -338,3 +338,4 @@ 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. + From fedora-extras-commits at redhat.com Wed Aug 10 01:44:59 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Tue, 9 Aug 2005 21:44:59 -0400 Subject: fedora-rpmdevtools COPYING,1.2,1.3 Message-ID: <200508100144.j7A1ixY9014492@cvs-int.fedora.redhat.com> Author: wtogami Update of /cvs/fedora/fedora-rpmdevtools In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14472 Modified Files: COPYING Log Message: undo test commit Index: COPYING =================================================================== RCS file: /cvs/fedora/fedora-rpmdevtools/COPYING,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- COPYING 10 Aug 2005 01:44:20 -0000 1.2 +++ COPYING 10 Aug 2005 01:44:57 -0000 1.3 @@ -338,4 +338,3 @@ 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. - From fedora-extras-commits at redhat.com Wed Aug 10 01:47:06 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Tue, 9 Aug 2005 21:47:06 -0400 Subject: fedora-rpmdevtools check-buildroot,1.2,1.3 Message-ID: <200508100147.j7A1l63x014526@cvs-int.fedora.redhat.com> Author: wtogami Update of /cvs/fedora/fedora-rpmdevtools In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14506 Modified Files: check-buildroot Log Message: test commit Index: check-buildroot =================================================================== RCS file: /cvs/fedora/fedora-rpmdevtools/check-buildroot,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- check-buildroot 22 Feb 2004 15:46:57 -0000 1.2 +++ check-buildroot 10 Aug 2005 01:47:04 -0000 1.3 @@ -1,5 +1,6 @@ #! /bin/sh + # Copyright (C) 2004 Enrico Scholz # # This program is free software; you can redistribute it and/or modify From fedora-extras-commits at redhat.com Wed Aug 10 01:48:12 2005 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Tue, 9 Aug 2005 21:48:12 -0400 Subject: fedora-rpmdevtools check-buildroot,1.3,1.4 Message-ID: <200508100148.j7A1mC6m014557@cvs-int.fedora.redhat.com> Author: wtogami Update of /cvs/fedora/fedora-rpmdevtools In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14537 Modified Files: check-buildroot Log Message: undo test commit Index: check-buildroot =================================================================== RCS file: /cvs/fedora/fedora-rpmdevtools/check-buildroot,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- check-buildroot 10 Aug 2005 01:47:04 -0000 1.3 +++ check-buildroot 10 Aug 2005 01:48:10 -0000 1.4 @@ -1,6 +1,5 @@ #! /bin/sh - # Copyright (C) 2004 Enrico Scholz # # This program is free software; you can redistribute it and/or modify From fedora-extras-commits at redhat.com Wed Aug 10 06:15:01 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Wed, 10 Aug 2005 02:15:01 -0400 Subject: rpms/perl-Locale-gettext - New directory Message-ID: <200508100615.j7A6F1bL020756@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Locale-gettext In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20742/perl-Locale-gettext Log Message: Directory /cvs/extras/rpms/perl-Locale-gettext added to the repository From fedora-extras-commits at redhat.com Wed Aug 10 06:41:09 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Wed, 10 Aug 2005 02:41:09 -0400 Subject: rpms/perl-Locale-gettext/devel - New directory Message-ID: <200508100641.j7A6f9Ok020909@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Locale-gettext/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20895/devel Log Message: Directory /cvs/extras/rpms/perl-Locale-gettext/devel added to the repository From fedora-extras-commits at redhat.com Wed Aug 10 06:54:55 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Wed, 10 Aug 2005 02:54:55 -0400 Subject: rpms/perl-Locale-gettext Makefile,NONE,1.1 Message-ID: <200508100654.j7A6steM021071@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Locale-gettext In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21040 Added Files: Makefile Log Message: manually import, because cvs-import has failed --- NEW FILE Makefile --- # Top level Makefile for module perl-Locale-gettext all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Wed Aug 10 06:54:55 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Wed, 10 Aug 2005 02:54:55 -0400 Subject: rpms/perl-Locale-gettext/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 perl-Locale-gettext.spec, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200508100654.j7A6stTA021076@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Locale-gettext/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21040/devel Added Files: .cvsignore Makefile perl-Locale-gettext.spec sources Log Message: manually import, because cvs-import has failed --- NEW FILE .cvsignore --- gettext-1.05.tar.gz ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE perl-Locale-gettext.spec --- Name: perl-Locale-gettext Version: 1.05 Release: 2%{?dist} Summary: Interface to gettext family of functions Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/gettext/ Source0: http://search.cpan.org/CPAN/authors/id/P/PV/PVANDRY/gettext-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl BuildRequires: gettext Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description The gettext module permits access from perl to the gettext() family of functions for retrieving message strings from databases constructed to internationalize software. %prep %setup -q -n gettext-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type f -name '*.bs' -a -size 0 -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc README %{perl_vendorarch}/auto/Locale %{perl_vendorarch}/Locale %{_mandir}/man3/*.3* %changelog * Tue Aug 09 2005 Ralf Corsepius - 1.05-2 - Add BuildRequires: gettext. * Sun Aug 07 2005 Ralf Corsepius - 1.05-1 - FE submission. * Thu Aug 04 2005 Ralf Corsepius - 1.05-0 - Initial rpm. --- NEW FILE sources --- f3d3f474a1458f37174c410dfef61a46 gettext-1.05.tar.gz From fedora-extras-commits at redhat.com Wed Aug 10 07:10:39 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Wed, 10 Aug 2005 03:10:39 -0400 Subject: owners owners.list,1.63,1.64 Message-ID: <200508100710.j7A7AdkZ022402@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22385 Modified Files: owners.list Log Message: Add perl-Locale-gettext Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- owners.list 9 Aug 2005 20:52:46 -0000 1.63 +++ owners.list 10 Aug 2005 07:10:37 -0000 1.64 @@ -576,6 +576,7 @@ Fedora Extras|perl-libintl|Internationalization library for Perl, compatible with gettext|matthias at rpmforge.net|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Lingua-EN-Inflect|Convert singular to plural, select "a" or "an"|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Lingua-EN-Inflect-Number|Force number of words to singular or plural|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Locale-gettext|Interface to gettext family of functions|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Mail-Alias|For bugs related to the perl-Mail-Alias component|anvil at livna.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Mail-Sendmail|Simple platform independent mailer for Perl|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Mail-SPF-Query|Mail::SPF::Query determines the legitimacy of an SMTP client IP|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Wed Aug 10 08:45:34 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Wed, 10 Aug 2005 04:45:34 -0400 Subject: rpms/libstatgrab/devel .cvsignore, 1.2, 1.3 libstatgrab.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200508100845.j7A8jYIo024353@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/libstatgrab/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24332 Modified Files: .cvsignore libstatgrab.spec sources Log Message: * Wed Aug 10 2005 Oliver Falk - 0.12-1 - Update - Added saidar manpage Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libstatgrab/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Jul 2005 07:22:42 -0000 1.2 +++ .cvsignore 10 Aug 2005 08:45:32 -0000 1.3 @@ -1 +1 @@ -libstatgrab-0.11.1.tar.gz +libstatgrab-0.12.tar.gz Index: libstatgrab.spec =================================================================== RCS file: /cvs/extras/rpms/libstatgrab/devel/libstatgrab.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libstatgrab.spec 8 Jul 2005 07:22:42 -0000 1.1 +++ libstatgrab.spec 10 Aug 2005 08:45:32 -0000 1.2 @@ -3,7 +3,7 @@ Summary: Make system statistics Name: libstatgrab -Version: 0.11.1 +Version: 0.12 Release: 3%{?dist} Source0: ftp://ftp.i-scream.org/pub/i-scream/%{name}/%{name}-%{version}.tar.gz @@ -96,6 +96,7 @@ %{_bindir}/statgrab-make-mrtg-config %{_bindir}/statgrab-make-mrtg-index %{_mandir}/*/statgrab* +%{_mandir}/*/saidar* %files %defattr(-,root,root) @@ -126,6 +127,10 @@ %{_bindir}/vm_stats %changelog +* Wed Aug 10 2005 Oliver Falk - 0.12-1 +- Update +- Added saidar manpage + * Fri Jul 08 2005 Oliver Falk - 0.11.1-3 - Included examples/*.c in doc Index: sources =================================================================== RCS file: /cvs/extras/rpms/libstatgrab/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Jul 2005 07:22:42 -0000 1.2 +++ sources 10 Aug 2005 08:45:32 -0000 1.3 @@ -1 +1 @@ -6d1e6980c39e505082e1c98c9fe81950 libstatgrab-0.11.1.tar.gz +fe8bf50490e3382c29da3a553bb7ca0e libstatgrab-0.12.tar.gz From fedora-extras-commits at redhat.com Wed Aug 10 08:47:01 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Wed, 10 Aug 2005 04:47:01 -0400 Subject: rpms/libstatgrab/devel libstatgrab.spec,1.2,1.3 Message-ID: <200508100847.j7A8l19V024396@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/libstatgrab/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24379 Modified Files: libstatgrab.spec Log Message: * Fix release number Index: libstatgrab.spec =================================================================== RCS file: /cvs/extras/rpms/libstatgrab/devel/libstatgrab.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- libstatgrab.spec 10 Aug 2005 08:45:32 -0000 1.2 +++ libstatgrab.spec 10 Aug 2005 08:46:59 -0000 1.3 @@ -4,7 +4,7 @@ Name: libstatgrab Version: 0.12 -Release: 3%{?dist} +Release: 1%{?dist} Source0: ftp://ftp.i-scream.org/pub/i-scream/%{name}/%{name}-%{version}.tar.gz Patch0: %{name}.nochmod.patch From fedora-extras-commits at redhat.com Wed Aug 10 08:49:20 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Wed, 10 Aug 2005 04:49:20 -0400 Subject: rpms/libstatgrab/FC-4 .cvsignore, 1.2, 1.3 libstatgrab.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200508100849.j7A8nKqH024479@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/libstatgrab/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24458 Modified Files: .cvsignore libstatgrab.spec sources Log Message: * Wed Aug 10 2005 Oliver Falk - 0.12-1 - Update - Added saidar manpage Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libstatgrab/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Jul 2005 07:22:42 -0000 1.2 +++ .cvsignore 10 Aug 2005 08:49:18 -0000 1.3 @@ -1 +1 @@ -libstatgrab-0.11.1.tar.gz +libstatgrab-0.12.tar.gz Index: libstatgrab.spec =================================================================== RCS file: /cvs/extras/rpms/libstatgrab/FC-4/libstatgrab.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libstatgrab.spec 8 Jul 2005 07:22:42 -0000 1.1 +++ libstatgrab.spec 10 Aug 2005 08:49:18 -0000 1.2 @@ -3,8 +3,8 @@ Summary: Make system statistics Name: libstatgrab -Version: 0.11.1 -Release: 3%{?dist} +Version: 0.12 +Release: 1%{?dist} Source0: ftp://ftp.i-scream.org/pub/i-scream/%{name}/%{name}-%{version}.tar.gz Patch0: %{name}.nochmod.patch @@ -96,6 +96,7 @@ %{_bindir}/statgrab-make-mrtg-config %{_bindir}/statgrab-make-mrtg-index %{_mandir}/*/statgrab* +%{_mandir}/*/saidar* %files %defattr(-,root,root) @@ -126,6 +127,10 @@ %{_bindir}/vm_stats %changelog +* Wed Aug 10 2005 Oliver Falk - 0.12-1 +- Update +- Added saidar manpage + * Fri Jul 08 2005 Oliver Falk - 0.11.1-3 - Included examples/*.c in doc Index: sources =================================================================== RCS file: /cvs/extras/rpms/libstatgrab/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Jul 2005 07:22:42 -0000 1.2 +++ sources 10 Aug 2005 08:49:18 -0000 1.3 @@ -1 +1 @@ -6d1e6980c39e505082e1c98c9fe81950 libstatgrab-0.11.1.tar.gz +fe8bf50490e3382c29da3a553bb7ca0e libstatgrab-0.12.tar.gz From fedora-extras-commits at redhat.com Wed Aug 10 08:52:21 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Wed, 10 Aug 2005 04:52:21 -0400 Subject: rpms/libstatgrab/FC-3 .cvsignore, 1.2, 1.3 libstatgrab.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200508100852.j7A8qLfm024556@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/libstatgrab/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24535 Modified Files: .cvsignore libstatgrab.spec sources Log Message: * Wed Aug 10 2005 Oliver Falk - 0.12-1 - Update - Added saidar manpage Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libstatgrab/FC-3/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Jul 2005 07:22:42 -0000 1.2 +++ .cvsignore 10 Aug 2005 08:52:18 -0000 1.3 @@ -1 +1 @@ -libstatgrab-0.11.1.tar.gz +libstatgrab-0.12.tar.gz Index: libstatgrab.spec =================================================================== RCS file: /cvs/extras/rpms/libstatgrab/FC-3/libstatgrab.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libstatgrab.spec 8 Jul 2005 07:22:42 -0000 1.1 +++ libstatgrab.spec 10 Aug 2005 08:52:18 -0000 1.2 @@ -3,8 +3,8 @@ Summary: Make system statistics Name: libstatgrab -Version: 0.11.1 -Release: 3%{?dist} +Version: 0.12 +Release: 1%{?dist} Source0: ftp://ftp.i-scream.org/pub/i-scream/%{name}/%{name}-%{version}.tar.gz Patch0: %{name}.nochmod.patch @@ -96,6 +96,7 @@ %{_bindir}/statgrab-make-mrtg-config %{_bindir}/statgrab-make-mrtg-index %{_mandir}/*/statgrab* +%{_mandir}/*/saidar* %files %defattr(-,root,root) @@ -126,6 +127,10 @@ %{_bindir}/vm_stats %changelog +* Wed Aug 10 2005 Oliver Falk - 0.12-1 +- Update +- Added saidar manpage + * Fri Jul 08 2005 Oliver Falk - 0.11.1-3 - Included examples/*.c in doc Index: sources =================================================================== RCS file: /cvs/extras/rpms/libstatgrab/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Jul 2005 07:22:42 -0000 1.2 +++ sources 10 Aug 2005 08:52:18 -0000 1.3 @@ -1 +1 @@ -6d1e6980c39e505082e1c98c9fe81950 libstatgrab-0.11.1.tar.gz +fe8bf50490e3382c29da3a553bb7ca0e libstatgrab-0.12.tar.gz From oliver at linux-kernel.at Wed Aug 10 09:22:55 2005 From: oliver at linux-kernel.at (Oliver Falk) Date: Wed, 10 Aug 2005 11:22:55 +0200 Subject: Request for review: perl-Unix-Statgrab Message-ID: <42F9C76F.609@linux-kernel.at> SRPM & Spec: http://filelister.linux-kernel.at/mod_perl?current=/packages/FC_EXTRAS_APPROVAL/perl-Unix-Statgrab Summary: Perl extension for collecting information about the machine Description: Unix::Statgrab is a wrapper for libstatgrab as available from . It is a reasonably portable attempt to query interesting stats about your computer. It covers information on the operating system, CPU, memory usage, network interfaces, hard-disks etc. Each of the provided functions follow a simple rule: It never takes any argument and returns either an object (in case of success) or "undef". In case "undef" was returned, check the return value of "get_error". Also see "ERROR HANDLING" further below. Compiled fine on FC Devel with libstatgrab 0.12, after I patched it... :-) Please review, Oliver From bugs.michael at gmx.net Wed Aug 10 09:34:25 2005 From: bugs.michael at gmx.net (Michael Schwendt) Date: Wed, 10 Aug 2005 11:34:25 +0200 Subject: Request for review: perl-Unix-Statgrab In-Reply-To: <42F9C76F.609@linux-kernel.at> References: <42F9C76F.609@linux-kernel.at> Message-ID: <20050810113425.4c5627d0.bugs.michael@gmx.net> On Wed, 10 Aug 2005 11:22:55 +0200, Oliver Falk wrote: > SRPM & Spec: > http://filelister.linux-kernel.at/mod_perl?current=/packages/FC_EXTRAS_APPROVAL/perl-Unix-Statgrab > > Summary: Perl extension for collecting information about the machine Can you please request reviews following http://fedoraproject.org/wiki/Extras/NewPackageProcessMarkTwo ? fedora-extras-commits list has not been used for reviews before. From oliver at linux-kernel.at Wed Aug 10 09:32:36 2005 From: oliver at linux-kernel.at (Oliver Falk) Date: Wed, 10 Aug 2005 11:32:36 +0200 Subject: Request for review: perl-Unix-Statgrab In-Reply-To: <20050810113425.4c5627d0.bugs.michael@gmx.net> References: <42F9C76F.609@linux-kernel.at> <20050810113425.4c5627d0.bugs.michael@gmx.net> Message-ID: <42F9C9B4.8020603@linux-kernel.at> On 08/10/2005 11:34 AM, Michael Schwendt wrote: > On Wed, 10 Aug 2005 11:22:55 +0200, Oliver Falk wrote: > > >>SRPM & Spec: >>http://filelister.linux-kernel.at/mod_perl?current=/packages/FC_EXTRAS_APPROVAL/perl-Unix-Statgrab >> >>Summary: Perl extension for collecting information about the machine > > > Can you please request reviews following > http://fedoraproject.org/wiki/Extras/NewPackageProcessMarkTwo > ? OK, the old way doesn't work anymore :-) > fedora-extras-commits list has not been used for reviews before. Oops, was a mistake. Best, Oliver From fedora-extras-commits at redhat.com Wed Aug 10 13:41:37 2005 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Wed, 10 Aug 2005 09:41:37 -0400 Subject: rpms/pptp/devel pptp.spec,1.4,1.5 Message-ID: <200508101341.j7ADfbkh030888@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/pptp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30871 Modified Files: pptp.spec Log Message: * Wed Aug 10 2005 Paul Howarth 1.7.0-2 - own directory %{_localstatedir}/run/pptp Index: pptp.spec =================================================================== RCS file: /cvs/extras/rpms/pptp/devel/pptp.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- pptp.spec 28 Jul 2005 15:26:10 -0000 1.4 +++ pptp.spec 10 Aug 2005 13:41:34 -0000 1.5 @@ -1,6 +1,6 @@ Name: pptp Version: 1.7.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Point-to-Point Tunneling Protocol (PPTP) Client Group: Applications/Internet @@ -26,6 +26,7 @@ %install %{__rm} -rf $RPM_BUILD_ROOT %{__make} DESTDIR=$RPM_BUILD_ROOT install +%{__install} -d -m 750 $RPM_BUILD_ROOT%{_localstatedir}/run/pptp %clean %{__rm} -rf $RPM_BUILD_ROOT @@ -36,11 +37,15 @@ %doc ChangeLog Documentation/DESIGN.PPTP %{_sbindir}/pptp %{_mandir}/man8/pptp.8* +%dir %attr(750,root,root) %{_localstatedir}/run/pptp # /etc/ppp is hardcoded instead of using %{_sysconfdir}/ppp because the # Fedora Core ppp package hardcodes the directory name %config(noreplace) /etc/ppp/options.pptp %changelog +* Wed Aug 10 2005 Paul Howarth 1.7.0-2 +- own directory %{_localstatedir}/run/pptp + * Thu Jul 28 2005 Paul Howarth 1.7.0-1 - new upstream version 1.7.0 - remove patch, included upstream From fedora-extras-commits at redhat.com Wed Aug 10 13:42:13 2005 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Wed, 10 Aug 2005 09:42:13 -0400 Subject: rpms/pptp/FC-4 pptp.spec,1.4,1.5 Message-ID: <200508101342.j7ADgD9u030911@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/pptp/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30894 Modified Files: pptp.spec Log Message: resync with devel Index: pptp.spec =================================================================== RCS file: /cvs/extras/rpms/pptp/FC-4/pptp.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- pptp.spec 28 Jul 2005 15:40:40 -0000 1.4 +++ pptp.spec 10 Aug 2005 13:42:11 -0000 1.5 @@ -1,6 +1,6 @@ Name: pptp Version: 1.7.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Point-to-Point Tunneling Protocol (PPTP) Client Group: Applications/Internet @@ -26,6 +26,7 @@ %install %{__rm} -rf $RPM_BUILD_ROOT %{__make} DESTDIR=$RPM_BUILD_ROOT install +%{__install} -d -m 750 $RPM_BUILD_ROOT%{_localstatedir}/run/pptp %clean %{__rm} -rf $RPM_BUILD_ROOT @@ -36,11 +37,15 @@ %doc ChangeLog Documentation/DESIGN.PPTP %{_sbindir}/pptp %{_mandir}/man8/pptp.8* +%dir %attr(750,root,root) %{_localstatedir}/run/pptp # /etc/ppp is hardcoded instead of using %{_sysconfdir}/ppp because the # Fedora Core ppp package hardcodes the directory name %config(noreplace) /etc/ppp/options.pptp %changelog +* Wed Aug 10 2005 Paul Howarth 1.7.0-2 +- own directory %{_localstatedir}/run/pptp + * Thu Jul 28 2005 Paul Howarth 1.7.0-1 - new upstream version 1.7.0 - remove patch, included upstream From fedora-extras-commits at redhat.com Wed Aug 10 13:42:37 2005 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Wed, 10 Aug 2005 09:42:37 -0400 Subject: rpms/pptp/FC-3 pptp.spec,1.4,1.5 Message-ID: <200508101342.j7ADgbYg030934@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/pptp/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30917 Modified Files: pptp.spec Log Message: resync with devel Index: pptp.spec =================================================================== RCS file: /cvs/extras/rpms/pptp/FC-3/pptp.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- pptp.spec 28 Jul 2005 15:42:39 -0000 1.4 +++ pptp.spec 10 Aug 2005 13:42:35 -0000 1.5 @@ -1,6 +1,6 @@ Name: pptp Version: 1.7.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Point-to-Point Tunneling Protocol (PPTP) Client Group: Applications/Internet @@ -26,6 +26,7 @@ %install %{__rm} -rf $RPM_BUILD_ROOT %{__make} DESTDIR=$RPM_BUILD_ROOT install +%{__install} -d -m 750 $RPM_BUILD_ROOT%{_localstatedir}/run/pptp %clean %{__rm} -rf $RPM_BUILD_ROOT @@ -36,11 +37,15 @@ %doc ChangeLog Documentation/DESIGN.PPTP %{_sbindir}/pptp %{_mandir}/man8/pptp.8* +%dir %attr(750,root,root) %{_localstatedir}/run/pptp # /etc/ppp is hardcoded instead of using %{_sysconfdir}/ppp because the # Fedora Core ppp package hardcodes the directory name %config(noreplace) /etc/ppp/options.pptp %changelog +* Wed Aug 10 2005 Paul Howarth 1.7.0-2 +- own directory %{_localstatedir}/run/pptp + * Thu Jul 28 2005 Paul Howarth 1.7.0-1 - new upstream version 1.7.0 - remove patch, included upstream From fedora-extras-commits at redhat.com Wed Aug 10 14:16:08 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Wed, 10 Aug 2005 10:16:08 -0400 Subject: rpms/perl-Module-Signature/devel .cvsignore, 1.2, 1.3 perl-Module-Signature.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200508101416.j7AEG8xY032377@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-Module-Signature/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32356 Modified Files: .cvsignore perl-Module-Signature.spec sources Log Message: * Wed Aug 10 2005 Ville Skytt?? - 0.45-1 - 0.45. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Signature/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 7 Apr 2005 19:13:37 -0000 1.2 +++ .cvsignore 10 Aug 2005 14:16:06 -0000 1.3 @@ -1 +1 @@ -Module-Signature-0.44.tar.gz +Module-Signature-0.45.tar.gz Index: perl-Module-Signature.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Signature/devel/perl-Module-Signature.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Module-Signature.spec 15 Apr 2005 18:21:51 -0000 1.2 +++ perl-Module-Signature.spec 10 Aug 2005 14:16:06 -0000 1.3 @@ -2,19 +2,22 @@ %{expand: %%define mytempdir %(mktemp -d %{_tmppath}/tmp.XXXXXX)} Name: perl-Module-Signature -Version: 0.44 -Release: 2 +Version: 0.45 +Release: 1%{?dist} Summary: CPAN signature management utilities and modules Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/Module-Signature/ -Source0: http://www.cpan.org/authors/id/A/AU/AUTRIJUS/Module-Signature-0.44.tar.gz +Source0: http://www.cpan.org/authors/id/A/AU/AUTRIJUS/Module-Signature-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: perl >= 1:5.6.1, perl(Digest::SHA1), gnupg -Requires: gnupg, perl(PAR::Dist), perl(Digest::SHA1) +BuildRequires: gnupg +BuildRequires: perl(Digest::SHA1) +Requires: gnupg +Requires: perl(Digest::SHA1) +Requires: perl(PAR::Dist) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -40,7 +43,7 @@ chmod -R u+w $RPM_BUILD_ROOT/* -%check || : +%check export GNUPGHOME=%{mytempdir}/_gnupg for f in debug*.list ; do test -e $f && mv $f %{mytempdir} ; done # make test # would require network access @@ -55,11 +58,14 @@ %defattr(-,root,root,-) %doc AUTHORS Changes README TODO *.pub %{_bindir}/cpansign -%{perl_vendorlib}/Module +%{perl_vendorlib}/Module/ %{_mandir}/man[13]/*.[13]* %changelog +* Wed Aug 10 2005 Ville Skytt?? - 0.45-1 +- 0.45. + * Thu Apr 7 2005 Ville Skytt?? - 0.44-2 - Drop Epoch: 0 and 0.fdr. release prefix. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Signature/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 7 Apr 2005 19:13:37 -0000 1.2 +++ sources 10 Aug 2005 14:16:06 -0000 1.3 @@ -1 +1 @@ -f1928d481376c1402878890feec26a1f Module-Signature-0.44.tar.gz +c74843d4e7f4da911edcf7becf32b9c8 Module-Signature-0.45.tar.gz From fedora-extras-commits at redhat.com Wed Aug 10 14:36:16 2005 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Wed, 10 Aug 2005 10:36:16 -0400 Subject: owners owners.list,1.64,1.65 Message-ID: <200508101436.j7AEaGEb032542@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32525 Modified Files: owners.list Log Message: Grabbing some of anvil's orphaned packages. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- owners.list 10 Aug 2005 07:10:37 -0000 1.64 +++ owners.list 10 Aug 2005 14:36:14 -0000 1.65 @@ -513,7 +513,7 @@ Fedora Extras|pdftk|The PDF Tool Kit|Jochen at herr-schmitt.de|extras-qa at fedoraproject.org| Fedora Extras|pdftohtml|A PDF to HTML converter|gauret at free.fr|extras-qa at fedoraproject.org| Fedora Extras|perl-AppConfig|Perl module for reading configuration files|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com -Fedora Extras|perl-Archive-Zip|Perl library for accessing Zip archives|anvil at livna.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Archive-Zip|Perl library for accessing Zip archives|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Authen-SASL|SASL Authentication framework for Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-BerkeleyDB|Perl interface to Berkeley DB|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-bioperl|A package of public domain Perl tools for computational molecular biology|thm at duke.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com @@ -528,7 +528,7 @@ Fedora Extras|perl-Config-Record|Perl module for Configuration file access|dgregor at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Config-Tiny|Perl module for reading and writing .ini style configuration files|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Convert-BinHex|Macintosh BinHex extractor library for Perl|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com -Fedora Extras|perl-Convert-TNEF|Perl module to read TNEF files|anvil at livna.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Convert-TNEF|Perl module to read TNEF files|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Convert-UUlib|A perl interface to the uulib library|Nicolas.Mailhot at laPoste.net|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Crypt-Blowfish|XS Blowfish implementation for Perl|andreas at bawue.net|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Crypt-CBC|Encrypt Data with Cipher Block Chaining Mode|andreas at bawue.net|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com @@ -637,7 +637,7 @@ Fedora Extras|perl-Unicode-MapUTF8|Conversions to and from arbitrary character sets and UTF8|gauret at free.fr|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Unicode-String|Perl modules to handle various Unicode issues|gauret at free.fr|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-UNIVERSAL-moniker|Real world naming for classes|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com -Fedora Extras|perl-Unix-Syslog|Perl interface to the UNIX syslog(3) calls|anvil at livna.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Unix-Syslog|Perl interface to the UNIX syslog(3) calls|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Want|Perl module implementing a generalisation of wantarray|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-XML-LibXSLT|Perl module for interfacing to GNOME's libxslt|shishz at hotpop.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-XML-RSS|Perl module for managing RDF Site Summary (RSS) files|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Wed Aug 10 16:37:07 2005 From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl)) Date: Wed, 10 Aug 2005 12:37:07 -0400 Subject: rpms/gmime/devel .cvsignore, 1.2, 1.3 gmime.spec, 1.5, 1.6 sources, 1.2, 1.3 Message-ID: <200508101637.j7AGb71C002883@cvs-int.fedora.redhat.com> Author: thl Update of /cvs/extras/rpms/gmime/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2862 Modified Files: .cvsignore gmime.spec sources Log Message: update to 2.1.15 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gmime/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:26:21 -0000 1.2 +++ .cvsignore 10 Aug 2005 16:37:04 -0000 1.3 @@ -1 +1 @@ -gmime-2.1.9.tar.gz +gmime-2.1.15.tar.gz Index: gmime.spec =================================================================== RCS file: /cvs/extras/rpms/gmime/devel/gmime.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- gmime.spec 18 May 2005 02:36:55 -0000 1.5 +++ gmime.spec 10 Aug 2005 16:37:04 -0000 1.6 @@ -1,12 +1,12 @@ Name: gmime -Version: 2.1.9 -Release: 5 +Version: 2.1.15 +Release: 1%{?dist} Summary: Library for creating and parsing MIME messages Group: System Environment/Libraries License: GPL URL: http://spruce.sourceforge.net/gmime/ -Source0: http://spruce.sourceforge.net/gmime/sources/v2.1/gmime-2.1.9.tar.gz +Source0: http://spruce.sourceforge.net/gmime/sources/v2.1/gmime-2.1.15.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: glib2-devel >= 2.0.0 @@ -72,9 +72,13 @@ %{_libdir}/gmimeConf.sh %{_libdir}/pkgconfig/*.pc %{_includedir}/gmime-2.0 -%{_datadir}/gtk-doc +%{_datadir}/doc %changelog +* Wed Aug 10 2005 Thorsten Leemhuis - 2.1.15-1 +- Update to 2.1.15 +- Use dist + * Wed May 18 2005 Colin Charles - 2.1.9-5 - bump release, request build on ppc Index: sources =================================================================== RCS file: /cvs/extras/rpms/gmime/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 04:26:21 -0000 1.2 +++ sources 10 Aug 2005 16:37:04 -0000 1.3 @@ -1 +1 @@ -8bd24a56d5f56be9150deb9840a0812a gmime-2.1.9.tar.gz +c6df963c6e502f2da57ebb33143b40af gmime-2.1.15.tar.gz From fedora-extras-commits at redhat.com Wed Aug 10 16:53:18 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Wed, 10 Aug 2005 12:53:18 -0400 Subject: owners owners.list,1.65,1.66 Message-ID: <200508101653.j7AGrIWK003003@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2986 Modified Files: owners.list Log Message: Grabbing neXtaw. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- owners.list 10 Aug 2005 14:36:14 -0000 1.65 +++ owners.list 10 Aug 2005 16:53:16 -0000 1.66 @@ -474,7 +474,7 @@ Fedora Extras|NetworkManager-vpnc|NetworkManager VPN integration for vpnc|davidz at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|neverball|Roll a ball through an obstacle course|nos at utelsystems.com|extras-qa at fedoraproject.org| Fedora Extras|newpg|Temporary project to work on GnuPG extensions|ville.skytta at iki.fi|extras-qa at fedoraproject.org| -Fedora Extras|neXtaw|A modified version of the Athena Widgets with a N*XTSTEP appearance.|anvil at livna.org|extras-qa at fedoraproject.org| +Fedora Extras|neXtaw|A modified version of the Athena Widgets with a N*XTSTEP appearance|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|nexuiz|Multiplayer, deathmatch oriented first person shooter|adrian at lisas.de|extras-qa at fedoraproject.org| Fedora Extras|nexuiz-data|Game data for the Nexuiz first person shooter|adrian at lisas.de|extras-qa at fedoraproject.org| Fedora Extras|nfswatch|An NFS traffic monitoring tool|Christian.Iseli at licr.org|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Wed Aug 10 16:54:55 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Wed, 10 Aug 2005 12:54:55 -0400 Subject: owners owners.list,1.66,1.67 Message-ID: <200508101654.j7AGstTd003036@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3019 Modified Files: owners.list Log Message: Orphan qtparted. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.66 retrieving revision 1.67 diff -u -r1.66 -r1.67 --- owners.list 10 Aug 2005 16:53:16 -0000 1.66 +++ owners.list 10 Aug 2005 16:54:52 -0000 1.67 @@ -717,7 +717,7 @@ Fedora Extras|qhull|General dimension convex hull programs|rc040203 at freenet.de|extras-qa at fedoraproject.org| Fedora Extras|qiv|Quick Image Viewer|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|qof|QOF provides a query engine library for C objects|toshio at tiki-lounge.com|extras-qa at fedoraproject.org| -Fedora Extras|qtparted|Partition Magic clone written in C++ using the Qt toolkit|ville.skytta at iki.fi|extras-qa at fedoraproject.org| +Fedora Extras|qtparted|Partition Magic clone written in C++ using the Qt toolkit|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|QuantLib| QuantLib is a free/open-source library for modeling, trading, and risk management in real-life|tcallawa at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|quilt|Patch management tool|jwboyer at jdub.homelinux.org|extras-qa at fedoraproject.org| Fedora Extras|R|A language and environment for statistical computing and graphics|tcallawa at redhat.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Wed Aug 10 17:07:46 2005 From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl)) Date: Wed, 10 Aug 2005 13:07:46 -0400 Subject: rpms/gmime/FC-4 .cvsignore, 1.2, 1.3 gmime.spec, 1.5, 1.6 sources, 1.2, 1.3 Message-ID: <200508101708.j7AH8GHf004291@cvs-int.fedora.redhat.com> Author: thl Update of /cvs/extras/rpms/gmime/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4267 Modified Files: .cvsignore gmime.spec sources Log Message: Update to 2.1.15; use dist Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gmime/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:26:21 -0000 1.2 +++ .cvsignore 10 Aug 2005 17:07:43 -0000 1.3 @@ -1 +1 @@ -gmime-2.1.9.tar.gz +gmime-2.1.15.tar.gz Index: gmime.spec =================================================================== RCS file: /cvs/extras/rpms/gmime/FC-4/gmime.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- gmime.spec 18 May 2005 02:36:55 -0000 1.5 +++ gmime.spec 10 Aug 2005 17:07:44 -0000 1.6 @@ -1,12 +1,12 @@ Name: gmime -Version: 2.1.9 -Release: 5 +Version: 2.1.15 +Release: 1%{?dist} Summary: Library for creating and parsing MIME messages Group: System Environment/Libraries License: GPL URL: http://spruce.sourceforge.net/gmime/ -Source0: http://spruce.sourceforge.net/gmime/sources/v2.1/gmime-2.1.9.tar.gz +Source0: http://spruce.sourceforge.net/gmime/sources/v2.1/gmime-2.1.15.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: glib2-devel >= 2.0.0 @@ -72,9 +72,13 @@ %{_libdir}/gmimeConf.sh %{_libdir}/pkgconfig/*.pc %{_includedir}/gmime-2.0 -%{_datadir}/gtk-doc +%{_datadir}/doc %changelog +* Wed Aug 10 2005 Thorsten Leemhuis - 2.1.15-1 +- Update to 2.1.15 +- Use dist + * Wed May 18 2005 Colin Charles - 2.1.9-5 - bump release, request build on ppc Index: sources =================================================================== RCS file: /cvs/extras/rpms/gmime/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 04:26:21 -0000 1.2 +++ sources 10 Aug 2005 17:07:44 -0000 1.3 @@ -1 +1 @@ -8bd24a56d5f56be9150deb9840a0812a gmime-2.1.9.tar.gz +c6df963c6e502f2da57ebb33143b40af gmime-2.1.15.tar.gz From fedora-extras-commits at redhat.com Wed Aug 10 17:13:58 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 10 Aug 2005 13:13:58 -0400 Subject: rpms/plplot - New directory Message-ID: <200508101713.j7AHDwmw004367@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/plplot In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4347/plplot Log Message: Directory /cvs/extras/rpms/plplot added to the repository From fedora-extras-commits at redhat.com Wed Aug 10 17:13:59 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 10 Aug 2005 13:13:59 -0400 Subject: rpms/plplot/devel - New directory Message-ID: <200508101713.j7AHDxLZ004372@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/plplot/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4347/plplot/devel Log Message: Directory /cvs/extras/rpms/plplot/devel added to the repository From fedora-extras-commits at redhat.com Wed Aug 10 17:14:09 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 10 Aug 2005 13:14:09 -0400 Subject: rpms/plplot Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200508101714.j7AHE9XX004419@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/plplot In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4392 Added Files: Makefile import.log Log Message: Setup of module plplot --- NEW FILE Makefile --- # Top level Makefile for module plplot all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Wed Aug 10 17:14:09 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 10 Aug 2005 13:14:09 -0400 Subject: rpms/plplot/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200508101714.j7AHE984004424@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/plplot/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4392/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module plplot --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Wed Aug 10 17:15:12 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 10 Aug 2005 13:15:12 -0400 Subject: rpms/plplot import.log,1.1,1.2 Message-ID: <200508101715.j7AHFCl0004507@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/plplot In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4473 Modified Files: import.log Log Message: auto-import plplot-5.5.3-5 on branch devel from plplot-5.5.3-5.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/plplot/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 10 Aug 2005 17:14:07 -0000 1.1 +++ import.log 10 Aug 2005 17:15:09 -0000 1.2 @@ -0,0 +1 @@ +plplot-5_5_3-5:HEAD:plplot-5.5.3-5.src.rpm:1123694106 From fedora-extras-commits at redhat.com Wed Aug 10 17:15:12 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 10 Aug 2005 13:15:12 -0400 Subject: rpms/plplot/devel plplot-5.5.3-buffer.patch, NONE, 1.1 plplot-5.5.3-matwrap.patch, NONE, 1.1 plplot-5.5.3-tk.patch, NONE, 1.1 plplot.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200508101715.j7AHFC62004518@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/plplot/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4473/devel Modified Files: .cvsignore sources Added Files: plplot-5.5.3-buffer.patch plplot-5.5.3-matwrap.patch plplot-5.5.3-tk.patch plplot.spec Log Message: auto-import plplot-5.5.3-5 on branch devel from plplot-5.5.3-5.src.rpm plplot-5.5.3-buffer.patch: --- NEW FILE plplot-5.5.3-buffer.patch --- --- plplot-5.5.3/src/plcont.c.orig 2005-08-09 10:14:34.000000000 -0600 +++ plplot-5.5.3/src/plcont.c 2005-08-09 10:15:11.000000000 -0600 @@ -295,7 +295,7 @@ static void plfloatlabel(PLFLT value, char *string) { PLINT setpre, precis; - char form[10], tmpstring[10]; + char form[10], tmpstring[20]; PLINT exponent = 0; PLFLT mant, tmp; plplot-5.5.3-matwrap.patch: --- NEW FILE plplot-5.5.3-matwrap.patch --- --- plplot-5.5.3/bindings/octave/matwrap/matwrap.orig 2005-08-04 17:10:33.000000000 -0600 +++ plplot-5.5.3/bindings/octave/matwrap/matwrap 2005-08-04 17:11:02.000000000 -0600 @@ -216,7 +216,7 @@ my $incstr = $fname; # Assume we include the file as is. if ($incstr =~ s@^/usr/include/@@ || # Is it a system include file? $incstr =~ s@^/usr/local/include/@@ || - $incstr =~ s at .*/gcc-lib/.*/include/@@) { # Is it a system include + $incstr =~ s at .*/gcc/.*/include/@@) { # Is it a system include # file that was fixed by gcc? $include_str .= "#include <$incstr>\n"; # Use a different syntax. } else { @@ -228,7 +228,7 @@ grep(substr($fname, 0, length($_)) eq $_, @cpp_ignore_dirs) || # Or does it begin with the list of forbidden # directories? - $fname =~ m@/gcc-lib/@) { # Somewhere in gcc fixed includes? + $fname =~ m@/gcc/@) { # Somewhere in gcc fixed includes? $remember_defs_in_file = 0; # We're not really interested in this file. } else { $remember_defs_in_file = 1; # This is a file we are actually --- plplot-5.5.3/cf/octave.ac.orig 2005-08-09 09:34:00.000000000 -0600 +++ plplot-5.5.3/cf/octave.ac 2005-08-09 09:34:52.000000000 -0600 @@ -35,13 +35,7 @@ # check for matwrap if test "$enable_octave" = "yes"; then - AC_CHECK_PROG(has_matwrap, matwrap, yes, no) - if test "$has_matwrap" = "yes"; then - MATWRAP=`which matwrap` - else - MATWRAP=`pwd`"/bindings/octave/matwrap/matwrap" - AC_MSG_WARN([Using builtin matwrap.]); - fi + MATWRAP=`pwd`"/bindings/octave/matwrap/matwrap" fi # check for user supplied mkoctfile plplot-5.5.3-tk.patch: --- NEW FILE plplot-5.5.3-tk.patch --- --- plplot-5.5.3/cf/tcl.ac.orig 2005-08-04 13:42:51.000000000 -0600 +++ plplot-5.5.3/cf/tcl.ac 2005-08-04 13:43:27.000000000 -0600 @@ -55,13 +55,10 @@ # "/usr" which would give bad result under Linux without this ordering. incdirs_default="\ -/usr/include/tcl8.4/tcl-private/generic \ -/usr/include/tcl8.4/tk-private/generic \ -/usr/include/tcl8.4/itcl-private/generic \ +/usr/include/tcl-private/generic \ +/usr/include/tk-private/generic \ +/usr/include/itcl-private/generic \ /usr/include/tcl8.4 \ -/usr/include/tcl8.3/tcl-private/generic \ -/usr/include/tcl8.3/tk-private/generic \ -/usr/include/tcl8.3/itcl-private/generic \ /usr/include/tcl8.3 \ /usr/include/tcl8.2/generic \ $prefix/include/itcl \ --- NEW FILE plplot.spec --- %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: plplot Version: 5.5.3 Release: 5%{?dist} Summary: Library of functions for making scientific plots Group: Applications/Engineering License: LGPL URL: http://plplot.sourceforge.net/ Source0: http://prdownloads.sf.net/plplot/%{name}-%{version}.tar.gz Patch0: plplot-5.5.3-matwrap.patch Patch1: plplot-5.5.3-tk.patch Patch2: plplot-5.5.3-buffer.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: autoconf BuildRequires: gcc-gfortran, freetype-devel, octave-devel, qhull-devel BuildRequires: java-devel, libgcj-devel BuildRequires: gd-devel, tcl-devel, tk-devel BuildRequires: python-devel, pygtk2-devel, python-numeric BuildRequires: libgnomeui-devel, libgnomeprintui22-devel, gnome-python2 BuildRequires: perl(XML::DOM) #BuildRequires: libunicode-devel %description PLplot is a library of functions that are useful for making scientific plots. PLplot can be used from within compiled languages such as C, C++, FORTRAN and Java, and interactively from interpreted languages such as Octave, Python, Perl and Tcl. The PLplot library can be used to create standard x-y plots, semilog plots, log-log plots, contour plots, 3D surface plots, mesh plots, bar charts and pie charts. Multiple graphs (of the same or different sizes) may be placed on a single page with multiple lines in each graph. A variety of output file devices such as Postscript, png, jpeg, LaTeX and others, as well as interactive devices such as xwin, tk, xterm and Tektronics devices are supported. New devices can be easily added by writing a small number of device dependent routines. There are almost 2000 characters in the extended character set. This includes four different fonts, the Greek alphabet and a host of mathematical, musical, and other symbols. Some devices supports its own way of dealing with text, such as the Postscript and LaTeX drivers, or the png and jpeg drivers that uses the Freetype library. %package devel Summary: Development headers and libraries for PLplot Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel %{summary} %package gnome Summary: Functions for scientific plotting with GNOME Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description gnome %{summary} %package gnome-devel Summary: Development files for using PLplot GNOME Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: %{name}-gnome = %{version}-%{release} %description gnome-devel %{summary} %package octave Summary: Functions for scientific plotting with Octave Group: Development/Libraries Requires: %{name} = %{version}-%{release}, octave %description octave %{summary} %package tk Summary: Functions for scientific plotting with Tk Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description tk %{summary} %package tk-devel Summary: Development files for using PLplot with Tk Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: %{name}-tk = %{version}-%{release} %description tk-devel %{summary} %prep %setup -q %patch0 -p1 -b .orig %patch1 -p1 -b .orig %patch2 -p1 -b .orig %build autoconf %configure --disable-static --without-rpath --with-pthreads \ --with-freetype-font-dir=/usr/share/fonts \ --with-libunicode=no --disable-cgm --disable-linuxvga \ --disable-wingcc --disable-aqt --disable-pdl make %check make check %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT mv $RPM_BUILD_ROOT/%{_docdir}/plplot $RPM_BUILD_ROOT/%{_docdir}/plplot-%{version} find $RPM_BUILD_ROOT -name \*.la | xargs rm #Remove non-existant PDL dependency rm -r $RPM_BUILD_ROOT%{_datadir}/plplot%{version}/examples/perl #Permissions find $RPM_BUILD_ROOT%{_docdir} -type f | xargs chmod -x %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %post gnome -p /sbin/ldconfig %postun gnome -p /sbin/ldconfig %post octave -p /sbin/ldconfig %postun octave -p /sbin/ldconfig %post tk -p /sbin/ldconfig %postun tk -p /sbin/ldconfig %files %defattr(-,root,root,-) %{_docdir}/plplot-%{version}/ %{_bindir}/plm2gif %{_bindir}/plpr %{_bindir}/plrender %{_bindir}/pltek %{_bindir}/pstex2eps %{_libdir}/libcsirocsa.so.* %{_libdir}/libcsironn.so.* %{_libdir}/libplplotcxxd.so.* %{_libdir}/libplplotd.so.* %{_libdir}/libplplotf77cd.so.* %{_libdir}/libplplotf77d.so.* %dir %{_libdir}/plplot%{version} %dir %{_libdir}/plplot%{version}/driversd %{_libdir}/plplot%{version}/driversd/gd.rc %{_libdir}/plplot%{version}/driversd/gd.so %{_libdir}/plplot%{version}/driversd/hpgl.rc %{_libdir}/plplot%{version}/driversd/hpgl.so %{_libdir}/plplot%{version}/driversd/mem.rc %{_libdir}/plplot%{version}/driversd/mem.so %{_libdir}/plplot%{version}/driversd/null.rc %{_libdir}/plplot%{version}/driversd/null.so %{_libdir}/plplot%{version}/driversd/pbm.rc %{_libdir}/plplot%{version}/driversd/pbm.so %{_libdir}/plplot%{version}/driversd/plmeta.rc %{_libdir}/plplot%{version}/driversd/plmeta.so %{_libdir}/plplot%{version}/driversd/ps.rc %{_libdir}/plplot%{version}/driversd/ps.so %{_libdir}/plplot%{version}/driversd/pstex.rc %{_libdir}/plplot%{version}/driversd/pstex.so %{_libdir}/plplot%{version}/driversd/xfig.rc %{_libdir}/plplot%{version}/driversd/xfig.so %{_libdir}/plplot%{version}/driversd/xwin.rc %{_libdir}/plplot%{version}/driversd/xwin.so %{_libdir}/jni/plplotjavac_wrap.so %{python_sitelib}/_plplotcmodule.so %{python_sitelib}/plplot.py %{python_sitelib}/plplot_widgetmodule.so %{python_sitelib}/plplotc.py %{python_sitelib}/plplotcanvas.py %{_mandir}/man1/plm2gif.1.gz %{_mandir}/man1/plpr.1.gz %{_mandir}/man1/plrender.1.gz %{_mandir}/man1/pltek.1.gz %{_mandir}/man1/pstex2eps.1.gz %{_datadir}/java/plplot.jar %dir %{_datadir}/plplot%{version} %{_datadir}/plplot%{version}/*.map %{_datadir}/plplot%{version}/*.fnt %{_datadir}/plplot%{version}/pkgIndex.tcl %{_datadir}/plplot%{version}/tcl/ %dir %{_datadir}/plplot%{version}/examples %{_datadir}/plplot%{version}/examples/python/ %{_datadir}/plplot%{version}/examples/test_python.sh %{_datadir}/plplot%{version}/examples/test_tcl.sh %{_datadir}/plplot%{version}/examples/plplot-test.sh %files devel %defattr(-,root,root,-) %{_bindir}/plplot-config %{_bindir}/plplot_libtool %{_mandir}/man1/plplot_libtool.1.gz %{_includedir}/plplot/ %{_libdir}/libcsirocsa.so %{_libdir}/libcsironn.so %{_libdir}/libplplotcxxd.so %{_libdir}/libplplotd.so %{_libdir}/libplplotf77cd.so %{_libdir}/libplplotf77d.so %{_datadir}/plplot%{version}/examples/c/ %{_datadir}/plplot%{version}/examples/c++/ %{_datadir}/plplot%{version}/examples/f77/ %{_datadir}/plplot%{version}/examples/java/ %{_datadir}/plplot%{version}/examples/Makefile %{_datadir}/plplot%{version}/examples/test_c.sh %{_datadir}/plplot%{version}/examples/test_cxx.sh %{_datadir}/plplot%{version}/examples/test_f77.sh %{_datadir}/plplot%{version}/examples/test_java.sh %files gnome %defattr(-,root,root,-) %{_libdir}/libplplotgnome2d.so.* %{_libdir}/plplot%{version}/driversd/gcw.rc %{_libdir}/plplot%{version}/driversd/gcw.so %{python_sitelib}/gcwmodule.so %{python_sitelib}/cplplotcanvasmodule.so %files gnome-devel %defattr(-,root,root,-) %{_libdir}/libplplotgnome2d.so %files octave %defattr(-,root,root,-) %{_datadir}/plplot_octave/ %{_datadir}/octave/site/m/PLplot/ %{_libexecdir}/octave/site/oct/*/plplot_octave.oct %{_datadir}/plplot%{version}/examples/octave/ %{_datadir}/plplot%{version}/examples/test_octave.sh %files tk %defattr(-,root,root,-) %{_bindir}/plserver %{_bindir}/pltcl %{_libdir}/libplplottcltkd.so.* %{_libdir}/libtclmatrixd.so.* %{_libdir}/plplot%{version}/driversd/tk.rc %{_libdir}/plplot%{version}/driversd/tk.so %{_libdir}/plplot%{version}/driversd/tkwin.rc %{_libdir}/plplot%{version}/driversd/tkwin.so %{_mandir}/man1/plserver.1.gz %{_mandir}/man1/pltcl.1.gz %files tk-devel %defattr(-,root,root,-) %{_libdir}/libplplottcltkd.so %{_libdir}/libtclmatrixd.so %{_datadir}/plplot%{version}/examples/tcl/ %{_datadir}/plplot%{version}/examples/tk/ %changelog * Tue Aug 09 2005 - Orion Poplawski - 5.5.3-5 - Explicitly turn off unused features in configure - rpmlint cleanup - add make check * Mon Aug 08 2005 - Orion Poplawski - 5.5.3-4 - Remove smp build due to problems - Add gnome-python2 BuildRequires * Mon Aug 08 2005 - Orion Poplawski - 5.5.3-3 - Split into multipe packages * Mon Aug 08 2005 - Orion Poplawski - 5.5.3-2 - Shorten summary - Fix Source URL * Thu Aug 04 2005 - Orion Poplawski - 5.5.3-1 - Initial Fedora Extras release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/plplot/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 10 Aug 2005 17:14:07 -0000 1.1 +++ .cvsignore 10 Aug 2005 17:15:10 -0000 1.2 @@ -0,0 +1 @@ +plplot-5.5.3.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/plplot/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 10 Aug 2005 17:14:07 -0000 1.1 +++ sources 10 Aug 2005 17:15:10 -0000 1.2 @@ -0,0 +1 @@ +6df3d63cffac28337ff7fa56712da5c7 plplot-5.5.3.tar.gz From fedora-extras-commits at redhat.com Wed Aug 10 17:40:00 2005 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Wed, 10 Aug 2005 13:40:00 -0400 Subject: rpms/epiphany-extensions/devel .cvsignore, 1.3, 1.4 epiphany-extensions.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200508101740.j7AHe0kU004652@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/epiphany-extensions/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4631 Modified Files: .cvsignore epiphany-extensions.spec sources Log Message: * Wed Aug 10 2005 Christopher Aillon - 1.7.4-1 - Update to 1.7.4 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/epiphany-extensions/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 29 Jul 2005 16:04:18 -0000 1.3 +++ .cvsignore 10 Aug 2005 17:39:58 -0000 1.4 @@ -1 +1,2 @@ epiphany-extensions-1.7.3.tar.bz2 +epiphany-extensions-1.7.4.tar.bz2 Index: epiphany-extensions.spec =================================================================== RCS file: /cvs/extras/rpms/epiphany-extensions/devel/epiphany-extensions.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- epiphany-extensions.spec 29 Jul 2005 16:04:18 -0000 1.2 +++ epiphany-extensions.spec 10 Aug 2005 17:39:58 -0000 1.3 @@ -2,7 +2,7 @@ Summary: Extensions for Epiphany, the GNOME web browser. Name: epiphany-extensions -Version: 1.7.3 +Version: 1.7.4 Release: 1 License: GPL Group: Applications/Internet @@ -22,7 +22,7 @@ %build %configure -make %{?_smp_mflags} +%{__make} %{?_smp_mflags} %install %{__rm} -rf $RPM_BUILD_ROOT @@ -39,6 +39,9 @@ %{_libdir}/epiphany %changelog +* Wed Aug 10 2005 Christopher Aillon - 1.7.4-1 +- Update to 1.7.4 + * Fri Jul 29 2005 Christopher Aillon - 1.7.3-1 - Update to 1.7.3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/epiphany-extensions/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 29 Jul 2005 16:04:18 -0000 1.3 +++ sources 10 Aug 2005 17:39:58 -0000 1.4 @@ -1 +1 @@ -f9c7f260d1a777533b67b6f7ec475973 epiphany-extensions-1.7.3.tar.bz2 +d175f0747254595d369aa75baa64a0a4 epiphany-extensions-1.7.4.tar.bz2 From fedora-extras-commits at redhat.com Wed Aug 10 18:09:50 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Wed, 10 Aug 2005 14:09:50 -0400 Subject: rpms/perl-Test-Taint - New directory Message-ID: <200508101809.j7AI9osZ005990@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Test-Taint In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5970/perl-Test-Taint Log Message: Directory /cvs/extras/rpms/perl-Test-Taint added to the repository From fedora-extras-commits at redhat.com Wed Aug 10 18:09:51 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Wed, 10 Aug 2005 14:09:51 -0400 Subject: rpms/perl-Test-Taint/devel - New directory Message-ID: <200508101809.j7AI9pXe005995@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Test-Taint/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5970/perl-Test-Taint/devel Log Message: Directory /cvs/extras/rpms/perl-Test-Taint/devel added to the repository From fedora-extras-commits at redhat.com Wed Aug 10 18:10:19 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Wed, 10 Aug 2005 14:10:19 -0400 Subject: rpms/perl-Test-Taint Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200508101810.j7AIAJln006044@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Test-Taint In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6017 Added Files: Makefile import.log Log Message: Setup of module perl-Test-Taint --- NEW FILE Makefile --- # Top level Makefile for module perl-Test-Taint all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Wed Aug 10 18:10:19 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Wed, 10 Aug 2005 14:10:19 -0400 Subject: rpms/perl-Test-Taint/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200508101810.j7AIAJfG006049@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Test-Taint/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6017/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Test-Taint --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Wed Aug 10 18:11:23 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Wed, 10 Aug 2005 14:11:23 -0400 Subject: rpms/perl-Test-Taint import.log,1.1,1.2 Message-ID: <200508101811.j7AIBrs5006154@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Test-Taint In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6120 Modified Files: import.log Log Message: auto-import perl-Test-Taint-1.04-1 on branch devel from perl-Test-Taint-1.04-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Test-Taint/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 10 Aug 2005 18:10:17 -0000 1.1 +++ import.log 10 Aug 2005 18:11:21 -0000 1.2 @@ -0,0 +1 @@ +perl-Test-Taint-1_04-1:HEAD:perl-Test-Taint-1.04-1.src.rpm:1123697464 From fedora-extras-commits at redhat.com Wed Aug 10 18:11:23 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Wed, 10 Aug 2005 14:11:23 -0400 Subject: rpms/perl-Test-Taint/devel perl-Test-Taint.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200508101811.j7AIBrNV006158@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Test-Taint/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6120/devel Modified Files: .cvsignore sources Added Files: perl-Test-Taint.spec Log Message: auto-import perl-Test-Taint-1.04-1 on branch devel from perl-Test-Taint-1.04-1.src.rpm --- NEW FILE perl-Test-Taint.spec --- Summary: Tools to test taintedness Name: perl-Test-Taint Version: 1.04 Release: 1%{?dist} License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Test-Taint/ Source0: http://search.cpan.org/CPAN/authors/id/P/PE/PETDANCE/Test-Taint-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildRequires: perl(Test::Pod) >= 1.00 BuildRequires: perl(Test::Pod::Coverage) >= 0.08 %description Tainted data is data that comes from an unsafe source, such as the command line, or, in the case of web apps, any GET or POST transactions. Read the perlsec man page for details on why tainted data is bad, and how to untaint the data. When you're writing unit tests for code that deals with tainted data, you'll want to have a way to provide tainted data for your routines to handle, and easy ways to check and report on the taintedness of your data, in standard Test::More style. %prep %setup -q -n Test-Taint-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="${RPM_OPT_FLAGS}" make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type f -name '*.bs' -a -size 0 -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %clean rm -rf $RPM_BUILD_ROOT %check make test %files %defattr(-,root,root,-) %doc Changes %{perl_vendorarch}/Test %{perl_vendorarch}/auto/Test %{_mandir}/man3/* %changelog * Wed Aug 10 2005 Ralf Corsepius - 1.04-1 - FE submission. * Sun Mar 20 2005 Ralf Corsepius - 1.04-0.pm.2 - Initial version. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Test-Taint/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 10 Aug 2005 18:10:17 -0000 1.1 +++ .cvsignore 10 Aug 2005 18:11:21 -0000 1.2 @@ -0,0 +1 @@ +Test-Taint-1.04.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Test-Taint/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 10 Aug 2005 18:10:17 -0000 1.1 +++ sources 10 Aug 2005 18:11:21 -0000 1.2 @@ -0,0 +1 @@ +a005ab5a2e22ab462b4f3661d1d1d5e0 Test-Taint-1.04.tar.gz From fedora-extras-commits at redhat.com Wed Aug 10 18:23:44 2005 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Wed, 10 Aug 2005 14:23:44 -0400 Subject: rpms/highlight/FC-4 highlight-2.4-etcdir.patch,NONE,1.1 Message-ID: <200508101823.j7AINibx006225@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/highlight/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6207 Added Files: highlight-2.4-etcdir.patch Log Message: Description: Move extesion.conf and scriptre.conf to /etc/highlight Fixed #165302 highlight-2.4-etcdir.patch: --- NEW FILE highlight-2.4-etcdir.patch --- --- highlight-2.4-1/highlight/main.cpp.org 2005-08-08 20:00:11.000000000 +0200 +++ highlight-2.4-1/highlight/main.cpp 2005-08-08 20:00:46.000000000 +0200 @@ -132,7 +132,7 @@ } bool HighlightApp::loadMapConfig(const string& name, StringMap* map){ - string extPath=dataDir.getDir() + name + ".conf"; + string extPath="/etc/highlight/" + name + ".conf"; ConfigurationReader config(extPath); if (config.found() ) { From fedora-extras-commits at redhat.com Wed Aug 10 18:25:05 2005 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Wed, 10 Aug 2005 14:25:05 -0400 Subject: rpms/highlight/FC-4 highlight.spec,1.2,1.3 Message-ID: <200508101825.j7AIP5Ap006278@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/highlight/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6261 Modified Files: highlight.spec Log Message: Description: Fixed erronous commit (wrong spec file). Index: highlight.spec =================================================================== RCS file: /cvs/extras/rpms/highlight/FC-4/highlight.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- highlight.spec 4 Aug 2005 15:42:26 -0000 1.2 +++ highlight.spec 10 Aug 2005 18:25:03 -0000 1.3 @@ -1,7 +1,7 @@ Name: highlight Summary: Universal source code to formatted text converter Version: 2.4.1 -Release: 3%{?dist} +Release: 5%{?dist} Group: Development/Tools License: GPL @@ -10,6 +10,7 @@ Source0: http://www.andre-simon.de/zip/%{name}-2.4-1.tar.bz2 Patch1: highlight-2.4-makefile.patch Patch2: highlight-2.4-rpmoptflags.patch +Patch3: highlight-2.4-etcdir.patch Buildroot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n) @@ -23,11 +24,12 @@ %prep %setup -q -n %{name}-2.4-1 -%patch1 -p1 +%patch1 -p1 %patch2 -p1 +%patch3 -p1 %build -make %{?_smp_mflags} +make %{?_smp_mflags} LDFLAGS= %install rm -rf $RPM_BUILD_ROOT @@ -46,9 +48,17 @@ %{_datadir}/highlight/ %{_mandir}/man1/highlight.1* +%config /etc/highlight/ + %doc ChangeLog AUTHORS README* COPYING TODO examples/ %changelog +* Tue Aug 9 2005 Jochen Schmitt 2.4-1-5 +- Fix #165302 + +* Mon Aug 8 2005 Jochen Schmitt 2.4.1-4 +- Move extension.conf and scriptre.conf to /etc/highlight + * Wed Aug 3 2005 Jochen Schmitt 2.4.1-3 - Remove leading 'A' from summary line From fedora-extras-commits at redhat.com Wed Aug 10 18:26:51 2005 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Wed, 10 Aug 2005 14:26:51 -0400 Subject: rpms/highlight/FC-3 highlight-2.4-etcdir.patch, NONE, 1.1 highlight.spec, 1.2, 1.3 Message-ID: <200508101826.j7AIQpgl006347@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/highlight/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6327 Modified Files: highlight.spec Added Files: highlight-2.4-etcdir.patch Log Message: Description: Move extension.conf and scriptre.conf to /etc/highlight Fixed #165302 highlight-2.4-etcdir.patch: --- NEW FILE highlight-2.4-etcdir.patch --- --- highlight-2.4-1/highlight/main.cpp.org 2005-08-08 20:00:11.000000000 +0200 +++ highlight-2.4-1/highlight/main.cpp 2005-08-08 20:00:46.000000000 +0200 @@ -132,7 +132,7 @@ } bool HighlightApp::loadMapConfig(const string& name, StringMap* map){ - string extPath=dataDir.getDir() + name + ".conf"; + string extPath="/etc/highlight/" + name + ".conf"; ConfigurationReader config(extPath); if (config.found() ) { Index: highlight.spec =================================================================== RCS file: /cvs/extras/rpms/highlight/FC-3/highlight.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- highlight.spec 4 Aug 2005 15:42:26 -0000 1.2 +++ highlight.spec 10 Aug 2005 18:26:49 -0000 1.3 @@ -1,7 +1,7 @@ Name: highlight Summary: Universal source code to formatted text converter Version: 2.4.1 -Release: 3%{?dist} +Release: 5%{?dist} Group: Development/Tools License: GPL @@ -10,6 +10,7 @@ Source0: http://www.andre-simon.de/zip/%{name}-2.4-1.tar.bz2 Patch1: highlight-2.4-makefile.patch Patch2: highlight-2.4-rpmoptflags.patch +Patch3: highlight-2.4-etcdir.patch Buildroot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n) @@ -23,11 +24,12 @@ %prep %setup -q -n %{name}-2.4-1 -%patch1 -p1 +%patch1 -p1 %patch2 -p1 +%patch3 -p1 %build -make %{?_smp_mflags} +make %{?_smp_mflags} LDFLAGS= %install rm -rf $RPM_BUILD_ROOT @@ -46,9 +48,17 @@ %{_datadir}/highlight/ %{_mandir}/man1/highlight.1* +%config /etc/highlight/ + %doc ChangeLog AUTHORS README* COPYING TODO examples/ %changelog +* Tue Aug 9 2005 Jochen Schmitt 2.4-1-5 +- Fix #165302 + +* Mon Aug 8 2005 Jochen Schmitt 2.4.1-4 +- Move extension.conf and scriptre.conf to /etc/highlight + * Wed Aug 3 2005 Jochen Schmitt 2.4.1-3 - Remove leading 'A' from summary line From jpo at di.uminho.pt Wed Aug 10 19:02:36 2005 From: jpo at di.uminho.pt (=?ISO-8859-1?Q?Jos=E9_Pedro_Oliveira?=) Date: Wed, 10 Aug 2005 20:02:36 +0100 Subject: APPROVED: perl-Test-Taint Message-ID: <42FA4F4C.4080303@di.uminho.pt> Name : perl-Test-Taint Summary : Tools to test taintedness Description : Tainted data is data that comes from an unsafe source, such as the command line, or, in the case of web apps, any GET or POST transactions. Read the perlsec man page for details on why tainted data is bad, and how to untaint the data. When you're writing unit tests for code that deals with tainted data, you'll want to have a way to provide tainted data for your routines to handle, and easy ways to check and report on the taintedness of your data, in standard Test::More style. Maintainer: Ralf Corsepius Reviewer: Jose Pedro Oliveira Bugzilla: https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=165573 -- Jos? Pedro Oliveira * mailto: jpo at di.uminho.pt * http://gsd.di.uminho.pt/jpo * * gpg fingerprint = F9B6 8D87 859D 1C94 48F0 84C0 9749 9EB5 91BD 851B * http://conferences.yapceurope.org/2005/ * http://braga.yapceurope.org/ -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 251 bytes Desc: OpenPGP digital signature URL: From fedora-extras-commits at redhat.com Wed Aug 10 19:09:49 2005 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Wed, 10 Aug 2005 15:09:49 -0400 Subject: rpms/highlight/FC-4 highlight-2.4-makefile.patch, 1.1, 1.2 highlight.spec, 1.3, 1.4 Message-ID: <200508101909.j7AJ9nIU007627@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/highlight/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7603 Modified Files: highlight-2.4-makefile.patch highlight.spec Log Message: Description: Fix: Forgotten update makefile.patch file. highlight-2.4-makefile.patch: Index: highlight-2.4-makefile.patch =================================================================== RCS file: /cvs/extras/rpms/highlight/FC-4/highlight-2.4-makefile.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- highlight-2.4-makefile.patch 4 Aug 2005 15:38:30 -0000 1.1 +++ highlight-2.4-makefile.patch 10 Aug 2005 19:09:47 -0000 1.2 @@ -1,5 +1,5 @@ --- highlight-2.4-1/makefile.org 2005-07-19 11:27:46.000000000 +0200 -+++ highlight-2.4-1/makefile 2005-07-24 22:24:39.000000000 +0200 ++++ highlight-2.4-1/makefile 2005-08-08 20:07:16.000000000 +0200 @@ -7,7 +7,7 @@ data_dir = ${DESTDIR}/usr/share/highlight/ @@ -9,16 +9,18 @@ # Location where the highlight man page will be installed: man_dir = ${DESTDIR}/usr/share/man/man1/ -@@ -16,7 +16,7 @@ +@@ -16,8 +16,9 @@ doc_dir = ${DESTDIR}/usr/share/doc/highlight/ # Location where the highlight examples will be installed: -examples_dir = ${doc_dir}examples/ +examples_dir = $(DESTDIR)/${doc_dir}examples/ ++etc_dir = $(DESTDIR)/etc/highlight # Commands: -@@ -40,12 +40,6 @@ + INSTALL_DATA=install -m644 +@@ -40,12 +41,6 @@ @echo "Binary directory: ${bin_dir}" @echo @@ -31,7 +33,16 @@ ${MKDIR} ${data_dir} \ ${data_dir}themes \ ${data_dir}langDefs \ -@@ -60,18 +54,6 @@ +@@ -53,25 +48,14 @@ + ${data_dir}helpmsg + ${MKDIR} ${man_dir} + ${MKDIR} ${bin_dir} ++ $(MKDIR) $(etc_dir) + + ${INSTALL_DATA} ./langDefs/*.lang ${data_dir}langDefs/ +- ${INSTALL_DATA} ./*.conf ${data_dir} ++ ${INSTALL_DATA} ./*.conf ${etc_dir} + ${INSTALL_DATA} ./themes/*.style ${data_dir}themes/ ${INSTALL_DATA} ./indentSchemes/*.indent ${data_dir}indentSchemes/ ${INSTALL_DATA} ./helpmsg/*.help ${data_dir}helpmsg/ ${INSTALL_DATA} ./man/highlight.1.gz ${man_dir} Index: highlight.spec =================================================================== RCS file: /cvs/extras/rpms/highlight/FC-4/highlight.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- highlight.spec 10 Aug 2005 18:25:03 -0000 1.3 +++ highlight.spec 10 Aug 2005 19:09:47 -0000 1.4 @@ -1,7 +1,7 @@ Name: highlight Summary: Universal source code to formatted text converter Version: 2.4.1 -Release: 5%{?dist} +Release: 6%{?dist} Group: Development/Tools License: GPL @@ -53,6 +53,9 @@ %doc ChangeLog AUTHORS README* COPYING TODO examples/ %changelog +* Wed Aug 10 2005 Jochen Schmitt 2.4.1-6 +- Rebuilt for FC-4/FC-3 + * Tue Aug 9 2005 Jochen Schmitt 2.4-1-5 - Fix #165302 From fedora-extras-commits at redhat.com Wed Aug 10 19:12:24 2005 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Wed, 10 Aug 2005 15:12:24 -0400 Subject: rpms/highlight/FC-3 highlight-2.4-makefile.patch, 1.1, 1.2 highlight.spec, 1.3, 1.4 Message-ID: <200508101912.j7AJCO26007714@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/highlight/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7692 Modified Files: highlight-2.4-makefile.patch highlight.spec Log Message: Fix: Forgotten updated makefile.patch file. highlight-2.4-makefile.patch: Index: highlight-2.4-makefile.patch =================================================================== RCS file: /cvs/extras/rpms/highlight/FC-3/highlight-2.4-makefile.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- highlight-2.4-makefile.patch 4 Aug 2005 15:38:30 -0000 1.1 +++ highlight-2.4-makefile.patch 10 Aug 2005 19:12:22 -0000 1.2 @@ -1,5 +1,5 @@ --- highlight-2.4-1/makefile.org 2005-07-19 11:27:46.000000000 +0200 -+++ highlight-2.4-1/makefile 2005-07-24 22:24:39.000000000 +0200 ++++ highlight-2.4-1/makefile 2005-08-08 20:07:16.000000000 +0200 @@ -7,7 +7,7 @@ data_dir = ${DESTDIR}/usr/share/highlight/ @@ -9,16 +9,18 @@ # Location where the highlight man page will be installed: man_dir = ${DESTDIR}/usr/share/man/man1/ -@@ -16,7 +16,7 @@ +@@ -16,8 +16,9 @@ doc_dir = ${DESTDIR}/usr/share/doc/highlight/ # Location where the highlight examples will be installed: -examples_dir = ${doc_dir}examples/ +examples_dir = $(DESTDIR)/${doc_dir}examples/ ++etc_dir = $(DESTDIR)/etc/highlight # Commands: -@@ -40,12 +40,6 @@ + INSTALL_DATA=install -m644 +@@ -40,12 +41,6 @@ @echo "Binary directory: ${bin_dir}" @echo @@ -31,7 +33,16 @@ ${MKDIR} ${data_dir} \ ${data_dir}themes \ ${data_dir}langDefs \ -@@ -60,18 +54,6 @@ +@@ -53,25 +48,14 @@ + ${data_dir}helpmsg + ${MKDIR} ${man_dir} + ${MKDIR} ${bin_dir} ++ $(MKDIR) $(etc_dir) + + ${INSTALL_DATA} ./langDefs/*.lang ${data_dir}langDefs/ +- ${INSTALL_DATA} ./*.conf ${data_dir} ++ ${INSTALL_DATA} ./*.conf ${etc_dir} + ${INSTALL_DATA} ./themes/*.style ${data_dir}themes/ ${INSTALL_DATA} ./indentSchemes/*.indent ${data_dir}indentSchemes/ ${INSTALL_DATA} ./helpmsg/*.help ${data_dir}helpmsg/ ${INSTALL_DATA} ./man/highlight.1.gz ${man_dir} Index: highlight.spec =================================================================== RCS file: /cvs/extras/rpms/highlight/FC-3/highlight.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- highlight.spec 10 Aug 2005 18:26:49 -0000 1.3 +++ highlight.spec 10 Aug 2005 19:12:22 -0000 1.4 @@ -1,7 +1,7 @@ Name: highlight Summary: Universal source code to formatted text converter Version: 2.4.1 -Release: 5%{?dist} +Release: 6%{?dist} Group: Development/Tools License: GPL @@ -53,6 +53,9 @@ %doc ChangeLog AUTHORS README* COPYING TODO examples/ %changelog +* Wed Aug 10 2005 Jochen Schmitt 2.4.1-6 +- Rebuilt for FC-4/FC-3 + * Tue Aug 9 2005 Jochen Schmitt 2.4-1-5 - Fix #165302 From fedora-extras-commits at redhat.com Wed Aug 10 19:31:23 2005 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Wed, 10 Aug 2005 15:31:23 -0400 Subject: rpms/highlight/devel highlight.spec,1.4,1.5 Message-ID: <200508101931.j7AJVNu6008054@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/highlight/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8030 Modified Files: highlight.spec Log Message: Description: Sync release number with FC-4/FC-3. Index: highlight.spec =================================================================== RCS file: /cvs/extras/rpms/highlight/devel/highlight.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- highlight.spec 9 Aug 2005 14:41:22 -0000 1.4 +++ highlight.spec 10 Aug 2005 19:31:21 -0000 1.5 @@ -1,7 +1,7 @@ Name: highlight Summary: Universal source code to formatted text converter Version: 2.4.1 -Release: 5%{?dist} +Release: 6%{?dist} Group: Development/Tools License: GPL @@ -53,6 +53,9 @@ %doc ChangeLog AUTHORS README* COPYING TODO examples/ %changelog +* Wed Aug 10 2005 Jochen Schmitt 2.4.1-6 +- Rebuilt for FC-4/FC-3 + * Tue Aug 9 2005 Jochen Schmitt 2.4-1-5 - Fix #165302 From fedora-extras-commits at redhat.com Wed Aug 10 20:23:51 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Wed, 10 Aug 2005 16:23:51 -0400 Subject: owners owners.list,1.67,1.68 Message-ID: <200508102023.j7AKNpk5009484@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9467 Modified Files: owners.list Log Message: * Take over maintainership of graphviz and perl-Mail-Alias Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.67 retrieving revision 1.68 diff -u -r1.67 -r1.68 --- owners.list 10 Aug 2005 16:54:52 -0000 1.67 +++ owners.list 10 Aug 2005 20:23:49 -0000 1.68 @@ -250,7 +250,7 @@ Fedora Extras|gputils|Development utilities for Microchip (TM) PIC (TM) microcontrollers|aportal at univ-montp2.fr|extras-qa at fedoraproject.org| Fedora Extras|gqview|Image browser and viewer|bugs.michael at gmx.net|extras-qa at fedoraproject.org| Fedora Extras|gramps|Genealogical Research and Analysis Management Programming System|bdpepple at ameritech.net|extras-qa at fedoraproject.org| -Fedora Extras|graphviz|Graph Visualization Tools|anvil at livna.org|extras-qa at fedoraproject.org| +Fedora Extras|graphviz|Graph Visualization Tools|oliver at linux-kernel.at|extras-qa at fedoraproject.org| Fedora Extras|graveman|A frontend for cdrtools, dvd+rw-tools and sox|gemi at bluewin.ch|extras-qa at fedoraproject.org| Fedora Extras|grip|Front-end for CD rippers and Ogg Vorbis encoders|adrian at lisas.de|extras-qa at fedoraproject.org| Fedora Extras|grisbi|Personal finances manager|gauret at free.fr|extras-qa at fedoraproject.org| @@ -577,7 +577,7 @@ Fedora Extras|perl-Lingua-EN-Inflect|Convert singular to plural, select "a" or "an"|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Lingua-EN-Inflect-Number|Force number of words to singular or plural|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Locale-gettext|Interface to gettext family of functions|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com -Fedora Extras|perl-Mail-Alias|For bugs related to the perl-Mail-Alias component|anvil at livna.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Mail-Alias|For bugs related to the perl-Mail-Alias component|oliver at linux-kernel.at|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Mail-Sendmail|Simple platform independent mailer for Perl|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Mail-SPF-Query|Mail::SPF::Query determines the legitimacy of an SMTP client IP|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-MailTools|MailTools module for Perl|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Wed Aug 10 20:36:38 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 10 Aug 2005 16:36:38 -0400 Subject: rpms/plplot/FC-4 .cvsignore, 1.2, 1.3 plplot.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200508102036.j7AKac9a009550@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/plplot/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9529 Modified Files: .cvsignore plplot.spec sources Log Message: Add patch to find tcl on x86_64 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/plplot/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 10 Aug 2005 17:15:10 -0000 1.2 +++ .cvsignore 10 Aug 2005 20:36:36 -0000 1.3 @@ -1 +1,2 @@ plplot-5.5.3.tar.gz +plplot-5.5.3-x86_64.patch Index: plplot.spec =================================================================== RCS file: /cvs/extras/rpms/plplot/FC-4/plplot.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- plplot.spec 10 Aug 2005 17:15:10 -0000 1.1 +++ plplot.spec 10 Aug 2005 20:36:36 -0000 1.2 @@ -2,7 +2,7 @@ Name: plplot Version: 5.5.3 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Library of functions for making scientific plots Group: Applications/Engineering @@ -12,6 +12,7 @@ Patch0: plplot-5.5.3-matwrap.patch Patch1: plplot-5.5.3-tk.patch Patch2: plplot-5.5.3-buffer.patch +Patch3: plplot-5.5.3-x86_64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: autoconf @@ -106,6 +107,7 @@ %patch0 -p1 -b .orig %patch1 -p1 -b .orig %patch2 -p1 -b .orig +%patch3 -p1 -b .orig %build @@ -275,6 +277,9 @@ %{_datadir}/plplot%{version}/examples/tk/ %changelog +* Wed Aug 10 2005 - Orion Poplawski - 5.5.3-6 +- Add patch to find tcl on x86_64 + * Tue Aug 09 2005 - Orion Poplawski - 5.5.3-5 - Explicitly turn off unused features in configure - rpmlint cleanup Index: sources =================================================================== RCS file: /cvs/extras/rpms/plplot/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 10 Aug 2005 17:15:10 -0000 1.2 +++ sources 10 Aug 2005 20:36:36 -0000 1.3 @@ -1 +1,2 @@ 6df3d63cffac28337ff7fa56712da5c7 plplot-5.5.3.tar.gz +02cc9f8eb72211581aae2bd38670252f plplot-5.5.3-x86_64.patch From fedora-extras-commits at redhat.com Wed Aug 10 20:39:33 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 10 Aug 2005 16:39:33 -0400 Subject: rpms/plplot/devel .cvsignore, 1.2, 1.3 plplot.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200508102039.j7AKdXla009623@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/plplot/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9602 Modified Files: .cvsignore plplot.spec sources Log Message: - Add patch to find tcl on x86_64 - Add patch to use new octave in devel Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/plplot/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 10 Aug 2005 17:15:10 -0000 1.2 +++ .cvsignore 10 Aug 2005 20:39:31 -0000 1.3 @@ -1 +1,3 @@ plplot-5.5.3.tar.gz +plplot-5.5.3-x86_64.patch +plplot-5.5.3-octave.patch Index: plplot.spec =================================================================== RCS file: /cvs/extras/rpms/plplot/devel/plplot.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- plplot.spec 10 Aug 2005 17:15:10 -0000 1.1 +++ plplot.spec 10 Aug 2005 20:39:31 -0000 1.2 @@ -12,6 +12,8 @@ Patch0: plplot-5.5.3-matwrap.patch Patch1: plplot-5.5.3-tk.patch Patch2: plplot-5.5.3-buffer.patch +Patch3: plplot-5.5.3-x86_64.patch +Patch4: plplot-5.5.3-octave.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: autoconf @@ -106,6 +108,8 @@ %patch0 -p1 -b .orig %patch1 -p1 -b .orig %patch2 -p1 -b .orig +%patch3 -p1 -b .orig +%patch4 -p1 -b .orig %build @@ -275,6 +279,10 @@ %{_datadir}/plplot%{version}/examples/tk/ %changelog +* Wed Aug 10 2005 - Orion Poplawski - 5.5.3-6 +- Add patch to find tcl on x86_64 +- Add patch to use new octave in devel + * Tue Aug 09 2005 - Orion Poplawski - 5.5.3-5 - Explicitly turn off unused features in configure - rpmlint cleanup Index: sources =================================================================== RCS file: /cvs/extras/rpms/plplot/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 10 Aug 2005 17:15:10 -0000 1.2 +++ sources 10 Aug 2005 20:39:31 -0000 1.3 @@ -1 +1,3 @@ 6df3d63cffac28337ff7fa56712da5c7 plplot-5.5.3.tar.gz +02cc9f8eb72211581aae2bd38670252f plplot-5.5.3-x86_64.patch +7970faa7d90fe1e98e19354fd607a309 plplot-5.5.3-octave.patch From fedora-extras-commits at redhat.com Wed Aug 10 20:40:06 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 10 Aug 2005 16:40:06 -0400 Subject: rpms/plplot/devel plplot.spec,1.2,1.3 Message-ID: <200508102040.j7AKe6iJ009676@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/plplot/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9659 Modified Files: plplot.spec Log Message: Bump release, stupid Index: plplot.spec =================================================================== RCS file: /cvs/extras/rpms/plplot/devel/plplot.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- plplot.spec 10 Aug 2005 20:39:31 -0000 1.2 +++ plplot.spec 10 Aug 2005 20:40:04 -0000 1.3 @@ -2,7 +2,7 @@ Name: plplot Version: 5.5.3 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Library of functions for making scientific plots Group: Applications/Engineering From jwboyer at jdub.homelinux.org Wed Aug 10 20:49:06 2005 From: jwboyer at jdub.homelinux.org (Josh Boyer) Date: Wed, 10 Aug 2005 15:49:06 -0500 (CDT) Subject: Approved: plague Message-ID: <46816.129.42.161.36.1123706946.squirrel@jdub.homelinux.org> Name: plauge Summary: Distributed build system for RPMs Description: The Plague build system is a client/server distributed build system for building RPM packages. This package provides the plague server. Maintainer: Dan Williams Reviewer: Josh Boyer Bugzilla: https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=165413 From fedora-extras-commits at redhat.com Thu Aug 11 00:48:39 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Wed, 10 Aug 2005 20:48:39 -0400 Subject: rpms/airsnort - New directory Message-ID: <200508110048.j7B0mdjG015225@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/airsnort In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15205/airsnort Log Message: Directory /cvs/extras/rpms/airsnort added to the repository From fedora-extras-commits at redhat.com Thu Aug 11 00:48:39 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Wed, 10 Aug 2005 20:48:39 -0400 Subject: rpms/airsnort/devel - New directory Message-ID: <200508110048.j7B0mdus015230@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/airsnort/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15205/airsnort/devel Log Message: Directory /cvs/extras/rpms/airsnort/devel added to the repository From fedora-extras-commits at redhat.com Thu Aug 11 00:49:45 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Wed, 10 Aug 2005 20:49:45 -0400 Subject: rpms/airsnort Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200508110049.j7B0njbA015277@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/airsnort In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15250 Added Files: Makefile import.log Log Message: Setup of module airsnort --- NEW FILE Makefile --- # Top level Makefile for module airsnort all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Thu Aug 11 00:49:46 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Wed, 10 Aug 2005 20:49:46 -0400 Subject: rpms/airsnort/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200508110049.j7B0nk7j015282@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/airsnort/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15250/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module airsnort --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Thu Aug 11 00:52:05 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Wed, 10 Aug 2005 20:52:05 -0400 Subject: rpms/airsnort import.log,1.1,1.2 Message-ID: <200508110052.j7B0qZsp015357@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/airsnort In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15322 Modified Files: import.log Log Message: auto-import airsnort-0.2.7e-4 on branch devel from airsnort-0.2.7e-4.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/airsnort/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 11 Aug 2005 00:49:43 -0000 1.1 +++ import.log 11 Aug 2005 00:52:03 -0000 1.2 @@ -0,0 +1 @@ +airsnort-0_2_7e-4:HEAD:airsnort-0.2.7e-4.src.rpm:1123721444 From fedora-extras-commits at redhat.com Thu Aug 11 00:52:06 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Wed, 10 Aug 2005 20:52:06 -0400 Subject: rpms/airsnort/devel airsnort.desktop, NONE, 1.1 airsnort.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200508110052.j7B0qaQG015361@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/airsnort/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15322/devel Modified Files: .cvsignore sources Added Files: airsnort.desktop airsnort.spec Log Message: auto-import airsnort-0.2.7e-4 on branch devel from airsnort-0.2.7e-4.src.rpm --- NEW FILE airsnort.desktop --- [Desktop Entry] Name=airsnort Comment=Wireless LAN (WLAN) tool which recovers encryption keys Exec=airsnort Terminal=false Type=Application Encoding=UTF-8 Categories=Application;Network; --- NEW FILE airsnort.spec --- Name: airsnort Version: 0.2.7e Release: 4 Summary: Wireless LAN (WLAN) tool which recovers encryption keys Group: Applications/Communications License: GPL URL: http://airsnort.shmoo.com/ Source0: http://dl.sourceforge.net/sourceforge/airsnort/airsnort-%{version}.tar.gz Source1: airsnort.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: libpcap BuildRequires: gtk2-devel >= 2.2 BuildRequires: atk-devel BuildRequires: xorg-x11-devel BuildRequires: glib2-devel BuildRequires: desktop-file-utils %description AirSnort is a wireless LAN (WLAN) tool which recovers encryption keys. AirSnort operates by passively monitoring transmissions, computing the encryption key when enough packets have been gathered. 802.11b, using the Wired Equivalent Protocol (WEP), is crippled with numerous security flaws. Most damning of these is the weakness described in " Weaknesses in the Key Scheduling Algorithm of RC4 " by Scott Fluhrer, Itsik Mantin and Adi Shamir. Adam Stubblefield was the first to implement this attack, but he has not made his software public. AirSnort, along with WEPCrack, which was released about the same time as AirSnort, are the first publicly available implementaions of this attack. AirSnort requires approximately 5-10 million encrypted packets to be gathered. Once enough packets have been gathered, AirSnort can guess the encryption password in under a second. %prep %setup -q %build %configure %{__make} %{?_smp_mflags} %install %{__rm} -rf $RPM_BUILD_ROOT %makeinstall desktop-file-install \ --vendor=fedora \ --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ --add-category=X-Fedora \ %{SOURCE1} %clean %{__rm} -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README README.decrypt TODO %{_bindir}/* %{_mandir}/man1/* %{_datadir}/applications/* %changelog * Wed Aug 10 2005 Andreas Bierfert 0.2.7e-4 - add BR desktop-file-utils - fix .desktop file * Thu Jun 02 2005 Andreas Bierfert 0.2.7e-3 - revamp specfile * Sun Feb 13 2005 Andreas Bierfert 0.2.7e-2 - minor cleanups * Tue Feb 08 2005 Andreas Bierfert 0.2.7e-1 - upgrade to 0.2.7e * Tue Nov 30 2004 Andreas Bierfert 0:0.2.6-0.awjb.1 - upgrade to 0.2.6 * Tue Sep 16 2003 Andreas Bierfert 0:0.2.2-0.fdr.4 - minor version upgrade (bugfix release) * Mon Jul 28 2003 Andreas Bierfert 0:0.2.2-0.fdr.3 - fixed minor stuff from #408 #7 * Tue Jun 24 2003 Andreas Bierfert (awjb) 0:0.2.2-0.fdr.1 - Initial RPM release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/airsnort/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 11 Aug 2005 00:49:44 -0000 1.1 +++ .cvsignore 11 Aug 2005 00:52:03 -0000 1.2 @@ -0,0 +1 @@ +airsnort-0.2.7e.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/airsnort/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 11 Aug 2005 00:49:44 -0000 1.1 +++ sources 11 Aug 2005 00:52:04 -0000 1.2 @@ -0,0 +1 @@ +8f852bd872fa7d352c14781010c25ef4 airsnort-0.2.7e.tar.gz From fedora-extras-commits at redhat.com Thu Aug 11 00:59:53 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Wed, 10 Aug 2005 20:59:53 -0400 Subject: rpms/airsnort/devel airsnort.spec,1.1,1.2 Message-ID: <200508110059.j7B0xrnt015423@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/airsnort/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15406 Modified Files: airsnort.spec Log Message: - add dist tag Index: airsnort.spec =================================================================== RCS file: /cvs/extras/rpms/airsnort/devel/airsnort.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- airsnort.spec 11 Aug 2005 00:52:04 -0000 1.1 +++ airsnort.spec 11 Aug 2005 00:59:51 -0000 1.2 @@ -1,6 +1,6 @@ Name: airsnort Version: 0.2.7e -Release: 4 +Release: 5%{?dist} Summary: Wireless LAN (WLAN) tool which recovers encryption keys Group: Applications/Communications @@ -62,6 +62,10 @@ %{_datadir}/applications/* %changelog +* Thu Aug 11 2005 Andreas Bierfert +0.2.7e-5 +- add dist tag + * Wed Aug 10 2005 Andreas Bierfert 0.2.7e-4 - add BR desktop-file-utils From fedora-extras-commits at redhat.com Thu Aug 11 01:10:42 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Wed, 10 Aug 2005 21:10:42 -0400 Subject: owners owners.list,1.68,1.69 Message-ID: <200508110110.j7B1AgBk016679@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16662 Modified Files: owners.list Log Message: - added airsnort Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.68 retrieving revision 1.69 diff -u -r1.68 -r1.69 --- owners.list 10 Aug 2005 20:23:49 -0000 1.68 +++ owners.list 11 Aug 2005 01:10:40 -0000 1.69 @@ -17,6 +17,7 @@ Fedora Extras|advancecomp|Recompression utilities for .PNG, .MNG and .ZIP files|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|aide|Intrusion detection environment|bugs.michael at gmx.net|extras-qa at fedoraproject.org| Fedora Extras|aiksaurus|A thesaurus library|j.m.maurer at student.utwente.nl|extras-qa at fedoraproject.org| +Fedora Extras|airsnort|Wireless LAN (WLAN) tool which recovers encryption keys|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|allegro|A game programming library|jnovy at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|alsa-firmware|Firmware for several ALSA-Supported soundcards|fedora at leemhuis.info|extras-qa at fedoraproject.org| Fedora Extras|alsa-tools|The ALSA Tools|fedora at leemhuis.info|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Thu Aug 11 02:08:52 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Wed, 10 Aug 2005 22:08:52 -0400 Subject: owners owners.list,1.69,1.70 Message-ID: <200508110208.j7B28qDV017997@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17980 Modified Files: owners.list Log Message: Add perl-Test-Taint Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.69 retrieving revision 1.70 diff -u -r1.69 -r1.70 --- owners.list 11 Aug 2005 01:10:40 -0000 1.69 +++ owners.list 11 Aug 2005 02:08:50 -0000 1.70 @@ -621,6 +621,7 @@ Fedora Extras|perl-Test-MockObject|Perl extension for emulating troublesome interfaces|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Test-Pod-Coverage|POD documentation coverage checker|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Test-Pod|Perl module for checking for POD errors in files|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Test-Taint|Tools to test taintedness|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-TeX-Hyphen|Hyphenate words using TeX's patterns|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Text-Autoformat|Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Text-Iconv|Perl interface to iconv() codeset conversion function|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From rc040203 at freenet.de Thu Aug 11 05:04:44 2005 From: rc040203 at freenet.de (Ralf Corsepius) Date: Thu, 11 Aug 2005 07:04:44 +0200 Subject: APPROVED: perl-Array-Compare Message-ID: <1123736685.1116.300.camel@mccallum.corsepiu.local> Description: If you have two arrays and you want to know if they are the same or different, then Array::Compare will be useful to you. Maintainer: Jos? Pedro Oliveira Reviewer: Ralf Cors?pius From rc040203 at freenet.de Thu Aug 11 05:05:14 2005 From: rc040203 at freenet.de (Ralf Corsepius) Date: Thu, 11 Aug 2005 07:05:14 +0200 Subject: APPROVED: perl-Test-Warn Message-ID: <1123736714.1116.302.camel@mccallum.corsepiu.local> Description: This module provides a few convenience methods for testing warning based code. Maintainer: Jos? Pedro Oliveira Reviewer: Ralf Cors?pius From fedora-extras-commits at redhat.com Thu Aug 11 08:20:24 2005 From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik)) Date: Thu, 11 Aug 2005 04:20:24 -0400 Subject: rpms/athcool - New directory Message-ID: <200508110820.j7B8KOw3026260@cvs-int.fedora.redhat.com> Author: gajownik Update of /cvs/extras/rpms/athcool In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26236/athcool Log Message: Directory /cvs/extras/rpms/athcool added to the repository From fedora-extras-commits at redhat.com Thu Aug 11 08:20:24 2005 From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik)) Date: Thu, 11 Aug 2005 04:20:24 -0400 Subject: rpms/athcool/devel - New directory Message-ID: <200508110820.j7B8KOcc026265@cvs-int.fedora.redhat.com> Author: gajownik Update of /cvs/extras/rpms/athcool/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26236/athcool/devel Log Message: Directory /cvs/extras/rpms/athcool/devel added to the repository From fedora-extras-commits at redhat.com Thu Aug 11 08:21:17 2005 From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik)) Date: Thu, 11 Aug 2005 04:21:17 -0400 Subject: rpms/athcool Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200508110821.j7B8LHYA026317@cvs-int.fedora.redhat.com> Author: gajownik Update of /cvs/extras/rpms/athcool In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26286 Added Files: Makefile import.log Log Message: Setup of module athcool --- NEW FILE Makefile --- # Top level Makefile for module athcool all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Thu Aug 11 08:21:17 2005 From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik)) Date: Thu, 11 Aug 2005 04:21:17 -0400 Subject: rpms/athcool/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200508110821.j7B8LHWk026322@cvs-int.fedora.redhat.com> Author: gajownik Update of /cvs/extras/rpms/athcool/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26286/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module athcool --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Thu Aug 11 08:23:28 2005 From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik)) Date: Thu, 11 Aug 2005 04:23:28 -0400 Subject: rpms/athcool import.log,1.1,1.2 Message-ID: <200508110823.j7B8Nxrx026397@cvs-int.fedora.redhat.com> Author: gajownik Update of /cvs/extras/rpms/athcool In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26361 Modified Files: import.log Log Message: auto-import athcool-0.3.11-2 on branch devel from athcool-0.3.11-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/athcool/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 11 Aug 2005 08:21:15 -0000 1.1 +++ import.log 11 Aug 2005 08:23:26 -0000 1.2 @@ -0,0 +1 @@ +athcool-0_3_11-2:HEAD:athcool-0.3.11-2.src.rpm:1123748690 From fedora-extras-commits at redhat.com Thu Aug 11 08:23:29 2005 From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik)) Date: Thu, 11 Aug 2005 04:23:29 -0400 Subject: rpms/athcool/devel athcool.init, NONE, 1.1 athcool.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200508110823.j7B8NTca026392@cvs-int.fedora.redhat.com> Author: gajownik Update of /cvs/extras/rpms/athcool/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26361/devel Modified Files: .cvsignore sources Added Files: athcool.init athcool.spec Log Message: auto-import athcool-0.3.11-2 on branch devel from athcool-0.3.11-2.src.rpm --- NEW FILE athcool.init --- #!/bin/sh # # athcool Athlon Powersaving bits enabler # # chkconfig: - 10 90 # description: This scripts runs athcool, enabling/disabling \ # powersaving mode for Athlon/Duron processors. # processname: athcool # Source function library. . /etc/rc.d/init.d/functions exec="/usr/sbin/athcool" prog=$(basename $exec) [ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog lockfile=/var/lock/subsys/$prog start() { echo -n $"Enabling Athlon powersaving mode..." if $prog on > /dev/null; then retval=$? echo " done." else retval=$? echo " failed." fi [ $retval -eq 0 ] && touch $lockfile return $retval } stop() { echo -n "Disabling Athlon powersaving mode..." if $prog off > /dev/null; then retval=$? echo " done." else retval=$? echo " failed." fi [ $retval -eq 0 ] && rm -f $lockfile return $retval } restart() { stop start } reload() { restart } force_reload() { restart } fdr_status() { echo "Query Athlon powersaving mode..." $prog stat } case "$1" in start|stop|restart|reload) $1 ;; force-reload) force_reload ;; status) fdr_status ;; condrestart|try-restart) [ ! -f $lockfile ] || restart ;; *) echo $"Usage: $0 {start|stop|status|restart|try-restart|reload|force-reload}" exit 2 esac --- NEW FILE athcool.spec --- Name: athcool Version: 0.3.11 Release: 2 Summary: Enables/disables Powersaving mode for AMD processors Group: System Environment/Daemons License: GPL URL: http://members.jcom.home.ne.jp/jacobi/linux/softwares.html#athcool Source0: http://members.jcom.home.ne.jp/jacobi/linux/files/%{name}-%{version}.tar.gz Source1: %{name}.init BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: pciutils-devel Requires(post): /sbin/chkconfig Requires(preun): /sbin/chkconfig Requires(preun): /sbin/service # It's for AMD Athlon/Duron processors ExclusiveArch: %{ix86} %description athcool is a small utility, enabling/disabling Powersaving mode for AMD Athlon/Duron processors. Since enabling Powersaving mode, you can save power consumption, lower CPU temprature when CPU is idle. Powersaving works if your kernel support ACPI (APM not work), because athcool only set/unset "Disconnect enable when STPGNT detected" bits in the Northbridge of Chipset. To really save power, someone has to send the STPGNT signal when idle. This is done by the ACPI subsystem when C2 state entered. !!!WARNING!!! Depending on your motherboard and/or hardware components, enabling powersaving mode may cause that: * noisy or distorted sound playback * a slowdown in harddisk performance * system locks or instability * massive filesystem corruption (rare, but observed at least once) If you met those problems, you should not use athcool. Please use athcool AT YOUR OWN RISK. %prep %setup -q %build make \ CC="%{__cc}" \ CFLAGS="%{optflags}" \ %{?_smp_mflags} %install rm -rf %{buildroot} make install DESTDIR=%{buildroot} install -D -p -m 0755 %{SOURCE1} %{buildroot}%{_initrddir}/%{name} %clean rm -rf %{buildroot} %post /sbin/chkconfig --add athcool %preun if [ $1 = 0 ]; then /sbin/service athcool stop >/dev/null 2>&1 /sbin/chkconfig --del athcool fi %postun if [ "$1" -ge "1" ]; then /sbin/service athcool condrestart >/dev/null 2>&1 fi %files %defattr(-,root,root,-) %doc COPYING ChangeLog README %{_initrddir}/%{name} %{_mandir}/man8/%{name}.8* %{_sbindir}/%{name} %changelog * Wed Aug 10 2005 Dawid Gajownik - 0.3.11-2 - Correct Summary field. * Wed Aug 10 2005 Dawid Gajownik - 0.3.11-1 - Initial RPM release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/athcool/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 11 Aug 2005 08:21:15 -0000 1.1 +++ .cvsignore 11 Aug 2005 08:23:27 -0000 1.2 @@ -0,0 +1 @@ +athcool-0.3.11.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/athcool/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 11 Aug 2005 08:21:15 -0000 1.1 +++ sources 11 Aug 2005 08:23:27 -0000 1.2 @@ -0,0 +1 @@ +0fdcc3e32f8e795ff95747e640710ce4 athcool-0.3.11.tar.gz From fedora-extras-commits at redhat.com Thu Aug 11 08:49:23 2005 From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik)) Date: Thu, 11 Aug 2005 04:49:23 -0400 Subject: rpms/athcool/devel athcool.spec,1.1,1.2 Message-ID: <200508110849.j7B8nNhs026554@cvs-int.fedora.redhat.com> Author: gajownik Update of /cvs/extras/rpms/athcool/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26539 Modified Files: athcool.spec Log Message: Add %{?dist} suffix to the release field. Index: athcool.spec =================================================================== RCS file: /cvs/extras/rpms/athcool/devel/athcool.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- athcool.spec 11 Aug 2005 08:23:27 -0000 1.1 +++ athcool.spec 11 Aug 2005 08:49:20 -0000 1.2 @@ -1,6 +1,6 @@ Name: athcool Version: 0.3.11 -Release: 2 +Release: 2%{?dist} Summary: Enables/disables Powersaving mode for AMD processors Group: System Environment/Daemons From fedora-extras-commits at redhat.com Thu Aug 11 09:20:12 2005 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Thu, 11 Aug 2005 05:20:12 -0400 Subject: rpms/plone/FC-4 .cvsignore, 1.4, 1.5 plone.spec, 1.6, 1.7 sources, 1.4, 1.5 Message-ID: <200508110920.j7B9Kgms027980@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/plone/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27942/FC-4 Modified Files: .cvsignore plone.spec sources Log Message: - update to rc2 - drop buildarch: noarch since _libdir depends on arch (on x86_64) - put readmes in %%doc Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/plone/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 1 Aug 2005 19:29:55 -0000 1.4 +++ .cvsignore 11 Aug 2005 09:20:10 -0000 1.5 @@ -1 +1 @@ -Plone-2.1-rc1.tar.gz +Plone-2.1-rc2.tar.gz Index: plone.spec =================================================================== RCS file: /cvs/extras/rpms/plone/FC-4/plone.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- plone.spec 1 Aug 2005 19:29:55 -0000 1.6 +++ plone.spec 11 Aug 2005 09:20:10 -0000 1.7 @@ -6,19 +6,18 @@ Name: plone Version: 2.1 -Release: 0.2.rc1%{?dist} +Release: 0.3.rc2%{?dist} Summary: User friendly and powerful open source Content Management System License: GPL Group: System Environment/Daemons URL: http://www.plone.org/ #Source0: http://dl.sf.net/plone/Plone-%{version}.tar.gz -Source0: http://dl.sf.net/plone/Plone-2.1-rc1.tar.gz +Source0: http://dl.sf.net/plone/Plone-2.1-rc2.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildArch: noarch Requires: zope >= %{zope_minver} -Requires: python >= %{python_minver} +Requires: python >= %{python_minver}, python-imaging %description Plone is a user friendly and powerful content management system based on Zope. @@ -27,15 +26,12 @@ products. %prep -%setup -q -n Plone-%{version}-rc1 -# Avoid conflicts -mv README.txt Plone-README.txt -mv CONTENTS.txt Plone-CONTENTS.txt +%setup -q -n Plone-%{version}-rc2 # Clean up sources find . -type d -name CVS | xargs rm -rf find . -type f -name .cvsignore | xargs rm -rf +find . -type d -name .svn | xargs rm -rf find . -type f -name "*~" | xargs rm -rf -rm -f Archetypes/content_driver/.DocBook.py.swp %install @@ -44,6 +40,8 @@ mkdir -p $RPM_BUILD_ROOT%{software_home}/Products cp -pr * $RPM_BUILD_ROOT%{software_home}/Products rm -rf $RPM_BUILD_ROOT%{software_home}/Products/BTreeFolder2 +rm -f $RPM_BUILD_ROOT%{software_home}/Products/README.txt +rm -f $RPM_BUILD_ROOT%{software_home}/Products/CONTENTS.txt %clean @@ -52,10 +50,16 @@ %files %defattr(644,root,root,755) +%doc README.txt CONTENTS.txt %{software_home}/Products/* %changelog +* Thu Aug 11 2005 Aurelien Bompard 2.1-0.3.rc2 +- update to rc2 +- drop buildarch: noarch since _libdir depends on arch (on x86_64) +- put readmes in %%doc + * Mon Aug 01 2005 Aurelien Bompard 2.1-0.2.rc1 - update to rc1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/plone/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 1 Aug 2005 19:29:55 -0000 1.4 +++ sources 11 Aug 2005 09:20:10 -0000 1.5 @@ -1 +1 @@ -7cc52354ddba675bfed383f0d412da48 Plone-2.1-rc1.tar.gz +3d5866c3301269b282a7ee375605326a Plone-2.1-rc2.tar.gz From fedora-extras-commits at redhat.com Thu Aug 11 09:20:12 2005 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Thu, 11 Aug 2005 05:20:12 -0400 Subject: rpms/plone/devel .cvsignore, 1.4, 1.5 plone.spec, 1.6, 1.7 sources, 1.4, 1.5 Message-ID: <200508110920.j7B9Kheu027985@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/plone/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27942/devel Modified Files: .cvsignore plone.spec sources Log Message: - update to rc2 - drop buildarch: noarch since _libdir depends on arch (on x86_64) - put readmes in %%doc Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/plone/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 1 Aug 2005 19:29:56 -0000 1.4 +++ .cvsignore 11 Aug 2005 09:20:10 -0000 1.5 @@ -1 +1 @@ -Plone-2.1-rc1.tar.gz +Plone-2.1-rc2.tar.gz Index: plone.spec =================================================================== RCS file: /cvs/extras/rpms/plone/devel/plone.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- plone.spec 1 Aug 2005 19:29:56 -0000 1.6 +++ plone.spec 11 Aug 2005 09:20:10 -0000 1.7 @@ -6,19 +6,18 @@ Name: plone Version: 2.1 -Release: 0.2.rc1%{?dist} +Release: 0.3.rc2%{?dist} Summary: User friendly and powerful open source Content Management System License: GPL Group: System Environment/Daemons URL: http://www.plone.org/ #Source0: http://dl.sf.net/plone/Plone-%{version}.tar.gz -Source0: http://dl.sf.net/plone/Plone-2.1-rc1.tar.gz +Source0: http://dl.sf.net/plone/Plone-2.1-rc2.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildArch: noarch Requires: zope >= %{zope_minver} -Requires: python >= %{python_minver} +Requires: python >= %{python_minver}, python-imaging %description Plone is a user friendly and powerful content management system based on Zope. @@ -27,15 +26,12 @@ products. %prep -%setup -q -n Plone-%{version}-rc1 -# Avoid conflicts -mv README.txt Plone-README.txt -mv CONTENTS.txt Plone-CONTENTS.txt +%setup -q -n Plone-%{version}-rc2 # Clean up sources find . -type d -name CVS | xargs rm -rf find . -type f -name .cvsignore | xargs rm -rf +find . -type d -name .svn | xargs rm -rf find . -type f -name "*~" | xargs rm -rf -rm -f Archetypes/content_driver/.DocBook.py.swp %install @@ -44,6 +40,8 @@ mkdir -p $RPM_BUILD_ROOT%{software_home}/Products cp -pr * $RPM_BUILD_ROOT%{software_home}/Products rm -rf $RPM_BUILD_ROOT%{software_home}/Products/BTreeFolder2 +rm -f $RPM_BUILD_ROOT%{software_home}/Products/README.txt +rm -f $RPM_BUILD_ROOT%{software_home}/Products/CONTENTS.txt %clean @@ -52,10 +50,16 @@ %files %defattr(644,root,root,755) +%doc README.txt CONTENTS.txt %{software_home}/Products/* %changelog +* Thu Aug 11 2005 Aurelien Bompard 2.1-0.3.rc2 +- update to rc2 +- drop buildarch: noarch since _libdir depends on arch (on x86_64) +- put readmes in %%doc + * Mon Aug 01 2005 Aurelien Bompard 2.1-0.2.rc1 - update to rc1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/plone/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 1 Aug 2005 19:29:56 -0000 1.4 +++ sources 11 Aug 2005 09:20:10 -0000 1.5 @@ -1 +1 @@ -7cc52354ddba675bfed383f0d412da48 Plone-2.1-rc1.tar.gz +3d5866c3301269b282a7ee375605326a Plone-2.1-rc2.tar.gz From fedora-extras-commits at redhat.com Thu Aug 11 09:22:31 2005 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Thu, 11 Aug 2005 05:22:31 -0400 Subject: rpms/plone/FC-4 plone.spec,1.7,1.8 Message-ID: <200508110923.j7B9N18E028056@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/plone/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28024/FC-4 Modified Files: plone.spec Log Message: rebuild (made tag before commit......) Index: plone.spec =================================================================== RCS file: /cvs/extras/rpms/plone/FC-4/plone.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- plone.spec 11 Aug 2005 09:20:10 -0000 1.7 +++ plone.spec 11 Aug 2005 09:22:29 -0000 1.8 @@ -6,7 +6,7 @@ Name: plone Version: 2.1 -Release: 0.3.rc2%{?dist} +Release: 0.4.rc2%{?dist} Summary: User friendly and powerful open source Content Management System License: GPL Group: System Environment/Daemons @@ -55,6 +55,9 @@ %changelog +* Thu Aug 11 2005 Aurelien Bompard 2.1-0.4.rc2 +- rebuild + * Thu Aug 11 2005 Aurelien Bompard 2.1-0.3.rc2 - update to rc2 - drop buildarch: noarch since _libdir depends on arch (on x86_64) From fedora-extras-commits at redhat.com Thu Aug 11 09:22:31 2005 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Thu, 11 Aug 2005 05:22:31 -0400 Subject: rpms/plone/devel plone.spec,1.7,1.8 Message-ID: <200508110923.j7B9N1ST028059@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/plone/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28024/devel Modified Files: plone.spec Log Message: rebuild (made tag before commit......) Index: plone.spec =================================================================== RCS file: /cvs/extras/rpms/plone/devel/plone.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- plone.spec 11 Aug 2005 09:20:10 -0000 1.7 +++ plone.spec 11 Aug 2005 09:22:29 -0000 1.8 @@ -6,7 +6,7 @@ Name: plone Version: 2.1 -Release: 0.3.rc2%{?dist} +Release: 0.4.rc2%{?dist} Summary: User friendly and powerful open source Content Management System License: GPL Group: System Environment/Daemons @@ -55,6 +55,9 @@ %changelog +* Thu Aug 11 2005 Aurelien Bompard 2.1-0.4.rc2 +- rebuild + * Thu Aug 11 2005 Aurelien Bompard 2.1-0.3.rc2 - update to rc2 - drop buildarch: noarch since _libdir depends on arch (on x86_64) From fedora-extras-commits at redhat.com Thu Aug 11 09:24:28 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Thu, 11 Aug 2005 05:24:28 -0400 Subject: rpms/graphviz/devel .cvsignore, 1.5, 1.6 graphviz.spec, 1.10, 1.11 sources, 1.5, 1.6 Message-ID: <200508110924.j7B9OSQW028091@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/graphviz/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28070 Modified Files: .cvsignore graphviz.spec sources Log Message: * Thu Aug 11 2005 Oliver Falk - 2.4-1 - Update - Took over maintainership - Merge with spec provided within source tarball Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/graphviz/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 16 Apr 2005 19:16:43 -0000 1.5 +++ .cvsignore 11 Aug 2005 09:24:26 -0000 1.6 @@ -1 +1 @@ -graphviz-2.2.1.tar.gz +graphviz-2.4.tar.gz Index: graphviz.spec =================================================================== RCS file: /cvs/extras/rpms/graphviz/devel/graphviz.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- graphviz.spec 22 May 2005 22:59:38 -0000 1.10 +++ graphviz.spec 11 Aug 2005 09:24:26 -0000 1.11 @@ -1,38 +1,41 @@ -# Note: graphviz requires gd with gif support (and other fixes), hence use -# internal one for now. +Summary: Graph Visualization Tools +Name: graphviz -Summary: Graph Visualization Tools -Name: graphviz -Version: 2.2.1 -Release: 2 - -Group: Applications/Multimedia -License: CPL -URL: http://www.graphviz.org/ -Source: http://www.graphviz.org/pub/graphviz/ARCHIVE/graphviz-2.2.1.tar.gz -BuildRoot: %{_tmppath}/%{name}-root -BuildRequires: zlib-devel libpng-devel libjpeg-devel XFree86-devel expat-devel -BuildRequires: /bin/ksh bison m4 flex tk tcl >= 8.3 -BuildRequires: /usr/include/tcl.h /usr/include/tk.h - -%package tcl -Group: Applications/Multimedia -Summary: Tcl extension tools for %{name} -Requires: %{name} = %{version}-%{release} tcl >= 8.3 tk - -%package devel -Summary: Development package for %{name} -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} pkgconfig - -%package doc -Summary: PDF and HTML documents for %{name} -Group: Documentation - -%package graphs -Summary: Demo graphs for %{name} -Group: Applications/Multimedia +Version: 2.4 +Release: 1 +Group: Applications/Multimedia +License: CPL + +URL: http://www.graphviz.org/ +Source0: http://www.graphviz.org/pub/graphviz/ARCHIVE/%{name}-%{version}.tar.gz + +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: zlib-devel libpng-devel libjpeg-devel expat-devel freetype-devel >= 2 +BuildRequires: /bin/ksh bison m4 flex +BuildRequires: tcl-devel >= 8.3 +BuildRequires: tk-devel +BuildRequires: fontconfig-devel xorg-x11-devel +BuildRequires: php-devel guile-devel + +%package tcl +Summary: Tcl extension tools for %{name} +Group: Applications/Multimedia +Requires: %{name} = %{version}-%{release} tcl >= 8.3 tk + +%package devel +Summary: Development package for %{name} +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} pkgconfig + +%package doc +Summary: PDF and HTML documents for %{name} +Group: Documentation + +%package graphs +Summary: Demo graphs for %{name} +Group: Applications/Multimedia %description A collection of tools and tcl packages for the manipulation and layout @@ -52,46 +55,36 @@ %description graphs Some demo graphs for %{name}. - %prep %setup -q - %build # XXX ix86 only used to have -ffast-math, let's use everywhere %{expand: %%define optflags %{optflags} -ffast-math} -# %%configure is broken in RH7.3 rpmbuild -# need unreleased changes to gd, so use --with-mylibgd for now. -CFLAGS="$RPM_OPT_FLAGS" \ -./configure \ - --prefix=%{_prefix} \ - --bindir=%{_bindir} \ - --libdir=%{_libdir} \ - --includedir=%{_includedir} \ - --datadir=%{_datadir} \ - --mandir=%{_mandir} \ - --with-x \ - --with-mylibgd \ - --disable-dependency-tracking -make %{?_smp_mflags} +%configure --with-x \ + --with-mylibgd \ + --disable-dependency-tracking + +%{__make} %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT __doc -make \ + +%{__make} \ DESTDIR=$RPM_BUILD_ROOT \ + docdir=$RPM_BUILD_ROOT%{_docdir}/%{name} \ pkgconfigdir=%{_libdir}/pkgconfig \ transform='s,x,x,' \ install + chmod -x $RPM_BUILD_ROOT%{_datadir}/%{name}/lefty/* cp -a $RPM_BUILD_ROOT%{_datadir}/%{name}/doc __doc rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/doc - %clean rm -rf $RPM_BUILD_ROOT - %files %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog NEWS README @@ -103,8 +96,8 @@ %{_datadir}/%{name}/lefty %exclude %{_libdir}/%{name}/lib*tcl*.so.* %exclude %{_libdir}/%{name}/libtk*.so.* -%exclude %{_bindir}/dotneato-config -%exclude %{_mandir}/man1/dotneato-config.1* +%exclude %{_includedir}/ltdl* +%exclude %{_libdir}/libltdl* %files tcl %defattr(-,root,root,-) @@ -113,17 +106,13 @@ %{_libdir}/%{name}/pkgIndex.tcl %{_datadir}/%{name}/demo %{_mandir}/mann/*.n* -%exclude %{_libdir}/%{name}/lib*tcl*.so.? -%exclude %{_libdir}/%{name}/libtk*.so.? %files devel %defattr(-,root,root,-) -%{_bindir}/dotneato-config %{_includedir}/%{name} %{_libdir}/%{name}/*.la %{_libdir}/%{name}/*.so %{_libdir}/pkgconfig/*.pc -%{_mandir}/man1/dotneato-config.1* %{_mandir}/man3/*.3* %exclude %{_libdir}/%{name}/lib*tcl*.* %exclude %{_libdir}/%{name}/libtk*.* @@ -137,8 +126,22 @@ %defattr(-,root,root,-) %doc __doc/* +# run "dot -V" to generate plugin config in %{_libdir}/%{name}/config +%post +%{_bindir}/dot -V 2>/dev/null + +%post tcl +%{_bindir}/dot -V 2>/dev/null + +%post devel +%{_bindir}/dot -V 2>/dev/null %changelog +* Thu Aug 11 2005 Oliver Falk - 2.4-1 +- Update +- Took over maintainership +- Merge with spec provided within source tarball + * Sun May 22 2005 Jeremy Katz - 2.2.1-2 - rebuild on all arches Index: sources =================================================================== RCS file: /cvs/extras/rpms/graphviz/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 16 Apr 2005 19:16:43 -0000 1.5 +++ sources 11 Aug 2005 09:24:26 -0000 1.6 @@ -1 +1 @@ -bb46d8ada39436cb672922f0c8b1339c graphviz-2.2.1.tar.gz +f1074d38a7eeb5e5b2ebfdb643aebf8a graphviz-2.4.tar.gz From fedora-extras-commits at redhat.com Thu Aug 11 09:26:45 2005 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Thu, 11 Aug 2005 05:26:45 -0400 Subject: rpms/plone/FC-4 plone.spec,1.8,1.9 Message-ID: <200508110926.j7B9QjD0028191@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/plone/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28162/FC-4 Modified Files: plone.spec Log Message: rebuild (cvs mistake *again* grmbl) Index: plone.spec =================================================================== RCS file: /cvs/extras/rpms/plone/FC-4/plone.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- plone.spec 11 Aug 2005 09:22:29 -0000 1.8 +++ plone.spec 11 Aug 2005 09:26:43 -0000 1.9 @@ -6,7 +6,7 @@ Name: plone Version: 2.1 -Release: 0.4.rc2%{?dist} +Release: 0.5.rc2%{?dist} Summary: User friendly and powerful open source Content Management System License: GPL Group: System Environment/Daemons @@ -55,7 +55,7 @@ %changelog -* Thu Aug 11 2005 Aurelien Bompard 2.1-0.4.rc2 +* Thu Aug 11 2005 Aurelien Bompard - rebuild * Thu Aug 11 2005 Aurelien Bompard 2.1-0.3.rc2 From fedora-extras-commits at redhat.com Thu Aug 11 09:26:46 2005 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Thu, 11 Aug 2005 05:26:46 -0400 Subject: rpms/plone/devel plone.spec,1.8,1.9 Message-ID: <200508110926.j7B9QkhZ028197@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/plone/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28162/devel Modified Files: plone.spec Log Message: rebuild (cvs mistake *again* grmbl) Index: plone.spec =================================================================== RCS file: /cvs/extras/rpms/plone/devel/plone.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- plone.spec 11 Aug 2005 09:22:29 -0000 1.8 +++ plone.spec 11 Aug 2005 09:26:44 -0000 1.9 @@ -6,7 +6,7 @@ Name: plone Version: 2.1 -Release: 0.4.rc2%{?dist} +Release: 0.5.rc2%{?dist} Summary: User friendly and powerful open source Content Management System License: GPL Group: System Environment/Daemons @@ -55,7 +55,7 @@ %changelog -* Thu Aug 11 2005 Aurelien Bompard 2.1-0.4.rc2 +* Thu Aug 11 2005 Aurelien Bompard - rebuild * Thu Aug 11 2005 Aurelien Bompard 2.1-0.3.rc2 From fedora-extras-commits at redhat.com Thu Aug 11 09:31:20 2005 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Thu, 11 Aug 2005 05:31:20 -0400 Subject: rpms/taglib/FC-4 taglib.spec,1.9,1.10 Message-ID: <200508110931.j7B9VoxR028364@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/taglib/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28327/FC-4 Modified Files: taglib.spec Log Message: - remove empty README Index: taglib.spec =================================================================== RCS file: /cvs/extras/rpms/taglib/FC-4/taglib.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- taglib.spec 1 Aug 2005 18:54:16 -0000 1.9 +++ taglib.spec 11 Aug 2005 09:31:18 -0000 1.10 @@ -60,7 +60,7 @@ %files %defattr(-,root,root) -%doc AUTHORS COPYING README +%doc AUTHORS COPYING %{_libdir}/lib*.so.* %files devel From fedora-extras-commits at redhat.com Thu Aug 11 09:31:20 2005 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Thu, 11 Aug 2005 05:31:20 -0400 Subject: rpms/taglib/devel taglib.spec,1.9,1.10 Message-ID: <200508110931.j7B9Vpbd028367@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/taglib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28327/devel Modified Files: taglib.spec Log Message: - remove empty README Index: taglib.spec =================================================================== RCS file: /cvs/extras/rpms/taglib/devel/taglib.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- taglib.spec 1 Aug 2005 18:54:16 -0000 1.9 +++ taglib.spec 11 Aug 2005 09:31:18 -0000 1.10 @@ -60,7 +60,7 @@ %files %defattr(-,root,root) -%doc AUTHORS COPYING README +%doc AUTHORS COPYING %{_libdir}/lib*.so.* %files devel From fedora-extras-commits at redhat.com Thu Aug 11 10:58:53 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Thu, 11 Aug 2005 06:58:53 -0400 Subject: rpms/perl-Mail-Alias/devel perl-Mail-Alias.spec,1.7,1.8 Message-ID: <200508111058.j7BAwrIM029787@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/perl-Mail-Alias/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29770 Modified Files: perl-Mail-Alias.spec Log Message: * Thu Aug 11 2005 Oliver Falk - 1.12-5 - Use Fedora perl specfile - Cleanup - Took over maintainership Index: perl-Mail-Alias.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Mail-Alias/devel/perl-Mail-Alias.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- perl-Mail-Alias.spec 6 Apr 2005 22:13:06 -0000 1.7 +++ perl-Mail-Alias.spec 11 Aug 2005 10:58:51 -0000 1.8 @@ -1,21 +1,20 @@ -%define perl_vendorlib %(eval "`perl -V:installvendorlib`"; echo $installvendorlib) +%define pkgname Mail-Alias -%define tarname Mail-Alias +Summary: Module for manipulating e-mail alias files +Name: perl-%{pkgname} +Version: 1.12 +Release: 5 + +License: Artistic +Group: Development/Libraries +URL: http://www.cpan.org/ + +Source0: http://search.cpan.org//CPAN/authors/id/Z/ZE/ZELT/%{pkgname}-%{version}.tar.gz +BuildArch: noarch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot -Summary: Mail::Alias perl module -Name: perl-%{tarname} -Version: 1.12 -Release: 4 - -License: Artistic -Group: Development/Libraries -URL: http://www.cpan.org/ -# Tarball grabbed with perl -MCPAN -e shell -> get Mail::Alias. -Source0: %{tarname}-%{version}.tar.gz -BuildArch: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot - -# ----------------------------------------------------------------------------- +BuildRequires: perl +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description This module allows direct manipulation of various types of E-Mail @@ -24,35 +23,25 @@ to read some other formats and to convert between various alias file formats. -# ----------------------------------------------------------------------------- - %prep -%setup -q -n %{tarname}-%{version} - -# ----------------------------------------------------------------------------- +%setup -q -n %{pkgname}-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} -make test - -# ----------------------------------------------------------------------------- %install rm -rf $RPM_BUILD_ROOT -make install \ - PERL_INSTALL_ROOT=$RPM_BUILD_ROOT \ - INSTALLARCHLIB=$RPM_BUILD_ROOT%{perl_archlib} -find $RPM_BUILD_ROOT -type f -a $ -name perllocal.pod -o -name .packlist \ - -o \( -name '*.bs' -a -empty $ \) -exec rm -f {} ';' +%{__make} pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT +find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' +find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' -# ----------------------------------------------------------------------------- +%check || : +%{__make} test %clean rm -rf $RPM_BUILD_ROOT -# ----------------------------------------------------------------------------- - %files %defattr(-,root,root,-) %doc README Changes @@ -60,9 +49,12 @@ %{perl_vendorlib}/Mail/Alias.pm %{_mandir}/man3/Mail::Alias.3pm* -# ----------------------------------------------------------------------------- - %changelog +* Thu Aug 11 2005 Oliver Falk - 1.12-5 +- Use Fedora perl specfile +- Cleanup +- Took over maintainership + * Fri Apr 7 2005 Michael Schwendt - rebuilt From fedora-extras-commits at redhat.com Thu Aug 11 11:19:19 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Thu, 11 Aug 2005 07:19:19 -0400 Subject: rpms/perl-Mail-Alias/FC-4 perl-Mail-Alias.spec,1.7,1.8 Message-ID: <200508111119.j7BBJJWw031090@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/perl-Mail-Alias/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31068 Modified Files: perl-Mail-Alias.spec Log Message: * Thu Aug 11 2005 Oliver Falk - 1.12-5 - Use Fedora perl specfile - Cleanup - Took over maintainership Index: perl-Mail-Alias.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Mail-Alias/FC-4/perl-Mail-Alias.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- perl-Mail-Alias.spec 6 Apr 2005 22:13:06 -0000 1.7 +++ perl-Mail-Alias.spec 11 Aug 2005 11:19:16 -0000 1.8 @@ -1,21 +1,20 @@ -%define perl_vendorlib %(eval "`perl -V:installvendorlib`"; echo $installvendorlib) +%define pkgname Mail-Alias -%define tarname Mail-Alias +Summary: Module for manipulating e-mail alias files +Name: perl-%{pkgname} +Version: 1.12 +Release: 5 + +License: Artistic +Group: Development/Libraries +URL: http://www.cpan.org/ + +Source0: http://search.cpan.org//CPAN/authors/id/Z/ZE/ZELT/%{pkgname}-%{version}.tar.gz +BuildArch: noarch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot -Summary: Mail::Alias perl module -Name: perl-%{tarname} -Version: 1.12 -Release: 4 - -License: Artistic -Group: Development/Libraries -URL: http://www.cpan.org/ -# Tarball grabbed with perl -MCPAN -e shell -> get Mail::Alias. -Source0: %{tarname}-%{version}.tar.gz -BuildArch: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot - -# ----------------------------------------------------------------------------- +BuildRequires: perl +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description This module allows direct manipulation of various types of E-Mail @@ -24,35 +23,25 @@ to read some other formats and to convert between various alias file formats. -# ----------------------------------------------------------------------------- - %prep -%setup -q -n %{tarname}-%{version} - -# ----------------------------------------------------------------------------- +%setup -q -n %{pkgname}-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} -make test - -# ----------------------------------------------------------------------------- %install rm -rf $RPM_BUILD_ROOT -make install \ - PERL_INSTALL_ROOT=$RPM_BUILD_ROOT \ - INSTALLARCHLIB=$RPM_BUILD_ROOT%{perl_archlib} -find $RPM_BUILD_ROOT -type f -a $ -name perllocal.pod -o -name .packlist \ - -o \( -name '*.bs' -a -empty $ \) -exec rm -f {} ';' +%{__make} pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT +find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' +find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' -# ----------------------------------------------------------------------------- +%check || : +%{__make} test %clean rm -rf $RPM_BUILD_ROOT -# ----------------------------------------------------------------------------- - %files %defattr(-,root,root,-) %doc README Changes @@ -60,9 +49,12 @@ %{perl_vendorlib}/Mail/Alias.pm %{_mandir}/man3/Mail::Alias.3pm* -# ----------------------------------------------------------------------------- - %changelog +* Thu Aug 11 2005 Oliver Falk - 1.12-5 +- Use Fedora perl specfile +- Cleanup +- Took over maintainership + * Fri Apr 7 2005 Michael Schwendt - rebuilt From fedora-extras-commits at redhat.com Thu Aug 11 11:21:11 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Thu, 11 Aug 2005 07:21:11 -0400 Subject: rpms/perl-Mail-Alias/FC-3 perl-Mail-Alias.spec,1.5,1.6 Message-ID: <200508111121.j7BBLBLq031133@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/perl-Mail-Alias/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31116 Modified Files: perl-Mail-Alias.spec Log Message: * Thu Aug 11 2005 Oliver Falk - 1.12-5 - Use Fedora perl specfile - Cleanup - Took over maintainership Index: perl-Mail-Alias.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Mail-Alias/FC-3/perl-Mail-Alias.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-Mail-Alias.spec 10 Dec 2004 22:03:08 -0000 1.5 +++ perl-Mail-Alias.spec 11 Aug 2005 11:21:09 -0000 1.6 @@ -1,21 +1,20 @@ -%define perl_vendorlib %(eval "`perl -V:installvendorlib`"; echo $installvendorlib) +%define pkgname Mail-Alias -%define tarname Mail-Alias +Summary: Module for manipulating e-mail alias files +Name: perl-%{pkgname} +Version: 1.12 +Release: 5 + +License: Artistic +Group: Development/Libraries +URL: http://www.cpan.org/ + +Source0: http://search.cpan.org//CPAN/authors/id/Z/ZE/ZELT/%{pkgname}-%{version}.tar.gz +BuildArch: noarch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot -Summary: Mail::Alias perl module. -Name: perl-%{tarname} -Version: 1.12 -Release: 3 -Epoch: 0 -License: Artistic -Group: Development/Libraries -URL: http://www.cpan.org/ -# Tarball grabbed with perl -MCPAN -e shell -> get Mail::Alias. -Source0: %{tarname}-%{version}.tar.gz -BuildArch: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot - -# ----------------------------------------------------------------------------- +BuildRequires: perl +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description This module allows direct manipulation of various types of E-Mail @@ -24,35 +23,25 @@ to read some other formats and to convert between various alias file formats. -# ----------------------------------------------------------------------------- - %prep -%setup -q -n %{tarname}-%{version} - -# ----------------------------------------------------------------------------- +%setup -q -n %{pkgname}-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} -make test - -# ----------------------------------------------------------------------------- %install rm -rf $RPM_BUILD_ROOT -make install \ - PERL_INSTALL_ROOT=$RPM_BUILD_ROOT \ - INSTALLARCHLIB=$RPM_BUILD_ROOT%{perl_archlib} -find $RPM_BUILD_ROOT -type f -a $ -name perllocal.pod -o -name .packlist \ - -o \( -name '*.bs' -a -empty $ \) -exec rm -f {} ';' +%{__make} pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT +find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' +find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' -# ----------------------------------------------------------------------------- +%check || : +%{__make} test %clean rm -rf $RPM_BUILD_ROOT -# ----------------------------------------------------------------------------- - %files %defattr(-,root,root,-) %doc README Changes @@ -60,9 +49,12 @@ %{perl_vendorlib}/Mail/Alias.pm %{_mandir}/man3/Mail::Alias.3pm* -# ----------------------------------------------------------------------------- - %changelog +* Thu Aug 11 2005 Oliver Falk - 1.12-5 +- Use Fedora perl specfile +- Cleanup +- Took over maintainership + * Thu Oct 2 2003 Michael Schwendt 0:1.12-0.fdr.3 - Vendor installation - noarch build @@ -73,5 +65,5 @@ - Added make test in build section - Added missing directory -* Tue Jun 17 2003 Dams +* Tue Jun 17 2003 Dams - Initial build. From fedora-extras-commits at redhat.com Thu Aug 11 11:22:29 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Thu, 11 Aug 2005 07:22:29 -0400 Subject: rpms/perl-Mail-Alias/FC-3 perl-Mail-Alias.spec,1.6,1.7 Message-ID: <200508111122.j7BBMTgv031196@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/perl-Mail-Alias/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31179 Modified Files: perl-Mail-Alias.spec Log Message: * Add disttag Index: perl-Mail-Alias.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Mail-Alias/FC-3/perl-Mail-Alias.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- perl-Mail-Alias.spec 11 Aug 2005 11:21:09 -0000 1.6 +++ perl-Mail-Alias.spec 11 Aug 2005 11:22:27 -0000 1.7 @@ -3,7 +3,7 @@ Summary: Module for manipulating e-mail alias files Name: perl-%{pkgname} Version: 1.12 -Release: 5 +Release: 5%{?dist} License: Artistic Group: Development/Libraries From fedora-extras-commits at redhat.com Thu Aug 11 11:34:21 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Thu, 11 Aug 2005 07:34:21 -0400 Subject: common tobuild,1.2194,1.2195 Message-ID: <200508111134.j7BBYLb3031248@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31231 Modified Files: tobuild Log Message: request build of rpms/perl-Crypt-Blowfish/devel perl-Crypt-Blowfish-2_09-2_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2194 retrieving revision 1.2195 diff -u -r1.2194 -r1.2195 --- tobuild 8 Aug 2005 22:52:08 -0000 1.2194 +++ tobuild 11 Aug 2005 11:34:19 -0000 1.2195 @@ -28,3 +28,4 @@ gemi rpms/unison/FC-3 unison-2_12_0-1_fc3 fc3 wtogami rpms/perl-Razor-Agent/devel perl-Razor-Agent-2_75-1_fc5 devel shishz rpms/snownews/devel snownews-1_5_7-2_fc5 devel +ixs rpms/perl-Crypt-Blowfish/devel perl-Crypt-Blowfish-2_09-2_fc5 devel From fedora-extras-commits at redhat.com Thu Aug 11 11:39:23 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Thu, 11 Aug 2005 07:39:23 -0400 Subject: common tobuild,1.2195,1.2196 Message-ID: <200508111139.j7BBdNDT031284@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31267 Modified Files: tobuild Log Message: removed tobuild entry, build is being requested via plague-client Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2195 retrieving revision 1.2196 diff -u -r1.2195 -r1.2196 --- tobuild 11 Aug 2005 11:34:19 -0000 1.2195 +++ tobuild 11 Aug 2005 11:39:21 -0000 1.2196 @@ -28,4 +28,3 @@ gemi rpms/unison/FC-3 unison-2_12_0-1_fc3 fc3 wtogami rpms/perl-Razor-Agent/devel perl-Razor-Agent-2_75-1_fc5 devel shishz rpms/snownews/devel snownews-1_5_7-2_fc5 devel -ixs rpms/perl-Crypt-Blowfish/devel perl-Crypt-Blowfish-2_09-2_fc5 devel From fedora-extras-commits at redhat.com Thu Aug 11 11:41:32 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Thu, 11 Aug 2005 07:41:32 -0400 Subject: common tobuild,1.2196,1.2197 Message-ID: <200508111141.j7BBfWS5031399@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31382 Modified Files: tobuild Log Message: request build of rpms/perl-Crypt-Blowfish/FC-4 perl-Crypt-Blowfish-2_09-2_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2196 retrieving revision 1.2197 diff -u -r1.2196 -r1.2197 --- tobuild 11 Aug 2005 11:39:21 -0000 1.2196 +++ tobuild 11 Aug 2005 11:41:30 -0000 1.2197 @@ -28,3 +28,4 @@ gemi rpms/unison/FC-3 unison-2_12_0-1_fc3 fc3 wtogami rpms/perl-Razor-Agent/devel perl-Razor-Agent-2_75-1_fc5 devel shishz rpms/snownews/devel snownews-1_5_7-2_fc5 devel +ixs rpms/perl-Crypt-Blowfish/FC-4 perl-Crypt-Blowfish-2_09-2_fc4 fc4 From fedora-extras-commits at redhat.com Thu Aug 11 11:50:02 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Thu, 11 Aug 2005 07:50:02 -0400 Subject: rpms/perl-Mail-Alias/FC-4 perl-Mail-Alias.spec,1.8,1.9 Message-ID: <200508111150.j7BBo2f5031523@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/perl-Mail-Alias/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31506 Modified Files: perl-Mail-Alias.spec Log Message: * Add disttag Index: perl-Mail-Alias.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Mail-Alias/FC-4/perl-Mail-Alias.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- perl-Mail-Alias.spec 11 Aug 2005 11:19:16 -0000 1.8 +++ perl-Mail-Alias.spec 11 Aug 2005 11:50:00 -0000 1.9 @@ -3,7 +3,7 @@ Summary: Module for manipulating e-mail alias files Name: perl-%{pkgname} Version: 1.12 -Release: 5 +Release: 5%{?dist} License: Artistic Group: Development/Libraries From fedora-extras-commits at redhat.com Thu Aug 11 11:50:26 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Thu, 11 Aug 2005 07:50:26 -0400 Subject: rpms/perl-Mail-Alias/devel perl-Mail-Alias.spec,1.8,1.9 Message-ID: <200508111150.j7BBoQGP031584@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/perl-Mail-Alias/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31567 Modified Files: perl-Mail-Alias.spec Log Message: * Add disttag Index: perl-Mail-Alias.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Mail-Alias/devel/perl-Mail-Alias.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- perl-Mail-Alias.spec 11 Aug 2005 10:58:51 -0000 1.8 +++ perl-Mail-Alias.spec 11 Aug 2005 11:50:24 -0000 1.9 @@ -3,7 +3,7 @@ Summary: Module for manipulating e-mail alias files Name: perl-%{pkgname} Version: 1.12 -Release: 5 +Release: 5%{?dist} License: Artistic Group: Development/Libraries From rc040203 at freenet.de Thu Aug 11 13:12:01 2005 From: rc040203 at freenet.de (Ralf Corsepius) Date: Thu, 11 Aug 2005 15:12:01 +0200 Subject: rpms/perl-Mail-Alias/FC-3 perl-Mail-Alias.spec,1.5,1.6 In-Reply-To: <200508111121.j7BBLBLq031133@cvs-int.fedora.redhat.com> References: <200508111121.j7BBLBLq031133@cvs-int.fedora.redhat.com> Message-ID: <1123765921.14200.2.camel@mccallum.corsepiu.local> On Thu, 2005-08-11 at 07:21 -0400, Oliver Falk wrote: > Author: oliver > Index: perl-Mail-Alias.spec > +License: Artistic This is not correct. http://search.cpan.org/~zelt/Mail-Alias-1.12/Alias.pm#COPYRIGHT +License: Artistic or GPL From fedora-extras-commits at redhat.com Thu Aug 11 13:44:00 2005 From: fedora-extras-commits at redhat.com (Marc Maurer (uwog)) Date: Thu, 11 Aug 2005 09:44:00 -0400 Subject: rpms/link-grammar - New directory Message-ID: <200508111344.j7BDi0B6001963@cvs-int.fedora.redhat.com> Author: uwog Update of /cvs/extras/rpms/link-grammar In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1939/link-grammar Log Message: Directory /cvs/extras/rpms/link-grammar added to the repository From fedora-extras-commits at redhat.com Thu Aug 11 13:44:01 2005 From: fedora-extras-commits at redhat.com (Marc Maurer (uwog)) Date: Thu, 11 Aug 2005 09:44:01 -0400 Subject: rpms/link-grammar/devel - New directory Message-ID: <200508111344.j7BDi1PH001968@cvs-int.fedora.redhat.com> Author: uwog Update of /cvs/extras/rpms/link-grammar/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1939/link-grammar/devel Log Message: Directory /cvs/extras/rpms/link-grammar/devel added to the repository From fedora-extras-commits at redhat.com Thu Aug 11 13:44:46 2005 From: fedora-extras-commits at redhat.com (Marc Maurer (uwog)) Date: Thu, 11 Aug 2005 09:44:46 -0400 Subject: rpms/link-grammar Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200508111344.j7BDikeg002015@cvs-int.fedora.redhat.com> Author: uwog Update of /cvs/extras/rpms/link-grammar In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1988 Added Files: Makefile import.log Log Message: Setup of module link-grammar --- NEW FILE Makefile --- # Top level Makefile for module link-grammar all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Thu Aug 11 13:44:46 2005 From: fedora-extras-commits at redhat.com (Marc Maurer (uwog)) Date: Thu, 11 Aug 2005 09:44:46 -0400 Subject: rpms/link-grammar/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200508111344.j7BDikk8002020@cvs-int.fedora.redhat.com> Author: uwog Update of /cvs/extras/rpms/link-grammar/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1988/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module link-grammar --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Thu Aug 11 13:45:43 2005 From: fedora-extras-commits at redhat.com (Marc Maurer (uwog)) Date: Thu, 11 Aug 2005 09:45:43 -0400 Subject: rpms/link-grammar import.log,1.1,1.2 Message-ID: <200508111346.j7BDkEp6002089@cvs-int.fedora.redhat.com> Author: uwog Update of /cvs/extras/rpms/link-grammar In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2054 Modified Files: import.log Log Message: auto-import link-grammar-4.1.3-3 on branch devel from link-grammar-4.1.3-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/link-grammar/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 11 Aug 2005 13:44:43 -0000 1.1 +++ import.log 11 Aug 2005 13:45:40 -0000 1.2 @@ -0,0 +1 @@ +link-grammar-4_1_3-3:HEAD:link-grammar-4.1.3-3.src.rpm:1123767928 From fedora-extras-commits at redhat.com Thu Aug 11 13:45:44 2005 From: fedora-extras-commits at redhat.com (Marc Maurer (uwog)) Date: Thu, 11 Aug 2005 09:45:44 -0400 Subject: rpms/link-grammar/devel link-grammar.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200508111346.j7BDkEoH002090@cvs-int.fedora.redhat.com> Author: uwog Update of /cvs/extras/rpms/link-grammar/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2054/devel Modified Files: .cvsignore sources Added Files: link-grammar.spec Log Message: auto-import link-grammar-4.1.3-3 on branch devel from link-grammar-4.1.3-3.src.rpm --- NEW FILE link-grammar.spec --- Summary: A Grammar Checking library Name: link-grammar Version: 4.1.3 Release: 3 Group: System Environment/Libraries License: BSD-style Source: http://www.abisource.com/downloads/link-grammar/%{version}/link-grammar-%{version}.tar.gz URL: http://bobo.link.cs.cmu.edu/link/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description A library that can perform grammar checking. %package devel Summary: Support files necessary to compile applications with liblink-grammar Group: Development/Libraries Requires: link-grammar = %{version}-%{release} %description devel Libraries, headers, and support files needed for using liblink-grammar. %prep %setup -q %build %configure make # currently the build system can not handle smp_flags properly # make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la %files %defattr(-,root,root) %doc LICENSE README %{_bindir}/* %{_libdir}/lib*.so.* %{_datadir}/link-grammar %files devel %defattr(-,root,root) %{_libdir}/*.a %{_libdir}/*.so %{_libdir}/pkgconfig/link-grammar.pc %{_includedir}/link-grammar %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %clean rm -r $RPM_BUILD_ROOT %changelog * Wed Aug 10 2005 Marc Maurer - 4.1.3-3 - Set the buildroot to the standard Fedora buildroot - Make the package own the %{_datadir}/link-grammar directory (thanks go to Aurelien Bompard for both issues) * Wed Aug 10 2005 Marc Maurer - 4.1.3-2 - Remove epoch - Make rpmlint happy * Sun Aug 7 2005 Marc Maurer - 1:4.1.3-1 - Initial version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/link-grammar/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 11 Aug 2005 13:44:44 -0000 1.1 +++ .cvsignore 11 Aug 2005 13:45:41 -0000 1.2 @@ -0,0 +1 @@ +link-grammar-4.1.3.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/link-grammar/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 11 Aug 2005 13:44:44 -0000 1.1 +++ sources 11 Aug 2005 13:45:41 -0000 1.2 @@ -0,0 +1 @@ +5edbeab4b9e3f61b343e68206708703e link-grammar-4.1.3.tar.gz From fedora-extras-commits at redhat.com Thu Aug 11 13:56:25 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Thu, 11 Aug 2005 09:56:25 -0400 Subject: rpms/perl-Mail-Alias/devel perl-Mail-Alias.spec,1.9,1.10 Message-ID: <200508111356.j7BDuPDd002202@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/perl-Mail-Alias/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2185 Modified Files: perl-Mail-Alias.spec Log Message: * Fix license Index: perl-Mail-Alias.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Mail-Alias/devel/perl-Mail-Alias.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- perl-Mail-Alias.spec 11 Aug 2005 11:50:24 -0000 1.9 +++ perl-Mail-Alias.spec 11 Aug 2005 13:56:23 -0000 1.10 @@ -3,9 +3,9 @@ Summary: Module for manipulating e-mail alias files Name: perl-%{pkgname} Version: 1.12 -Release: 5%{?dist} +Release: 6%{?dist} -License: Artistic +License: Artistic or GPL Group: Development/Libraries URL: http://www.cpan.org/ @@ -50,6 +50,9 @@ %{_mandir}/man3/Mail::Alias.3pm* %changelog +* Thu Aug 11 2005 Oliver Falk - 1.12-6 +- Fix license + * Thu Aug 11 2005 Oliver Falk - 1.12-5 - Use Fedora perl specfile - Cleanup From oliver at linux-kernel.at Thu Aug 11 13:57:24 2005 From: oliver at linux-kernel.at (Oliver Falk) Date: Thu, 11 Aug 2005 15:57:24 +0200 Subject: rpms/perl-Mail-Alias/FC-3 perl-Mail-Alias.spec,1.5,1.6 In-Reply-To: <1123765921.14200.2.camel@mccallum.corsepiu.local> References: <200508111121.j7BBLBLq031133@cvs-int.fedora.redhat.com> <1123765921.14200.2.camel@mccallum.corsepiu.local> Message-ID: <42FB5944.2080300@linux-kernel.at> On 08/11/2005 03:12 PM, Ralf Corsepius wrote: > On Thu, 2005-08-11 at 07:21 -0400, Oliver Falk wrote: > >>Author: oliver > > >>Index: perl-Mail-Alias.spec > > >>+License: Artistic > > > This is not correct. > > http://search.cpan.org/~zelt/Mail-Alias-1.12/Alias.pm#COPYRIGHT > > +License: Artistic or GPL Commits will come in within the next few minutes... Best, Oliver From fedora-extras-commits at redhat.com Thu Aug 11 14:40:45 2005 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Thu, 11 Aug 2005 10:40:45 -0400 Subject: rpms/stellarium/devel stellarium-0.6.2-gcc4.patch, 1.1, 1.2 stellarium.spec, 1.7, 1.8 Message-ID: <200508111440.j7BEejro003505@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/stellarium/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3481 Modified Files: stellarium-0.6.2-gcc4.patch stellarium.spec Log Message: Description: Take ownership of stellarium. Fix minor build problem with gcc4. stellarium-0.6.2-gcc4.patch: Index: stellarium-0.6.2-gcc4.patch =================================================================== RCS file: /cvs/extras/rpms/stellarium/devel/stellarium-0.6.2-gcc4.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- stellarium-0.6.2-gcc4.patch 13 Apr 2005 23:28:13 -0000 1.1 +++ stellarium-0.6.2-gcc4.patch 11 Aug 2005 14:40:43 -0000 1.2 @@ -1,6 +1,5 @@ -diff -Nur stellarium-0.6.2-orig/src/vecmath.h stellarium-0.6.2/src/vecmath.h ---- stellarium-0.6.2-orig/src/vecmath.h 2004-10-09 02:14:04.000000000 +0200 -+++ stellarium-0.6.2/src/vecmath.h 2005-04-14 01:02:11.000000000 +0200 +--- stellarium-0.6.2/src/vecmath.h.gcc4 2004-10-09 02:14:04.000000000 +0200 ++++ stellarium-0.6.2/src/vecmath.h 2005-08-10 20:31:06.000000000 +0200 @@ -73,8 +73,8 @@ inline Vector2 operator-(const Vector2&) const; inline Vector2 operator+(const Vector2&) const; @@ -34,3 +33,14 @@ inline Vector4 operator*(T) const; inline Vector4 operator/(T) const; +--- stellarium-0.6.2/src/stel_core.h.gcc4 2005-08-10 20:37:45.000000000 +0200 ++++ stellarium-0.6.2/src/stel_core.h 2005-08-10 20:38:16.000000000 +0200 +@@ -46,6 +46,8 @@ + #include "meteor_mgr.h" + #include "sky_localizer.h" + ++class stel_ui; ++ + class stel_core + { + friend class stel_ui; Index: stellarium.spec =================================================================== RCS file: /cvs/extras/rpms/stellarium/devel/stellarium.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- stellarium.spec 13 Apr 2005 23:28:13 -0000 1.7 +++ stellarium.spec 11 Aug 2005 14:40:43 -0000 1.8 @@ -1,6 +1,6 @@ Name: stellarium Version: 0.6.2 -Release: 4 +Release: 5 Summary: Photo-realistic nightsky renderer Group: Amusements/Graphics @@ -67,6 +67,9 @@ %changelog +* Wed Aug 10 2005 Jochen Schmitt 0.6.2-5 +- Fix build for GCC4. + * Thu Apr 14 2005 Michael Schwendt - 0.6.2-4 - Fix build for GCC4. - Fix desktop icon installation. From fedora-extras-commits at redhat.com Thu Aug 11 14:43:26 2005 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Thu, 11 Aug 2005 10:43:26 -0400 Subject: owners owners.list,1.70,1.71 Message-ID: <200508111443.j7BEhQNZ003585@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3568 Modified Files: owners.list Log Message: Description: Take ownership of stellarium. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.70 retrieving revision 1.71 diff -u -r1.70 -r1.71 --- owners.list 11 Aug 2005 02:08:50 -0000 1.70 +++ owners.list 11 Aug 2005 14:43:24 -0000 1.71 @@ -783,7 +783,7 @@ Fedora Extras|sqlite2|Embeddable SQL engine in a C library|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| Fedora Extras|sqlite|An embeddable SQL engine in a C library|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| Fedora Extras|starfighter|For bugs related to the starfighter component|matthias at rpmforge.net|extras-qa at fedoraproject.org| -Fedora Extras|stellarium|A photo-realistic nightsky renderer|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| +Fedora Extras|stellarium|A photo-realistic nightsky renderer|Jochen at herr-schmitt.de|extras-qa at fedoraproject.org| Fedora Extras|stow|Manage the installation of software packages from source|gauret at free.fr|extras-qa at fedoraproject.org| Fedora Extras|straw|GNOME desktop news aggregator|colin at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|stripesnoop|Magnetic Stripe Reader|tcallawa at redhat.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Thu Aug 11 14:58:16 2005 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Thu, 11 Aug 2005 10:58:16 -0400 Subject: rpms/stellarium/FC-4 stellarium-0.6.2-gcc4.patch, 1.1, 1.2 stellarium.spec, 1.7, 1.8 Message-ID: <200508111458.j7BEwGuU003631@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/stellarium/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3604 Modified Files: stellarium-0.6.2-gcc4.patch stellarium.spec Log Message: Description: Take ownership of stellarium. Fixe minor build bug with gcc4. stellarium-0.6.2-gcc4.patch: Index: stellarium-0.6.2-gcc4.patch =================================================================== RCS file: /cvs/extras/rpms/stellarium/FC-4/stellarium-0.6.2-gcc4.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- stellarium-0.6.2-gcc4.patch 13 Apr 2005 23:28:13 -0000 1.1 +++ stellarium-0.6.2-gcc4.patch 11 Aug 2005 14:58:14 -0000 1.2 @@ -1,6 +1,5 @@ -diff -Nur stellarium-0.6.2-orig/src/vecmath.h stellarium-0.6.2/src/vecmath.h ---- stellarium-0.6.2-orig/src/vecmath.h 2004-10-09 02:14:04.000000000 +0200 -+++ stellarium-0.6.2/src/vecmath.h 2005-04-14 01:02:11.000000000 +0200 +--- stellarium-0.6.2/src/vecmath.h.gcc4 2004-10-09 02:14:04.000000000 +0200 ++++ stellarium-0.6.2/src/vecmath.h 2005-08-10 20:31:06.000000000 +0200 @@ -73,8 +73,8 @@ inline Vector2 operator-(const Vector2&) const; inline Vector2 operator+(const Vector2&) const; @@ -34,3 +33,14 @@ inline Vector4 operator*(T) const; inline Vector4 operator/(T) const; +--- stellarium-0.6.2/src/stel_core.h.gcc4 2005-08-10 20:37:45.000000000 +0200 ++++ stellarium-0.6.2/src/stel_core.h 2005-08-10 20:38:16.000000000 +0200 +@@ -46,6 +46,8 @@ + #include "meteor_mgr.h" + #include "sky_localizer.h" + ++class stel_ui; ++ + class stel_core + { + friend class stel_ui; Index: stellarium.spec =================================================================== RCS file: /cvs/extras/rpms/stellarium/FC-4/stellarium.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- stellarium.spec 13 Apr 2005 23:28:13 -0000 1.7 +++ stellarium.spec 11 Aug 2005 14:58:14 -0000 1.8 @@ -1,6 +1,6 @@ Name: stellarium Version: 0.6.2 -Release: 4 +Release: 5 Summary: Photo-realistic nightsky renderer Group: Amusements/Graphics @@ -67,6 +67,9 @@ %changelog +* Wed Aug 10 2005 Jochen Schmitt 0.6.2-5 +- Fix build for GCC4. + * Thu Apr 14 2005 Michael Schwendt - 0.6.2-4 - Fix build for GCC4. - Fix desktop icon installation. From fedora-extras-commits at redhat.com Thu Aug 11 15:05:44 2005 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Thu, 11 Aug 2005 11:05:44 -0400 Subject: rpms/stellarium/devel stellarium.spec,1.8,1.9 Message-ID: <200508111506.j7BF6GQY004847@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/stellarium/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4822 Modified Files: stellarium.spec Log Message: Description: Add %{?dist} to release. Index: stellarium.spec =================================================================== RCS file: /cvs/extras/rpms/stellarium/devel/stellarium.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- stellarium.spec 11 Aug 2005 14:40:43 -0000 1.8 +++ stellarium.spec 11 Aug 2005 15:05:37 -0000 1.9 @@ -1,6 +1,6 @@ Name: stellarium Version: 0.6.2 -Release: 5 +Release: 6%{?dist} Summary: Photo-realistic nightsky renderer Group: Amusements/Graphics @@ -67,6 +67,9 @@ %changelog +* Thu Aug 11 2005 Jochen Schmitt 0.6.2-6 +- Add %%{?dist} to release. + * Wed Aug 10 2005 Jochen Schmitt 0.6.2-5 - Fix build for GCC4. From fedora-extras-commits at redhat.com Thu Aug 11 15:07:56 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Thu, 11 Aug 2005 11:07:56 -0400 Subject: rpms/perl-Mail-Alias/FC-4 perl-Mail-Alias.spec,1.9,1.10 Message-ID: <200508111507.j7BF7ube004931@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/perl-Mail-Alias/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4917 Modified Files: perl-Mail-Alias.spec Log Message: * Fix license Index: perl-Mail-Alias.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Mail-Alias/FC-4/perl-Mail-Alias.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- perl-Mail-Alias.spec 11 Aug 2005 11:50:00 -0000 1.9 +++ perl-Mail-Alias.spec 11 Aug 2005 15:07:54 -0000 1.10 @@ -2,10 +2,11 @@ Summary: Module for manipulating e-mail alias files Name: perl-%{pkgname} + Version: 1.12 -Release: 5%{?dist} +Release: 6%{?dist} -License: Artistic +License: Artistic or GPL Group: Development/Libraries URL: http://www.cpan.org/ @@ -50,6 +51,9 @@ %{_mandir}/man3/Mail::Alias.3pm* %changelog +* Thu Aug 11 2005 Oliver Falk - 1.12-6 +- Fix license + * Thu Aug 11 2005 Oliver Falk - 1.12-5 - Use Fedora perl specfile - Cleanup From fedora-extras-commits at redhat.com Thu Aug 11 15:08:40 2005 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Thu, 11 Aug 2005 11:08:40 -0400 Subject: rpms/stellarium/FC-4 stellarium.spec,1.8,1.9 Message-ID: <200508111508.j7BF8eh7004974@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/stellarium/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4953 Modified Files: stellarium.spec Log Message: Description: Add %{?dist} to release. Index: stellarium.spec =================================================================== RCS file: /cvs/extras/rpms/stellarium/FC-4/stellarium.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- stellarium.spec 11 Aug 2005 14:58:14 -0000 1.8 +++ stellarium.spec 11 Aug 2005 15:08:38 -0000 1.9 @@ -1,6 +1,6 @@ Name: stellarium Version: 0.6.2 -Release: 5 +Release: 6%{?dist} Summary: Photo-realistic nightsky renderer Group: Amusements/Graphics @@ -67,6 +67,9 @@ %changelog +* Thu Aug 11 2005 Jochen Schmitt 0.6.2-6 +- Add %%{?dist} to release. + * Wed Aug 10 2005 Jochen Schmitt 0.6.2-5 - Fix build for GCC4. From fedora-extras-commits at redhat.com Thu Aug 11 15:08:55 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Thu, 11 Aug 2005 11:08:55 -0400 Subject: rpms/perl-Mail-Alias/FC-3 perl-Mail-Alias.spec,1.7,1.8 Message-ID: <200508111508.j7BF8t9f005031@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/perl-Mail-Alias/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5014 Modified Files: perl-Mail-Alias.spec Log Message: * Fix license Index: perl-Mail-Alias.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Mail-Alias/FC-3/perl-Mail-Alias.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- perl-Mail-Alias.spec 11 Aug 2005 11:22:27 -0000 1.7 +++ perl-Mail-Alias.spec 11 Aug 2005 15:08:53 -0000 1.8 @@ -3,9 +3,9 @@ Summary: Module for manipulating e-mail alias files Name: perl-%{pkgname} Version: 1.12 -Release: 5%{?dist} +Release: 6%{?dist} -License: Artistic +License: Artistic or GPL Group: Development/Libraries URL: http://www.cpan.org/ @@ -50,6 +50,9 @@ %{_mandir}/man3/Mail::Alias.3pm* %changelog +* Thu Aug 11 2005 Oliver Falk - 1.12-6 +- Fix license + * Thu Aug 11 2005 Oliver Falk - 1.12-5 - Use Fedora perl specfile - Cleanup From fedora-extras-commits at redhat.com Thu Aug 11 15:39:35 2005 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Thu, 11 Aug 2005 11:39:35 -0400 Subject: fedora-security/audit fc4,1.37,1.38 Message-ID: <200508111539.j7BFdZfL005193@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5176 Modified Files: fc4 Log Message: Some tidying up of the status Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- fc4 8 Aug 2005 07:49:58 -0000 1.37 +++ fc4 11 Aug 2005 15:39:33 -0000 1.38 @@ -3,14 +3,17 @@ ** are items that need attention -2005-2475 ** unzip -2005-2471 ** netpbm -2005-2456 ** kernel +2005-2541 ignore (tar) is documented behaviour +2005-2536 ** pstotext +2005-2500 version (kernel, flaw introduced after 2.6.12) +2005-2475 VULNERABLE (unzip) bz#164928 +2005-2471 VULNERABLE (netpbm) bz#165355 +2005-2456 VULNERABLE (kernel, fixed after 20050726) 2005-2452 ** libtiff -2005-2448 ** libgadu/ekg -2005-2447 ** libgadu/ekg -2005-2446 ** libgadu/ekg -2005-2414 ** xpcom library +2005-2448 ** libgadu in kdenetwork +2005-2447 ** libgadu in kdenetwork +2005-2446 ** libgadu in kdenetwork +2005-2414 ignore (mozilla) not being fixed upstream, just a crash 2005-2410 backport (NetworkManager) [since FEDORA-2005-680] 2005-2395 ** firefox 2005-2370 version (kdenetwork, fixed 3.4.2) [since FEDORA-2005-670] was backport since FEDORA-2005-624 @@ -23,6 +26,7 @@ 2005-2363 version (ethereal, fixed 0.10.12) [since FEDORA-2005-655] 2005-2362 version (ethereal, fixed 0.10.12) [since FEDORA-2005-655] 2005-2361 version (ethereal, fixed 0.10.12) [since FEDORA-2005-655] +2005-2360 version (ethereal, fixed 0.10.12) [since FEDORA-2005-655] 2005-2353 ignore (thunderbird) debug mode only 2005-2335 backport (fetchmail) [since FEDORA-2005-613] 2005-2270 version (firefox, fixed 1.0.5) [since FEDORA-2005-605] @@ -366,6 +370,7 @@ 2005-0004 version (mysql, fixed 4.1.10) 2005-0003 version (kernel, fixed 2.6.10) 2005-0001 version (kernel, fixed 2.6.10) +2004-2302 version (kernel, fixed 2.6.10) 2004-2259 version (vsftpd, fixed 1.2.2) 2004-2228 version (firefox, fixed 1.0) 2004-2227 version (firefox, fixed 1.0) From fedora-extras-commits at redhat.com Thu Aug 11 16:07:49 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 11 Aug 2005 12:07:49 -0400 Subject: rpms/opensc/FC-3 opensc.spec,1.4,1.5 Message-ID: <200508111608.j7BG8JWS006445@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/opensc/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6413 Modified Files: opensc.spec Log Message: * Tue Aug 9 2005 Ville Skytt?? - 0.9.6-1.1 - Rebuild with updated libassuan. Index: opensc.spec =================================================================== RCS file: /cvs/extras/rpms/opensc/FC-3/opensc.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- opensc.spec 17 May 2005 19:13:24 -0000 1.4 +++ opensc.spec 11 Aug 2005 16:07:28 -0000 1.5 @@ -6,7 +6,7 @@ Name: opensc Version: 0.9.6 -Release: 1 +Release: 1.1 Summary: Smart card library and applications Group: System Environment/Libraries @@ -174,6 +174,9 @@ %changelog +* Tue Aug 9 2005 Ville Skytt?? - 0.9.6-1.1 +- Rebuild with updated libassuan. + * Tue Apr 26 2005 Ville Skytt?? - 0.9.6-1 - 0.9.6, build patch applied upstream. - Package summary and description improvements. From fedora-extras-commits at redhat.com Thu Aug 11 19:32:40 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 11 Aug 2005 15:32:40 -0400 Subject: extras-buildsys/www builders.psp, 1.6, 1.7 failed.psp, 1.4, 1.5 index.psp, 1.7, 1.8 indiv.psp, 1.7, 1.8 job.psp, 1.9, 1.10 success.psp, 1.5, 1.6 Message-ID: <200508111932.j7BJWeeG010724@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/www In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10667/www Modified Files: builders.psp failed.psp index.psp indiv.psp job.psp success.psp Log Message: 2005-08-11 Dan Williams * plague.spec - Clean up to Fedora Extras standards in preparation for package submission * builder/builder.py - Don't ignore mock output during the 'cleanup' stage - Make the process() function less byzantine by moving each step to a separate function and using getattr() to call them, like in PackageJob.py on the server * www/* - Clean up error handling so it actually works all the time intead of returning Error 500 Internal Server Error when, for example, the build server isn't running Patch from Ville Skytt?? * www/template/head.psp www/indiv.psp - Use HTTP GET instead of POST to stop nags about form data resubmission Index: builders.psp =================================================================== RCS file: /cvs/fedora/extras-buildsys/www/builders.psp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- builders.psp 8 Aug 2005 02:54:16 -0000 1.6 +++ builders.psp 11 Aug 2005 19:32:38 -0000 1.7 @@ -19,16 +19,17 @@ (e, msg, builders) = server.list_builders() except socket.error, e: msg = str(e) -%> -
Could not contact the server.

Error was:<%=msg%>
-<% + e = -1 except xmlrpclib.Fault, fault: msg = "XMLRPC Fault" e = -1 +except Exception, e: + msg = str(e) + e = -1 if e == -1: %> -
The server could not process the request.

Error was:  <%=msg%>
+
The server could not process the request.

Error was:  <%=msg%>
<% else: for builder in builders: Index: failed.psp =================================================================== RCS file: /cvs/fedora/extras-buildsys/www/failed.psp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- failed.psp 6 Aug 2005 16:25:05 -0000 1.4 +++ failed.psp 11 Aug 2005 19:32:38 -0000 1.5 @@ -18,16 +18,17 @@ (e, msg, these_jobs) = server.list_jobs(args) except socket.error, e: msg = str(e) -%> -
Could not contact the server.

Error was:<%=msg%>
-<% + e = -1 except xmlrpclib.Fault, fault: msg = "XMLRPC Fault" e = -1 +except Exception, e: + msg = str(e) + e = -1 if e == -1: %> -
The server could not process the request.

Error was:  <%=msg%>
+
The server could not process the request.

Error was:  <%=msg%>
<% else: i = 1 Index: index.psp =================================================================== RCS file: /cvs/fedora/extras-buildsys/www/index.psp,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- index.psp 6 Aug 2005 16:25:05 -0000 1.7 +++ index.psp 11 Aug 2005 19:32:38 -0000 1.8 @@ -15,16 +15,17 @@ (e, msg, jobs) = server.list_jobs(args) except socket.error, e: msg = str(e) -%> -
Could not contact the server.

Error was:<%=msg%>
-<% + e = -1 except xmlrpclib.Fault, fault: msg = "XMLRPC Fault" e = -1 +except Exception, e: + msg = str(e) + e = -1 if e == -1: %> -
The server could not process the request.

Error was:  <%=msg%>
+
The server could not process the request.

Error was:  <%=msg%>
<% else: i = 1 Index: indiv.psp =================================================================== RCS file: /cvs/fedora/extras-buildsys/www/indiv.psp,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- indiv.psp 6 Aug 2005 16:25:05 -0000 1.7 +++ indiv.psp 11 Aug 2005 19:32:38 -0000 1.8 @@ -9,7 +9,7 @@ if not len(user_email): %> -
+ Email Address:
@@ -40,16 +40,17 @@ targets.insert(0, 'ALL') except socket.error, e: msg = str(e) -%> -
Could not contact the server.

Error was:<%=msg%>
-<% + e = -1 except xmlrpclib.Fault, fault: msg = "XMLRPC Fault" e = -1 + except Exception, e: + msg = str(e) + e = -1 if e == -1: %> -
The server could not process the request.

Error was:  <%=msg%>
+
The server could not process the request.

Error was:  <%=msg%>
<% else: %> @@ -65,7 +66,8 @@

- + + Index: job.psp =================================================================== RCS file: /cvs/fedora/extras-buildsys/www/job.psp,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- job.psp 8 Aug 2005 02:54:16 -0000 1.9 +++ job.psp 11 Aug 2005 19:32:38 -0000 1.10 @@ -23,16 +23,17 @@ (e, msg, job) = server.detail_job(uid) except socket.error, e: msg = str(e) -%> -
Could not contact the server.

Error was:<%=msg%>
-<% + e = -1 except xmlrpclib.Fault, fault: msg = "XMLRPC Fault" e = -1 + except Exception, e: + msg = str(e) + e = -1 if e == -1: %> -
The server could not process the request.

Error was:  <%=msg%>
+
The server could not process the request.

Error was:  <%=msg%>
<% else: if job.has_key('version') and job.has_key('release'): Index: success.psp =================================================================== RCS file: /cvs/fedora/extras-buildsys/www/success.psp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- success.psp 8 Aug 2005 03:12:30 -0000 1.5 +++ success.psp 11 Aug 2005 19:32:38 -0000 1.6 @@ -16,16 +16,17 @@ (e, msg, jobs) = server.list_jobs(args) except socket.error, e: msg = str(e) -%> -
Could not contact the server.

Error was:<%=msg%>
-<% + e = -1 except xmlrpclib.Fault, fault: msg = "XMLRPC Fault" e = -1 +except Exception, e: + msg = str(e) + e = -1 if e == -1: %> -
The server could not process the request.

Error was:  <%=msg%>
+
The server could not process the request.

Error was:  <%=msg%>
<% else: i = 1 From fedora-extras-commits at redhat.com Thu Aug 11 19:32:48 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 11 Aug 2005 15:32:48 -0400 Subject: rpms/rpmlint/FC-4 rpmlint-perl-bs.patch, NONE, 1.1 rpmlint-prereq.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 rpmlint-fedora-config, 1.7, 1.8 rpmlint-initvars.patch, 1.1, 1.2 rpmlint.spec, 1.15, 1.16 sources, 1.8, 1.9 rpmlint-confmsg.patch, 1.1, NONE Message-ID: <200508111932.j7BJWmpn010780@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/rpmlint/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10731/FC-4 Modified Files: .cvsignore rpmlint-fedora-config rpmlint-initvars.patch rpmlint.spec sources Added Files: rpmlint-perl-bs.patch rpmlint-prereq.patch Removed Files: rpmlint-confmsg.patch Log Message: * Wed Aug 10 2005 Ville Skytt?? - 0.71-1 - 0.71, confmsg patch and bits from initvars patch applied upstream. - Filter out Mandriva-specific errors about missing locales-* deps (#165457). - Patch to not warn about non-empty *.bs (in Perl packages). - Patch to clarify PreReq explanation, make it a warning instead of an error. - Patch to warn about use of BuildPreReq. rpmlint-perl-bs.patch: --- NEW FILE rpmlint-perl-bs.patch --- --- FilesCheck.py 10 Aug 2005 01:46:30 -0000 1.88 +++ FilesCheck.py 10 Aug 2005 13:29:12 -0000 @@ -160,7 +160,7 @@ depmod_regex=re.compile('^[^#]*depmod', re.MULTILINE) info_regex=re.compile('^/usr/share/info') install_info_regex=re.compile('^[^#]*install-info', re.MULTILINE) -perl_temp_file=re.compile('.*perl.*(\.bs|/\.packlist|/perllocal\.pod)$') +perl_temp_file=re.compile('.*perl.*(/\.packlist|/perllocal\.pod)$') scm_regex=re.compile('/CVS/[^/]+$|/.cvsignore$|/\.svn/|/(\.arch-ids|{arch})/') htaccess_regex=re.compile('\.htaccess$') games_path_regex=re.compile('/usr/(lib/)?/games') rpmlint-prereq.patch: --- NEW FILE rpmlint-prereq.patch --- --- SpecCheck.py 10 Aug 2005 06:10:39 -0000 1.29 +++ SpecCheck.py 10 Aug 2005 13:14:46 -0000 @@ -44,6 +44,7 @@ biarch_package_regex=re.compile(DEFAULT_BIARCH_PACKAGES) hardcoded_lib_path_exceptions_regex=re.compile(Config.getOption('HardcodedLibPathExceptions', DEFAULT_HARDCODED_LIB_PATH_EXCEPTIONS)) prereq_regex=re.compile('^PreReq:\s*(.+?)\s*$', re.IGNORECASE) +buildprereq_regex=re.compile('^BuildPreReq:\s*(.+?)\s*$', re.IGNORECASE) # Only check for /lib, /usr/lib, /usr/X11R6/lib # TODO: better handling of X libraries and modules. @@ -185,8 +186,12 @@ res=prereq_regex.search(line) if res: - printError(pkg, 'prereq-use', res.group(1)) - + printWarning(pkg, 'prereq-use', res.group(1)) + + res=buildprereq_regex.search(line) + if res: + printWarning(pkg, 'buildprereq-use', res.group(1)) + if not buildroot: printError(pkg, 'no-buildroot-tag') @@ -272,8 +277,13 @@ patch to be effective only on a given arch.''', 'prereq-use', -'''The use of PreReq is deprecated. You should use Requires(pre), Requires(post), -Requires(preun) or Requires(postun) according to your needs.''', +'''The use of PreReq is deprecated. In the majority of cases, a plain Requires +is enough and the right thing to do. Sometimes Requires(pre), Requires(post), +Requires(preun) and/or Requires(postun) can also be used instead of PreReq.''', + +'buildprereq-use', +'''The use of BuildPreReq is deprecated, build dependencies are always required +before a package can be built. Use plain BuildRequires instead.''', ) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/rpmlint/FC-4/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 20 Jun 2005 18:02:35 -0000 1.8 +++ .cvsignore 11 Aug 2005 19:32:45 -0000 1.9 @@ -1 +1 @@ -rpmlint-0.70.tar.bz2 +rpmlint-0.71.tar.bz2 Index: rpmlint-fedora-config =================================================================== RCS file: /cvs/extras/rpms/rpmlint/FC-4/rpmlint-fedora-config,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- rpmlint-fedora-config 20 Jun 2005 18:02:36 -0000 1.7 +++ rpmlint-fedora-config 11 Aug 2005 19:32:45 -0000 1.8 @@ -79,6 +79,7 @@ addFilter("W: .* source-or-patch-not-[bg]zipped .*") addFilter("E: .* lib-package-without-%mklibname") addFilter("E: .* no-dependency-on (perl|python)-base.*") +addFilter("E: .* no-dependency-on locales-.*") addFilter("W: .* (python|perl5)-naming-policy-not-applied.*") addFilter("W: .* invalid-(distribution|vendor) .*") addFilter("E: .* no-(packager-tag|signature)") rpmlint-initvars.patch: Index: rpmlint-initvars.patch =================================================================== RCS file: /cvs/extras/rpms/rpmlint/FC-4/rpmlint-initvars.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- rpmlint-initvars.patch 11 Jul 2005 18:22:30 -0000 1.1 +++ rpmlint-initvars.patch 11 Aug 2005 19:32:45 -0000 1.2 @@ -1,19 +1,5 @@ -Index: InitScriptCheck.py -=================================================================== -RCS file: /cooker/soft/rpmlint/InitScriptCheck.py,v -retrieving revision 1.14 -diff -u -r1.14 InitScriptCheck.py ---- InitScriptCheck.py 15 Apr 2005 20:01:46 -0000 1.14 -+++ InitScriptCheck.py 6 Jul 2005 14:19:22 -0000 -@@ -17,7 +17,7 @@ - - rc_regex=re.compile('^/etc(/rc.d)?/init.d/') - chkconfig_content_regex=re.compile('# +chkconfig: +([-0-9]+) +[-0-9]+ +[-0-9]+', re.MULTILINE) --subsys_regex=re.compile('/var/lock/subsys/([^/\n ]+)', re.MULTILINE) -+subsys_regex=re.compile('/var/lock/subsys/([^/"\'\n ]+)', re.MULTILINE) - chkconfig_regex=re.compile('^[^#]*(chkconfig|add-service|del-service)', re.MULTILINE) - status_regex=re.compile('^[^#]*status', re.MULTILINE) - reload_regex=re.compile('^[^#]*reload', re.MULTILINE) +--- InitScriptCheck.py 10 Aug 2005 01:51:34 -0000 1.15 ++++ InitScriptCheck.py 10 Aug 2005 13:12:39 -0000 @@ -86,7 +86,7 @@ error=1 if name[0] == '$': Index: rpmlint.spec =================================================================== RCS file: /cvs/extras/rpms/rpmlint/FC-4/rpmlint.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- rpmlint.spec 11 Jul 2005 18:22:30 -0000 1.15 +++ rpmlint.spec 11 Aug 2005 19:32:45 -0000 1.16 @@ -1,6 +1,6 @@ Name: rpmlint -Version: 0.70 -Release: 4%{?dist} +Version: 0.71 +Release: 1%{?dist} Summary: Tool for checking common errors in RPM packages Group: Development/Tools @@ -9,10 +9,11 @@ Source0: http://people.mandriva.com/~flepied/projects/rpmlint/dist/%{name}-%{version}.tar.bz2 Source1: %{name}-fedora-config Patch0: %{name}-svcdefault.patch -Patch1: %{name}-confmsg.patch +Patch1: %{name}-prereq.patch Patch2: %{name}-disttag.patch Patch3: %{name}-initvars.patch Patch4: %{name}-execs.patch +Patch5: %{name}-perl-bs.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -35,6 +36,7 @@ %patch2 %patch3 %patch4 +%patch5 sed -i -e 's|/etc/httpd/webapps\.d|%{_sysconfdir}/httpd/conf.d|' \ FilesCheck.py I18NCheck.py for f in AUTHORS ChangeLog ; do @@ -86,12 +88,19 @@ %changelog +* Wed Aug 10 2005 Ville Skytt?? - 0.71-1 +- 0.71, confmsg patch and bits from initvars patch applied upstream. +- Filter out Mandriva-specific errors about missing locales-* deps (#165457). +- Patch to not warn about non-empty *.bs (in Perl packages). +- Patch to clarify PreReq explanation, make it a warning instead of an error. +- Patch to warn about use of BuildPreReq. + * Thu Jul 7 2005 Ville Skytt?? - 0.70-4 - Fix false "positives" from libtool archives confused as scripts, non-executable scripts installed in docs, FE disttags, unsuccessfully expanded shell variables and quotation in init scripts. -* Mon Jun 20 2005 Ville Skytt?? - 0.70-2 +* Mon Jun 20 2005 Ville Skytt?? - 0.70-3 - 0.70, use sed instead of perl during build. - Default configuration improvements: allow Development/Debug group (for debuginfo packages), filter out errors/warnings about non-indexed jars, Index: sources =================================================================== RCS file: /cvs/extras/rpms/rpmlint/FC-4/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 20 Jun 2005 18:02:36 -0000 1.8 +++ sources 11 Aug 2005 19:32:45 -0000 1.9 @@ -1 +1 @@ -0457f6d88c6b25fe3cb31503249a6909 rpmlint-0.70.tar.bz2 +9e7645ee79bfc75540c885f05dca0751 rpmlint-0.71.tar.bz2 --- rpmlint-confmsg.patch DELETED --- From fedora-extras-commits at redhat.com Thu Aug 11 19:32:48 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 11 Aug 2005 15:32:48 -0400 Subject: rpms/rpmlint/devel rpmlint-perl-bs.patch, NONE, 1.1 rpmlint-prereq.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 rpmlint-fedora-config, 1.7, 1.8 rpmlint-initvars.patch, 1.1, 1.2 rpmlint.spec, 1.15, 1.16 sources, 1.8, 1.9 rpmlint-confmsg.patch, 1.1, NONE Message-ID: <200508111932.j7BJWmWm010797@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/rpmlint/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10731/devel Modified Files: .cvsignore rpmlint-fedora-config rpmlint-initvars.patch rpmlint.spec sources Added Files: rpmlint-perl-bs.patch rpmlint-prereq.patch Removed Files: rpmlint-confmsg.patch Log Message: * Wed Aug 10 2005 Ville Skytt?? - 0.71-1 - 0.71, confmsg patch and bits from initvars patch applied upstream. - Filter out Mandriva-specific errors about missing locales-* deps (#165457). - Patch to not warn about non-empty *.bs (in Perl packages). - Patch to clarify PreReq explanation, make it a warning instead of an error. - Patch to warn about use of BuildPreReq. rpmlint-perl-bs.patch: --- NEW FILE rpmlint-perl-bs.patch --- --- FilesCheck.py 10 Aug 2005 01:46:30 -0000 1.88 +++ FilesCheck.py 10 Aug 2005 13:29:12 -0000 @@ -160,7 +160,7 @@ depmod_regex=re.compile('^[^#]*depmod', re.MULTILINE) info_regex=re.compile('^/usr/share/info') install_info_regex=re.compile('^[^#]*install-info', re.MULTILINE) -perl_temp_file=re.compile('.*perl.*(\.bs|/\.packlist|/perllocal\.pod)$') +perl_temp_file=re.compile('.*perl.*(/\.packlist|/perllocal\.pod)$') scm_regex=re.compile('/CVS/[^/]+$|/.cvsignore$|/\.svn/|/(\.arch-ids|{arch})/') htaccess_regex=re.compile('\.htaccess$') games_path_regex=re.compile('/usr/(lib/)?/games') rpmlint-prereq.patch: --- NEW FILE rpmlint-prereq.patch --- --- SpecCheck.py 10 Aug 2005 06:10:39 -0000 1.29 +++ SpecCheck.py 10 Aug 2005 13:14:46 -0000 @@ -44,6 +44,7 @@ biarch_package_regex=re.compile(DEFAULT_BIARCH_PACKAGES) hardcoded_lib_path_exceptions_regex=re.compile(Config.getOption('HardcodedLibPathExceptions', DEFAULT_HARDCODED_LIB_PATH_EXCEPTIONS)) prereq_regex=re.compile('^PreReq:\s*(.+?)\s*$', re.IGNORECASE) +buildprereq_regex=re.compile('^BuildPreReq:\s*(.+?)\s*$', re.IGNORECASE) # Only check for /lib, /usr/lib, /usr/X11R6/lib # TODO: better handling of X libraries and modules. @@ -185,8 +186,12 @@ res=prereq_regex.search(line) if res: - printError(pkg, 'prereq-use', res.group(1)) - + printWarning(pkg, 'prereq-use', res.group(1)) + + res=buildprereq_regex.search(line) + if res: + printWarning(pkg, 'buildprereq-use', res.group(1)) + if not buildroot: printError(pkg, 'no-buildroot-tag') @@ -272,8 +277,13 @@ patch to be effective only on a given arch.''', 'prereq-use', -'''The use of PreReq is deprecated. You should use Requires(pre), Requires(post), -Requires(preun) or Requires(postun) according to your needs.''', +'''The use of PreReq is deprecated. In the majority of cases, a plain Requires +is enough and the right thing to do. Sometimes Requires(pre), Requires(post), +Requires(preun) and/or Requires(postun) can also be used instead of PreReq.''', + +'buildprereq-use', +'''The use of BuildPreReq is deprecated, build dependencies are always required +before a package can be built. Use plain BuildRequires instead.''', ) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/rpmlint/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 20 Jun 2005 18:03:01 -0000 1.8 +++ .cvsignore 11 Aug 2005 19:32:46 -0000 1.9 @@ -1 +1 @@ -rpmlint-0.70.tar.bz2 +rpmlint-0.71.tar.bz2 Index: rpmlint-fedora-config =================================================================== RCS file: /cvs/extras/rpms/rpmlint/devel/rpmlint-fedora-config,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- rpmlint-fedora-config 20 Jun 2005 18:03:05 -0000 1.7 +++ rpmlint-fedora-config 11 Aug 2005 19:32:46 -0000 1.8 @@ -79,6 +79,7 @@ addFilter("W: .* source-or-patch-not-[bg]zipped .*") addFilter("E: .* lib-package-without-%mklibname") addFilter("E: .* no-dependency-on (perl|python)-base.*") +addFilter("E: .* no-dependency-on locales-.*") addFilter("W: .* (python|perl5)-naming-policy-not-applied.*") addFilter("W: .* invalid-(distribution|vendor) .*") addFilter("E: .* no-(packager-tag|signature)") rpmlint-initvars.patch: Index: rpmlint-initvars.patch =================================================================== RCS file: /cvs/extras/rpms/rpmlint/devel/rpmlint-initvars.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- rpmlint-initvars.patch 11 Jul 2005 18:22:30 -0000 1.1 +++ rpmlint-initvars.patch 11 Aug 2005 19:32:46 -0000 1.2 @@ -1,19 +1,5 @@ -Index: InitScriptCheck.py -=================================================================== -RCS file: /cooker/soft/rpmlint/InitScriptCheck.py,v -retrieving revision 1.14 -diff -u -r1.14 InitScriptCheck.py ---- InitScriptCheck.py 15 Apr 2005 20:01:46 -0000 1.14 -+++ InitScriptCheck.py 6 Jul 2005 14:19:22 -0000 -@@ -17,7 +17,7 @@ - - rc_regex=re.compile('^/etc(/rc.d)?/init.d/') - chkconfig_content_regex=re.compile('# +chkconfig: +([-0-9]+) +[-0-9]+ +[-0-9]+', re.MULTILINE) --subsys_regex=re.compile('/var/lock/subsys/([^/\n ]+)', re.MULTILINE) -+subsys_regex=re.compile('/var/lock/subsys/([^/"\'\n ]+)', re.MULTILINE) - chkconfig_regex=re.compile('^[^#]*(chkconfig|add-service|del-service)', re.MULTILINE) - status_regex=re.compile('^[^#]*status', re.MULTILINE) - reload_regex=re.compile('^[^#]*reload', re.MULTILINE) +--- InitScriptCheck.py 10 Aug 2005 01:51:34 -0000 1.15 ++++ InitScriptCheck.py 10 Aug 2005 13:12:39 -0000 @@ -86,7 +86,7 @@ error=1 if name[0] == '$': Index: rpmlint.spec =================================================================== RCS file: /cvs/extras/rpms/rpmlint/devel/rpmlint.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- rpmlint.spec 11 Jul 2005 18:22:30 -0000 1.15 +++ rpmlint.spec 11 Aug 2005 19:32:46 -0000 1.16 @@ -1,6 +1,6 @@ Name: rpmlint -Version: 0.70 -Release: 4%{?dist} +Version: 0.71 +Release: 1%{?dist} Summary: Tool for checking common errors in RPM packages Group: Development/Tools @@ -9,10 +9,11 @@ Source0: http://people.mandriva.com/~flepied/projects/rpmlint/dist/%{name}-%{version}.tar.bz2 Source1: %{name}-fedora-config Patch0: %{name}-svcdefault.patch -Patch1: %{name}-confmsg.patch +Patch1: %{name}-prereq.patch Patch2: %{name}-disttag.patch Patch3: %{name}-initvars.patch Patch4: %{name}-execs.patch +Patch5: %{name}-perl-bs.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -35,6 +36,7 @@ %patch2 %patch3 %patch4 +%patch5 sed -i -e 's|/etc/httpd/webapps\.d|%{_sysconfdir}/httpd/conf.d|' \ FilesCheck.py I18NCheck.py for f in AUTHORS ChangeLog ; do @@ -86,6 +88,13 @@ %changelog +* Wed Aug 10 2005 Ville Skytt?? - 0.71-1 +- 0.71, confmsg patch and bits from initvars patch applied upstream. +- Filter out Mandriva-specific errors about missing locales-* deps (#165457). +- Patch to not warn about non-empty *.bs (in Perl packages). +- Patch to clarify PreReq explanation, make it a warning instead of an error. +- Patch to warn about use of BuildPreReq. + * Thu Jul 7 2005 Ville Skytt?? - 0.70-4 - Fix false "positives" from libtool archives confused as scripts, non-executable scripts installed in docs, FE disttags, unsuccessfully Index: sources =================================================================== RCS file: /cvs/extras/rpms/rpmlint/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 20 Jun 2005 18:03:08 -0000 1.8 +++ sources 11 Aug 2005 19:32:46 -0000 1.9 @@ -1 +1 @@ -0457f6d88c6b25fe3cb31503249a6909 rpmlint-0.70.tar.bz2 +9e7645ee79bfc75540c885f05dca0751 rpmlint-0.71.tar.bz2 --- rpmlint-confmsg.patch DELETED --- From fedora-extras-commits at redhat.com Thu Aug 11 19:32:34 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 11 Aug 2005 15:32:34 -0400 Subject: extras-buildsys ChangeLog,1.95,1.96 plague.spec,1.23,1.24 Message-ID: <200508111933.j7BJX4L4010835@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10667 Modified Files: ChangeLog plague.spec Log Message: 2005-08-11 Dan Williams * plague.spec - Clean up to Fedora Extras standards in preparation for package submission * builder/builder.py - Don't ignore mock output during the 'cleanup' stage - Make the process() function less byzantine by moving each step to a separate function and using getattr() to call them, like in PackageJob.py on the server * www/* - Clean up error handling so it actually works all the time intead of returning Error 500 Internal Server Error when, for example, the build server isn't running Patch from Ville Skytt?? * www/template/head.psp www/indiv.psp - Use HTTP GET instead of POST to stop nags about form data resubmission Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.95 retrieving revision 1.96 diff -u -r1.95 -r1.96 --- ChangeLog 8 Aug 2005 19:51:33 -0000 1.95 +++ ChangeLog 11 Aug 2005 19:32:31 -0000 1.96 @@ -1,3 +1,24 @@ +2005-08-11 Dan Williams + + * plague.spec + - Clean up to Fedora Extras standards in preparation for package submission + + * builder/builder.py + - Don't ignore mock output during the 'cleanup' stage + - Make the process() function less byzantine by moving each step to a + separate function and using getattr() to call them, like in + PackageJob.py on the server + + * www/* + - Clean up error handling so it actually works all the time intead of + returning Error 500 Internal Server Error when, for example, the + build server isn't running + + Patch from Ville Skytt?? + * www/template/head.psp + www/indiv.psp + - Use HTTP GET instead of POST to stop nags about form data resubmission + 2005-08-08 Dan Williams * Tag plague-0_3_RELEASE Index: plague.spec =================================================================== RCS file: /cvs/fedora/extras-buildsys/plague.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- plague.spec 9 Aug 2005 03:06:32 -0000 1.23 +++ plague.spec 11 Aug 2005 19:32:32 -0000 1.24 @@ -2,14 +2,14 @@ Summary: Distributed build system for RPMs Name: plague -Version: 0.3 +Version: 0.3.1 Release: 1 License: GPL Group: Development/Tools Source: http://people.redhat.com/dcbw/plague/%{name}-%{version}.tar.bz2 URL: http://people.redhat.com/dcbw/plague -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -Requires: python-sqlite, pyOpenSSL, createrepo +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Requires: python-sqlite, createrepo Requires: %{name}-common = %{version}-%{release} Requires(post): /sbin/chkconfig Requires(post): /sbin/service @@ -34,8 +34,7 @@ Summary: Builder daemon for Plague builder slaves Group: Development/Tools Requires: %{name}-common = %{version}-%{release} -Requires: yum >= 2.2.1 -Requires: mock >= 0.3, pyOpenSSL +Requires: yum >= 2.2.1, mock >= 0.3 Requires(post): /sbin/chkconfig Requires(post): /sbin/service Requires(preun): /sbin/chkconfig @@ -49,7 +48,6 @@ Summary: Package queueing client for the Plague build system Group: Development/Tools Requires: %{name}-common = %{version}-%{release} -Requires: pyOpenSSL %description client Client program for enqueueing package builds and interrogating the build system. @@ -59,7 +57,6 @@ Summary: Utility programs for the Plague build system Group: Development/Tools Requires: %{name}-common = %{version}-%{release} -Requires: pyOpenSSL %description utils This package includes user utilities for the Plague build system, including @@ -149,6 +146,14 @@ %changelog +* Thu Aug 11 2005 Dan Williams 0.3.1-1 +- Version 0.3.1 + o Clean up web interface error handling, catches more errors + o Clean up builder code, hopefully deal with block mock processes waiting + to write to stderr + o Use HTTP GET rather than POST for web forms, more back/forward/reload + friendly (Ville Skytt??) + * Mon Aug 8 2005 Dan Williams 0.3-1 - Version 0.3 From fedora-extras-commits at redhat.com Thu Aug 11 19:32:34 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 11 Aug 2005 15:32:34 -0400 Subject: extras-buildsys/builder builder.py,1.30,1.31 Message-ID: <200508111933.j7BJX5HN010838@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/builder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10667/builder Modified Files: builder.py Log Message: 2005-08-11 Dan Williams * plague.spec - Clean up to Fedora Extras standards in preparation for package submission * builder/builder.py - Don't ignore mock output during the 'cleanup' stage - Make the process() function less byzantine by moving each step to a separate function and using getattr() to call them, like in PackageJob.py on the server * www/* - Clean up error handling so it actually works all the time intead of returning Error 500 Internal Server Error when, for example, the build server isn't running Patch from Ville Skytt?? * www/template/head.psp www/indiv.psp - Use HTTP GET instead of POST to stop nags about form data resubmission Index: builder.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/builder/builder.py,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- builder.py 8 Aug 2005 02:54:10 -0000 1.30 +++ builder.py 11 Aug 2005 19:32:32 -0000 1.31 @@ -280,9 +280,8 @@ return contents def _grab_mock_output(self): - # We don't care about output from the 'cleanup' stage - if self._pobj and self._status != 'cleanup': - # Grab any mock output and write it to a log + """ Grab mock output and write it to a log """ + if self._pobj: string = ' ' while len(string) > 0: try: @@ -293,9 +292,11 @@ else: self.log("Error reading mock output: %s\n" % e) else: - self._log_fd.write(string) - self._log_fd.flush() - os.fsync(self._log_fd.fileno()) + # We don't care about output from the 'cleanup' stage + if self._status != 'cleanup': + self._log_fd.write(string) + self._log_fd.flush() + os.fsync(self._log_fd.fileno()) def _mock_done(self): # Ensure child mock is reaped @@ -317,61 +318,72 @@ self._log_fd.close() self._log_fd = None + def _status_init(self): + pass + + def _status_downloading(self): + pass + + def _status_downloaded(self): + # We can't start doing anything with yum until the build + # server tells us the repo is unlocked. + if not self._repo_locked: + self._build() + else: + # Only show this message once + if not self._repo_locked_msg: + self.log("Waiting for repository to unlock before starting the build...\n") + self._repo_locked_msg = True + + def _status_prepping(self): + if not self._mock_config and self._mock_is_prepping(): + self._mock_config = self._read_mock_config() + if not self._mock_using_repo(): + self._status = 'building' + + def _status_building(self): + exit_status = self._pobj.poll() + if exit_status == 0: + # mock completed successfully + if self._status != 'building': + self.log("Bad job end status %s encountered!" % self._status) + self._done_status = 'done' + self._cleanup() + elif exit_status > 0: + # mock exited with an error + self._done_status = 'failed' + self._cleanup() + + def _status_cleanup(self): + exit_status = self._pobj.poll() + if exit_status >= 0: + # Mock exited + self._status = self._done_status + if self._mock_config and self._mock_config.has_key('rootdir') and self._mock_config.has_key('statedir'): + # Kill the entire job dir, not just the rootdir + job_dir = os.path.normpath(self._mock_config['rootdir'] + "/../") + job_dir2 = os.path.normpath(self._mock_config['statedir'] + "/../") + print job_dir, job_dir2 + + # Be a little paranoid about randomly removing an entire directory. + # Compare the rootdir's parent to the statedir's parent and remove the + # parent only if they match. + if job_dir == job_dir2: + shutil.rmtree(job_dir, ignore_errors=True) + else: + shutil.rmtree(self._mock_config['rootdir'], ignore_errors=True) + def process(self): if self.is_done_status(): return - if self._status == 'downloading': - pass - elif self._status == 'downloaded': - # We can't start doing anything with yum until the build - # server tells us the repo is unlocked. - if not self._repo_locked: - self._build() - else: - # Only show this message once - if not self._repo_locked_msg: - self.log("Waiting for repository to unlock before starting the build...\n") - self._repo_locked_msg = True - elif self._status == 'prepping': - if not self._mock_config and self._mock_is_prepping(): - self._mock_config = self._read_mock_config() - if not self._mock_using_repo(): - self._status = 'building' - elif self._status == 'building': - exit_status = self._pobj.poll() - if exit_status == 0: - # mock completed successfully - if self._status != 'building': - self.log("Bad job end status %s encountered!" % self._status) - self._done_status = 'done' - self._cleanup() - elif exit_status > 0: - # mock exited with an error - self._done_status = 'failed' - self._cleanup() - else: - # mock still running - pass - elif self._status == 'cleanup': - exit_status = self._pobj.poll() - if exit_status >= 0: - # We ignore mock errors when cleaning the buildroot - self._status = self._done_status - if self._mock_config and self._mock_config.has_key('rootdir') and self._mock_config.has_key('statedir'): - # Kill the entire job dir, not just the rootdir - job_dir = os.path.normpath(self._mock_config['rootdir'] + "/../") - job_dir2 = os.path.normpath(self._mock_config['statedir'] + "/../") - # Be a little paranoid about randomly removing an entire directory. - # Compare the rootdir's parent to the statedir's parent and remove the - # parent only if they match. - if job_dir == job_dir2: - shutil.rmtree(job_dir, ignore_errors=True) - else: - shutil.rmtree(self._mock_config['rootdir'], ignore_errors=True) - else: - # mock still running - pass + # Execute operations for our current status + try: + func = getattr(self, "_status_%s" % self._status) + func() + except AttributeError: + self.log("ERROR: internal builder inconsistency, didn't recognize status '%s'." % self._status) + self._status = 'failed' self._grab_mock_output() if self.is_done_status(): From fedora-extras-commits at redhat.com Thu Aug 11 19:35:58 2005 From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel)) Date: Thu, 11 Aug 2005 15:35:58 -0400 Subject: rpms/libnjb - New directory Message-ID: <200508111935.j7BJZw4u010957@cvs-int.fedora.redhat.com> Author: snirkel Update of /cvs/extras/rpms/libnjb In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10937/libnjb Log Message: Directory /cvs/extras/rpms/libnjb added to the repository From fedora-extras-commits at redhat.com Thu Aug 11 19:35:58 2005 From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel)) Date: Thu, 11 Aug 2005 15:35:58 -0400 Subject: rpms/libnjb/devel - New directory Message-ID: <200508111935.j7BJZwZQ010962@cvs-int.fedora.redhat.com> Author: snirkel Update of /cvs/extras/rpms/libnjb/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10937/libnjb/devel Log Message: Directory /cvs/extras/rpms/libnjb/devel added to the repository From fedora-extras-commits at redhat.com Thu Aug 11 19:36:10 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 11 Aug 2005 15:36:10 -0400 Subject: extras-buildsys ChangeLog,1.96,1.97 Message-ID: <200508111936.j7BJaAUs010998@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10974 Modified Files: ChangeLog Log Message: 2005-08-11 Dan Williams * Tag plague-0_3_1_RELEASE Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.96 retrieving revision 1.97 diff -u -r1.96 -r1.97 --- ChangeLog 11 Aug 2005 19:32:31 -0000 1.96 +++ ChangeLog 11 Aug 2005 19:36:08 -0000 1.97 @@ -1,5 +1,9 @@ 2005-08-11 Dan Williams + * Tag plague-0_3_1_RELEASE + +2005-08-11 Dan Williams + * plague.spec - Clean up to Fedora Extras standards in preparation for package submission From fedora-extras-commits at redhat.com Thu Aug 11 19:36:17 2005 From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel)) Date: Thu, 11 Aug 2005 15:36:17 -0400 Subject: rpms/libnjb Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200508111936.j7BJaHTd011038@cvs-int.fedora.redhat.com> Author: snirkel Update of /cvs/extras/rpms/libnjb In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11005 Added Files: Makefile import.log Log Message: Setup of module libnjb --- NEW FILE Makefile --- # Top level Makefile for module libnjb all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Thu Aug 11 19:36:17 2005 From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel)) Date: Thu, 11 Aug 2005 15:36:17 -0400 Subject: rpms/libnjb/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200508111936.j7BJaHCe011043@cvs-int.fedora.redhat.com> Author: snirkel Update of /cvs/extras/rpms/libnjb/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11005/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module libnjb --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Thu Aug 11 19:36:30 2005 From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs)) Date: Thu, 11 Aug 2005 15:36:30 -0400 Subject: rpms/denyhosts/devel denyhosts-0.9.8-daemon-control.patch, NONE, 1.1 denyhosts-0.9.8-setup.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 denyhosts.cron, 1.3, 1.4 denyhosts.spec, 1.5, 1.6 sources, 1.4, 1.5 denyhosts-0.8.0-setup.patch, 1.1, NONE Message-ID: <200508111936.j7BJaUmr011090@cvs-int.fedora.redhat.com> Author: tibbs Update of /cvs/extras/rpms/denyhosts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11062 Modified Files: .cvsignore denyhosts.cron denyhosts.spec sources Added Files: denyhosts-0.9.8-daemon-control.patch denyhosts-0.9.8-setup.patch Removed Files: denyhosts-0.8.0-setup.patch Log Message: * Fri Aug 5 2005 Jason L Tibbitts III - 0.9.8-1 - Update to 0.9.8 denyhosts-0.9.8-daemon-control.patch: --- NEW FILE denyhosts-0.9.8-daemon-control.patch --- --- daemon-control-dist.orig 2005-08-05 13:45:22.636374381 -0500 +++ daemon-control-dist 2005-08-05 13:45:39.629721902 -0500 @@ -7,7 +7,7 @@ DENYHOSTS_BIN = "/usr/bin/denyhosts.py" DENYHOSTS_LOCK = "/var/lock/subsys/denyhosts" -DENYHOSTS_CFG = "/usr/share/denyhosts/denyhosts.cfg" +DENYHOSTS_CFG = "/etc/denyhosts.cfg" ############################################### denyhosts-0.9.8-setup.patch: --- NEW FILE denyhosts-0.9.8-setup.patch --- --- setup.py.orig 2005-07-22 17:39:17.000000000 -0500 +++ setup.py 2005-08-04 13:06:14.893095036 -0500 @@ -21,13 +21,13 @@ package_dir={'DenyHosts': 'DenyHosts'}, packages=["DenyHosts"], ##py_modules=["denyhosts_version"], - data_files=[(libpath, glob("denyhosts.cfg-dist")), - (libpath, glob("denyhosts-daemon-initscript")), - (libpath, glob("setup.py")), - (libpath, glob("daemon-control-dist")), - (libpath, glob("CHANGELOG.txt")), - (libpath, glob("README.txt")), - (libpath, glob("LICENSE.txt"))], +# data_files=[(libpath, glob("denyhosts.cfg-dist")), +# (libpath, glob("denyhosts-daemon-initscript")), +# (libpath, glob("setup.py")), +# (libpath, glob("daemon-control-dist")), +# (libpath, glob("CHANGELOG.txt")), +# (libpath, glob("README.txt")), +# (libpath, glob("LICENSE.txt"))], license="GPL", ##extra_path='denyhosts', long_description=""" Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/denyhosts/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 21 Jul 2005 16:43:26 -0000 1.4 +++ .cvsignore 11 Aug 2005 19:36:28 -0000 1.5 @@ -1 +1 @@ -DenyHosts-0.8.0.tar.gz +DenyHosts-0.9.8.tar.gz Index: denyhosts.cron =================================================================== RCS file: /cvs/extras/rpms/denyhosts/devel/denyhosts.cron,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- denyhosts.cron 22 Jul 2005 16:27:04 -0000 1.3 +++ denyhosts.cron 11 Aug 2005 19:36:28 -0000 1.4 @@ -1,10 +1,12 @@ -# This defaults to running once every ten minutes, but if your host is being -# heavily attacked then it is reasonable to make it run as frequently as once -# every minute. DenyHosts runs quickly once it has initially processed your -# logs and should not take a significant amount of CPU time. -*/10 * * * * root [ -f /var/lock/subsys/denyhosts.init ] && /usr/bin/denyhosts.py -c /etc/denyhosts.conf +# The Fedora default is to use daemon mode, but if you wish to have +# denyhosts run periodically, you can uncomment the appropriate two lines +# edit /etc/sysconfig/denyhosts. (You will also have to start the "service" +# and set it to run at boot if necessary.) +# +# Run denyhosts occasionally; adjust the time span to your liking +#*/10 * * * * root [ -f /var/lock/subsys/denyhosts.init ] && /usr/bin/denyhosts.py -c /etc/denyhosts.conf # # Automatically purge old entries early in the morning. Note that you must # edit /etc/denyhosts.conf and set PURGE_DENY to something reasonable, as the # default value purge time is set very high. -0 5 * * * root [ -f /var/lock/subsys/denyhosts.init ] && /usr/bin/denyhosts.py -c /etc/denyhosts.conf --purge +#0 5 * * * root [ -f /var/lock/subsys/denyhosts.init ] && /usr/bin/denyhosts.py -c /etc/denyhosts.conf --purge Index: denyhosts.spec =================================================================== RCS file: /cvs/extras/rpms/denyhosts/devel/denyhosts.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- denyhosts.spec 22 Jul 2005 16:27:04 -0000 1.5 +++ denyhosts.spec 11 Aug 2005 19:36:28 -0000 1.6 @@ -1,6 +1,6 @@ Name: denyhosts -Version: 0.8.0 -Release: 3%{?dist} +Version: 0.9.8 +Release: 0%{?dist} Summary: A script to help thwart ssh server attacks Group: Applications/System @@ -12,7 +12,8 @@ Source3: denyhosts-allowed-hosts Source4: README.fedora Patch0: denyhosts-0.8.0-config.patch -Patch1: denyhosts-0.8.0-setup.patch +Patch1: denyhosts-0.9.8-setup.patch +Patch2: denyhosts-0.9.8-daemon-control.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArchitectures: noarch @@ -32,6 +33,7 @@ %setup -q -n DenyHosts-%{version} %patch0 -p0 %patch1 -p0 +%patch2 -p0 cp %{SOURCE4} . @@ -100,6 +102,9 @@ %changelog +* Fri Aug 5 2005 Jason L Tibbitts III - 0.9.8-1 +- Update to 0.9.8 + * Fri Jul 22 2005 Jason L Tibbitts III - 0.8.0-3 - Rename the lockfile used by the initscript/cron setup because DenyHosts now has its own internal locking and they chose the exact Index: sources =================================================================== RCS file: /cvs/extras/rpms/denyhosts/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 21 Jul 2005 16:43:26 -0000 1.4 +++ sources 11 Aug 2005 19:36:28 -0000 1.5 @@ -1 +1 @@ -951bfb51b045f12281d114594115878a DenyHosts-0.8.0.tar.gz +337128544fadfc428746de5ad28bec19 DenyHosts-0.9.8.tar.gz --- denyhosts-0.8.0-setup.patch DELETED --- From fedora-extras-commits at redhat.com Thu Aug 11 19:37:46 2005 From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel)) Date: Thu, 11 Aug 2005 15:37:46 -0400 Subject: rpms/libnjb/devel libnjb.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200508111937.j7BJbkxB011144@cvs-int.fedora.redhat.com> Author: snirkel Update of /cvs/extras/rpms/libnjb/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11114/devel Modified Files: .cvsignore sources Added Files: libnjb.spec Log Message: auto-import libnjb-2.2.1-7 on branch devel from libnjb-2.2.1-7.src.rpm --- NEW FILE libnjb.spec --- # SPEC file for libnjb, primary target is the Fedora Extras # RPM repository. # # For testing a certain distribution, rely on macros that # you define in your ".rpmmacros" file. For example, for # test building a Fedora Extras package, define the following # two macros in .rpmmacros: # # %dist .fc4 # %fedora 4 # Name: libnjb Version: 2.2.1 Release: 7%{?dist} Summary: A software library for talking to the Creative Nomad Jukeboxes and Dell DJs URL: http://libnjb.sourceforge.net/ Group: System Environment/Libraries Source: http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) License: BSD Requires: hotplug BuildRequires: libusb-devel BuildRequires: zlib-devel BuildRequires: ncurses-devel BuildRequires: doxygen %description This package provides a software library for communicating with the Creative Nomad Jukebox line of MP3 players. %package examples Summary: Example programs for libnjb Group: Applications/Multimedia Requires: %{name} = %{version}-%{release} %description examples This package provides example programs for communicating with the Creative Nomad Jukebox and Dell DJ line of MP3 players. %package devel Summary: Development files for libnjb Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} # doc subpackage removed in newer releases, and included # in the -devel package. Provides: libnjb-doc Obsoletes: libnjb-doc <= 2.2-1 Requires: libusb-devel Requires: zlib-devel Requires: ncurses-devel %description devel This package provides development files for the libnjb library for Creative Nomad/Zen/Jukebox and Dell DJ line of MP3 players. %prep %setup -q %build %configure --disable-static --program-prefix=njb- make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT %makeinstall # Remove libtool archive remnant rm -f $RPM_BUILD_ROOT%{_libdir}/libnjb.la # Install hotplug scripts so they are up to date mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/hotplug/usb install -p -m 755 nomadjukebox $RPM_BUILD_ROOT%{_sysconfdir}/hotplug/usb install -p -m 644 nomad.usermap $RPM_BUILD_ROOT%{_sysconfdir}/hotplug/usb # Copy documentation to a good place install -p -m 644 AUTHORS ChangeLog ChangeLog-old FAQ \ INSTALL LICENSE HACKING $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-, root, root) %{_libdir}/*.so.* %config(noreplace) %{_sysconfdir}/hotplug/usb/* %files examples %defattr(-, root, root) %{_bindir}/* %files devel %defattr(-, root, root) %{_libdir}/*.so %dir %{_docdir}/%{name}-%{version} %{_docdir}/%{name}-%{version}/* %{_includedir}/*.h %{_libdir}/pkgconfig/*.pc %changelog * Wed Aug 11 2005 Linus Walleij 2.2.1-7 - Forgot one extraneous docdir, removing it. * Wed Aug 10 2005 Linus Walleij 2.2.1-6 - Even more fixes after more feedback from Michael. * Tue Aug 9 2005 Linus Walleij 2.2.1-5 - More fixes after feedback from Michael Schwendt. * Sun Aug 7 2005 Linus Walleij 2.2.1-4 - More fixes after feedback from Ralf Corsepius. * Sat Aug 6 2005 Linus Walleij 2.2.1-3 - Remove unnecessary macros. * Mon Aug 1 2005 Linus Walleij 2.2.1-2 - More work on Fedora compliance. * Sat Jul 30 2005 Linus Walleij 2.2.1-1 - Fedora extrafication, created a -devel package. * Mon Jun 27 2005 Linus Walleij 2.2-1 - Fixed a lot of RPM modernization for 2.2 release * Mon May 23 2005 Linus Walleij 2.1.2-1 - Interrim 2.1.2 release. Fixed program prefix. * Fri May 13 2005 Linus Walleij 2.1.1-1 - Interrim 2.1.1 release. Fixed library versioning. * Tue May 10 2005 Linus Walleij 2.1-1 - Final 2.1 release. Removed the checkings for old hotplug versions. * Fri Mar 4 2005 Ed Welch 2.0-1mdk - Mandrake rpm for final 2.0 release. * Wed Mar 2 2005 Linus Walleij 2.0-1 - Final 2.0 release. * Mon Feb 21 2005 Linus Walleij 2.0-0.RC1 - Release candidate 1 for 2.0. * Tue Feb 8 2005 Linus Walleij 2.0-0.20050208 - Third CVS snapshot for the pre-2.0 series. * Thu Jan 20 2005 Linus Walleij 2.0-0.20050120 - Second CVS snapshot for the pre-2.0 series. * Mon Jan 10 2005 Linus Walleij 2.0-0.20050110 - A CVS snapshot for the first pre-2.0 series. * Tue Nov 30 2004 Linus Walleij 1.3-0.20041130 - A CVS snapshot for the new API and all. * Wed Sep 29 2004 Linus Walleij 1.2-0.20040929 - A CVS snapshot, much needed, which also works * Fri Sep 24 2004 Linus Walleij 1.2-0.20040924 - A CVS snapshot, much needed. * Tue May 25 2004 Linus Walleij 1.1-1 - Added hook to redistribute pkgconfig module * Wed Apr 25 2004 Linus Walleij 1.1-1 - Final 1.1 release! * Wed Apr 21 2004 Linus Walleij 1.0.2-0.20040421 - A new CVS snapshot. * Fri Apr 9 2004 Linus Walleij 1.0.2-0.20040409 - A new CVS snapshot. * Sun Feb 22 2004 Linus Walleij 1.0.2-0.20040222 - A new CVS snapshot. Adressing several bugs. * Fri Jan 9 2004 Linus Walleij 1.0.1-0.20040109 - A new CVS release adressing bugs, better numbering scheme * Tue Dec 9 2003 Linus Walleij 1.0.1-1 - Addressed some issues in 1.0 * Tue Dec 9 2003 Linus Walleij 1.0-2 - Second package for samples * Sat Dec 6 2003 Linus Walleij 1.0-1 - Final 1.0 release * Sun Aug 17 2003 Linus Walleij 1.1.0b-6 - Seventh RPM * Sun Aug 17 2003 Linus Walleij 1.1.0b-5 - Sixth RPM * Thu Jul 31 2003 Linus Walleij 1.1.0b-4 - Fifth RPM * Wed Jun 11 2003 Linus Walleij 1.1.0b-3 - Fourth RPM. * Mon Apr 21 2003 Linus Walleij 1.1.0b-2 - Third RPM, big improvements in hotplug installation. * Sun Mar 30 2003 Linus Walleij 1.1.0b - Second CVS RPM * Thu Dec 26 2002 Dwight Engen 0.9.1 - First RPM'ed Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libnjb/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 11 Aug 2005 19:36:15 -0000 1.1 +++ .cvsignore 11 Aug 2005 19:37:44 -0000 1.2 @@ -0,0 +1 @@ +libnjb-2.2.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/libnjb/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 11 Aug 2005 19:36:15 -0000 1.1 +++ sources 11 Aug 2005 19:37:44 -0000 1.2 @@ -0,0 +1 @@ +ae7974f5a802072f95742e1d59132152 libnjb-2.2.1.tar.gz From fedora-extras-commits at redhat.com Thu Aug 11 19:37:46 2005 From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel)) Date: Thu, 11 Aug 2005 15:37:46 -0400 Subject: rpms/libnjb import.log,1.1,1.2 Message-ID: <200508111938.j7BJcGLk011150@cvs-int.fedora.redhat.com> Author: snirkel Update of /cvs/extras/rpms/libnjb In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11114 Modified Files: import.log Log Message: auto-import libnjb-2.2.1-7 on branch devel from libnjb-2.2.1-7.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/libnjb/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 11 Aug 2005 19:36:14 -0000 1.1 +++ import.log 11 Aug 2005 19:37:44 -0000 1.2 @@ -0,0 +1 @@ +libnjb-2_2_1-7:HEAD:libnjb-2.2.1-7.src.rpm:1123789056 From fedora-extras-commits at redhat.com Thu Aug 11 19:52:07 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 11 Aug 2005 15:52:07 -0400 Subject: rpms/plague - New directory Message-ID: <200508111952.j7BJq7A3011266@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/extras/rpms/plague In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11246/plague Log Message: Directory /cvs/extras/rpms/plague added to the repository From fedora-extras-commits at redhat.com Thu Aug 11 19:52:08 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 11 Aug 2005 15:52:08 -0400 Subject: rpms/plague/devel - New directory Message-ID: <200508111952.j7BJq8xp011271@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/extras/rpms/plague/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11246/plague/devel Log Message: Directory /cvs/extras/rpms/plague/devel added to the repository From fedora-extras-commits at redhat.com Thu Aug 11 19:52:29 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 11 Aug 2005 15:52:29 -0400 Subject: rpms/plague Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200508111952.j7BJqTlR011318@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/extras/rpms/plague In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11291 Added Files: Makefile import.log Log Message: Setup of module plague --- NEW FILE Makefile --- # Top level Makefile for module plague all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Thu Aug 11 19:52:30 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 11 Aug 2005 15:52:30 -0400 Subject: rpms/plague/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200508111952.j7BJqU9U011323@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/extras/rpms/plague/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11291/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module plague --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Thu Aug 11 19:53:05 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 11 Aug 2005 15:53:05 -0400 Subject: rpms/plague import.log,1.1,1.2 Message-ID: <200508111953.j7BJrZbS011390@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/extras/rpms/plague In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11355 Modified Files: import.log Log Message: auto-import plague-0.3.1-1 on branch devel from plague-0.3.1-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/plague/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 11 Aug 2005 19:52:27 -0000 1.1 +++ import.log 11 Aug 2005 19:53:03 -0000 1.2 @@ -0,0 +1 @@ +plague-0_3_1-1:HEAD:plague-0.3.1-1.src.rpm:1123789971 From fedora-extras-commits at redhat.com Thu Aug 11 19:53:06 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 11 Aug 2005 15:53:06 -0400 Subject: rpms/plague/devel plague.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200508111953.j7BJr6iV011385@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/extras/rpms/plague/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11355/devel Modified Files: .cvsignore sources Added Files: plague.spec Log Message: auto-import plague-0.3.1-1 on branch devel from plague-0.3.1-1.src.rpm --- NEW FILE plague.spec --- BuildArch: noarch Summary: Distributed build system for RPMs Name: plague Version: 0.3.1 Release: 1 License: GPL Group: Development/Tools Source: http://people.redhat.com/dcbw/plague/%{name}-%{version}.tar.bz2 URL: http://people.redhat.com/dcbw/plague BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: python-sqlite, createrepo Requires: %{name}-common = %{version}-%{release} Requires(post): /sbin/chkconfig Requires(post): /sbin/service Requires(preun): /sbin/chkconfig Requires(preun): /sbin/service %description The Plague build system is a client/server distributed build system for building RPM packages. This package provides the plague server. %package common Summary: Common resources for the Plague build system Group: Development/Tools Requires: pyOpenSSL %description common This package includes the common Python module that all Plague services require. %package builder Summary: Builder daemon for Plague builder slaves Group: Development/Tools Requires: %{name}-common = %{version}-%{release} Requires: yum >= 2.2.1, mock >= 0.3 Requires(post): /sbin/chkconfig Requires(post): /sbin/service Requires(preun): /sbin/chkconfig Requires(preun): /sbin/service Requires(pre): /usr/sbin/useradd %description builder The Plague builder does the actual RPM package building on slave machines. %package client Summary: Package queueing client for the Plague build system Group: Development/Tools Requires: %{name}-common = %{version}-%{release} %description client Client program for enqueueing package builds and interrogating the build system. %package utils Summary: Utility programs for the Plague build system Group: Development/Tools Requires: %{name}-common = %{version}-%{release} %description utils This package includes user utilities for the Plague build system, including the interface to the build server. %prep %setup -q %build make %install rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install install -D -m 0644 etc/plague-builder.config $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}-builder install -D -m 0755 etc/plague-builder.init $RPM_BUILD_ROOT%{_initrddir}/%{name}-builder install -D -m 0644 etc/plague-server.config $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}-server install -D -m 0755 etc/plague-server.init $RPM_BUILD_ROOT%{_initrddir}/%{name}-server mkdir -p $RPM_BUILD_ROOT/srv/plague_builder %clean rm -rf $RPM_BUILD_ROOT %post /sbin/chkconfig --add plague-server /sbin/service plague-server condrestart >> /dev/null || : %preun if [ $1 = 0 ]; then /sbin/service plague-server stop &> /dev/null /sbin/chkconfig --del plague-server fi %pre builder /usr/sbin/useradd -G mock -s /sbin/nologin -M -r -d /srv/plague_builder plague-builder 2>/dev/null || : %post builder /sbin/chkconfig --add plague-builder /sbin/service plague-builder condrestart >> /dev/null || : %preun builder if [ $1 = 0 ]; then /sbin/service plague-builder stop &> /dev/null /sbin/chkconfig --del plague-builder fi %files %defattr(-, root, root) %doc README ChangeLog %{_bindir}/%{name}-server %dir %{_datadir}/%{name}/server %{_datadir}/%{name}/server/*.py* %dir %{_sysconfdir}/%{name}/server %config(noreplace) %{_sysconfdir}/%{name}/server/CONFIG.py* %dir %{_sysconfdir}/%{name}/server/certs %dir %{_sysconfdir}/%{name}/server/addl_pkg_arches %{_sysconfdir}/%{name}/server/addl_pkg_arches/* %config(noreplace) %{_sysconfdir}/sysconfig/%{name}-server %{_initrddir}/%{name}-server %files common %defattr(-, root, root) /usr/lib/python?.?/site-packages/plague/*.py* %files builder %defattr(-, root, root) %{_bindir}/%{name}-builder %dir %{_sysconfdir}/%{name}/builder %config(noreplace) %{_sysconfdir}/%{name}/builder/CONFIG.py* %dir %{_sysconfdir}/%{name}/builder/certs %config(noreplace) %{_sysconfdir}/sysconfig/%{name}-builder %{_initrddir}/%{name}-builder %attr(0755, plague-builder, plague-builder) /srv/plague_builder %files client %defattr(-, root, root) %{_bindir}/%{name}-client %files utils %defattr(-, root, root) %{_bindir}/%{name}-user-manager.py* %{_bindir}/%{name}-certhelper.py* %changelog * Thu Aug 11 2005 Dan Williams 0.3.1-1 - Version 0.3.1 o Clean up web interface error handling, catches more errors o Clean up builder code, hopefully deal with block mock processes waiting to write to stderr o Use HTTP GET rather than POST for web forms, more back/forward/reload friendly (Ville Skytt??) * Mon Aug 8 2005 Dan Williams 0.3-1 - Version 0.3 * Sat Jul 16 2005 Dan Williams - Bump version to 0.2 - Grab python files from /usr/lib, not %{_libdir} until the multiarch issues get worked out * Sun Jun 26 2005 Dan Williams - first version/packaging Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/plague/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 11 Aug 2005 19:52:27 -0000 1.1 +++ .cvsignore 11 Aug 2005 19:53:04 -0000 1.2 @@ -0,0 +1 @@ +plague-0.3.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/plague/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 11 Aug 2005 19:52:27 -0000 1.1 +++ sources 11 Aug 2005 19:53:04 -0000 1.2 @@ -0,0 +1 @@ +073067b72452dae4473ed7ff50384ed7 plague-0.3.1.tar.bz2 From fedora-extras-commits at redhat.com Thu Aug 11 20:06:56 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 11 Aug 2005 16:06:56 -0400 Subject: devel/abicheck abicheck.dbfile.FORTIFY_SOURCE, NONE, 1.1 abicheck.spec, 1.11, 1.12 Message-ID: <200508112007.j7BK7Q6f012641@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/devel/abicheck In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12620 Modified Files: abicheck.spec Added Files: abicheck.dbfile.FORTIFY_SOURCE Log Message: * Thu Aug 11 2005 Michael Schwendt - 1.2-7 - Add an override file in %doc which can be specified with option -O to modify the symbol classification for binaries built with _FORTIFY_SOURCE. --- NEW FILE abicheck.dbfile.FORTIFY_SOURCE --- libc.so.6|__chk_fail|public libc.so.6|__fgets_chk|public libc.so.6|__fgets_unlocked_chk|public libc.so.6|__fprintf_chk|public libc.so.6|__getcwd_chk|public libc.so.6|__gets_chk|public libc.so.6|__getwd_chk|public libc.so.6|__memcpy_chk|public libc.so.6|__memmove_chk|public libc.so.6|__mempcpy_chk|public libc.so.6|__memset_chk|public libc.so.6|__pread64_chk|public libc.so.6|__pread_chk|public libc.so.6|__printf_chk|public libc.so.6|__read_chk|public libc.so.6|__readlink_chk|public libc.so.6|__recv_chk|public libc.so.6|__recvfrom_chk|public libc.so.6|__snprintf_chk|public libc.so.6|__sprintf_chk|public libc.so.6|__stack_chk_fail|public libc.so.6|__stpcpy_chk|public libc.so.6|__strcat_chk|public libc.so.6|__strcpy_chk|public libc.so.6|__strncat_chk|public libc.so.6|__strncpy_chk|public libc.so.6|__vfprintf_chk|public libc.so.6|__vprintf_chk|public libc.so.6|__vsnprintf_chk|public libc.so.6|__vsprintf_chk|public Index: abicheck.spec =================================================================== RCS file: /cvs/extras/devel/abicheck/abicheck.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- abicheck.spec 9 May 2005 21:35:49 -0000 1.11 +++ abicheck.spec 11 Aug 2005 20:06:26 -0000 1.12 @@ -3,11 +3,12 @@ Summary: ABI checking tool Name: abicheck Version: 1.2 -Release: 6 +Release: 7 License: LGPL Group: Applications/File URL: http://abicheck.sourceforge.net/ -Source0: %{name}-%{version}.tar.gz +Source0: http://dl.sf.net/abicheck/%{name}-%{version}.tar.gz +Source1: abicheck.dbfile.FORTIFY_SOURCE Patch0: abicheck-1.2-fc3.patch Patch1: abicheck-1.2-test-static.patch Patch2: abicheck-1.2-bindings-fc4.patch @@ -37,8 +38,9 @@ %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_bindir} $RPM_BUILD_ROOT%{_mandir}/man1 -install -m 0755 abicheck $RPM_BUILD_ROOT%{_bindir} -install -m 0644 abicheck.1 $RPM_BUILD_ROOT%{_mandir}/man1 +install -p -m 0755 abicheck $RPM_BUILD_ROOT%{_bindir} +install -p -m 0644 abicheck.1 $RPM_BUILD_ROOT%{_mandir}/man1 +install -p -m 0644 %{SOURCE1} dbfile.FORTIFY_SOURCE %clean @@ -48,11 +50,17 @@ %files %defattr(-,root,root,-) %doc COPYING ChangeLog INTRO README +%doc dbfile.FORTIFY_SOURCE %{_bindir}/abicheck %{_mandir}/man1/abicheck.1* %changelog +* Thu Aug 11 2005 Michael Schwendt - 1.2-7 +- Add an override file in %%doc which can be specified with + option -O to modify the symbol classification for binaries + built with _FORTIFY_SOURCE. + * Mon May 9 2005 Michael Schwendt - 1.2-6 - Disable debuginfo package. From fedora-extras-commits at redhat.com Thu Aug 11 20:20:11 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Thu, 11 Aug 2005 16:20:11 -0400 Subject: rpms/python-numarray - New directory Message-ID: <200508112020.j7BKKBAt012833@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/python-numarray In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12809/python-numarray Log Message: Directory /cvs/extras/rpms/python-numarray added to the repository From fedora-extras-commits at redhat.com Thu Aug 11 20:20:12 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Thu, 11 Aug 2005 16:20:12 -0400 Subject: rpms/python-numarray/devel - New directory Message-ID: <200508112020.j7BKKC4v012838@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/python-numarray/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12809/python-numarray/devel Log Message: Directory /cvs/extras/rpms/python-numarray/devel added to the repository From fedora-extras-commits at redhat.com Thu Aug 11 20:20:19 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Thu, 11 Aug 2005 16:20:19 -0400 Subject: rpms/python-numarray Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200508112020.j7BKKJQl012881@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/python-numarray In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12854 Added Files: Makefile import.log Log Message: Setup of module python-numarray --- NEW FILE Makefile --- # Top level Makefile for module python-numarray all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Thu Aug 11 20:20:20 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Thu, 11 Aug 2005 16:20:20 -0400 Subject: rpms/python-numarray/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200508112020.j7BKKK1D012886@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/python-numarray/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12854/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module python-numarray --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Thu Aug 11 20:20:53 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Thu, 11 Aug 2005 16:20:53 -0400 Subject: rpms/python-numarray import.log,1.1,1.2 Message-ID: <200508112021.j7BKLNQl012953@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/python-numarray In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12918 Modified Files: import.log Log Message: auto-import python-numarray-1.3.3-3 on branch devel from python-numarray-1.3.3-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/python-numarray/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 11 Aug 2005 20:20:17 -0000 1.1 +++ import.log 11 Aug 2005 20:20:51 -0000 1.2 @@ -0,0 +1 @@ +python-numarray-1_3_3-3:HEAD:python-numarray-1.3.3-3.src.rpm:1123791648 From fedora-extras-commits at redhat.com Thu Aug 11 20:20:54 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Thu, 11 Aug 2005 16:20:54 -0400 Subject: rpms/python-numarray/devel python-numarray.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200508112020.j7BKKsCT012948@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/python-numarray/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12918/devel Modified Files: .cvsignore sources Added Files: python-numarray.spec Log Message: auto-import python-numarray-1.3.3-3 on branch devel from python-numarray-1.3.3-3.src.rpm --- NEW FILE python-numarray.spec --- %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %{!?python_siteinc: %define python_siteinc %(%{__python} -c "from distutils.sysconfig import get_python_inc; print get_python_inc()")} Name: python-numarray Version: 1.3.3 Release: 3%{?dist} Summary: Python array manipulation and computational library Group: Development/Languages License: Distributable URL: http://www.stsci.edu/resources/software_hardware/numarray Source0: http://dl.sf.net/numpy/numarray-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") Provides: %{name}-devel = %{version}-%{release} %description Numarray provides array manipulation and computational capabilities similar to those found in IDL, Matlab, or Octave. Using numarray, it is possible to write many efficient numerical data processing applications directly in Python without using any C, C++ or Fortran code (as well as doing such analysis interactively within Python or PyRAF). For algorithms that are not well suited for efficient computation using array facilities it is possible to write C functions (and eventually Fortran) that can read and write numarray arrays that can be called from Python. %prep %setup -q -n numarray-%{version} find -name \*~ | xargs rm -f %build CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build %install rm -rf $RPM_BUILD_ROOT %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT chmod +x $RPM_BUILD_ROOT%{python_sitelib}/numarray/examples/convolve/benchmark.py %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc LICENSE.txt README.txt Doc/* %{python_siteinc}/numarray/ %dir %{python_sitelib}/numarray %{python_sitelib}/numarray/LICENSE.txt %{python_sitelib}/numarray/*.py %{python_sitelib}/numarray/*.pyc %{python_sitelib}/numarray/*.so %{python_sitelib}/numarray/testdata.fits %ghost %{python_sitelib}/numarray/*.pyo %dir %{python_sitelib}/numarray/convolve %{python_sitelib}/numarray/convolve/*.py %{python_sitelib}/numarray/convolve/*.pyc %{python_sitelib}/numarray/convolve/*.so %ghost %{python_sitelib}/numarray/convolve/*.pyo %dir %{python_sitelib}/numarray/fft %{python_sitelib}/numarray/fft/*.py %{python_sitelib}/numarray/fft/*.pyc %{python_sitelib}/numarray/fft/*.so %ghost %{python_sitelib}/numarray/fft/*.pyo %dir %{python_sitelib}/numarray/examples %{python_sitelib}/numarray/examples/*.py %{python_sitelib}/numarray/examples/*.pyc %ghost %{python_sitelib}/numarray/examples/*.pyo %dir %{python_sitelib}/numarray/examples/convolve %{python_sitelib}/numarray/examples/convolve/*.py %{python_sitelib}/numarray/examples/convolve/*.pyc %{python_sitelib}/numarray/examples/convolve/*.so %ghost %{python_sitelib}/numarray/examples/convolve/*.pyo %dir %{python_sitelib}/numarray/nd_image %{python_sitelib}/numarray/nd_image/*.py %{python_sitelib}/numarray/nd_image/*.pyc %{python_sitelib}/numarray/nd_image/*.so %ghost %{python_sitelib}/numarray/nd_image/*.pyo %dir %{python_sitelib}/numarray/image %{python_sitelib}/numarray/image/*.py %{python_sitelib}/numarray/image/*.pyc %{python_sitelib}/numarray/image/*.so %ghost %{python_sitelib}/numarray/image/*.pyo %dir %{python_sitelib}/numarray/mlab %{python_sitelib}/numarray/mlab/*.py %{python_sitelib}/numarray/mlab/*.pyc %ghost %{python_sitelib}/numarray/mlab/*.pyo %dir %{python_sitelib}/numarray/matrix %{python_sitelib}/numarray/matrix/*.py %{python_sitelib}/numarray/matrix/*.pyc %ghost %{python_sitelib}/numarray/matrix/*.pyo %dir %{python_sitelib}/numarray/linear_algebra %{python_sitelib}/numarray/linear_algebra/*.py %{python_sitelib}/numarray/linear_algebra/*.pyc %{python_sitelib}/numarray/linear_algebra/*.so %ghost %{python_sitelib}/numarray/linear_algebra/*.pyo %dir %{python_sitelib}/numarray/ma %{python_sitelib}/numarray/ma/*.py %{python_sitelib}/numarray/ma/*.pyc %{python_sitelib}/numarray/ma/Legal.htm %ghost %{python_sitelib}/numarray/ma/*.pyo %dir %{python_sitelib}/numarray/random_array %{python_sitelib}/numarray/random_array/*.py %{python_sitelib}/numarray/random_array/*.pyc %{python_sitelib}/numarray/random_array/*.so %ghost %{python_sitelib}/numarray/random_array/*.pyo %dir %{python_sitelib}/numarray/codegenerator %{python_sitelib}/numarray/codegenerator/*.py %{python_sitelib}/numarray/codegenerator/*.pyc %ghost %{python_sitelib}/numarray/codegenerator/*.pyo %changelog * Thu Aug 11 2005 - Orion Poplawski - 1.3.3-3 - Properly %ghost .pyo files * Tue Aug 09 2005 - Orion Poplawski - 1.3.3-2 - Cleanup - Added -devel provides * Tue Aug 02 2005 - Orion Poplawski - 1.3.3-1 - Initial release for Fedora Extras Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-numarray/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 11 Aug 2005 20:20:17 -0000 1.1 +++ .cvsignore 11 Aug 2005 20:20:52 -0000 1.2 @@ -0,0 +1 @@ +numarray-1.3.3.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-numarray/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 11 Aug 2005 20:20:17 -0000 1.1 +++ sources 11 Aug 2005 20:20:52 -0000 1.2 @@ -0,0 +1 @@ +2286f5dbccebd4ba743915e9e1d30856 numarray-1.3.3.tar.gz From fedora-extras-commits at redhat.com Thu Aug 11 20:55:08 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Thu, 11 Aug 2005 16:55:08 -0400 Subject: rpms/python-numarray/devel python-numarray.spec,1.1,1.2 Message-ID: <200508112055.j7BKt8Qf013067@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/python-numarray/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13050 Modified Files: python-numarray.spec Log Message: Use sitearch macro instead of sitelib Index: python-numarray.spec =================================================================== RCS file: /cvs/extras/rpms/python-numarray/devel/python-numarray.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- python-numarray.spec 11 Aug 2005 20:20:52 -0000 1.1 +++ python-numarray.spec 11 Aug 2005 20:55:06 -0000 1.2 @@ -1,9 +1,10 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} %{!?python_siteinc: %define python_siteinc %(%{__python} -c "from distutils.sysconfig import get_python_inc; print get_python_inc()")} Name: python-numarray Version: 1.3.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Python array manipulation and computational library Group: Development/Languages @@ -38,7 +39,7 @@ %install rm -rf $RPM_BUILD_ROOT %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT -chmod +x $RPM_BUILD_ROOT%{python_sitelib}/numarray/examples/convolve/benchmark.py +chmod +x $RPM_BUILD_ROOT%{python_sitearch}/numarray/examples/convolve/benchmark.py %clean @@ -49,72 +50,75 @@ %defattr(-,root,root,-) %doc LICENSE.txt README.txt Doc/* %{python_siteinc}/numarray/ -%dir %{python_sitelib}/numarray -%{python_sitelib}/numarray/LICENSE.txt -%{python_sitelib}/numarray/*.py -%{python_sitelib}/numarray/*.pyc -%{python_sitelib}/numarray/*.so -%{python_sitelib}/numarray/testdata.fits -%ghost %{python_sitelib}/numarray/*.pyo -%dir %{python_sitelib}/numarray/convolve -%{python_sitelib}/numarray/convolve/*.py -%{python_sitelib}/numarray/convolve/*.pyc -%{python_sitelib}/numarray/convolve/*.so -%ghost %{python_sitelib}/numarray/convolve/*.pyo -%dir %{python_sitelib}/numarray/fft -%{python_sitelib}/numarray/fft/*.py -%{python_sitelib}/numarray/fft/*.pyc -%{python_sitelib}/numarray/fft/*.so -%ghost %{python_sitelib}/numarray/fft/*.pyo -%dir %{python_sitelib}/numarray/examples -%{python_sitelib}/numarray/examples/*.py -%{python_sitelib}/numarray/examples/*.pyc -%ghost %{python_sitelib}/numarray/examples/*.pyo -%dir %{python_sitelib}/numarray/examples/convolve -%{python_sitelib}/numarray/examples/convolve/*.py -%{python_sitelib}/numarray/examples/convolve/*.pyc -%{python_sitelib}/numarray/examples/convolve/*.so -%ghost %{python_sitelib}/numarray/examples/convolve/*.pyo -%dir %{python_sitelib}/numarray/nd_image -%{python_sitelib}/numarray/nd_image/*.py -%{python_sitelib}/numarray/nd_image/*.pyc -%{python_sitelib}/numarray/nd_image/*.so -%ghost %{python_sitelib}/numarray/nd_image/*.pyo -%dir %{python_sitelib}/numarray/image -%{python_sitelib}/numarray/image/*.py -%{python_sitelib}/numarray/image/*.pyc -%{python_sitelib}/numarray/image/*.so -%ghost %{python_sitelib}/numarray/image/*.pyo -%dir %{python_sitelib}/numarray/mlab -%{python_sitelib}/numarray/mlab/*.py -%{python_sitelib}/numarray/mlab/*.pyc -%ghost %{python_sitelib}/numarray/mlab/*.pyo -%dir %{python_sitelib}/numarray/matrix -%{python_sitelib}/numarray/matrix/*.py -%{python_sitelib}/numarray/matrix/*.pyc -%ghost %{python_sitelib}/numarray/matrix/*.pyo -%dir %{python_sitelib}/numarray/linear_algebra -%{python_sitelib}/numarray/linear_algebra/*.py -%{python_sitelib}/numarray/linear_algebra/*.pyc -%{python_sitelib}/numarray/linear_algebra/*.so -%ghost %{python_sitelib}/numarray/linear_algebra/*.pyo -%dir %{python_sitelib}/numarray/ma -%{python_sitelib}/numarray/ma/*.py -%{python_sitelib}/numarray/ma/*.pyc -%{python_sitelib}/numarray/ma/Legal.htm -%ghost %{python_sitelib}/numarray/ma/*.pyo -%dir %{python_sitelib}/numarray/random_array -%{python_sitelib}/numarray/random_array/*.py -%{python_sitelib}/numarray/random_array/*.pyc -%{python_sitelib}/numarray/random_array/*.so -%ghost %{python_sitelib}/numarray/random_array/*.pyo -%dir %{python_sitelib}/numarray/codegenerator -%{python_sitelib}/numarray/codegenerator/*.py -%{python_sitelib}/numarray/codegenerator/*.pyc -%ghost %{python_sitelib}/numarray/codegenerator/*.pyo +%dir %{python_sitearch}/numarray +%{python_sitearch}/numarray/LICENSE.txt +%{python_sitearch}/numarray/*.py +%{python_sitearch}/numarray/*.pyc +%{python_sitearch}/numarray/*.so +%{python_sitearch}/numarray/testdata.fits +%ghost %{python_sitearch}/numarray/*.pyo +%dir %{python_sitearch}/numarray/convolve +%{python_sitearch}/numarray/convolve/*.py +%{python_sitearch}/numarray/convolve/*.pyc +%{python_sitearch}/numarray/convolve/*.so +%ghost %{python_sitearch}/numarray/convolve/*.pyo +%dir %{python_sitearch}/numarray/fft +%{python_sitearch}/numarray/fft/*.py +%{python_sitearch}/numarray/fft/*.pyc +%{python_sitearch}/numarray/fft/*.so +%ghost %{python_sitearch}/numarray/fft/*.pyo +%dir %{python_sitearch}/numarray/examples +%{python_sitearch}/numarray/examples/*.py +%{python_sitearch}/numarray/examples/*.pyc +%ghost %{python_sitearch}/numarray/examples/*.pyo +%dir %{python_sitearch}/numarray/examples/convolve +%{python_sitearch}/numarray/examples/convolve/*.py +%{python_sitearch}/numarray/examples/convolve/*.pyc +%{python_sitearch}/numarray/examples/convolve/*.so +%ghost %{python_sitearch}/numarray/examples/convolve/*.pyo +%dir %{python_sitearch}/numarray/nd_image +%{python_sitearch}/numarray/nd_image/*.py +%{python_sitearch}/numarray/nd_image/*.pyc +%{python_sitearch}/numarray/nd_image/*.so +%ghost %{python_sitearch}/numarray/nd_image/*.pyo +%dir %{python_sitearch}/numarray/image +%{python_sitearch}/numarray/image/*.py +%{python_sitearch}/numarray/image/*.pyc +%{python_sitearch}/numarray/image/*.so +%ghost %{python_sitearch}/numarray/image/*.pyo +%dir %{python_sitearch}/numarray/mlab +%{python_sitearch}/numarray/mlab/*.py +%{python_sitearch}/numarray/mlab/*.pyc +%ghost %{python_sitearch}/numarray/mlab/*.pyo +%dir %{python_sitearch}/numarray/matrix +%{python_sitearch}/numarray/matrix/*.py +%{python_sitearch}/numarray/matrix/*.pyc +%ghost %{python_sitearch}/numarray/matrix/*.pyo +%dir %{python_sitearch}/numarray/linear_algebra +%{python_sitearch}/numarray/linear_algebra/*.py +%{python_sitearch}/numarray/linear_algebra/*.pyc +%{python_sitearch}/numarray/linear_algebra/*.so +%ghost %{python_sitearch}/numarray/linear_algebra/*.pyo +%dir %{python_sitearch}/numarray/ma +%{python_sitearch}/numarray/ma/*.py +%{python_sitearch}/numarray/ma/*.pyc +%{python_sitearch}/numarray/ma/Legal.htm +%ghost %{python_sitearch}/numarray/ma/*.pyo +%dir %{python_sitearch}/numarray/random_array +%{python_sitearch}/numarray/random_array/*.py +%{python_sitearch}/numarray/random_array/*.pyc +%{python_sitearch}/numarray/random_array/*.so +%ghost %{python_sitearch}/numarray/random_array/*.pyo +%dir %{python_sitearch}/numarray/codegenerator +%{python_sitearch}/numarray/codegenerator/*.py +%{python_sitearch}/numarray/codegenerator/*.pyc +%ghost %{python_sitearch}/numarray/codegenerator/*.pyo %changelog +* Thu Aug 11 2005 - Orion Poplawski - 1.3.3-4 +- Use sitearch macro instead of sitelib + * Thu Aug 11 2005 - Orion Poplawski - 1.3.3-3 - Properly %ghost .pyo files From fedora-extras-commits at redhat.com Thu Aug 11 21:05:01 2005 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Thu, 11 Aug 2005 17:05:01 -0400 Subject: fedora-security/audit fc4,1.38,1.39 Message-ID: <200508112105.j7BL5VBC014296@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14275 Modified Files: fc4 Log Message: >From bressers Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- fc4 11 Aug 2005 15:39:33 -0000 1.38 +++ fc4 11 Aug 2005 21:04:59 -0000 1.39 @@ -87,7 +87,7 @@ 2005-1759 VULNERABLE (openldap) 2005-1759 VULNERABLE (php) 2005-1751 VULNERABLE (nmap, fixed shtool 2.0.2) #158996 -2005-1751 VULNERABLE (openldap, fixed shtool 2.0.2) +2005-1751 ignore (openldap, fixed shtool 2.0.2) flawed code path not used 2005-1751 ignore (ncpfs) part of shtool in ncpfs is not vulnerable 2005-1740 backport (net-snmp, not fixed) 2005-1739 backport (ImageMagick, fixed 6.2.2.3) [since re0526.1] From fedora-extras-commits at redhat.com Thu Aug 11 21:24:56 2005 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Thu, 11 Aug 2005 17:24:56 -0400 Subject: owners owners.list,1.71,1.72 Message-ID: <200508112124.j7BLOusl014413@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14396 Modified Files: owners.list Log Message: Taking over qtparted. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.71 retrieving revision 1.72 diff -u -r1.71 -r1.72 --- owners.list 11 Aug 2005 14:43:24 -0000 1.71 +++ owners.list 11 Aug 2005 21:24:54 -0000 1.72 @@ -719,7 +719,7 @@ Fedora Extras|qhull|General dimension convex hull programs|rc040203 at freenet.de|extras-qa at fedoraproject.org| Fedora Extras|qiv|Quick Image Viewer|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|qof|QOF provides a query engine library for C objects|toshio at tiki-lounge.com|extras-qa at fedoraproject.org| -Fedora Extras|qtparted|Partition Magic clone written in C++ using the Qt toolkit|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| +Fedora Extras|qtparted|Partition Magic clone written in C++ using the Qt toolkit|steve at silug.org|extras-qa at fedoraproject.org| Fedora Extras|QuantLib| QuantLib is a free/open-source library for modeling, trading, and risk management in real-life|tcallawa at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|quilt|Patch management tool|jwboyer at jdub.homelinux.org|extras-qa at fedoraproject.org| Fedora Extras|R|A language and environment for statistical computing and graphics|tcallawa at redhat.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Thu Aug 11 21:32:19 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 11 Aug 2005 17:32:19 -0400 Subject: extras-buildsys/www/template head.psp,1.8,1.9 Message-ID: <200508112132.j7BLWJWI014477@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/www/template In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14458 Modified Files: head.psp Log Message: Commit a bit of Ville's patch that didn't quite make it Index: head.psp =================================================================== RCS file: /cvs/fedora/extras-buildsys/www/template/head.psp,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- head.psp 7 Aug 2005 15:40:00 -0000 1.8 +++ head.psp 11 Aug 2005 21:32:17 -0000 1.9 @@ -81,7 +81,7 @@

Filter by: Status:
- + Job ID:   <% if user_email and len(user_email): From fedora-extras-commits at redhat.com Thu Aug 11 21:36:22 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Thu, 11 Aug 2005 17:36:22 -0400 Subject: rpms/plplot/FC-4 .cvsignore, 1.3, 1.4 plplot.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200508112136.j7BLaMUa014528@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/plplot/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14507 Modified Files: .cvsignore plplot.spec sources Log Message: - Breakout java into its own sub-package, don't build on non x86 - Add patch to use new octave in devel - Add patch to fix c test on ppc Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/plplot/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 10 Aug 2005 20:36:36 -0000 1.3 +++ .cvsignore 11 Aug 2005 21:36:20 -0000 1.4 @@ -1,2 +1,4 @@ plplot-5.5.3.tar.gz plplot-5.5.3-x86_64.patch +plplot-5.5.3-octave.patch +plplot-5.5.3-check.patch Index: plplot.spec =================================================================== RCS file: /cvs/extras/rpms/plplot/FC-4/plplot.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- plplot.spec 10 Aug 2005 20:36:36 -0000 1.2 +++ plplot.spec 11 Aug 2005 21:36:20 -0000 1.3 @@ -2,7 +2,7 @@ Name: plplot Version: 5.5.3 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Library of functions for making scientific plots Group: Applications/Engineering @@ -13,11 +13,18 @@ Patch1: plplot-5.5.3-tk.patch Patch2: plplot-5.5.3-buffer.patch Patch3: plplot-5.5.3-x86_64.patch +Patch4: plplot-5.5.3-octave.patch +Patch5: plplot-5.5.3-check.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: autoconf BuildRequires: gcc-gfortran, freetype-devel, octave-devel, qhull-devel +%ifarch %{ix86} x86_64 BuildRequires: java-devel, libgcj-devel +%define java_config %{nil} +%else +%define java_config --disable-java +%endif BuildRequires: gd-devel, tcl-devel, tk-devel BuildRequires: python-devel, pygtk2-devel, python-numeric BuildRequires: libgnomeui-devel, libgnomeprintui22-devel, gnome-python2 @@ -70,12 +77,34 @@ Summary: Development files for using PLplot GNOME Group: Development/Libraries Requires: %{name} = %{version}-%{release} +Requires: %{name}-devel = %{version}-%{release} Requires: %{name}-gnome = %{version}-%{release} %description gnome-devel %{summary} +%ifarch %{ix86} x86_64 +%package java +Summary: Functions for scientific plotting with Java +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description java +%{summary} + +%package java-devel +Summary: Development files for using PLplot GNOME +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Requires: %{name}-devel = %{version}-%{release} +Requires: %{name}-java = %{version}-%{release} + +%description java-devel +%{summary} +%endif + + %package octave Summary: Functions for scientific plotting with Octave Group: Development/Libraries @@ -97,6 +126,7 @@ Summary: Development files for using PLplot with Tk Group: Development/Libraries Requires: %{name} = %{version}-%{release} +Requires: %{name}-devel = %{version}-%{release} Requires: %{name}-tk = %{version}-%{release} %description tk-devel @@ -108,6 +138,8 @@ %patch1 -p1 -b .orig %patch2 -p1 -b .orig %patch3 -p1 -b .orig +%patch4 -p1 -b .orig +%patch5 -p1 -b .orig %build @@ -115,7 +147,7 @@ %configure --disable-static --without-rpath --with-pthreads \ --with-freetype-font-dir=/usr/share/fonts \ --with-libunicode=no --disable-cgm --disable-linuxvga \ - --disable-wingcc --disable-aqt --disable-pdl + --disable-wingcc --disable-aqt --disable-pdl %{java_config} make @@ -191,7 +223,6 @@ %{_libdir}/plplot%{version}/driversd/xfig.so %{_libdir}/plplot%{version}/driversd/xwin.rc %{_libdir}/plplot%{version}/driversd/xwin.so -%{_libdir}/jni/plplotjavac_wrap.so %{python_sitelib}/_plplotcmodule.so %{python_sitelib}/plplot.py %{python_sitelib}/plplot_widgetmodule.so @@ -202,7 +233,6 @@ %{_mandir}/man1/plrender.1.gz %{_mandir}/man1/pltek.1.gz %{_mandir}/man1/pstex2eps.1.gz -%{_datadir}/java/plplot.jar %dir %{_datadir}/plplot%{version} %{_datadir}/plplot%{version}/*.map %{_datadir}/plplot%{version}/*.fnt @@ -229,12 +259,10 @@ %{_datadir}/plplot%{version}/examples/c/ %{_datadir}/plplot%{version}/examples/c++/ %{_datadir}/plplot%{version}/examples/f77/ -%{_datadir}/plplot%{version}/examples/java/ %{_datadir}/plplot%{version}/examples/Makefile %{_datadir}/plplot%{version}/examples/test_c.sh %{_datadir}/plplot%{version}/examples/test_cxx.sh %{_datadir}/plplot%{version}/examples/test_f77.sh -%{_datadir}/plplot%{version}/examples/test_java.sh %files gnome %defattr(-,root,root,-) @@ -248,6 +276,18 @@ %defattr(-,root,root,-) %{_libdir}/libplplotgnome2d.so +%ifarch %{ix86} x86_64 +%files java +%defattr(-,root,root,-) +%{_libdir}/jni/plplotjavac_wrap.so +%{_datadir}/java/plplot.jar + +%files java-devel +%defattr(-,root,root,-) +%{_datadir}/plplot%{version}/examples/java/ +%{_datadir}/plplot%{version}/examples/test_java.sh +%endif + %files octave %defattr(-,root,root,-) %{_datadir}/plplot_octave/ @@ -277,6 +317,11 @@ %{_datadir}/plplot%{version}/examples/tk/ %changelog +* Thu Aug 11 2005 - Orion Poplawski - 5.5.3-7 +- Breakout java into its own sub-package, don't build on non x86 +- Add patch to use new octave in devel +- Add patch to fix c test on ppc + * Wed Aug 10 2005 - Orion Poplawski - 5.5.3-6 - Add patch to find tcl on x86_64 Index: sources =================================================================== RCS file: /cvs/extras/rpms/plplot/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 10 Aug 2005 20:36:36 -0000 1.3 +++ sources 11 Aug 2005 21:36:20 -0000 1.4 @@ -1,2 +1,4 @@ 6df3d63cffac28337ff7fa56712da5c7 plplot-5.5.3.tar.gz 02cc9f8eb72211581aae2bd38670252f plplot-5.5.3-x86_64.patch +7970faa7d90fe1e98e19354fd607a309 plplot-5.5.3-octave.patch +22f2761b863bf1f47fb37b7d7fb9ab85 plplot-5.5.3-check.patch From fedora-extras-commits at redhat.com Thu Aug 11 21:40:28 2005 From: fedora-extras-commits at redhat.com (Marc Maurer (uwog)) Date: Thu, 11 Aug 2005 17:40:28 -0400 Subject: rpms/abiword/devel abiword.spec,1.9,1.10 Message-ID: <200508112140.j7BLeSRO014589@cvs-int.fedora.redhat.com> Author: uwog Update of /cvs/extras/rpms/abiword/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14572 Modified Files: abiword.spec Log Message: First attempt to build 2.3.4 Index: abiword.spec =================================================================== RCS file: /cvs/extras/rpms/abiword/devel/abiword.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- abiword.spec 27 Jul 2005 23:46:58 -0000 1.9 +++ abiword.spec 11 Aug 2005 21:40:26 -0000 1.10 @@ -2,7 +2,7 @@ Summary: The AbiWord word processor Name: abiword -Version: 2.2.9 +Version: 2.3.4 Release: 1 Epoch: 1 Group: Applications/Editors @@ -29,6 +29,7 @@ BuildRequires: librsvg2-devel BuildRequires: libwmf-devel BuildRequires: aiksaurus-gtk-devel >= 1.2.1 +BuildRequires: link-grammar-devel >= 4.1.3 # gnome build deps BuildRequires: libbonobo-devel @@ -61,14 +62,14 @@ cd ../abiword-plugins libtoolize --copy --force ./nextgen.sh -%configure --disable-gda --with-abiword=../abi +%configure --disable-gda --disable-abimathview --with-abiword=../abi sed 's/^predep_objects=.*/predep_objects=\"\"/' < libtool > libtool.foo sed 's/^postdep_objects=.*/postdep_objects=\"\"/' < libtool.foo > libtool make # now make the docs cd ../abiword-docs -ABI_DOC_PROG=$(pwd)/../abi/src/wp/main/unix/AbiWord-2.2 ./make-html.sh +ABI_DOC_PROG=$(pwd)/../abi/src/wp/main/unix/AbiWord-2.4 ./make-html.sh %install cd abi @@ -78,13 +79,13 @@ # install the docs cd ../abiword-docs -mkdir -p $RPM_BUILD_ROOT/%{_datadir}/AbiSuite-2.2/AbiWord/help -cp -rp help/* $RPM_BUILD_ROOT/%{_datadir}/AbiSuite-2.2/AbiWord/help/ +mkdir -p $RPM_BUILD_ROOT/%{_datadir}/AbiSuite-2.4/AbiWord/help +cp -rp help/* $RPM_BUILD_ROOT/%{_datadir}/AbiSuite-2.4/AbiWord/help/ # some of the help dirs have bad perms (#109261) -find $RPM_BUILD_ROOT/%{_datadir}/AbiSuite-2.2/AbiWord/help/ -type d -exec chmod -c o+rx {} \; +find $RPM_BUILD_ROOT/%{_datadir}/AbiSuite-2.4/AbiWord/help/ -type d -exec chmod -c o+rx {} \; mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps/ -cp $RPM_BUILD_ROOT%{_datadir}/AbiSuite-2.2/icons/abiword_48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/abiword_48.png +cp $RPM_BUILD_ROOT%{_datadir}/AbiSuite-2.4/icons/abiword_48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/abiword_48.png cd ../abi mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications @@ -101,7 +102,7 @@ rm -f $RPM_BUILD_ROOT%{_bindir}/ttf* # nuke .la files -rm -f $RPM_BUILD_ROOT/%{_libdir}/AbiWord-2.2/plugins/*.la +rm -f $RPM_BUILD_ROOT/%{_libdir}/AbiWord-2.4/plugins/*.la %clean rm -rf $RPM_BUILD_ROOT @@ -117,16 +118,20 @@ %files %defattr(-,root,root) %doc abi/docs -%{_bindir}/AbiWord-2.2 +%{_bindir}/AbiWord-2.4 %{_bindir}/abiword -%{_libdir}/AbiWord-2.2 -%{_datadir}/AbiSuite-2.2 +%{_libdir}/AbiWord-2.4 +%{_datadir}/AbiSuite-2.4 %{_datadir}/applications/* %{_datadir}/mime-info/* %{_datadir}/pixmaps/*png %{_datadir}/icons/*png %changelog +* Thu Aug 11 2005 Marc Maurer - 1:2.3.4-1 +- Update to 2.3.4 +- Add link-grammar dependency + * Thu Jul 28 2005 Marc Maurer - 1:2.2.9-1 - Update to 2.2.9 - Drop the mailmerge patch again From fedora-extras-commits at redhat.com Thu Aug 11 22:23:39 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Thu, 11 Aug 2005 18:23:39 -0400 Subject: rpms/plplot/devel .cvsignore, 1.3, 1.4 plplot.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200508112223.j7BMNdqh016022@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/plplot/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15998 Modified Files: .cvsignore plplot.spec sources Log Message: - Breakout java into its own sub-package, don't build on non x86 - Add patch to fix c test on ppc Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/plplot/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 10 Aug 2005 20:39:31 -0000 1.3 +++ .cvsignore 11 Aug 2005 22:23:37 -0000 1.4 @@ -1,3 +1,4 @@ plplot-5.5.3.tar.gz plplot-5.5.3-x86_64.patch plplot-5.5.3-octave.patch +plplot-5.5.3-check.patch Index: plplot.spec =================================================================== RCS file: /cvs/extras/rpms/plplot/devel/plplot.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- plplot.spec 10 Aug 2005 20:40:04 -0000 1.3 +++ plplot.spec 11 Aug 2005 22:23:37 -0000 1.4 @@ -2,7 +2,7 @@ Name: plplot Version: 5.5.3 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Library of functions for making scientific plots Group: Applications/Engineering @@ -14,11 +14,17 @@ Patch2: plplot-5.5.3-buffer.patch Patch3: plplot-5.5.3-x86_64.patch Patch4: plplot-5.5.3-octave.patch +Patch5: plplot-5.5.3-check.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: autoconf BuildRequires: gcc-gfortran, freetype-devel, octave-devel, qhull-devel +%ifarch %{ix86} x86_64 BuildRequires: java-devel, libgcj-devel +%define java_config %{nil} +%else +%define java_config --disable-java +%endif BuildRequires: gd-devel, tcl-devel, tk-devel BuildRequires: python-devel, pygtk2-devel, python-numeric BuildRequires: libgnomeui-devel, libgnomeprintui22-devel, gnome-python2 @@ -71,12 +77,34 @@ Summary: Development files for using PLplot GNOME Group: Development/Libraries Requires: %{name} = %{version}-%{release} +Requires: %{name}-devel = %{version}-%{release} Requires: %{name}-gnome = %{version}-%{release} %description gnome-devel %{summary} +%ifarch %{ix86} x86_64 +%package java +Summary: Functions for scientific plotting with Java +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description java +%{summary} + +%package java-devel +Summary: Development files for using PLplot GNOME +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Requires: %{name}-devel = %{version}-%{release} +Requires: %{name}-java = %{version}-%{release} + +%description java-devel +%{summary} +%endif + + %package octave Summary: Functions for scientific plotting with Octave Group: Development/Libraries @@ -98,6 +126,7 @@ Summary: Development files for using PLplot with Tk Group: Development/Libraries Requires: %{name} = %{version}-%{release} +Requires: %{name}-devel = %{version}-%{release} Requires: %{name}-tk = %{version}-%{release} %description tk-devel @@ -110,6 +139,7 @@ %patch2 -p1 -b .orig %patch3 -p1 -b .orig %patch4 -p1 -b .orig +%patch5 -p1 -b .orig %build @@ -117,7 +147,7 @@ %configure --disable-static --without-rpath --with-pthreads \ --with-freetype-font-dir=/usr/share/fonts \ --with-libunicode=no --disable-cgm --disable-linuxvga \ - --disable-wingcc --disable-aqt --disable-pdl + --disable-wingcc --disable-aqt --disable-pdl %{java_config} make @@ -193,7 +223,6 @@ %{_libdir}/plplot%{version}/driversd/xfig.so %{_libdir}/plplot%{version}/driversd/xwin.rc %{_libdir}/plplot%{version}/driversd/xwin.so -%{_libdir}/jni/plplotjavac_wrap.so %{python_sitelib}/_plplotcmodule.so %{python_sitelib}/plplot.py %{python_sitelib}/plplot_widgetmodule.so @@ -204,7 +233,6 @@ %{_mandir}/man1/plrender.1.gz %{_mandir}/man1/pltek.1.gz %{_mandir}/man1/pstex2eps.1.gz -%{_datadir}/java/plplot.jar %dir %{_datadir}/plplot%{version} %{_datadir}/plplot%{version}/*.map %{_datadir}/plplot%{version}/*.fnt @@ -231,12 +259,10 @@ %{_datadir}/plplot%{version}/examples/c/ %{_datadir}/plplot%{version}/examples/c++/ %{_datadir}/plplot%{version}/examples/f77/ -%{_datadir}/plplot%{version}/examples/java/ %{_datadir}/plplot%{version}/examples/Makefile %{_datadir}/plplot%{version}/examples/test_c.sh %{_datadir}/plplot%{version}/examples/test_cxx.sh %{_datadir}/plplot%{version}/examples/test_f77.sh -%{_datadir}/plplot%{version}/examples/test_java.sh %files gnome %defattr(-,root,root,-) @@ -250,6 +276,18 @@ %defattr(-,root,root,-) %{_libdir}/libplplotgnome2d.so +%ifarch %{ix86} x86_64 +%files java +%defattr(-,root,root,-) +%{_libdir}/jni/plplotjavac_wrap.so +%{_datadir}/java/plplot.jar + +%files java-devel +%defattr(-,root,root,-) +%{_datadir}/plplot%{version}/examples/java/ +%{_datadir}/plplot%{version}/examples/test_java.sh +%endif + %files octave %defattr(-,root,root,-) %{_datadir}/plplot_octave/ @@ -279,6 +317,10 @@ %{_datadir}/plplot%{version}/examples/tk/ %changelog +* Thu Aug 11 2005 - Orion Poplawski - 5.5.3-7 +- Breakout java into its own sub-package, don't build on non x86 +- Add patch to fix c test on ppc + * Wed Aug 10 2005 - Orion Poplawski - 5.5.3-6 - Add patch to find tcl on x86_64 - Add patch to use new octave in devel Index: sources =================================================================== RCS file: /cvs/extras/rpms/plplot/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 10 Aug 2005 20:39:31 -0000 1.3 +++ sources 11 Aug 2005 22:23:37 -0000 1.4 @@ -1,3 +1,4 @@ 6df3d63cffac28337ff7fa56712da5c7 plplot-5.5.3.tar.gz 02cc9f8eb72211581aae2bd38670252f plplot-5.5.3-x86_64.patch 7970faa7d90fe1e98e19354fd607a309 plplot-5.5.3-octave.patch +22f2761b863bf1f47fb37b7d7fb9ab85 plplot-5.5.3-check.patch From fedora-extras-commits at redhat.com Thu Aug 11 22:32:25 2005 From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel)) Date: Thu, 11 Aug 2005 18:32:25 -0400 Subject: common tobuild,1.2197,1.2198 Message-ID: <200508112232.j7BMWP1g016152@cvs-int.fedora.redhat.com> Author: snirkel Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16135 Modified Files: tobuild Log Message: request build of rpms/libnjb/devel libnjb-2_2_1-7_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2197 retrieving revision 1.2198 diff -u -r1.2197 -r1.2198 --- tobuild 11 Aug 2005 11:41:30 -0000 1.2197 +++ tobuild 11 Aug 2005 22:32:22 -0000 1.2198 @@ -29,3 +29,4 @@ wtogami rpms/perl-Razor-Agent/devel perl-Razor-Agent-2_75-1_fc5 devel shishz rpms/snownews/devel snownews-1_5_7-2_fc5 devel ixs rpms/perl-Crypt-Blowfish/FC-4 perl-Crypt-Blowfish-2_09-2_fc4 fc4 +snirkel rpms/libnjb/devel libnjb-2_2_1-7_fc5 devel From fedora-extras-commits at redhat.com Thu Aug 11 23:05:25 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 11 Aug 2005 19:05:25 -0400 Subject: rpms/libgdamm - New directory Message-ID: <200508112305.j7BN5Pk7017419@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/libgdamm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17410/libgdamm Log Message: Directory /cvs/extras/rpms/libgdamm added to the repository From fedora-extras-commits at redhat.com Thu Aug 11 23:05:53 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 11 Aug 2005 19:05:53 -0400 Subject: rpms/libgdamm/devel - New directory Message-ID: <200508112305.j7BN5rOm017439@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/libgdamm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17410/libgdamm/devel Log Message: Directory /cvs/extras/rpms/libgdamm/devel added to the repository From fedora-extras-commits at redhat.com Thu Aug 11 23:06:26 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 11 Aug 2005 19:06:26 -0400 Subject: rpms/libgdamm Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200508112306.j7BN6Q2r017469@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/libgdamm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17455 Added Files: Makefile import.log Log Message: Setup of module libgdamm --- NEW FILE Makefile --- # Top level Makefile for module libgdamm all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Thu Aug 11 23:06:48 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 11 Aug 2005 19:06:48 -0400 Subject: rpms/libgdamm/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200508112306.j7BN6mld017484@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/libgdamm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17455/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module libgdamm --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Thu Aug 11 23:07:33 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 11 Aug 2005 19:07:33 -0400 Subject: rpms/libgdamm import.log,1.1,1.2 Message-ID: <200508112307.j7BN7XEr017553@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/libgdamm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17522 Modified Files: import.log Log Message: auto-import libgdamm-1.3.7-2 on branch devel from libgdamm-1.3.7-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/libgdamm/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 11 Aug 2005 23:06:24 -0000 1.1 +++ import.log 11 Aug 2005 23:07:31 -0000 1.2 @@ -0,0 +1 @@ +libgdamm-1_3_7-2:HEAD:libgdamm-1.3.7-2.src.rpm:1123801704 From fedora-extras-commits at redhat.com Thu Aug 11 23:07:34 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 11 Aug 2005 19:07:34 -0400 Subject: rpms/libgdamm/devel libgdamm.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200508112307.j7BN7Ybl017560@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/libgdamm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17522/devel Modified Files: .cvsignore sources Added Files: libgdamm.spec Log Message: auto-import libgdamm-1.3.7-2 on branch devel from libgdamm-1.3.7-2.src.rpm --- NEW FILE libgdamm.spec --- Name: libgdamm Version: 1.3.7 Release: 2%{?dist} Summary: C++ wrappers for libgda Group: System Environment/Libraries License: LGPL URL: http://www.gtkmm.org/ Source0: http://ftp.gnome.org/pub/GNOME/sources/libgdamm/1.3/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: glibmm24-devel, libgda-devel %description C++ wrappers for libgda. libgdamm is part of a set of powerful C++ bindings for the GNOME libraries, which provide additional functionality above GTK+/gtkmm. %package devel Summary: Headers/Libraries for developing programs that use libgdamm Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: glibmm24-devel, libgda-devel %description devel This package contains headers and libraries that programmers will need to develop applications which use libgdamm. %prep %setup -q %build %configure --enable-static make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make DESTDIR=${RPM_BUILD_ROOT} install find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';' %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-, root, root, -) %doc AUTHORS COPYING ChangeLog NEWS %{_libdir}/*.so.* %files devel %defattr(-, root, root, -) %{_includedir}/libgdamm-2.0 %{_libdir}/*.a %{_libdir}/*.so %{_libdir}/libgdamm-2.0 %{_libdir}/pkgconfig/*.pc %changelog * Thu Aug 11 2005 Tom "spot" Callaway 1.3.7-2 - cleanups, additional devel Requires * Sat Aug 6 2005 Tom "spot" Callaway 1.3.7-1 - initial package for Fedora Extras Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libgdamm/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 11 Aug 2005 23:06:28 -0000 1.1 +++ .cvsignore 11 Aug 2005 23:07:32 -0000 1.2 @@ -0,0 +1 @@ +libgdamm-1.3.7.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libgdamm/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 11 Aug 2005 23:06:28 -0000 1.1 +++ sources 11 Aug 2005 23:07:32 -0000 1.2 @@ -0,0 +1 @@ +1aa0e35753ec87ec55822b2e59005892 libgdamm-1.3.7.tar.bz2 From fedora-extras-commits at redhat.com Fri Aug 12 00:15:00 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Thu, 11 Aug 2005 20:15:00 -0400 Subject: rpms/plt-scheme/FC-4 .cvsignore, 1.2, 1.3 plt-scheme.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200508120015.j7C0F0ll018931@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/plt-scheme/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18912 Modified Files: .cvsignore plt-scheme.spec sources Log Message: new version 299.200 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/plt-scheme/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 16 Apr 2005 17:08:26 -0000 1.2 +++ .cvsignore 12 Aug 2005 00:14:57 -0000 1.3 @@ -1 +1 @@ -plt-299.100-src-unix.tgz +plt-299.200-src-unix.tgz Index: plt-scheme.spec =================================================================== RCS file: /cvs/extras/rpms/plt-scheme/FC-4/plt-scheme.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- plt-scheme.spec 16 May 2005 12:13:55 -0000 1.2 +++ plt-scheme.spec 12 Aug 2005 00:14:57 -0000 1.3 @@ -1,12 +1,12 @@ Name: plt-scheme -Version: 299.100 -Release: 2 +Version: 299.200 +Release: 1%{?dist} Summary: Graphical environment for developing programs using Scheme Group: Development/Languages License: LGPL URL: http://www.drscheme.org -Source: http://download.plt-scheme.org/bundles/299.100/plt/plt-299.100-src-unix.tgz +Source: http://download.plt-scheme.org/bundles/299.200/plt/plt-299.200-src-unix.tgz Source1: drscheme.png BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: XFree86-devel, libpng-devel, freetype-devel, fontconfig-devel @@ -103,6 +103,9 @@ %{_datadir}/applications/* %changelog +* Fri Aug 12 2005 Gerard Milmeister - 299.200-1 +- New Version 299.200 + * Sat Apr 16 2005 Gerard Milmeister - 299.100-1 - Renamed to plt-scheme Index: sources =================================================================== RCS file: /cvs/extras/rpms/plt-scheme/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 16 Apr 2005 17:08:26 -0000 1.2 +++ sources 12 Aug 2005 00:14:57 -0000 1.3 @@ -1 +1 @@ -12186ba09947d9ebc3988e29de4ab104 plt-299.100-src-unix.tgz +9d0e3153f7214af6a966e15f1649f10b plt-299.200-src-unix.tgz From fedora-extras-commits at redhat.com Fri Aug 12 00:16:08 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Thu, 11 Aug 2005 20:16:08 -0400 Subject: common tobuild,1.2198,1.2199 Message-ID: <200508120016.j7C0G8OD019003@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18986 Modified Files: tobuild Log Message: request build of rpms/plt-scheme/FC-4 plt-scheme-299_200-1_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2198 retrieving revision 1.2199 diff -u -r1.2198 -r1.2199 --- tobuild 11 Aug 2005 22:32:22 -0000 1.2198 +++ tobuild 12 Aug 2005 00:16:06 -0000 1.2199 @@ -30,3 +30,4 @@ shishz rpms/snownews/devel snownews-1_5_7-2_fc5 devel ixs rpms/perl-Crypt-Blowfish/FC-4 perl-Crypt-Blowfish-2_09-2_fc4 fc4 snirkel rpms/libnjb/devel libnjb-2_2_1-7_fc5 devel +gemi rpms/plt-scheme/FC-4 plt-scheme-299_200-1_fc4 fc4 From fedora-extras-commits at redhat.com Fri Aug 12 00:16:30 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Thu, 11 Aug 2005 20:16:30 -0400 Subject: rpms/plt-scheme/FC-3 plt-scheme.spec,1.1,1.2 sources,1.2,1.3 Message-ID: <200508120016.j7C0GUQv019028@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/plt-scheme/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19009 Modified Files: plt-scheme.spec sources Log Message: new version 299.200 Index: plt-scheme.spec =================================================================== RCS file: /cvs/extras/rpms/plt-scheme/FC-3/plt-scheme.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- plt-scheme.spec 16 Apr 2005 17:08:26 -0000 1.1 +++ plt-scheme.spec 12 Aug 2005 00:16:28 -0000 1.2 @@ -1,12 +1,12 @@ Name: plt-scheme -Version: 299.100 -Release: 1 +Version: 299.200 +Release: 1%{?dist} Summary: Graphical environment for developing programs using Scheme Group: Development/Languages License: LGPL URL: http://www.drscheme.org -Source: http://download.plt-scheme.org/bundles/299.100/plt/plt-299.100-src-unix.tgz +Source: http://download.plt-scheme.org/bundles/299.200/plt/plt-299.200-src-unix.tgz Source1: drscheme.png BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: XFree86-devel, libpng-devel, freetype-devel, fontconfig-devel @@ -103,6 +103,9 @@ %{_datadir}/applications/* %changelog +* Fri Aug 12 2005 Gerard Milmeister - 299.200-1 +- New Version 299.200 + * Sat Apr 16 2005 Gerard Milmeister - 299.100-1 - Renamed to plt-scheme Index: sources =================================================================== RCS file: /cvs/extras/rpms/plt-scheme/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 16 Apr 2005 17:08:26 -0000 1.2 +++ sources 12 Aug 2005 00:16:28 -0000 1.3 @@ -1 +1 @@ -12186ba09947d9ebc3988e29de4ab104 plt-299.100-src-unix.tgz +9d0e3153f7214af6a966e15f1649f10b plt-299.200-src-unix.tgz From fedora-extras-commits at redhat.com Fri Aug 12 00:17:10 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Thu, 11 Aug 2005 20:17:10 -0400 Subject: common tobuild,1.2199,1.2200 Message-ID: <200508120017.j7C0HA0j019090@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19073 Modified Files: tobuild Log Message: request build of rpms/plt-scheme/FC-3 plt-scheme-299_200-1_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2199 retrieving revision 1.2200 diff -u -r1.2199 -r1.2200 --- tobuild 12 Aug 2005 00:16:06 -0000 1.2199 +++ tobuild 12 Aug 2005 00:17:08 -0000 1.2200 @@ -31,3 +31,4 @@ ixs rpms/perl-Crypt-Blowfish/FC-4 perl-Crypt-Blowfish-2_09-2_fc4 fc4 snirkel rpms/libnjb/devel libnjb-2_2_1-7_fc5 devel gemi rpms/plt-scheme/FC-4 plt-scheme-299_200-1_fc4 fc4 +gemi rpms/plt-scheme/FC-3 plt-scheme-299_200-1_fc3 fc3 From fedora-extras-commits at redhat.com Fri Aug 12 00:17:40 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Thu, 11 Aug 2005 20:17:40 -0400 Subject: rpms/plt-scheme/devel plt-scheme.spec,1.2,1.3 sources,1.2,1.3 Message-ID: <200508120017.j7C0Hekr019116@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/plt-scheme/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19097 Modified Files: plt-scheme.spec sources Log Message: new version 299.200 Index: plt-scheme.spec =================================================================== RCS file: /cvs/extras/rpms/plt-scheme/devel/plt-scheme.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- plt-scheme.spec 16 May 2005 12:13:55 -0000 1.2 +++ plt-scheme.spec 12 Aug 2005 00:17:38 -0000 1.3 @@ -1,12 +1,12 @@ Name: plt-scheme -Version: 299.100 -Release: 2 +Version: 299.200 +Release: 1%{?dist} Summary: Graphical environment for developing programs using Scheme Group: Development/Languages License: LGPL URL: http://www.drscheme.org -Source: http://download.plt-scheme.org/bundles/299.100/plt/plt-299.100-src-unix.tgz +Source: http://download.plt-scheme.org/bundles/299.200/plt/plt-299.200-src-unix.tgz Source1: drscheme.png BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: XFree86-devel, libpng-devel, freetype-devel, fontconfig-devel @@ -103,6 +103,9 @@ %{_datadir}/applications/* %changelog +* Fri Aug 12 2005 Gerard Milmeister - 299.200-1 +- New Version 299.200 + * Sat Apr 16 2005 Gerard Milmeister - 299.100-1 - Renamed to plt-scheme Index: sources =================================================================== RCS file: /cvs/extras/rpms/plt-scheme/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 16 Apr 2005 17:08:26 -0000 1.2 +++ sources 12 Aug 2005 00:17:38 -0000 1.3 @@ -1 +1 @@ -12186ba09947d9ebc3988e29de4ab104 plt-299.100-src-unix.tgz +9d0e3153f7214af6a966e15f1649f10b plt-299.200-src-unix.tgz From fedora-extras-commits at redhat.com Fri Aug 12 00:18:11 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Thu, 11 Aug 2005 20:18:11 -0400 Subject: common tobuild,1.2200,1.2201 Message-ID: <200508120018.j7C0IBr8019178@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19161 Modified Files: tobuild Log Message: request build of rpms/plt-scheme/devel plt-scheme-299_200-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2200 retrieving revision 1.2201 diff -u -r1.2200 -r1.2201 --- tobuild 12 Aug 2005 00:17:08 -0000 1.2200 +++ tobuild 12 Aug 2005 00:18:09 -0000 1.2201 @@ -32,3 +32,4 @@ snirkel rpms/libnjb/devel libnjb-2_2_1-7_fc5 devel gemi rpms/plt-scheme/FC-4 plt-scheme-299_200-1_fc4 fc4 gemi rpms/plt-scheme/FC-3 plt-scheme-299_200-1_fc3 fc3 +gemi rpms/plt-scheme/devel plt-scheme-299_200-1_fc5 devel From fedora-extras-commits at redhat.com Fri Aug 12 06:55:13 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Fri, 12 Aug 2005 02:55:13 -0400 Subject: rpms/bwm-ng/devel bwm-ng.spec,1.1,1.2 Message-ID: <200508120655.j7C6tDwJ026920@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/bwm-ng/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26903 Modified Files: bwm-ng.spec Log Message: * Fri Aug 12 2005 Oliver Falk - 0.5-6 - Rebuild against libstatgrab 0.12 Index: bwm-ng.spec =================================================================== RCS file: /cvs/extras/rpms/bwm-ng/devel/bwm-ng.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- bwm-ng.spec 14 Jul 2005 07:58:00 -0000 1.1 +++ bwm-ng.spec 12 Aug 2005 06:55:11 -0000 1.2 @@ -4,7 +4,7 @@ Name: bwm-ng Version: 0.5 -Release: 5%{?dist} +Release: 6%{?dist} License: GPL Group: Applications/System @@ -54,6 +54,9 @@ %{_mandir}/man1/bwm-ng.1* %changelog +* Fri Aug 12 2005 Oliver Falk - 0.5-6 +- Rebuild against libstatgrab 0.12 + * Thu Jul 14 2005 Oliver Falk - 0.5-5 - Integrated Matthias changes, after his review From fedora-extras-commits at redhat.com Fri Aug 12 06:59:08 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Fri, 12 Aug 2005 02:59:08 -0400 Subject: rpms/bwm-ng/FC-3 bwm-ng.spec,1.1,1.2 Message-ID: <200508120659.j7C6x9x4026995@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/bwm-ng/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26978 Modified Files: bwm-ng.spec Log Message: * Wed Aug 10 2005 Oliver Falk - 0.5-6 - Force rebuild against libstatgrab 0.12 Index: bwm-ng.spec =================================================================== RCS file: /cvs/extras/rpms/bwm-ng/FC-3/bwm-ng.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- bwm-ng.spec 14 Jul 2005 07:58:00 -0000 1.1 +++ bwm-ng.spec 12 Aug 2005 06:59:06 -0000 1.2 @@ -4,7 +4,7 @@ Name: bwm-ng Version: 0.5 -Release: 5%{?dist} +Release: 6%{?dist} License: GPL Group: Applications/System @@ -54,6 +54,9 @@ %{_mandir}/man1/bwm-ng.1* %changelog +* Wed Aug 10 2005 Oliver Falk - 0.5-6 +- Force rebuild against libstatgrab 0.12 + * Thu Jul 14 2005 Oliver Falk - 0.5-5 - Integrated Matthias changes, after his review From fedora-extras-commits at redhat.com Fri Aug 12 07:02:55 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Fri, 12 Aug 2005 03:02:55 -0400 Subject: rpms/bwm-ng/FC-4 bwm-ng.spec,1.1,1.2 Message-ID: <200508120703.j7C73PFp028214@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/bwm-ng/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28197 Modified Files: bwm-ng.spec Log Message: * Wed Aug 10 2005 Oliver Falk - 0.5-6 - Force rebuild against libstatgrab 0.12 Index: bwm-ng.spec =================================================================== RCS file: /cvs/extras/rpms/bwm-ng/FC-4/bwm-ng.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- bwm-ng.spec 14 Jul 2005 07:58:00 -0000 1.1 +++ bwm-ng.spec 12 Aug 2005 07:02:53 -0000 1.2 @@ -4,7 +4,7 @@ Name: bwm-ng Version: 0.5 -Release: 5%{?dist} +Release: 6%{?dist} License: GPL Group: Applications/System @@ -54,6 +54,9 @@ %{_mandir}/man1/bwm-ng.1* %changelog +* Wed Aug 10 2005 Oliver Falk - 0.5-6 +- Force rebuild against libstatgrab 0.12 + * Thu Jul 14 2005 Oliver Falk - 0.5-5 - Integrated Matthias changes, after his review From fedora-extras-commits at redhat.com Fri Aug 12 07:56:15 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 12 Aug 2005 03:56:15 -0400 Subject: rpms/bubblemon - New directory Message-ID: <200508120756.j7C7uF2f028390@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/bubblemon In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28370/bubblemon Log Message: Directory /cvs/extras/rpms/bubblemon added to the repository From fedora-extras-commits at redhat.com Fri Aug 12 07:56:15 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 12 Aug 2005 03:56:15 -0400 Subject: rpms/bubblemon/devel - New directory Message-ID: <200508120756.j7C7uFw2028395@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/bubblemon/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28370/bubblemon/devel Log Message: Directory /cvs/extras/rpms/bubblemon/devel added to the repository From fedora-extras-commits at redhat.com Fri Aug 12 07:58:19 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 12 Aug 2005 03:58:19 -0400 Subject: rpms/bubblemon Makefile,NONE,1.1 Message-ID: <200508120758.j7C7wJkQ028443@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/bubblemon In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28415/bubblemon Added Files: Makefile Log Message: broken import --- NEW FILE Makefile --- # Top level Makefile for module bubblemon all : CVS/Root common-update @cvs update common-update : CVS/Root common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Fri Aug 12 07:58:19 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 12 Aug 2005 03:58:19 -0400 Subject: rpms/bubblemon/devel Makefile,NONE,1.1 Message-ID: <200508120758.j7C7wJg7028448@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/bubblemon/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28415/bubblemon/devel Added Files: Makefile Log Message: broken import ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' From fedora-extras-commits at redhat.com Fri Aug 12 08:16:41 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Fri, 12 Aug 2005 04:16:41 -0400 Subject: rpms/bubblemon/devel bubblemon.spec,NONE,1.1 sources,NONE,1.1 Message-ID: <200508120816.j7C8GfX2030332@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/bubblemon/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30315/devel Added Files: bubblemon.spec sources Log Message: auto-import bubblemon-1.46-2 on branch devel from bubblemon-1.46-2.src.rpm --- NEW FILE bubblemon.spec --- Name: bubblemon Version: 1.46 Release: 2 Summary: A system monitoring dockapp Group: User Interface/X License: GPL URL: http://www.ne.jp/asahi/linux/timecop/ Source0: http://www.ne.jp/asahi/linux/timecop/software/bubblemon-dockapp-1.46.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: xorg-x11-devel BuildRequires: gtk+-devel %description his is a system monitoring dockapp, visually based on the GNOME "BubbleMon" applet (here). Basically, it displays CPU and memory load as bubbles in a jar of water. But that's where similarity ends. New bubblemon-dockapp features translucent CPU load meter (for accurate CPU load measurement), yellow duck swimming back and forth on the water surface (just for fun), and fading load average and memory usage screens. Either of the info screens can be locked to stay on top of water/duck/cpu screen, so that you can see both statistics at once. Pretty nifty toy for your desktop. Supports Linux, FreeBSD, OpenBSD, and Solaris 2.6, 7 and 8. Code has been thoroughly optimized since version 1.0, and even with all the features compiled in, BubbleMon still uses very little CPU time. Load Average screen locked at about 20% looks particularly sexy. All the extra "bloated" features can be compiled out or disabled on command-line, if you prefer original "BubbleMon" look. %prep %setup -q -n %{name}-dockapp-%{version} %build make CFLAGS="${RPM_OPT_FLAGS} `gtk-config --cflags` -DENABLE_DUCK -DENABLE_CPU -DENABLE_MEMSCREEN -DKERNEL_26" %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT %{__mkdir_p} $RPM_BUILD_ROOT%{_bindir} make install PREFIX=$RPM_BUILD_ROOT%{_prefix} %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc ChangeLog README doc/* %{_bindir}/bubblemon %changelog * Wed Aug 10 2005 Andreas Bierfert 1.46-2 - fix make install * Fri Jun 03 2005 Andreas Bierfert 1.46-1 - Initial Release --- NEW FILE sources --- f1f86fe5c725bf3a6f5fef8709992931 bubblemon-dockapp-1.46.tar.gz From fedora-extras-commits at redhat.com Fri Aug 12 08:24:37 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Fri, 12 Aug 2005 04:24:37 -0400 Subject: rpms/bubblemon/devel .cvsignore,NONE,1.1 Message-ID: <200508120824.j7C8Ob1k030424@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/bubblemon/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30408 Added Files: .cvsignore Log Message: - add .cvsignore --- NEW FILE .cvsignore --- bubblemon-dockapp-1.46.tar.gz From fedora-extras-commits at redhat.com Fri Aug 12 08:26:05 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Fri, 12 Aug 2005 04:26:05 -0400 Subject: rpms/bubblemon/devel bubblemon.spec,1.1,1.2 Message-ID: <200508120826.j7C8Q5uF030477@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/bubblemon/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30460 Modified Files: bubblemon.spec Log Message: - add dist tag Index: bubblemon.spec =================================================================== RCS file: /cvs/extras/rpms/bubblemon/devel/bubblemon.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- bubblemon.spec 12 Aug 2005 08:16:39 -0000 1.1 +++ bubblemon.spec 12 Aug 2005 08:26:03 -0000 1.2 @@ -1,6 +1,6 @@ Name: bubblemon Version: 1.46 -Release: 2 +Release: 3%{?dist} Summary: A system monitoring dockapp Group: User Interface/X @@ -50,6 +50,10 @@ %{_bindir}/bubblemon %changelog +* Fri Aug 12 2005 Andreas Bierfert +1.46-3 +- add dist tag + * Wed Aug 10 2005 Andreas Bierfert 1.46-2 - fix make install From fedora-extras-commits at redhat.com Fri Aug 12 10:42:28 2005 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Fri, 12 Aug 2005 06:42:28 -0400 Subject: fedora-security/audit fc4,1.39,1.40 Message-ID: <200508121042.j7CAgSeQ000795@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv778 Modified Files: fc4 Log Message: Updates based on latest cve mails Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- fc4 11 Aug 2005 21:04:59 -0000 1.39 +++ fc4 12 Aug 2005 10:42:26 -0000 1.40 @@ -1,8 +1,12 @@ -Up to date CVE as of CVE email 20050807 -Up to date FC4 as of 20050807 +Up to date CVE as of CVE email 20050811 +Up to date FC4 as of 20050811 ** are items that need attention +2005-2550 ** evolution +2005-2549 ** evolution +2005-2548 ** kernel +2005-2547 version (bluez-pin, fixed after 2.1.8, not before 2.1.6) 2005-2541 ignore (tar) is documented behaviour 2005-2536 ** pstotext 2005-2500 version (kernel, flaw introduced after 2.6.12) @@ -18,7 +22,7 @@ 2005-2395 ** firefox 2005-2370 version (kdenetwork, fixed 3.4.2) [since FEDORA-2005-670] was backport since FEDORA-2005-624 2005-2369 version (kdenetwork, fixed 3.4.2) [since FEDORA-2005-670] was backport since FEDORA-2005-624 -2005-2368 VULNERABLE (vim) +2005-2368 version (vim, fixed 6.3.086 at least) [since FEDORA-2005-737] 2005-2367 version (ethereal, fixed 0.10.12) [since FEDORA-2005-655] 2005-2366 version (ethereal, fixed 0.10.12) [since FEDORA-2005-655] 2005-2365 version (ethereal, fixed 0.10.12) [since FEDORA-2005-655] From fedora-extras-commits at redhat.com Fri Aug 12 10:52:34 2005 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Fri, 12 Aug 2005 06:52:34 -0400 Subject: fedora-security/audit fc4,1.40,1.41 Message-ID: <200508121052.j7CAqYdU000829@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv812 Modified Files: fc4 Log Message: Read about kernel issue, only 2.6.8 Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- fc4 12 Aug 2005 10:42:26 -0000 1.40 +++ fc4 12 Aug 2005 10:52:32 -0000 1.41 @@ -5,7 +5,7 @@ 2005-2550 ** evolution 2005-2549 ** evolution -2005-2548 ** kernel +2005-2548 version (kernel, fixed 2.6.9) only affected 2.6.8 2005-2547 version (bluez-pin, fixed after 2.1.8, not before 2.1.6) 2005-2541 ignore (tar) is documented behaviour 2005-2536 ** pstotext From fedora-extras-commits at redhat.com Fri Aug 12 11:11:36 2005 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Fri, 12 Aug 2005 07:11:36 -0400 Subject: fedora-security/audit fc4,1.41,1.42 Message-ID: <200508121111.j7CBBatL002069@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2052 Modified Files: fc4 Log Message: Correct inaccuracy in bluez-utils CVE Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- fc4 12 Aug 2005 10:52:32 -0000 1.41 +++ fc4 12 Aug 2005 11:11:34 -0000 1.42 @@ -6,7 +6,7 @@ 2005-2550 ** evolution 2005-2549 ** evolution 2005-2548 version (kernel, fixed 2.6.9) only affected 2.6.8 -2005-2547 version (bluez-pin, fixed after 2.1.8, not before 2.1.6) +2005-2547 version (bluez-pin, fixed 2.19) not before 2.16 2005-2541 ignore (tar) is documented behaviour 2005-2536 ** pstotext 2005-2500 version (kernel, flaw introduced after 2.6.12) From fedora-extras-commits at redhat.com Fri Aug 12 16:46:32 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 12 Aug 2005 12:46:32 -0400 Subject: rpms/perl-Array-Compare - New directory Message-ID: <200508121646.j7CGkWv1008980@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Array-Compare In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8956/perl-Array-Compare Log Message: Directory /cvs/extras/rpms/perl-Array-Compare added to the repository From fedora-extras-commits at redhat.com Fri Aug 12 16:46:33 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 12 Aug 2005 12:46:33 -0400 Subject: rpms/perl-Array-Compare/devel - New directory Message-ID: <200508121646.j7CGkXOE008985@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Array-Compare/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8956/perl-Array-Compare/devel Log Message: Directory /cvs/extras/rpms/perl-Array-Compare/devel added to the repository From fedora-extras-commits at redhat.com Fri Aug 12 16:47:00 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 12 Aug 2005 12:47:00 -0400 Subject: rpms/perl-Array-Compare Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200508121647.j7CGl0l5009030@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Array-Compare In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9002 Added Files: Makefile import.log Log Message: Setup of module perl-Array-Compare --- NEW FILE Makefile --- # Top level Makefile for module perl-Array-Compare all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Fri Aug 12 16:47:00 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 12 Aug 2005 12:47:00 -0400 Subject: rpms/perl-Array-Compare/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200508121647.j7CGl0OM009035@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Array-Compare/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9002/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Array-Compare --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Fri Aug 12 16:47:35 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 12 Aug 2005 12:47:35 -0400 Subject: rpms/perl-Array-Compare/devel perl-Array-Compare.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200508121648.j7CGm6BQ009105@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Array-Compare/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9067/devel Modified Files: .cvsignore sources Added Files: perl-Array-Compare.spec Log Message: auto-import perl-Array-Compare-1.12-3 on branch devel from perl-Array-Compare-1.12-3.src.rpm --- NEW FILE perl-Array-Compare.spec --- Name: perl-Array-Compare Version: 1.12 Release: 3%{?dist} Summary: Perl extension for comparing arrays Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/Array-Compare/ Source0: http://www.cpan.org/authors/id/D/DA/DAVECROSS/Array-Compare-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl >= 1:5.6.1 BuildRequires: perl(Module::Build) BuildRequires: perl(Test::Pod), perl(Test::Pod::Coverage) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description If you have two arrays and you want to know if they are the same or different, then Array::Compare will be useful to you. %prep %setup -q -n Array-Compare-%{version} %build %{__perl} Build.PL installdirs=vendor ./Build %install rm -rf $RPM_BUILD_ROOT ./Build install destdir=$RPM_BUILD_ROOT create_packlist=0 chmod -R u+w $RPM_BUILD_ROOT/* %check || : ./Build test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README %{perl_vendorlib}/Array/ %{_mandir}/man3/*.3* %changelog * Fri Jul 1 2005 Jose Pedro Oliveira - 1.12-3 - Dist tag. * Wed Apr 20 2005 Jose Pedro Oliveira - 0:1.12-0.fdr.2 - Avoid .packlist creation with Module::Build >= 0.2609. * Tue Mar 1 2005 Jose Pedro Oliveira - 0:1.12-0.fdr.1 - Update to 1.12. * Fri Nov 5 2004 Jose Pedro Oliveira - 0:1.11-0.fdr.1 - Update to 1.11. * Sun Jul 04 2004 Jose Pedro Oliveira - 0:1.09-0.fdr.1 - First build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Array-Compare/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 12 Aug 2005 16:46:58 -0000 1.1 +++ .cvsignore 12 Aug 2005 16:47:33 -0000 1.2 @@ -0,0 +1 @@ +Array-Compare-1.12.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Array-Compare/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 12 Aug 2005 16:46:58 -0000 1.1 +++ sources 12 Aug 2005 16:47:33 -0000 1.2 @@ -0,0 +1 @@ +9688cc922ff6b07fd9b8e577776fb70b Array-Compare-1.12.tar.gz From fedora-extras-commits at redhat.com Fri Aug 12 16:47:35 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 12 Aug 2005 12:47:35 -0400 Subject: rpms/perl-Array-Compare import.log,1.1,1.2 Message-ID: <200508121648.j7CGm5nm009101@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Array-Compare In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9067 Modified Files: import.log Log Message: auto-import perl-Array-Compare-1.12-3 on branch devel from perl-Array-Compare-1.12-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Array-Compare/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 12 Aug 2005 16:46:58 -0000 1.1 +++ import.log 12 Aug 2005 16:47:33 -0000 1.2 @@ -0,0 +1 @@ +perl-Array-Compare-1_12-3:HEAD:perl-Array-Compare-1.12-3.src.rpm:1123865244 From fedora-extras-commits at redhat.com Fri Aug 12 16:49:40 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 12 Aug 2005 12:49:40 -0400 Subject: rpms/perl-Test-Warn - New directory Message-ID: <200508121649.j7CGnesm009204@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Test-Warn In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9184/perl-Test-Warn Log Message: Directory /cvs/extras/rpms/perl-Test-Warn added to the repository From fedora-extras-commits at redhat.com Fri Aug 12 16:49:41 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 12 Aug 2005 12:49:41 -0400 Subject: rpms/perl-Test-Warn/devel - New directory Message-ID: <200508121649.j7CGnfQ1009209@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Test-Warn/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9184/perl-Test-Warn/devel Log Message: Directory /cvs/extras/rpms/perl-Test-Warn/devel added to the repository From fedora-extras-commits at redhat.com Fri Aug 12 16:50:02 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 12 Aug 2005 12:50:02 -0400 Subject: rpms/perl-Test-Warn Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200508121650.j7CGo2pP009256@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Test-Warn In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9229 Added Files: Makefile import.log Log Message: Setup of module perl-Test-Warn --- NEW FILE Makefile --- # Top level Makefile for module perl-Test-Warn all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Fri Aug 12 16:50:02 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 12 Aug 2005 12:50:02 -0400 Subject: rpms/perl-Test-Warn/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200508121650.j7CGo2PT009261@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Test-Warn/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9229/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Test-Warn --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Fri Aug 12 16:50:34 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 12 Aug 2005 12:50:34 -0400 Subject: rpms/perl-Test-Warn import.log,1.1,1.2 Message-ID: <200508121651.j7CGp4m0009327@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Test-Warn In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9293 Modified Files: import.log Log Message: auto-import perl-Test-Warn-0.08-2 on branch devel from perl-Test-Warn-0.08-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Test-Warn/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 12 Aug 2005 16:50:00 -0000 1.1 +++ import.log 12 Aug 2005 16:50:32 -0000 1.2 @@ -0,0 +1 @@ +perl-Test-Warn-0_08-2:HEAD:perl-Test-Warn-0.08-2.src.rpm:1123865423 From fedora-extras-commits at redhat.com Fri Aug 12 16:50:35 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 12 Aug 2005 12:50:35 -0400 Subject: rpms/perl-Test-Warn/devel perl-Test-Warn.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200508121651.j7CGp5ps009331@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Test-Warn/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9293/devel Modified Files: .cvsignore sources Added Files: perl-Test-Warn.spec Log Message: auto-import perl-Test-Warn-0.08-2 on branch devel from perl-Test-Warn-0.08-2.src.rpm --- NEW FILE perl-Test-Warn.spec --- Name: perl-Test-Warn Version: 0.08 Release: 2%{?dist} Summary: Perl extension to test methods for warnings Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/Test-Warn/ Source0: http://www.cpan.org/authors/id/B/BI/BIGJ/Test-Warn-0.08.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl >= 1:5.6.1 BuildRequires: perl(Test::Builder::Tester), perl(Test::Exception) BuildRequires: perl(Array::Compare), perl(Tree::DAG_Node) Requires: perl(Tree::DAG_Node) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description This module provides a few convenience methods for testing warning based code. %prep %setup -q -n Test-Warn-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %check || : make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README %{perl_vendorlib}/Test/ %{_mandir}/man3/*.3* %changelog * Fri Jul 1 2005 Jose Pedro Oliveira - 0.08-2 - Dist tag. * Sun Jul 04 2004 Jose Pedro Oliveira - 0:0.08-0.fdr.1 - First build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Test-Warn/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 12 Aug 2005 16:50:00 -0000 1.1 +++ .cvsignore 12 Aug 2005 16:50:33 -0000 1.2 @@ -0,0 +1 @@ +Test-Warn-0.08.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Test-Warn/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 12 Aug 2005 16:50:00 -0000 1.1 +++ sources 12 Aug 2005 16:50:33 -0000 1.2 @@ -0,0 +1 @@ +95fa7fa694f00ec414a877ae4ef65d7b Test-Warn-0.08.tar.gz From fedora-extras-commits at redhat.com Fri Aug 12 16:56:37 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 12 Aug 2005 12:56:37 -0400 Subject: owners owners.list,1.72,1.73 Message-ID: <200508121656.j7CGubOp009396@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9379 Modified Files: owners.list Log Message: New packages: perl-Array-Compare and perl-Test-Warn Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.72 retrieving revision 1.73 diff -u -r1.72 -r1.73 --- owners.list 11 Aug 2005 21:24:54 -0000 1.72 +++ owners.list 12 Aug 2005 16:56:35 -0000 1.73 @@ -515,6 +515,7 @@ Fedora Extras|pdftohtml|A PDF to HTML converter|gauret at free.fr|extras-qa at fedoraproject.org| Fedora Extras|perl-AppConfig|Perl module for reading configuration files|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Archive-Zip|Perl library for accessing Zip archives|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Array-Compare|Perl extension for comparing arrays|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Authen-SASL|SASL Authentication framework for Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-BerkeleyDB|Perl interface to Berkeley DB|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-bioperl|A package of public domain Perl tools for computational molecular biology|thm at duke.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com @@ -622,6 +623,7 @@ Fedora Extras|perl-Test-Pod-Coverage|POD documentation coverage checker|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Test-Pod|Perl module for checking for POD errors in files|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Test-Taint|Tools to test taintedness|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Test-Warn|Perl extension to test methods for warnings|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-TeX-Hyphen|Hyphenate words using TeX's patterns|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Text-Autoformat|Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Text-Iconv|Perl interface to iconv() codeset conversion function|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From jpo at di.uminho.pt Fri Aug 12 18:02:04 2005 From: jpo at di.uminho.pt (=?ISO-8859-1?Q?Jos=E9_Pedro_Oliveira?=) Date: Fri, 12 Aug 2005 19:02:04 +0100 Subject: APPROVED: scanssh Message-ID: <42FCE41C.2030507@di.uminho.pt> Description : ScanSSH supports scanning a list of addresses and networks for open proxies, SSH protocol servers, Web and SMTP servers. Where possible ScanSSH, displays the version number of the running services. ScanSSH protocol scanner supports random selection of IP addresses from large network ranges and is useful for gathering statistics on the deployment of SSH protocol servers in a company or the Internet as whole. Maintainer: Oliver Falk Reviewers: Jos? Pedro Oliveira, Ralf Corsepius -- Jos? Pedro Oliveira * mailto: jpo at di.uminho.pt * http://gsd.di.uminho.pt/jpo * * gpg fingerprint = F9B6 8D87 859D 1C94 48F0 84C0 9749 9EB5 91BD 851B * http://conferences.yapceurope.org/2005/ * http://braga.yapceurope.org/ -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 251 bytes Desc: OpenPGP digital signature URL: From fedora-extras-commits at redhat.com Fri Aug 12 22:41:20 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Fri, 12 Aug 2005 18:41:20 -0400 Subject: rpms/libetpan - New directory Message-ID: <200508122241.j7CMfKPX017367@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libetpan In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17347/libetpan Log Message: Directory /cvs/extras/rpms/libetpan added to the repository From fedora-extras-commits at redhat.com Fri Aug 12 22:41:20 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Fri, 12 Aug 2005 18:41:20 -0400 Subject: rpms/libetpan/devel - New directory Message-ID: <200508122241.j7CMfKHZ017372@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libetpan/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17347/libetpan/devel Log Message: Directory /cvs/extras/rpms/libetpan/devel added to the repository From fedora-extras-commits at redhat.com Fri Aug 12 22:41:59 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Fri, 12 Aug 2005 18:41:59 -0400 Subject: rpms/libetpan/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200508122241.j7CMfxsp017431@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libetpan/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17395/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module libetpan --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Fri Aug 12 22:41:59 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Fri, 12 Aug 2005 18:41:59 -0400 Subject: rpms/libetpan Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200508122241.j7CMfxCH017426@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libetpan In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17395 Added Files: Makefile import.log Log Message: Setup of module libetpan --- NEW FILE Makefile --- # Top level Makefile for module libetpan all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Fri Aug 12 22:43:48 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Fri, 12 Aug 2005 18:43:48 -0400 Subject: rpms/libetpan import.log,1.1,1.2 Message-ID: <200508122244.j7CMiICu017495@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libetpan In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17461 Modified Files: import.log Log Message: auto-import libetpan-0.38-3 on branch devel from libetpan-0.38-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/libetpan/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 12 Aug 2005 22:41:57 -0000 1.1 +++ import.log 12 Aug 2005 22:43:46 -0000 1.2 @@ -0,0 +1 @@ +libetpan-0_38-3:HEAD:libetpan-0.38-3.src.rpm:1123886612 From fedora-extras-commits at redhat.com Fri Aug 12 22:43:49 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Fri, 12 Aug 2005 18:43:49 -0400 Subject: rpms/libetpan/devel libetpan.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200508122244.j7CMiJwH017499@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libetpan/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17461/devel Modified Files: .cvsignore sources Added Files: libetpan.spec Log Message: auto-import libetpan-0.38-3 on branch devel from libetpan-0.38-3.src.rpm --- NEW FILE libetpan.spec --- Name: libetpan Version: 0.38 Release: 3 Summary: Portable, efficient middleware for different kinds of mail access Group: System Environment/Libraries License: BSD URL: http://www.etpan.org/ Source0: http://dl.sf.net/%{name}/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: db4-devel BuildRequires: cyrus-sasl-devel BuildRequires: openssl-devel %description The purpose of this mail library is to provide a portable, efficient middleware for different kinds of mail access. When using the drivers interface, the interface is the same for all kinds of mail access, remote and local mailboxes. %package devel Summary: Development package for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: openssl-devel Requires: cyrus-sasl-devel Requires: db4-devel %description devel The %{name}-devel package contains the files needed for development with %{name}. %prep %setup -q %build %configure --disable-static --with-gnutls=no make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT%{_libdir}/libetpan.la chmod 755 $RPM_BUILD_ROOT%{_libdir}/libetpan.so.3.0.0 %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc ChangeLog COPYRIGHT NEWS TODO %{_libdir}/*.so.* %files devel %defattr(-,root,root,-) %doc doc/API.html doc/README.html doc/DOCUMENTATION %{_bindir}/libetpan-config %{_includedir}/libetpan.h %{_includedir}/libetpan %{_libdir}/*.so %changelog * Mon Aug 08 2005 Andreas Bierfert 0.38-3 - remove some doc - build without gnutls * Sun Jul 31 2005 Andreas Bierfert 0.38-2 - add documentation - add more Requires/BuildRequires - build with gnutls support * Sun Jul 31 2005 Andreas Bierfert 0.38-1 - Initial Release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libetpan/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 12 Aug 2005 22:41:57 -0000 1.1 +++ .cvsignore 12 Aug 2005 22:43:46 -0000 1.2 @@ -0,0 +1 @@ +libetpan-0.38.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/libetpan/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 12 Aug 2005 22:41:57 -0000 1.1 +++ sources 12 Aug 2005 22:43:46 -0000 1.2 @@ -0,0 +1 @@ +4d31145dee857beca7e283aa03fe9450 libetpan-0.38.tar.gz From fedora-extras-commits at redhat.com Fri Aug 12 22:50:44 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Fri, 12 Aug 2005 18:50:44 -0400 Subject: owners owners.list,1.73,1.74 Message-ID: <200508122250.j7CMoikH017565@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17548 Modified Files: owners.list Log Message: - add bubblemon Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.73 retrieving revision 1.74 diff -u -r1.73 -r1.74 --- owners.list 12 Aug 2005 16:56:35 -0000 1.73 +++ owners.list 12 Aug 2005 22:50:42 -0000 1.74 @@ -57,6 +57,7 @@ Fedora Extras|bochs|Bochs Project x86 PC Emulator|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|bonnie++|Bonnie++ filesystem and disk benchmark & burn-in suite|wtogami at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|brightside|Add reactivity to the corners and edges of your GNOME desktop|fedora at leemhuis.info|extras-qa at fedoraproject.org| +Fedora Extras|bubblemon|A system monitoring dockapp|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|buildsystem|Fedora-Extras Buildsystem|skvidal at phy.duke.edu|extras-qa at fedoraproject.org| Fedora Extras|bwbar|A program that generates a readout of the current bandwidth use|adrian at lisas.de|extras-qa at fedoraproject.org| Fedora Extras|bwm-ng|Bandwidth Monitor NG|oliver at linux-kernel.at|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Fri Aug 12 22:51:48 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Fri, 12 Aug 2005 18:51:48 -0400 Subject: rpms/libetpan/devel libetpan.spec,1.1,1.2 Message-ID: <200508122251.j7CMpmTe017588@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libetpan/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17571 Modified Files: libetpan.spec Log Message: - add dist tag Index: libetpan.spec =================================================================== RCS file: /cvs/extras/rpms/libetpan/devel/libetpan.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libetpan.spec 12 Aug 2005 22:43:46 -0000 1.1 +++ libetpan.spec 12 Aug 2005 22:51:46 -0000 1.2 @@ -1,6 +1,6 @@ Name: libetpan Version: 0.38 -Release: 3 +Release: 4%{?dist} Summary: Portable, efficient middleware for different kinds of mail access Group: System Environment/Libraries @@ -65,6 +65,10 @@ %{_libdir}/*.so %changelog +* Sat Aug 13 2005 Andreas Bierfert +0.38-4 +- add dist tag + * Mon Aug 08 2005 Andreas Bierfert 0.38-3 - remove some doc From fedora-extras-commits at redhat.com Sat Aug 13 02:50:13 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 12 Aug 2005 22:50:13 -0400 Subject: owners owners.list,1.74,1.75 Message-ID: <200508130250.j7D2oDIX027278@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27261 Modified Files: owners.list Log Message: Add libgdamm. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.74 retrieving revision 1.75 diff -u -r1.74 -r1.75 --- owners.list 12 Aug 2005 22:50:42 -0000 1.74 +++ owners.list 13 Aug 2005 02:50:11 -0000 1.75 @@ -365,6 +365,7 @@ Fedora Extras|libfwbuilder|Firewall Builder API|sgrubb at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|libgcrypt1|A general-purpose cryptography library|bugs.michael at gmx.net|extras-qa at fedoraproject.org| Fedora Extras|libgda|Library for writing gnome database programs|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org| +Fedora Extras|libgdamm|C++ wrappers for libgda|tcallawa at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|libglademm20|A C++ wrapper for libglade|denisleroy at yahoo.com|extras-qa at fedoraproject.org| Fedora Extras|libglademm24|A C++ wrapper for libglade|denisleroy at yahoo.com|extras-qa at fedoraproject.org| Fedora Extras|libgnomecanvasmm20|A C++ interface for Gnome libs (a GUI library for X)|denisleroy at yahoo.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sat Aug 13 03:15:41 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Fri, 12 Aug 2005 23:15:41 -0400 Subject: rpms/perl-Number-Compare - New directory Message-ID: <200508130315.j7D3FfXS028674@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Number-Compare In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28650/perl-Number-Compare Log Message: Directory /cvs/extras/rpms/perl-Number-Compare added to the repository From fedora-extras-commits at redhat.com Sat Aug 13 03:15:42 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Fri, 12 Aug 2005 23:15:42 -0400 Subject: rpms/perl-Number-Compare/devel - New directory Message-ID: <200508130315.j7D3FgF7028679@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Number-Compare/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28650/perl-Number-Compare/devel Log Message: Directory /cvs/extras/rpms/perl-Number-Compare/devel added to the repository From fedora-extras-commits at redhat.com Sat Aug 13 03:16:04 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Fri, 12 Aug 2005 23:16:04 -0400 Subject: rpms/perl-Number-Compare Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200508130316.j7D3G4CH028722@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Number-Compare In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28695 Added Files: Makefile import.log Log Message: Setup of module perl-Number-Compare --- NEW FILE Makefile --- # Top level Makefile for module perl-Number-Compare all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Sat Aug 13 03:16:05 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Fri, 12 Aug 2005 23:16:05 -0400 Subject: rpms/perl-Number-Compare/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200508130316.j7D3G5jX028727@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Number-Compare/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28695/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Number-Compare --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Sat Aug 13 03:16:52 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Fri, 12 Aug 2005 23:16:52 -0400 Subject: rpms/perl-Number-Compare import.log,1.1,1.2 Message-ID: <200508130317.j7D3HMHR028794@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Number-Compare In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28760 Modified Files: import.log Log Message: auto-import perl-Number-Compare-0.01-2 on branch devel from perl-Number-Compare-0.01-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Number-Compare/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 13 Aug 2005 03:16:02 -0000 1.1 +++ import.log 13 Aug 2005 03:16:50 -0000 1.2 @@ -0,0 +1 @@ +perl-Number-Compare-0_01-2:HEAD:perl-Number-Compare-0.01-2.src.rpm:1123902995 From fedora-extras-commits at redhat.com Sat Aug 13 03:16:52 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Fri, 12 Aug 2005 23:16:52 -0400 Subject: rpms/perl-Number-Compare/devel perl-Number-Compare.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200508130317.j7D3HNXF028798@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Number-Compare/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28760/devel Modified Files: .cvsignore sources Added Files: perl-Number-Compare.spec Log Message: auto-import perl-Number-Compare-0.01-2 on branch devel from perl-Number-Compare-0.01-2.src.rpm --- NEW FILE perl-Number-Compare.spec --- Name: perl-Number-Compare Version: 0.01 Release: 2%{?dist} Summary: Perl module for numeric comparisons License: Artistic or GPL Group: Development/Libraries URL: http://search.cpan.org/dist/Number-Compare/ Source0: http://www.cpan.org/modules/by-module/Number/Number-Compare-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Number::Compare compiles a simple comparison to an anonymous subroutine, which you can call with a value to be tested again. %prep %setup -q -n Number-Compare-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type f -name '*.bs' -a -size 0 -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %clean rm -rf $RPM_BUILD_ROOT %check make test %files %defattr(-,root,root,-) %doc Changes %{perl_vendorlib}/Number %{_mandir}/man3/* %changelog * Fri Aug 10 2005 Ralf Corsepius - 0.01-2 - FE re-submission. * Fri Jul 01 2005 Ralf Corsepius - 0.01-1 - FE submission. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Number-Compare/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 13 Aug 2005 03:16:03 -0000 1.1 +++ .cvsignore 13 Aug 2005 03:16:50 -0000 1.2 @@ -0,0 +1 @@ +Number-Compare-0.01.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Number-Compare/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 13 Aug 2005 03:16:03 -0000 1.1 +++ sources 13 Aug 2005 03:16:50 -0000 1.2 @@ -0,0 +1 @@ +519a4434e35033e9bd034d27cd2fd299 Number-Compare-0.01.tar.gz From fedora-extras-commits at redhat.com Sat Aug 13 03:22:12 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Fri, 12 Aug 2005 23:22:12 -0400 Subject: rpms/perl-Number-Compare/devel perl-Number-Compare.spec,1.1,1.2 Message-ID: <200508130322.j7D3MCq4028854@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Number-Compare/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28837 Modified Files: perl-Number-Compare.spec Log Message: Spec cleanup Index: perl-Number-Compare.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Number-Compare/devel/perl-Number-Compare.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Number-Compare.spec 13 Aug 2005 03:16:50 -0000 1.1 +++ perl-Number-Compare.spec 13 Aug 2005 03:22:10 -0000 1.2 @@ -1,6 +1,6 @@ Name: perl-Number-Compare Version: 0.01 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Perl module for numeric comparisons License: Artistic or GPL Group: Development/Libraries @@ -29,7 +29,6 @@ rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' -find $RPM_BUILD_ROOT -type f -name '*.bs' -a -size 0 -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* @@ -48,7 +47,10 @@ %{_mandir}/man3/* %changelog -* Fri Aug 10 2005 Ralf Corsepius - 0.01-2 +* Wed Aug 13 2005 Ralf Corsepius - 0.01-3 +- Spec cleanup. + +* Wed Aug 10 2005 Ralf Corsepius - 0.01-2 - FE re-submission. * Fri Jul 01 2005 Ralf Corsepius - 0.01-1 From fedora-extras-commits at redhat.com Sat Aug 13 03:22:33 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Fri, 12 Aug 2005 23:22:33 -0400 Subject: rpms/perl-Number-Compare/devel perl-Number-Compare.spec,1.2,1.3 Message-ID: <200508130322.j7D3MXHv028877@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Number-Compare/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28860 Modified Files: perl-Number-Compare.spec Log Message: Spec cleanup Index: perl-Number-Compare.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Number-Compare/devel/perl-Number-Compare.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Number-Compare.spec 13 Aug 2005 03:22:10 -0000 1.2 +++ perl-Number-Compare.spec 13 Aug 2005 03:22:31 -0000 1.3 @@ -47,7 +47,7 @@ %{_mandir}/man3/* %changelog -* Wed Aug 13 2005 Ralf Corsepius - 0.01-3 +* Sat Aug 13 2005 Ralf Corsepius - 0.01-3 - Spec cleanup. * Wed Aug 10 2005 Ralf Corsepius - 0.01-2 From fedora-extras-commits at redhat.com Sat Aug 13 04:52:57 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Sat, 13 Aug 2005 00:52:57 -0400 Subject: owners owners.list,1.75,1.76 Message-ID: <200508130452.j7D4qwH7031067@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31050 Modified Files: owners.list Log Message: Add perl-Number-Compare Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.75 retrieving revision 1.76 diff -u -r1.75 -r1.76 --- owners.list 13 Aug 2005 02:50:11 -0000 1.75 +++ owners.list 13 Aug 2005 04:52:55 -0000 1.76 @@ -599,6 +599,7 @@ Fedora Extras|perl-Net-Server|Extensible, general Perl server engine|Nicolas.Mailhot at laPoste.net|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Net-SSH|Perl extension for secure shell|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Net-SSLeay|Perl extension for using OpenSSL|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Number-Compare|Perl module for numeric comparisons|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-OLE-Storage_Lite|Simple Class for OLE document interface|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-PAR-Dist|Toolkit for creating and manipulating Perl PAR distributions|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-pmtools|A suite of small programs to help manage Perl modules|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Sat Aug 13 05:57:37 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 13 Aug 2005 01:57:37 -0400 Subject: rpms/rpmlint/devel rpmlint-fedora-config, 1.8, 1.9 rpmlint.spec, 1.16, 1.17 Message-ID: <200508130557.j7D5vbt3032329@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/rpmlint/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32310 Modified Files: rpmlint-fedora-config rpmlint.spec Log Message: * Sat Aug 13 2005 Ville Skytt?? - Add dangling symlink exceptions tuned for Fedora to default config (partially fixes #165839). Index: rpmlint-fedora-config =================================================================== RCS file: /cvs/extras/rpms/rpmlint/devel/rpmlint-fedora-config,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- rpmlint-fedora-config 11 Aug 2005 19:32:46 -0000 1.8 +++ rpmlint-fedora-config 13 Aug 2005 05:57:35 -0000 1.9 @@ -74,6 +74,10 @@ "/usr/bin/perl", "/usr/bin/python", )) +setOption("DanglingSymlinkExceptions", ( + ['consolehelper$', 'usermode'], + ['consolehelper-gtk$', 'usermode-gtk'], +)) # Output filters addFilter("W: .* source-or-patch-not-[bg]zipped .*") Index: rpmlint.spec =================================================================== RCS file: /cvs/extras/rpms/rpmlint/devel/rpmlint.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- rpmlint.spec 11 Aug 2005 19:32:46 -0000 1.16 +++ rpmlint.spec 13 Aug 2005 05:57:35 -0000 1.17 @@ -88,6 +88,10 @@ %changelog +* Sat Aug 13 2005 Ville Skytt?? +- Add dangling symlink exceptions tuned for Fedora to default config + (partially fixes #165839). + * Wed Aug 10 2005 Ville Skytt?? - 0.71-1 - 0.71, confmsg patch and bits from initvars patch applied upstream. - Filter out Mandriva-specific errors about missing locales-* deps (#165457). From fedora-extras-commits at redhat.com Sat Aug 13 07:09:05 2005 From: fedora-extras-commits at redhat.com (Colin Charles (byte)) Date: Sat, 13 Aug 2005 03:09:05 -0400 Subject: rpms/MagicPoint/devel MagicPoint.spec,1.2,1.3 Message-ID: <200508130709.j7D795wq002361@cvs-int.fedora.redhat.com> Author: byte Update of /cvs/extras/rpms/MagicPoint/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2344 Modified Files: MagicPoint.spec Log Message: * Fri Aug 5 2005 Colin Charles - 1.11b-3 - Re-enable debuginfo builds - Ralf Corsepius watchful eyes fixes - cleaning up the spec Index: MagicPoint.spec =================================================================== RCS file: /cvs/extras/rpms/MagicPoint/devel/MagicPoint.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- MagicPoint.spec 4 Aug 2005 12:15:39 -0000 1.2 +++ MagicPoint.spec 13 Aug 2005 07:09:02 -0000 1.3 @@ -5,7 +5,7 @@ Name: MagicPoint Version: 1.11b -Release: 2%{?dist} +Release: 3%{?dist} Summary: X based presentation software Group: Applications/Productivity @@ -21,9 +21,7 @@ Patch11: magicpoint-1.10a-fix-gcc34.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildPrereq: freetype-devel -BuildRequires: fontconfig-devel xorg-x11-devel libungif-devel libpng-devel libmng-devel imlib-devel autoconf automake libtool byacc flex -#Requires: VFlib2 >= 2.25.6-8 VFlib2-conf-ja >= 2.25.6-8 +BuildRequires: freetype-devel fontconfig-devel xorg-x11-devel libungif-devel libpng-devel libmng-devel imlib-devel autoconf automake libtool byacc flex Requires: imlib Obsoletes: mgp,magicpoint Provides: mgp,magicpoint @@ -43,7 +41,7 @@ %patch11 -p1 -b .gcc34 %build -CFLAGS=-I/usr/include/freetype1/freetype +CPPFLAGS=-I/usr/include/freetype1/freetype autoconf cp /usr/share/libtool/config.{sub,guess} . %configure --prefix=/usr/X11R6 --enable-gif --disable-vflib --enable-imlib @@ -52,12 +50,11 @@ rm -rf $RPM_BUILD_DIR/magicpoint-%{version}/sample/.cvsignore %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT make install install.man DESTDIR=$RPM_BUILD_ROOT -strip `file $RPM_BUILD_ROOT/%{x11bindir}/* | grep ELF | cut -d : -f 1` %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT %files %defattr(755,root,root,755) @@ -68,6 +65,10 @@ %{x11mandir}/*/* %changelog +* Fri Aug 5 2005 Colin Charles - 1.11b-3 +- Re-enable debuginfo builds +- Ralf Corsepius watchful eyes fixes - cleaning up the spec + * Thu Aug 4 2005 Colin Charles - 1.11b-2 - Removed Patch12 to fix undefined operation - Bump spec to somewhat match work from Rui Miguel Silva Seabra From fedora-extras-commits at redhat.com Sat Aug 13 08:31:14 2005 From: fedora-extras-commits at redhat.com (Colin Charles (byte)) Date: Sat, 13 Aug 2005 04:31:14 -0400 Subject: owners owners.list,1.76,1.77 Message-ID: <200508130831.j7D8VEFh005266@cvs-int.fedora.redhat.com> Author: byte Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5249 Modified Files: owners.list Log Message: MagicPoint co-maintainer Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.76 retrieving revision 1.77 diff -u -r1.76 -r1.77 --- owners.list 13 Aug 2005 04:52:55 -0000 1.76 +++ owners.list 13 Aug 2005 08:31:12 -0000 1.77 @@ -433,7 +433,7 @@ Fedora Extras|Macaulay2|A system for algebraic geometry and commutative algebra|rdieter at math.unl.edu|extras-qa at fedoraproject.org| Fedora Extras|mach|make a chroot|thomas at apestaart.org|extras-qa at fedoraproject.org| Fedora Extras|Maelstrom|A space combat game.|notting at redhat.com|extras-qa at fedoraproject.org| -Fedora Extras|MagicPoint|X based presentation software|colin at fedoraproject.org|extras-qa at fedoraproject.org| +Fedora Extras|MagicPoint|X based presentation software|colin at fedoraproject.org|extras-qa at fedoraproject.org|rms at 1407.org Fedora Extras|mail-notification|Mail Notification is a status icon that informs you if you have new mail|fedora at leemhuis.info|extras-qa at fedoraproject.org| Fedora Extras|manedit|GUI editor for creating man pages.|nos at utelsystems.com|extras-qa at fedoraproject.org| Fedora Extras|mantis|A web-based bugtracking system|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sat Aug 13 11:37:33 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sat, 13 Aug 2005 07:37:33 -0400 Subject: rpms/perl-HTML-Template/FC-4 perl-HTML-Template.spec,1.6,1.7 Message-ID: <200508131137.j7DBbXJL009266@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-HTML-Template/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9237/FC-4 Modified Files: perl-HTML-Template.spec Log Message: README file: corrected the end-of-line encoding (#165874). Index: perl-HTML-Template.spec =================================================================== RCS file: /cvs/extras/rpms/perl-HTML-Template/FC-4/perl-HTML-Template.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- perl-HTML-Template.spec 6 Apr 2005 22:12:45 -0000 1.6 +++ perl-HTML-Template.spec 13 Aug 2005 11:37:31 -0000 1.7 @@ -1,20 +1,17 @@ -%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)} - Name: perl-HTML-Template Version: 2.7 -Release: 3 - +Release: 4%{?dist} Summary: Perl module to use HTML Templates Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/HTML-Template/ -Source0: http://www.cpan.org/authors/id/S/SA/SAMTREGAR/HTML-Template-2.7.tar.gz +Source0: http://www.cpan.org/authors/id/S/SA/SAMTREGAR/HTML-Template-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: perl >= 1:5.6.1, perl(Test::More), perl(Digest::MD5) -BuildRequires: perl(IPC::SharedCache), perl(Storable) +BuildRequires: perl >= 1:5.6.1 +BuildRequires: perl(IPC::SharedCache) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -31,6 +28,7 @@ %prep %setup -q -n HTML-Template-%{version} +%{__perl} -pi -e 's/\r//g' README %build @@ -62,7 +60,11 @@ %changelog -* Fri Apr 7 2005 Michael Schwendt +* Sat Aug 13 2005 Jose Pedro Oliveira - 2.7-4 +- README file: corrected the end-of-line encoding (#165874). +- Bring up to date with Fedora Extras template. + +* Fri Apr 7 2005 Michael Schwendt - 2.7-3 - rebuilt * Mon Oct 25 2004 Jose Pedro Oliveira - 0:2.7-0.fdr.2 From fedora-extras-commits at redhat.com Sat Aug 13 11:37:33 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sat, 13 Aug 2005 07:37:33 -0400 Subject: rpms/perl-HTML-Template/devel perl-HTML-Template.spec,1.6,1.7 Message-ID: <200508131137.j7DBbXMa009272@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-HTML-Template/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9237/devel Modified Files: perl-HTML-Template.spec Log Message: README file: corrected the end-of-line encoding (#165874). Index: perl-HTML-Template.spec =================================================================== RCS file: /cvs/extras/rpms/perl-HTML-Template/devel/perl-HTML-Template.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- perl-HTML-Template.spec 6 Apr 2005 22:12:45 -0000 1.6 +++ perl-HTML-Template.spec 13 Aug 2005 11:37:31 -0000 1.7 @@ -1,20 +1,17 @@ -%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)} - Name: perl-HTML-Template Version: 2.7 -Release: 3 - +Release: 4%{?dist} Summary: Perl module to use HTML Templates Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/HTML-Template/ -Source0: http://www.cpan.org/authors/id/S/SA/SAMTREGAR/HTML-Template-2.7.tar.gz +Source0: http://www.cpan.org/authors/id/S/SA/SAMTREGAR/HTML-Template-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: perl >= 1:5.6.1, perl(Test::More), perl(Digest::MD5) -BuildRequires: perl(IPC::SharedCache), perl(Storable) +BuildRequires: perl >= 1:5.6.1 +BuildRequires: perl(IPC::SharedCache) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -31,6 +28,7 @@ %prep %setup -q -n HTML-Template-%{version} +%{__perl} -pi -e 's/\r//g' README %build @@ -62,7 +60,11 @@ %changelog -* Fri Apr 7 2005 Michael Schwendt +* Sat Aug 13 2005 Jose Pedro Oliveira - 2.7-4 +- README file: corrected the end-of-line encoding (#165874). +- Bring up to date with Fedora Extras template. + +* Fri Apr 7 2005 Michael Schwendt - 2.7-3 - rebuilt * Mon Oct 25 2004 Jose Pedro Oliveira - 0:2.7-0.fdr.2 From fedora-extras-commits at redhat.com Sat Aug 13 17:58:10 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Sat, 13 Aug 2005 13:58:10 -0400 Subject: rpms/tkcvs/FC-4 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 tkcvs.spec, 1.10, 1.11 Message-ID: <200508131758.j7DHwAwL017165@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/tkcvs/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17144 Modified Files: .cvsignore sources tkcvs.spec Log Message: new version 7.2.4 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/tkcvs/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 5 Jul 2005 16:50:43 -0000 1.4 +++ .cvsignore 13 Aug 2005 17:58:07 -0000 1.5 @@ -1 +1 @@ -tkcvs_7_2_3.tar.gz +tkcvs_7_2_4.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/tkcvs/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 5 Jul 2005 16:50:43 -0000 1.4 +++ sources 13 Aug 2005 17:58:07 -0000 1.5 @@ -1 +1 @@ -ef7bf5114a083bd36c2bc793d1ca23c5 tkcvs_7_2_3.tar.gz +d5fc8adc92c197c9662512a698de62d0 tkcvs_7_2_4.tar.gz Index: tkcvs.spec =================================================================== RCS file: /cvs/extras/rpms/tkcvs/FC-4/tkcvs.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- tkcvs.spec 5 Jul 2005 16:50:43 -0000 1.10 +++ tkcvs.spec 13 Aug 2005 17:58:07 -0000 1.11 @@ -1,13 +1,13 @@ Name: tkcvs -Version: 7.2.3 -Release: 1 +Version: 7.2.4 +Release: 1%{?dist} Summary: TkCVS and TkDiff Group: Development/Tools License: GPL URL: http://www.twobarleycorns.net/tkcvs.html -Source: http://www.twobarleycorns.net/tkcvs_7_2_3.tar.gz +Source: http://www.twobarleycorns.net/tkcvs_7_2_4.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: tk, tcl, cvs BuildArch: noarch @@ -20,7 +20,7 @@ merging your changes. %prep -%setup -q -n tkcvs_7_2_3 +%setup -q -n tkcvs_7_2_4 %build perl -pi -e 's|set TCDIR \[file join \$TclRoot tkcvs\]|set TCDIR "%{_datadir}/tkcvs"|' tkcvs/tkcvs.tcl @@ -51,6 +51,9 @@ %{_mandir}/man1/* %changelog +* Sat Aug 13 2005 Gerard Milmeister - 7.2.4 +- New Version 2.7.4 + * Tue Jul 5 2005 Gerard Milmeister - 7.2.3-1 - New Version 2.7.3 From fedora-extras-commits at redhat.com Sat Aug 13 17:58:55 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Sat, 13 Aug 2005 13:58:55 -0400 Subject: rpms/tkcvs/FC-3 sources,1.3,1.4 tkcvs.spec,1.7,1.8 Message-ID: <200508131758.j7DHwtr6017190@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/tkcvs/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17171 Modified Files: sources tkcvs.spec Log Message: new version 7.2.4 Index: sources =================================================================== RCS file: /cvs/extras/rpms/tkcvs/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 12 Feb 2005 13:23:15 -0000 1.3 +++ sources 13 Aug 2005 17:58:53 -0000 1.4 @@ -1 +1 @@ -8cf12b4e30209228eb8050ac6ee2da80 tkcvs_7_2_2.tar.gz +d5fc8adc92c197c9662512a698de62d0 tkcvs_7_2_4.tar.gz Index: tkcvs.spec =================================================================== RCS file: /cvs/extras/rpms/tkcvs/FC-3/tkcvs.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- tkcvs.spec 14 Feb 2005 21:33:30 -0000 1.7 +++ tkcvs.spec 13 Aug 2005 17:58:53 -0000 1.8 @@ -1,13 +1,13 @@ Name: tkcvs -Version: 7.2.2 -Release: 2 -Epoch: 0 +Version: 7.2.4 +Release: 1%{?dist} + Summary: TkCVS and TkDiff Group: Development/Tools License: GPL URL: http://www.twobarleycorns.net/tkcvs.html -Source: http://www.twobarleycorns.net/tkcvs_7_2_2.tar.gz +Source: http://www.twobarleycorns.net/tkcvs_7_2_4.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: tk, tcl, cvs BuildArch: noarch @@ -20,7 +20,7 @@ merging your changes. %prep -%setup -q -n tkcvs_7_2_2 +%setup -q -n tkcvs_7_2_4 %build perl -pi -e 's|set TCDIR \[file join \$TclRoot tkcvs\]|set TCDIR "%{_datadir}/tkcvs"|' tkcvs/tkcvs.tcl @@ -45,12 +45,21 @@ %files %defattr(-,root,root) +%doc CHANGELOG COPYING FAQ vendor5readme.pdf vendorcode.sh %{_datadir}/tkcvs %{_bindir}/* %{_mandir}/man1/* -%doc CHANGELOG COPYING FAQ vendor5readme.pdf vendorcode.sh %changelog +* Sat Aug 13 2005 Gerard Milmeister - 7.2.4 +- New Version 2.7.4 + +* Tue Jul 5 2005 Gerard Milmeister - 7.2.3-1 +- New Version 2.7.3 + +* Fri Apr 7 2005 Michael Schwendt +- rebuilt + * Mon Feb 14 2005 Gerard Milmeister - 0:7.2.2-2 - Changed tk-devel and tcl-devel to tk and tcl - Moved %%{_libdir}/tkcvs to %%{_datadir}/tkcvs From fedora-extras-commits at redhat.com Sat Aug 13 17:59:09 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Sat, 13 Aug 2005 13:59:09 -0400 Subject: rpms/tkcvs/devel sources,1.4,1.5 tkcvs.spec,1.10,1.11 Message-ID: <200508131759.j7DHx9JG017215@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/tkcvs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17196 Modified Files: sources tkcvs.spec Log Message: new version 7.2.4 Index: sources =================================================================== RCS file: /cvs/extras/rpms/tkcvs/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 5 Jul 2005 16:51:32 -0000 1.4 +++ sources 13 Aug 2005 17:59:07 -0000 1.5 @@ -1 +1 @@ -ef7bf5114a083bd36c2bc793d1ca23c5 tkcvs_7_2_3.tar.gz +d5fc8adc92c197c9662512a698de62d0 tkcvs_7_2_4.tar.gz Index: tkcvs.spec =================================================================== RCS file: /cvs/extras/rpms/tkcvs/devel/tkcvs.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- tkcvs.spec 5 Jul 2005 16:51:32 -0000 1.10 +++ tkcvs.spec 13 Aug 2005 17:59:07 -0000 1.11 @@ -1,13 +1,13 @@ Name: tkcvs -Version: 7.2.3 -Release: 2 +Version: 7.2.4 +Release: 1%{?dist} Summary: TkCVS and TkDiff Group: Development/Tools License: GPL URL: http://www.twobarleycorns.net/tkcvs.html -Source: http://www.twobarleycorns.net/tkcvs_7_2_3.tar.gz +Source: http://www.twobarleycorns.net/tkcvs_7_2_4.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: tk, tcl, cvs BuildArch: noarch @@ -20,7 +20,7 @@ merging your changes. %prep -%setup -q -n tkcvs_7_2_3 +%setup -q -n tkcvs_7_2_4 %build perl -pi -e 's|set TCDIR \[file join \$TclRoot tkcvs\]|set TCDIR "%{_datadir}/tkcvs"|' tkcvs/tkcvs.tcl @@ -51,6 +51,9 @@ %{_mandir}/man1/* %changelog +* Sat Aug 13 2005 Gerard Milmeister - 7.2.4 +- New Version 2.7.4 + * Tue Jul 5 2005 Gerard Milmeister - 7.2.3-1 - New Version 2.7.3 From fedora-extras-commits at redhat.com Sat Aug 13 20:28:30 2005 From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs)) Date: Sat, 13 Aug 2005 16:28:30 -0400 Subject: rpms/denyhosts/devel .cvsignore, 1.5, 1.6 denyhosts.spec, 1.6, 1.7 sources, 1.5, 1.6 Message-ID: <200508132028.j7DKSU38021207@cvs-int.fedora.redhat.com> Author: tibbs Update of /cvs/extras/rpms/denyhosts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21186 Modified Files: .cvsignore denyhosts.spec sources Log Message: * Sat Aug 13 2005 Jason L Tibbitts III - 0.9.9-0 - Update to 0.9.9 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/denyhosts/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 11 Aug 2005 19:36:28 -0000 1.5 +++ .cvsignore 13 Aug 2005 20:28:27 -0000 1.6 @@ -1 +1 @@ -DenyHosts-0.9.8.tar.gz +DenyHosts-0.9.9.tar.gz Index: denyhosts.spec =================================================================== RCS file: /cvs/extras/rpms/denyhosts/devel/denyhosts.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- denyhosts.spec 11 Aug 2005 19:36:28 -0000 1.6 +++ denyhosts.spec 13 Aug 2005 20:28:27 -0000 1.7 @@ -1,5 +1,5 @@ Name: denyhosts -Version: 0.9.8 +Version: 0.9.9 Release: 0%{?dist} Summary: A script to help thwart ssh server attacks @@ -102,6 +102,9 @@ %changelog +* Sat Aug 13 2005 Jason L Tibbitts III - 0.9.9-0 +- Update to 0.9.9 + * Fri Aug 5 2005 Jason L Tibbitts III - 0.9.8-1 - Update to 0.9.8 Index: sources =================================================================== RCS file: /cvs/extras/rpms/denyhosts/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 11 Aug 2005 19:36:28 -0000 1.5 +++ sources 13 Aug 2005 20:28:27 -0000 1.6 @@ -1 +1 @@ -337128544fadfc428746de5ad28bec19 DenyHosts-0.9.8.tar.gz +cda391b8724ecf7c9bb02162b9534a41 DenyHosts-0.9.9.tar.gz From fedora-extras-commits at redhat.com Sat Aug 13 21:11:22 2005 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Sat, 13 Aug 2005 17:11:22 -0400 Subject: rpms/Glide3/devel .cvsignore, 1.2, 1.3 Glide3.spec, 1.9, 1.10 sources, 1.2, 1.3 Glide3-64bit.patch, 1.3, NONE Glide3-amd3dnow.patch, 1.2, NONE Glide3-fixes.patch, 1.3, NONE Glide3-gcc4.patch, 1.2, NONE Glide3-lib64.patch, 1.1, NONE Glide3-new-autotools-bugfix.patch, 1.2, NONE Glide3-redhat-cleanup-1.patch, 1.1, NONE Message-ID: <200508132111.j7DLBMKG022501@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/Glide3/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22480 Modified Files: .cvsignore Glide3.spec sources Removed Files: Glide3-64bit.patch Glide3-amd3dnow.patch Glide3-fixes.patch Glide3-gcc4.patch Glide3-lib64.patch Glide3-new-autotools-bugfix.patch Glide3-redhat-cleanup-1.patch Log Message: Work together with upstream, change to upstream CVS glide-devel-branch, intergrate all patches, enable VooDoo1 support, add 64 bit support to VooDoo2. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/Glide3/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 28 Apr 2005 18:39:19 -0000 1.2 +++ .cvsignore 13 Aug 2005 21:11:19 -0000 1.3 @@ -1 +1,2 @@ -Glide3-20010520.tar.bz2 +Glide3-20050813.tar.bz2 +glidelink.c Index: Glide3.spec =================================================================== RCS file: /cvs/extras/rpms/Glide3/devel/Glide3.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- Glide3.spec 9 May 2005 18:52:34 -0000 1.9 +++ Glide3.spec 13 Aug 2005 21:11:19 -0000 1.10 @@ -1,8 +1,8 @@ Name: Glide3 -Version: 20010520 -Release: 36 +Version: 20050813 +Release: 1 Summary: Glide3 runtime for the 3Dfx Voodoo family of cards -# Glide3 is x86/alpha/ia64/x86_64 only, ia64 and x86_64 are untested +# Glide3 is x86/alpha/ia64/x86_64 only, ia64 is untested ExclusiveArch: %{ix86} alpha ia64 x86_64 Group: User Interface/X Hardware Support @@ -10,29 +10,23 @@ URL: http://glide.sourceforge.net # Create the Glide3 tarball by using: -# cvs -d :pserver:anonymous at cvs.glide.sourceforge.net:/cvsroot/glide co Glide3 +# cvs -d :pserver:anonymous at cvs.glide.sourceforge.net:/cvsroot/glide \ +# co -r glide-devel-branch Glide3 # pushd Glide3 ; find . -name CVS -type d |xargs rm -rf # find . -name .cvsignore | xargs rm ; popd # tar jcf Glide3-$(date +"%Y%m%d").tar.bz2 Glide3/ Source0: %{name}-%{version}.tar.bz2 Source1: glidelink.c -Patch0: Glide3-64bit.patch -Patch1: Glide3-new-autotools-bugfix.patch -Patch2: Glide3-redhat-cleanup-1.patch -Patch3: Glide3-fixes.patch -Patch4: Glide3-gcc4.patch -Patch5: Glide3-amd3dnow.patch -Patch6: Glide3-lib64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: automake14 autoconf xorg-x11-devel +BuildRequires: xorg-x11-devel %description Glide3 provides the necessary low-level interface glue between the Mesa 3D graphics library, and 3Dfx Voodoo series of hardware. This package is required by the Xorg tdfx driver in order to provide 3D acceleration support for the 3Dfx Voodoo 3 & 5. This package also contains support for -the Voodoo 2 in order to use the 3Dfx Voodoo 2 you need a special version -of Mesa or a native Glide3 application. +the Voodoo 2 & 1 in order to use the 3Dfx Voodoo 2 or 1 you need a special +version of Mesa or a native Glide3 application. %package devel Summary: Development libraries and headers for Glide3 @@ -46,87 +40,58 @@ %prep %setup -q -n Glide3 -%patch0 -p1 -b .64bit -%patch1 -p1 -b .new-autotools-bugfix -%patch2 -p1 -b .redhat-cleanup-1 -%patch3 -p1 -b .fix -%patch4 -p1 -b .gcc4 -%patch5 -p1 -b .amd3dnow -%ifarch x86_64 -%patch6 -p1 -b .lib64 -%endif -%build -aclocal-1.4 -libtoolize --copy --force -automake-1.4 -a -autoconf +%build %ifarch %{ix86} -%define configure_flags --enable-fx-debug=no --enable-amd3d +%define glide_flags USE_X86=1 USE_3DNOW=1 USE_MMX=1 USE_SSE=1 USE_SSE2=1 TEXUS2=1 %else -%define configure_flags --enable-fx-debug=no +%define glide_flags TEXUS2=1 %endif -mkdir build-5 -cd build-5 -ln -s ../configure configure -%configure \ - %{configure_flags} \ - --enable-fx-glide-hw=h5 \ - --enable-fx-dri-build -make -f makefile.autoconf all -cd .. - -mkdir build-3 -cd build-3 -ln -s ../configure configure -%configure \ - %{configure_flags} \ - --enable-fx-glide-hw=h3 \ - --enable-fx-dri-build -make -f makefile.autoconf all -cd .. +make -f makefile.linux FX_GLIDE_HW=h5 DRI=1 XPATH=/usr/X11R6/%{_lib} \ + OPTFLAGS="$RPM_OPT_FLAGS -Wno-unused-parameter" %{glide_flags} +mv h5/lib/libglide3.so libglide3-v5.so +make -f makefile.linux FX_GLIDE_HW=h5 realclean + +make -f makefile.linux FX_GLIDE_HW=h3 DRI=1 XPATH=/usr/X11R6/%{_lib} \ + OPTFLAGS="$RPM_OPT_FLAGS -Wno-unused-parameter" %{glide_flags} +mv h3/lib/libglide3.so libglide3-v3.so +make -f makefile.linux FX_GLIDE_HW=h3 realclean + +make -f makefile.linux FX_GLIDE_HW=cvg \ + OPTFLAGS="$RPM_OPT_FLAGS -Wno-unused-parameter" %{glide_flags} +mv cvg/lib/libglide3x.so libglide3-v2.so +make -f makefile.linux FX_GLIDE_HW=cvg realclean -#Sorry, no 64 bit support for Voodoo2 (yet) +#Sorry, no 64 bit support for Voodoo1 (yet) %ifarch %{ix86} -mkdir build-2 -cd build-2 -ln -s ../configure configure -%configure \ - %{configure_flags} \ - --enable-fx-glide-hw=cvg -make -f makefile.autoconf all -cd .. +make -f makefile.linux FX_GLIDE_HW=sst1 \ + OPTFLAGS="$RPM_OPT_FLAGS -Wno-unused-parameter" %{glide_flags} +mv sst1/lib/libglide3x.so libglide3-v1.so +make -f makefile.linux FX_GLIDE_HW=sst1 realclean %endif -%install -rm -rf $RPM_BUILD_ROOT -cd build-5 -make -f makefile.autoconf install DESTDIR=$RPM_BUILD_ROOT +%install %define libver 3.10.0 -mkdir -p $RPM_BUILD_ROOT/usr/sbin mkdir -p $RPM_BUILD_ROOT/%{_libdir} -mv $RPM_BUILD_ROOT%{_libdir}/libglide3.so.%{libver} \ - $RPM_BUILD_ROOT/%{_libdir}/libglide3-v5.so -install -m 755 ../build-3/h3/glide3/src/.libs/libglide3.so.%{libver} \ - $RPM_BUILD_ROOT/%{_libdir}/libglide3-v3.so -%ifarch %{ix86} -install -m 755 ../build-2/cvg/glide3/src/.libs/libglide3.so.%{libver} \ - $RPM_BUILD_ROOT/%{_libdir}/libglide3-v2.so -%endif +mkdir -p $RPM_BUILD_ROOT/%{_includedir}/glide3 -# For ix86 Point to v2 by default else v5, ldconfig doesn't like this? -%ifarch %{ix86} +install -m 755 *.so $RPM_BUILD_ROOT/%{_libdir} +# Point to v2 by default ln -snf libglide3-v2.so $RPM_BUILD_ROOT%{_libdir}/libglide3.so.%{libver} -%else -ln -snf libglide3-v5.so $RPM_BUILD_ROOT%{_libdir}/libglide3.so.%{libver} -%endif ln -snf libglide3.so.%{libver} $RPM_BUILD_ROOT%{_libdir}/libglide3.so.3 +ln -snf libglide3.so.%{libver} $RPM_BUILD_ROOT%{_libdir}/libglide3.so -# We are not installing these, so lets delete them -rm -f $RPM_BUILD_ROOT%{_libdir}/libglide3.{a,la} +install -p -m 644 swlibs/fxmisc/3dfx.h $RPM_BUILD_ROOT/%{_includedir}/glide3 +install -p -m 644 h5/glide3/src/g3ext.h $RPM_BUILD_ROOT/%{_includedir}/glide3 +install -p -m 644 h5/glide3/src/glide.h $RPM_BUILD_ROOT/%{_includedir}/glide3 +install -p -m 644 h5/glide3/src/glidesys.h $RPM_BUILD_ROOT/%{_includedir}/glide3 +install -p -m 644 h5/glide3/src/glideutl.h $RPM_BUILD_ROOT/%{_includedir}/glide3 +install -p -m 644 swlibs/fxmisc/linutil.h $RPM_BUILD_ROOT/%{_includedir}/glide3 +install -p -m 644 h5/incsrc/sst1vid.h $RPM_BUILD_ROOT/%{_includedir}/glide3 +install -p -m 644 swlibs/texus2/lib/texus.h $RPM_BUILD_ROOT/%{_includedir}/glide3 %clean @@ -144,8 +109,9 @@ %{_libdir}/libglide3.so.3 %{_libdir}/libglide3.so.%{libver} %ifarch %{ix86} -%{_libdir}/libglide3-v2.so +%{_libdir}/libglide3-v1.so %endif +%{_libdir}/libglide3-v2.so %{_libdir}/libglide3-v3.so %{_libdir}/libglide3-v5.so @@ -156,8 +122,14 @@ %{_libdir}/libglide3.so - %changelog +* Sat Aug 13 2005 Hans de Goede 20050813-1 +- Work together with upstream to keep Glide alive, use upstream CVS + glide-devel-branch as a base. +- Intergrate all our patches into upstream CVS glide-devel-branch. +- New upstream branch (re)adds support for Voodoo1 (sst1). +- Make Voodoo2 (cvg) code 64 bit clean (merged upstream). + * Mon May 9 2005 Hans de Goede - Change -L/usr/X11R6/lib to -L/usr/X11R6/lib64 when building on x86_64 . Index: sources =================================================================== RCS file: /cvs/extras/rpms/Glide3/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 28 Apr 2005 18:39:19 -0000 1.2 +++ sources 13 Aug 2005 21:11:19 -0000 1.3 @@ -1 +1,2 @@ -6cd7e5926c2a97bb96add94ca6a54a0c Glide3-20010520.tar.bz2 +8da72f671d9900645244f8db7e594f76 Glide3-20050813.tar.bz2 +99cf1d5972fd8ecb35498a4b99a24b59 glidelink.c --- Glide3-64bit.patch DELETED --- --- Glide3-amd3dnow.patch DELETED --- --- Glide3-fixes.patch DELETED --- --- Glide3-gcc4.patch DELETED --- --- Glide3-lib64.patch DELETED --- --- Glide3-new-autotools-bugfix.patch DELETED --- --- Glide3-redhat-cleanup-1.patch DELETED --- From fedora-extras-commits at redhat.com Sat Aug 13 21:28:36 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sat, 13 Aug 2005 17:28:36 -0400 Subject: rpms/abicheck/FC-3 abicheck.dbfile.FORTIFY_SOURCE, NONE, 1.1 abicheck.spec, 1.6, 1.7 Message-ID: <200508132129.j7DLT643022635@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/abicheck/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22601/FC-3 Modified Files: abicheck.spec Added Files: abicheck.dbfile.FORTIFY_SOURCE Log Message: sync with bits from devel tree --- NEW FILE abicheck.dbfile.FORTIFY_SOURCE --- libc.so.6|__chk_fail|public libc.so.6|__fprintf_chk|public libc.so.6|__gets_chk|public libc.so.6|__memcpy_chk|public libc.so.6|__memmove_chk|public libc.so.6|__mempcpy_chk|public libc.so.6|__memset_chk|public libc.so.6|__printf_chk|public libc.so.6|__snprintf_chk|public libc.so.6|__sprintf_chk|public libc.so.6|__stpcpy_chk|public libc.so.6|__strcat_chk|public libc.so.6|__strcpy_chk|public libc.so.6|__strncat_chk|public libc.so.6|__strncpy_chk|public libc.so.6|__vfprintf_chk|public libc.so.6|__vprintf_chk|public libc.so.6|__vsnprintf_chk|public libc.so.6|__vsprintf_chk|public Index: abicheck.spec =================================================================== RCS file: /cvs/extras/rpms/abicheck/FC-3/abicheck.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- abicheck.spec 13 Dec 2004 12:04:36 -0000 1.6 +++ abicheck.spec 13 Aug 2005 21:28:33 -0000 1.7 @@ -1,60 +1,70 @@ +%define debug_package %{nil} + Summary: ABI checking tool Name: abicheck Version: 1.2 -Release: 3 +Release: 3.1 License: LGPL Group: Applications/File URL: http://abicheck.sourceforge.net/ -Source0: %{name}-%{version}.tar.gz -Patch: abicheck-1.2-fc3.patch +Source0: http://dl.sf.net/abicheck/%{name}-%{version}.tar.gz +Source1: abicheck.dbfile.FORTIFY_SOURCE +Patch0: abicheck-1.2-fc3.patch Patch1: abicheck-1.2-test-static.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot Requires: binutils perl -# ----------------------------------------------------------------------------- %description abicheck is a tool that checks application binary executables and shared libraries for conformance to the (or an) ABI (Application Binary Interface). -# ----------------------------------------------------------------------------- %prep %setup -q %patch -p1 -b .fc3 %patch1 -p1 -b .test-static +sed -i -e 's!/usr/lib/!%{_libdir}/!g' test/Makefile -# ----------------------------------------------------------------------------- %build -make +make make test -# ----------------------------------------------------------------------------- %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_bindir} $RPM_BUILD_ROOT%{_mandir}/man1 -install -m 0755 abicheck $RPM_BUILD_ROOT%{_bindir} -install -m 0644 abicheck.1 $RPM_BUILD_ROOT%{_mandir}/man1 +install -p -m 0755 abicheck $RPM_BUILD_ROOT%{_bindir} +install -p -m 0644 abicheck.1 $RPM_BUILD_ROOT%{_mandir}/man1 +install -p -m 0644 %{SOURCE1} dbfile.FORTIFY_SOURCE -# ----------------------------------------------------------------------------- %clean rm -rf $RPM_BUILD_ROOT -# ----------------------------------------------------------------------------- %files %defattr(-,root,root,-) %doc COPYING ChangeLog INTRO README +%doc dbfile.FORTIFY_SOURCE %{_bindir}/abicheck %{_mandir}/man1/abicheck.1* -# ----------------------------------------------------------------------------- %changelog +* Thu Aug 11 2005 Michael Schwendt - 1.2-3.1 +- Add an override file in %%doc which can be specified with + option -O to modify the symbol classification for binaries + built with _FORTIFY_SOURCE. + +* Mon May 9 2005 Michael Schwendt +- Disable debuginfo package. + +* Thu Apr 14 2005 Michael Schwendt +- Replace /usr/lib/ with %%_libdir/ in %%prep. + * Mon Dec 13 2004 Michael Schwendt - 1.2-3 - Add patch to catch up with changes in ldd output. - Fix static linking test. From fedora-extras-commits at redhat.com Sat Aug 13 21:28:36 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sat, 13 Aug 2005 17:28:36 -0400 Subject: rpms/abicheck/FC-4 abicheck.dbfile.FORTIFY_SOURCE, NONE, 1.1 abicheck.spec, 1.11, 1.12 Message-ID: <200508132129.j7DLT6EC022638@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/abicheck/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22601/FC-4 Modified Files: abicheck.spec Added Files: abicheck.dbfile.FORTIFY_SOURCE Log Message: sync with bits from devel tree --- NEW FILE abicheck.dbfile.FORTIFY_SOURCE --- libc.so.6|__chk_fail|public libc.so.6|__fprintf_chk|public libc.so.6|__gets_chk|public libc.so.6|__memcpy_chk|public libc.so.6|__memmove_chk|public libc.so.6|__mempcpy_chk|public libc.so.6|__memset_chk|public libc.so.6|__printf_chk|public libc.so.6|__snprintf_chk|public libc.so.6|__sprintf_chk|public libc.so.6|__stpcpy_chk|public libc.so.6|__strcat_chk|public libc.so.6|__strcpy_chk|public libc.so.6|__strncat_chk|public libc.so.6|__strncpy_chk|public libc.so.6|__vfprintf_chk|public libc.so.6|__vprintf_chk|public libc.so.6|__vsnprintf_chk|public libc.so.6|__vsprintf_chk|public Index: abicheck.spec =================================================================== RCS file: /cvs/extras/rpms/abicheck/FC-4/abicheck.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- abicheck.spec 9 May 2005 21:35:49 -0000 1.11 +++ abicheck.spec 13 Aug 2005 21:28:34 -0000 1.12 @@ -3,11 +3,12 @@ Summary: ABI checking tool Name: abicheck Version: 1.2 -Release: 6 +Release: 6.1 License: LGPL Group: Applications/File URL: http://abicheck.sourceforge.net/ -Source0: %{name}-%{version}.tar.gz +Source0: http://dl.sf.net/abicheck/%{name}-%{version}.tar.gz +Source1: abicheck.dbfile.FORTIFY_SOURCE Patch0: abicheck-1.2-fc3.patch Patch1: abicheck-1.2-test-static.patch Patch2: abicheck-1.2-bindings-fc4.patch @@ -37,8 +38,9 @@ %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_bindir} $RPM_BUILD_ROOT%{_mandir}/man1 -install -m 0755 abicheck $RPM_BUILD_ROOT%{_bindir} -install -m 0644 abicheck.1 $RPM_BUILD_ROOT%{_mandir}/man1 +install -p -m 0755 abicheck $RPM_BUILD_ROOT%{_bindir} +install -p -m 0644 abicheck.1 $RPM_BUILD_ROOT%{_mandir}/man1 +install -p -m 0644 %{SOURCE1} dbfile.FORTIFY_SOURCE %clean @@ -48,11 +50,17 @@ %files %defattr(-,root,root,-) %doc COPYING ChangeLog INTRO README +%doc dbfile.FORTIFY_SOURCE %{_bindir}/abicheck %{_mandir}/man1/abicheck.1* %changelog +* Thu Aug 11 2005 Michael Schwendt - 1.2-6.1 +- Add an override file in %%doc which can be specified with + option -O to modify the symbol classification for binaries + built with _FORTIFY_SOURCE. + * Mon May 9 2005 Michael Schwendt - 1.2-6 - Disable debuginfo package. From fedora-extras-commits at redhat.com Sat Aug 13 21:35:03 2005 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Sat, 13 Aug 2005 17:35:03 -0400 Subject: rpms/Glide3/devel Glide3.spec,1.10,1.11 Message-ID: <200508132135.j7DLZ31O022748@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/Glide3/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22731 Modified Files: Glide3.spec Log Message: fix i386 build Index: Glide3.spec =================================================================== RCS file: /cvs/extras/rpms/Glide3/devel/Glide3.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- Glide3.spec 13 Aug 2005 21:11:19 -0000 1.10 +++ Glide3.spec 13 Aug 2005 21:35:01 -0000 1.11 @@ -19,6 +19,9 @@ Source1: glidelink.c BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: xorg-x11-devel +%ifarch %{ix86} +BuildRequires: nasm +%endif %description Glide3 provides the necessary low-level interface glue between the Mesa From fedora-extras-commits at redhat.com Sat Aug 13 21:57:32 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sat, 13 Aug 2005 17:57:32 -0400 Subject: rpms/wesnoth/devel .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 wesnoth.spec, 1.14, 1.15 Message-ID: <200508132157.j7DLvWWi022983@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/wesnoth/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22929/devel Modified Files: .cvsignore sources wesnoth.spec Log Message: * Sat Aug 13 2005 Michael Schwendt - 0.9.5-1 - update to 0.9.5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wesnoth/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 27 Jul 2005 20:11:42 -0000 1.6 +++ .cvsignore 13 Aug 2005 21:57:30 -0000 1.7 @@ -1 +1 @@ -wesnoth-0.9.4.tar.gz +wesnoth-0.9.5.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/wesnoth/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 27 Jul 2005 20:11:42 -0000 1.6 +++ sources 13 Aug 2005 21:57:30 -0000 1.7 @@ -1 +1 @@ -b27115df93298a8ee192a85499f26ef2 wesnoth-0.9.4.tar.gz +864dee75a0d5c37a5e91d2f063121a83 wesnoth-0.9.5.tar.gz Index: wesnoth.spec =================================================================== RCS file: /cvs/extras/rpms/wesnoth/devel/wesnoth.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- wesnoth.spec 27 Jul 2005 20:11:42 -0000 1.14 +++ wesnoth.spec 13 Aug 2005 21:57:30 -0000 1.15 @@ -1,5 +1,5 @@ Name: wesnoth -Version: 0.9.4 +Version: 0.9.5 Release: 1%{?dist} Summary: Battle for Wesnoth, a fantasy turn-based strategy game @@ -31,7 +31,7 @@ %package server Summary: %{summary} Group: Amusements/Games -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{version}-%{release} %description server This package contains the binaries for running a Wesnoth server @@ -41,7 +41,7 @@ %package tools Summary: %{summary} Group: Amusements/Games -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{version}-%{release} %description tools This package contains the game editor and development tools. @@ -145,6 +145,9 @@ %ghost /var/run/wesnothd/socket %changelog +* Sat Aug 13 2005 Michael Schwendt - 0.9.5-1 +- update to 0.9.5 + * Wed Jul 27 2005 Michael Schwendt - 0.9.4-1 - update to 0.9.4 From fedora-extras-commits at redhat.com Sat Aug 13 21:57:26 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sat, 13 Aug 2005 17:57:26 -0400 Subject: rpms/wesnoth/FC-3 .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 wesnoth.spec, 1.6, 1.7 Message-ID: <200508132157.j7DLvu1L022988@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/wesnoth/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22929/FC-3 Modified Files: .cvsignore sources wesnoth.spec Log Message: * Sat Aug 13 2005 Michael Schwendt - 0.9.5-1 - update to 0.9.5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wesnoth/FC-3/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 27 Jul 2005 20:11:41 -0000 1.5 +++ .cvsignore 13 Aug 2005 21:57:24 -0000 1.6 @@ -1 +1 @@ -wesnoth-0.9.4.tar.gz +wesnoth-0.9.5.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/wesnoth/FC-3/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 27 Jul 2005 20:11:41 -0000 1.5 +++ sources 13 Aug 2005 21:57:24 -0000 1.6 @@ -1 +1 @@ -b27115df93298a8ee192a85499f26ef2 wesnoth-0.9.4.tar.gz +864dee75a0d5c37a5e91d2f063121a83 wesnoth-0.9.5.tar.gz Index: wesnoth.spec =================================================================== RCS file: /cvs/extras/rpms/wesnoth/FC-3/wesnoth.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- wesnoth.spec 27 Jul 2005 20:11:41 -0000 1.6 +++ wesnoth.spec 13 Aug 2005 21:57:24 -0000 1.7 @@ -1,5 +1,5 @@ Name: wesnoth -Version: 0.9.4 +Version: 0.9.5 Release: 1%{?dist} Summary: Battle for Wesnoth, a fantasy turn-based strategy game @@ -31,7 +31,7 @@ %package server Summary: %{summary} Group: Amusements/Games -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{version}-%{release} %description server This package contains the binaries for running a Wesnoth server @@ -41,7 +41,7 @@ %package tools Summary: %{summary} Group: Amusements/Games -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{version}-%{release} %description tools This package contains the game editor and development tools. @@ -145,6 +145,9 @@ %ghost /var/run/wesnothd/socket %changelog +* Sat Aug 13 2005 Michael Schwendt - 0.9.5-1 +- update to 0.9.5 + * Wed Jul 27 2005 Michael Schwendt - 0.9.4-1 - update to 0.9.4 From fedora-extras-commits at redhat.com Sat Aug 13 21:57:26 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sat, 13 Aug 2005 17:57:26 -0400 Subject: rpms/wesnoth/FC-4 .cvsignore,1.5,1.6 sources,1.5,1.6 Message-ID: <200508132157.j7DLvvYb022992@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/wesnoth/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22929/FC-4 Modified Files: .cvsignore sources Log Message: * Sat Aug 13 2005 Michael Schwendt - 0.9.5-1 - update to 0.9.5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wesnoth/FC-4/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 27 Jul 2005 20:11:41 -0000 1.5 +++ .cvsignore 13 Aug 2005 21:57:24 -0000 1.6 @@ -1 +1 @@ -wesnoth-0.9.4.tar.gz +wesnoth-0.9.5.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/wesnoth/FC-4/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 27 Jul 2005 20:11:41 -0000 1.5 +++ sources 13 Aug 2005 21:57:24 -0000 1.6 @@ -1 +1 @@ -b27115df93298a8ee192a85499f26ef2 wesnoth-0.9.4.tar.gz +864dee75a0d5c37a5e91d2f063121a83 wesnoth-0.9.5.tar.gz From fedora-extras-commits at redhat.com Sat Aug 13 23:04:26 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sat, 13 Aug 2005 19:04:26 -0400 Subject: rpms/wesnoth/FC-4 wesnoth.spec,1.10,1.11 Message-ID: <200508132304.j7DN4wGM025613@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/wesnoth/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25596 Modified Files: wesnoth.spec Log Message: Index: wesnoth.spec =================================================================== RCS file: /cvs/extras/rpms/wesnoth/FC-4/wesnoth.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- wesnoth.spec 27 Jul 2005 20:11:41 -0000 1.10 +++ wesnoth.spec 13 Aug 2005 23:04:02 -0000 1.11 @@ -1,5 +1,5 @@ Name: wesnoth -Version: 0.9.4 +Version: 0.9.5 Release: 1%{?dist} Summary: Battle for Wesnoth, a fantasy turn-based strategy game @@ -31,7 +31,7 @@ %package server Summary: %{summary} Group: Amusements/Games -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{version}-%{release} %description server This package contains the binaries for running a Wesnoth server @@ -41,7 +41,7 @@ %package tools Summary: %{summary} Group: Amusements/Games -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{version}-%{release} %description tools This package contains the game editor and development tools. @@ -145,6 +145,9 @@ %ghost /var/run/wesnothd/socket %changelog +* Sat Aug 13 2005 Michael Schwendt - 0.9.5-1 +- update to 0.9.5 + * Wed Jul 27 2005 Michael Schwendt - 0.9.4-1 - update to 0.9.4 From fedora-extras-commits at redhat.com Sat Aug 13 23:10:53 2005 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Sat, 13 Aug 2005 19:10:53 -0400 Subject: rpms/qtparted/devel .cvsignore, 1.3, 1.4 qtparted-desktop.patch, 1.2, 1.3 qtparted.spec, 1.8, 1.9 sources, 1.3, 1.4 Message-ID: <200508132310.j7DNAr6H025723@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/qtparted/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25697 Modified Files: .cvsignore qtparted-desktop.patch qtparted.spec sources Log Message: * Sat Aug 13 2005 Steven Pritchard - 0.4.5-1 - Update to 0.4.5. - Work around unsermake dependency in distributed configure script. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/qtparted/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 30 Nov 2004 09:27:21 -0000 1.3 +++ .cvsignore 13 Aug 2005 23:10:51 -0000 1.4 @@ -1 +1 @@ -qtparted-0.4.4.tar.bz2 +qtparted-0.4.5.tar.bz2 qtparted-desktop.patch: Index: qtparted-desktop.patch =================================================================== RCS file: /cvs/extras/rpms/qtparted/devel/qtparted-desktop.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- qtparted-desktop.patch 30 Nov 2004 09:27:21 -0000 1.2 +++ qtparted-desktop.patch 13 Aug 2005 23:10:51 -0000 1.3 @@ -2,7 +2,7 @@ +++ data/qtparted.desktop 2004-05-21 00:36:57.955313448 +0300 @@ -1,7 +1,7 @@ [Desktop Entry] --Exec=gksu /usr/sbin/qtparted +-Exec=/usr/sbin/qtparted +Exec=qtparted Name=QTParted -Icon=qtparted.xpm Index: qtparted.spec =================================================================== RCS file: /cvs/extras/rpms/qtparted/devel/qtparted.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- qtparted.spec 19 May 2005 19:09:32 -0000 1.8 +++ qtparted.spec 13 Aug 2005 23:10:51 -0000 1.9 @@ -1,8 +1,8 @@ %define qtdir %(. %{_sysconfdir}/profile.d/qt.sh 2>/dev/null; echo $QTDIR) Name: qtparted -Version: 0.4.4 -Release: 3 +Version: 0.4.5 +Release: 1%{?dist} Summary: Partition Magic clone written in C++ using the Qt toolkit Group: Applications/System @@ -18,6 +18,7 @@ BuildRequires: qt-devel >= 1:3.1.0, parted-devel >= 1.6.6, XFree86-devel BuildRequires: desktop-file-utils, qt-designer, e2fsprogs-devel, jfsutils BuildRequires: zlib-devel, libjpeg-devel, xfsprogs +BuildRequires: automake, perl, autoconf Requires: usermode-gtk, e2fsprogs, jfsutils, xfsprogs %description @@ -31,6 +32,12 @@ %build export QTDIR="%{qtdir}" + +%{__aclocal} +%{__automake} --add-missing --gnu +%{__perl} admin/am_edit +%{__autoconf} + %configure \ --with-log-dir=%{_localstatedir}/log \ --disable-reiserfs \ @@ -100,6 +107,10 @@ %changelog +* Sat Aug 13 2005 Steven Pritchard - 0.4.5-1 +- Update to 0.4.5. +- Work around unsermake dependency in distributed configure script. + * Thu May 19 2005 Ville Skytt?? - 0.4.4-3 - Rebuild. Index: sources =================================================================== RCS file: /cvs/extras/rpms/qtparted/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 30 Nov 2004 09:27:21 -0000 1.3 +++ sources 13 Aug 2005 23:10:51 -0000 1.4 @@ -1 +1 @@ -b8253bf21eaebe1f2c22b50462e8046c qtparted-0.4.4.tar.bz2 +4541c0aa5475ba38d3cc518c921c8a34 qtparted-0.4.5.tar.bz2 From fedora-extras-commits at redhat.com Sat Aug 13 23:45:59 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sat, 13 Aug 2005 19:45:59 -0400 Subject: rpms/koffice/FC-4 koffice.spec,1.3,1.4 Message-ID: <200508132345.j7DNjxTR025831@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/koffice/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25814 Modified Files: koffice.spec Log Message: - add dist tag Index: koffice.spec =================================================================== RCS file: /cvs/extras/rpms/koffice/FC-4/koffice.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- koffice.spec 1 Aug 2005 08:46:31 -0000 1.3 +++ koffice.spec 13 Aug 2005 23:45:56 -0000 1.4 @@ -1,6 +1,6 @@ Name: koffice Version: 1.4.1 -Release: 1 +Release: 2%{?dist} Summary: A free, integrated office suite for KDE Group: Applications/Productivity @@ -734,8 +734,12 @@ %{_datadir}/servicetypes/kofilter*.desktop %changelog +* Sun Aug 14 2005 Andreas Bierfert +1.4.1-2 +- add dist tag + * Sun Jul 31 2005 Andreas Bierfert -1.4.1 +1.4.1-1 - upgrade to 1.4.1 * Sat Jul 23 2005 Andreas Bierfert From fedora-extras-commits at redhat.com Sat Aug 13 23:46:51 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sat, 13 Aug 2005 19:46:51 -0400 Subject: rpms/koffice/devel koffice.spec,1.3,1.4 Message-ID: <200508132346.j7DNkpJs025892@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/koffice/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25875 Modified Files: koffice.spec Log Message: - add dist tag Index: koffice.spec =================================================================== RCS file: /cvs/extras/rpms/koffice/devel/koffice.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- koffice.spec 1 Aug 2005 08:46:31 -0000 1.3 +++ koffice.spec 13 Aug 2005 23:46:49 -0000 1.4 @@ -1,6 +1,6 @@ Name: koffice Version: 1.4.1 -Release: 1 +Release: 2%{?dist} Summary: A free, integrated office suite for KDE Group: Applications/Productivity @@ -734,8 +734,12 @@ %{_datadir}/servicetypes/kofilter*.desktop %changelog +* Sun Aug 14 2005 Andreas Bierfert +1.4.1-2 +- add dist tag + * Sun Jul 31 2005 Andreas Bierfert -1.4.1 +1.4.1-1 - upgrade to 1.4.1 * Sat Jul 23 2005 Andreas Bierfert From fedora-extras-commits at redhat.com Sat Aug 13 23:48:29 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sat, 13 Aug 2005 19:48:29 -0400 Subject: rpms/koffice-langpack/FC-4 koffice-langpack.spec,1.1,1.2 Message-ID: <200508132348.j7DNmTYc025953@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/koffice-langpack/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25936 Modified Files: koffice-langpack.spec Log Message: - add dist tag Index: koffice-langpack.spec =================================================================== RCS file: /cvs/extras/rpms/koffice-langpack/FC-4/koffice-langpack.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- koffice-langpack.spec 1 Aug 2005 09:16:56 -0000 1.1 +++ koffice-langpack.spec 13 Aug 2005 23:48:27 -0000 1.2 @@ -1,6 +1,6 @@ Name: koffice-langpack Version: 1.4.1 -Release: 2 +Release: 3%{?dist} Summary: Language files for koffice Group: Applications/Productivity @@ -475,6 +475,10 @@ %lang(zh_CN) %{_datadir}/locale/zh_CN/LC_MESSAGES/* %changelog +* Sun Aug 14 2005 Andreas Bierfert +1.4.1-3 +- add dist tag + * Mon Aug 01 2005 Andreas Bierfert 1.4.1-2 - change Requires koffice-core from v-r to v only From fedora-extras-commits at redhat.com Sat Aug 13 23:49:07 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sat, 13 Aug 2005 19:49:07 -0400 Subject: rpms/koffice-langpack/devel koffice-langpack.spec,1.1,1.2 Message-ID: <200508132349.j7DNn7c7026014@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/koffice-langpack/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25997 Modified Files: koffice-langpack.spec Log Message: - add dist tag Index: koffice-langpack.spec =================================================================== RCS file: /cvs/extras/rpms/koffice-langpack/devel/koffice-langpack.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- koffice-langpack.spec 1 Aug 2005 09:16:56 -0000 1.1 +++ koffice-langpack.spec 13 Aug 2005 23:49:05 -0000 1.2 @@ -1,6 +1,6 @@ Name: koffice-langpack Version: 1.4.1 -Release: 2 +Release: 3%{?dist} Summary: Language files for koffice Group: Applications/Productivity @@ -475,6 +475,10 @@ %lang(zh_CN) %{_datadir}/locale/zh_CN/LC_MESSAGES/* %changelog +* Sun Aug 14 2005 Andreas Bierfert +1.4.1-3 +- add dist tag + * Mon Aug 01 2005 Andreas Bierfert 1.4.1-2 - change Requires koffice-core from v-r to v only From fedora-extras-commits at redhat.com Sun Aug 14 03:27:26 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Sat, 13 Aug 2005 23:27:26 -0400 Subject: rpms/perl-Devel-StackTrace - New directory Message-ID: <200508140327.j7E3RQvE031576@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Devel-StackTrace In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31556/perl-Devel-StackTrace Log Message: Directory /cvs/extras/rpms/perl-Devel-StackTrace added to the repository From fedora-extras-commits at redhat.com Sun Aug 14 03:27:27 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Sat, 13 Aug 2005 23:27:27 -0400 Subject: rpms/perl-Devel-StackTrace/devel - New directory Message-ID: <200508140327.j7E3RRM3031581@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Devel-StackTrace/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31556/perl-Devel-StackTrace/devel Log Message: Directory /cvs/extras/rpms/perl-Devel-StackTrace/devel added to the repository From fedora-extras-commits at redhat.com Sun Aug 14 03:27:57 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Sat, 13 Aug 2005 23:27:57 -0400 Subject: rpms/perl-Devel-StackTrace/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200508140327.j7E3RvdC031637@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Devel-StackTrace/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31601/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Devel-StackTrace --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Sun Aug 14 03:27:57 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Sat, 13 Aug 2005 23:27:57 -0400 Subject: rpms/perl-Devel-StackTrace Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200508140327.j7E3RvUI031632@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Devel-StackTrace In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31601 Added Files: Makefile import.log Log Message: Setup of module perl-Devel-StackTrace --- NEW FILE Makefile --- # Top level Makefile for module perl-Devel-StackTrace all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Sun Aug 14 03:28:52 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Sat, 13 Aug 2005 23:28:52 -0400 Subject: rpms/perl-Devel-StackTrace import.log,1.1,1.2 Message-ID: <200508140329.j7E3TNYL031699@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Devel-StackTrace In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31665 Modified Files: import.log Log Message: auto-import perl-Devel-StackTrace-1.11-3 on branch devel from perl-Devel-StackTrace-1.11-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Devel-StackTrace/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 14 Aug 2005 03:27:55 -0000 1.1 +++ import.log 14 Aug 2005 03:28:50 -0000 1.2 @@ -0,0 +1 @@ +perl-Devel-StackTrace-1_11-3:HEAD:perl-Devel-StackTrace-1.11-3.src.rpm:1123990113 From fedora-extras-commits at redhat.com Sun Aug 14 03:28:53 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Sat, 13 Aug 2005 23:28:53 -0400 Subject: rpms/perl-Devel-StackTrace/devel perl-Devel-StackTrace.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200508140329.j7E3TNXq031701@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Devel-StackTrace/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31665/devel Modified Files: .cvsignore sources Added Files: perl-Devel-StackTrace.spec Log Message: auto-import perl-Devel-StackTrace-1.11-3 on branch devel from perl-Devel-StackTrace-1.11-3.src.rpm --- NEW FILE perl-Devel-StackTrace.spec --- Name: perl-Devel-StackTrace Summary: Perl module implementing stack trace and stack trace frame objects Version: 1.11 Release: 3%{?dist} License: Artistic or GPL Group: Development/Libraries URL: http://search.cpan.org/dist/Devel-StackTrace BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source: http://search.cpan.org//CPAN/authors/id/D/DR/DROLSKY/Devel-StackTrace-%{version}.tar.gz Buildarch: noarch BuildRequires: perl BuildRequires: perl(Test::Pod) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description The Devel::StackTrace module contains two classes, Devel::StackTrace and Devel::StackTraceFrame. The goal of this object is to encapsulate the information that can found through using the caller() function, as well as providing a simple interface to this data. The Devel::StackTrace object contains a set of Devel::StackTraceFrame objects, one for each level of the stack. The frames contain all the data available from caller() as of Perl 5.6.0. %prep %setup -q -n Devel-StackTrace-%{version} %build perl Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type f -name '*.bs' -a -size 0 -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %clean rm -rf $RPM_BUILD_ROOT %check make test %files %defattr(-,root,root,-) %doc README LICENSE Changes %{perl_vendorlib}/Devel %{_mandir}/man3/* %changelog * Wed Aug 10 2005 Ralf Corsepius - 1.11-2 - Add %%defattr. * Wed Aug 10 2005 Ralf Corsepius - 1.11-2 - FE re-submission. * Fri Jul 01 2005 Ralf Corsepius - 1.11-1 - FE submission. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Devel-StackTrace/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 14 Aug 2005 03:27:55 -0000 1.1 +++ .cvsignore 14 Aug 2005 03:28:50 -0000 1.2 @@ -0,0 +1 @@ +Devel-StackTrace-1.11.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Devel-StackTrace/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 14 Aug 2005 03:27:55 -0000 1.1 +++ sources 14 Aug 2005 03:28:50 -0000 1.2 @@ -0,0 +1 @@ +a5d2088a531ceeec82b989c742f9382e Devel-StackTrace-1.11.tar.gz From fedora-extras-commits at redhat.com Sun Aug 14 03:32:08 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Sat, 13 Aug 2005 23:32:08 -0400 Subject: rpms/perl-Devel-StackTrace/devel perl-Devel-StackTrace.spec, 1.1, 1.2 Message-ID: <200508140332.j7E3W8E5031757@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Devel-StackTrace/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31740 Modified Files: perl-Devel-StackTrace.spec Log Message: Spec cleanup Index: perl-Devel-StackTrace.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Devel-StackTrace/devel/perl-Devel-StackTrace.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Devel-StackTrace.spec 14 Aug 2005 03:28:50 -0000 1.1 +++ perl-Devel-StackTrace.spec 14 Aug 2005 03:32:06 -0000 1.2 @@ -1,7 +1,7 @@ Name: perl-Devel-StackTrace Summary: Perl module implementing stack trace and stack trace frame objects Version: 1.11 -Release: 3%{?dist} +Release: 4%{?dist} License: Artistic or GPL Group: Development/Libraries URL: http://search.cpan.org/dist/Devel-StackTrace @@ -35,7 +35,6 @@ rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' -find $RPM_BUILD_ROOT -type f -name '*.bs' -a -size 0 -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* @@ -52,7 +51,10 @@ %{_mandir}/man3/* %changelog -* Wed Aug 10 2005 Ralf Corsepius - 1.11-2 +* Wed Aug 10 2005 Ralf Corsepius - 1.11-4 +- Spec cleanup. + +* Wed Aug 10 2005 Ralf Corsepius - 1.11-3 - Add %%defattr. * Wed Aug 10 2005 Ralf Corsepius - 1.11-2 From fedora-extras-commits at redhat.com Sun Aug 14 04:24:33 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Sun, 14 Aug 2005 00:24:33 -0400 Subject: rpms/perl-Params-Validate - New directory Message-ID: <200508140424.j7E4OXcI000802@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Params-Validate In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv782/perl-Params-Validate Log Message: Directory /cvs/extras/rpms/perl-Params-Validate added to the repository From fedora-extras-commits at redhat.com Sun Aug 14 04:24:33 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Sun, 14 Aug 2005 00:24:33 -0400 Subject: rpms/perl-Params-Validate/devel - New directory Message-ID: <200508140424.j7E4OXqg000807@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Params-Validate/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv782/perl-Params-Validate/devel Log Message: Directory /cvs/extras/rpms/perl-Params-Validate/devel added to the repository From fedora-extras-commits at redhat.com Sun Aug 14 04:25:02 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Sun, 14 Aug 2005 00:25:02 -0400 Subject: rpms/perl-Params-Validate Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200508140425.j7E4P284000854@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Params-Validate In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv827 Added Files: Makefile import.log Log Message: Setup of module perl-Params-Validate --- NEW FILE Makefile --- # Top level Makefile for module perl-Params-Validate all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Sun Aug 14 04:25:02 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Sun, 14 Aug 2005 00:25:02 -0400 Subject: rpms/perl-Params-Validate/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200508140425.j7E4P20J000859@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Params-Validate/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv827/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Params-Validate --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Sun Aug 14 04:26:10 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Sun, 14 Aug 2005 00:26:10 -0400 Subject: rpms/perl-Params-Validate import.log,1.1,1.2 Message-ID: <200508140426.j7E4QeGm000925@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Params-Validate In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv891 Modified Files: import.log Log Message: auto-import perl-Params-Validate-0.78-1 on branch devel from perl-Params-Validate-0.78-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Params-Validate/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 14 Aug 2005 04:25:00 -0000 1.1 +++ import.log 14 Aug 2005 04:26:08 -0000 1.2 @@ -0,0 +1 @@ +perl-Params-Validate-0_78-1:HEAD:perl-Params-Validate-0.78-1.src.rpm:1123993554 From fedora-extras-commits at redhat.com Sun Aug 14 04:26:10 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Sun, 14 Aug 2005 00:26:10 -0400 Subject: rpms/perl-Params-Validate/devel perl-Params-Validate.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200508140426.j7E4Qf6h000929@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Params-Validate/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv891/devel Modified Files: .cvsignore sources Added Files: perl-Params-Validate.spec Log Message: auto-import perl-Params-Validate-0.78-1 on branch devel from perl-Params-Validate-0.78-1.src.rpm --- NEW FILE perl-Params-Validate.spec --- Summary: Params-Validate Perl module Name: perl-Params-Validate Version: 0.78 Release: 1%{?dist} License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Params-Validate/ Source0: http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/Params-Validate-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) # Required by the tests BuildRequires: perl(Test::Taint) %description The Params::Validate module allows you to validate method or function call parameters to an arbitrary level of specificity. At the simplest level, it is capable of validating the required parameters were given and that no unspecified additional parameters were passed in. It is also capable of determining that a parameter is of a specific type, that it is an object of a certain class hierarchy, that it possesses certain methods, or applying validation callbacks to arguments. %prep %setup -q -n Params-Validate-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type f -name '*.bs' -a -size 0 -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %clean rm -rf $RPM_BUILD_ROOT %check make test %files %defattr(-,root,root,-) %doc Changes LICENSE README TODO %{perl_vendorarch}/Params %{perl_vendorarch}/auto/Params %{perl_vendorarch}/Attribute %{_mandir}/man3/* %changelog * Wed Aug 10 2005 Ralf Corsepius - 0.77-1 - FE submission. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Params-Validate/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 14 Aug 2005 04:25:00 -0000 1.1 +++ .cvsignore 14 Aug 2005 04:26:08 -0000 1.2 @@ -0,0 +1 @@ +Params-Validate-0.78.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Params-Validate/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 14 Aug 2005 04:25:00 -0000 1.1 +++ sources 14 Aug 2005 04:26:08 -0000 1.2 @@ -0,0 +1 @@ +8b6951214915c33addc4cc16e047546f Params-Validate-0.78.tar.gz From fedora-extras-commits at redhat.com Sun Aug 14 04:31:35 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Sun, 14 Aug 2005 00:31:35 -0400 Subject: rpms/perl-Params-Validate/devel perl-Params-Validate.spec,1.1,1.2 Message-ID: <200508140431.j7E4VZVH000985@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Params-Validate/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv968 Modified Files: perl-Params-Validate.spec Log Message: Spec cleanup Index: perl-Params-Validate.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Params-Validate/devel/perl-Params-Validate.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Params-Validate.spec 14 Aug 2005 04:26:08 -0000 1.1 +++ perl-Params-Validate.spec 14 Aug 2005 04:31:33 -0000 1.2 @@ -1,7 +1,7 @@ Summary: Params-Validate Perl module Name: perl-Params-Validate Version: 0.78 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Params-Validate/ @@ -53,5 +53,8 @@ %{_mandir}/man3/* %changelog -* Wed Aug 10 2005 Ralf Corsepius - 0.77-1 +* Sun Aug 14 2005 Ralf Corsepius - 0.78-2 +- Spec file cleanup. + +* Wed Aug 10 2005 Ralf Corsepius - 0.78-1 - FE submission. From fedora-extras-commits at redhat.com Sun Aug 14 04:40:37 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Sun, 14 Aug 2005 00:40:37 -0400 Subject: owners owners.list,1.77,1.78 Message-ID: <200508140440.j7E4eb5c001097@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1080 Modified Files: owners.list Log Message: Add perl-Devel-StackTrace, perl-Params-Validate. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.77 retrieving revision 1.78 diff -u -r1.77 -r1.78 --- owners.list 13 Aug 2005 08:31:12 -0000 1.77 +++ owners.list 14 Aug 2005 04:40:35 -0000 1.78 @@ -539,6 +539,7 @@ Fedora Extras|perl-DBD-SQLite|Self Contained RDBMS in a DBI Driver|jpo at di.uminho.pt|extras-qa at fedoraproject.org| Fedora Extras|perl-DBD-SQLite2|Self Contained RDBMS in a DBI Driver (sqlite 2.x)|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Devel-Cycle|Find memory cycles in objects|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Devel-StackTrace|Perl module implementing stack trace and stack trace frame objects|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Digest-Nilsimsa|Perl interface to the Nilsima Algorithm|wtogami at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Error|Error Perl module|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Exporter-Lite|Lightweight exporting of variables|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com @@ -602,6 +603,7 @@ Fedora Extras|perl-Number-Compare|Perl module for numeric comparisons|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-OLE-Storage_Lite|Simple Class for OLE document interface|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-PAR-Dist|Toolkit for creating and manipulating Perl PAR distributions|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Params-Validate|Params-Validate Perl module|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-pmtools|A suite of small programs to help manage Perl modules|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Pod-Coverage|Checks if the documentation of a module is comprehensive|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Pod-Escapes|Perl module for resolving POD escape sequences|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Sun Aug 14 17:39:14 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Sun, 14 Aug 2005 13:39:14 -0400 Subject: rpms/loudmouth/devel .cvsignore, 1.3, 1.4 loudmouth.spec, 1.6, 1.7 sources, 1.3, 1.4 Message-ID: <200508141739.j7EHdEme021772@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/loudmouth/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21751 Modified Files: .cvsignore loudmouth.spec sources Log Message: * Sun Aug 14 2005 Brian Pepple - 1.0-2 - Update to 1.0. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/loudmouth/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 13 May 2005 14:32:33 -0000 1.3 +++ .cvsignore 14 Aug 2005 17:39:11 -0000 1.4 @@ -1 +1 @@ -loudmouth-0.90.tar.bz2 +loudmouth-1.0.tar.bz2 Index: loudmouth.spec =================================================================== RCS file: /cvs/extras/rpms/loudmouth/devel/loudmouth.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- loudmouth.spec 8 Aug 2005 13:22:47 -0000 1.6 +++ loudmouth.spec 14 Aug 2005 17:39:11 -0000 1.7 @@ -1,8 +1,8 @@ %define with_ssl 1 Name: loudmouth -Version: 0.90 -Release: 5%{?dist} +Version: 1.0 +Release: 2%{?dist} Summary: Loudmouth is a Jabber programming library written in C Group: System Environment/Libraries @@ -84,6 +84,9 @@ %changelog +* Sun Aug 14 2005 Brian Pepple - 1.0-2 +- Update to 1.0. + * Mon Aug 8 2005 Brian Pepple - 0.90-5 - Rebuild due to new gnutls. Index: sources =================================================================== RCS file: /cvs/extras/rpms/loudmouth/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 13 May 2005 14:32:33 -0000 1.3 +++ sources 14 Aug 2005 17:39:11 -0000 1.4 @@ -1 +1 @@ -8d1cc61764bf05cdb86ba2659df30069 loudmouth-0.90.tar.bz2 +d8518084fcb747d3d979bd72ad7cabee loudmouth-1.0.tar.bz2 From fedora-extras-commits at redhat.com Sun Aug 14 17:40:02 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Sun, 14 Aug 2005 13:40:02 -0400 Subject: rpms/loudmouth/FC-4 .cvsignore, 1.3, 1.4 loudmouth.spec, 1.5, 1.6 sources, 1.3, 1.4 Message-ID: <200508141740.j7EHe2G0021805@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/loudmouth/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21784 Modified Files: .cvsignore loudmouth.spec sources Log Message: * Sun Aug 14 2005 Brian Pepple - 1.0-1 - Update to 1.0. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/loudmouth/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 13 May 2005 14:32:33 -0000 1.3 +++ .cvsignore 14 Aug 2005 17:40:00 -0000 1.4 @@ -1 +1 @@ -loudmouth-0.90.tar.bz2 +loudmouth-1.0.tar.bz2 Index: loudmouth.spec =================================================================== RCS file: /cvs/extras/rpms/loudmouth/FC-4/loudmouth.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- loudmouth.spec 30 Jul 2005 16:39:29 -0000 1.5 +++ loudmouth.spec 14 Aug 2005 17:40:00 -0000 1.6 @@ -1,8 +1,8 @@ %define with_ssl 1 Name: loudmouth -Version: 0.90 -Release: 3%{?dist} +Version: 1.0 +Release: 1%{?dist} Summary: Loudmouth is a Jabber programming library written in C Group: System Environment/Libraries @@ -84,6 +84,9 @@ %changelog +* Sun Aug 14 2005 Brian Pepple - 1.0-1 +- Update to 1.0. + * Sat Jul 30 2005 Brian Pepple - 0.90 - Fix description. Index: sources =================================================================== RCS file: /cvs/extras/rpms/loudmouth/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 13 May 2005 14:32:33 -0000 1.3 +++ sources 14 Aug 2005 17:40:00 -0000 1.4 @@ -1 +1 @@ -8d1cc61764bf05cdb86ba2659df30069 loudmouth-0.90.tar.bz2 +d8518084fcb747d3d979bd72ad7cabee loudmouth-1.0.tar.bz2 From fedora-extras-commits at redhat.com Sun Aug 14 17:45:56 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 14 Aug 2005 13:45:56 -0400 Subject: rpms/lirc/devel lirc-gpio.patch, NONE, 1.1 lirc-nodev-crash.patch, NONE, 1.1 lirc-nomodules.patch, NONE, 1.1 lirc-optflags.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 lirc.spec, 1.6, 1.7 sources, 1.4, 1.5 Message-ID: <200508141745.j7EHjuDl021933@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/lirc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21900 Modified Files: .cvsignore lirc.spec sources Added Files: lirc-gpio.patch lirc-nodev-crash.patch lirc-nomodules.patch lirc-optflags.patch Log Message: * Sun Aug 14 2005 Ville Skytt?? - 0.7.2-2 - 0.7.2, patch to fix crash at startup when no device is specified. - Enable audio input driver support (portaudio). - Improve package description. - Don't ship static libraries. - Drop pre Fedora Extras backwards compatibility hacks. - Make svgalib support (smode2) build conditional, disabled by default. - Simplify module package build (still work in progress, disabled by default). - Other minor specfile cleanups and maintainability improvements. lirc-gpio.patch: --- NEW FILE lirc-gpio.patch --- The gpio driver doesn't compile against kernel-devel due to missing drivers/media/video/{bttv,bttvp}.h. --- lirc-0.7.2/configure.drivers 2005-08-14 17:14:08.000000000 +0300 +++ lirc-0.7.2/configure 2005-08-14 17:25:56.000000000 +0300 @@ -8027,7 +8027,6 @@ (lirc_dev lirc_atiusb) \ (lirc_dev lirc_bt829) \ (lirc_dev lirc_cmdir) \ - (lirc_dev lirc_gpio) \ (lirc_dev lirc_i2c) \ (lirc_dev lirc_igorplugusb) \ (lirc_dev lirc_imon) \ @@ -9382,7 +9381,6 @@ lirc_atiusb \ lirc_bt829 \ lirc_cmdir \ - lirc_gpio \ lirc_i2c \ lirc_igorplugusb \ lirc_imon \ --- lirc-0.7.2/configure.in.drivers 2005-08-14 13:23:48.000000000 +0300 +++ lirc-0.7.2/configure.in 2005-08-14 17:28:15.000000000 +0300 @@ -169,7 +169,6 @@ (lirc_dev lirc_atiusb) \ (lirc_dev lirc_bt829) \ (lirc_dev lirc_cmdir) \ - (lirc_dev lirc_gpio) \ (lirc_dev lirc_i2c) \ (lirc_dev lirc_igorplugusb) \ (lirc_dev lirc_imon) \ @@ -1090,7 +1089,6 @@ lirc_atiusb \ lirc_bt829 \ lirc_cmdir \ - lirc_gpio \ lirc_i2c \ lirc_igorplugusb \ lirc_imon \ lirc-nodev-crash.patch: --- NEW FILE lirc-nodev-crash.patch --- --- daemons/lircd.c~ 2005-07-10 11:34:12.000000000 +0300 +++ daemons/lircd.c 2005-08-14 19:29:50.000000000 +0300 @@ -1974,7 +1974,7 @@ "no peers are specified\n",progname); return(EXIT_FAILURE); } - if(strcmp(hw.device, lircdfile)==0) + if(hw.device != NULL && strcmp(hw.device, lircdfile)==0) { fprintf(stderr, "%s: refusing to connect to myself\n", progname); lirc-nomodules.patch: --- NEW FILE lirc-nomodules.patch --- --- lirc-0.7.2/Makefile.am.orig 2003-05-07 19:31:48.000000000 +0300 +++ lirc-0.7.2/Makefile.am 2005-08-14 18:39:49.000000000 +0300 @@ -9,7 +9,7 @@ EXTRA_DIST = setup.sh setup-driver.sh setup.data data2setup.sh ANNOUNCE TODO ## daemons/ and tools/ should appear before doc/ for help2man to work. -SUBDIRS = drivers daemons tools doc +SUBDIRS = daemons tools doc ## From automake documentation: ## Note that EXTRA_DIST can only handle files in the current --- lirc-0.7.2/configure.orig 2005-08-14 18:39:36.000000000 +0300 +++ lirc-0.7.2/configure 2005-08-14 18:40:14.000000000 +0300 @@ -7995,6 +7995,7 @@ echo "$ac_t""" 1>&6 possible_drivers="(none) \ + (any) \ (bte) \ (bw6130) \ (creative) \ @@ -8020,26 +8021,6 @@ (uirt2_raw) \ (udp)" -if test x${no_kernel} != xyes; then - possible_drivers="${possible_drivers} \ - (any) \ - (lirc_dev) \ - (lirc_dev lirc_atiusb) \ - (lirc_dev lirc_bt829) \ - (lirc_dev lirc_cmdir) \ - (lirc_dev lirc_i2c) \ - (lirc_dev lirc_igorplugusb) \ - (lirc_dev lirc_imon) \ - (lirc_dev lirc_it87) \ - (lirc_dev lirc_mceusb) \ - (lirc_dev lirc_mceusb2) \ - (lirc_dev lirc_parallel) \ - (lirc_dev lirc_sasem) \ - (lirc_dev lirc_serial) \ - (lirc_dev lirc_sir) \ - (lirc_dev lirc_streamzap)" -fi - if test -n "${LIBUSB_CONFIG}"; then cat >> confdefs.h <<\EOF #define HAVE_LIBUSB 1 --- lirc-0.7.2/Makefile.in.orig 2005-08-14 13:27:43.000000000 +0300 +++ lirc-0.7.2/Makefile.in 2005-08-14 18:39:49.000000000 +0300 @@ -113,7 +113,7 @@ EXTRA_DIST = setup.sh setup-driver.sh setup.data data2setup.sh ANNOUNCE TODO -SUBDIRS = drivers daemons tools doc +SUBDIRS = daemons tools doc DISTCLEANFILES = configure.sh .setup.config --- lirc-0.7.2/configure.in.orig 2005-08-14 18:39:36.000000000 +0300 +++ lirc-0.7.2/configure.in 2005-08-14 18:40:08.000000000 +0300 @@ -137,6 +137,7 @@ AC_MSG_RESULT() possible_drivers="(none) \ + (any) \ (bte) \ (bw6130) \ (creative) \ @@ -162,26 +163,6 @@ (uirt2_raw) \ (udp)" -if test x${no_kernel} != xyes; then - possible_drivers="${possible_drivers} \ - (any) \ - (lirc_dev) \ - (lirc_dev lirc_atiusb) \ - (lirc_dev lirc_bt829) \ - (lirc_dev lirc_cmdir) \ - (lirc_dev lirc_i2c) \ - (lirc_dev lirc_igorplugusb) \ - (lirc_dev lirc_imon) \ - (lirc_dev lirc_it87) \ - (lirc_dev lirc_mceusb) \ - (lirc_dev lirc_mceusb2) \ - (lirc_dev lirc_parallel) \ - (lirc_dev lirc_sasem) \ - (lirc_dev lirc_serial) \ - (lirc_dev lirc_sir) \ - (lirc_dev lirc_streamzap)" -fi - if test -n "${LIBUSB_CONFIG}"; then AC_DEFINE(HAVE_LIBUSB) possible_drivers="${possible_drivers} (atilibusb)" lirc-optflags.patch: --- NEW FILE lirc-optflags.patch --- --- lirc-0.7.2/configure.in.optflags 2005-08-14 17:53:43.000000000 +0300 +++ lirc-0.7.2/configure.in 2005-08-14 17:54:18.000000000 +0300 @@ -17,5 +17,5 @@ AM_CONFIG_HEADER(config.h) -CFLAGS="-O2 -g -Wall" +CFLAGS="$CFLAGS -Wall" dnl Checks for programs. --- lirc-0.7.2/configure.optflags 2005-08-14 17:53:50.000000000 +0300 +++ lirc-0.7.2/configure 2005-08-14 17:54:07.000000000 +0300 @@ -1076,5 +1076,5 @@ -CFLAGS="-O2 -g -Wall" +CFLAGS="$CFLAGS -Wall" # Extract the first word of "gcc", so it can be a program name with args. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/lirc/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 17 Apr 2005 14:34:10 -0000 1.4 +++ .cvsignore 14 Aug 2005 17:45:54 -0000 1.5 @@ -1 +1 @@ -lirc-0.7.1.tar.bz2 +lirc-0.7.2.tar.bz2 Index: lirc.spec =================================================================== RCS file: /cvs/extras/rpms/lirc/devel/lirc.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- lirc.spec 26 May 2005 19:16:18 -0000 1.6 +++ lirc.spec 14 Aug 2005 17:45:54 -0000 1.7 @@ -1,25 +1,21 @@ # Driver TODO, sometime maybe: -# - audio (req: portaudio) -# - caraca (req: caraca_client) -# - irman: (req: libirman) -# - drivers that need drivers/media/video/bttv*.h (not in kernel-devel) -# - gpio: avermedia avermedia98 flyvideo +# - caraca (req: caraca, http://caraca.sf.net/) +# - irman: (req: libirman, http://lirc.sf.net/software/snapshots/) # Other TODO: # - move to -devel (?): irw, *mode2, others? +# note: xmode2 inflicts a dependency on X, and smode2 on svgalib # - don't run as root and/or create dedicated group, reduce fifo permissions? # - Fixup /etc/lirc(m)d.conf %%ghost'ification, existence after erase etc. # - Verify that the kernel modules work and correct /dev entries get created # automagically with proper permissions etc. -%{!?kernel: %{expand: %%define kernel %(uname -r)}} -%define ksrc %{_usrsrc}/kernels/%{kernel}-%{_target_cpu} - -# Kernel module drivers -%define drivers atiusb com1 hauppauge igorplugusb imon it87 lpt1 mceusb sasem sir_com3 streamzap tekram_bt829 +%{!?kver: %{expand: %%define kver %(uname -r)}} +%define ksrc %{_usrsrc}/kernels/%{kver}-%{_target_cpu} +%define mdir /lib/modules/%{kver}/extra Name: lirc -Version: 0.7.1 -Release: 3 +Version: 0.7.2 +Release: 2%{?dist} Summary: The Linux Infrared Remote Control package Group: System Environment/Daemons @@ -28,19 +24,31 @@ Source0: http://download.sourceforge.net/lirc/%{name}-%{version}.tar.bz2 Source1: %{name}.init Source2: %{name}.sysconfig +Patch0: %{name}-optflags.patch +Patch1: %{name}-gpio.patch +Patch2: %{name}-nomodules.patch +Patch3: %{name}-nodev-crash.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: %{__perl} %if 0%{!?_with_modules:1} -BuildRequires: alsa-lib-devel XFree86-devel libusb-devel -BuildConflicts: svgalib-devel +BuildRequires: %{__perl} +BuildRequires: alsa-lib-devel +BuildRequires: xorg-x11-devel +BuildRequires: libusb-devel +BuildRequires: portaudio-devel >= 18 +Build%{?_with_svgalib:Requires}%{!?_with_svgalib:Conflicts}: svgalib-devel %endif -Requires(post): /sbin/chkconfig /sbin/ldconfig +Requires(post): /sbin/chkconfig +Requires(post): /sbin/ldconfig Requires(preun): /sbin/chkconfig Requires(postun): /sbin/ldconfig %description -LIRC is the Linux Infrared Remote Control package. +LIRC is a package that allows you to decode and send infra-red and +other signals of many (but not all) commonly used remote controls. +Included applications include daemons which decode the received +signals as well as user space applications which allow controlling a +computer with a remote control. %package devel Summary: Development files for LIRC @@ -50,74 +58,59 @@ %description devel %{summary}. -%package -n kernel-module-%{name}-%{kernel} +%package -n kernel-module-%{name}-%{kver} Summary: Kernel modules for LIRC Group: System Environment/Kernel Provides: kernel-module Provides: kernel-module-%{name} = %{version} %if 0%{?_with_modules:1} -BuildRequires: kernel-devel-%{_target_cpu} = %{kernel} +BuildRequires: kernel-devel-%{_target_cpu} = %{kver} %endif Requires: %{name} = %{version} -Requires: modutils -Requires: kernel-%{_target_cpu} = %{kernel} +Requires: module-init-tools +Requires: kernel-%{_target_cpu} = %{kver} Requires: udev -%description -n kernel-module-%{name}-%{kernel} +%description -n kernel-module-%{name}-%{kver} LIRC kernel modules built for kernel -%{kernel} (%{_target_cpu}). +%{kver} (%{_target_cpu}). %prep %setup -q -%{__perl} -pi -e 's|^CFLAGS="-O2 -g -Wall"|CFLAGS="\$CFLAGS -Wall"|' configure +%patch0 -p1 +%patch1 -p1 +# patch2 needs to be applied on top of patch1 +%{!?_with_modules:%patch2 -p1} +%patch3 -p0 chmod 644 contrib/* +touch -r aclocal.m4 configure.in # avoid autofoo re-run %build -%if 0%{?_with_modules:1} -for driver in %{drivers} ; do - # lpt1 is not smp safe @@@ TODO: verify this? - test $driver = lpt1 && grep -q '^CONFIG_SMP=y' %{ksrc}/.config && continue - mkdir -p buildroot/"$driver" - %configure \ - --enable-sandboxed \ - --enable-debug \ - --disable-dependency-tracking \ - --with-kerneldir=%{ksrc} \ - --with-moduledir=/tmp \ - --with-driver=$driver - make %{?_smp_mflags} -C drivers - make -C drivers install DESTDIR=$PWD/buildroot/$driver -done - -%else %configure \ - --with-syslog=LOG_DAEMON \ - --enable-sandboxed \ - --enable-debug \ + --disable-static \ --disable-dependency-tracking \ + --enable-debug \ + --enable-sandboxed \ + --with-syslog=LOG_DAEMON \ + --with-kerneldir=%{ksrc} \ + --with-moduledir=%{mdir}/%{name} \ --with-driver=any -make %{?_smp_mflags} -%endif +make %{?_smp_mflags} %{?_with_modules:-C drivers} %install rm -rf $RPM_BUILD_ROOT __docs %if 0%{?_with_modules:1} -for driver in %{drivers} ; do - # lpt1 is not SMP safe @@@ TODO: verify this? - test $driver = lpt1 && grep -q '^CONFIG_SMP=y' %{ksrc}/.config && continue - install -dm 755 $RPM_BUILD_ROOT/lib/modules/%{kernel}/updates/lirc - # 0755 here to allow stripping, fixed later in %%files - install -pm 755 buildroot/$driver/tmp/* \ - $RPM_BUILD_ROOT/lib/modules/%{kernel}/updates/lirc -done +make install DESTDIR=$RPM_BUILD_ROOT -C drivers +# executable here to allow stripping, fixed later in %%files +chmod +x $RPM_BUILD_ROOT%{mdir}/%{name}/*.ko %else make install DESTDIR=$RPM_BUILD_ROOT -rm -f $RPM_BUILD_ROOT%{_mandir}/man1/smode2.1* # if no svgalib +%{!?_with_svgalib:rm $RPM_BUILD_ROOT%{_mandir}/man1/smode2.1*} install -Dpm 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/lirc %{__perl} -pi -e \ 's|/etc/|%{_sysconfdir}/|g ; @@ -133,6 +126,7 @@ touch $RPM_BUILD_ROOT%{_sysconfdir}/lirc{d,md}.conf install -dm 755 $RPM_BUILD_ROOT/dev touch $RPM_BUILD_ROOT/dev/lirc{d,m} +rm $RPM_BUILD_ROOT%{_libdir}/liblirc_client.la %endif @@ -143,20 +137,9 @@ %post /sbin/ldconfig /sbin/chkconfig --add lirc -# Backwards compatibility (init script lircd -> lirc rename), -# drop this in FC5: -if [ $1 -gt 0 -a -x %{_initrddir}/lircd ] ; then - %{_initrddir}/lircd status >/dev/null 2>&1 - ret=$? - %{_initrddir}/lircd stop >/dev/null || : - /sbin/chkconfig --del lircd || : - if [ $ret -eq 0 ] ; then - %{_initrddir}/lirc start >/dev/null || : - fi -fi -%post -n kernel-module-%{name}-%{kernel} -depmod -ae -F /boot/System.map-%{kernel} %{kernel} >/dev/null || : +%post -n kernel-module-%{name}-%{kver} +depmod -ae -F /boot/System.map-%{kver} %{kver} >/dev/null || : %preun if [ $1 -eq 0 ] ; then @@ -170,8 +153,8 @@ %{_initrddir}/lirc try-restart >/dev/null || : fi -%postun -n kernel-module-%{name}-%{kernel} -depmod -ae -F /boot/System.map-%{kernel} %{kernel} >/dev/null || : +%postun -n kernel-module-%{name}-%{kver} +depmod -ae -F /boot/System.map-%{kver} %{kver} >/dev/null || : %if 0%{!?_with_modules:1} @@ -180,7 +163,7 @@ %doc ANNOUNCE AUTHORS ChangeLog COPYING NEWS README TODO remotes __docs/* %ghost %config(noreplace) %{_sysconfdir}/lirc*d.conf %config(noreplace) %{_sysconfdir}/sysconfig/lirc -%config %{_initrddir}/lirc +%{_initrddir}/lirc %{_bindir}/ir* %{_bindir}/*mode2 %{_sbindir}/lirc*d @@ -192,20 +175,28 @@ %files devel %defattr(-,root,root,-) -%{_includedir}/lirc -%{_libdir}/liblirc_client.a +%{_includedir}/lirc/ %{_libdir}/liblirc_client.so -%exclude %{_libdir}/liblirc_client.la %endif %if 0%{?_with_modules:1} -%files -n kernel-module-%{name}-%{kernel} +%files -n kernel-module-%{name}-%{kver} %defattr(644,root,root,755) -/lib/modules/%{kernel}/updates +%{mdir}/ %endif %changelog +* Sun Aug 14 2005 Ville Skytt?? - 0.7.2-2 +- 0.7.2, patch to fix crash at startup when no device is specified. +- Enable audio input driver support (portaudio). +- Improve package description. +- Don't ship static libraries. +- Drop pre Fedora Extras backwards compatibility hacks. +- Make svgalib support (smode2) build conditional, disabled by default. +- Simplify module package build (still work in progress, disabled by default). +- Other minor specfile cleanups and maintainability improvements. + * Thu May 26 2005 Ville Skytt?? - 0.7.1-3 - Adjust kernel module build for FC4 and add hauppauge, igorplugusb, imon, sasem, and streamzap to the list of modules to build. This stuff is still Index: sources =================================================================== RCS file: /cvs/extras/rpms/lirc/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 17 Apr 2005 14:34:10 -0000 1.4 +++ sources 14 Aug 2005 17:45:54 -0000 1.5 @@ -1 +1 @@ -642e543e25dd6ad72416784bb6166d54 lirc-0.7.1.tar.bz2 +4510cf711f5c146f80c5bdfd61ca3f4a lirc-0.7.2.tar.bz2 From fedora-extras-commits at redhat.com Sun Aug 14 17:49:08 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 14 Aug 2005 13:49:08 -0400 Subject: rpms/lirc/FC-4 lirc-gpio.patch, NONE, 1.1 lirc-nodev-crash.patch, NONE, 1.1 lirc-nomodules.patch, NONE, 1.1 lirc-optflags.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 lirc.spec, 1.6, 1.7 sources, 1.4, 1.5 Message-ID: <200508141749.j7EHn8qL022021@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/lirc/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21991 Modified Files: .cvsignore lirc.spec sources Added Files: lirc-gpio.patch lirc-nodev-crash.patch lirc-nomodules.patch lirc-optflags.patch Log Message: * Sun Aug 14 2005 Ville Skytt?? - 0.7.2-1 - 0.7.2, patch to fix crash at startup when no device is specified. - Enable audio input driver support (portaudio). - Improve package description. - Simplify module package build (still work in progress, disabled by default). - Other minor specfile cleanups and maintainability improvements. lirc-gpio.patch: --- NEW FILE lirc-gpio.patch --- The gpio driver doesn't compile against kernel-devel due to missing drivers/media/video/{bttv,bttvp}.h. --- lirc-0.7.2/configure.drivers 2005-08-14 17:14:08.000000000 +0300 +++ lirc-0.7.2/configure 2005-08-14 17:25:56.000000000 +0300 @@ -8027,7 +8027,6 @@ (lirc_dev lirc_atiusb) \ (lirc_dev lirc_bt829) \ (lirc_dev lirc_cmdir) \ - (lirc_dev lirc_gpio) \ (lirc_dev lirc_i2c) \ (lirc_dev lirc_igorplugusb) \ (lirc_dev lirc_imon) \ @@ -9382,7 +9381,6 @@ lirc_atiusb \ lirc_bt829 \ lirc_cmdir \ - lirc_gpio \ lirc_i2c \ lirc_igorplugusb \ lirc_imon \ --- lirc-0.7.2/configure.in.drivers 2005-08-14 13:23:48.000000000 +0300 +++ lirc-0.7.2/configure.in 2005-08-14 17:28:15.000000000 +0300 @@ -169,7 +169,6 @@ (lirc_dev lirc_atiusb) \ (lirc_dev lirc_bt829) \ (lirc_dev lirc_cmdir) \ - (lirc_dev lirc_gpio) \ (lirc_dev lirc_i2c) \ (lirc_dev lirc_igorplugusb) \ (lirc_dev lirc_imon) \ @@ -1090,7 +1089,6 @@ lirc_atiusb \ lirc_bt829 \ lirc_cmdir \ - lirc_gpio \ lirc_i2c \ lirc_igorplugusb \ lirc_imon \ lirc-nodev-crash.patch: --- NEW FILE lirc-nodev-crash.patch --- --- daemons/lircd.c~ 2005-07-10 11:34:12.000000000 +0300 +++ daemons/lircd.c 2005-08-14 19:29:50.000000000 +0300 @@ -1974,7 +1974,7 @@ "no peers are specified\n",progname); return(EXIT_FAILURE); } - if(strcmp(hw.device, lircdfile)==0) + if(hw.device != NULL && strcmp(hw.device, lircdfile)==0) { fprintf(stderr, "%s: refusing to connect to myself\n", progname); lirc-nomodules.patch: --- NEW FILE lirc-nomodules.patch --- --- lirc-0.7.2/Makefile.am.orig 2003-05-07 19:31:48.000000000 +0300 +++ lirc-0.7.2/Makefile.am 2005-08-14 18:39:49.000000000 +0300 @@ -9,7 +9,7 @@ EXTRA_DIST = setup.sh setup-driver.sh setup.data data2setup.sh ANNOUNCE TODO ## daemons/ and tools/ should appear before doc/ for help2man to work. -SUBDIRS = drivers daemons tools doc +SUBDIRS = daemons tools doc ## From automake documentation: ## Note that EXTRA_DIST can only handle files in the current --- lirc-0.7.2/configure.orig 2005-08-14 18:39:36.000000000 +0300 +++ lirc-0.7.2/configure 2005-08-14 18:40:14.000000000 +0300 @@ -7995,6 +7995,7 @@ echo "$ac_t""" 1>&6 possible_drivers="(none) \ + (any) \ (bte) \ (bw6130) \ (creative) \ @@ -8020,26 +8021,6 @@ (uirt2_raw) \ (udp)" -if test x${no_kernel} != xyes; then - possible_drivers="${possible_drivers} \ - (any) \ - (lirc_dev) \ - (lirc_dev lirc_atiusb) \ - (lirc_dev lirc_bt829) \ - (lirc_dev lirc_cmdir) \ - (lirc_dev lirc_i2c) \ - (lirc_dev lirc_igorplugusb) \ - (lirc_dev lirc_imon) \ - (lirc_dev lirc_it87) \ - (lirc_dev lirc_mceusb) \ - (lirc_dev lirc_mceusb2) \ - (lirc_dev lirc_parallel) \ - (lirc_dev lirc_sasem) \ - (lirc_dev lirc_serial) \ - (lirc_dev lirc_sir) \ - (lirc_dev lirc_streamzap)" -fi - if test -n "${LIBUSB_CONFIG}"; then cat >> confdefs.h <<\EOF #define HAVE_LIBUSB 1 --- lirc-0.7.2/Makefile.in.orig 2005-08-14 13:27:43.000000000 +0300 +++ lirc-0.7.2/Makefile.in 2005-08-14 18:39:49.000000000 +0300 @@ -113,7 +113,7 @@ EXTRA_DIST = setup.sh setup-driver.sh setup.data data2setup.sh ANNOUNCE TODO -SUBDIRS = drivers daemons tools doc +SUBDIRS = daemons tools doc DISTCLEANFILES = configure.sh .setup.config --- lirc-0.7.2/configure.in.orig 2005-08-14 18:39:36.000000000 +0300 +++ lirc-0.7.2/configure.in 2005-08-14 18:40:08.000000000 +0300 @@ -137,6 +137,7 @@ AC_MSG_RESULT() possible_drivers="(none) \ + (any) \ (bte) \ (bw6130) \ (creative) \ @@ -162,26 +163,6 @@ (uirt2_raw) \ (udp)" -if test x${no_kernel} != xyes; then - possible_drivers="${possible_drivers} \ - (any) \ - (lirc_dev) \ - (lirc_dev lirc_atiusb) \ - (lirc_dev lirc_bt829) \ - (lirc_dev lirc_cmdir) \ - (lirc_dev lirc_i2c) \ - (lirc_dev lirc_igorplugusb) \ - (lirc_dev lirc_imon) \ - (lirc_dev lirc_it87) \ - (lirc_dev lirc_mceusb) \ - (lirc_dev lirc_mceusb2) \ - (lirc_dev lirc_parallel) \ - (lirc_dev lirc_sasem) \ - (lirc_dev lirc_serial) \ - (lirc_dev lirc_sir) \ - (lirc_dev lirc_streamzap)" -fi - if test -n "${LIBUSB_CONFIG}"; then AC_DEFINE(HAVE_LIBUSB) possible_drivers="${possible_drivers} (atilibusb)" lirc-optflags.patch: --- NEW FILE lirc-optflags.patch --- --- lirc-0.7.2/configure.in.optflags 2005-08-14 17:53:43.000000000 +0300 +++ lirc-0.7.2/configure.in 2005-08-14 17:54:18.000000000 +0300 @@ -17,5 +17,5 @@ AM_CONFIG_HEADER(config.h) -CFLAGS="-O2 -g -Wall" +CFLAGS="$CFLAGS -Wall" dnl Checks for programs. --- lirc-0.7.2/configure.optflags 2005-08-14 17:53:50.000000000 +0300 +++ lirc-0.7.2/configure 2005-08-14 17:54:07.000000000 +0300 @@ -1076,5 +1076,5 @@ -CFLAGS="-O2 -g -Wall" +CFLAGS="$CFLAGS -Wall" # Extract the first word of "gcc", so it can be a program name with args. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/lirc/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 17 Apr 2005 14:34:10 -0000 1.4 +++ .cvsignore 14 Aug 2005 17:49:06 -0000 1.5 @@ -1 +1 @@ -lirc-0.7.1.tar.bz2 +lirc-0.7.2.tar.bz2 Index: lirc.spec =================================================================== RCS file: /cvs/extras/rpms/lirc/FC-4/lirc.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- lirc.spec 26 May 2005 19:16:18 -0000 1.6 +++ lirc.spec 14 Aug 2005 17:49:06 -0000 1.7 @@ -1,25 +1,21 @@ # Driver TODO, sometime maybe: -# - audio (req: portaudio) -# - caraca (req: caraca_client) -# - irman: (req: libirman) -# - drivers that need drivers/media/video/bttv*.h (not in kernel-devel) -# - gpio: avermedia avermedia98 flyvideo +# - caraca (req: caraca, http://caraca.sf.net/) +# - irman: (req: libirman, http://lirc.sf.net/software/snapshots/) # Other TODO: # - move to -devel (?): irw, *mode2, others? +# note: xmode2 inflicts a dependency on X, and smode2 on svgalib # - don't run as root and/or create dedicated group, reduce fifo permissions? # - Fixup /etc/lirc(m)d.conf %%ghost'ification, existence after erase etc. # - Verify that the kernel modules work and correct /dev entries get created # automagically with proper permissions etc. -%{!?kernel: %{expand: %%define kernel %(uname -r)}} -%define ksrc %{_usrsrc}/kernels/%{kernel}-%{_target_cpu} - -# Kernel module drivers -%define drivers atiusb com1 hauppauge igorplugusb imon it87 lpt1 mceusb sasem sir_com3 streamzap tekram_bt829 +%{!?kver: %{expand: %%define kver %(uname -r)}} +%define ksrc %{_usrsrc}/kernels/%{kver}-%{_target_cpu} +%define mdir /lib/modules/%{kver}/extra Name: lirc -Version: 0.7.1 -Release: 3 +Version: 0.7.2 +Release: 1%{?dist} Summary: The Linux Infrared Remote Control package Group: System Environment/Daemons @@ -28,19 +24,31 @@ Source0: http://download.sourceforge.net/lirc/%{name}-%{version}.tar.bz2 Source1: %{name}.init Source2: %{name}.sysconfig +Patch0: %{name}-optflags.patch +Patch1: %{name}-gpio.patch +Patch2: %{name}-nomodules.patch +Patch3: %{name}-nodev-crash.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: %{__perl} %if 0%{!?_with_modules:1} -BuildRequires: alsa-lib-devel XFree86-devel libusb-devel +BuildRequires: %{__perl} +BuildRequires: alsa-lib-devel +BuildRequires: xorg-x11-devel +BuildRequires: libusb-devel +BuildRequires: portaudio-devel >= 18 BuildConflicts: svgalib-devel %endif -Requires(post): /sbin/chkconfig /sbin/ldconfig +Requires(post): /sbin/chkconfig +Requires(post): /sbin/ldconfig Requires(preun): /sbin/chkconfig Requires(postun): /sbin/ldconfig %description -LIRC is the Linux Infrared Remote Control package. +LIRC is a package that allows you to decode and send infra-red and +other signals of many (but not all) commonly used remote controls. +Included applications include daemons which decode the received +signals as well as user space applications which allow controlling a +computer with a remote control. %package devel Summary: Development files for LIRC @@ -50,70 +58,54 @@ %description devel %{summary}. -%package -n kernel-module-%{name}-%{kernel} +%package -n kernel-module-%{name}-%{kver} Summary: Kernel modules for LIRC Group: System Environment/Kernel Provides: kernel-module Provides: kernel-module-%{name} = %{version} %if 0%{?_with_modules:1} -BuildRequires: kernel-devel-%{_target_cpu} = %{kernel} +BuildRequires: kernel-devel-%{_target_cpu} = %{kver} %endif Requires: %{name} = %{version} -Requires: modutils -Requires: kernel-%{_target_cpu} = %{kernel} +Requires: module-init-tools +Requires: kernel-%{_target_cpu} = %{kver} Requires: udev -%description -n kernel-module-%{name}-%{kernel} +%description -n kernel-module-%{name}-%{kver} LIRC kernel modules built for kernel -%{kernel} (%{_target_cpu}). +%{kver} (%{_target_cpu}). %prep %setup -q -%{__perl} -pi -e 's|^CFLAGS="-O2 -g -Wall"|CFLAGS="\$CFLAGS -Wall"|' configure +%patch0 -p1 +%patch1 -p1 +# patch2 needs to be applied on top of patch1 +%{!?_with_modules:%patch2 -p1} +%patch3 -p0 chmod 644 contrib/* +touch -r aclocal.m4 configure.in # avoid autofoo re-run %build -%if 0%{?_with_modules:1} -for driver in %{drivers} ; do - # lpt1 is not smp safe @@@ TODO: verify this? - test $driver = lpt1 && grep -q '^CONFIG_SMP=y' %{ksrc}/.config && continue - mkdir -p buildroot/"$driver" - %configure \ - --enable-sandboxed \ - --enable-debug \ - --disable-dependency-tracking \ - --with-kerneldir=%{ksrc} \ - --with-moduledir=/tmp \ - --with-driver=$driver - make %{?_smp_mflags} -C drivers - make -C drivers install DESTDIR=$PWD/buildroot/$driver -done - -%else %configure \ - --with-syslog=LOG_DAEMON \ - --enable-sandboxed \ - --enable-debug \ --disable-dependency-tracking \ + --enable-debug \ + --enable-sandboxed \ + --with-syslog=LOG_DAEMON \ + --with-kerneldir=%{ksrc} \ + --with-moduledir=%{mdir}/%{name} \ --with-driver=any -make %{?_smp_mflags} -%endif +make %{?_smp_mflags} %{?_with_modules:-C drivers} %install rm -rf $RPM_BUILD_ROOT __docs %if 0%{?_with_modules:1} -for driver in %{drivers} ; do - # lpt1 is not SMP safe @@@ TODO: verify this? - test $driver = lpt1 && grep -q '^CONFIG_SMP=y' %{ksrc}/.config && continue - install -dm 755 $RPM_BUILD_ROOT/lib/modules/%{kernel}/updates/lirc - # 0755 here to allow stripping, fixed later in %%files - install -pm 755 buildroot/$driver/tmp/* \ - $RPM_BUILD_ROOT/lib/modules/%{kernel}/updates/lirc -done +make install DESTDIR=$RPM_BUILD_ROOT -C drivers +# executable here to allow stripping, fixed later in %%files +chmod +x $RPM_BUILD_ROOT%{mdir}/%{name}/*.ko %else make install DESTDIR=$RPM_BUILD_ROOT @@ -133,6 +125,7 @@ touch $RPM_BUILD_ROOT%{_sysconfdir}/lirc{d,md}.conf install -dm 755 $RPM_BUILD_ROOT/dev touch $RPM_BUILD_ROOT/dev/lirc{d,m} +rm $RPM_BUILD_ROOT%{_libdir}/liblirc_client.la %endif @@ -143,8 +136,7 @@ %post /sbin/ldconfig /sbin/chkconfig --add lirc -# Backwards compatibility (init script lircd -> lirc rename), -# drop this in FC5: +# Backwards compatibility (init script lircd -> lirc rename), FC < 5 only. if [ $1 -gt 0 -a -x %{_initrddir}/lircd ] ; then %{_initrddir}/lircd status >/dev/null 2>&1 ret=$? @@ -155,8 +147,8 @@ fi fi -%post -n kernel-module-%{name}-%{kernel} -depmod -ae -F /boot/System.map-%{kernel} %{kernel} >/dev/null || : +%post -n kernel-module-%{name}-%{kver} +depmod -ae -F /boot/System.map-%{kver} %{kver} >/dev/null || : %preun if [ $1 -eq 0 ] ; then @@ -170,8 +162,8 @@ %{_initrddir}/lirc try-restart >/dev/null || : fi -%postun -n kernel-module-%{name}-%{kernel} -depmod -ae -F /boot/System.map-%{kernel} %{kernel} >/dev/null || : +%postun -n kernel-module-%{name}-%{kver} +depmod -ae -F /boot/System.map-%{kver} %{kver} >/dev/null || : %if 0%{!?_with_modules:1} @@ -180,7 +172,7 @@ %doc ANNOUNCE AUTHORS ChangeLog COPYING NEWS README TODO remotes __docs/* %ghost %config(noreplace) %{_sysconfdir}/lirc*d.conf %config(noreplace) %{_sysconfdir}/sysconfig/lirc -%config %{_initrddir}/lirc +%{_initrddir}/lirc %{_bindir}/ir* %{_bindir}/*mode2 %{_sbindir}/lirc*d @@ -192,20 +184,26 @@ %files devel %defattr(-,root,root,-) -%{_includedir}/lirc +%{_includedir}/lirc/ %{_libdir}/liblirc_client.a %{_libdir}/liblirc_client.so -%exclude %{_libdir}/liblirc_client.la %endif %if 0%{?_with_modules:1} -%files -n kernel-module-%{name}-%{kernel} +%files -n kernel-module-%{name}-%{kver} %defattr(644,root,root,755) -/lib/modules/%{kernel}/updates +%{mdir}/ %endif %changelog +* Sun Aug 14 2005 Ville Skytt?? - 0.7.2-1 +- 0.7.2, patch to fix crash at startup when no device is specified. +- Enable audio input driver support (portaudio). +- Improve package description. +- Simplify module package build (still work in progress, disabled by default). +- Other minor specfile cleanups and maintainability improvements. + * Thu May 26 2005 Ville Skytt?? - 0.7.1-3 - Adjust kernel module build for FC4 and add hauppauge, igorplugusb, imon, sasem, and streamzap to the list of modules to build. This stuff is still Index: sources =================================================================== RCS file: /cvs/extras/rpms/lirc/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 17 Apr 2005 14:34:10 -0000 1.4 +++ sources 14 Aug 2005 17:49:06 -0000 1.5 @@ -1 +1 @@ -642e543e25dd6ad72416784bb6166d54 lirc-0.7.1.tar.bz2 +4510cf711f5c146f80c5bdfd61ca3f4a lirc-0.7.2.tar.bz2 From fedora-extras-commits at redhat.com Sun Aug 14 18:03:11 2005 From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl)) Date: Sun, 14 Aug 2005 14:03:11 -0400 Subject: rpms/mail-notification/devel .cvsignore, 1.4, 1.5 mail-notification.spec, 1.7, 1.8 sources, 1.4, 1.5 Message-ID: <200508141804.j7EI42tP023255@cvs-int.fedora.redhat.com> Author: thl Update of /cvs/extras/rpms/mail-notification/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23234 Modified Files: .cvsignore mail-notification.spec sources Log Message: Update to 2.0 (without evo for now); Use dist; new BR gob2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mail-notification/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 9 Mar 2005 20:16:31 -0000 1.4 +++ .cvsignore 14 Aug 2005 18:03:09 -0000 1.5 @@ -1 +1,3 @@ -mail-notification-1.1.tar.gz +mail-notification-2.0.tar.gz +mail-notification-2.0-buildfix.diff +mail-notification-2.0-gmail-properties-fix.diff Index: mail-notification.spec =================================================================== RCS file: /cvs/extras/rpms/mail-notification/devel/mail-notification.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- mail-notification.spec 18 May 2005 02:45:50 -0000 1.7 +++ mail-notification.spec 14 Aug 2005 18:03:09 -0000 1.8 @@ -1,13 +1,15 @@ Name: mail-notification -Version: 1.1 -Release: 3 +Version: 2.0 +Release: 1%{?dist} Summary: Status icon that informs you if you have new mail Group: Applications/Internet License: GPL URL: http://www.nongnu.org/mailnotify/ -Source0: http://savannah.nongnu.org/download/mailnotify/mail-notification-1.1.tar.gz +Source0: http://savannah.nongnu.org/download/mailnotify/mail-notification-2.0.tar.gz Source1: mail-notification-README.FEDORA +Patch0: http://savannah.nongnu.org/download/mailnotify/mail-notification-2.0-buildfix.diff +Patch1: http://savannah.nongnu.org/download/mailnotify/mail-notification-2.0-gmail-properties-fix.diff BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gettext >= 0.14.1 @@ -21,6 +23,8 @@ BuildRequires: gnutls-devel >= 1.0.20 BuildRequires: libgcrypt-devel >= 1.2.0 BuildRequires: libicu-devel >= 2.6 +BuildRequires: gob2 + Requires(post): GConf2 Requires(post): scrollkeeper @@ -37,11 +41,12 @@ %prep %setup -q cp %{SOURCE1} ./README.FEDORA - +%patch0 -b .patch0 +%patch1 -b .patch1 %build -%configure +%configure --disable-evolution make %{?_smp_mflags} @@ -61,6 +66,11 @@ --add-category X-Fedora \ ${RPM_BUILD_ROOT}%{_datadir}/applications/mail-notification.desktop +desktop-file-install --vendor fedora \ + --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ + --delete-original \ + --add-category X-Fedora \ + ${RPM_BUILD_ROOT}%{_datadir}/applications/mail-notification-properties.desktop %clean @@ -91,9 +101,10 @@ %{_sysconfdir}/gconf/schemas/mail-notification.schemas %{_sysconfdir}/sound/events/mail-notification.soundlist %{_bindir}/* -%{_libdir}/bonobo/servers/GNOME_MailNotification_Automation.server +%{_libdir}/bonobo/servers/GNOME_MailNotification.server %{_datadir}/%{name} -%{_datadir}/control-center-2.0/capplets/mail-notification-properties.desktop +%{_datadir}/applications/fedora-mail-notification.desktop +%{_datadir}/applications/fedora-mail-notification-properties.desktop %{_datadir}/gnome/help/mail-notification/ %dir %{_datadir}/omf/mail-notification/ %{_datadir}/omf/mail-notification/mail-notification-C.omf @@ -102,6 +113,13 @@ %changelog +* Wed Aug 10 2005 Thorsten Leemhuis - 2.0-1 +- Update to 2.0 -- build without evolution support for now (seems it + needs the whole evo-source) +- Use dist +- Add two patches +- New BR gob2 + * Wed May 18 2005 Colin Charles - 1.1.-3 - bump release, request build for ppc Index: sources =================================================================== RCS file: /cvs/extras/rpms/mail-notification/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 9 Mar 2005 20:16:31 -0000 1.4 +++ sources 14 Aug 2005 18:03:09 -0000 1.5 @@ -1 +1,3 @@ -2359fb53128b12cf295bdf8553e5869b mail-notification-1.1.tar.gz +56ef7401aba1cb27d881fb0f33a3248d mail-notification-2.0.tar.gz +9b632ffa3d886c3829752ea656adf8f1 mail-notification-2.0-buildfix.diff +7e2243b625802214a46bce8d633b94dc mail-notification-2.0-gmail-properties-fix.diff From fedora-extras-commits at redhat.com Sun Aug 14 18:10:00 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Sun, 14 Aug 2005 14:10:00 -0400 Subject: rpms/gossip/devel .cvsignore, 1.2, 1.3 gossip.spec, 1.3, 1.4 sources, 1.2, 1.3 Message-ID: <200508141810.j7EIA0ti023328@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/gossip/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23307 Modified Files: .cvsignore gossip.spec sources Log Message: * Sun Aug 14 2005 Brian Pepple - 0.9-2 - Remove dbus patch. - Add version for loudmouth & dbus deps. - Change location of wav files. - Add soundlist & dtd to files. - Update to 0.9. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gossip/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 6 May 2005 16:12:39 -0000 1.2 +++ .cvsignore 14 Aug 2005 18:09:57 -0000 1.3 @@ -1 +1 @@ -gossip-0.8.tar.bz2 +gossip-0.9.tar.bz2 Index: gossip.spec =================================================================== RCS file: /cvs/extras/rpms/gossip/devel/gossip.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gossip.spec 23 May 2005 18:14:25 -0000 1.3 +++ gossip.spec 14 Aug 2005 18:09:57 -0000 1.4 @@ -1,18 +1,17 @@ %define with_dbus 1 Name: gossip -Version: 0.8 -Release: 5%{?dist} +Version: 0.9 +Release: 2%{?dist} Summary: Gnome Jabber Client Group: Applications/Communications License: GPL URL: http://www.imendio.com/projects/gossip/ Source0: http://ftp.gnome.org/pub/GNOME/sources/%{name}/%{version}/%{name}-%{version}.tar.bz2 -Patch1: gossip-dbus.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: loudmouth-devel +BuildRequires: loudmouth-devel >= 1.0 BuildRequires: GConf2-devel BuildRequires: libglade2-devel BuildRequires: libgnomeui-devel @@ -24,7 +23,7 @@ BuildRequires: gettext %if %{with_dbus} -BuildRequires: dbus-devel +BuildRequires: dbus-devel >= 0.31 %endif Requires(post): GConf2 @@ -37,7 +36,6 @@ %prep %setup -q -%patch1 -p1 -b .dbus %build @@ -85,18 +83,28 @@ %doc AUTHORS ChangeLog README NEWS %{_bindir}/%{name} %{_sysconfdir}/gconf/schemas/%{name}.schemas +%{_sysconfdir}/sound/events/%{name}.soundlist %{_datadir}/applications/*.desktop %{_datadir}/pixmaps/%{name}.png %dir %{_datadir}/%{name} %{_datadir}/%{name}/*.glade %{_datadir}/%{name}/*.png -%{_datadir}/%{name}/*.wav +%{_datadir}/%{name}/*.dtd %{_datadir}/%{name}/%{name}-log.xsl %dir %{_datadir}/%{name}/protocols %{_datadir}/%{name}/protocols/* +%dir %{_datadir}/sounds/%{name} +%{_datadir}/sounds/%{name}/*.wav %changelog +* Sun Aug 14 2005 Brian Pepple - 0.9-2 +- Remove dbus patch. +- Add version for loudmouth & dbus deps. +- Change location of wav files. +- Add soundlist & dtd to files. +- Update to 0.9. + * Mon May 23 2005 Brian Pepple - 0.8-5 - Add patch to fix dbus support, and build. Index: sources =================================================================== RCS file: /cvs/extras/rpms/gossip/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 6 May 2005 16:12:39 -0000 1.2 +++ sources 14 Aug 2005 18:09:57 -0000 1.3 @@ -1 +1 @@ -8bbe3dac8d0da7e0b936971a01545f14 gossip-0.8.tar.bz2 +af017e1652a96009d30eeeead2dd4ef9 gossip-0.9.tar.bz2 From fedora-extras-commits at redhat.com Sun Aug 14 18:16:17 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Sun, 14 Aug 2005 14:16:17 -0400 Subject: rpms/gossip/devel gossip-dbus.patch,1.1,NONE Message-ID: <200508141816.j7EIGHWA023373@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/gossip/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23358 Removed Files: gossip-dbus.patch Log Message: * Sun Aug 14 2005 Brian Pepple - 0.9-2 - Remove dbus patch. - Add version for loudmouth & dbus deps. - Change location of wav files. - Add soundlist & dtd to files. - Update to 0.9. --- gossip-dbus.patch DELETED --- From fedora-extras-commits at redhat.com Sun Aug 14 18:21:03 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Sun, 14 Aug 2005 14:21:03 -0400 Subject: rpms/gossip/FC-4 .cvsignore, 1.2, 1.3 gossip.spec, 1.3, 1.4 sources, 1.2, 1.3 gossip-dbus.patch, 1.1, NONE Message-ID: <200508141821.j7EIL3Oj023452@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/gossip/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23431 Modified Files: .cvsignore gossip.spec sources Removed Files: gossip-dbus.patch Log Message: * Sun Aug 14 2005 Brian Pepple - 0.9-1 - Remove dbus patch. - Add version for loudmouth & dbus deps. - Change location of wav files. - Add soundlist & dtd to files. - Update to 0.9. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gossip/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 6 May 2005 16:12:39 -0000 1.2 +++ .cvsignore 14 Aug 2005 18:21:01 -0000 1.3 @@ -1 +1 @@ -gossip-0.8.tar.bz2 +gossip-0.9.tar.bz2 Index: gossip.spec =================================================================== RCS file: /cvs/extras/rpms/gossip/FC-4/gossip.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gossip.spec 23 May 2005 18:14:25 -0000 1.3 +++ gossip.spec 14 Aug 2005 18:21:01 -0000 1.4 @@ -1,18 +1,17 @@ %define with_dbus 1 Name: gossip -Version: 0.8 -Release: 5%{?dist} +Version: 0.9 +Release: 1%{?dist} Summary: Gnome Jabber Client Group: Applications/Communications License: GPL URL: http://www.imendio.com/projects/gossip/ Source0: http://ftp.gnome.org/pub/GNOME/sources/%{name}/%{version}/%{name}-%{version}.tar.bz2 -Patch1: gossip-dbus.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: loudmouth-devel +BuildRequires: loudmouth-devel >= 1.0 BuildRequires: GConf2-devel BuildRequires: libglade2-devel BuildRequires: libgnomeui-devel @@ -24,7 +23,7 @@ BuildRequires: gettext %if %{with_dbus} -BuildRequires: dbus-devel +BuildRequires: dbus-devel >= 0.31 %endif Requires(post): GConf2 @@ -37,7 +36,6 @@ %prep %setup -q -%patch1 -p1 -b .dbus %build @@ -85,18 +83,28 @@ %doc AUTHORS ChangeLog README NEWS %{_bindir}/%{name} %{_sysconfdir}/gconf/schemas/%{name}.schemas +%{_sysconfdir}/sound/events/%{name}.soundlist %{_datadir}/applications/*.desktop %{_datadir}/pixmaps/%{name}.png %dir %{_datadir}/%{name} %{_datadir}/%{name}/*.glade %{_datadir}/%{name}/*.png -%{_datadir}/%{name}/*.wav +%{_datadir}/%{name}/*.dtd %{_datadir}/%{name}/%{name}-log.xsl %dir %{_datadir}/%{name}/protocols %{_datadir}/%{name}/protocols/* +%dir %{_datadir}/sounds/%{name} +%{_datadir}/sounds/%{name}/*.wav %changelog +* Sun Aug 14 2005 Brian Pepple - 0.9-1 +- Remove dbus patch. +- Add version for loudmouth & dbus deps. +- Change location of wav files. +- Add soundlist & dtd to files. +- Update to 0.9. + * Mon May 23 2005 Brian Pepple - 0.8-5 - Add patch to fix dbus support, and build. Index: sources =================================================================== RCS file: /cvs/extras/rpms/gossip/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 6 May 2005 16:12:39 -0000 1.2 +++ sources 14 Aug 2005 18:21:01 -0000 1.3 @@ -1 +1 @@ -8bbe3dac8d0da7e0b936971a01545f14 gossip-0.8.tar.bz2 +af017e1652a96009d30eeeead2dd4ef9 gossip-0.9.tar.bz2 --- gossip-dbus.patch DELETED --- From fedora-extras-commits at redhat.com Sun Aug 14 18:38:36 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 14 Aug 2005 14:38:36 -0400 Subject: rpms/perl-Class-Accessor - New directory Message-ID: <200508141838.j7EIcadv023586@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Class-Accessor In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23562/perl-Class-Accessor Log Message: Directory /cvs/extras/rpms/perl-Class-Accessor added to the repository From fedora-extras-commits at redhat.com Sun Aug 14 18:38:36 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 14 Aug 2005 14:38:36 -0400 Subject: rpms/perl-Class-Accessor/devel - New directory Message-ID: <200508141838.j7EIcau6023591@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Class-Accessor/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23562/perl-Class-Accessor/devel Log Message: Directory /cvs/extras/rpms/perl-Class-Accessor/devel added to the repository From fedora-extras-commits at redhat.com Sun Aug 14 18:38:48 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 14 Aug 2005 14:38:48 -0400 Subject: rpms/perl-Class-Accessor Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200508141838.j7EIcmR9023638@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Class-Accessor In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23607 Added Files: Makefile import.log Log Message: Setup of module perl-Class-Accessor --- NEW FILE Makefile --- # Top level Makefile for module perl-Class-Accessor all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Sun Aug 14 18:38:49 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 14 Aug 2005 14:38:49 -0400 Subject: rpms/perl-Class-Accessor/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200508141838.j7EIcn3w023643@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Class-Accessor/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23607/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Class-Accessor --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Sun Aug 14 18:39:10 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 14 Aug 2005 14:39:10 -0400 Subject: rpms/perl-Class-Accessor import.log,1.1,1.2 Message-ID: <200508141839.j7EIdA9g023702@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Class-Accessor In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23671 Modified Files: import.log Log Message: auto-import perl-Class-Accessor-0.19-3 on branch devel from perl-Class-Accessor-0.19-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Accessor/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 14 Aug 2005 18:38:46 -0000 1.1 +++ import.log 14 Aug 2005 18:39:07 -0000 1.2 @@ -0,0 +1 @@ +perl-Class-Accessor-0_19-3:HEAD:perl-Class-Accessor-0.19-3.src.rpm:1124044802 From fedora-extras-commits at redhat.com Sun Aug 14 18:39:10 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 14 Aug 2005 14:39:10 -0400 Subject: rpms/perl-Class-Accessor/devel perl-Class-Accessor.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200508141839.j7EIdAIF023709@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Class-Accessor/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23671/devel Modified Files: .cvsignore sources Added Files: perl-Class-Accessor.spec Log Message: auto-import perl-Class-Accessor-0.19-3 on branch devel from perl-Class-Accessor-0.19-3.src.rpm --- NEW FILE perl-Class-Accessor.spec --- Name: perl-Class-Accessor Version: 0.19 Release: 3%{?dist} Summary: Automated accessor generation Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/Class-Accessor/ Source0: http://search.cpan.org/CPAN/authors/id/K/KA/KASEI/Class-Accessor-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl >= 1:5.6.1 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description %{summary}. %prep %setup -q -n Class-Accessor-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes examples/ %{perl_vendorlib}/Class %{_mandir}/man3/*.3* %changelog * Fri Aug 5 2005 Tom "spot" Callaway 0.19-3 - add examples/ to %doc * Fri Jul 8 2005 Tom "spot" Callaway 0.19-2 - cleanups * Wed Jul 6 2005 Tom "spot" Callaway 0.19-1 - Initial package for Fedora Extras Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Accessor/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 14 Aug 2005 18:38:47 -0000 1.1 +++ .cvsignore 14 Aug 2005 18:39:08 -0000 1.2 @@ -0,0 +1 @@ +Class-Accessor-0.19.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Accessor/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 14 Aug 2005 18:38:47 -0000 1.1 +++ sources 14 Aug 2005 18:39:08 -0000 1.2 @@ -0,0 +1 @@ +c61a058df6901b4ebae2596fd6352197 Class-Accessor-0.19.tar.gz From fedora-extras-commits at redhat.com Sun Aug 14 18:45:00 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 14 Aug 2005 14:45:00 -0400 Subject: owners owners.list,1.78,1.79 Message-ID: <200508141845.j7EIj0wR023763@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23746 Modified Files: owners.list Log Message: Add perl-Class-Accessor Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.78 retrieving revision 1.79 diff -u -r1.78 -r1.79 --- owners.list 14 Aug 2005 04:40:35 -0000 1.78 +++ owners.list 14 Aug 2005 18:44:58 -0000 1.79 @@ -524,6 +524,7 @@ Fedora Extras|perl-Cache-Cache|Cache-Cache module for perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-CGI-Simple|Simple totally OO CGI interface that is CGI.pm compliant|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Chart|Perl modules for producing many types of charts|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Class-Accessor|Automated accessor generation|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Class-Data-Inheritable|Inheritable, overridable class data|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Class-MethodMaker|Create generic methods for OO Perl|dgregor at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Class-Whitehole|Base class to treat unhandled method calls as errors|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Sun Aug 14 18:50:10 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 14 Aug 2005 14:50:10 -0400 Subject: rpms/perl-UNIVERSAL-exports - New directory Message-ID: <200508141850.j7EIoAEh024147@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-UNIVERSAL-exports In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24127/perl-UNIVERSAL-exports Log Message: Directory /cvs/extras/rpms/perl-UNIVERSAL-exports added to the repository From fedora-extras-commits at redhat.com Sun Aug 14 18:50:11 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 14 Aug 2005 14:50:11 -0400 Subject: rpms/perl-UNIVERSAL-exports/devel - New directory Message-ID: <200508141850.j7EIoBus024152@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-UNIVERSAL-exports/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24127/perl-UNIVERSAL-exports/devel Log Message: Directory /cvs/extras/rpms/perl-UNIVERSAL-exports/devel added to the repository From fedora-extras-commits at redhat.com Sun Aug 14 18:50:24 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 14 Aug 2005 14:50:24 -0400 Subject: rpms/perl-UNIVERSAL-exports Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200508141850.j7EIoOOn024199@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-UNIVERSAL-exports In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24172 Added Files: Makefile import.log Log Message: Setup of module perl-UNIVERSAL-exports --- NEW FILE Makefile --- # Top level Makefile for module perl-UNIVERSAL-exports all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Sun Aug 14 18:50:25 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 14 Aug 2005 14:50:25 -0400 Subject: rpms/perl-UNIVERSAL-exports/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200508141850.j7EIoP7G024204@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-UNIVERSAL-exports/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24172/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-UNIVERSAL-exports --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Sun Aug 14 18:50:53 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 14 Aug 2005 14:50:53 -0400 Subject: rpms/perl-UNIVERSAL-exports import.log,1.1,1.2 Message-ID: <200508141850.j7EIorLG024267@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-UNIVERSAL-exports In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24236 Modified Files: import.log Log Message: auto-import perl-UNIVERSAL-exports-0.03-3 on branch devel from perl-UNIVERSAL-exports-0.03-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-UNIVERSAL-exports/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 14 Aug 2005 18:50:22 -0000 1.1 +++ import.log 14 Aug 2005 18:50:51 -0000 1.2 @@ -0,0 +1 @@ +perl-UNIVERSAL-exports-0_03-3:HEAD:perl-UNIVERSAL-exports-0.03-3.src.rpm:1124045505 From fedora-extras-commits at redhat.com Sun Aug 14 18:50:53 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 14 Aug 2005 14:50:53 -0400 Subject: rpms/perl-UNIVERSAL-exports/devel perl-UNIVERSAL-exports.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200508141850.j7EIorT6024274@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-UNIVERSAL-exports/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24236/devel Modified Files: .cvsignore sources Added Files: perl-UNIVERSAL-exports.spec Log Message: auto-import perl-UNIVERSAL-exports-0.03-3 on branch devel from perl-UNIVERSAL-exports-0.03-3.src.rpm --- NEW FILE perl-UNIVERSAL-exports.spec --- Name: perl-UNIVERSAL-exports Version: 0.03 Release: 3%{?dist} Summary: Lightweight, universal exporting of variables Group: Development/Libraries # This is likely GPL or Artistic, like perl, but it cannot be confirmed. License: Distributable URL: http://search.cpan.org/dist/UNIVERSAL-exports/ Source0: http://search.cpan.org/CPAN/authors/id/M/MS/MSCHWERN/UNIVERSAL-exports-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl >= 1:5.6.1 BuildRequires: perl(Exporter::Lite) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description %{summary}. %prep %setup -q -n UNIVERSAL-exports-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes %{perl_vendorlib}/UNIVERSAL %{_mandir}/man3/*.3* %changelog * Sun Aug 14 2005 Tom "spot" Callaway 0.03-3 - change license to Distributable, since upstream never replied to license confirmation * Fri Jul 8 2005 Tom "spot" Callaway 0.03-2 - cleanups * Wed Jul 6 2005 Tom "spot" Callaway 0.03-1 - Initial package for Fedora Extras Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-UNIVERSAL-exports/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 14 Aug 2005 18:50:23 -0000 1.1 +++ .cvsignore 14 Aug 2005 18:50:51 -0000 1.2 @@ -0,0 +1 @@ +UNIVERSAL-exports-0.03.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-UNIVERSAL-exports/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 14 Aug 2005 18:50:23 -0000 1.1 +++ sources 14 Aug 2005 18:50:51 -0000 1.2 @@ -0,0 +1 @@ +7672d8e740d99c3af612205e6fde8644 UNIVERSAL-exports-0.03.tar.gz From fedora-extras-commits at redhat.com Sun Aug 14 18:52:16 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 14 Aug 2005 14:52:16 -0400 Subject: owners owners.list,1.79,1.80 Message-ID: <200508141852.j7EIqGXE024323@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24306/owners Modified Files: owners.list Log Message: Add perl-UNIVERSAL-exports Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.79 retrieving revision 1.80 diff -u -r1.79 -r1.80 --- owners.list 14 Aug 2005 18:44:58 -0000 1.79 +++ owners.list 14 Aug 2005 18:52:14 -0000 1.80 @@ -646,6 +646,7 @@ Fedora Extras|perl-Unicode-Map|Perl module for mapping charsets from and to utf16 unicode|gauret at free.fr|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Unicode-MapUTF8|Conversions to and from arbitrary character sets and UTF8|gauret at free.fr|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Unicode-String|Perl modules to handle various Unicode issues|gauret at free.fr|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-UNIVERSAL-exports|Lightweight, universal exporting of variables|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-UNIVERSAL-moniker|Real world naming for classes|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Unix-Syslog|Perl interface to the UNIX syslog(3) calls|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Want|Perl module implementing a generalisation of wantarray|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Sun Aug 14 22:14:28 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Sun, 14 Aug 2005 18:14:28 -0400 Subject: rpms/gossip/devel gossip.spec,1.4,1.5 Message-ID: <200508142214.j7EMES1v029684@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/gossip/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29667 Modified Files: gossip.spec Log Message: * Sun Aug 14 2005 Brian Pepple - 0.9-3 - Add aspell-devel BR, so spell-checking is enabled. Index: gossip.spec =================================================================== RCS file: /cvs/extras/rpms/gossip/devel/gossip.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- gossip.spec 14 Aug 2005 18:09:57 -0000 1.4 +++ gossip.spec 14 Aug 2005 22:14:26 -0000 1.5 @@ -2,7 +2,7 @@ Name: gossip Version: 0.9 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Gnome Jabber Client Group: Applications/Communications @@ -20,6 +20,7 @@ BuildRequires: libxml2-devel BuildRequires: libgcrypt-devel BuildRequires: desktop-file-utils +BuildRequires: aspell-devel BuildRequires: gettext %if %{with_dbus} @@ -98,6 +99,9 @@ %changelog +* Sun Aug 14 2005 Brian Pepple - 0.9-3 +- Add aspell-devel BR, so spell-checking is enabled. + * Sun Aug 14 2005 Brian Pepple - 0.9-2 - Remove dbus patch. - Add version for loudmouth & dbus deps. From fedora-extras-commits at redhat.com Sun Aug 14 22:16:27 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Sun, 14 Aug 2005 18:16:27 -0400 Subject: rpms/gossip/FC-4 gossip.spec,1.4,1.5 Message-ID: <200508142216.j7EMGS18029712@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/gossip/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29698 Modified Files: gossip.spec Log Message: * Sun Aug 14 2005 Brian Pepple - 0.9-2 - Add aspell-devel BR, so spell-checking is enabled. Index: gossip.spec =================================================================== RCS file: /cvs/extras/rpms/gossip/FC-4/gossip.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- gossip.spec 14 Aug 2005 18:21:01 -0000 1.4 +++ gossip.spec 14 Aug 2005 22:16:25 -0000 1.5 @@ -2,7 +2,7 @@ Name: gossip Version: 0.9 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Gnome Jabber Client Group: Applications/Communications @@ -20,6 +20,7 @@ BuildRequires: libxml2-devel BuildRequires: libgcrypt-devel BuildRequires: desktop-file-utils +BuildRequires: aspell-devel BuildRequires: gettext %if %{with_dbus} @@ -98,6 +99,9 @@ %changelog +* Sun Aug 14 2005 Brian Pepple - 0.9-2 +- Add aspell-devel BR, so spell-checking is enabled. + * Sun Aug 14 2005 Brian Pepple - 0.9-1 - Remove dbus patch. - Add version for loudmouth & dbus deps. From fedora-extras-commits at redhat.com Mon Aug 15 01:31:02 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sun, 14 Aug 2005 21:31:02 -0400 Subject: rpms/abicheck/devel abicheck.dbfile.FORTIFY_SOURCE, 1.1, 1.2 abicheck.spec, 1.12, 1.13 Message-ID: <200508150131.j7F1V2uL001969@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/abicheck/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1950 Modified Files: abicheck.dbfile.FORTIFY_SOURCE abicheck.spec Log Message: more symbols Index: abicheck.dbfile.FORTIFY_SOURCE =================================================================== RCS file: /cvs/extras/rpms/abicheck/devel/abicheck.dbfile.FORTIFY_SOURCE,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- abicheck.dbfile.FORTIFY_SOURCE 11 Aug 2005 20:06:26 -0000 1.1 +++ abicheck.dbfile.FORTIFY_SOURCE 15 Aug 2005 01:30:59 -0000 1.2 @@ -1,10 +1,21 @@ libc.so.6|__chk_fail|public +libc.so.6|__confstr_chk|public libc.so.6|__fgets_chk|public libc.so.6|__fgets_unlocked_chk|public +libc.so.6|__fgetws_chk|public +libc.so.6|__fgetws_unlocked_chk|public libc.so.6|__fprintf_chk|public +libc.so.6|__fwprintf_chk|public libc.so.6|__getcwd_chk|public +libc.so.6|__getdomainname_chk|public +libc.so.6|__getgroups_chk|public +libc.so.6|__gethostname_chk|public +libc.so.6|__getlogin_r_chk|public libc.so.6|__gets_chk|public libc.so.6|__getwd_chk|public +libc.so.6|__mbsnrtowcs_chk|public +libc.so.6|__mbsrtowcs_chk|public +libc.so.6|__mbstowcs_chk|public libc.so.6|__memcpy_chk|public libc.so.6|__memmove_chk|public libc.so.6|__mempcpy_chk|public @@ -12,19 +23,45 @@ libc.so.6|__pread64_chk|public libc.so.6|__pread_chk|public libc.so.6|__printf_chk|public +libc.so.6|__ptsname_r_chk|public libc.so.6|__read_chk|public libc.so.6|__readlink_chk|public +libc.so.6|__realpath_chk|public libc.so.6|__recv_chk|public libc.so.6|__recvfrom_chk|public libc.so.6|__snprintf_chk|public libc.so.6|__sprintf_chk|public libc.so.6|__stack_chk_fail|public libc.so.6|__stpcpy_chk|public +libc.so.6|__stpncpy_chk|public libc.so.6|__strcat_chk|public libc.so.6|__strcpy_chk|public libc.so.6|__strncat_chk|public libc.so.6|__strncpy_chk|public +libc.so.6|__swprintf_chk|public +libc.so.6|__syslog_chk|public +libc.so.6|__ttyname_r_chk|public libc.so.6|__vfprintf_chk|public +libc.so.6|__vfwprintf_chk|public libc.so.6|__vprintf_chk|public libc.so.6|__vsnprintf_chk|public libc.so.6|__vsprintf_chk|public +libc.so.6|__vswprintf_chk|public +libc.so.6|__vsyslog_chk|public +libc.so.6|__vwprintf_chk|public +libc.so.6|__wcpcpy_chk|public +libc.so.6|__wcpncpy_chk|public +libc.so.6|__wcrtomb_chk|public +libc.so.6|__wcscat_chk|public +libc.so.6|__wcscpy_chk|public +libc.so.6|__wcsncat_chk|public +libc.so.6|__wcsncpy_chk|public +libc.so.6|__wcsnrtombs_chk|public +libc.so.6|__wcsrtombs_chk|public +libc.so.6|__wcstombs_chk|public +libc.so.6|__wctomb_chk|public +libc.so.6|__wmemcpy_chk|public +libc.so.6|__wmemmove_chk|public +libc.so.6|__wmempcpy_chk|public +libc.so.6|__wmemset_chk|public +libc.so.6|__wprintf_chk|public Index: abicheck.spec =================================================================== RCS file: /cvs/extras/rpms/abicheck/devel/abicheck.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- abicheck.spec 11 Aug 2005 20:06:26 -0000 1.12 +++ abicheck.spec 15 Aug 2005 01:30:59 -0000 1.13 @@ -3,7 +3,7 @@ Summary: ABI checking tool Name: abicheck Version: 1.2 -Release: 7 +Release: 8 License: LGPL Group: Applications/File URL: http://abicheck.sourceforge.net/ From fedora-extras-commits at redhat.com Mon Aug 15 03:18:23 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sun, 14 Aug 2005 23:18:23 -0400 Subject: extras-buildsys/server/addl_pkg_arches devel-addl-arches,1.1,NONE Message-ID: <200508150318.j7F3INVh004686@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server/addl_pkg_arches In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4617/server/addl_pkg_arches Removed Files: devel-addl-arches Log Message: 2005-08-14 Dan Williams * Switch to new server config file format using ConfigParser - Server config files are no longer python scripts - Server now takes a mandatory -c option for config file location - Server will write out a default config file at the specified location if none exists - Each target has its own config file, by default in /etc/plague/targets/ - CVSROOT and CVS_RSH are now target-specific, not server-wide - Additional Package Arches are now target-specific, and reside in each target's config file rather than server-wide * "Scratch" targets are now supported; ie, they are targets that do not contribute packages to a repository. Use the option "scratch=yes" in the target's config file in the "General" section to make the target a scratch target. * Repository Scripts: you may now specify a script that is run after packages are copied to a repository. Use the "repo_script" option in each target's config file to specify a script for that target/repo. The script must exit with result 0 on success, and > 0 on error. The script is given one argument, which is the name of the target/repo which has just copied packages. If the script fails, those listed in "admin_emails" in the server config file will be mailed with the script's output. The script is also killed if it takes longer than 1 hour to complete, since packages cannot be built for the target while the script is running. --- devel-addl-arches DELETED --- From fedora-extras-commits at redhat.com Mon Aug 15 03:18:21 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sun, 14 Aug 2005 23:18:21 -0400 Subject: extras-buildsys ChangeLog,1.97,1.98 Message-ID: <200508150318.j7F3IpAU004693@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4617 Modified Files: ChangeLog Log Message: 2005-08-14 Dan Williams * Switch to new server config file format using ConfigParser - Server config files are no longer python scripts - Server now takes a mandatory -c option for config file location - Server will write out a default config file at the specified location if none exists - Each target has its own config file, by default in /etc/plague/targets/ - CVSROOT and CVS_RSH are now target-specific, not server-wide - Additional Package Arches are now target-specific, and reside in each target's config file rather than server-wide * "Scratch" targets are now supported; ie, they are targets that do not contribute packages to a repository. Use the option "scratch=yes" in the target's config file in the "General" section to make the target a scratch target. * Repository Scripts: you may now specify a script that is run after packages are copied to a repository. Use the "repo_script" option in each target's config file to specify a script for that target/repo. The script must exit with result 0 on success, and > 0 on error. The script is given one argument, which is the name of the target/repo which has just copied packages. If the script fails, those listed in "admin_emails" in the server config file will be mailed with the script's output. The script is also killed if it takes longer than 1 hour to complete, since packages cannot be built for the target while the script is running. Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.97 retrieving revision 1.98 diff -u -r1.97 -r1.98 --- ChangeLog 11 Aug 2005 19:36:08 -0000 1.97 +++ ChangeLog 15 Aug 2005 03:18:18 -0000 1.98 @@ -1,3 +1,30 @@ +2005-08-14 Dan Williams + + * Switch to new server config file format using ConfigParser + - Server config files are no longer python scripts + - Server now takes a mandatory -c option for config file location + - Server will write out a default config file at the specified location + if none exists + - Each target has its own config file, by default in /etc/plague/targets/ + - CVSROOT and CVS_RSH are now target-specific, not server-wide + - Additional Package Arches are now target-specific, and reside in each + target's config file rather than server-wide + + * "Scratch" targets are now supported; ie, they are targets that do not + contribute packages to a repository. Use the option "scratch=yes" in + the target's config file in the "General" section to make the target a + scratch target. + + * Repository Scripts: you may now specify a script that is run after packages + are copied to a repository. Use the "repo_script" option in each target's + config file to specify a script for that target/repo. The script must + exit with result 0 on success, and > 0 on error. The script is given + one argument, which is the name of the target/repo which has just copied + packages. If the script fails, those listed in "admin_emails" in the + server config file will be mailed with the script's output. The script + is also killed if it takes longer than 1 hour to complete, since packages + cannot be built for the target while the script is running. + 2005-08-11 Dan Williams * Tag plague-0_3_1_RELEASE From fedora-extras-commits at redhat.com Mon Aug 15 03:18:23 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sun, 14 Aug 2005 23:18:23 -0400 Subject: extras-buildsys/server Config.py, NONE, 1.1 ArchJob.py, 1.10, 1.11 BuildMaster.py, 1.30, 1.31 Builder.py, 1.11, 1.12 BuilderManager.py, 1.11, 1.12 EmailUtils.py, 1.1, 1.2 Makefile, 1.6, 1.7 PackageJob.py, 1.21, 1.22 Repo.py, 1.11, 1.12 User.py, 1.6, 1.7 UserInterface.py, 1.44, 1.45 main.py, 1.11, 1.12 CONFIG.py, 1.21, NONE Message-ID: <200508150318.j7F3INB9004683@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4617/server Modified Files: ArchJob.py BuildMaster.py Builder.py BuilderManager.py EmailUtils.py Makefile PackageJob.py Repo.py User.py UserInterface.py main.py Added Files: Config.py Removed Files: CONFIG.py Log Message: 2005-08-14 Dan Williams * Switch to new server config file format using ConfigParser - Server config files are no longer python scripts - Server now takes a mandatory -c option for config file location - Server will write out a default config file at the specified location if none exists - Each target has its own config file, by default in /etc/plague/targets/ - CVSROOT and CVS_RSH are now target-specific, not server-wide - Additional Package Arches are now target-specific, and reside in each target's config file rather than server-wide * "Scratch" targets are now supported; ie, they are targets that do not contribute packages to a repository. Use the option "scratch=yes" in the target's config file in the "General" section to make the target a scratch target. * Repository Scripts: you may now specify a script that is run after packages are copied to a repository. Use the "repo_script" option in each target's config file to specify a script for that target/repo. The script must exit with result 0 on success, and > 0 on error. The script is given one argument, which is the name of the target/repo which has just copied packages. If the script fails, those listed in "admin_emails" in the server config file will be mailed with the script's output. The script is also killed if it takes longer than 1 hour to complete, since packages cannot be built for the target while the script is running. --- NEW FILE Config.py --- # 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 Library 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. # # Copyright 2005 Dan Williams and Red Hat, Inc. import os from ConfigParser import ConfigParser class ConfigError(Exception): pass class BaseConfig: def __init__(self, filename): self._filename = filename self._config = ConfigParser() def open(self, filename=None): if not filename: filename = self._filename if not os.path.exists(filename): raise ConfigError("Config file '%s' missing." % filename) self._config.read(filename) self._filename = filename def has_option(self, section, name): return self._config.has_option(section, name) def get_option(self, section, name): if not self._config.has_section(section): raise ConfigError("Invalid section: %s" % section) if self._config.has_option(section, name): return self._config.get(section, name) raise ConfigError("Config file %s does not have option: %s/%s" % (self._filename, section, name)) def get_str(self, section, name): return self.get_option(section, name) def get_bool(self, section, name): opt = self.get_option(section, name) if type(opt) == type(""): if opt.lower() == 'yes' or opt.lower() == 'true': return True elif opt.lower() == 'no' or opt.lower() == 'false': return False raise ConfigError("Invalid format for %s/%s. Should be one of [yes, no, true, false]." % (section, name)) def get_list(self, section, name): opt = self.get_option(section, name) if type(opt) == type(""): if not len(opt): return [] try: return opt.split() except Exception: pass raise ConfigError("Invalid format for %s/%s. Should be a space-separate list." % (section, name)) def get_int(self, section, name): opt = self.get_option(section, name) try: return int(opt) except Exception: pass raise ConfigError("Invalid format for %s/%s. Should be a valid integer." % (section, name)) def add_section(self, section): self._config.add_section(section) def set_option(self, section, name, value): if not self._config.has_section(section): self._config.add_section(section) self._config.set(section, name, value) def save(self, filename=None): if not filename: filename = self._filename fp = open(filename, 'w') self._config.write(fp) self._filename = filename class ServerConfig(BaseConfig): def __init__(self, filename): BaseConfig.__init__(self, filename) try: self.open() except ConfigError: print "Config file did not exist. Writing %s with default values." % filename self.save_default_config() self._targets = [] def targets(self): return self._targets def load_target_configs(self): cfg_dir = self.get_str("Directories", "target_configs_dir") if not os.path.exists(cfg_dir) or not os.access(cfg_dir, os.R_OK): return # Don't ever load targets twice if len(self._targets) > 0: return files = os.listdir(cfg_dir) for f in files: if not f.endswith(".cfg"): continue cfg_file = os.path.join(cfg_dir, f) target_cfg = TargetConfig(self, cfg_file) self._targets.append(target_cfg) def save_default_config(self, filename=None): self.add_section("General") self.set_option("General", "hostname", "localhost") self.add_section("Directories") self.set_option("Directories", "server_work_dir", "/rpmbuild",) self.set_option("Directories", "repo_dir", "/repodir") self.set_option("Directories", "tmpdir", "/tmp") self.set_option("Directories", "target_configs_dir", "/etc/plague/targets") self.add_section("Email") self.set_option("Email", "email_from", "buildsys at foo.com") self.set_option("Email", "admin_emails", "") self.set_option("Email", "success_emails", "") self.add_section("Builders") self.set_option("Builders", "use_ssl", "yes") self.set_option("Builders", "builders", "127.0.0.1:8888") self.add_section("SSL") self.set_option("SSL", "server_key_and_cert", "/etc/plague/server/certs/server_key_and_cert.pem") self.set_option("SSL", "ca_cert", "/etc/plague/server/certs/ca_cert.pem") self.add_section("CVS") self.set_option("CVS", "use_cvs", "no") self.add_section("UI") self.set_option("UI", "use_ssl", "yes") self.set_option("UI", "client_ca_cert", "/etc/plague/server/certs/ui_ca_cert.pem") self.set_option("UI", "port", "8887") self.set_option("UI", "guest_allowed", "yes") self.set_option("UI", "log_url", "http://www.foo.com/logs/") self.save() class TargetConfig(BaseConfig): def __init__(self, cfg, filename): BaseConfig.__init__(self, filename) try: self.open() except ConfigError: print "Config file did not exist. Writing %s with default values." % filename self.save_default_config() self._parent_cfg = cfg def parent_cfg(self): return self._parent_cfg def addl_pkg_arches(self): if not self._config.has_section("Additional Package Arches"): return [] items = self._config.items("Additional Package Arches") addl_arches = {} for (pkg, arches) in items: if type(arches) != type("") or not len(arches): continue try: l = opt.split() except Exception: continue addl_arches[pkg] = l return addl_arches def save_default_config(self, filename=None): self.add_section("General") self.set_option("General", "name", "development") self.set_option("General", "scratch", "no") self.set_option("General", "repo_script", "") self.add_section("Arches") self.set_option("Arches", "base_arches", "i386") self.set_option("Arches", "optional_arches", "") self.add_section("Aliases") self.set_option("Aliases", "user_aliases", "devel") self.set_option("Aliases", "cvs_aliases", "devel") self.add_section("Additional Package Arches") self.set_option("Additional Package Arches", "kernel", "i686") self.add_section("CVS") self.set_option("CVS", "cvs_root", "") self.set_option("CVS", "cvs_rsh", "") self.save() Index: ArchJob.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/ArchJob.py,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- ArchJob.py 8 Aug 2005 02:54:16 -0000 1.10 +++ ArchJob.py 15 Aug 2005 03:18:20 -0000 1.11 @@ -25,24 +25,15 @@ from plague import FileDownloader from plague import CommonErrors -# Load in the config -execfile("/etc/plague/server/CONFIG.py") - - -# SSL certificate and key filenames -certs = {} -certs['key_and_cert'] = config_opts['server_key_and_cert'] -certs['ca_cert'] = config_opts['ca_cert'] -certs['peer_ca_cert'] = config_opts['ca_cert'] - class ArchJob: """ Tracks a single build instance for a single arch on a builder """ - def __init__(self, builder, server, par_job, jobid, target, arch): + def __init__(self, builder, cfg, server, par_job, jobid, target, arch): self.par_job = par_job self.builder = builder self._server = server + self._use_ssl = cfg.get_bool("Builders", "use_ssl") self.jobid = jobid self.status = 'running' self.builder_status = '' @@ -55,6 +46,12 @@ self._die = False self._die_lock = threading.Lock() + # SSL certificate and key filenames + self._certs = {} + self._certs['key_and_cert'] = cfg.get_str("SSL", "server_key_and_cert") + self._certs['ca_cert'] = cfg.get_str("SSL", "ca_cert") + self._certs['peer_ca_cert'] = cfg.get_str("SSL", "ca_cert") + def _builder_finished(self): if self.builder_status == 'done' or self.builder_status == 'killed' or self.builder_status == 'failed' or self.builder_status == 'orphaned': return True @@ -177,9 +174,9 @@ target_dir = os.path.join(self.par_job.get_stage_dir(), self.arch) if not os.path.exists(target_dir): os.makedirs(target_dir) - if config_opts['ssl_builders']: + if self._use_ssl: dl_thread = FileDownloader.FileDownloader(self.dl_callback, url, url, - target_dir, ['.rpm', '.log'], certs) + target_dir, ['.rpm', '.log'], self._certs) else: dl_thread = FileDownloader.FileDownloader(self.dl_callback, url, url, target_dir, ['.rpm', '.log'], None) Index: BuildMaster.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/BuildMaster.py,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- BuildMaster.py 8 Aug 2005 02:54:16 -0000 1.30 +++ BuildMaster.py 15 Aug 2005 03:18:20 -0000 1.31 @@ -23,11 +23,11 @@ import os import Repo import copy +import Config # Load in the config CONFIG_LOCATION = "/etc/plague/server/" -execfile(CONFIG_LOCATION + "CONFIG.py") def ensure_job_db_tables(dbcx): @@ -102,15 +102,18 @@ MAX_CHECKOUT_JOBS = 5 - def __init__(self, hostname, builder_manager): + def __init__(self, builder_manager, cfg): self.builder_manager = builder_manager - self.hostname = hostname + self.hostname = cfg.get_str("General", "hostname") self.should_stop = False self._paused = False - self.repos = {} - for target in config_opts['targets'].keys(): - repo = Repo.Repo(target, builder_manager) - self.repos[target] = repo + self._cfg = cfg + + self._repos = {} + repodir = self._cfg.get_str("Directories", "repo_dir") + for target_cfg in self._cfg.targets(): + repo = Repo.Repo(target_cfg, repodir, builder_manager) + self._repos[repo.target()] = repo repo.start() self._done_queue = [] @@ -140,12 +143,8 @@ ensure_job_db_tables(self.dbcx) self._requeue_interrupted_jobs() - threading.Thread.__init__(self) - def __del__(self): - self.dbcx.close() - def _requeue_interrupted_jobs(self): """ Restart interrupted jobs from our db. """ self.curs.execute('SELECT uid FROM jobs WHERE (status!="needsign" AND status!="failed" AND status!="finished") ORDER BY uid') @@ -192,19 +191,22 @@ # Now requeue the job try: - repo = self.repos[row['target']] + repo = self._repos[row['target']] except KeyError: - print "%s (%s): Target '%s' not found." % (uid, row['package'], row['target']) + print "%s (%s): Target '%s' not found." % (uid, + row['package'], row['target']) else: - job = PackageJob.PackageJob(uid, row['username'], row['package'], row['cvs_tag'], repo, self, self.hostname) - print "%s (%s): Restarting '%s' on target '%s'" % (uid, row['package'], row['cvs_tag'], row['target']) + job = PackageJob.PackageJob(uid, row['username'], row['package'], + row['cvs_tag'], repo, self) + print "%s (%s): Restarting '%s' on target '%s'" % (uid, + row['package'], row['cvs_tag'], row['target']) self._building_jobs_lock.acquire() self._building_jobs[uid] = job self._building_jobs_lock.release() def stop(self): self.should_stop = True - for repo in self.repos.values(): + for repo in self._repos.values(): repo.stop() def create_job_request(self, email, package, source, target, buildreq, time): @@ -252,7 +254,8 @@ self._checkout_wait_queue_lock.acquire() # We allow only 5 jobs at a time in checkout stage - allowed_jobs = min(self.MAX_CHECKOUT_JOBS - self._checkout_num, len(self._checkout_wait_queue)) + allowed_jobs = min(self.MAX_CHECKOUT_JOBS - self._checkout_num, + len(self._checkout_wait_queue)) for i in range(allowed_jobs): job = self._checkout_wait_queue[i] self._checkout_num = self._checkout_num + 1 @@ -302,7 +305,8 @@ def _write_job_status_to_db(self, uid, attrdict): sql = 'status="%s"' % attrdict['status'] if attrdict.has_key('epoch') and attrdict.has_key('version') and attrdict.has_key('release'): - sql = sql + ', epoch="%s", version="%s", release="%s"' % (attrdict['epoch'], attrdict['version'], attrdict['release']) + sql = sql + ', epoch="%s", version="%s", release="%s"' % (attrdict['epoch'], + attrdict['version'], attrdict['release']) if attrdict.has_key('result_msg'): import urllib sql = sql + ', result_msg="%s"' % (urllib.quote(attrdict['result_msg'])) @@ -333,7 +337,9 @@ else: try: self.curs.execute('UPDATE archjobs SET status="%s", builder_status="%s", endtime=%d ' \ - 'WHERE jobid="%s" AND parent_uid=%d' % (attrdict['status'], attrdict['builder_status'], attrdict['endtime'], uid, attrdict['parent_uid'])) + 'WHERE jobid="%s" AND parent_uid=%d' % (attrdict['status'], + attrdict['builder_status'], attrdict['endtime'], uid, + attrdict['parent_uid'])) except sqlite.OperationalError, e: print "DB Error: could not access jobs database. Reason: '%s'" % e @@ -378,9 +384,9 @@ # If two of the same job are submitted close together, we need # to make sure we pick the last result to get the correct one row = data[len(data) - 1] - repo = self.repos[item['target']] + repo = self._repos[item['target']] job = PackageJob.PackageJob(row['uid'], item['email'], item['package'], - item['source'], repo, self, self.hostname) + item['source'], repo, self) print "%s (%s): Starting tag '%s' on target '%s'" % (row['uid'], \ item['package'], item['source'], item['target']) Index: Builder.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/Builder.py,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- Builder.py 8 Aug 2005 02:54:16 -0000 1.11 +++ Builder.py 15 Aug 2005 03:18:20 -0000 1.12 @@ -27,16 +27,7 @@ import OpenSSL import ArchJob import EmailUtils - -# Load in the config -execfile("/etc/plague/server/CONFIG.py") - - -# SSL certificate and key filenames -certs = {} -certs['key_and_cert'] = config_opts['server_key_and_cert'] -certs['ca_cert'] = config_opts['ca_cert'] -certs['peer_ca_cert'] = config_opts['ca_cert'] +import Config class Builder(threading.Thread): @@ -44,7 +35,7 @@ _BUILDER_PING_INTERVAL = 60 * 5 # In seconds - def __init__(self, manager, address): + def __init__(self, manager, cfg, address): self._cur_jobid = None self._manager = manager self._jobs = {} @@ -57,8 +48,14 @@ self._ping_timeout = 0 self._cur_ping_interval = self._BUILDER_PING_INTERVAL self._when_died = 0 + self._server_cfg = cfg + + certs = {} + certs['key_and_cert'] = self._server_cfg.get_str("SSL", "server_key_and_cert") + certs['ca_cert'] = self._server_cfg.get_str("SSL", "ca_cert") + certs['peer_ca_cert'] = self._server_cfg.get_str("SSL", "ca_cert") - if config_opts['ssl_builders']: + if self._server_cfg.get_bool("Builders", "use_ssl"): self._server = XMLRPCServerProxy.PlgXMLRPCServerProxy(self._address, certs) else: self._server = XMLRPCServerProxy.PlgXMLRPCServerProxy(self._address, None) @@ -134,7 +131,8 @@ self._server_lock.release() raise RuntimeError - job = ArchJob.ArchJob(self, self._server, par_job, jobid, target, arch) + use_ssl = self._server_cfg.get_bool("Builders", "use_ssl") + job = ArchJob.ArchJob(self, self._server_cfg, self._server, par_job, jobid, target, arch) self._jobs[jobid] = job self._update_cur_job() self._server_lock.release() @@ -196,8 +194,9 @@ print "Suspending builder '%s' because it timed out." % self._address subject = "Builder Timeout: %s" % self._address msg = "The builder '%s' timed out and was suspended." % self._address - for addr in config_opts['admin_emails']: - EmailUtils.email_result(addr, msg, subject) + sender = self._server_cfg.get_str("Email", "email_from") + for addr in self._server_cfg.get_list("Email", "admin_emails"): + EmailUtils.email_result(sender, addr, msg, subject) def _handle_builder_reactivate(self, target_arches): self._alive = True @@ -212,8 +211,9 @@ Suspended at: %s Re-Enabled at: %s """ % (self._address, time.ctime(self._when_died), time.ctime(time.time())) - for addr in config_opts['admin_emails']: - EmailUtils.email_result(addr, msg, subject) + sender = self._server_cfg.get_str("Email", "email_from") + for addr in self._server_cfg.get_list("Email", "admin_emails"): + EmailUtils.email_result(sender, addr, msg, subject) self._when_died = 0 def run(self): Index: BuilderManager.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/BuilderManager.py,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- BuilderManager.py 8 Aug 2005 02:54:16 -0000 1.11 +++ BuilderManager.py 15 Aug 2005 03:18:20 -0000 1.12 @@ -23,9 +23,7 @@ import threading import Builder import EmailUtils - -# Load in the config -execfile("/etc/plague/server/CONFIG.py") +import Config class BuilderManager: @@ -33,14 +31,10 @@ Tracks individual builder instances. """ - def __init__(self): + def __init__(self, cfg): + self._cfg = cfg self._builders_lock = threading.Lock() - # List of addresses of possible builders - self._builders_lock.acquire() - self.possible_builders = config_opts['builders'] - self._builders_lock.release() - self._builders = [] self.add_new_builders() @@ -75,19 +69,21 @@ def add_new_builders(self): self._builders_lock.acquire() - # Load in any new builders from the config file - execfile("/etc/plague/server/CONFIG.py") - self.possible_builders = config_opts['builders'] - - for address in self.possible_builders: - # If the address is "https" but we aren't set up for SSL, exit - if address.startswith('https') and not config_opts['ssl_builders']: - print "Builder address (%s) starts with 'https', but the 'ssl_builders' option is set to False." % address - continue - elif address.startswith('http:') and config_opts['ssl_builders']: - print "Builder address (%s) starts with 'http', but the 'ssl_builders' option is set to True." % address - continue + builder_list = [] + tmp_list = self._cfg.get_list("Builders", "builders") + prefix = "http://" + if self._cfg.get_bool("Builders", "use_ssl") == True: + prefix = "https://" + for addr in tmp_list: + # Rewrite addresses to match current builder connection method + if addr.startswith("http://"): + addr = addr[7:] + elif addr.startswith("https://"): + addr = addr[8:] + + builder_list.append(prefix + addr) + for address in builder_list: # If the address is already in our _builders list, skip it skip = False for builder in self._builders: @@ -97,7 +93,7 @@ continue # Add the builder to our build list - builder = Builder.Builder(self, address) + builder = Builder.Builder(self, self._cfg, address) builder.start() self._builders.append(builder) Index: EmailUtils.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/EmailUtils.py,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- EmailUtils.py 25 Jul 2005 19:47:15 -0000 1.1 +++ EmailUtils.py 15 Aug 2005 03:18:20 -0000 1.2 @@ -18,18 +18,14 @@ import smtplib from email.MIMEText import MIMEText -# Load in the config -CONFIG_LOCATION = "/etc/plague/server/" -execfile(CONFIG_LOCATION + "CONFIG.py") - -def email_result(to, resultstring, subject=None): +def email_result(sender, to, resultstring, subject=None): msg = MIMEText(resultstring) msg['Subject'] = subject - msg['From'] = config_opts['email_from'] + msg['From'] = sender msg['To'] = to s = smtplib.SMTP() s.connect() - s.sendmail(config_opts['email_from'], [to], msg.as_string()) + s.sendmail(sender, [to], msg.as_string()) s.close() Index: Makefile =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/Makefile,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- Makefile 25 Jul 2005 19:47:15 -0000 1.6 +++ Makefile 15 Aug 2005 03:18:20 -0000 1.7 @@ -14,6 +14,7 @@ BuilderManager.py \ Builder.py \ BuildMaster.py \ + Config.py \ EmailUtils.py \ PackageJob.py \ Repo.py \ @@ -29,7 +30,6 @@ $(MKDIR) -p $(OTHERINSTDIR) for file in $(FILES); do $(INSTALL) -m 644 $$file $(OTHERINSTDIR)/$$file; done $(MKDIR) -p $(CONFIGDIR) - $(INSTALL) -m 755 CONFIG.py $(CONFIGDIR)/CONFIG.py $(MKDIR) -p $(CONFIGDIR)/addl_pkg_arches $(INSTALL) -m 755 addl_pkg_arches/devel-addl-arches $(CONFIGDIR)/addl_pkg_arches/devel-addl-arches $(MKDIR) -p $(CONFIGDIR)/certs Index: PackageJob.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/PackageJob.py,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- PackageJob.py 6 Aug 2005 17:58:34 -0000 1.21 +++ PackageJob.py 15 Aug 2005 03:18:20 -0000 1.22 @@ -34,12 +34,8 @@ import ArchJob from plague import ArchUtils -# Load in the config -execfile("/etc/plague/server/CONFIG.py") - -os.environ['CVSROOT'] = config_opts['pkg_cvs_root'] -if len(config_opts['pkg_cvs_rsh']) > 0: - os.environ['CVS_RSH'] = config_opts['pkg_cvs_rsh'] +CVS_CMD = "/usr/bin/cvs" +MAKE_CMD = "/usr/bin/make" DEBUG = False def debugprint(stuff=''): @@ -100,18 +96,16 @@ return True return False -def make_job_log_url(target, uid, name, ver, release): +def make_job_log_url(base_url, target, uid, name, ver, release): if target and uid and name and ver and release: - return "%s/%s/%s-%s-%s-%s/" % (config_opts['log_url'], target, uid, name, ver, release) + return "%s/%s/%s-%s-%s-%s/" % (base_url, target, uid, name, ver, release) return None class PackageJob: """ Controller object for building 1 SRPM on multiple arches """ - http_dir = os.path.join(config_opts['server_work_dir'], "srpm_http_dir") - - def __init__(self, uid, username, package, cvs_tag, repo, buildmaster, hostname): + def __init__(self, uid, username, package, cvs_tag, repo, buildmaster): self.curstage = '' self.result = 'in-progress' self.bm = buildmaster @@ -122,13 +116,15 @@ self.ver = None self.release = None - self.hostname = hostname + self._target_cfg = repo.target_cfg() + self._server_cfg = self._target_cfg.parent_cfg() + self.username = username self.starttime = time.time() self.endtime = 0 self.target = repo.target() self.repo = repo - self.no_cvs = config_opts['use_srpm_not_cvs'] + self.use_cvs = self._server_cfg.get_bool("CVS", "use_cvs") self.cvs_tag = cvs_tag self.result_dir = None self.srpm_path = None @@ -140,8 +136,11 @@ self._killer = None self._die = False + self.http_dir = os.path.join(self._server_cfg.get_str("Directories", + "server_work_dir"), "srpm_http_dir") + first_stage = 'initialize' - if self.no_cvs == True: + if self.use_cvs == False: first_stage = 'prep' pjc = PackageJobController(self, first_stage, 'waiting') pjc.start() @@ -175,44 +174,24 @@ return self.uid def arch_handling(self, hdr): - # Grab additional build arches out of the Additional Package - # Arches file - apa_file_name = self.target + "addl-arches" - apa_file = os.path.join(config_opts['addl_package_arches_dir'], apa_file_name) addl_arches = [] try: - f = open(apa_file, "r") - except IOError, e: + addl_arches = self._target_cfg.addl_pkg_arches()[self.name] + except KeyError: pass - else: - for line in f.readlines(): - line = line.strip() - tmp_split = line.split(':') - if len(tmp_split) == 2: - package = tmp_split[0] - if package == self.name: - tmp_arches = tmp_split[1] - tmp_arches = tmp_arches.strip() - addl_arches = tmp_arches.split(' ') - break - - targets = config_opts['targets'] - buildable_arches = targets[self.target] - - target_opt_arches = config_opts['target_optional_arches'] - opt_arches = [] - if target_opt_arches.has_key(self.target): - opt_arches = target_opt_arches[self.target] + + base_arches = self._target_cfg.get_list("Arches", "base_arches") + opt_arches = self._target_cfg.get_list("Arches", "optional_arches") # Remove arches we don't support from addl_arches for arch in addl_arches: # ArchUtils.sub_arches is only used to determine which arches to build on by default, - # so that if we have an Additional Package Arches file that specifies + # so that if we have an Additional Package Arches that specifies # 'sparcv9' for a package that we don't try to build sparcv9 for that # package unless 'sparc' is also listed in our 'targets' config option. if ArchUtils.sub_arches.has_key(arch): master_addl_arch = ArchUtils.sub_arches[arch] - if master_addl_arch not in buildable_arches: + if master_addl_arch not in base_arches: addl_arches.remove(arch) ba = hdr['buildarchs'] @@ -231,7 +210,7 @@ # is enabled for this target pkg_arches = [] allowed_arches = [] - for arch in buildable_arches: + for arch in base_arches: pkg_arches.append(arch) allowed_arches.append(arch) for arch in addl_arches: @@ -281,13 +260,21 @@ # Create the temporary checkout directory dirname = "%s-%s-%d" % (self.uid, self.cvs_tag, time.time()) - self.checkout_tmpdir = os.path.join(config_opts['tmpdir'], dirname) + tmpdir = self._server_cfg.get_str("Directories", "tmpdir") + self.checkout_tmpdir = os.path.join(tmpdir, dirname) if os.path.exists(self.checkout_tmpdir): shutil.rmtree(self.checkout_tmpdir, ignore_errors=True) os.makedirs(self.checkout_tmpdir) + # Set up CVS environment + env_args = "CVSROOT='%s'" % self._target_cfg.get_str("CVS", "cvs_root") + cvs_rsh = self._target_cfg.get_str("CVS", "cvs_rsh") + if len(cvs_rsh) > 0: + env_args = "%s CVS_RSH='%s'" % (env_args, cvs_rsh) + # Checkout the module - cmd = 'cd %s; %s co -r %s %s' % (self.checkout_tmpdir, config_opts['cvs_cmd'], self.cvs_tag, self.package) + cmd = 'cd %s; %s co -r %s %s %s' % (self.checkout_tmpdir, CVS_CMD, + self.cvs_tag, self.package, env_args) debugprint("%d: Running %s" % (self.uid, cmd)) s, o = commands.getstatusoutput(cmd) if s != 0: @@ -297,7 +284,7 @@ # get it from CVS pkg_path = os.path.join(self.checkout_tmpdir, self.package) if not os.path.exists(os.path.join(pkg_path, "common")): - cmd = 'cd %s; %s co common' % (pkg_path, config_opts['cvs_cmd']) + cmd = 'cd %s; %s co common %s' % (pkg_path, CVS_CMD, env_args) debugprint("%d: Running %s" % (self.uid, cmd)) s, o = commands.getstatusoutput(cmd) if s != 0: @@ -313,12 +300,11 @@ def _stage_make_srpm(self): # Map our target (self.target) to the CVS target alias, since CVS may have - # different target names that we expose - cvs_target_map = config_opts['cvs_target_map'] - try: - cvs_target = cvs_target_map[self.target] - except KeyError: - cvs_target = self.target + # different target names than we expose + cvs_target = self.target + cvs_aliases = self._target_cfg.get_str("Aliases", "cvs_aliases") + if len(cvs_aliases) > 0: + cvs_target = cvs_aliases self.srpm_path = None srpm_dir = os.path.join(self.checkout_tmpdir, self.package, cvs_target) @@ -326,7 +312,7 @@ msg = "could not find path %s for %s." % (srpm_dir, self.cvs_tag) raise PrepError(msg) - cmd = 'cd %s; %s srpm' % (srpm_dir, config_opts['make_cmd']) + cmd = 'cd %s; %s srpm' % (srpm_dir, MAKE_CMD) debugprint("%d: Running %s in %s" % (self.uid, cmd, srpm_dir)) s, o = commands.getstatusoutput(cmd) if s != 0: @@ -369,7 +355,7 @@ def _stage_prep(self): # In SRPM-only mode, cvs_tag is path to the SRPM to build - if self.no_cvs: + if self.use_cvs == False: self.srpm_path = self.cvs_tag ts = rpmUtils.transaction.initReadOnlyTransaction() @@ -391,7 +377,8 @@ """ % (self.cvs_tag, pkg_arches, allowed_arches) raise PrepError(msg) - self.result_dir = self._make_stage_dir(config_opts['server_work_dir']) + work_dir = self._server_cfg.get_str("Directories", "server_work_dir") + self.result_dir = self._make_stage_dir(work_dir) for arch in self.archjobs.keys(): thisdir = os.path.join(self.result_dir, arch) if not os.path.exists(thisdir): @@ -404,7 +391,7 @@ self.srpm_path = None # Remove CVS checkout and make_srpm dirs - if not self.no_cvs: + if self.use_cvs == True: shutil.rmtree(self.checkout_tmpdir, ignore_errors=True) self._request_arch_jobs() @@ -414,11 +401,13 @@ def _request_one_arch_job(self, arch, orphaned): # Construct SPRM URL srpm_http_base = self.srpm_http_path[len(self.http_dir):] - if config_opts['ssl_builders'] == True: + use_ssl = self._server_cfg.get_bool("Builders", "use_ssl") + if use_ssl == True: method = "https://" else: method = "http://" - srpm_url = method + self.hostname + ":8886/" + srpm_http_base + hostname = self._server_cfg.get_str("General", "hostname") + srpm_url = method + hostname + ":8886/" + srpm_http_base self.bm.builder_manager.request_arch_job(self, self.target, arch, srpm_url, orphaned) def _request_arch_jobs(self): @@ -507,14 +496,15 @@ self._event.wait() self._event.clear() except PrepError, e: - if not self.no_cvs: + if self.use_cvs == True: shutil.rmtree(self.checkout_tmpdir, ignore_errors=True) subj = 'Prep Error (Job %s): %s on %s' % (self.uid, self.cvs_tag, self.target) self.email_result(self.username, resultstring=e.args, subject=subj) self._stage_failed(e.args) except BuildError, e: subj = 'Build Error (Job %s): %s on %s' % (self.uid, self.cvs_tag, self.target) - log_url = make_job_log_url(self.target, self.uid, self.name, self.ver, self.release) + base_url = self._server_cfg.get_str("UI", "log_url") + log_url = make_job_log_url(base_url, self.target, self.uid, self.name, self.ver, self.release) msg = "%s\n\n Build logs may be found at %s\n\n" % (e.msg, log_url) logtail = self._get_log_tail(e.arch) msg = "%s\n-------------------------------------------------\n\n%s\n" % (msg, logtail) @@ -540,7 +530,11 @@ self._archjobs_lock.release() if completed_jobs == len(self.archjobs): - self._set_cur_stage('add_to_repo') + # Scratch targets don't contribute packages to the repo + if self._target_cfg.get_bool("General", "scratch") == True: + self._set_cur_stage('repodone') + else: + self._set_cur_stage('add_to_repo') return False # Don't want to wait return True @@ -583,6 +577,7 @@ def _stage_add_to_repo(self): # Create a list of files that the repo should copy to # the repo dir + repo_dir = self._server_cfg.get_str("Directories", "repo_dir") for job in self.archjobs.values(): if not job: continue @@ -592,9 +587,9 @@ src_file = os.path.join(self.result_dir, job.arch, f) verrel = "%s-%s" % (self.ver, self.release) if f.endswith(".src.rpm"): - dst_path = os.path.join(config_opts['repo_dir'], self.target, self.name, verrel, "SRPM") + dst_path = os.path.join(repo_dir, self.target, self.name, verrel, "SRPM") else: - dst_path = os.path.join(config_opts['repo_dir'], self.target, self.name, verrel, job.arch) + dst_path = os.path.join(repo_dir, self.target, self.name, verrel, job.arch) self.repofiles[src_file] = os.path.join(dst_path, f) self._event.clear() @@ -619,12 +614,13 @@ self._cleanup_job_files() - log_url = make_job_log_url(self.target, self.uid, self.name, self.ver, self.release) + base_url = self._server_cfg.get_str("UI", "log_url") + log_url = make_job_log_url(base_url, self.target, self.uid, self.name, self.ver, self.release) resultstring = resultstring + "\n Build logs may be found at %s\n" % (log_url) self.email_result(self.username, resultstring) # Notify everyone else who might want to know that the build succeeded - for addr in config_opts['success_emails']: + for addr in self._server_cfg.get_list("Email", "success_emails"): self.email_result(addr, resultstring) self.bm.notify_job_done(self) @@ -633,7 +629,8 @@ """ Returns the last 30 lines of the most relevant log file """ pkg_dir = "%s-%s-%s-%s" % (self.uid, self.name, self.ver, self.release) - log_dir = os.path.join(config_opts['server_work_dir'], self.target, pkg_dir, arch) + work_dir = self._server_cfg.get_str("Directories", "server_work_dir") + log_dir = os.path.join(work_dir, self.target, pkg_dir, arch) final_log = None build_log = "%s/%s" % (log_dir, "build.log") root_log = "%s/%s" % (log_dir, "root.log") @@ -681,5 +678,6 @@ if not name: name = self.package subject = 'Build Result: %d - %s on %s' % (self.uid, name, self.target) - EmailUtils.email_result(to, resultstring, subject) + sender = self._server_cfg.get_str("Email", "email_from") + EmailUtils.email_result(sender, to, resultstring, subject) Index: Repo.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/Repo.py,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- Repo.py 18 Jul 2005 21:11:27 -0000 1.11 +++ Repo.py 15 Aug 2005 03:18:20 -0000 1.12 @@ -19,42 +19,53 @@ import shutil import time import commands - - -# Load in the config -execfile("/etc/plague/server/CONFIG.py") +import popen2 +import fcntl +import EmailUtils class Repo(threading.Thread): """ Represents an on-disk repository of RPMs and manages updates to the repo. """ - def __init__(self, target, builder_manager): + def __init__(self, target_cfg, repodir, builder_manager): self._builder_manager = builder_manager - self._target = target - if not os.path.exists(config_opts['repo_dir']): - print "Error: Repository directory '%s' does not exist." % config_opts['repo_dir'] + self._target_cfg = target_cfg + self._target = self._target_cfg.get_str("General", "name") + if not os.path.exists(repodir): + print "Error: Repository directory '%s' does not exist." % repodir os._exit(1) - self._repodir = os.path.join(config_opts['repo_dir'], target) + self._repodir = os.path.join(repodir, self._target) if not os.path.exists(self._repodir): os.makedirs(self._repodir) - self._repo_cache_dir = os.path.join(config_opts['repo_dir'], "cache", target) + self._repo_cache_dir = os.path.join(repodir, "cache", self._target) if not os.path.exists(self._repo_cache_dir): os.makedirs(self._repo_cache_dir) self._lock = threading.Lock() self._repo_additions = [] self._lock_count = 0 self._stop = False + + self._pobj = None + self._repo_script_start = 0 + self._repo_script = None + script = self._target_cfg.get_str("General", "repo_script") + if len(script): + self._repo_script = script + threading.Thread.__init__(self) def target(self): return self._target + def target_cfg(self): + return self._target_cfg + def request_copy(self, buildjob): """ Registers a BuildJob object that has files to copy to the repo """ self._lock.acquire() self._repo_additions.append(buildjob) - # We enter lock level 1 here, preventing build clients from + # We enter lock level 1 here, preventing builders from # starting their 'prep' state if self._lock_count == 0: self._lock_count = 1 @@ -91,27 +102,99 @@ if s != 0: print "Error: createrepo failed with exit status %d! Output: '%s'" % (s, o) + def _run_repo_script(self): + cmd = "%s %s" % (self._repo_script, self._target) + print "Repo '%s': executing repository script %s" % (self._target, self._repo_script) + self._pobj = popen2.Popen4(cmd=cmd) + fcntl.fcntl(self._pobj.fromchild.fileno(), fcntl.F_SETFL, os.O_NONBLOCK) + self._repo_script_start = time.time() + + def _email_repo_script_failure(self, subject): + server_cfg = self._target_cfg.parent_cfg() + admins = server_cfg.get_list("Email", "admin_emails") + sender = server_cfg.get_str("Email", "email_from") + msg = self._get_repo_script_output() + for addr in admins: + EmailUtils.email_result(sender, addr, msg, subject) + + def _get_repo_script_output(self): + output = "" + while True: + try: + string = os.read(self._pobj.fromchild.fileno(), 1024) + if not len(string): + break + except OSError, e: + break + output = output + string + return output + + def _monitor_repo_script(self): + unlock = False + exit_status = self._pobj.poll() + if exit_status == 0: + print "Repo '%s': repo script %s done." % (self._target, self._repo_script) + unlock = True + elif exit_status > 0: + subj = "Repo '%s': repo script %s exited with error: %d." % (self._target, self._repo_script, exit_status) + self._email_repo_script_failure(subj) + print subj + unlock = True + else: + # If the repo script has been going for more than an hour, kill it + if time.time() > self._repo_script_start + (60 * 60): + try: + os.kill(self._pobj.pid, 9) + except OSError: + pass + subj = "Repo '%s': repo script %s timed out and was killed." % (self._target, self._repo_script) + self._email_repo_script_failure(subj) + print subj + unlock = True + + if unlock: + self._repo_script_start = 0 + self._lock_count = 0 + self._pobj = None def run(self): while self._stop == False: - # We have 2 lock levels. When the repo is in either, clients are prevented - # from starting their 'prep' state. Clients may already be in the 'prep' - # state when we lock the repo, therefore we don't actually enter lock level - # 2 until all clients have finished their 'prep' state. Only then do we - # copy RPMs to the repo and run createrepo on it. + # We have 3 lock levels: + # + # 0 - repo unlocked + # 1 - entered when jobs request packages to be copied to the repo; + # builders blocked from entering the 'prep' state + # 2 - entered when no builders are currently in the 'prep' state; + # packages copied to repo and createrepo is run + # 3 - entered when createrepo is done; repo script run prepping_builders = self._builder_manager.any_prepping_builders() + print "repo %s, count %d" % (self._target, self._lock_count) self._lock.acquire() - # If the lock level is 2, update the repo + # Level 2: update the repo if self._lock_count == 2: print "Repo '%s': updating repository metadata..." % self._target self._update_repo() print "Repo '%s': Done updating." % self._target - self._lock_count = 0 - # Enter lock level 2 if there are no build clients in the + # If there's a repo script for this target, enter level 3 + if self._repo_script: + self._run_repo_script() + self._lock_count = 3 + else: + self._lock_count = 0 + + # Level 3: monitor the repo script + if self._lock_count == 3: + if self._pobj: + self._monitor_repo_script() + else: + # If for some reason self._pobj is None, unlock the repo + self._lock_count = 0 + + # Enter lock level 2 if there are no builders in the # 'prep' state and we are already at lock level 1 if not prepping_builders and self._lock_count == 1: self._lock_count = 2 Index: User.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/User.py,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- User.py 2 Aug 2005 04:10:32 -0000 1.6 +++ User.py 15 Aug 2005 03:18:20 -0000 1.7 @@ -17,10 +17,7 @@ import sqlite -# Load in the config CONFIG_LOCATION = "/etc/plague/server/" -execfile(CONFIG_LOCATION + "CONFIG.py") - class User: def __init__(self, email, guest): @@ -48,7 +45,8 @@ Talks to a database of users & capabilities """ - def __init__(self): + def __init__(self, cfg): + self._cfg = cfg (dbcx, curs) = get_userdb_dbcx() if not dbcx or not curs: print "Unable to open the user database. Exiting..." @@ -88,7 +86,7 @@ user.user_admin = item['user_admin'] user.server_admin = item['server_admin'] else: - if config_opts['guest_allowed']: + if self._cfg.get_bool("UI", "guest_allowed"): user = User('guest at guest', True) return user Index: UserInterface.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/UserInterface.py,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- UserInterface.py 8 Aug 2005 02:54:16 -0000 1.44 +++ UserInterface.py 15 Aug 2005 03:18:20 -0000 1.45 @@ -24,12 +24,11 @@ import exceptions import BuildMaster import PackageJob +import Config from plague import AuthedXMLRPCServer -# Load in the config -CONFIG_LOCATION = "/etc/plague/server/" -execfile(CONFIG_LOCATION + "CONFIG.py") +CONFIG_LOCATION = "/etc/plague/server/" def get_dbcx(): dbcx = None @@ -79,43 +78,35 @@ class InvalidTargetError(exceptions.Exception): pass -def resolve_target(target): - client_target_map = config_opts['client_target_map'] - target_dict = config_opts['targets'] - - resolved_target = target - done = True - for master_target in client_target_map.keys(): - if not target_dict.has_key(master_target): # make sure we build it - continue # if not, move along - - if target_dict.has_key(resolved_target): # it's one of the masters - return resolved_target - - # do the aliases - for alias in client_target_map[master_target]: - if resolved_target.lower() == alias.lower(): - return master_target +def resolve_target(target, cfg): + for target_cfg in cfg.targets(): + target_name = target_cfg.get_str("General", "name") + target_aliases = target_cfg.get_list("Aliases", "user_aliases") + if target.lower() == target_name.lower(): + return target + for alias in target_aliases: + if target.lower() == alias.lower(): + return target raise InvalidTargetError() - -def email_result(email, source, resultstring): - """send 'resultstring' to email""" - - subject = 'Enqueue Result: %s' % source - EmailUtils.email_result(email, resultstring, subject) - - class UserInterface: """ Base UserInterface class. NO AUTHENTICATION. Subclass this to provide some. """ - def __init__(self, builder_manager, build_master): + def __init__(self, builder_manager, build_master, cfg): self._builder_manager = builder_manager self._bm = build_master + self._cfg = cfg + + def email_result(self, to, source, resultstring): + """ send 'resultstring' to an email address """ + + subject = 'Enqueue Result: %s' % source + sender = self._cfg.get_str("Email", "email_from") + EmailUtils.email_result(sender, to, resultstring, subject) def _wait_for_uid(self, req): """ Wait a bit to see if the UID comes back to us """ @@ -132,27 +123,30 @@ def enqueue(self, email, package, cvs_tag, target, buildreq=None): """ Accept a job to build and stuff it into the job database """ - if config_opts['use_srpm_not_cvs'] == True: - email_result(email, cvs_tag, "Error setting up build for %s on "\ + if self._cfg.get_bool("CVS", "use_cvs") == False: + self.email_result(email, cvs_tag, "Error setting up build for %s on "\ "%s: this server builds SRPMs, not CVS checkouts." % (cvs_tag, target)) - return (-1, "This build server is set up for building SRPMS only. Use the 'enqueue_srpm' command instead.") + return (-1, "This build server is set up for building SRPMS only. "\ + "Use the 'enqueue_srpm' command instead.", -1) if not validate_package_name(package): - email_result(email, cvs_tag, "Error setting up build for %s on "\ - "%s: Package name '%s' contained an illegal character. Submit a bug report?" % (cvs_tag, target, package)) - return (-1, "The package name contained an illegal character.") + self.email_result(email, cvs_tag, "Error setting up build for %s on "\ + "%s: Package name '%s' contained an illegal character. "\ + "Submit a bug report?" % (cvs_tag, target, package)) + return (-1, "The package name contained an illegal character.", -1) if not validate_cvs_tag(cvs_tag): - email_result(email, cvs_tag, "Error setting up build for %s on "\ - "%s: The CVS tag '%s' contained an illegal character. Submit a bug report?" % (package, target, cvs_tag)) - return (-1, "The CVS tag contained an illegal character.") + self.email_result(email, cvs_tag, "Error setting up build for %s on "\ + "%s: The CVS tag '%s' contained an illegal character. "\ + "Submit a bug report?" % (package, target, cvs_tag)) + return (-1, "The CVS tag contained an illegal character.", -1) try: - real_target = resolve_target(target) + real_target = resolve_target(target, self._cfg) except InvalidTargetError: - email_result(email, cvs_tag, "Error setting up build for %s on "\ + self.email_result(email, cvs_tag, "Error setting up build for %s on "\ "%s: target does not exist." % (cvs_tag, target)) - return (-1, "This build server does not support the target %s." % target) + return (-1, "This build server does not support the target %s." % target, -1) else: print "Request to enqueue '%s' tag '%s' for target '%s' (user '%s')" % (package, cvs_tag, real_target, email) req = self._bm.create_job_request(email, package, cvs_tag, real_target, buildreq, time.time()) @@ -163,34 +157,34 @@ def enqueue_srpm(self, email, package, srpm_file, target, buildreq=None): """ Accept a job to build from SRPM file and stuff it into the job database """ - if config_opts['use_srpm_not_cvs'] == False: - email_result(email, srpm_file, "Error setting up build for %s on "\ + if self._cfg.get_bool("CVS", "use_cvs") == True: + self.email_result(email, srpm_file, "Error setting up build for %s on "\ "%s: this server builds CVS checkouts, not SRPMS." % (srpm_file, target)) - return (-1, "This build server is set up for building from CVS. Use the 'enqueue' command instead.") + return (-1, "This build server is set up for building from CVS. Use the 'enqueue' command instead.", -1) if not validate_package_name(package): - email_result(email, srpm_file, "Error setting up build for %s on "\ + self.email_result(email, srpm_file, "Error setting up build for %s on "\ "%s: Package name '%s' contained an illegal character. Submit a bug report?" % (package, target, package)) - return (-1, "The package name contained an illegal character.") + return (-1, "The package name contained an illegal character.", -1) # We limit the database field to 255 chars if len(srpm_file) > 255: - email_result(email, srpm_file, "Error setting up build for %s on "\ + self.email_result(email, srpm_file, "Error setting up build for %s on "\ "%s: try using a shorter path to the SRPM (< 255 chars)." % (srpm_file, target)) - return (-1, "Pathname to SRPM is limited to 255 characters.") + return (-1, "Pathname to SRPM is limited to 255 characters.", -1) srpm_file = os.path.abspath(srpm_file) if not srpm_file or not os.access(srpm_file, os.R_OK): - email_result(email, srpm_file, "Error setting up build for %s on "\ + self.email_result(email, srpm_file, "Error setting up build for %s on "\ "%s: The SRPM does not exist, or is not accessible. Remember to use absolute paths." % (srpm_file, target)) - return (-1, "SRPM does not exist or is not accessible, remember to use absolute paths.") + return (-1, "SRPM does not exist or is not accessible, remember to use absolute paths.", -1) try: - real_target = resolve_target(target) + real_target = resolve_target(target, self._cfg) except InvalidTargetError: - email_result(email, srpm_file, "Error setting up build for %s on "\ + self.email_result(email, srpm_file, "Error setting up build for %s on "\ "%s: target does not exist." % (srpm_file, target)) - return (-1, "This build server does not support the target %s." % target) + return (-1, "This build server does not support the target %s." % target, -1) else: print "Request to enqueue '%s' file '%s' for target '%s' (user '%s')" % (package, srpm_file, real_target, email) req = self._bm.create_job_request(email, package, srpm_file, real_target, buildreq, time.time()) @@ -285,7 +279,7 @@ if args_dict.has_key('target') and args_dict['target']: try: - real_target = resolve_target(args_dict['target']) + real_target = resolve_target(args_dict['target'], self._cfg) except InvalidTargetError: return (-1, "Error: Invalid job UID.", []) sql_args.append('target="%s"' % real_target) @@ -422,7 +416,10 @@ jobrec['epoch'] = job['epoch'] jobrec['version'] = job['version'] jobrec['release'] = job['release'] - log_url = PackageJob.make_job_log_url(jobrec['target'], str(uid), jobrec['package'], jobrec['version'], jobrec['release']) + base_url = self._server_cfg.get_str("UI", "log_url") + log_url = PackageJob.make_job_log_url(base_url, jobrec['target'], + str(uid), jobrec['package'], jobrec['version'], + jobrec['release']) if log_url and len(log_url): jobrec['log_url'] = log_url if job['result_msg']: @@ -468,8 +465,10 @@ return (0, "Success.", builder_list) def targets(self): - target_dict = config_opts['targets'] - return target_dict.keys() + targets = [] + for target_cfg in self._cfg.targets(): + targets.append(target_cfg.get_str("General", "name")) + return targets def pause(self, paused): s = "paused" Index: main.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/main.py,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- main.py 22 Jul 2005 21:35:27 -0000 1.11 +++ main.py 15 Aug 2005 03:18:20 -0000 1.12 @@ -30,22 +30,19 @@ import User import BuildMaster import BuilderManager +import Config from UserInterface import UserInterfaceSSLAuth from UserInterface import UserInterfaceNoAuth -# Load in the config -execfile("/etc/plague/server/CONFIG.py") - - class AuthenticatedSSLXMLRPCServer(AuthedXMLRPCServer.AuthedSSLXMLRPCServer): """ SSL XMLRPC server that authenticates clients based on their certificate. """ - def __init__(self, address, certs): + def __init__(self, address, certs, cfg): AuthedXMLRPCServer.AuthedSSLXMLRPCServer.__init__(self, address, self.auth_cb, certs) - self.authenticator = User.Authenticator() + self.authenticator = User.Authenticator(cfg) def auth_cb(self, request, client_address): peer_cert = request.get_peer_certificate() @@ -60,7 +57,7 @@ ################################################################# if __name__ == '__main__': - usage = "Usage: %s [-p ] [-l ] [-d] " % sys.argv[0] + usage = "Usage: %s [-p ] [-l ] [-d] -c " % sys.argv[0] parser = OptionParser(usage=usage) parser.add_option("-p", "--pidfile", default=None, help='file to write the PID to') @@ -68,14 +65,14 @@ help="location of file to write log output to") parser.add_option("-d", "--daemon", default=False, action="store_true", help="daemonize (i.e., detach from the terminal)") + parser.add_option("-c", "--configfile", default=None, + help='server configuration file') (opts, args) = parser.parse_args() - if (not len(args) == 1): - print "Must specify a single hostname." + if not opts.configfile: + print "Must specify a config file." sys.exit(1) - hostname = args[0] - if opts.daemon: ret=daemonize.createDaemon() if ret: @@ -91,26 +88,34 @@ sys.stdout=log sys.stderr=log - builder_manager = BuilderManager.BuilderManager() + # Load in our config, filling in with defaults if it doesn't exist + cfg = Config.ServerConfig("/etc/plague/server/plague-server.cfg") + cfg.load_target_configs() + if len(cfg.targets()) == 0: + print "You need at least one target to do anything useful." + sys.exit(3) + + builder_manager = BuilderManager.BuilderManager(cfg) # Create the BuildMaster thread - bm = BuildMaster.BuildMaster(hostname, builder_manager) + hostname = cfg.get_str("General", "hostname") + bm = BuildMaster.BuildMaster(builder_manager, cfg) bm.start() # Create the BuildMaster XMLRPC server - UI_PORT = 8887 + port = cfg.get_int("UI", "port") ui = None try: - if config_opts['ssl_frontend'] == True: + if cfg.get_bool("UI", "use_ssl") == True: ui_certs = {} - ui_certs['key_and_cert'] = config_opts['server_key_and_cert'] - ui_certs['ca_cert'] = config_opts['ca_cert'] - ui_certs['peer_ca_cert'] = config_opts['ui_ca_cert'] - ui = UserInterfaceSSLAuth(builder_manager, bm) - bm_server = AuthenticatedSSLXMLRPCServer((hostname, UI_PORT), ui_certs) + ui_certs['key_and_cert'] = cfg.get_str("SSL", "server_key_and_cert") + ui_certs['ca_cert'] = cfg.get_str("SSL", "ca_cert") + ui_certs['peer_ca_cert'] = cfg.get_str("UI", "client_ca_cert") + ui = UserInterfaceSSLAuth(builder_manager, bm, cfg) + bm_server = AuthenticatedSSLXMLRPCServer((hostname, port), ui_certs, cfg) else: - ui = UserInterfaceNoAuth(builder_manager, bm) - bm_server = AuthedXMLRPCServer.AuthedXMLRPCServer((hostname, UI_PORT)) + ui = UserInterfaceNoAuth(builder_manager, bm, cfg) + bm_server = AuthedXMLRPCServer.AuthedXMLRPCServer((hostname, port)) except socket.error, e: if e[0] == 98: # Address already in use print "Error: couldn't bind to address '%s:%s'. Is the server already running?" % (hostname, UI_PORT) @@ -120,16 +125,16 @@ # SRPM fileserver SRPM_SERVER_PORT = 8886 - http_dir = os.path.join(config_opts['server_work_dir'], "srpm_http_dir") + http_dir = os.path.join(cfg.get_str("Directories", "server_work_dir"), "srpm_http_dir") srpm_server_certs = {} - if config_opts['ssl_builders']: - srpm_server_certs['key_and_cert'] = config_opts['server_key_and_cert'] - srpm_server_certs['ca_cert'] = config_opts['ca_cert'] - srpm_server_certs['peer_ca_cert'] = config_opts['ca_cert'] + if cfg.get_bool("Builders", "use_ssl"): + srpm_server_certs['key_and_cert'] = cfg.get_str("SSL", "server_key_and_cert") + srpm_server_certs['ca_cert'] = cfg.get_str("SSL", "ca_cert") + srpm_server_certs['peer_ca_cert'] = cfg.get_str("SSL", "ca_cert") srpm_server = HTTPServer.PlgHTTPServerManager((hostname, SRPM_SERVER_PORT), http_dir, srpm_server_certs) srpm_server.start() - print "Build Server accepting requests on %s:%d.\n" % (hostname, UI_PORT) + print "Build Server accepting requests on %s:%d.\n" % (hostname, port) try: bm_server.serve_forever() except KeyboardInterrupt: --- CONFIG.py DELETED --- From fedora-extras-commits at redhat.com Mon Aug 15 03:18:21 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sun, 14 Aug 2005 23:18:21 -0400 Subject: extras-buildsys/etc plague-server.config, 1.1, 1.2 plague-server.init, 1.1, 1.2 Message-ID: <200508150318.j7F3Iq8F004697@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/etc In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4617/etc Modified Files: plague-server.config plague-server.init Log Message: 2005-08-14 Dan Williams * Switch to new server config file format using ConfigParser - Server config files are no longer python scripts - Server now takes a mandatory -c option for config file location - Server will write out a default config file at the specified location if none exists - Each target has its own config file, by default in /etc/plague/targets/ - CVSROOT and CVS_RSH are now target-specific, not server-wide - Additional Package Arches are now target-specific, and reside in each target's config file rather than server-wide * "Scratch" targets are now supported; ie, they are targets that do not contribute packages to a repository. Use the option "scratch=yes" in the target's config file in the "General" section to make the target a scratch target. * Repository Scripts: you may now specify a script that is run after packages are copied to a repository. Use the "repo_script" option in each target's config file to specify a script for that target/repo. The script must exit with result 0 on success, and > 0 on error. The script is given one argument, which is the name of the target/repo which has just copied packages. If the script fails, those listed in "admin_emails" in the server config file will be mailed with the script's output. The script is also killed if it takes longer than 1 hour to complete, since packages cannot be built for the target while the script is running. Index: plague-server.config =================================================================== RCS file: /cvs/fedora/extras-buildsys/etc/plague-server.config,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- plague-server.config 11 Jul 2005 03:23:21 -0000 1.1 +++ plague-server.config 15 Aug 2005 03:18:19 -0000 1.2 @@ -1 +1 @@ -HOST=localhost +CONFIG=/etc/plague/server/plague-server.cfg Index: plague-server.init =================================================================== RCS file: /cvs/fedora/extras-buildsys/etc/plague-server.init,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- plague-server.init 11 Jul 2005 03:23:21 -0000 1.1 +++ plague-server.init 15 Aug 2005 03:18:19 -0000 1.2 @@ -17,7 +17,7 @@ start() { echo -n "Starting plague-server: " - daemon plague-server -d -p /var/run/plague-server.pid -l /var/log/plague-server.log $HOST + daemon plague-server -c $CONFIG -d -p /var/run/plague-server.pid -l /var/log/plague-server.log echo touch /var/lock/subsys/plague-server return 0 From fedora-extras-commits at redhat.com Mon Aug 15 03:33:23 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sun, 14 Aug 2005 23:33:23 -0400 Subject: rpms/plague/devel plague-0.3.1-match-enqueue-return-args.patch, NONE, 1.1 plague.spec, 1.1, 1.2 Message-ID: <200508150333.j7F3XNNE004765@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/extras/rpms/plague/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4745 Modified Files: plague.spec Added Files: plague-0.3.1-match-enqueue-return-args.patch Log Message: * Sun Aug 14 2005 Dan Williams 0.3.1-2 - Match return arguments for enqueue and enqueue_srpm so that errors are properly returned plague-0.3.1-match-enqueue-return-args.patch: --- NEW FILE plague-0.3.1-match-enqueue-return-args.patch --- --- plague-0.3.1/server/UserInterface.py.enqueue-fix 2005-08-14 23:27:44.000000000 -0400 +++ plague-0.3.1/server/UserInterface.py 2005-08-14 23:28:39.000000000 -0400 @@ -135,24 +135,24 @@ if config_opts['use_srpm_not_cvs'] == True: email_result(email, cvs_tag, "Error setting up build for %s on "\ "%s: this server builds SRPMs, not CVS checkouts." % (cvs_tag, target)) - return (-1, "This build server is set up for building SRPMS only. Use the 'enqueue_srpm' command instead.") + return (-1, "This build server is set up for building SRPMS only. Use the 'enqueue_srpm' command instead.", -1) if not validate_package_name(package): email_result(email, cvs_tag, "Error setting up build for %s on "\ "%s: Package name '%s' contained an illegal character. Submit a bug report?" % (cvs_tag, target, package)) - return (-1, "The package name contained an illegal character.") + return (-1, "The package name contained an illegal character.", -1) if not validate_cvs_tag(cvs_tag): email_result(email, cvs_tag, "Error setting up build for %s on "\ "%s: The CVS tag '%s' contained an illegal character. Submit a bug report?" % (package, target, cvs_tag)) - return (-1, "The CVS tag contained an illegal character.") + return (-1, "The CVS tag contained an illegal character.", -1) try: real_target = resolve_target(target) except InvalidTargetError: email_result(email, cvs_tag, "Error setting up build for %s on "\ "%s: target does not exist." % (cvs_tag, target)) - return (-1, "This build server does not support the target %s." % target) + return (-1, "This build server does not support the target %s." % target, -1) else: print "Request to enqueue '%s' tag '%s' for target '%s' (user '%s')" % (package, cvs_tag, real_target, email) req = self._bm.create_job_request(email, package, cvs_tag, real_target, buildreq, time.time()) @@ -166,31 +166,31 @@ if config_opts['use_srpm_not_cvs'] == False: email_result(email, srpm_file, "Error setting up build for %s on "\ "%s: this server builds CVS checkouts, not SRPMS." % (srpm_file, target)) - return (-1, "This build server is set up for building from CVS. Use the 'enqueue' command instead.") + return (-1, "This build server is set up for building from CVS. Use the 'enqueue' command instead.", -1) if not validate_package_name(package): email_result(email, srpm_file, "Error setting up build for %s on "\ "%s: Package name '%s' contained an illegal character. Submit a bug report?" % (package, target, package)) - return (-1, "The package name contained an illegal character.") + return (-1, "The package name contained an illegal character.", -1) # We limit the database field to 255 chars if len(srpm_file) > 255: email_result(email, srpm_file, "Error setting up build for %s on "\ "%s: try using a shorter path to the SRPM (< 255 chars)." % (srpm_file, target)) - return (-1, "Pathname to SRPM is limited to 255 characters.") + return (-1, "Pathname to SRPM is limited to 255 characters.", -1) srpm_file = os.path.abspath(srpm_file) if not srpm_file or not os.access(srpm_file, os.R_OK): email_result(email, srpm_file, "Error setting up build for %s on "\ "%s: The SRPM does not exist, or is not accessible. Remember to use absolute paths." % (srpm_file, target)) - return (-1, "SRPM does not exist or is not accessible, remember to use absolute paths.") + return (-1, "SRPM does not exist or is not accessible, remember to use absolute paths.", -1) try: real_target = resolve_target(target) except InvalidTargetError: email_result(email, srpm_file, "Error setting up build for %s on "\ "%s: target does not exist." % (srpm_file, target)) - return (-1, "This build server does not support the target %s." % target) + return (-1, "This build server does not support the target %s." % target, -1) else: print "Request to enqueue '%s' file '%s' for target '%s' (user '%s')" % (package, srpm_file, real_target, email) req = self._bm.create_job_request(email, package, srpm_file, real_target, buildreq, time.time()) Index: plague.spec =================================================================== RCS file: /cvs/extras/rpms/plague/devel/plague.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- plague.spec 11 Aug 2005 19:53:04 -0000 1.1 +++ plague.spec 15 Aug 2005 03:33:21 -0000 1.2 @@ -3,7 +3,7 @@ Summary: Distributed build system for RPMs Name: plague Version: 0.3.1 -Release: 1 +Release: 2 License: GPL Group: Development/Tools Source: http://people.redhat.com/dcbw/plague/%{name}-%{version}.tar.bz2 @@ -16,6 +16,8 @@ Requires(preun): /sbin/chkconfig Requires(preun): /sbin/service +Patch0: plague-0.3.1-match-enqueue-return-args.patch + %description The Plague build system is a client/server distributed build system for building RPM packages. This package provides the plague server. @@ -66,6 +68,8 @@ %prep %setup -q +%patch0 -p1 -b .enqueue-fix + %build make @@ -146,6 +150,10 @@ %changelog +* Sun Aug 14 2005 Dan Williams 0.3.1-2 +- Match return arguments for enqueue and enqueue_srpm so that errors are + properly returned + * Thu Aug 11 2005 Dan Williams 0.3.1-1 - Version 0.3.1 o Clean up web interface error handling, catches more errors From fedora-extras-commits at redhat.com Mon Aug 15 08:40:28 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Mon, 15 Aug 2005 04:40:28 -0400 Subject: rpms/sylpheed-claws/FC-4 sylpheed-claws.spec,1.18,1.19 Message-ID: <200508150840.j7F8eSlu011858@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/sylpheed-claws/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11841 Modified Files: sylpheed-claws.spec Log Message: - add bzip2-devel BR Index: sylpheed-claws.spec =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws/FC-4/sylpheed-claws.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- sylpheed-claws.spec 31 Jul 2005 10:15:10 -0000 1.18 +++ sylpheed-claws.spec 15 Aug 2005 08:40:26 -0000 1.19 @@ -2,7 +2,7 @@ Name: sylpheed-claws Version: 1.9.13 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The bleeding edge branch of Sylpheed Group: Applications/Internet License: GPL @@ -20,6 +20,7 @@ BuildRequires: pilot-link-devel BuildRequires: gdk-pixbuf-devel BuildRequires: clamav-devel +BuildRequires: bzip2-devel BuildRequires: gnupg >= 1.2.1, gpgme-devel >= 0.4.5 BuildRequires: desktop-file-utils startup-notification-devel BuildRequires: pkgconfig @@ -112,6 +113,10 @@ %{_libdir}/sylpheed-claws/plugins/*deps %changelog +* Mon Aug 15 2005 Andreas Bierfert +1.9.13-2 +- add bzip2-devel BR + * Sun Jul 31 2005 Andreas Bierfert 1.9.13-1 - upgrade From fedora-extras-commits at redhat.com Mon Aug 15 08:42:22 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Mon, 15 Aug 2005 04:42:22 -0400 Subject: rpms/sylpheed-claws/devel sylpheed-claws.spec,1.18,1.19 Message-ID: <200508150842.j7F8gM1J011922@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/sylpheed-claws/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11905 Modified Files: sylpheed-claws.spec Log Message: - add bzip2-devel BR Index: sylpheed-claws.spec =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws/devel/sylpheed-claws.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- sylpheed-claws.spec 31 Jul 2005 10:16:28 -0000 1.18 +++ sylpheed-claws.spec 15 Aug 2005 08:42:19 -0000 1.19 @@ -2,7 +2,7 @@ Name: sylpheed-claws Version: 1.9.13 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The bleeding edge branch of Sylpheed Group: Applications/Internet License: GPL @@ -20,6 +20,7 @@ BuildRequires: pilot-link-devel BuildRequires: gdk-pixbuf-devel BuildRequires: clamav-devel +BuildRequires: bzip2-devel BuildRequires: gnupg >= 1.2.1, gpgme-devel >= 0.4.5 BuildRequires: desktop-file-utils startup-notification-devel BuildRequires: pkgconfig @@ -112,6 +113,10 @@ %{_libdir}/sylpheed-claws/plugins/*deps %changelog +* Mon Aug 15 2005 Andreas Bierfert +1.9.13-2 +- add bzip2-devel BR + * Sun Jul 31 2005 Andreas Bierfert 1.9.13-1 - upgrade From fedora-extras-commits at redhat.com Mon Aug 15 08:54:06 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Mon, 15 Aug 2005 04:54:06 -0400 Subject: rpms/sylpheed-claws/FC-4 sylpheed-claws.spec,1.19,1.20 Message-ID: <200508150854.j7F8sbmM011999@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/sylpheed-claws/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11967/FC-4 Modified Files: sylpheed-claws.spec Log Message: - add gmp-devel BR Index: sylpheed-claws.spec =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws/FC-4/sylpheed-claws.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- sylpheed-claws.spec 15 Aug 2005 08:40:26 -0000 1.19 +++ sylpheed-claws.spec 15 Aug 2005 08:54:04 -0000 1.20 @@ -2,7 +2,7 @@ Name: sylpheed-claws Version: 1.9.13 -Release: 2%{?dist} +Release: 3%{?dist} Summary: The bleeding edge branch of Sylpheed Group: Applications/Internet License: GPL @@ -21,6 +21,7 @@ BuildRequires: gdk-pixbuf-devel BuildRequires: clamav-devel BuildRequires: bzip2-devel +BuildRequires: gmp-devel BuildRequires: gnupg >= 1.2.1, gpgme-devel >= 0.4.5 BuildRequires: desktop-file-utils startup-notification-devel BuildRequires: pkgconfig @@ -114,6 +115,10 @@ %changelog * Mon Aug 15 2005 Andreas Bierfert +1.9.13-3 +- add gmp-devel BR + +* Mon Aug 15 2005 Andreas Bierfert 1.9.13-2 - add bzip2-devel BR From fedora-extras-commits at redhat.com Mon Aug 15 08:54:07 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Mon, 15 Aug 2005 04:54:07 -0400 Subject: rpms/sylpheed-claws/devel sylpheed-claws.spec,1.19,1.20 Message-ID: <200508150854.j7F8sba8012002@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/sylpheed-claws/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11967/devel Modified Files: sylpheed-claws.spec Log Message: - add gmp-devel BR Index: sylpheed-claws.spec =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws/devel/sylpheed-claws.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- sylpheed-claws.spec 15 Aug 2005 08:42:19 -0000 1.19 +++ sylpheed-claws.spec 15 Aug 2005 08:54:05 -0000 1.20 @@ -2,7 +2,7 @@ Name: sylpheed-claws Version: 1.9.13 -Release: 2%{?dist} +Release: 3%{?dist} Summary: The bleeding edge branch of Sylpheed Group: Applications/Internet License: GPL @@ -21,6 +21,7 @@ BuildRequires: gdk-pixbuf-devel BuildRequires: clamav-devel BuildRequires: bzip2-devel +BuildRequires: gmp-devel BuildRequires: gnupg >= 1.2.1, gpgme-devel >= 0.4.5 BuildRequires: desktop-file-utils startup-notification-devel BuildRequires: pkgconfig @@ -114,6 +115,10 @@ %changelog * Mon Aug 15 2005 Andreas Bierfert +1.9.13-3 +- add gmp-devel BR + +* Mon Aug 15 2005 Andreas Bierfert 1.9.13-2 - add bzip2-devel BR From fedora-extras-commits at redhat.com Mon Aug 15 10:26:58 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Mon, 15 Aug 2005 06:26:58 -0400 Subject: rpms/sylpheed-claws/FC-4 sylpheed-claws.spec,1.20,1.21 Message-ID: <200508151026.j7FAQwgL014531@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/sylpheed-claws/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14502/FC-4 Modified Files: sylpheed-claws.spec Log Message: - fix build Index: sylpheed-claws.spec =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws/FC-4/sylpheed-claws.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sylpheed-claws.spec 15 Aug 2005 08:54:04 -0000 1.20 +++ sylpheed-claws.spec 15 Aug 2005 10:26:56 -0000 1.21 @@ -2,7 +2,7 @@ Name: sylpheed-claws Version: 1.9.13 -Release: 3%{?dist} +Release: 4%{?dist} Summary: The bleeding edge branch of Sylpheed Group: Applications/Internet License: GPL @@ -100,7 +100,6 @@ %{_libdir}/sylpheed-claws/plugins/*.so %exclude %{_libdir}/sylpheed-claws/plugins/*.a %{_datadir}/pixmaps/* -%{_datadir}/icons/hicolor/48x48/apps/sylpheed-claws.png %dir %{_datadir}/sylpheed-claws/ %{_datadir}/sylpheed-claws/* %{_mandir}/man1/* @@ -115,6 +114,10 @@ %changelog * Mon Aug 15 2005 Andreas Bierfert +1.9.13-4 +- fix files + +* Mon Aug 15 2005 Andreas Bierfert 1.9.13-3 - add gmp-devel BR From fedora-extras-commits at redhat.com Mon Aug 15 10:26:58 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Mon, 15 Aug 2005 06:26:58 -0400 Subject: rpms/sylpheed-claws/devel sylpheed-claws.spec,1.20,1.21 Message-ID: <200508151026.j7FAQwvU014537@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/sylpheed-claws/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14502/devel Modified Files: sylpheed-claws.spec Log Message: - fix build Index: sylpheed-claws.spec =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws/devel/sylpheed-claws.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sylpheed-claws.spec 15 Aug 2005 08:54:05 -0000 1.20 +++ sylpheed-claws.spec 15 Aug 2005 10:26:56 -0000 1.21 @@ -2,7 +2,7 @@ Name: sylpheed-claws Version: 1.9.13 -Release: 3%{?dist} +Release: 4%{?dist} Summary: The bleeding edge branch of Sylpheed Group: Applications/Internet License: GPL @@ -100,7 +100,6 @@ %{_libdir}/sylpheed-claws/plugins/*.so %exclude %{_libdir}/sylpheed-claws/plugins/*.a %{_datadir}/pixmaps/* -%{_datadir}/icons/hicolor/48x48/apps/sylpheed-claws.png %dir %{_datadir}/sylpheed-claws/ %{_datadir}/sylpheed-claws/* %{_mandir}/man1/* @@ -115,6 +114,10 @@ %changelog * Mon Aug 15 2005 Andreas Bierfert +1.9.13-4 +- fix files + +* Mon Aug 15 2005 Andreas Bierfert 1.9.13-3 - add gmp-devel BR From fedora-extras-commits at redhat.com Mon Aug 15 12:05:21 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 15 Aug 2005 08:05:21 -0400 Subject: extras-buildsys/server Makefile, 1.7, 1.8 Repo.py, 1.12, 1.13 UserInterface.py, 1.45, 1.46 Message-ID: <200508151205.j7FC5p1N017133@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17112/server Modified Files: Makefile Repo.py UserInterface.py Log Message: Fix some stuff that got broken in the config changes Index: Makefile =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/Makefile,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- Makefile 15 Aug 2005 03:18:20 -0000 1.7 +++ Makefile 15 Aug 2005 12:05:01 -0000 1.8 @@ -30,7 +30,5 @@ $(MKDIR) -p $(OTHERINSTDIR) for file in $(FILES); do $(INSTALL) -m 644 $$file $(OTHERINSTDIR)/$$file; done $(MKDIR) -p $(CONFIGDIR) - $(MKDIR) -p $(CONFIGDIR)/addl_pkg_arches - $(INSTALL) -m 755 addl_pkg_arches/devel-addl-arches $(CONFIGDIR)/addl_pkg_arches/devel-addl-arches $(MKDIR) -p $(CONFIGDIR)/certs Index: Repo.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/Repo.py,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- Repo.py 15 Aug 2005 03:18:20 -0000 1.12 +++ Repo.py 15 Aug 2005 12:05:02 -0000 1.13 @@ -170,7 +170,6 @@ prepping_builders = self._builder_manager.any_prepping_builders() - print "repo %s, count %d" % (self._target, self._lock_count) self._lock.acquire() # Level 2: update the repo Index: UserInterface.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/UserInterface.py,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- UserInterface.py 15 Aug 2005 03:18:20 -0000 1.45 +++ UserInterface.py 15 Aug 2005 12:05:02 -0000 1.46 @@ -514,14 +514,14 @@ def enqueue(self, package, cvs_tag, target, buildreq=None): user = AuthedXMLRPCServer.get_authinfo() if not user or not user.own_jobs: - return (-1, "Insufficient privileges.") + return (-1, "Insufficient privileges.", -1) return UserInterface.enqueue(self, user.email, package, cvs_tag, target, buildreq) def enqueue_srpm(self, package, srpm_file, target, buildreq=None): user = AuthedXMLRPCServer.get_authinfo() if not user or not user.own_jobs: - return (-1, "Insufficient privileges.") + return (-1, "Insufficient privileges.", -1) return UserInterface.enqueue_srpm(self, user.email, package, srpm_file, target, buildreq) def requeue(self, uid): From fedora-extras-commits at redhat.com Mon Aug 15 13:13:58 2005 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 15 Aug 2005 09:13:58 -0400 Subject: rpms/Glide3/devel sources,1.3,1.4 Glide3.spec,1.11,1.12 Message-ID: <200508151313.j7FDDwYp019016@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/Glide3/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18997 Modified Files: sources Glide3.spec Log Message: * Mon Aug 15 2005 Hans de Goede 20050815-1 - Add -soname to linkerflags, so that we report the correct soname, otherwise rpm can't properly resolve dependencies because of the symlink stuff we do (merged upstream). Index: sources =================================================================== RCS file: /cvs/extras/rpms/Glide3/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 13 Aug 2005 21:11:19 -0000 1.3 +++ sources 15 Aug 2005 13:13:56 -0000 1.4 @@ -1,2 +1 @@ -8da72f671d9900645244f8db7e594f76 Glide3-20050813.tar.bz2 -99cf1d5972fd8ecb35498a4b99a24b59 glidelink.c +7d180579776f363faeea2bd8b09b5964 Glide3-20050815.tar.bz2 Index: Glide3.spec =================================================================== RCS file: /cvs/extras/rpms/Glide3/devel/Glide3.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- Glide3.spec 13 Aug 2005 21:35:01 -0000 1.11 +++ Glide3.spec 15 Aug 2005 13:13:56 -0000 1.12 @@ -1,5 +1,5 @@ Name: Glide3 -Version: 20050813 +Version: 20050815 Release: 1 Summary: Glide3 runtime for the 3Dfx Voodoo family of cards # Glide3 is x86/alpha/ia64/x86_64 only, ia64 is untested @@ -77,6 +77,7 @@ %install +rm -rf $RPM_BUILD_ROOT %define libver 3.10.0 mkdir -p $RPM_BUILD_ROOT/%{_libdir} mkdir -p $RPM_BUILD_ROOT/%{_includedir}/glide3 @@ -126,6 +127,11 @@ %changelog +* Mon Aug 15 2005 Hans de Goede 20050815-1 +- Add -soname to linkerflags, so that we report the correct soname, + otherwise rpm can't properly resolve dependencies because of the + symlink stuff we do (merged upstream). + * Sat Aug 13 2005 Hans de Goede 20050813-1 - Work together with upstream to keep Glide alive, use upstream CVS glide-devel-branch as a base. From fedora-extras-commits at redhat.com Mon Aug 15 13:14:28 2005 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 15 Aug 2005 09:14:28 -0400 Subject: rpms/Glide3/devel .cvsignore,1.3,1.4 Message-ID: <200508151314.j7FDESM3019068@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/Glide3/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19051 Modified Files: .cvsignore Log Message: Glide3-20050815.tar.bz2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/Glide3/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 13 Aug 2005 21:11:19 -0000 1.3 +++ .cvsignore 15 Aug 2005 13:14:26 -0000 1.4 @@ -1,2 +1 @@ -Glide3-20050813.tar.bz2 -glidelink.c +Glide3-20050815.tar.bz2 From fedora-extras-commits at redhat.com Mon Aug 15 14:15:26 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 15 Aug 2005 10:15:26 -0400 Subject: extras-buildsys ChangeLog,1.97,1.97.2.1 Message-ID: <200508151415.j7FEFQIO020516@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20401 Modified Files: Tag: STABLE_0_3 ChangeLog Log Message: 2005-08-15 Dan Williams * server/UserInterface.py - (UserInterface::enqueue, UserInterface::enqueue_srpm, UserInterfaceSSLAuth::enqueue, UserInterface::enqueue_srpm): - We need to return 3 arguments on errors, not just 2 Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.97 retrieving revision 1.97.2.1 diff -u -r1.97 -r1.97.2.1 --- ChangeLog 11 Aug 2005 19:36:08 -0000 1.97 +++ ChangeLog 15 Aug 2005 14:15:24 -0000 1.97.2.1 @@ -1,3 +1,10 @@ +2005-08-15 Dan Williams + + * server/UserInterface.py + - (UserInterface::enqueue, UserInterface::enqueue_srpm, + UserInterfaceSSLAuth::enqueue, UserInterface::enqueue_srpm): + - We need to return 3 arguments on errors, not just 2 + 2005-08-11 Dan Williams * Tag plague-0_3_1_RELEASE From fedora-extras-commits at redhat.com Mon Aug 15 14:15:26 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 15 Aug 2005 10:15:26 -0400 Subject: extras-buildsys/server UserInterface.py,1.44,1.44.2.1 Message-ID: <200508151415.j7FEFQXC020522@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20401/server Modified Files: Tag: STABLE_0_3 UserInterface.py Log Message: 2005-08-15 Dan Williams * server/UserInterface.py - (UserInterface::enqueue, UserInterface::enqueue_srpm, UserInterfaceSSLAuth::enqueue, UserInterface::enqueue_srpm): - We need to return 3 arguments on errors, not just 2 Index: UserInterface.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/UserInterface.py,v retrieving revision 1.44 retrieving revision 1.44.2.1 diff -u -r1.44 -r1.44.2.1 --- UserInterface.py 8 Aug 2005 02:54:16 -0000 1.44 +++ UserInterface.py 15 Aug 2005 14:15:24 -0000 1.44.2.1 @@ -135,24 +135,24 @@ if config_opts['use_srpm_not_cvs'] == True: email_result(email, cvs_tag, "Error setting up build for %s on "\ "%s: this server builds SRPMs, not CVS checkouts." % (cvs_tag, target)) - return (-1, "This build server is set up for building SRPMS only. Use the 'enqueue_srpm' command instead.") + return (-1, "This build server is set up for building SRPMS only. Use the 'enqueue_srpm' command instead.", -1) if not validate_package_name(package): email_result(email, cvs_tag, "Error setting up build for %s on "\ "%s: Package name '%s' contained an illegal character. Submit a bug report?" % (cvs_tag, target, package)) - return (-1, "The package name contained an illegal character.") + return (-1, "The package name contained an illegal character.", -1) if not validate_cvs_tag(cvs_tag): email_result(email, cvs_tag, "Error setting up build for %s on "\ "%s: The CVS tag '%s' contained an illegal character. Submit a bug report?" % (package, target, cvs_tag)) - return (-1, "The CVS tag contained an illegal character.") + return (-1, "The CVS tag contained an illegal character.", -1) try: real_target = resolve_target(target) except InvalidTargetError: email_result(email, cvs_tag, "Error setting up build for %s on "\ "%s: target does not exist." % (cvs_tag, target)) - return (-1, "This build server does not support the target %s." % target) + return (-1, "This build server does not support the target %s." % target, -1) else: print "Request to enqueue '%s' tag '%s' for target '%s' (user '%s')" % (package, cvs_tag, real_target, email) req = self._bm.create_job_request(email, package, cvs_tag, real_target, buildreq, time.time()) @@ -166,31 +166,31 @@ if config_opts['use_srpm_not_cvs'] == False: email_result(email, srpm_file, "Error setting up build for %s on "\ "%s: this server builds CVS checkouts, not SRPMS." % (srpm_file, target)) - return (-1, "This build server is set up for building from CVS. Use the 'enqueue' command instead.") + return (-1, "This build server is set up for building from CVS. Use the 'enqueue' command instead.", -1) if not validate_package_name(package): email_result(email, srpm_file, "Error setting up build for %s on "\ "%s: Package name '%s' contained an illegal character. Submit a bug report?" % (package, target, package)) - return (-1, "The package name contained an illegal character.") + return (-1, "The package name contained an illegal character.", -1) # We limit the database field to 255 chars if len(srpm_file) > 255: email_result(email, srpm_file, "Error setting up build for %s on "\ "%s: try using a shorter path to the SRPM (< 255 chars)." % (srpm_file, target)) - return (-1, "Pathname to SRPM is limited to 255 characters.") + return (-1, "Pathname to SRPM is limited to 255 characters.", -1) srpm_file = os.path.abspath(srpm_file) if not srpm_file or not os.access(srpm_file, os.R_OK): email_result(email, srpm_file, "Error setting up build for %s on "\ "%s: The SRPM does not exist, or is not accessible. Remember to use absolute paths." % (srpm_file, target)) - return (-1, "SRPM does not exist or is not accessible, remember to use absolute paths.") + return (-1, "SRPM does not exist or is not accessible, remember to use absolute paths.", -1) try: real_target = resolve_target(target) except InvalidTargetError: email_result(email, srpm_file, "Error setting up build for %s on "\ "%s: target does not exist." % (srpm_file, target)) - return (-1, "This build server does not support the target %s." % target) + return (-1, "This build server does not support the target %s." % target, -1) else: print "Request to enqueue '%s' file '%s' for target '%s' (user '%s')" % (package, srpm_file, real_target, email) req = self._bm.create_job_request(email, package, srpm_file, real_target, buildreq, time.time()) @@ -515,16 +515,17 @@ def enqueue(self, package, cvs_tag, target, buildreq=None): user = AuthedXMLRPCServer.get_authinfo() if not user or not user.own_jobs: - return (-1, "Insufficient privileges.") + return (-1, "Insufficient privileges.", -1) return UserInterface.enqueue(self, user.email, package, cvs_tag, target, buildreq) def enqueue_srpm(self, package, srpm_file, target, buildreq=None): user = AuthedXMLRPCServer.get_authinfo() if not user or not user.own_jobs: - return (-1, "Insufficient privileges.") + return (-1, "Insufficient privileges.", -1) return UserInterface.enqueue_srpm(self, user.email, package, srpm_file, target, buildreq) + def requeue(self, uid): user = AuthedXMLRPCServer.get_authinfo() if not user or not user.own_jobs: @@ -552,6 +553,7 @@ return UserInterface.requeue(self, uid) + def kill_job(self, email, jobid): user = AuthedXMLRPCServer.get_authinfo() if not user or not user.own_jobs: From fedora-extras-commits at redhat.com Mon Aug 15 14:33:12 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 15 Aug 2005 10:33:12 -0400 Subject: extras-buildsys/server UserInterface.py,1.44.2.1,1.44.2.2 Message-ID: <200508151433.j7FEXC27020665@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20617/server Modified Files: Tag: STABLE_0_3 UserInterface.py Log Message: 2005-08-15 Dan Williams * client/client.py server/UserInterface.py - Implement API versioning, and check the API version in the client before doing anything else Index: UserInterface.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/UserInterface.py,v retrieving revision 1.44.2.1 retrieving revision 1.44.2.2 diff -u -r1.44.2.1 -r1.44.2.2 --- UserInterface.py 15 Aug 2005 14:15:24 -0000 1.44.2.1 +++ UserInterface.py 15 Aug 2005 14:33:10 -0000 1.44.2.2 @@ -31,6 +31,10 @@ execfile(CONFIG_LOCATION + "CONFIG.py") +# API version #, just increment each time an incompatible API change is made +XMLRPC_API_VERSION = 1 + + def get_dbcx(): dbcx = None dbcx = sqlite.connect(CONFIG_LOCATION + "jobdb", encoding="utf-8", timeout=3) @@ -506,6 +510,9 @@ dbcx.commit() return (0, "Success.") + def api_version(self): + return XMLRPC_API_VERSION + class UserInterfaceSSLAuth(UserInterface): """ From fedora-extras-commits at redhat.com Mon Aug 15 14:33:06 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 15 Aug 2005 10:33:06 -0400 Subject: extras-buildsys ChangeLog,1.97.2.1,1.97.2.2 Message-ID: <200508151433.j7FEXbbj020671@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20617 Modified Files: Tag: STABLE_0_3 ChangeLog Log Message: 2005-08-15 Dan Williams * client/client.py server/UserInterface.py - Implement API versioning, and check the API version in the client before doing anything else Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.97.2.1 retrieving revision 1.97.2.2 diff -u -r1.97.2.1 -r1.97.2.2 --- ChangeLog 15 Aug 2005 14:15:24 -0000 1.97.2.1 +++ ChangeLog 15 Aug 2005 14:33:04 -0000 1.97.2.2 @@ -1,5 +1,12 @@ 2005-08-15 Dan Williams + * client/client.py + server/UserInterface.py + - Implement API versioning, and check the API version in the client + before doing anything else + +2005-08-15 Dan Williams + * server/UserInterface.py - (UserInterface::enqueue, UserInterface::enqueue_srpm, UserInterfaceSSLAuth::enqueue, UserInterface::enqueue_srpm): From fedora-extras-commits at redhat.com Mon Aug 15 14:33:07 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 15 Aug 2005 10:33:07 -0400 Subject: extras-buildsys/client client.py,1.26,1.26.2.1 Message-ID: <200508151433.j7FEXbaJ020675@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/client In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20617/client Modified Files: Tag: STABLE_0_3 client.py Log Message: 2005-08-15 Dan Williams * client/client.py server/UserInterface.py - Implement API versioning, and check the API version in the client before doing anything else Index: client.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/client/client.py,v retrieving revision 1.26 retrieving revision 1.26.2.1 diff -u -r1.26 -r1.26.2.1 --- client.py 8 Aug 2005 02:54:15 -0000 1.26 +++ client.py 15 Aug 2005 14:33:05 -0000 1.26.2.1 @@ -24,6 +24,9 @@ import OpenSSL +XMLRPC_API_VERSION = 1 + + config = ConfigParser.ConfigParser() config.add_section('Certs') config.set('Certs', 'user-cert', '~/.fedora.cert') @@ -51,6 +54,28 @@ self.message = message +def check_api_version(server): + """ Ensure the API of the server matches the one we expect to talk to """ + + try: + server_ver = server.api_version() + except socket.error, e: + print "Error connecting to build server: '%s'" % e + return False + except OpenSSL.SSL.SysCallError, e: + print "Error connecting to build server: '%s'" % e + return False + except xmlrpclib.Fault, fault: + print "Error: build server does not support 'api_version' method. Server said: '%s'" % fault + return False + + if server_ver != XMLRPC_API_VERSION: + print "Error: API version mismatch. Client: %d, Server: %d" % (XMLRPC_API_VERSION, server_ver) + return False + + return True + + def enqueue(server, email, args): """ Enqueue a package on the server by CVS tag """ @@ -373,10 +398,14 @@ print e.message sys.exit(1) + # Ensure the server's API version matches ours + if not check_api_version(server): + sys.exit(1) + if cmd == 'build': if len(sys.argv) < 5: Usage() - exit(1) + sys.exit(1) item = sys.argv[3] try: if item.endswith(".src.rpm") and os.path.exists(item): From fedora-extras-commits at redhat.com Mon Aug 15 14:37:02 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 15 Aug 2005 10:37:02 -0400 Subject: extras-buildsys ChangeLog,1.98,1.99 Message-ID: <200508151437.j7FEb2Va020728@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20687 Modified Files: ChangeLog Log Message: 2005-08-15 Dan Williams * client/client.py server/UserInterface.py - Implement API versioning, and check the API version in the client before doing anything else Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.98 retrieving revision 1.99 diff -u -r1.98 -r1.99 --- ChangeLog 15 Aug 2005 03:18:18 -0000 1.98 +++ ChangeLog 15 Aug 2005 14:37:00 -0000 1.99 @@ -1,3 +1,10 @@ +2005-08-15 Dan Williams + + * client/client.py + server/UserInterface.py + - Implement API versioning, and check the API version in the client + before doing anything else + 2005-08-14 Dan Williams * Switch to new server config file format using ConfigParser From fedora-extras-commits at redhat.com Mon Aug 15 14:37:02 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 15 Aug 2005 10:37:02 -0400 Subject: extras-buildsys/client client.py,1.26,1.27 Message-ID: <200508151437.j7FEb2r9020734@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/client In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20687/client Modified Files: client.py Log Message: 2005-08-15 Dan Williams * client/client.py server/UserInterface.py - Implement API versioning, and check the API version in the client before doing anything else Index: client.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/client/client.py,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- client.py 8 Aug 2005 02:54:15 -0000 1.26 +++ client.py 15 Aug 2005 14:37:00 -0000 1.27 @@ -24,6 +24,9 @@ import OpenSSL +XMLRPC_API_VERSION = 100 + + config = ConfigParser.ConfigParser() config.add_section('Certs') config.set('Certs', 'user-cert', '~/.fedora.cert') @@ -51,6 +54,28 @@ self.message = message +def check_api_version(server): + """ Ensure the API of the server matches the one we expect to talk to """ + + try: + server_ver = server.api_version() + except socket.error, e: + print "Error connecting to build server: '%s'" % e + return False + except OpenSSL.SSL.SysCallError, e: + print "Error connecting to build server: '%s'" % e + return False + except xmlrpclib.Fault, fault: + print "Error: build server does not support 'api_version' method. Server said: '%s'" % fault + return False + + if server_ver != XMLRPC_API_VERSION: + print "Error: API version mismatch. Client: %d, Server: %d" % (XMLRPC_API_VERSION, server_ver) + return False + + return True + + def enqueue(server, email, args): """ Enqueue a package on the server by CVS tag """ @@ -373,10 +398,14 @@ print e.message sys.exit(1) + # Ensure the server's API version matches ours + if not check_api_version(server): + sys.exit(1) + if cmd == 'build': if len(sys.argv) < 5: Usage() - exit(1) + sys.exit(1) item = sys.argv[3] try: if item.endswith(".src.rpm") and os.path.exists(item): From fedora-extras-commits at redhat.com Mon Aug 15 14:37:03 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 15 Aug 2005 10:37:03 -0400 Subject: extras-buildsys/server UserInterface.py,1.46,1.47 Message-ID: <200508151437.j7FEb3v8020740@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20687/server Modified Files: UserInterface.py Log Message: 2005-08-15 Dan Williams * client/client.py server/UserInterface.py - Implement API versioning, and check the API version in the client before doing anything else Index: UserInterface.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/UserInterface.py,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- UserInterface.py 15 Aug 2005 12:05:02 -0000 1.46 +++ UserInterface.py 15 Aug 2005 14:37:00 -0000 1.47 @@ -30,6 +30,10 @@ CONFIG_LOCATION = "/etc/plague/server/" +# API version #, just increment each time an incompatible API change is made +XMLRPC_API_VERSION = 100 + + def get_dbcx(): dbcx = None dbcx = sqlite.connect(CONFIG_LOCATION + "jobdb", encoding="utf-8", timeout=3) @@ -505,6 +509,9 @@ dbcx.commit() return (0, "Success.") + def api_version(self): + return XMLRPC_API_VERSION + class UserInterfaceSSLAuth(UserInterface): """ @@ -524,6 +531,7 @@ return (-1, "Insufficient privileges.", -1) return UserInterface.enqueue_srpm(self, user.email, package, srpm_file, target, buildreq) + def requeue(self, uid): user = AuthedXMLRPCServer.get_authinfo() if not user or not user.own_jobs: @@ -551,6 +559,7 @@ return UserInterface.requeue(self, uid) + def kill_job(self, email, jobid): user = AuthedXMLRPCServer.get_authinfo() if not user or not user.own_jobs: From fedora-extras-commits at redhat.com Mon Aug 15 14:53:54 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 15 Aug 2005 10:53:54 -0400 Subject: extras-buildsys/server UserInterface.py,1.47,1.48 Message-ID: <200508151453.j7FErstD020786@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20769/server Modified Files: UserInterface.py Log Message: Remove bit obsoleted by config changes Index: UserInterface.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/UserInterface.py,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- UserInterface.py 15 Aug 2005 14:37:00 -0000 1.47 +++ UserInterface.py 15 Aug 2005 14:53:52 -0000 1.48 @@ -464,7 +464,6 @@ def list_builders(self): - execfile("/etc/plague/server/CONFIG.py") builder_list = self._builder_manager.list_builders() return (0, "Success.", builder_list) From fedora-extras-commits at redhat.com Mon Aug 15 16:00:09 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 15 Aug 2005 12:00:09 -0400 Subject: extras-buildsys ChangeLog,1.99,1.100 Message-ID: <200508151600.j7FG0dtP022256@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22220 Modified Files: ChangeLog Log Message: 2005-08-15 Dan Williams * server/ArchJob.py server/PackageJob.py - Let "scratch" target jobs continue building even if one or more arches has failed Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.99 retrieving revision 1.100 diff -u -r1.99 -r1.100 --- ChangeLog 15 Aug 2005 14:37:00 -0000 1.99 +++ ChangeLog 15 Aug 2005 16:00:07 -0000 1.100 @@ -1,5 +1,12 @@ 2005-08-15 Dan Williams + * server/ArchJob.py + server/PackageJob.py + - Let "scratch" target jobs continue building even if one or more arches + has failed + +2005-08-15 Dan Williams + * client/client.py server/UserInterface.py - Implement API versioning, and check the API version in the client From fedora-extras-commits at redhat.com Mon Aug 15 16:00:10 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 15 Aug 2005 12:00:10 -0400 Subject: extras-buildsys/server ArchJob.py, 1.11, 1.12 PackageJob.py, 1.22, 1.23 Message-ID: <200508151600.j7FG0eNE022260@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22220/server Modified Files: ArchJob.py PackageJob.py Log Message: 2005-08-15 Dan Williams * server/ArchJob.py server/PackageJob.py - Let "scratch" target jobs continue building even if one or more arches has failed Index: ArchJob.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/ArchJob.py,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- ArchJob.py 15 Aug 2005 03:18:20 -0000 1.11 +++ ArchJob.py 15 Aug 2005 16:00:08 -0000 1.12 @@ -37,6 +37,7 @@ self.jobid = jobid self.status = 'running' self.builder_status = '' + self._failure_noticed = False self.target = target self.arch = arch self._builder_gone = False @@ -52,6 +53,12 @@ self._certs['ca_cert'] = cfg.get_str("SSL", "ca_cert") self._certs['peer_ca_cert'] = cfg.get_str("SSL", "ca_cert") + def failure_noticed(self): + return self._failure_noticed + + def set_failure_noticed(self): + self._failure_noticed = True + def _builder_finished(self): if self.builder_status == 'done' or self.builder_status == 'killed' or self.builder_status == 'failed' or self.builder_status == 'orphaned': return True Index: PackageJob.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/PackageJob.py,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- PackageJob.py 15 Aug 2005 03:18:20 -0000 1.22 +++ PackageJob.py 15 Aug 2005 16:00:08 -0000 1.23 @@ -509,30 +509,47 @@ logtail = self._get_log_tail(e.arch) msg = "%s\n-------------------------------------------------\n\n%s\n" % (msg, logtail) self.email_result(self.username, resultstring=msg, subject=subj) - # Kill remaining jobs on other arches - self._kill_all_archjobs() - self._stage_failed(e.msg) + + # Only non-scratch targets kill remaining jobs and file the entire + # build when one archjob fails + if self._target_cfg.get_bool("General", "scratch") == False: + # Kill remaining jobs on other arches + self._kill_all_archjobs() + self._stage_failed(e.msg) def _stage_building(self): # Count failed and completed jobs completed_jobs = 0 + failed_jobs = 0 self._archjobs_lock.acquire() for job in self.archjobs.values(): if not job: continue if job.get_status() is 'done': + completed_jobs = completed_jobs + 1 + if job.builder_failed(): - msg = "Job failed on arch %s\n" % (job.arch) - self._archjobs_lock.release() - raise BuildError(msg, job.arch) - else: - completed_jobs = completed_jobs + 1 + failed_jobs = failed_jobs + 1 + + # Normal jobs will just stop when a single archjob fails, but + # scratch targets don't kill the build when one fails. However, + # even for scratch targets, we still want to notify the user if + # a particular arch fails. + if not job.failure_noticed(): + job.set_failure_noticed() + msg = "Job failed on arch %s\n" % (job.arch) + self._archjobs_lock.release() + raise BuildError(msg, job.arch) + self._archjobs_lock.release() if completed_jobs == len(self.archjobs): # Scratch targets don't contribute packages to the repo if self._target_cfg.get_bool("General", "scratch") == True: - self._set_cur_stage('repodone') + if failed_jobs > 0: + self._stage_failed("Job failed on one or more architectures.") + else: + self._set_cur_stage('repodone') else: self._set_cur_stage('add_to_repo') return False # Don't want to wait From fedora-extras-commits at redhat.com Mon Aug 15 16:21:13 2005 From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs)) Date: Mon, 15 Aug 2005 12:21:13 -0400 Subject: rpms/denyhosts/devel denyhosts.sysconfig, NONE, 1.1 denyhosts.init, 1.2, 1.3 denyhosts.spec, 1.7, 1.8 Message-ID: <200508151621.j7FGLDfc023514@cvs-int.fedora.redhat.com> Author: tibbs Update of /cvs/extras/rpms/denyhosts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23494 Modified Files: denyhosts.init denyhosts.spec Added Files: denyhosts.sysconfig Log Message: * Sun Aug 14 2005 Jason L Tibbitts III - 0.9.9 - Framework for enabling daemon mode. --- NEW FILE denyhosts.sysconfig --- # Should DenyHosts run in daemon mode? # If set to "no", you also need to edit /etc/cron.d/denyhosts and # uncomment the appropriate lines. DAEMON=yes Index: denyhosts.init =================================================================== RCS file: /cvs/extras/rpms/denyhosts/devel/denyhosts.init,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- denyhosts.init 22 Jul 2005 16:27:04 -0000 1.2 +++ denyhosts.init 15 Aug 2005 16:21:11 -0000 1.3 @@ -7,7 +7,7 @@ # # chkconfig: - 50 01 # -# description: Enable periodic execution of denyhosts, an SSH log watcher +# description: Enable execution of denyhosts, an SSH log watcher # processname denyhosts # config: /etc/denyhosts.cfg # @@ -15,29 +15,65 @@ # source function library . /etc/rc.d/init.d/functions -lockfile=/var/lock/subsys/denyhosts.init - +CONFIG=/etc/denyhosts.cfg +CONTROL=/usr/bin/denyhosts-control +CRONLOCK=/var/lock/subsys/denyhosts.init +LOCKFILE=/var/lock/subsys/denyhosts RETVAL=0 -start() { +[ -f /etc/sysconfig/denyhosts ] && . /etc/sysconfig/denyhosts + +c_start() { echo -n $"Enabling denyhosts: " - touch "$lockfile" && success || failure + touch "$CRONLOCK" && success || failure RETVAL=$? echo } -stop() { +c_stop() { echo -n $"Disabling denyhosts: " - rm -f "$lockfile" && success || failure + rm -f "$CRONLOCK" && success || failure RETVAL=$? echo } -restart() { - stop - start +c_restart() { + c_stop + c_start +} + +c_condrestart() { + [ -f "$CRONLOCK" ] && c_restart +} + +c_status() { + if [ -f $CRONLOCK ]; then + echo $"Denyhosts is enabled." + RETVAL=0 + else + echo $"Denyhosts is disabled." + RETVAL=3 + fi +} + +d_start() {$CONTROL start --config=$CONFIG; RETVAL=$?} +d_stop() {$CONTROL stop --config=$CONFIG; RETVAL=$?} +d_restart() {$CONTROL restart --config=$CONFIG; RETVAL=$?} +d_status() {$CONTROL status --config=$CONFIG; RETVAL=$?} + +d_condrestart() { + # It's a layering violation to test the location of the + # lockfile, but the control script doesn't support condrestart + # yet + [ -f $LOCKFILE ] && d_restart } +start() {if [ $DAEMON = "yes" ]; then d_start; else c_start; fi} +stop() {if [ $DAEMON = "yes" ]; then d_stop; else c_stop; fi} +restart() {if [ $DAEMON = "yes" ]; then d_restart; else c_restart; fi} +condrestart() {if [ $DAEMON = "yes" ]; then d_condrestart; else c_restart; fi} +status() {if [ $DAEMON = "yes" ]; then d_status; else c_status; fi} + case "$1" in start) start @@ -51,16 +87,10 @@ reload) ;; condrestart) - [ -f "$lockfile" ] && restart + condrestart ;; status) - if [ -f $lockfile ]; then - echo $"Denyhosts is enabled." - RETVAL=0 - else - echo $"Denyhosts is disabled." - RETVAL=3 - fi + status ;; *) echo $"Usage: $0 {start|stop|status|restart|reload|force-reload|condrestart}" Index: denyhosts.spec =================================================================== RCS file: /cvs/extras/rpms/denyhosts/devel/denyhosts.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- denyhosts.spec 13 Aug 2005 20:28:27 -0000 1.7 +++ denyhosts.spec 15 Aug 2005 16:21:11 -0000 1.8 @@ -1,6 +1,6 @@ Name: denyhosts Version: 0.9.9 -Release: 0%{?dist} +Release: 1%{?dist} Summary: A script to help thwart ssh server attacks Group: Applications/System @@ -10,7 +10,8 @@ Source1: denyhosts.cron Source2: denyhosts.init Source3: denyhosts-allowed-hosts -Source4: README.fedora +Source4: denyhosts.sysconfig +Source5: README.fedora Patch0: denyhosts-0.8.0-config.patch Patch1: denyhosts-0.9.8-setup.patch Patch2: denyhosts-0.9.8-daemon-control.patch @@ -35,7 +36,7 @@ %patch1 -p0 %patch2 -p0 -cp %{SOURCE4} . +cp %{SOURCE5} . %build @@ -46,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT python ./setup.py install --root=$RPM_BUILD_ROOT --record=%{name}.files +install -d $RPM_BUILD_ROOT${_bindir} +install -p -m 755 daemon-control-dist $RPM_BUILD_ROOT%{_bindir}/denyhosts-control + install -d $RPM_BUILD_ROOT%{_initrddir} install -d $RPM_BUILD_ROOT%{_sysconfdir}/cron.d @@ -99,9 +103,12 @@ %dir %{_localstatedir}/lib/denyhosts %{_initrddir}/denyhosts - +%{_bindir}/denyhosts-control %changelog +* Sun Aug 14 2005 Jason L Tibbitts III - 0.9.9 +- Framework for enabling daemon mode. + * Sat Aug 13 2005 Jason L Tibbitts III - 0.9.9-0 - Update to 0.9.9 From fedora-extras-commits at redhat.com Mon Aug 15 16:22:59 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 15 Aug 2005 12:22:59 -0400 Subject: extras-buildsys ChangeLog, 1.97.2.2, 1.97.2.3 plague.spec, 1.24, 1.24.2.1 Message-ID: <200508151622.j7FGMxkp023545@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23526 Modified Files: Tag: STABLE_0_3 ChangeLog plague.spec Log Message: 2005-08-11 Dan Williams * Tag plague-0_3_2_RELEASE Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.97.2.2 retrieving revision 1.97.2.3 diff -u -r1.97.2.2 -r1.97.2.3 --- ChangeLog 15 Aug 2005 14:33:04 -0000 1.97.2.2 +++ ChangeLog 15 Aug 2005 16:22:57 -0000 1.97.2.3 @@ -1,3 +1,7 @@ +2005-08-11 Dan Williams + + * Tag plague-0_3_2_RELEASE + 2005-08-15 Dan Williams * client/client.py Index: plague.spec =================================================================== RCS file: /cvs/fedora/extras-buildsys/plague.spec,v retrieving revision 1.24 retrieving revision 1.24.2.1 diff -u -r1.24 -r1.24.2.1 --- plague.spec 11 Aug 2005 19:32:32 -0000 1.24 +++ plague.spec 15 Aug 2005 16:22:57 -0000 1.24.2.1 @@ -2,7 +2,7 @@ Summary: Distributed build system for RPMs Name: plague -Version: 0.3.1 +Version: 0.3.2 Release: 1 License: GPL Group: Development/Tools @@ -146,6 +146,11 @@ %changelog +* Mon Aug 15 2005 Dan Williams 0.3.2-1 +- Version 0.3.2 + o Fix errors in enqueue and enqueue_srpm return values + o Implement client/server API versioning + * Thu Aug 11 2005 Dan Williams 0.3.1-1 - Version 0.3.1 o Clean up web interface error handling, catches more errors From fedora-extras-commits at redhat.com Mon Aug 15 16:25:53 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 15 Aug 2005 12:25:53 -0400 Subject: rpms/plague/devel .cvsignore, 1.2, 1.3 plague.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200508151625.j7FGPrKI023598@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/extras/rpms/plague/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23577 Modified Files: .cvsignore plague.spec sources Log Message: * Mon Aug 15 2005 Dan Williams 0.3.2-1 - Version 0.3.2 o Fix errors in enqueue and enqueue_srpm return values o Implement client/server API versioning Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/plague/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 11 Aug 2005 19:53:04 -0000 1.2 +++ .cvsignore 15 Aug 2005 16:25:51 -0000 1.3 @@ -1 +1,2 @@ plague-0.3.1.tar.bz2 +plague-0.3.2.tar.bz2 Index: plague.spec =================================================================== RCS file: /cvs/extras/rpms/plague/devel/plague.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- plague.spec 15 Aug 2005 03:33:21 -0000 1.2 +++ plague.spec 15 Aug 2005 16:25:51 -0000 1.3 @@ -2,8 +2,8 @@ Summary: Distributed build system for RPMs Name: plague -Version: 0.3.1 -Release: 2 +Version: 0.3.2 +Release: 1 License: GPL Group: Development/Tools Source: http://people.redhat.com/dcbw/plague/%{name}-%{version}.tar.bz2 @@ -16,8 +16,6 @@ Requires(preun): /sbin/chkconfig Requires(preun): /sbin/service -Patch0: plague-0.3.1-match-enqueue-return-args.patch - %description The Plague build system is a client/server distributed build system for building RPM packages. This package provides the plague server. @@ -68,8 +66,6 @@ %prep %setup -q -%patch0 -p1 -b .enqueue-fix - %build make @@ -150,9 +146,10 @@ %changelog -* Sun Aug 14 2005 Dan Williams 0.3.1-2 -- Match return arguments for enqueue and enqueue_srpm so that errors are - properly returned +* Mon Aug 15 2005 Dan Williams 0.3.2-1 +- Version 0.3.2 + o Fix errors in enqueue and enqueue_srpm return values + o Implement client/server API versioning * Thu Aug 11 2005 Dan Williams 0.3.1-1 - Version 0.3.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/plague/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 11 Aug 2005 19:53:04 -0000 1.2 +++ sources 15 Aug 2005 16:25:51 -0000 1.3 @@ -1 +1 @@ -073067b72452dae4473ed7ff50384ed7 plague-0.3.1.tar.bz2 +293d5d5b92b5a2742c51ecece3201987 plague-0.3.2.tar.bz2 From fedora-extras-commits at redhat.com Mon Aug 15 16:26:33 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 15 Aug 2005 12:26:33 -0400 Subject: rpms/plague/devel plague-0.3.1-match-enqueue-return-args.patch, 1.1, NONE Message-ID: <200508151626.j7FGQXw3023654@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/extras/rpms/plague/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23639 Removed Files: plague-0.3.1-match-enqueue-return-args.patch Log Message: Remove upstreamed patch --- plague-0.3.1-match-enqueue-return-args.patch DELETED --- From fedora-extras-commits at redhat.com Mon Aug 15 17:11:18 2005 From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith)) Date: Mon, 15 Aug 2005 13:11:18 -0400 Subject: CVSROOT avail,1.9,1.10 Message-ID: <200508151711.j7FHBIwd025182@cvs-int.fedora.redhat.com> Author: sopwith Update of /cvs/fedora/CVSROOT In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25165 Modified Files: avail Log Message: Add pfrields Index: avail =================================================================== RCS file: /cvs/fedora/CVSROOT/avail,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- avail 12 Jul 2005 22:58:51 -0000 1.9 +++ avail 15 Aug 2005 17:11:15 -0000 1.10 @@ -32,7 +32,7 @@ avail | llch | web/html/projects/i18n avail | sarahs | web/html/projects/translations avail | harald | web/html/projects/config-tools -avail | kwade | web/html/docs +avail | kwade,pfrields | web/html/docs avail | sarahs | web/html/participate/translation-faq avail | sarahs | web/html/participate/translation-guide avail | sarahs | web/html/participate/translation-windows From fedora-extras-commits at redhat.com Mon Aug 15 18:18:06 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Mon, 15 Aug 2005 14:18:06 -0400 Subject: rpms/skencil/FC-4 .cvsignore, 1.2, 1.3 skencil.spec, 1.7, 1.8 sources, 1.2, 1.3 Message-ID: <200508151818.j7FII6WY026612@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/skencil/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26591 Modified Files: .cvsignore skencil.spec sources Log Message: new version 0.6.17 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/skencil/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 22 Feb 2005 22:18:22 -0000 1.2 +++ .cvsignore 15 Aug 2005 18:18:04 -0000 1.3 @@ -1 +1 @@ -skencil-0.6.16.tar.gz +skencil-0.6.17.tar.gz Index: skencil.spec =================================================================== RCS file: /cvs/extras/rpms/skencil/FC-4/skencil.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- skencil.spec 26 May 2005 19:08:03 -0000 1.7 +++ skencil.spec 15 Aug 2005 18:18:04 -0000 1.8 @@ -1,15 +1,15 @@ Name: skencil -Version: 0.6.16 -Release: 6 +Version: 0.6.17 +Release: 1%{?dist} Summary: Vector drawing program Group: Applications/Multimedia License: LGPL, GPL, Historical Permission Notice and Disclaimer URL: http://www.skencil.org -Source0: http://dl.sf.net/sketch/skencil-0.6.16.tar.gz +Source0: http://dl.sf.net/sketch/skencil-0.6.17.tar.gz Source1: skencil-logo.png -Patch0: skencil-python2.4.patch +#Patch0: skencil-python2.4.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel, python-imaging-devel, PyXML @@ -31,7 +31,7 @@ %setup -q grep -rl lib/ . | xargs perl -pi -e's,lib/,%{_lib}/,g' grep -rl lib\' . | xargs perl -pi -es,lib\',%{_lib}\',g -%patch0 -p0 -b .python24 +#%patch0 -p0 -b .python24 %build find $ -name \*.sk -or -name \*.ppm -or -name \*.jpg $ -exec chmod 644 \{\} \; @@ -104,6 +104,10 @@ %changelog +* Mon Aug 15 2005 Gerard Milmeister - 0.6.17 +- New Version 0.6.17 +- patch no longer necessary + * Thu May 26 2005 Jeremy Katz - 0.6.16-6 - add patch from upstream bug 10345 to fix build with python2.4 (#158408) Index: sources =================================================================== RCS file: /cvs/extras/rpms/skencil/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 22 Feb 2005 22:18:22 -0000 1.2 +++ sources 15 Aug 2005 18:18:04 -0000 1.3 @@ -1 +1 @@ -22db4f78151629df428c387e035fdad2 skencil-0.6.16.tar.gz +03f0a57cf623bcd657a4b8887d3ebe0b skencil-0.6.17.tar.gz From fedora-extras-commits at redhat.com Mon Aug 15 18:20:29 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Mon, 15 Aug 2005 14:20:29 -0400 Subject: rpms/skencil/FC-4 skencil.spec,1.8,1.9 Message-ID: <200508151820.j7FIKTBa026745@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/skencil/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26728 Modified Files: skencil.spec Log Message: Index: skencil.spec =================================================================== RCS file: /cvs/extras/rpms/skencil/FC-4/skencil.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- skencil.spec 15 Aug 2005 18:18:04 -0000 1.8 +++ skencil.spec 15 Aug 2005 18:20:27 -0000 1.9 @@ -1,6 +1,6 @@ Name: skencil Version: 0.6.17 -Release: 1%{?dist} +Release: 3%{?dist} Summary: Vector drawing program @@ -9,7 +9,6 @@ URL: http://www.skencil.org Source0: http://dl.sf.net/sketch/skencil-0.6.17.tar.gz Source1: skencil-logo.png -#Patch0: skencil-python2.4.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel, python-imaging-devel, PyXML @@ -31,7 +30,6 @@ %setup -q grep -rl lib/ . | xargs perl -pi -e's,lib/,%{_lib}/,g' grep -rl lib\' . | xargs perl -pi -es,lib\',%{_lib}\',g -#%patch0 -p0 -b .python24 %build find $ -name \*.sk -or -name \*.ppm -or -name \*.jpg $ -exec chmod 644 \{\} \; From fedora-extras-commits at redhat.com Mon Aug 15 18:21:45 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Mon, 15 Aug 2005 14:21:45 -0400 Subject: rpms/skencil/devel skencil.spec,1.7,1.8 sources,1.2,1.3 Message-ID: <200508151821.j7FILkiK026837@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/skencil/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26821 Modified Files: skencil.spec sources Log Message: new version 0.6.17 Index: skencil.spec =================================================================== RCS file: /cvs/extras/rpms/skencil/devel/skencil.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- skencil.spec 26 May 2005 19:08:03 -0000 1.7 +++ skencil.spec 15 Aug 2005 18:21:41 -0000 1.8 @@ -1,15 +1,14 @@ Name: skencil -Version: 0.6.16 -Release: 6 +Version: 0.6.17 +Release: 4%{?dist} Summary: Vector drawing program Group: Applications/Multimedia License: LGPL, GPL, Historical Permission Notice and Disclaimer URL: http://www.skencil.org -Source0: http://dl.sf.net/sketch/skencil-0.6.16.tar.gz +Source0: http://dl.sf.net/sketch/skencil-0.6.17.tar.gz Source1: skencil-logo.png -Patch0: skencil-python2.4.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel, python-imaging-devel, PyXML @@ -31,7 +30,6 @@ %setup -q grep -rl lib/ . | xargs perl -pi -e's,lib/,%{_lib}/,g' grep -rl lib\' . | xargs perl -pi -es,lib\',%{_lib}\',g -%patch0 -p0 -b .python24 %build find $ -name \*.sk -or -name \*.ppm -or -name \*.jpg $ -exec chmod 644 \{\} \; @@ -104,6 +102,10 @@ %changelog +* Mon Aug 15 2005 Gerard Milmeister - 0.6.17 +- New Version 0.6.17 +- patch no longer necessary + * Thu May 26 2005 Jeremy Katz - 0.6.16-6 - add patch from upstream bug 10345 to fix build with python2.4 (#158408) Index: sources =================================================================== RCS file: /cvs/extras/rpms/skencil/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 22 Feb 2005 22:18:22 -0000 1.2 +++ sources 15 Aug 2005 18:21:41 -0000 1.3 @@ -1 +1 @@ -22db4f78151629df428c387e035fdad2 skencil-0.6.16.tar.gz +03f0a57cf623bcd657a4b8887d3ebe0b skencil-0.6.17.tar.gz From fedora-extras-commits at redhat.com Mon Aug 15 19:21:52 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 15 Aug 2005 15:21:52 -0400 Subject: rpms/plague/devel plague.spec,1.3,1.4 Message-ID: <200508151921.j7FJLqV0028433@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/extras/rpms/plague/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28416 Modified Files: plague.spec Log Message: * Mon Aug 15 2005 Dan Williams 0.3.2-2 - Append %{?dist} to Releases to get correct precedence on FC3, FC4, and Rawhide Index: plague.spec =================================================================== RCS file: /cvs/extras/rpms/plague/devel/plague.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- plague.spec 15 Aug 2005 16:25:51 -0000 1.3 +++ plague.spec 15 Aug 2005 19:21:50 -0000 1.4 @@ -3,7 +3,7 @@ Summary: Distributed build system for RPMs Name: plague Version: 0.3.2 -Release: 1 +Release: 2%{?dist} License: GPL Group: Development/Tools Source: http://people.redhat.com/dcbw/plague/%{name}-%{version}.tar.bz2 @@ -146,6 +146,9 @@ %changelog +* Mon Aug 15 2005 Dan Williams 0.3.2-2 +- Append %{?dist} to Releases to get correct precedence on FC3, FC4, and Rawhide + * Mon Aug 15 2005 Dan Williams 0.3.2-1 - Version 0.3.2 o Fix errors in enqueue and enqueue_srpm return values From fedora-extras-commits at redhat.com Mon Aug 15 19:22:07 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 15 Aug 2005 15:22:07 -0400 Subject: rpms/plague/FC-4 plague.spec,1.3,1.4 Message-ID: <200508151922.j7FJM7wU028464@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/extras/rpms/plague/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28447 Modified Files: plague.spec Log Message: * Mon Aug 15 2005 Dan Williams 0.3.2-2 - Append %{?dist} to Releases to get correct precedence on FC3, FC4, and Rawhide Index: plague.spec =================================================================== RCS file: /cvs/extras/rpms/plague/FC-4/plague.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- plague.spec 15 Aug 2005 16:25:51 -0000 1.3 +++ plague.spec 15 Aug 2005 19:22:05 -0000 1.4 @@ -3,7 +3,7 @@ Summary: Distributed build system for RPMs Name: plague Version: 0.3.2 -Release: 1 +Release: 2%{?dist} License: GPL Group: Development/Tools Source: http://people.redhat.com/dcbw/plague/%{name}-%{version}.tar.bz2 @@ -146,6 +146,9 @@ %changelog +* Mon Aug 15 2005 Dan Williams 0.3.2-2 +- Append %{?dist} to Releases to get correct precedence on FC3, FC4, and Rawhide + * Mon Aug 15 2005 Dan Williams 0.3.2-1 - Version 0.3.2 o Fix errors in enqueue and enqueue_srpm return values From fedora-extras-commits at redhat.com Mon Aug 15 19:22:25 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 15 Aug 2005 15:22:25 -0400 Subject: rpms/plague/FC-3 plague.spec,1.3,1.4 Message-ID: <200508151922.j7FJMPVE028494@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/extras/rpms/plague/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28475 Modified Files: plague.spec Log Message: * Mon Aug 15 2005 Dan Williams 0.3.2-2 - Append %{?dist} to Releases to get correct precedence on FC3, FC4, and Rawhide Index: plague.spec =================================================================== RCS file: /cvs/extras/rpms/plague/FC-3/plague.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- plague.spec 15 Aug 2005 16:25:51 -0000 1.3 +++ plague.spec 15 Aug 2005 19:22:23 -0000 1.4 @@ -3,7 +3,7 @@ Summary: Distributed build system for RPMs Name: plague Version: 0.3.2 -Release: 1 +Release: 2%{?dist} License: GPL Group: Development/Tools Source: http://people.redhat.com/dcbw/plague/%{name}-%{version}.tar.bz2 @@ -146,6 +146,9 @@ %changelog +* Mon Aug 15 2005 Dan Williams 0.3.2-2 +- Append %{?dist} to Releases to get correct precedence on FC3, FC4, and Rawhide + * Mon Aug 15 2005 Dan Williams 0.3.2-1 - Version 0.3.2 o Fix errors in enqueue and enqueue_srpm return values From fedora-extras-commits at redhat.com Mon Aug 15 19:33:04 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Mon, 15 Aug 2005 15:33:04 -0400 Subject: rpms/gramps/devel .cvsignore, 1.9, 1.10 gramps.spec, 1.9, 1.10 sources, 1.9, 1.10 Message-ID: <200508151933.j7FJX4pW028744@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/gramps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28723 Modified Files: .cvsignore gramps.spec sources Log Message: * Mon Aug 15 2005 Brian Pepple - 2.0.6-2 - Update to 2.0.6. - Bump minimum ver for python. - Add requires for python-reportlab & graphviz for reports. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gramps/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 6 Jul 2005 22:30:33 -0000 1.9 +++ .cvsignore 15 Aug 2005 19:33:02 -0000 1.10 @@ -1 +1 @@ -gramps-2.0.5.tar.gz +gramps-2.0.6.tar.gz Index: gramps.spec =================================================================== RCS file: /cvs/extras/rpms/gramps/devel/gramps.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- gramps.spec 6 Jul 2005 22:30:33 -0000 1.9 +++ gramps.spec 15 Aug 2005 19:33:02 -0000 1.10 @@ -1,7 +1,6 @@ Name: gramps -Version: 2.0.5 -Release: 1%{?dist} - +Version: 2.0.6 +Release: 2%{?dist} Summary: Genealogical Research and Analysis Management Programming System Group: Applications/Productivity @@ -19,7 +18,7 @@ BuildRequires: gnome-vfs2-devel BuildRequires: pygtk2 BuildRequires: pygtk2-libglade -BuildRequires: python-devel >= 2.2 +BuildRequires: python-devel >= 2.3 BuildRequires: scrollkeeper BuildRequires: GConf2 @@ -30,8 +29,10 @@ Requires: ImageMagick Requires: pygtk2 Requires: pygtk2-libglade -Requires: python >= 2.2 +Requires: python >= 2.3 Requires: rcs +Requires: python-reportlab +Requires: graphviz Requires(post): scrollkeeper Requires(post): GConf2 Requires(postun): scrollkeeper @@ -77,8 +78,8 @@ %post -GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` \ - gconftool-2 --makefile-install-rule \ +GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` \ + gconftool-2 --makefile-install-rule \ %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null update-desktop-database %{_datadir}/applications &> /dev/null update-mime-database %{_datadir}/mime &> /dev/null @@ -111,6 +112,11 @@ %changelog +* Mon Aug 15 2005 Brian Pepple - 2.0.6-2 +- Update to 2.0.6. +- Bump minimum ver for python. +- Add requires for python-reportlab & graphviz for reports. + * Wed Jul 6 2005 Brian Pepple - 2.0.5-1 - Update to 2.0.5. Index: sources =================================================================== RCS file: /cvs/extras/rpms/gramps/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 6 Jul 2005 22:30:33 -0000 1.9 +++ sources 15 Aug 2005 19:33:02 -0000 1.10 @@ -1 +1 @@ -87e6ad11f18a83dcd91fb12b947b2cc0 gramps-2.0.5.tar.gz +1df757d3a5269767e705857034068805 gramps-2.0.6.tar.gz From fedora-extras-commits at redhat.com Mon Aug 15 19:34:33 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Mon, 15 Aug 2005 15:34:33 -0400 Subject: rpms/gramps/FC-4 .cvsignore, 1.9, 1.10 gramps.spec, 1.9, 1.10 sources, 1.9, 1.10 Message-ID: <200508151934.j7FJYXZR028824@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/gramps/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28803 Modified Files: .cvsignore gramps.spec sources Log Message: * Mon Aug 15 2005 Brian Pepple - 2.0.6-1 - Update to 2.0.6. - Bump minimum ver for python. - Add requires for python-reportlab & graphviz for reports. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gramps/FC-4/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 6 Jul 2005 22:33:00 -0000 1.9 +++ .cvsignore 15 Aug 2005 19:34:31 -0000 1.10 @@ -1 +1 @@ -gramps-2.0.5.tar.gz +gramps-2.0.6.tar.gz Index: gramps.spec =================================================================== RCS file: /cvs/extras/rpms/gramps/FC-4/gramps.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- gramps.spec 6 Jul 2005 22:33:00 -0000 1.9 +++ gramps.spec 15 Aug 2005 19:34:31 -0000 1.10 @@ -1,7 +1,6 @@ Name: gramps -Version: 2.0.5 +Version: 2.0.6 Release: 1%{?dist} - Summary: Genealogical Research and Analysis Management Programming System Group: Applications/Productivity @@ -19,7 +18,7 @@ BuildRequires: gnome-vfs2-devel BuildRequires: pygtk2 BuildRequires: pygtk2-libglade -BuildRequires: python-devel >= 2.2 +BuildRequires: python-devel >= 2.3 BuildRequires: scrollkeeper BuildRequires: GConf2 @@ -30,8 +29,10 @@ Requires: ImageMagick Requires: pygtk2 Requires: pygtk2-libglade -Requires: python >= 2.2 +Requires: python >= 2.3 Requires: rcs +Requires: python-reportlab +Requires: graphviz Requires(post): scrollkeeper Requires(post): GConf2 Requires(postun): scrollkeeper @@ -77,8 +78,8 @@ %post -GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` \ - gconftool-2 --makefile-install-rule \ +GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` \ + gconftool-2 --makefile-install-rule \ %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null update-desktop-database %{_datadir}/applications &> /dev/null update-mime-database %{_datadir}/mime &> /dev/null @@ -111,6 +112,11 @@ %changelog +* Mon Aug 15 2005 Brian Pepple - 2.0.6-1 +- Update to 2.0.6. +- Bump minimum ver for python. +- Add requires for python-reportlab & graphviz for reports. + * Wed Jul 6 2005 Brian Pepple - 2.0.5-1 - Update to 2.0.5. Index: sources =================================================================== RCS file: /cvs/extras/rpms/gramps/FC-4/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 6 Jul 2005 22:33:00 -0000 1.9 +++ sources 15 Aug 2005 19:34:31 -0000 1.10 @@ -1 +1 @@ -87e6ad11f18a83dcd91fb12b947b2cc0 gramps-2.0.5.tar.gz +1df757d3a5269767e705857034068805 gramps-2.0.6.tar.gz From fedora-extras-commits at redhat.com Mon Aug 15 19:42:28 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 15 Aug 2005 15:42:28 -0400 Subject: extras-buildsys ChangeLog,1.100,1.101 plague.spec,1.24,1.25 Message-ID: <200508151942.j7FJgSo1029080@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29049 Modified Files: ChangeLog plague.spec Log Message: 2005-08-15 Dan Williams * server/BuildMaster.py - Clear out old job info when requeueing a job Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.100 retrieving revision 1.101 diff -u -r1.100 -r1.101 --- ChangeLog 15 Aug 2005 16:00:07 -0000 1.100 +++ ChangeLog 15 Aug 2005 19:42:26 -0000 1.101 @@ -1,5 +1,10 @@ 2005-08-15 Dan Williams + * server/BuildMaster.py + - Clear out old job info when requeueing a job + +2005-08-15 Dan Williams + * server/ArchJob.py server/PackageJob.py - Let "scratch" target jobs continue building even if one or more arches Index: plague.spec =================================================================== RCS file: /cvs/fedora/extras-buildsys/plague.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- plague.spec 11 Aug 2005 19:32:32 -0000 1.24 +++ plague.spec 15 Aug 2005 19:42:26 -0000 1.25 @@ -2,8 +2,8 @@ Summary: Distributed build system for RPMs Name: plague -Version: 0.3.1 -Release: 1 +Version: 0.4 +Release: 1%{?dist} License: GPL Group: Development/Tools Source: http://people.redhat.com/dcbw/plague/%{name}-%{version}.tar.bz2 From fedora-extras-commits at redhat.com Mon Aug 15 19:42:29 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 15 Aug 2005 15:42:29 -0400 Subject: extras-buildsys/server BuildMaster.py,1.31,1.32 Message-ID: <200508151942.j7FJgTKI029086@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29049/server Modified Files: BuildMaster.py Log Message: 2005-08-15 Dan Williams * server/BuildMaster.py - Clear out old job info when requeueing a job Index: BuildMaster.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/BuildMaster.py,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- BuildMaster.py 15 Aug 2005 03:18:20 -0000 1.31 +++ BuildMaster.py 15 Aug 2005 19:42:26 -0000 1.32 @@ -189,6 +189,11 @@ self.curs.execute('DELETE FROM archjobs WHERE parent_uid=%d' % uid) self.dbcx.commit() + # Clear out old time/result information + self.curs.execute('UPDATE jobs SET starttime=%d, endtime=0, ' \ + 'result_msg="" WHERE uid=%d' % (time.time(), uid)) + self.dbcx.commit() + # Now requeue the job try: repo = self._repos[row['target']] From fedora-extras-commits at redhat.com Mon Aug 15 19:42:12 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 15 Aug 2005 15:42:12 -0400 Subject: extras-buildsys ChangeLog, 1.97.2.3, 1.97.2.4 plague.spec, 1.24.2.1, 1.24.2.2 Message-ID: <200508151942.j7FJggoQ029090@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29013 Modified Files: Tag: STABLE_0_3 ChangeLog plague.spec Log Message: 2005-08-15 Dan Williams * server/BuildMaster.py - Clear out old job info when requeueing a job Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.97.2.3 retrieving revision 1.97.2.4 diff -u -r1.97.2.3 -r1.97.2.4 --- ChangeLog 15 Aug 2005 16:22:57 -0000 1.97.2.3 +++ ChangeLog 15 Aug 2005 19:42:10 -0000 1.97.2.4 @@ -1,4 +1,9 @@ -2005-08-11 Dan Williams +2005-08-15 Dan Williams + + * server/BuildMaster.py + - Clear out old job info when requeueing a job + +2005-08-15 Dan Williams * Tag plague-0_3_2_RELEASE Index: plague.spec =================================================================== RCS file: /cvs/fedora/extras-buildsys/plague.spec,v retrieving revision 1.24.2.1 retrieving revision 1.24.2.2 diff -u -r1.24.2.1 -r1.24.2.2 --- plague.spec 15 Aug 2005 16:22:57 -0000 1.24.2.1 +++ plague.spec 15 Aug 2005 19:42:10 -0000 1.24.2.2 @@ -3,7 +3,7 @@ Summary: Distributed build system for RPMs Name: plague Version: 0.3.2 -Release: 1 +Release: 3%{?dist} License: GPL Group: Development/Tools Source: http://people.redhat.com/dcbw/plague/%{name}-%{version}.tar.bz2 @@ -146,6 +146,12 @@ %changelog +* Mon Aug 15 2005 Dan Williams 0.3.2-3 +- Clear out old job info when requeueing jobs + +* Mon Aug 15 2005 Dan Williams 0.3.2-2 +- Append %{?dist} to Releases to get correct precedence on FC3, FC4, and Rawhide + * Mon Aug 15 2005 Dan Williams 0.3.2-1 - Version 0.3.2 o Fix errors in enqueue and enqueue_srpm return values From fedora-extras-commits at redhat.com Mon Aug 15 19:42:13 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 15 Aug 2005 15:42:13 -0400 Subject: extras-buildsys/server BuildMaster.py,1.30,1.30.2.1 Message-ID: <200508151942.j7FJghYL029093@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29013/server Modified Files: Tag: STABLE_0_3 BuildMaster.py Log Message: 2005-08-15 Dan Williams * server/BuildMaster.py - Clear out old job info when requeueing a job Index: BuildMaster.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/BuildMaster.py,v retrieving revision 1.30 retrieving revision 1.30.2.1 diff -u -r1.30 -r1.30.2.1 --- BuildMaster.py 8 Aug 2005 02:54:16 -0000 1.30 +++ BuildMaster.py 15 Aug 2005 19:42:11 -0000 1.30.2.1 @@ -190,6 +190,11 @@ self.curs.execute('DELETE FROM archjobs WHERE parent_uid=%d' % uid) self.dbcx.commit() + # Clear out old time/result information + self.curs.execute('UPDATE jobs SET starttime=%d, endtime=0, ' \ + 'result_msg="" WHERE uid=%d' % (time.time(), uid)) + self.dbcx.commit() + # Now requeue the job try: repo = self.repos[row['target']] From fedora-extras-commits at redhat.com Mon Aug 15 19:43:46 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 15 Aug 2005 15:43:46 -0400 Subject: rpms/abicheck/devel abicheck-1.2-fortify-source-fc5.patch, NONE, 1.1 abicheck-1.2-libgcc.patch, NONE, 1.1 abicheck.spec, 1.13, 1.14 abicheck.dbfile.FORTIFY_SOURCE, 1.2, NONE Message-ID: <200508151943.j7FJhkhA029141@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/abicheck/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29118 Modified Files: abicheck.spec Added Files: abicheck-1.2-fortify-source-fc5.patch abicheck-1.2-libgcc.patch Removed Files: abicheck.dbfile.FORTIFY_SOURCE Log Message: Some more glibc updates. abicheck-1.2-fortify-source-fc5.patch: --- NEW FILE abicheck-1.2-fortify-source-fc5.patch --- diff -Nur abicheck-1.2-orig/abicheck.pl abicheck-1.2/abicheck.pl --- abicheck-1.2-orig/abicheck.pl 2003-08-26 21:57:51.000000000 +0200 +++ abicheck-1.2/abicheck.pl 2005-08-15 20:54:04.000000000 +0200 @@ -3538,5 +3538,79 @@ libnsl.so.1:readColdStartFile libnsl.so.1:writeColdStartFile ); + + # + # These are _FORTIFY_SOURCE symbols. + # + push(@{$public}, qw( + libc.so.6:__chk_fail + libc.so.6:__confstr_chk + libc.so.6:__fgets_chk + libc.so.6:__fgets_unlocked_chk + libc.so.6:__fgetws_chk + libc.so.6:__fgetws_unlocked_chk + libc.so.6:__fprintf_chk + libc.so.6:__fwprintf_chk + libc.so.6:__getcwd_chk + libc.so.6:__getdomainname_chk + libc.so.6:__getgroups_chk + libc.so.6:__gethostname_chk + libc.so.6:__getlogin_r_chk + libc.so.6:__gets_chk + libc.so.6:__getwd_chk + libc.so.6:__mbsnrtowcs_chk + libc.so.6:__mbsrtowcs_chk + libc.so.6:__mbstowcs_chk + libc.so.6:__memcpy_chk + libc.so.6:__memmove_chk + libc.so.6:__mempcpy_chk + libc.so.6:__memset_chk + libc.so.6:__pread64_chk + libc.so.6:__pread_chk + libc.so.6:__printf_chk + libc.so.6:__ptsname_r_chk + libc.so.6:__read_chk + libc.so.6:__readlink_chk + libc.so.6:__realpath_chk + libc.so.6:__recv_chk + libc.so.6:__recvfrom_chk + libc.so.6:__snprintf_chk + libc.so.6:__sprintf_chk + libc.so.6:__stack_chk_fail + libc.so.6:__stpcpy_chk + libc.so.6:__stpncpy_chk + libc.so.6:__strcat_chk + libc.so.6:__strcpy_chk + libc.so.6:__strncat_chk + libc.so.6:__strncpy_chk + libc.so.6:__swprintf_chk + libc.so.6:__syslog_chk + libc.so.6:__ttyname_r_chk + libc.so.6:__vfprintf_chk + libc.so.6:__vfwprintf_chk + libc.so.6:__vprintf_chk + libc.so.6:__vsnprintf_chk + libc.so.6:__vsprintf_chk + libc.so.6:__vswprintf_chk + libc.so.6:__vsyslog_chk + libc.so.6:__vwprintf_chk + libc.so.6:__wcpcpy_chk + libc.so.6:__wcpncpy_chk + libc.so.6:__wcrtomb_chk + libc.so.6:__wcscat_chk + libc.so.6:__wcscpy_chk + libc.so.6:__wcsncat_chk + libc.so.6:__wcsncpy_chk + libc.so.6:__wcsnrtombs_chk + libc.so.6:__wcsrtombs_chk + libc.so.6:__wcstombs_chk + libc.so.6:__wctomb_chk + libc.so.6:__wmemcpy_chk + libc.so.6:__wmemmove_chk + libc.so.6:__wmempcpy_chk + libc.so.6:__wmemset_chk + libc.so.6:__wprintf_chk + ) + ); } } abicheck-1.2-libgcc.patch: --- NEW FILE abicheck-1.2-libgcc.patch --- diff -Nur abicheck-1.2-orig/abicheck.pl abicheck-1.2/abicheck.pl --- abicheck-1.2-orig/abicheck.pl 2003-08-26 21:57:51.000000000 +0200 +++ abicheck-1.2/abicheck.pl 2005-08-15 21:10:15.000000000 +0200 @@ -3498,6 +3498,19 @@ libc.so.6:__ctype_b_loc libc.so.6:__ctype_tolower_loc libc.so.6:__ctype_toupper_loc + + libgcc_s.so.1:__divdi3 + libgcc_s.so.1:__register_frame + libgcc_s.so.1:__frame_state_for + libgcc_s.so.1:__umoddi3 + libgcc_s.so.1:__udivdi3 + libgcc_s.so.1:__register_frame_table + libgcc_s.so.1:__deregister_frame_info + libgcc_s.so.1:__deregister_frame + libgcc_s.so.1:__cxa_finalize + libgcc_s.so.1:__moddi3 + libgcc_s.so.1:__register_frame_info_table + libgcc_s.so.1:__register_frame_info ); @{$private} = qw( Index: abicheck.spec =================================================================== RCS file: /cvs/extras/rpms/abicheck/devel/abicheck.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- abicheck.spec 15 Aug 2005 01:30:59 -0000 1.13 +++ abicheck.spec 15 Aug 2005 19:43:44 -0000 1.14 @@ -8,10 +8,11 @@ Group: Applications/File URL: http://abicheck.sourceforge.net/ Source0: http://dl.sf.net/abicheck/%{name}-%{version}.tar.gz -Source1: abicheck.dbfile.FORTIFY_SOURCE Patch0: abicheck-1.2-fc3.patch Patch1: abicheck-1.2-test-static.patch Patch2: abicheck-1.2-bindings-fc4.patch +Patch3: abicheck-1.2-libgcc.patch +Patch4: abicheck-1.2-fortify-source-fc5.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot Requires: binutils perl @@ -27,6 +28,8 @@ %patch -p1 -b .fc3 %patch1 -p1 -b .test-static %patch2 -p1 -b .bindings-fc4 +%patch3 -p1 -b .libgcc +%patch4 -p1 -b .fortify-source-fc5 sed -i -e 's!/usr/lib/!%{_libdir}/!g' test/Makefile @@ -40,7 +43,6 @@ mkdir -p $RPM_BUILD_ROOT%{_bindir} $RPM_BUILD_ROOT%{_mandir}/man1 install -p -m 0755 abicheck $RPM_BUILD_ROOT%{_bindir} install -p -m 0644 abicheck.1 $RPM_BUILD_ROOT%{_mandir}/man1 -install -p -m 0644 %{SOURCE1} dbfile.FORTIFY_SOURCE %clean @@ -50,12 +52,16 @@ %files %defattr(-,root,root,-) %doc COPYING ChangeLog INTRO README -%doc dbfile.FORTIFY_SOURCE %{_bindir}/abicheck %{_mandir}/man1/abicheck.1* %changelog +* Mon Aug 15 2005 Michael Schwendt - 1.2-8 +- Add libgcc symbols. +- Add more _FORTIFY_SOURCE symbols. +- Override symbol classification by default. + * Thu Aug 11 2005 Michael Schwendt - 1.2-7 - Add an override file in %%doc which can be specified with option -O to modify the symbol classification for binaries --- abicheck.dbfile.FORTIFY_SOURCE DELETED --- From fedora-extras-commits at redhat.com Mon Aug 15 20:06:23 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 15 Aug 2005 16:06:23 -0400 Subject: rpms/abicheck/devel abicheck.spec,1.14,1.15 Message-ID: <200508152006.j7FK6sXG030436@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/abicheck/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30413 Modified Files: abicheck.spec Log Message: -7 succeeded on ppc last night, -8 fails -- testing... Index: abicheck.spec =================================================================== RCS file: /cvs/extras/rpms/abicheck/devel/abicheck.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- abicheck.spec 15 Aug 2005 19:43:44 -0000 1.14 +++ abicheck.spec 15 Aug 2005 20:05:57 -0000 1.15 @@ -35,6 +35,7 @@ %build make +cd test ; make private1 ; ../abicheck ./private1 ; cd - make test From fedora-extras-commits at redhat.com Mon Aug 15 20:11:44 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 15 Aug 2005 16:11:44 -0400 Subject: rpms/dumpasn1 - New directory Message-ID: <200508152011.j7FKBimm030583@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/dumpasn1 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30563/dumpasn1 Log Message: Directory /cvs/extras/rpms/dumpasn1 added to the repository From fedora-extras-commits at redhat.com Mon Aug 15 20:11:44 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 15 Aug 2005 16:11:44 -0400 Subject: rpms/dumpasn1/devel - New directory Message-ID: <200508152011.j7FKBiLU030588@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/dumpasn1/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30563/dumpasn1/devel Log Message: Directory /cvs/extras/rpms/dumpasn1/devel added to the repository From fedora-extras-commits at redhat.com Mon Aug 15 20:12:05 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 15 Aug 2005 16:12:05 -0400 Subject: rpms/dumpasn1 Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200508152012.j7FKC5Rq030639@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/dumpasn1 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30608 Added Files: Makefile import.log Log Message: Setup of module dumpasn1 --- NEW FILE Makefile --- # Top level Makefile for module dumpasn1 all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Mon Aug 15 20:12:06 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 15 Aug 2005 16:12:06 -0400 Subject: rpms/dumpasn1/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200508152012.j7FKC6Lm030644@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/dumpasn1/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30608/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module dumpasn1 --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Mon Aug 15 20:12:58 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 15 Aug 2005 16:12:58 -0400 Subject: rpms/dumpasn1 import.log,1.1,1.2 Message-ID: <200508152013.j7FKDSLA030719@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/dumpasn1 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30682 Modified Files: import.log Log Message: auto-import dumpasn1-20050404-0.1 on branch devel from dumpasn1-20050404-0.1.src.rpm Initial import (#165497). Index: import.log =================================================================== RCS file: /cvs/extras/rpms/dumpasn1/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 15 Aug 2005 20:12:03 -0000 1.1 +++ import.log 15 Aug 2005 20:12:55 -0000 1.2 @@ -0,0 +1 @@ +dumpasn1-20050404-0_1:HEAD:dumpasn1-20050404-0.1.src.rpm:1124136755 From fedora-extras-commits at redhat.com Mon Aug 15 20:12:58 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 15 Aug 2005 16:12:58 -0400 Subject: rpms/dumpasn1/devel dumpasn1.c, NONE, 1.1 dumpasn1.cfg, NONE, 1.1 dumpasn1.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200508152012.j7FKCw7a030713@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/dumpasn1/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30682/devel Modified Files: .cvsignore sources Added Files: dumpasn1.c dumpasn1.cfg dumpasn1.spec Log Message: auto-import dumpasn1-20050404-0.1 on branch devel from dumpasn1-20050404-0.1.src.rpm Initial import (#165497). --- NEW FILE dumpasn1.c --- /* ASN.1 object dumping code, copyright Peter Gutmann , based on ASN.1 dump program by David Kemp , with contributions from various people including Matthew Hamrick , Bruno Couillard , Hallvard Furuseth , Geoff Thorpe , David Boyce , John Hughes , Life is hard, and then you die , Hans-Olof Hermansson , Tor Rustad , Kjetil Barvik , James Sweeny , Chris Ridd , and several other people whose names I've misplaced. This code grew slowly over time without much design or planning, with features being tacked on as required. It's not representative of my normal coding style. Available from http://www.cs.auckland.ac.nz/~pgut001/dumpasn1.c. Last updated 22 February 2003 (version 20030222, if you prefer it that way). To build under Windows, use 'cl /MD dumpasn1.c'. To build on OS390 or z/OS, use '/bin/c89 -D OS390 -o dumpasn1 dumpasn1.c'. This version of dumpasn1 requires a config file dumpasn1.cfg to be present in the same location as the program itself or in a standard directory where binaries live (it will run without it but will display a warning message, you can configure the path either by hardcoding it in or using an environment variable as explained further down). The config file is available from http://www.cs.auckland.ac.nz/~pgut001/dumpasn1.cfg. This code assumes that the input data is binary, having come from a MIME- aware mailer or been piped through a decoding utility if the original format used base64 encoding. If you need to decode it, it's recommended that you use a utility like uudeview, which will strip virtually any kind of encoding (MIME, PEM, PGP, whatever) to recover the binary original. You can use this code in whatever way you want, as long as you don't try to claim you wrote it. Editing notes: Tabs to 4, phasers to stun (and in case anyone wants to complain about that, see "Program Indentation and Comprehensiblity", Richard Miara, Joyce Musselman, Juan Navarro, and Ben Shneiderman, Communications of the ACM, Vol.26, No.11 (November 1983), p.861) */ #include #include #include #include #ifdef OS390 #include #endif /* OS390 */ /* The update string, printed as part of the help screen */ #define UPDATE_STRING "22 February 2003" /* Useful defines */ #ifndef TRUE #define FALSE 0 #define TRUE ( !FALSE ) #endif /* TRUE */ /* Tandem Guardian NonStop Kernel options */ #ifdef __TANDEM #pragma nolist /* Spare us the source listing, no GUI... */ #pragma nowarn (1506) /* Implicit type conversion: int to char etc */ #endif /* __TANDEM */ /* SunOS 4.x doesn't define seek codes or exit codes or FILENAME_MAX (it does define _POSIX_MAX_PATH, but in funny locations and to different values depending on which include file you use). Strictly speaking this code isn't right since we need to use PATH_MAX, however not all systems define this, some use _POSIX_PATH_MAX, and then there are all sorts of variations and other defines that you have to check, which require about a page of code to cover each OS, so we just use max( FILENAME_MAX, 512 ) which should work for everything */ #ifndef SEEK_SET #define SEEK_SET 0 #define SEEK_CUR 2 #endif /* No fseek() codes defined */ #ifndef EXIT_FAILURE #define EXIT_FAILURE 1 #define EXIT_SUCCESS ( !EXIT_FAILURE ) #endif /* No exit() codes defined */ #ifndef FILENAME_MAX #define FILENAME_MAX 512 #else #if FILENAME_MAX < 128 #undef FILENAME_MAX #define FILENAME_MAX 512 #endif /* FILENAME_MAX < 128 */ #endif /* FILENAME_MAX */ /* Under Windows we can do special-case handling for paths and Unicode strings (although in practice it can't really handle much except latin-1) */ #if ( defined( _WINDOWS ) || defined( WIN32 ) || defined( _WIN32 ) || \ defined( __WIN32__ ) ) #define __WIN32__ #endif /* Win32 */ /* Under Unix we can do special-case handling for paths and Unicode strings. Detecting Unix systems is a bit tricky but the following should find most versions. This define implicitly assumes that the system has wchar_t support, but this is almost always the case except for very old systems, so it's best to default to allow-all rather than deny-all */ #if defined( linux ) || defined( __linux__ ) || defined( sun ) || \ defined( __bsdi__ ) || defined( __FreeBSD__ ) || defined( __NetBSD__ ) || \ defined( __OpenBSD__ ) || defined( __hpux ) || defined( _M_XENIX ) || \ defined( __osf__ ) || defined( _AIX ) || defined( __MACH__ ) #define __UNIX__ #endif /* Every commonly-used Unix */ #if defined( linux ) || defined( __linux__ ) #define __USE_ISOC99 #include #endif /* Linux */ /* For IBM mainframe OSes we use the Posix environment, so it looks like Unix */ #ifdef OS390 #define __OS390__ #define __UNIX__ #endif /* OS390 / z/OS */ /* Tandem NSK: Don't tangle with Tandem OSS, which is almost UNIX */ #ifdef __TANDEM #ifdef _GUARDIAN_TARGET #define __TANDEM_NSK__ #else #define __UNIX__ #endif /* _GUARDIAN_TARGET */ #endif /* __TANDEM */ /* Some OS's don't define the min() macro */ #ifndef min #define min(a,b) ( ( a ) < ( b ) ? ( a ) : ( b ) ) #endif /* !min */ /* The level of recursion can get scary for deeply-nested structures so we use a larger-than-normal stack under DOS */ #ifdef __TURBOC__ extern unsigned _stklen = 16384; #endif /* __TURBOC__ */ /* When we dump a nested data object encapsulated within a larger object, the length is initially set to a magic value which is adjusted to the actual length once we start parsing the object */ #define LENGTH_MAGIC 177545L /* Tag classes */ #define CLASS_MASK 0xC0 /* Bits 8 and 7 */ #define UNIVERSAL 0x00 /* 0 = Universal (defined by ITU X.680) */ #define APPLICATION 0x40 /* 1 = Application */ #define CONTEXT 0x80 /* 2 = Context-specific */ #define PRIVATE 0xC0 /* 3 = Private */ /* Encoding type */ #define FORM_MASK 0x20 /* Bit 6 */ #define PRIMITIVE 0x00 /* 0 = primitive */ #define CONSTRUCTED 0x20 /* 1 = constructed */ /* Universal tags */ #define TAG_MASK 0x1F /* Bits 5 - 1 */ #define EOC 0x00 /* 0: End-of-contents octets */ #define BOOLEAN 0x01 /* 1: Boolean */ #define INTEGER 0x02 /* 2: Integer */ #define BITSTRING 0x03 /* 2: Bit string */ #define OCTETSTRING 0x04 /* 4: Byte string */ #define NULLTAG 0x05 /* 5: NULL */ #define OID 0x06 /* 6: Object Identifier */ #define OBJDESCRIPTOR 0x07 /* 7: Object Descriptor */ #define EXTERNAL 0x08 /* 8: External */ #define REAL 0x09 /* 9: Real */ #define ENUMERATED 0x0A /* 10: Enumerated */ #define EMBEDDED_PDV 0x0B /* 11: Embedded Presentation Data Value */ #define UTF8STRING 0x0C /* 12: UTF8 string */ #define SEQUENCE 0x10 /* 16: Sequence/sequence of */ #define SET 0x11 /* 17: Set/set of */ #define NUMERICSTRING 0x12 /* 18: Numeric string */ #define PRINTABLESTRING 0x13 /* 19: Printable string (ASCII subset) */ #define T61STRING 0x14 /* 20: T61/Teletex string */ #define VIDEOTEXSTRING 0x15 /* 21: Videotex string */ #define IA5STRING 0x16 /* 22: IA5/ASCII string */ #define UTCTIME 0x17 /* 23: UTC time */ #define GENERALIZEDTIME 0x18 /* 24: Generalized time */ #define GRAPHICSTRING 0x19 /* 25: Graphic string */ #define VISIBLESTRING 0x1A /* 26: Visible string (ASCII subset) */ #define GENERALSTRING 0x1B /* 27: General string */ #define UNIVERSALSTRING 0x1C /* 28: Universal string */ [...1970 lines suppressed...] /* Check for arguments */ while( argc && *argv[ 0 ] == '-' && moreArgs ) { char *argPtr = argv[ 0 ] + 1; if( !*argPtr ) useStdin = TRUE; while( *argPtr ) { if( isdigit( *argPtr ) ) { offset = atol( argPtr ); break; } switch( toupper( *argPtr ) ) { case '-': moreArgs = FALSE; /* GNU-style end-of-args flag */ break; case 'A': printAllData = TRUE; break; case 'C': if( !readConfig( argPtr + 1, FALSE ) ) exit( EXIT_FAILURE ); while( argPtr[ 1 ] ) argPtr++; /* Skip rest of arg */ break; case 'D': printDots = TRUE; break; case 'E': checkEncaps = FALSE; break; case 'F': if( ( outFile = fopen( argPtr + 1, "wb" ) ) == NULL ) { perror( argPtr + 1 ); exit( EXIT_FAILURE ); } while( argPtr[ 1 ] ) argPtr++; /* Skip rest of arg */ break; case 'I': shallowIndent = TRUE; break; case 'L': extraOIDinfo = TRUE; break; case 'H': doDumpHeader++; break; case 'O': checkCharset = TRUE; break; case 'P': doPure = TRUE; break; case 'R': reverseBitString = !reverseBitString; break; case 'S': doCheckOnly = TRUE; #if defined( __WIN32__ ) /* Under Windows we can't fclose( stdout ) because the VC++ runtime reassigns the stdout handle to the next open file (which is valid) but then scribbles stdout garbage all over it for files larger than about 16K (which isn't), so we have to make sure that the stdout handle is pointed to something somewhere */ freopen( "nul", "w", stdout ); #elif defined( __UNIX__ ) /* Safety feature in case any Unix libc is as broken as the Win32 version */ freopen( "/dev/null", "w", stdout ); #else fclose( stdout ); #endif /* OS-specific bypassing of stdout */ break; case 'T': dumpText = TRUE; break; case 'U': rawTimeString = TRUE; break; case 'X': doHexValues = TRUE; break; case 'Z': zeroLengthAllowed = TRUE; break; default: printf( "Unknown argument '%c'.\n", *argPtr ); return( EXIT_SUCCESS ); } argPtr++; } argv++; argc--; } /* We can't use options that perform an fseek() if reading from stdin */ if( useStdin && ( doDumpHeader || outFile != NULL ) ) { puts( "Can't use -f or -h when taking input from stdin" ); exit( EXIT_FAILURE ); } /* Check args and read the config file. We don't bother weeding out dups during the read because (a) the linear search would make the process n^2, (b) during the dump process the search will terminate on the first match so dups aren't that serious, and (c) there should be very few dups present */ if( argc != 1 && !useStdin ) usageExit(); if( !readGlobalConfig( pathPtr ) ) exit( EXIT_FAILURE ); /* Dump the given file */ if( useStdin ) inFile = stdin; else if( ( inFile = fopen( argv[ 0 ], "rb" ) ) == NULL ) { perror( argv[ 0 ] ); exit( EXIT_FAILURE ); } if( useStdin ) { while( offset-- ) getc( inFile ); } else fseek( inFile, offset, SEEK_SET ); if( outFile != NULL ) { ASN1_ITEM item; long length; int i, status; /* Make sure there's something there, and that it has a definite length */ status = getItem( inFile, &item ); if( status == -1 ) { puts( "Non-ASN.1 data encountered." ); exit( EXIT_FAILURE ); } if( status == 0 ) { puts( "Nothing to read." ); exit( EXIT_FAILURE ); } if( item.indefinite ) { puts( "Cannot process indefinite-length item." ); exit( EXIT_FAILURE ); } /* Copy the item across, first the header and then the data */ for( i = 0; i < item.headerSize; i++ ) putc( item.header[ i ], outFile ); for( length = 0; length < item.length && !feof( inFile ); length++ ) putc( getc( inFile ), outFile ); fclose( outFile ); fseek( inFile, offset, SEEK_SET ); } printAsn1( inFile, 0, LENGTH_MAGIC, 0 ); fclose( inFile ); /* Print a summary of warnings/errors if it's required or appropriate */ if( !doPure ) { if( !doCheckOnly ) fputc( '\n', stderr ); fprintf( stderr, "%d warning%s, %d error%s.\n", noWarnings, ( noWarnings != 1 ) ? "s" : "", noErrors, ( noErrors != 1 ) ? "s" : "" ); } return( ( noErrors ) ? noErrors : EXIT_SUCCESS ); } --- NEW FILE dumpasn1.cfg --- # dumpasn1 Object Identifier configuration file, available from # http://www.cs.auckland.ac.nz/~pgut001/dumpasn1.cfg. This is read by # dumpasn1.c and is used to display information on Object Identifiers found in # ASN.1 objects. This is merely a list of things that you might conceivably # find in use somewhere, and should in no way be taken as a guide to which OIDs # to use - many of these will never been seen in the wild, or should be shot on # sight if encountered. # # The format of this file is as follows: # # - All blank lines and lines beginning with a '#' are ignored. # - OIDs are described by a set of attributes, of which at least the 'OID' and # 'Description' must be present. Optional attributes are a 'Comment' and a # 'Warning' (to indicate that dumpasn1 will display a warning if this OID is # encountered). # - Attributes are listed one per line. The first attribute should be an 'OID' # attribute since this is used to denote the start of a new OID description. # The other attributes may be given in any order. # # See the rest of this file for examples of what an OID description should look # like. # Deutsche Telekom/Telesec OID = 06 05 02 82 06 01 0A Comment = Deutsche Telekom Description = Telesec (0 2 262 1 10) OID = 06 06 02 82 06 01 0A 00 Comment = Telesec Description = extension (0 2 262 1 10 0) OID = 06 06 02 82 06 01 0A 01 Comment = Telesec Description = mechanism (0 2 262 1 10 1) OID = 06 07 02 82 06 01 0A 01 00 Comment = Telesec mechanism Description = authentication (0 2 262 1 10 1 0) OID = 06 08 02 82 06 01 0A 01 00 01 Comment = Telesec authentication Description = passwordAuthentication (0 2 262 1 10 1 0 1) OID = 06 08 02 82 06 01 0A 01 00 02 Comment = Telesec authentication Description = protectedPasswordAuthentication (0 2 262 1 10 1 0 2) OID = 06 08 02 82 06 01 0A 01 00 03 Comment = Telesec authentication Description = oneWayX509Authentication (0 2 262 1 10 1 0 3) OID = 06 08 02 82 06 01 0A 01 00 04 Comment = Telesec authentication Description = twoWayX509Authentication (0 2 262 1 10 1 0 4) OID = 06 08 02 82 06 01 0A 01 00 05 Comment = Telesec authentication Description = threeWayX509Authentication (0 2 262 1 10 1 0 5) OID = 06 08 02 82 06 01 0A 01 00 06 Comment = Telesec authentication Description = oneWayISO9798Authentication (0 2 262 1 10 1 0 6) OID = 06 08 02 82 06 01 0A 01 00 07 Comment = Telesec authentication Description = twoWayISO9798Authentication (0 2 262 1 10 1 0 7) OID = 06 08 02 82 06 01 0A 01 00 08 Comment = Telesec authentication Description = telekomAuthentication (0 2 262 1 10 1 0 8) OID = 06 07 02 82 06 01 0A 01 01 Comment = Telesec mechanism Description = signature (0 2 262 1 10 1 1) OID = 06 08 02 82 06 01 0A 01 01 01 Comment = Telesec mechanism Description = md4WithRSAAndISO9697 (0 2 262 1 10 1 1 1) OID = 06 08 02 82 06 01 0A 01 01 02 Comment = Telesec mechanism Description = md4WithRSAAndTelesecSignatureStandard (0 2 262 1 10 1 1 2) OID = 06 08 02 82 06 01 0A 01 01 03 Comment = Telesec mechanism Description = md5WithRSAAndISO9697 (0 2 262 1 10 1 1 3) OID = 06 08 02 82 06 01 0A 01 01 04 Comment = Telesec mechanism Description = md5WithRSAAndTelesecSignatureStandard (0 2 262 1 10 1 1 4) # PKCS #1 signature with RIPEMD-160 OID = 06 08 02 82 06 01 0A 01 01 05 Comment = Telesec mechanism Description = ripemd160WithRSAAndTelekomSignatureStandard (0 2 262 1 10 1 1 5) # RIPEMD-160 with raw RSA (ie no padding, just 160 bytes encrypted) signature OID = 06 08 02 82 06 01 0A 01 01 09 Comment = Telesec signature Description = hbciRsaSignature (0 2 262 1 10 1 1 9) OID = 06 07 02 82 06 01 0A 01 02 Comment = Telesec mechanism Description = encryption (0 2 262 1 10 1 2) # Specially recommended by the NSA for German use OID = 06 08 02 82 06 01 0A 01 02 00 Comment = Telesec encryption Description = none (0 2 262 1 10 1 2 0) OID = 06 08 02 82 06 01 0A 01 02 01 Comment = Telesec encryption Description = rsaTelesec (0 2 262 1 10 1 2 1) OID = 06 08 02 82 06 01 0A 01 02 02 Comment = Telesec encryption Description = des (0 2 262 1 10 1 2 2) OID = 06 09 02 82 06 01 0A 01 02 02 01 Comment = Telesec encryption Description = desECB (0 2 262 1 10 1 2 2 1) OID = 06 09 02 82 06 01 0A 01 02 02 02 Comment = Telesec encryption Description = desCBC (0 2 262 1 10 1 2 2 2) OID = 06 09 02 82 06 01 0A 01 02 02 03 Comment = Telesec encryption Description = desOFB (0 2 262 1 10 1 2 2 3) OID = 06 09 02 82 06 01 0A 01 02 02 04 Comment = Telesec encryption Description = desCFB8 (0 2 262 1 10 1 2 2 4) OID = 06 09 02 82 06 01 0A 01 02 02 05 Comment = Telesec encryption Description = desCFB64 (0 2 262 1 10 1 2 2 5) OID = 06 08 02 82 06 01 0A 01 02 03 Comment = Telesec encryption Description = des3 (0 2 262 1 10 1 2 3) OID = 06 09 02 82 06 01 0A 01 02 03 01 Comment = Telesec encryption Description = des3ECB (0 2 262 1 10 1 2 3 1) OID = 06 09 02 82 06 01 0A 01 02 03 02 Comment = Telesec encryption Description = des3CBC (0 2 262 1 10 1 2 3 2) OID = 06 09 02 82 06 01 0A 01 02 03 03 Comment = Telesec encryption Description = des3OFB (0 2 262 1 10 1 2 3 3) OID = 06 09 02 82 06 01 0A 01 02 03 04 Comment = Telesec encryption Description = des3CFB8 (0 2 262 1 10 1 2 3 4) OID = 06 09 02 82 06 01 0A 01 02 03 05 Comment = Telesec encryption Description = des3CFB64 (0 2 262 1 10 1 2 3 5) OID = 06 08 02 82 06 01 0A 01 02 04 Comment = Telesec encryption Description = magenta (0 2 262 1 10 1 2 4) OID = 06 08 02 82 06 01 0A 01 02 05 Comment = Telesec encryption Description = idea (0 2 262 1 10 1 2 5) OID = 06 09 02 82 06 01 0A 01 02 05 01 Comment = Telesec encryption Description = ideaECB (0 2 262 1 10 1 2 5 1) OID = 06 09 02 82 06 01 0A 01 02 05 02 Comment = Telesec encryption Description = ideaCBC (0 2 262 1 10 1 2 5 2) OID = 06 09 02 82 06 01 0A 01 02 05 03 Comment = Telesec encryption Description = ideaOFB (0 2 262 1 10 1 2 5 3) OID = 06 09 02 82 06 01 0A 01 02 05 04 Comment = Telesec encryption Description = ideaCFB8 (0 2 262 1 10 1 2 5 4) OID = 06 09 02 82 06 01 0A 01 02 05 05 Comment = Telesec encryption Description = ideaCFB64 (0 2 262 1 10 1 2 5 5) OID = 06 07 02 82 06 01 0A 01 03 Comment = Telesec mechanism Description = oneWayFunction (0 2 262 1 10 1 3) OID = 06 08 02 82 06 01 0A 01 03 01 Comment = Telesec one-way function Description = md4 (0 2 262 1 10 1 3 1) [...5297 lines suppressed...] OID = 06 04 67 2A 09 01 Comment = SET vendor Description = IBM (2 23 42 9 1) OID = 06 04 67 2A 09 02 Comment = SET vendor Description = CyberCash (2 23 42 9 2) OID = 06 04 67 2A 09 03 Comment = SET vendor Description = Terisa (2 23 42 9 3) OID = 06 04 67 2A 09 04 Comment = SET vendor Description = RSADSI (2 23 42 9 4) OID = 06 04 67 2A 09 05 Comment = SET vendor Description = VeriFone (2 23 42 9 5) OID = 06 04 67 2A 09 06 Comment = SET vendor Description = TrinTech (2 23 42 9 6) OID = 06 04 67 2A 09 07 Comment = SET vendor Description = BankGate (2 23 42 9 7) OID = 06 04 67 2A 09 08 Comment = SET vendor Description = GTE (2 23 42 9 8) OID = 06 04 67 2A 09 09 Comment = SET vendor Description = CompuSource (2 23 42 9 9) OID = 06 04 67 2A 09 0A Comment = SET vendor Description = Griffin (2 23 42 9 10) OID = 06 04 67 2A 09 0B Comment = SET vendor Description = Certicom (2 23 42 9 11) OID = 06 04 67 2A 09 0C Comment = SET vendor Description = OSS (2 23 42 9 12) OID = 06 04 67 2A 09 0D Comment = SET vendor Description = TenthMountain (2 23 42 9 13) OID = 06 04 67 2A 09 0E Comment = SET vendor Description = Antares (2 23 42 9 14) OID = 06 04 67 2A 09 0F Comment = SET vendor Description = ECC (2 23 42 9 15) OID = 06 04 67 2A 09 10 Comment = SET vendor Description = Maithean (2 23 42 9 16) OID = 06 04 67 2A 09 11 Comment = SET vendor Description = Netscape (2 23 42 9 17) OID = 06 04 67 2A 09 12 Comment = SET vendor Description = Verisign (2 23 42 9 18) OID = 06 04 67 2A 09 13 Comment = SET vendor Description = BlueMoney (2 23 42 9 19) OID = 06 04 67 2A 09 14 Comment = SET vendor Description = Lacerte (2 23 42 9 20) OID = 06 04 67 2A 09 15 Comment = SET vendor Description = Fujitsu (2 23 42 9 21) OID = 06 04 67 2A 09 16 Comment = SET vendor Description = eLab (2 23 42 9 22) OID = 06 04 67 2A 09 17 Comment = SET vendor Description = Entrust (2 23 42 9 23) OID = 06 04 67 2A 09 18 Comment = SET vendor Description = VIAnet (2 23 42 9 24) OID = 06 04 67 2A 09 19 Comment = SET vendor Description = III (2 23 42 9 25) OID = 06 04 67 2A 09 1A Comment = SET vendor Description = OpenMarket (2 23 42 9 26) OID = 06 04 67 2A 09 1B Comment = SET vendor Description = Lexem (2 23 42 9 27) OID = 06 04 67 2A 09 1C Comment = SET vendor Description = Intertrader (2 23 42 9 28) OID = 06 04 67 2A 09 1D Comment = SET vendor Description = Persimmon (2 23 42 9 29) OID = 06 04 67 2A 09 1E Comment = SET vendor Description = NABLE (2 23 42 9 30) OID = 06 04 67 2A 09 1F Comment = SET vendor Description = espace-net (2 23 42 9 31) OID = 06 04 67 2A 09 20 Comment = SET vendor Description = Hitachi (2 23 42 9 32) OID = 06 04 67 2A 09 21 Comment = SET vendor Description = Microsoft (2 23 42 9 33) OID = 06 04 67 2A 09 22 Comment = SET vendor Description = NEC (2 23 42 9 34) OID = 06 04 67 2A 09 23 Comment = SET vendor Description = Mitsubishi (2 23 42 9 35) OID = 06 04 67 2A 09 24 Comment = SET vendor Description = NCR (2 23 42 9 36) OID = 06 04 67 2A 09 25 Comment = SET vendor Description = e-COMM (2 23 42 9 37) OID = 06 04 67 2A 09 26 Comment = SET vendor Description = Gemplus (2 23 42 9 38) OID = 06 03 67 2A 0A Comment = SET Description = national (2 23 42 10) OID = 06 05 67 2A 0A E2 00 Comment = SET national Description = Japan (2 23 42 10 392) # Draft SET. These were invented for testing in pre-1.0 drafts, but have # been used nonetheless by implementors OID = 06 04 86 8D 6F 02 Comment = SET. Deprecated, use (2 23 42 7 0) instead Description = hashedRootKey (2 54 1775 2) Warning OID = 06 04 86 8D 6F 03 Comment = SET. Deprecated, use (2 23 42 7 0) instead Description = certificateType (2 54 1775 3) Warning OID = 06 04 86 8D 6F 04 Comment = SET. Deprecated, use (2 23 42 7 0) instead Description = merchantData (2 54 1775 4) Warning OID = 06 04 86 8D 6F 05 Comment = SET. Deprecated, use (2 23 42 7 0) instead Description = cardCertRequired (2 54 1775 5) Warning OID = 06 04 86 8D 6F 06 Comment = SET. Deprecated, use (2 23 42 7 0) instead Description = tunneling (2 54 1775 6) Warning OID = 06 04 86 8D 6F 07 Comment = SET. Deprecated, use (2 23 42 7 0) instead Description = setQualifier (2 54 1775 7) Warning OID = 06 04 86 8D 6F 63 Comment = SET. Deprecated, use (2 23 42 7 0) instead Description = set-data (2 54 1775 99) Warning # End of Fahnenstange --- NEW FILE dumpasn1.spec --- Name: dumpasn1 Version: 20050404 Release: 0.1 Summary: ASN.1 object dump utility Group: Development/Tools License: Public Domain URL: http://www.cs.auckland.ac.nz/~pgut001/ Source0: http://www.cs.auckland.ac.nz/~pgut001/dumpasn1.c Source1: http://www.cs.auckland.ac.nz/~pgut001/dumpasn1.cfg Patch0: http://ftp.debian.org/debian/pool/main/d/dumpasn1/%{name}_20030222-1.diff.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: sed >= 3.95 %description dumpasn1 is an ASN.1 object dump program that will dump data encoded using any of the ASN.1 encoding rules in a variety of user-specified formats. %prep %setup -q -c -T install -pm 644 %{SOURCE0} . %patch0 -p1 sed -i -e 's|\bgcc |\$(CC) \$(RPM_OPT_FLAGS) |' Makefile sed -i -e 's|/etc/dumpasn1/|%{_sysconfdir}/dumpasn1/|' dumpasn1.{c,1*} %build make %{?_smp_mflags} CC="%{__cc}" %install rm -rf $RPM_BUILD_ROOT install -Dpm 755 dumpasn1 $RPM_BUILD_ROOT%{_bindir}/dumpasn1 install -Dpm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/dumpasn1/dumpasn1.cfg install -Dpm 644 dumpasn1.1 $RPM_BUILD_ROOT%{_mandir}/man1/dumpasn1.1 %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc debian/README.Debian debian/copyright %config(noreplace) %{_sysconfdir}/dumpasn1/ %{_bindir}/dumpasn1 %{_mandir}/man1/dumpasn1.1* %changelog * Tue Aug 9 2005 Ville Skytt?? - 20050404-0.1 - Update to 20050404. * Sun May 29 2005 Ville Skytt?? - 20030222-0.1 - Rebuild for FC4. * Mon Aug 30 2004 Ville Skytt?? - 0:20030222-0.fdr.1 - First build, based on Debian package. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dumpasn1/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 15 Aug 2005 20:12:04 -0000 1.1 +++ .cvsignore 15 Aug 2005 20:12:56 -0000 1.2 @@ -0,0 +1 @@ +dumpasn1_20030222-1.diff.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/dumpasn1/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 15 Aug 2005 20:12:04 -0000 1.1 +++ sources 15 Aug 2005 20:12:56 -0000 1.2 @@ -0,0 +1 @@ +4d3bff6213cc455af94846a0485ca743 dumpasn1_20030222-1.diff.gz From fedora-extras-commits at redhat.com Mon Aug 15 20:13:51 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 15 Aug 2005 16:13:51 -0400 Subject: rpms/abicheck/devel abicheck.spec,1.15,1.16 Message-ID: <200508152013.j7FKDpvS030771@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/abicheck/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30754 Modified Files: abicheck.spec Log Message: Index: abicheck.spec =================================================================== RCS file: /cvs/extras/rpms/abicheck/devel/abicheck.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- abicheck.spec 15 Aug 2005 20:05:57 -0000 1.15 +++ abicheck.spec 15 Aug 2005 20:13:49 -0000 1.16 @@ -35,8 +35,6 @@ %build make -cd test ; make private1 ; ../abicheck ./private1 ; cd - -make test %install @@ -46,6 +44,15 @@ install -p -m 0644 abicheck.1 $RPM_BUILD_ROOT%{_mandir}/man1 +%check +cd test +make private1 +../abicheck ./private1 || : +cd - +make test +: + + %clean rm -rf $RPM_BUILD_ROOT From fedora-extras-commits at redhat.com Mon Aug 15 20:27:53 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 15 Aug 2005 16:27:53 -0400 Subject: rpms/abicheck/devel abicheck.spec,1.16,1.17 Message-ID: <200508152027.j7FKRrMT030901@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/abicheck/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30884 Modified Files: abicheck.spec Log Message: hmm, and in job 10 it failed differently on ppc than in job 8... Index: abicheck.spec =================================================================== RCS file: /cvs/extras/rpms/abicheck/devel/abicheck.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- abicheck.spec 15 Aug 2005 20:13:49 -0000 1.16 +++ abicheck.spec 15 Aug 2005 20:27:51 -0000 1.17 @@ -46,8 +46,9 @@ %check cd test -make private1 +make private1 public1 ../abicheck ./private1 || : +../abicheck ./public1 || : cd - make test : From fedora-extras-commits at redhat.com Mon Aug 15 20:30:50 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 15 Aug 2005 16:30:50 -0400 Subject: rpms/dumpasn1/devel .cvsignore, 1.2, 1.3 dumpasn1.spec, 1.1, 1.2 sources, 1.2, 1.3 dumpasn1.c, 1.1, NONE dumpasn1.cfg, 1.1, NONE Message-ID: <200508152030.j7FKUoNM030982@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/dumpasn1/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30961 Modified Files: .cvsignore dumpasn1.spec sources Removed Files: dumpasn1.c dumpasn1.cfg Log Message: Tweak macro usage, move sources to lookaside cache. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dumpasn1/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 15 Aug 2005 20:12:56 -0000 1.2 +++ .cvsignore 15 Aug 2005 20:30:48 -0000 1.3 @@ -1 +1,3 @@ dumpasn1_20030222-1.diff.gz +dumpasn1.c +dumpasn1.cfg Index: dumpasn1.spec =================================================================== RCS file: /cvs/extras/rpms/dumpasn1/devel/dumpasn1.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- dumpasn1.spec 15 Aug 2005 20:12:56 -0000 1.1 +++ dumpasn1.spec 15 Aug 2005 20:30:48 -0000 1.2 @@ -1,14 +1,14 @@ Name: dumpasn1 Version: 20050404 -Release: 0.1 +Release: 1%{?dist} Summary: ASN.1 object dump utility Group: Development/Tools License: Public Domain URL: http://www.cs.auckland.ac.nz/~pgut001/ -Source0: http://www.cs.auckland.ac.nz/~pgut001/dumpasn1.c -Source1: http://www.cs.auckland.ac.nz/~pgut001/dumpasn1.cfg -Patch0: http://ftp.debian.org/debian/pool/main/d/dumpasn1/%{name}_20030222-1.diff.gz +Source0: http://www.cs.auckland.ac.nz/~pgut001/%{name}.c +Source1: http://www.cs.auckland.ac.nz/~pgut001/%{name}.cfg +Patch0: http://ftp.debian.org/debian/pool/main/d/%{name}/%{name}_20030222-1.diff.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: sed >= 3.95 @@ -51,6 +51,9 @@ %changelog +* Mon Aug 15 2005 Ville Skytt?? - 20050404-1 +- Use macros more consistently (#165497). + * Tue Aug 9 2005 Ville Skytt?? - 20050404-0.1 - Update to 20050404. Index: sources =================================================================== RCS file: /cvs/extras/rpms/dumpasn1/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 15 Aug 2005 20:12:56 -0000 1.2 +++ sources 15 Aug 2005 20:30:48 -0000 1.3 @@ -1 +1,3 @@ 4d3bff6213cc455af94846a0485ca743 dumpasn1_20030222-1.diff.gz +faba9cbad80fcc97ae566f97c2c85272 dumpasn1.c +fffe09ac2fad6161b62a69b98f51e7d1 dumpasn1.cfg --- dumpasn1.c DELETED --- --- dumpasn1.cfg DELETED --- From fedora-extras-commits at redhat.com Mon Aug 15 20:52:30 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 15 Aug 2005 16:52:30 -0400 Subject: owners owners.list,1.80,1.81 Message-ID: <200508152052.j7FKqUer031101@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31084 Modified Files: owners.list Log Message: Add dumpasn1. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.80 retrieving revision 1.81 diff -u -r1.80 -r1.81 --- owners.list 14 Aug 2005 18:52:14 -0000 1.80 +++ owners.list 15 Aug 2005 20:52:28 -0000 1.81 @@ -126,6 +126,7 @@ Fedora Extras|dosbox|An x86/DOS emulator with sound/graphics|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|drivel|A journal or "blog" client|katzj at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|drscheme|Graphical environment for developing programs using Scheme|gemi at bluewin.ch|extras-qa at fedoraproject.org| +Fedora Extras|dumpasn1|ASN.1 object dump utility|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|duplicity|Untrusted/encrypted backup using rsync algorithm|bescoto at stanford.edu|extras-qa at fedoraproject.org| Fedora Extras|dvb-apps|Utility, demo and test applications using the Linux DVB API|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|dxpc|A Differential X Protocol Compressor|rdieter at math.unl.edu|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Mon Aug 15 20:54:35 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Mon, 15 Aug 2005 16:54:35 -0400 Subject: owners owners.list,1.81,1.82 Message-ID: <200508152054.j7FKsZIL031139@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31122 Modified Files: owners.list Log Message: Add plplot Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.81 retrieving revision 1.82 diff -u -r1.81 -r1.82 --- owners.list 15 Aug 2005 20:52:28 -0000 1.81 +++ owners.list 15 Aug 2005 20:54:33 -0000 1.82 @@ -671,6 +671,7 @@ Fedora Extras|plib|Set of portable libraries especially useful for games|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|plone|User friendly and powerful open source Content Management System|gauret at free.fr|extras-qa at fedoraproject.org| Fedora Extras|pl|SWI-Prolog - Edinburgh compatible Prolog compiler|gemi at bluewin.ch|extras-qa at fedoraproject.org| +Fedora Extras|plplot|Library of functions for making scientific plots|orion at cora.nwra.com|extras-qa at fedoraproject.org| Fedora Extras|plt-scheme|Graphical environment for developing programs using Scheme|gemi at bluewin.ch|extras-qa at fedoraproject.org| Fedora Extras|pop-before-smtp|Watch log for POP/IMAP auth, notify MTA to allow relay|wtogami at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|portaudio|Free, cross platform, open-source, audio I/O library|matthias at rpmforge.net|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Mon Aug 15 21:40:55 2005 From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel)) Date: Mon, 15 Aug 2005 17:40:55 -0400 Subject: owners owners.list,1.82,1.83 Message-ID: <200508152140.j7FLetpF032576@cvs-int.fedora.redhat.com> Author: snirkel Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32559 Modified Files: owners.list Log Message: Added bugzilla component for libnjb. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.82 retrieving revision 1.83 diff -u -r1.82 -r1.83 --- owners.list 15 Aug 2005 20:54:33 -0000 1.82 +++ owners.list 15 Aug 2005 21:40:53 -0000 1.83 @@ -385,6 +385,7 @@ Fedora Extras|libmatroska|An open Audio/Video container format|anvil at livna.org|extras-qa at fedoraproject.org| Fedora Extras|libmodplug|Modplug mod music file format library|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|libnet10|High-level API (toolkit) allowing the application programmer to construct and inject network packets|compton at pcompton.com|extras-qa at fedoraproject.org| +Fedora Extras|libnjb|Library for managing digital audio players|triad at df.lth.se|extras-qa at fedoraproject.org| Fedora Extras|liboggz|Simple programming interface for Ogg files and streams|thomas at apestaart.org|extras-qa at fedoraproject.org| Fedora Extras|liboil|Library of Optimized Inner Loops, CPU optimized functions|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|libol|Support library for syslog-ng|jpo at di.uminho.pt|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Mon Aug 15 21:49:29 2005 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Mon, 15 Aug 2005 17:49:29 -0400 Subject: rpms/qtparted/FC-4 .cvsignore, 1.3, 1.4 qtparted-desktop.patch, 1.2, 1.3 qtparted.spec, 1.8, 1.9 sources, 1.3, 1.4 Message-ID: <200508152149.j7FLnTJ7032661@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/qtparted/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32634 Modified Files: .cvsignore qtparted-desktop.patch qtparted.spec sources Log Message: Update to 0.4.5 (backport from devel). Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/qtparted/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 30 Nov 2004 09:27:21 -0000 1.3 +++ .cvsignore 15 Aug 2005 21:49:27 -0000 1.4 @@ -1 +1 @@ -qtparted-0.4.4.tar.bz2 +qtparted-0.4.5.tar.bz2 qtparted-desktop.patch: Index: qtparted-desktop.patch =================================================================== RCS file: /cvs/extras/rpms/qtparted/FC-4/qtparted-desktop.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- qtparted-desktop.patch 30 Nov 2004 09:27:21 -0000 1.2 +++ qtparted-desktop.patch 15 Aug 2005 21:49:27 -0000 1.3 @@ -2,7 +2,7 @@ +++ data/qtparted.desktop 2004-05-21 00:36:57.955313448 +0300 @@ -1,7 +1,7 @@ [Desktop Entry] --Exec=gksu /usr/sbin/qtparted +-Exec=/usr/sbin/qtparted +Exec=qtparted Name=QTParted -Icon=qtparted.xpm Index: qtparted.spec =================================================================== RCS file: /cvs/extras/rpms/qtparted/FC-4/qtparted.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- qtparted.spec 19 May 2005 19:09:32 -0000 1.8 +++ qtparted.spec 15 Aug 2005 21:49:27 -0000 1.9 @@ -1,8 +1,8 @@ %define qtdir %(. %{_sysconfdir}/profile.d/qt.sh 2>/dev/null; echo $QTDIR) Name: qtparted -Version: 0.4.4 -Release: 3 +Version: 0.4.5 +Release: 1%{?dist} Summary: Partition Magic clone written in C++ using the Qt toolkit Group: Applications/System @@ -18,6 +18,7 @@ BuildRequires: qt-devel >= 1:3.1.0, parted-devel >= 1.6.6, XFree86-devel BuildRequires: desktop-file-utils, qt-designer, e2fsprogs-devel, jfsutils BuildRequires: zlib-devel, libjpeg-devel, xfsprogs +BuildRequires: automake, perl, autoconf Requires: usermode-gtk, e2fsprogs, jfsutils, xfsprogs %description @@ -31,6 +32,12 @@ %build export QTDIR="%{qtdir}" + +%{__aclocal} +%{__automake} --add-missing --gnu +%{__perl} admin/am_edit +%{__autoconf} + %configure \ --with-log-dir=%{_localstatedir}/log \ --disable-reiserfs \ @@ -100,6 +107,10 @@ %changelog +* Sat Aug 13 2005 Steven Pritchard - 0.4.5-1 +- Update to 0.4.5. +- Work around unsermake dependency in distributed configure script. + * Thu May 19 2005 Ville Skytt?? - 0.4.4-3 - Rebuild. Index: sources =================================================================== RCS file: /cvs/extras/rpms/qtparted/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 30 Nov 2004 09:27:21 -0000 1.3 +++ sources 15 Aug 2005 21:49:27 -0000 1.4 @@ -1 +1 @@ -b8253bf21eaebe1f2c22b50462e8046c qtparted-0.4.4.tar.bz2 +4541c0aa5475ba38d3cc518c921c8a34 qtparted-0.4.5.tar.bz2 From fedora-extras-commits at redhat.com Mon Aug 15 22:43:42 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Mon, 15 Aug 2005 18:43:42 -0400 Subject: rpms/koffice/FC-4 koffice.spec,1.4,1.5 Message-ID: <200508152244.j7FMiCTO001643@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/koffice/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1611/FC-4 Modified Files: koffice.spec Log Message: - try to fix x86_64 configure Index: koffice.spec =================================================================== RCS file: /cvs/extras/rpms/koffice/FC-4/koffice.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- koffice.spec 13 Aug 2005 23:45:56 -0000 1.4 +++ koffice.spec 15 Aug 2005 22:43:40 -0000 1.5 @@ -1,6 +1,6 @@ Name: koffice Version: 1.4.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A free, integrated office suite for KDE Group: Applications/Productivity @@ -198,9 +198,11 @@ make -f admin/Makefile.common %build +unset QTDIR || : ; . /etc/profile.d/qt.sh %configure --disable-rpath --disable-dependency-tracking --enable-shared \ ---enable-fast-install --with-pic --disable-static +--enable-fast-install --with-pic --disable-static \ +--with-qt-libraries=$QTDIR/lib --with-extra-libs=%{_libdir} make %{?_smp_mflags} @@ -734,6 +736,10 @@ %{_datadir}/servicetypes/kofilter*.desktop %changelog +* Tue Aug 16 2005 Andreas Bierfert +1.4.1-3 +- try to fix x86_64 build + * Sun Aug 14 2005 Andreas Bierfert 1.4.1-2 - add dist tag From fedora-extras-commits at redhat.com Mon Aug 15 22:43:42 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Mon, 15 Aug 2005 18:43:42 -0400 Subject: rpms/koffice/devel koffice.spec,1.4,1.5 Message-ID: <200508152244.j7FMiDJD001646@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/koffice/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1611/devel Modified Files: koffice.spec Log Message: - try to fix x86_64 configure Index: koffice.spec =================================================================== RCS file: /cvs/extras/rpms/koffice/devel/koffice.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- koffice.spec 13 Aug 2005 23:46:49 -0000 1.4 +++ koffice.spec 15 Aug 2005 22:43:40 -0000 1.5 @@ -1,6 +1,6 @@ Name: koffice Version: 1.4.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A free, integrated office suite for KDE Group: Applications/Productivity @@ -198,9 +198,11 @@ make -f admin/Makefile.common %build +unset QTDIR || : ; . /etc/profile.d/qt.sh %configure --disable-rpath --disable-dependency-tracking --enable-shared \ ---enable-fast-install --with-pic --disable-static +--enable-fast-install --with-pic --disable-static \ +--with-qt-libraries=$QTDIR/lib --with-extra-libs=%{_libdir} make %{?_smp_mflags} @@ -734,6 +736,10 @@ %{_datadir}/servicetypes/kofilter*.desktop %changelog +* Tue Aug 16 2005 Andreas Bierfert +1.4.1-3 +- try to fix x86_64 build + * Sun Aug 14 2005 Andreas Bierfert 1.4.1-2 - add dist tag From fedora-extras-commits at redhat.com Mon Aug 15 23:32:30 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Mon, 15 Aug 2005 19:32:30 -0400 Subject: rpms/liferea/devel .cvsignore, 1.9, 1.10 liferea.spec, 1.14, 1.15 sources, 1.10, 1.11 Message-ID: <200508152332.j7FNWUX0002982@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/liferea/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2961 Modified Files: .cvsignore liferea.spec sources Log Message: * Mon Aug 15 2005 Brian Pepple - 0.9.6-2 - Update to 0.9.6. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/liferea/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 31 Jul 2005 14:55:41 -0000 1.9 +++ .cvsignore 15 Aug 2005 23:32:28 -0000 1.10 @@ -1 +1 @@ -liferea-0.9.5.tar.gz +liferea-0.9.6.tar.gz Index: liferea.spec =================================================================== RCS file: /cvs/extras/rpms/liferea/devel/liferea.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- liferea.spec 31 Jul 2005 14:55:41 -0000 1.14 +++ liferea.spec 15 Aug 2005 23:32:28 -0000 1.15 @@ -1,7 +1,7 @@ %define with_dbus 1 Name: liferea -Version: 0.9.5 +Version: 0.9.6 Release: 2%{?dist} Summary: An RSS/RDF feed reader @@ -92,6 +92,9 @@ %changelog +* Mon Aug 15 2005 Brian Pepple - 0.9.6-2 +- Update to 0.9.6. + * Sun Jul 31 2005 Brian Pepple - 0.9.5-2 - Update to 0.9.5. Index: sources =================================================================== RCS file: /cvs/extras/rpms/liferea/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 31 Jul 2005 14:55:41 -0000 1.10 +++ sources 15 Aug 2005 23:32:28 -0000 1.11 @@ -1 +1 @@ -562c84cd394fd2faf7944990613117ca liferea-0.9.5.tar.gz +325398d66a0b4fba6b004a2d04950cb5 liferea-0.9.6.tar.gz From fedora-extras-commits at redhat.com Tue Aug 16 03:30:59 2005 From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs)) Date: Mon, 15 Aug 2005 23:30:59 -0400 Subject: rpms/denyhosts/devel denyhosts-1.0.0-config.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 README.fedora, 1.1, 1.2 denyhosts-0.9.8-daemon-control.patch, 1.1, 1.2 denyhosts.cron, 1.4, 1.5 denyhosts.init, 1.3, 1.4 denyhosts.spec, 1.8, 1.9 denyhosts.sysconfig, 1.1, 1.2 sources, 1.6, 1.7 denyhosts-0.8.0-config.patch, 1.1, NONE Message-ID: <200508160330.j7G3UxLd008371@cvs-int.fedora.redhat.com> Author: tibbs Update of /cvs/extras/rpms/denyhosts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8339 Modified Files: .cvsignore README.fedora denyhosts-0.9.8-daemon-control.patch denyhosts.cron denyhosts.init denyhosts.spec denyhosts.sysconfig sources Added Files: denyhosts-1.0.0-config.patch Removed Files: denyhosts-0.8.0-config.patch Log Message: * Mon Aug 15 2005 Jason L Tibbitts III - 1.0.0-0 - Update to 1.0.0 - Add logrotate entry - Clean up initscript - Add notes on upgrading. denyhosts-1.0.0-config.patch: --- NEW FILE denyhosts-1.0.0-config.patch --- --- denyhosts.cfg-dist.orig 2005-08-15 10:51:55.000000000 -0500 +++ denyhosts.cfg-dist 2005-08-15 22:26:21.788502326 -0500 @@ -47,13 +47,18 @@ # 'y' = years # # never purge: -PURGE_DENY = +#PURGE_DENY = # # purge entries older than 1 week #PURGE_DENY = 1w # # purge entries older than 5 days #PURGE_DENY = 5d +# +# For the default Fedora Extras install, we want timestamping but no +# expiration (at least by default) so this is deliberately set high. +# Adjust to taste. +PURGE_DENY = 1y ####################################################################### @@ -116,7 +121,7 @@ # Note: when run in daemon mode, this directory should be specified # as an absolute path name (eg. /home/foo/denyhosts/data) # -WORK_DIR = denyhosts +WORK_DIR = /var/lib/denyhosts # ####################################################################### @@ -175,7 +180,7 @@ # match your email address. If you do not want to receive these reports # leave this field blank (or run with the --noemail option) # -ADMIN_EMAIL = +ADMIN_EMAIL = root # ####################################################################### Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/denyhosts/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 13 Aug 2005 20:28:27 -0000 1.6 +++ .cvsignore 16 Aug 2005 03:30:56 -0000 1.7 @@ -1 +1 @@ -DenyHosts-0.9.9.tar.gz +DenyHosts-1.0.0.tar.gz Index: README.fedora =================================================================== RCS file: /cvs/extras/rpms/denyhosts/devel/README.fedora,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- README.fedora 22 Jul 2005 16:27:04 -0000 1.1 +++ README.fedora 16 Aug 2005 03:30:56 -0000 1.2 @@ -32,3 +32,13 @@ DenyHosts can also handle logs compressed with gzip or bzip2. +Notes about upgrading +--------------------- +If upgrading from DenyHosts 0.6.0 or earlier, note that this package +does not run denyhosts --migrate to make the old entries expirable. +This preserves any entries that may have been manually added. You +can, of course, run this yourself. + +This package runs denyhosts --upgrade099 automatically to move any +post-0.6.0 and pre-0.9.9 entries into the proper format. + denyhosts-0.9.8-daemon-control.patch: Index: denyhosts-0.9.8-daemon-control.patch =================================================================== RCS file: /cvs/extras/rpms/denyhosts/devel/denyhosts-0.9.8-daemon-control.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- denyhosts-0.9.8-daemon-control.patch 11 Aug 2005 19:36:28 -0000 1.1 +++ denyhosts-0.9.8-daemon-control.patch 16 Aug 2005 03:30:56 -0000 1.2 @@ -5,7 +5,7 @@ DENYHOSTS_BIN = "/usr/bin/denyhosts.py" DENYHOSTS_LOCK = "/var/lock/subsys/denyhosts" -DENYHOSTS_CFG = "/usr/share/denyhosts/denyhosts.cfg" -+DENYHOSTS_CFG = "/etc/denyhosts.cfg" ++DENYHOSTS_CFG = "/etc/denyhosts.conf" ############################################### Index: denyhosts.cron =================================================================== RCS file: /cvs/extras/rpms/denyhosts/devel/denyhosts.cron,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- denyhosts.cron 11 Aug 2005 19:36:28 -0000 1.4 +++ denyhosts.cron 16 Aug 2005 03:30:56 -0000 1.5 @@ -1,7 +1,7 @@ # The Fedora default is to use daemon mode, but if you wish to have # denyhosts run periodically, you can uncomment the appropriate two lines -# edit /etc/sysconfig/denyhosts. (You will also have to start the "service" -# and set it to run at boot if necessary.) +# and edit /etc/sysconfig/denyhosts. (You will also have to start the +# "service" and set it to run at boot if necessary.) # # Run denyhosts occasionally; adjust the time span to your liking #*/10 * * * * root [ -f /var/lock/subsys/denyhosts.init ] && /usr/bin/denyhosts.py -c /etc/denyhosts.conf Index: denyhosts.init =================================================================== RCS file: /cvs/extras/rpms/denyhosts/devel/denyhosts.init,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- denyhosts.init 15 Aug 2005 16:21:11 -0000 1.3 +++ denyhosts.init 16 Aug 2005 03:30:56 -0000 1.4 @@ -15,7 +15,6 @@ # source function library . /etc/rc.d/init.d/functions -CONFIG=/etc/denyhosts.cfg CONTROL=/usr/bin/denyhosts-control CRONLOCK=/var/lock/subsys/denyhosts.init LOCKFILE=/var/lock/subsys/denyhosts @@ -54,12 +53,14 @@ echo $"Denyhosts is disabled." RETVAL=3 fi -} +} + + +d_start() { $CONTROL start; RETVAL=$?; } +d_restart() { $CONTROL restart; RETVAL=$?; } +d_stop() { $CONTROL stop; RETVAL=$?; } +d_status() { $CONTROL status; RETVAL=$?; } -d_start() {$CONTROL start --config=$CONFIG; RETVAL=$?} -d_stop() {$CONTROL stop --config=$CONFIG; RETVAL=$?} -d_restart() {$CONTROL restart --config=$CONFIG; RETVAL=$?} -d_status() {$CONTROL status --config=$CONFIG; RETVAL=$?} d_condrestart() { # It's a layering violation to test the location of the @@ -68,11 +69,11 @@ [ -f $LOCKFILE ] && d_restart } -start() {if [ $DAEMON = "yes" ]; then d_start; else c_start; fi} -stop() {if [ $DAEMON = "yes" ]; then d_stop; else c_stop; fi} -restart() {if [ $DAEMON = "yes" ]; then d_restart; else c_restart; fi} -condrestart() {if [ $DAEMON = "yes" ]; then d_condrestart; else c_restart; fi} -status() {if [ $DAEMON = "yes" ]; then d_status; else c_status; fi} +start() { if [ $DAEMON = "yes" ]; then d_start; else c_start; fi } +stop() { if [ $DAEMON = "yes" ]; then d_stop; else c_stop; fi } +restart() { if [ $DAEMON = "yes" ]; then d_restart; else c_restart; fi } +condrestart() { if [ $DAEMON = "yes" ]; then d_condrestart; else c_restart; fi } +status() { if [ $DAEMON = "yes" ]; then d_status; else c_status; fi } case "$1" in start) Index: denyhosts.spec =================================================================== RCS file: /cvs/extras/rpms/denyhosts/devel/denyhosts.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- denyhosts.spec 15 Aug 2005 16:21:11 -0000 1.8 +++ denyhosts.spec 16 Aug 2005 03:30:56 -0000 1.9 @@ -1,6 +1,6 @@ Name: denyhosts -Version: 0.9.9 -Release: 1%{?dist} +Version: 1.0.0 +release: 0%{?dist} Summary: A script to help thwart ssh server attacks Group: Applications/System @@ -11,8 +11,9 @@ Source2: denyhosts.init Source3: denyhosts-allowed-hosts Source4: denyhosts.sysconfig -Source5: README.fedora -Patch0: denyhosts-0.8.0-config.patch +Source5: denyhosts.logrotate +Source6: README.fedora +Patch0: denyhosts-1.0.0-config.patch Patch1: denyhosts-0.9.8-setup.patch Patch2: denyhosts-0.9.8-daemon-control.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -36,7 +37,7 @@ %patch1 -p0 %patch2 -p0 -cp %{SOURCE5} . +cp %{SOURCE6} . %build @@ -47,18 +48,23 @@ rm -rf $RPM_BUILD_ROOT python ./setup.py install --root=$RPM_BUILD_ROOT --record=%{name}.files -install -d $RPM_BUILD_ROOT${_bindir} -install -p -m 755 daemon-control-dist $RPM_BUILD_ROOT%{_bindir}/denyhosts-control +install -d $RPM_BUILD_ROOT%{_bindir} install -d $RPM_BUILD_ROOT%{_initrddir} install -d $RPM_BUILD_ROOT%{_sysconfdir}/cron.d +install -d $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig install -d -m 700 $RPM_BUILD_ROOT%{_localstatedir}/lib/denyhosts +install -d $RPM_BUILD_ROOT%{_localstatedir}/log install -p -m 600 denyhosts.cfg-dist $RPM_BUILD_ROOT%{_sysconfdir}/denyhosts.conf +install -p -m 755 daemon-control-dist $RPM_BUILD_ROOT%{_bindir}/denyhosts-control install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/cron.d/denyhosts install -p -m 755 %{SOURCE2} $RPM_BUILD_ROOT%{_initrddir}/denyhosts install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_localstatedir}/lib/denyhosts/allowed-hosts +install -p -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/denyhosts + +touch $RPM_BUILD_ROOT%{_localstatedir}/log/denyhosts for i in allowed-warned-hosts hosts offset suspicious-logins \ users-hosts users-invalid users-valid; do @@ -70,16 +76,19 @@ rm -rf $RPM_BUILD_ROOT +# Note that we do not automaticaly run --migrate, because we can't be +# sure that all of the hosts.deny entries were created by denyhosts %post /sbin/chkconfig --add denyhosts -/sbin/service denyhosts condrestart >> /dev/null +%{_bindir}/denyhosts.py -c /etc/denyhosts.conf --upgrade099 || : +/sbin/service denyhosts condrestart > /dev/null 2>&1 exit 0 %preun if [ $1 = 0 ]; then + /sbin/service denyhosts stop > /dev/null 2>&1 /sbin/chkconfig --del denyhosts - /sbin/service denyhosts stop >> /dev/null fi exit 0 @@ -90,8 +99,10 @@ %doc README.fedora README.txt setup.py %config(noreplace) %{_sysconfdir}/denyhosts.conf %config(noreplace) %{_sysconfdir}/cron.d/denyhosts +%config(noreplace) %{_sysconfdir}/sysconfig/denyhosts %config(noreplace) %{_localstatedir}/lib/denyhosts/allowed-hosts +%ghost %{_localstatedir}/log/denyhosts %ghost %{_localstatedir}/lib/denyhosts/allowed-warned-hosts %ghost %{_localstatedir}/lib/denyhosts/hosts %ghost %{_localstatedir}/lib/denyhosts/offset @@ -106,7 +117,16 @@ %{_bindir}/denyhosts-control %changelog -* Sun Aug 14 2005 Jason L Tibbitts III - 0.9.9 +* Mon Aug 15 2005 Jason L Tibbitts III - 1.0.0-0 +- Update to 1.0.0 +- Add logrotate entry +- Clean up initscript +- Add notes on upgrading. + +* Mon Aug 15 2005 Jason L Tibbitts III - 0.9.9-2 +- Automatically upgrade the format of hosts.deny entries. + +* Sun Aug 14 2005 Jason L Tibbitts III - 0.9.9-1 - Framework for enabling daemon mode. * Sat Aug 13 2005 Jason L Tibbitts III - 0.9.9-0 Index: denyhosts.sysconfig =================================================================== RCS file: /cvs/extras/rpms/denyhosts/devel/denyhosts.sysconfig,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- denyhosts.sysconfig 15 Aug 2005 16:21:11 -0000 1.1 +++ denyhosts.sysconfig 16 Aug 2005 03:30:56 -0000 1.2 @@ -1,4 +1,4 @@ # Should DenyHosts run in daemon mode? -# If set to "no", you also need to edit /etc/cron.d/denyhosts and -# uncomment the appropriate lines. +# If not set to "yes", you also need to edit /etc/cron.d/denyhosts +# and uncomment the appropriate lines. DAEMON=yes Index: sources =================================================================== RCS file: /cvs/extras/rpms/denyhosts/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 13 Aug 2005 20:28:27 -0000 1.6 +++ sources 16 Aug 2005 03:30:56 -0000 1.7 @@ -1 +1 @@ -cda391b8724ecf7c9bb02162b9534a41 DenyHosts-0.9.9.tar.gz +12633e88a120ccdbd604bd775b154a62 DenyHosts-1.0.0.tar.gz --- denyhosts-0.8.0-config.patch DELETED --- From fedora-extras-commits at redhat.com Tue Aug 16 03:35:56 2005 From: fedora-extras-commits at redhat.com (Christopher Grau (cgrau)) Date: Mon, 15 Aug 2005 23:35:56 -0400 Subject: owners owners.list,1.83,1.84 Message-ID: <200508160335.j7G3Zuqu008401@cvs-int.fedora.redhat.com> Author: cgrau Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8384 Modified Files: owners.list Log Message: Added frotz component. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.83 retrieving revision 1.84 diff -u -r1.83 -r1.84 --- owners.list 15 Aug 2005 21:40:53 -0000 1.83 +++ owners.list 16 Aug 2005 03:35:54 -0000 1.84 @@ -175,6 +175,7 @@ Fedora Extras|freenx|freenx application/thin-client serve|zipsonic at gmail.com|extras-qa at fedoraproject.org| Fedora Extras|FreeWnn|Japanese input server|petersen at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|freeze|freeze/melt/fcat compression utilities|Nicolas.Mailhot at laPoste.net|extras-qa at fedoraproject.org| +Fedora Extras|frotz|Interpreter for Infocom and other Z-machine games|chris at chrisgrau.com|extras-qa at fedoraproject.org| Fedora Extras|fslint|FSlint - a utility to find and clean "lint" on a filesystem|P at draigBrady.com|extras-qa at fedoraproject.org| Fedora Extras|fwbuilder|Firewall Builder|sgrubb at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|fyre|A tool for creating artwork from chaotic functions|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Tue Aug 16 06:05:44 2005 From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl)) Date: Tue, 16 Aug 2005 02:05:44 -0400 Subject: rpms/mail-notification/FC-4 .cvsignore, 1.4, 1.5 mail-notification.spec, 1.7, 1.8 sources, 1.4, 1.5 Message-ID: <200508160605.j7G65i9a012204@cvs-int.fedora.redhat.com> Author: thl Update of /cvs/extras/rpms/mail-notification/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12186 Modified Files: .cvsignore mail-notification.spec sources Log Message: Update to 2.0; Use dist; new BR gob2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mail-notification/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 9 Mar 2005 20:16:31 -0000 1.4 +++ .cvsignore 16 Aug 2005 06:05:42 -0000 1.5 @@ -1 +1,3 @@ -mail-notification-1.1.tar.gz +mail-notification-2.0.tar.gz +mail-notification-2.0-buildfix.diff +mail-notification-2.0-gmail-properties-fix.diff Index: mail-notification.spec =================================================================== RCS file: /cvs/extras/rpms/mail-notification/FC-4/mail-notification.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- mail-notification.spec 18 May 2005 02:45:50 -0000 1.7 +++ mail-notification.spec 16 Aug 2005 06:05:42 -0000 1.8 @@ -1,13 +1,15 @@ Name: mail-notification -Version: 1.1 -Release: 3 +Version: 2.0 +Release: 1%{?dist} Summary: Status icon that informs you if you have new mail Group: Applications/Internet License: GPL URL: http://www.nongnu.org/mailnotify/ -Source0: http://savannah.nongnu.org/download/mailnotify/mail-notification-1.1.tar.gz +Source0: http://savannah.nongnu.org/download/mailnotify/mail-notification-2.0.tar.gz Source1: mail-notification-README.FEDORA +Patch0: http://savannah.nongnu.org/download/mailnotify/mail-notification-2.0-buildfix.diff +Patch1: http://savannah.nongnu.org/download/mailnotify/mail-notification-2.0-gmail-properties-fix.diff BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gettext >= 0.14.1 @@ -21,6 +23,8 @@ BuildRequires: gnutls-devel >= 1.0.20 BuildRequires: libgcrypt-devel >= 1.2.0 BuildRequires: libicu-devel >= 2.6 +BuildRequires: gob2 + Requires(post): GConf2 Requires(post): scrollkeeper @@ -37,11 +41,12 @@ %prep %setup -q cp %{SOURCE1} ./README.FEDORA - +%patch0 -b .patch0 +%patch1 -b .patch1 %build -%configure +%configure --disable-evolution make %{?_smp_mflags} @@ -61,6 +66,11 @@ --add-category X-Fedora \ ${RPM_BUILD_ROOT}%{_datadir}/applications/mail-notification.desktop +desktop-file-install --vendor fedora \ + --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ + --delete-original \ + --add-category X-Fedora \ + ${RPM_BUILD_ROOT}%{_datadir}/applications/mail-notification-properties.desktop %clean @@ -91,9 +101,10 @@ %{_sysconfdir}/gconf/schemas/mail-notification.schemas %{_sysconfdir}/sound/events/mail-notification.soundlist %{_bindir}/* -%{_libdir}/bonobo/servers/GNOME_MailNotification_Automation.server +%{_libdir}/bonobo/servers/GNOME_MailNotification.server %{_datadir}/%{name} -%{_datadir}/control-center-2.0/capplets/mail-notification-properties.desktop +%{_datadir}/applications/fedora-mail-notification.desktop +%{_datadir}/applications/fedora-mail-notification-properties.desktop %{_datadir}/gnome/help/mail-notification/ %dir %{_datadir}/omf/mail-notification/ %{_datadir}/omf/mail-notification/mail-notification-C.omf @@ -102,6 +113,13 @@ %changelog +* Wed Aug 10 2005 Thorsten Leemhuis - 2.0-1 +- Update to 2.0 -- build without evolution support for now (seems it + needs the whole evo-source) +- Use dist +- Add two patches +- New BR gob2 + * Wed May 18 2005 Colin Charles - 1.1.-3 - bump release, request build for ppc Index: sources =================================================================== RCS file: /cvs/extras/rpms/mail-notification/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 9 Mar 2005 20:16:31 -0000 1.4 +++ sources 16 Aug 2005 06:05:42 -0000 1.5 @@ -1 +1,3 @@ -2359fb53128b12cf295bdf8553e5869b mail-notification-1.1.tar.gz +56ef7401aba1cb27d881fb0f33a3248d mail-notification-2.0.tar.gz +9b632ffa3d886c3829752ea656adf8f1 mail-notification-2.0-buildfix.diff +7e2243b625802214a46bce8d633b94dc mail-notification-2.0-gmail-properties-fix.diff From fedora-extras-commits at redhat.com Tue Aug 16 07:34:22 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 16 Aug 2005 03:34:22 -0400 Subject: rpms/koffice/FC-4 koffice.spec,1.5,1.6 Message-ID: <200508160734.j7G7YMOH013655@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/koffice/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13633 Modified Files: koffice.spec Log Message: - fix libpqxx detection on x86_64 Index: koffice.spec =================================================================== RCS file: /cvs/extras/rpms/koffice/FC-4/koffice.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- koffice.spec 15 Aug 2005 22:43:40 -0000 1.5 +++ koffice.spec 16 Aug 2005 07:34:20 -0000 1.6 @@ -1,6 +1,6 @@ Name: koffice Version: 1.4.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A free, integrated office suite for KDE Group: Applications/Productivity @@ -202,7 +202,9 @@ %configure --disable-rpath --disable-dependency-tracking --enable-shared \ --enable-fast-install --with-pic --disable-static \ ---with-qt-libraries=$QTDIR/lib --with-extra-libs=%{_libdir} +--with-qt-libraries=$QTDIR/lib --with-extra-libs=%{_libdir} \ +--with-pgsqllibdir=%{_libdir} --with-pgsqlincdir=%{_includedir} \ +--with-pqxxlibdir=%{_libdir} --with-pqxxincdir=%{_includedir} make %{?_smp_mflags} @@ -737,6 +739,10 @@ %changelog * Tue Aug 16 2005 Andreas Bierfert +1.4.1-4 +- fix libpqxx detection on x86_64 + +* Tue Aug 16 2005 Andreas Bierfert 1.4.1-3 - try to fix x86_64 build From fedora-extras-commits at redhat.com Tue Aug 16 07:35:21 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Tue, 16 Aug 2005 03:35:21 -0400 Subject: rpms/moin/devel moin-1.3.5-config.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 moin.spec, 1.2, 1.3 sources, 1.3, 1.4 moin-1.3.4-config.patch, 1.1, NONE Message-ID: <200508160735.j7G7ZL8D013723@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/moin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13699 Modified Files: .cvsignore moin.spec sources Added Files: moin-1.3.5-config.patch Removed Files: moin-1.3.4-config.patch Log Message: Update MoinMoin to 1.3.5. moin-1.3.5-config.patch: --- NEW FILE moin-1.3.5-config.patch --- diff -Naupr moin-1.3.5.orig/MoinMoin/multiconfig.py moin-1.3.5/MoinMoin/multiconfig.py --- moin-1.3.5.orig/MoinMoin/multiconfig.py 2005-07-30 17:58:51.000000000 +0200 +++ moin-1.3.5/MoinMoin/multiconfig.py 2005-08-15 13:42:13.000000000 +0200 @@ -151,7 +151,7 @@ class DefaultConfig: FIXME: update according to MoinMoin:UpdateConfiguration """ - acl_enabled = 0 + acl_enabled = 1 # All acl_right lines must use unicode! acl_rights_default = u"Trusted:read,write,delete,revert Known:read,write,delete,revert All:read,write" acl_rights_before = u"" @@ -165,7 +165,7 @@ class DefaultConfig: attachments = None # {'dir': path, 'url': url-prefix} auth_http_enabled = 0 auth_http_insecure = 0 - bang_meta = 0 + bang_meta = 1 backtick_meta = 1 caching_formats = ['text_html'] changed_time_fmt = '%H:%M' @@ -274,13 +274,13 @@ class DefaultConfig: 'remember_last_visit': 0, 'show_fancy_links': 1, 'show_nonexist_qm': nonexist_qm, - 'show_page_trail': 1, + 'show_page_trail': 0, 'show_toolbar': 1, 'show_topbottom': 0, 'show_fancy_diff': 1, 'wikiname_add_spaces': 0, 'remember_me': 1, - 'want_trivial': 0, + 'want_trivial': 1, } # don't let the user change those # user_checkbox_disable = ['disabled', 'want_trivial'] diff -Naupr moin-1.3.5.orig/wiki/config/wikiconfig.py moin-1.3.5/wiki/config/wikiconfig.py --- moin-1.3.5.orig/wiki/config/wikiconfig.py 2005-06-26 17:43:05.000000000 +0200 +++ moin-1.3.5/wiki/config/wikiconfig.py 2005-08-15 13:43:18.000000000 +0200 @@ -54,14 +54,14 @@ class Config(DefaultConfig): # Where your mutable wiki pages are. You want to make regular # backups of this directory. - data_dir = './data/' + data_dir = '../data/' # Where read-only system and help page are. You might want to share # this directory between several wikis. When you update MoinMoin, # you can safely replace the underlay directory with a new one. This # directory is part of MoinMoin distribution, you don't have to # backup it. - data_underlay_dir = './underlay/' + data_underlay_dir = '../underlay/' # This must be '/wiki' for twisted and standalone. For CGI, it should # match your Apache Alias setting. @@ -115,6 +115,7 @@ class Config(DefaultConfig): u'%(page_front_page)s', u'RecentChanges', u'FindPage', + u'SiteNavigation', u'HelpContents', ] Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/moin/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 15 Jun 2005 11:10:06 -0000 1.3 +++ .cvsignore 16 Aug 2005 07:35:18 -0000 1.4 @@ -1 +1 @@ -moin-1.3.4.tar.gz +moin-1.3.5.tar.gz Index: moin.spec =================================================================== RCS file: /cvs/extras/rpms/moin/devel/moin.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- moin.spec 15 Jun 2005 11:10:06 -0000 1.2 +++ moin.spec 16 Aug 2005 07:35:18 -0000 1.3 @@ -1,13 +1,13 @@ Summary: MoinMoin is a Python clone of WikiWiki Name: moin -Version: 1.3.4 +Version: 1.3.5 Release: 1%{?dist} License: GPL Group: Applications/Internet URL: http://moinmoin.wikiwikiweb.de/ Source0: http://dl.sf.net/moin/moin-%{version}.tar.gz Source1: README-rpm -Patch: moin-1.3.4-config.patch +Patch: moin-1.3.5-config.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildArch: noarch BuildRequires: python @@ -40,13 +40,19 @@ %files %defattr(-,root,root,0755) -%doc README README-rpm CHANGES COPYING INSTALL.html UPDATE.html +%doc README README-rpm docs/CHANGES docs/INSTALL.html docs/UPDATE.html +%doc docs/licenses/ %{_bindir}/* %{_libdir}/python?.?/site-packages/MoinMoin/ %{_datadir}/moin/ %changelog +* Mon Aug 15 2005 Matthias Saou 1.3.5-1 +- Update to 1.3.5. +- Update the config patch. +- Update %%doc section (many moved to docs/). + * Wed Jun 15 2005 Matthias Saou 1.3.4-1 - Update to 1.3.4. - Update the config patch. Index: sources =================================================================== RCS file: /cvs/extras/rpms/moin/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 15 Jun 2005 11:10:06 -0000 1.3 +++ sources 16 Aug 2005 07:35:18 -0000 1.4 @@ -1 +1 @@ -9d72e2cc6382d6dc8408bf0f9ccb1398 moin-1.3.4.tar.gz +7194abf16cd6fe24c046013ce3a7c13d moin-1.3.5.tar.gz --- moin-1.3.4-config.patch DELETED --- From fedora-extras-commits at redhat.com Tue Aug 16 08:15:56 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Tue, 16 Aug 2005 04:15:56 -0400 Subject: rpms/nexuiz/devel nexuiz.spec,1.2,1.3 Message-ID: <200508160815.j7G8FulA015544@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/nexuiz/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15527 Modified Files: nexuiz.spec Log Message: * Tue Aug 16 2005 Adrian Reber - 1.1-2 - support building on RHEL4 (#165522) Index: nexuiz.spec =================================================================== RCS file: /cvs/extras/rpms/nexuiz/devel/nexuiz.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- nexuiz.spec 1 Aug 2005 07:08:10 -0000 1.2 +++ nexuiz.spec 16 Aug 2005 08:15:54 -0000 1.3 @@ -1,7 +1,7 @@ Summary: Multiplayer, deathmatch oriented first person shooter Name: nexuiz Version: 1.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Amusements/Games URL: http://www.nexuiz.com/ @@ -89,7 +89,7 @@ %{name}.desktop # Install all png files previously extracted from the .ico file -for file in nexuiz*.png; do +for file in nexuiz*.png*; do res="`file ${file} | tr -d ' ' | cut -d ',' -f 2`" %{__install} -D -m 0644 ${file} \ %{buildroot}%{_datadir}/icons/hicolor/${res}/apps/nexuiz.png @@ -123,6 +123,9 @@ %changelog +* Tue Aug 16 2005 Adrian Reber - 1.1-2 +- support building on RHEL4 (#165522) + * Sat Jul 09 2005 Adrian Reber - 1.1-1 - added gtk-update-icon-cache to %%post and %%postun - added desktop-file-utils as Requires({post,postun}) From fedora-extras-commits at redhat.com Tue Aug 16 08:16:59 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Tue, 16 Aug 2005 04:16:59 -0400 Subject: rpms/nexuiz/FC-4 nexuiz.spec,1.2,1.3 Message-ID: <200508160816.j7G8Gx6H015607@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/nexuiz/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15590 Modified Files: nexuiz.spec Log Message: * Tue Aug 16 2005 Adrian Reber - 1.1-2 - support building on RHEL4 (#165522) Index: nexuiz.spec =================================================================== RCS file: /cvs/extras/rpms/nexuiz/FC-4/nexuiz.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- nexuiz.spec 29 Jul 2005 11:56:29 -0000 1.2 +++ nexuiz.spec 16 Aug 2005 08:16:57 -0000 1.3 @@ -1,7 +1,7 @@ Summary: Multiplayer, deathmatch oriented first person shooter Name: nexuiz Version: 1.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Amusements/Games URL: http://www.nexuiz.com/ @@ -89,7 +89,7 @@ %{name}.desktop # Install all png files previously extracted from the .ico file -for file in nexuiz*.png; do +for file in nexuiz*.png*; do res="`file ${file} | tr -d ' ' | cut -d ',' -f 2`" %{__install} -D -m 0644 ${file} \ %{buildroot}%{_datadir}/icons/hicolor/${res}/apps/nexuiz.png @@ -123,6 +123,9 @@ %changelog +* Tue Aug 16 2005 Adrian Reber - 1.1-2 +- support building on RHEL4 (#165522) + * Sat Jul 09 2005 Adrian Reber - 1.1-1 - added gtk-update-icon-cache to %%post and %%postun - added desktop-file-utils as Requires({post,postun}) From fedora-extras-commits at redhat.com Tue Aug 16 08:29:00 2005 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Tue, 16 Aug 2005 04:29:00 -0400 Subject: fedora-security/audit fc4,1.42,1.43 Message-ID: <200508160829.j7G8T03l015716@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15699 Modified Files: fc4 Log Message: Another day, more security stuff for fc4 Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- fc4 12 Aug 2005 11:11:34 -0000 1.42 +++ fc4 16 Aug 2005 08:28:58 -0000 1.43 @@ -1,15 +1,17 @@ -Up to date CVE as of CVE email 20050811 -Up to date FC4 as of 20050811 +Up to date CVE as of CVE email 20050815 +Up to date FC4 as of 20050815 ** are items that need attention -2005-2550 ** evolution -2005-2549 ** evolution +2005-2553 version (kernel, not 2.6) +2005-2550 backport (evolution) [since FEDORA-2005-743] +2005-2549 backport (evolution) [since FEDORA-2005-743] 2005-2548 version (kernel, fixed 2.6.9) only affected 2.6.8 2005-2547 version (bluez-pin, fixed 2.19) not before 2.16 2005-2541 ignore (tar) is documented behaviour 2005-2536 ** pstotext 2005-2500 version (kernel, flaw introduced after 2.6.12) +2005-2498 ** php xmlrpc 2005-2475 VULNERABLE (unzip) bz#164928 2005-2471 VULNERABLE (netpbm) bz#165355 2005-2456 VULNERABLE (kernel, fixed after 20050726) @@ -60,6 +62,7 @@ 2005-2260 version (mozilla, fixed 1.7.9) [since FEDORA-2005-619] 2005-2177 version (net-snmp, fixed 5.2.1.2) [since FEDORA-2005-561] 2005-2114 ** mozilla, can't find out when this was fixed upstream +2005-2097 backport (xpdf) [since FEDORA-2005-729] 2005-2096 backport (zlib) [since FEDORA-2005-523] 2005-2096 backport (rpm) [since FEDORA-2005-565] 2005-2095 VULNERABLE (squirrelmail) From fedora-extras-commits at redhat.com Tue Aug 16 08:51:05 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 16 Aug 2005 04:51:05 -0400 Subject: rpms/koffice/devel koffice.spec,1.5,1.6 Message-ID: <200508160851.j7G8p5N0015764@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/koffice/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15747 Modified Files: koffice.spec Log Message: - fix libpqxx detection on x86_64 Index: koffice.spec =================================================================== RCS file: /cvs/extras/rpms/koffice/devel/koffice.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- koffice.spec 15 Aug 2005 22:43:40 -0000 1.5 +++ koffice.spec 16 Aug 2005 08:51:03 -0000 1.6 @@ -1,6 +1,6 @@ Name: koffice Version: 1.4.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A free, integrated office suite for KDE Group: Applications/Productivity @@ -202,7 +202,9 @@ %configure --disable-rpath --disable-dependency-tracking --enable-shared \ --enable-fast-install --with-pic --disable-static \ ---with-qt-libraries=$QTDIR/lib --with-extra-libs=%{_libdir} +--with-qt-libraries=$QTDIR/lib --with-extra-libs=%{_libdir} \ +--with-pgsqllibdir=%{_libdir} --with-pgsqlincdir=%{_includedir} \ +--with-pqxxlibdir=%{_libdir} --with-pqxxincdir=%{_includedir} make %{?_smp_mflags} @@ -737,6 +739,10 @@ %changelog * Tue Aug 16 2005 Andreas Bierfert +1.4.1-4 +- fix libpqxx detection on x86_64 + +* Tue Aug 16 2005 Andreas Bierfert 1.4.1-3 - try to fix x86_64 build From fedora-extras-commits at redhat.com Tue Aug 16 11:55:33 2005 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Tue, 16 Aug 2005 07:55:33 -0400 Subject: rpms/svgalib/devel svgalib-1.9.21-wip.patch, 1.1, 1.2 svgalib-1.9.22.diff, 1.1, 1.2 svgalib.spec, 1.4, 1.5 svgalib-1.9.21-ppc.patch, 1.1, NONE svgalib-1.9.21-wip2.patch, 1.1, NONE svgalib-1.9.21-wip3.patch, 1.1, NONE Message-ID: <200508161155.j7GBtXu0019730@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/svgalib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19708 Modified Files: svgalib-1.9.21-wip.patch svgalib-1.9.22.diff svgalib.spec Removed Files: svgalib-1.9.21-ppc.patch svgalib-1.9.21-wip2.patch svgalib-1.9.21-wip3.patch Log Message: Merge with upstream, drop merged patches, fix dark vga modes on radeon svgalib-1.9.21-wip.patch: Index: svgalib-1.9.21-wip.patch =================================================================== RCS file: /cvs/extras/rpms/svgalib/devel/svgalib-1.9.21-wip.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- svgalib-1.9.21-wip.patch 5 Aug 2005 09:37:40 -0000 1.1 +++ svgalib-1.9.21-wip.patch 16 Aug 2005 11:55:30 -0000 1.2 @@ -1,427 +1,196 @@ -Only in svgalib-1.9.21: debugfiles.list -Only in svgalib-1.9.21: debugsources.list -Only in svgalib-1.9.21: sharedlib -diff -urBbw svgalib-1.9.21.orig/src/drivers/fbdev.c svgalib-1.9.21/src/drivers/fbdev.c ---- svgalib-1.9.21.orig/src/drivers/fbdev.c 2005-07-30 15:22:24.000000000 +0200 -+++ svgalib-1.9.21/src/drivers/fbdev.c 2005-07-30 09:16:04.000000000 +0200 -@@ -139,16 +139,18 @@ - - static void fbdev_setpage(int page) - { -- static int oldpage = 0; -- -- if (page != oldpage) -+ if (fbdev_vgamode) -+ { -+ __svgalib_vga_driverspecs.__svgalib_setpage(page); -+ } -+ else - { - mmap(BANKED_POINTER, - __svgalib_banked_mem_size, - PROT_READ | PROT_WRITE, - MAP_SHARED | MAP_FIXED, - fbdev_fd, page << 16); -- oldpage = page; -+ fbdev_banked_pointer_emulated = 1; - } - } - -@@ -239,8 +241,10 @@ - { - struct fb_var_screeninfo info; - -- if (!__svgalib_fbdev_novga && IS_IN_STANDARD_VGA_DRIVER(mode)) -+ if (IS_IN_STANDARD_VGA_DRIVER(mode)) - { -+ if (__svgalib_fbdev_novga) -+ return 1; - if (__svgalib_vga_driverspecs.setmode(mode, prv_mode)) - return 1; - if (fbdev_banked_pointer_emulated) -@@ -288,8 +292,13 @@ - struct fb_var_screeninfo info; - unsigned g, bpp; - -- if (!__svgalib_fbdev_novga && IS_IN_STANDARD_VGA_DRIVER(mode)) -+ if (IS_IN_STANDARD_VGA_DRIVER(mode)) -+ { -+ if (__svgalib_fbdev_novga) -+ return 0; -+ else - return __svgalib_vga_driverspecs.modeavailable(mode); -+ } - - if (fbdev_screeninfo(&info, mode)) - return 0; -@@ -356,7 +365,7 @@ - struct fb_var_screeninfo info; - int maxpixels = fbdev_memory; - -- if (!__svgalib_fbdev_novga && IS_IN_STANDARD_VGA_DRIVER(mode)) -+ if (IS_IN_STANDARD_VGA_DRIVER(mode)) - return __svgalib_vga_driverspecs.getmodeinfo(mode, modeinfo); - - if (modeinfo->bytesperpixel) -Only in svgalib-1.9.21/src/drivers: fbdev.c.wip -Only in svgalib-1.9.21/src: svgalib_helper.h -diff -urBbw svgalib-1.9.21.orig/src/vga.c svgalib-1.9.21/src/vga.c ---- svgalib-1.9.21.orig/src/vga.c 2005-07-30 15:22:24.000000000 +0200 -+++ svgalib-1.9.21/src/vga.c 2005-07-30 15:18:46.000000000 +0200 -@@ -471,8 +471,13 @@ - static unsigned long graph_buf_size = 0; - static unsigned char *graph_buf = NULL; /* saves graphics data during flip */ - --static unsigned char *font_buf1=NULL; /* saved font data - plane 2 */ --static unsigned char *font_buf2=NULL; /* saved font data - plane 3 */ -+/* The format of the fontdata seems to differ between banked and LFB access, -+ so we save both in case emulatepage gets set between saving and restoring. -+ This can happen when using runinbackground in nohelper secure mode. */ -+static unsigned char *font_buf1_banked=NULL; /* saved font data - plane 2 */ -+static unsigned char *font_buf2_banked=NULL; /* saved font data - plane 3 */ -+static unsigned char *font_buf1_linear=NULL; /* saved font data - plane 2 */ -+static unsigned char *font_buf2_linear=NULL; /* saved font data - plane 3 */ - static unsigned char *text_buf1=NULL; /* saved text data - plane 0 */ - static unsigned char *text_buf2=NULL; /* saved text data - plane 1 */ - -@@ -859,8 +864,49 @@ - - static void __svgalib_giveup_perm(void) - { -- if (CHIPSET != FBDEV) -+ if (CHIPSET != FBDEV) { - __svgalib_linear_mem_phys_addr = __svgalib_linear_mem_base; -+ /* Try get a pure handle to the LFB which can safely be left open -+ at all times, this will only work with 2.6 kernels. -+ This could be done in helper mode too, but we don't know the -+ real pci ID there, only the helper module id. Also this -+ is not usefull in helpermode since mem_fd must always be left -+ open in helpermode. */ -+ if (__svgalib_nohelper) { -+ unsigned int bus, device, fn; -+ char buf[256]; -+ FILE *f; -+ int i, fd; -+ -+ bus=(__svgalib_pci_card_found_at&0xff00)>>8; -+ device=(__svgalib_pci_card_found_at&0xf8)>>3; -+ fn=__svgalib_pci_card_found_at&0x07; -+ snprintf(buf, 256, "/sys/bus/pci/devices/0000:%02u:%02x.%u/resource", -+ bus, device, fn); -+ -+ f = fopen(buf, "r"); -+ if (f) { -+ for (i=0; fgets(buf, 256, f); i++) { -+ if (strtoul(buf, NULL, 16) == __svgalib_linear_mem_base) { -+ snprintf(buf, 256, -+ "/sys/bus/pci/devices/0000:%02u:%02x.%u/resource%i", -+ bus, device, fn, i); -+ fd = open(buf, O_RDWR); -+ if (fd != -1) { -+ __svgalib_linear_mem_fd = fd; -+ __svgalib_linear_mem_base = 0; -+#ifdef DEBUG -+ fprintf(stderr, "svgalib: debug: Opened: %s as LFB\n", -+ buf); -+#endif -+ } -+ break; -+ } -+ } -+ fclose(f); -+ } -+ } -+ } - - /* mmap graphics memory */ - map_mem(); -@@ -902,7 +948,7 @@ - - static void slowcpy(unsigned char *dest, unsigned char *src, unsigned bytes) - { -- if(dest==NULL || src==NULL || (int)dest==-1 || (int)src==-1) return; -+ if(dest==NULL || src==NULL || (long)dest==-1L || (long)src==-1L) return; - while (bytes > 0) { - *(uint32_t *)dest = *(uint32_t *)src; - dest+=4; -@@ -1649,16 +1695,30 @@ - save_text(); - - /* Allocate space for textmode font. */ -- font_buf1 = malloc(FONT_SIZE * 2); -- font_buf2 = font_buf1 + FONT_SIZE; -+ if (!__svgalib_emulatepage) -+ { -+ font_buf1_banked = malloc(FONT_SIZE * 2); -+ font_buf2_banked = font_buf1_banked + FONT_SIZE; -+ } -+ if (LINEAR_POINTER) -+ { -+ font_buf1_linear = malloc(FONT_SIZE * 2); -+ font_buf2_linear = font_buf1_linear + FONT_SIZE; -+ } - - /* save font data in plane 2 */ - __svgalib_outgra(0x04,0x02); -- slowcpy(font_buf1, GM, FONT_SIZE); -+ if (!__svgalib_emulatepage) -+ slowcpy(font_buf1_banked, GM, FONT_SIZE); -+ if (LINEAR_POINTER) -+ slowcpy(font_buf1_linear, LINEAR_POINTER, FONT_SIZE); - - /* save font data in plane 3 */ - __svgalib_outgra(0x04,0x03); -- slowcpy(font_buf2, GM, FONT_SIZE); -+ if (!__svgalib_emulatepage) -+ slowcpy(font_buf2_banked, GM, FONT_SIZE); -+ if (LINEAR_POINTER) -+ slowcpy(font_buf2_linear, LINEAR_POINTER, FONT_SIZE); - #endif - } - initialized = 1; -@@ -1907,11 +1967,17 @@ - /* restore font data in plane 2 - necessary for all VGA's */ - __svgalib_outseq(0x02,0x04); - -- slowcpy(GM, font_buf1, FONT_SIZE); -+ if (__svgalib_emulatepage) -+ slowcpy(LINEAR_POINTER, font_buf1_linear, FONT_SIZE); -+ else -+ slowcpy(GM, font_buf1_banked, FONT_SIZE); - - /* restore font data in plane 3 - necessary for Trident VGA's */ - __svgalib_outseq(0x02,0x08); -- slowcpy(GM, font_buf2, FONT_SIZE); -+ if (__svgalib_emulatepage) -+ slowcpy(LINEAR_POINTER, font_buf2_linear, FONT_SIZE); -+ else -+ slowcpy(GM, font_buf2_banked, FONT_SIZE); - fontloadingcomplete(); - #endif - /* change register adresses if monochrome text mode */ -@@ -1935,11 +2001,17 @@ - __svgalib_outgra(4,2); - __svgalib_outgra(5,0); - __svgalib_outgra(6,0); -- slowcpy(GM, font_buf1, FONT_SIZE); -+ if (__svgalib_emulatepage) -+ slowcpy(LINEAR_POINTER, font_buf1_linear, FONT_SIZE); -+ else -+ slowcpy(GM, font_buf1_banked, FONT_SIZE); - __svgalib_outseq(2,2); - slowcpy(GM, text_buf2, FONT_SIZE); - __svgalib_outseq(2,1); -- slowcpy(GM, font_buf1, FONT_SIZE); -+ if (__svgalib_emulatepage) -+ slowcpy(LINEAR_POINTER, font_buf1_linear, FONT_SIZE); -+ else -+ slowcpy(GM, font_buf1_banked, FONT_SIZE); - __svgalib_outseq(0,1); - __svgalib_outseq(2,3); - __svgalib_outseq(4,3); -@@ -1993,11 +2065,17 @@ - __svgalib_outgra(4,2); - __svgalib_outgra(5,0); - __svgalib_outgra(6,0); -- slowcpy(font_buf1, GM, FONT_SIZE); -+ if (__svgalib_emulatepage) -+ slowcpy(font_buf1_linear, LINEAR_POINTER, FONT_SIZE); -+ else -+ slowcpy(font_buf1_banked, GM, FONT_SIZE); - __svgalib_outgra(4,1); - slowcpy(text_buf2, GM, FONT_SIZE); - __svgalib_outseq(4,0); -- slowcpy(font_buf1, GM, FONT_SIZE); -+ if (__svgalib_emulatepage) -+ slowcpy(font_buf1_linear, LINEAR_POINTER, FONT_SIZE); -+ else -+ slowcpy(font_buf1_banked, GM, FONT_SIZE); - __svgalib_outseq(0,1); - __svgalib_outseq(2,3); - __svgalib_outseq(4,3); -@@ -2078,7 +2156,7 @@ +--- svgalib-1.9.21/src/vga.c.wip 2005-08-16 13:42:55.000000000 +0200 ++++ svgalib-1.9.21/src/vga.c 2005-08-16 13:42:55.000000000 +0200 +@@ -2165,9 +2165,8 @@ mouse_mode = mode; } if (__svgalib_emulatepage && (modeinfo->flags & CAPABLE_LINEAR) && - !(modeinfo->flags & IS_LINEAR)) { + !(modeinfo->flags & LINEAR_USE)) { __svgalib_driverspecs->linear(LINEAR_ENABLE, 0); - __svgalib_modeinfo_linearset |= IS_LINEAR; +- __svgalib_modeinfo_linearset |= IS_LINEAR; } -@@ -2097,6 +2175,12 @@ - void vga_gettextfont(void *font) - { - unsigned int getsize; -+ unsigned char *font_buf1; -+ -+ if (__svgalib_emulatepage) -+ font_buf1 = font_buf1_linear; -+ else -+ font_buf1 = font_buf1_banked; - - /* robert at debian.org, May, 26th 2002: check for valid font_buf buffer */ - if (!font_buf1) { -@@ -2115,6 +2199,15 @@ - void vga_puttextfont(void *font) - { - unsigned int putsize; -+ unsigned char *font_buf1, *font_buf2; -+ -+ if (__svgalib_emulatepage) { -+ font_buf1 = font_buf1_linear; -+ font_buf2 = font_buf2_linear; -+ } else { -+ font_buf1 = font_buf1_banked; -+ font_buf2 = font_buf2_banked; -+ } - - /* robert at debian.org, May, 26th 2002: check for valid font_buf buffer */ - if (!font_buf1 || !font_buf2) { -@@ -2236,7 +2328,7 @@ - - modeinfo = vga_getmodeinfo(mode); - if (__svgalib_emulatepage && (mode!=G320x200x256) && -- !(modeinfo->flags & (CAPABLE_LINEAR|IS_LINEAR))) -+ !(modeinfo->flags & (CAPABLE_LINEAR|LINEAR_USE))) - return 0; - - return 1; -@@ -3603,6 +3695,7 @@ - break; - #else - fprintf(stderr,"svgalib: Warning: VESA support not enabled!\n"); -+ break; - #endif - case 57: /* Vesa save bitmap */ - #ifdef INCLUDE_VESA_DRIVER -@@ -3915,21 +4008,51 @@ - __svgalib_come_from_background = va_arg(params, void *); - break; - default: -- if (__svgalib_nohelper && __svgalib_nohelper_secure && stat) { -+ if ( ( stat && __svgalib_runinbackground) || -+ (!stat && !__svgalib_runinbackground) ) -+ break; /* nothing todo */ -+ if (stat) { -+ if (__svgalib_readpage != __svgalib_writepage) { -+ fprintf(stderr, -+ "svgalib: Warning runinbackground does not support seperate\n" -+ "read- and writepages, ignoring runinbackground request.\n"); -+ break; -+ } -+ if (__svgalib_mem_fd == -1) { -+ vga_modeinfo *modeinfo = vga_getmodeinfo(CM); -+ /* we don't have /dev/mem available so we can't do runinbackground -+ with the real banked mem, see if we do have an fd for the LFB -+ and if it is ok to switch to emulating pages. */ -+ if ((__svgalib_linear_mem_fd != -1) && ( (CM == TEXT) || ( -+ ( (modeinfo->flags & CAPABLE_LINEAR) || -+ (modeinfo->flags & LINEAR_USE) ) && -+ (!STDVGAMODE(CM) || (CM == G320x200x256)) ))) { -+ /* only do this if we are not already emulating pages */ -+ if (!__svgalib_emulatepage) -+ { -+ __svgalib_emulatepage=1; -+ __svgalib_setrdpage=NULL; -+ __svgalib_setwrpage=NULL; -+ if (CM != TEXT) { -+ (*__svgalib_setpage)(vga_page_offset); -+ if ((modeinfo->flags & CAPABLE_LINEAR) && -+ !(modeinfo->flags & LINEAR_USE)) { -+ __svgalib_driverspecs->linear(LINEAR_ENABLE, 0); -+ __svgalib_modeinfo_linearset |= IS_LINEAR; -+ } -+ } -+ map_banked(MAP_FIXED); -+ } -+ } else { - fprintf(stderr, - "svgalib: Warning runinbackground not supported in nohelper mode, ignoring\n" - " runinbackground request. Program should check vga_runinbackground_version\n" - " before calling vga_runinbackground\n"); - break; - } -- if (stat && (__svgalib_readpage != __svgalib_writepage)) { -- fprintf(stderr, -- "svgalib: Warning runinbackground does not support seperate " -- "read- and writepages, ignoring\n" -- " runinbackground request.\n"); -- break; - } -- if (!stat) -+ } -+ else /* if (stat) */ - __svgalib_waitvtactive(); - __svgalib_runinbackground = stat; -@@ -3939,11 +4062,11 @@ + if (!flip) /* set graphics mode termio */ +@@ -2303,11 +2302,10 @@ + modeinfo.flags &= modeinfo_mask; + + /* Many cards have problems with linear 320x200x256 mode */ +- if(mode==G320x200x256)modeinfo.flags &= (~CAPABLE_LINEAR) & (~IS_LINEAR) ; ++ if(mode==G320x200x256)modeinfo.flags &= (~CAPABLE_LINEAR) & (~LINEAR_USE); + +- /* If all needed info is here, signal if linear support has been enabled */ +- if ((modeinfo.flags & (CAPABLE_LINEAR | EXT_INFO_AVAILABLE)) == +- (CAPABLE_LINEAR | EXT_INFO_AVAILABLE)) { ++ /* Signal if linear support has been enabled */ ++ if (modeinfo.flags & CAPABLE_LINEAR) { + modeinfo.flags |= __svgalib_modeinfo_linearset; + } + +@@ -2622,7 +2620,7 @@ + + size = VMEM; + alloc_graph_buf(size); +- if(__svgalib_modeinfo_linearset & LINEAR_USE) { ++ if( CAN_USE_LINEAR ) { + memcpy(graph_buf, LINEAR_POINTER, size); + } else { + page = 0; +@@ -2643,6 +2641,7 @@ + static void restorestate(void) + { + int i; ++ vga_modeinfo *modeinfo; + + vga_screenoff(); + +@@ -2658,6 +2657,12 @@ + if(saved_linear) + vga_setlinearaddressing(); + ++ modeinfo = vga_getmodeinfo(CM); ++ if (__svgalib_emulatepage && (modeinfo->flags & CAPABLE_LINEAR) && ++ !(modeinfo->flags & LINEAR_USE)) { ++ __svgalib_driverspecs->linear(LINEAR_ENABLE, 0); ++ } ++ + if (CM == G320x200x256 && VMEM <= 65536) { + memcpy(GM, graph_buf, 65536); + } else if (MODEX || CM == G800x600x16 || (STDVGAMODE(CM) && CM != G320x200x256)) { +@@ -2716,7 +2721,7 @@ + + DPRINTF("Restoring %dK of video memory.\n", (size + 2) / 1024); + +- if(__svgalib_modeinfo_linearset & LINEAR_USE) { ++ if( CAN_USE_LINEAR ) { + memcpy(LINEAR_POINTER, graph_buf, size); + } else { + page = 0; +@@ -4030,34 +4035,41 @@ + "read- and writepages, ignoring runinbackground request.\n"); + break; + } ++ /* If we don't have /dev/mem available we can't do runinbackground ++ * with the real banked mem, see if we do have an fd for the LFB ++ * and if it is ok to switch to emulating pages. */ + if (__svgalib_mem_fd == -1) { +- vga_modeinfo *modeinfo = vga_getmodeinfo(CM); +- /* we don't have /dev/mem available so we can't do runinbackground +- * with the real banked mem, see if we do have an fd for the LFB +- * and if it is ok to switch to emulating pages. */ +- if ((__svgalib_linear_mem_fd != -1) && ( (CM == TEXT) || ( +- ( (modeinfo->flags & CAPABLE_LINEAR) || +- (modeinfo->flags & LINEAR_USE) ) && +- (!STDVGAMODE(CM) || (CM == G320x200x256)) ))) { +- /* only do this if we are not already emulating pages */ +- if (!__svgalib_emulatepage) { +- __svgalib_emulatepage=1; ++ int hasmode = 0; ++ if (__svgalib_linear_mem_fd != -1) ++ { ++ if (!__svgalib_emulatepage) ++ { ++ /* see if we can do CM with emulatepage */ ++ __svgalib_emulatepage = 1; ++ hasmode = vga_hasmode(CM); ++ if (hasmode) { + __svgalib_setrdpage=NULL; + __svgalib_setwrpage=NULL; + if (CM != TEXT) { ++ vga_modeinfo *modeinfo = vga_getmodeinfo(CM); + (*__svgalib_setpage)(vga_page_offset); + if ((modeinfo->flags & CAPABLE_LINEAR) && + !(modeinfo->flags & LINEAR_USE)) { + __svgalib_driverspecs->linear(LINEAR_ENABLE, 0); +- __svgalib_modeinfo_linearset |= IS_LINEAR; + } + } + map_banked(MAP_FIXED); + } +- } else { ++ else ++ __svgalib_emulatepage = 0; ++ } ++ else ++ hasmode = 1; ++ } ++ if (!hasmode) { + fprintf(stderr, + "svgalib: Warning runinbackground not supported " +- "inohelper mode, ignoring\n" ++ "in nohelper mode, ignoring\n" + " runinbackground request. Program should check " + "vga_runinbackground_version\n" + " before calling vga_runinbackground\n"); +@@ -4075,31 +4087,33 @@ /* Program can check, if it is safe to in background. */ int vga_runinbackground_version(void) { -- /* we need to read the configfile here to get the correct value -- for __svgalib_nohelper and __svgalib_nohelper_secure */ -- readconfigfile(); -+ /* getchipset opens, maps and perhaps closes the LFB, -+ we need an open LFB to be able to runinbackground */ -+ __svgalib_getchipset(); +- vga_modeinfo *modeinfo; ++ const int runinbackground_version = 3; ++ int hasmode; + +- /* getchipset opens, maps and perhaps closes the LFB, ++ /* getchipset opens, maps and perhaps closes the LFB, + we need an open LFB to be able to runinbackground. + Also we need to know the chipset for getmodeinfo(). */ +- +- __svgalib_getchipset(); ++ __svgalib_getchipset(); -- if (__svgalib_nohelper && __svgalib_nohelper_secure) -+ if (__svgalib_linear_mem_fd == -1) - return 0; - - return 3; -Only in svgalib-1.9.21/src: vga.c.wip -Only in svgalib-1.9.21/src: vga.c~ -diff -urBbw svgalib-1.9.21.orig/src/vgapci.c svgalib-1.9.21/src/vgapci.c ---- svgalib-1.9.21.orig/src/vgapci.c 2005-07-30 15:22:24.000000000 +0200 -+++ svgalib-1.9.21/src/vgapci.c 2005-07-30 09:16:04.000000000 +0200 -@@ -10,6 +10,7 @@ - - int __svgalib_pci_helper_idev=0; - int __svgalib_pci_nohelper_idev=0; -+int __svgalib_pci_card_found_at=0; + if (__svgalib_mem_fd != -1) +- return 3; ++ return runinbackground_version; + +- if (__svgalib_linear_mem_fd == -1) +- return 0; +- + /* we don't have /dev/mem available so we can't do runinbackground + with the real banked mem, see if we do have an fd for the LFB + and if it is ok to switch to emulating pages. */ +- +- modeinfo = vga_getmodeinfo(CM); +- if ((__svgalib_linear_mem_fd != -1) && ( (CM == TEXT) || ( +- ( (modeinfo->flags & CAPABLE_LINEAR) || +- (modeinfo->flags & LINEAR_USE) ) && +- (!STDVGAMODE(CM) || (CM == G320x200x256)) ))) +- return 3; ++ if (__svgalib_linear_mem_fd == -1) ++ return 0; + ++ if (__svgalib_emulatepage) ++ return runinbackground_version; ++ ++ /* see if we can do CM with emulatepage */ ++ __svgalib_emulatepage = 1; ++ hasmode = vga_hasmode(CM); ++ __svgalib_emulatepage = 0; ++ if (hasmode) ++ return runinbackground_version; ++ + return 0; + } - static void proc_pci_read_config(int device, unsigned int *buf, int size) - { -@@ -57,6 +58,7 @@ - if(((conf[0]&0xffff)==vendor)&& - (((conf[2]>>16)&0xffff)==0x0300)) { /* VGA Class */ - proc_pci_read_config(device,conf,16); -+ __svgalib_pci_card_found_at = device; - return device; - } - } -Only in svgalib-1.9.21/src: vgapci.c.wip -diff -urBbw svgalib-1.9.21.orig/src/vgapci.h svgalib-1.9.21/src/vgapci.h ---- svgalib-1.9.21.orig/src/vgapci.h 2005-07-30 15:22:24.000000000 +0200 -+++ svgalib-1.9.21/src/vgapci.h 2005-07-30 09:16:04.000000000 +0200 -@@ -1,6 +1,7 @@ - extern int __svgalib_pci_find_vendor_vga_pos(unsigned int vendor, unsigned int *conf); - extern int __svgalib_pci_helper_idev; - extern int __svgalib_pci_nohelper_idev; -+extern int __svgalib_pci_card_found_at; - extern void __svgalib_pci_write_config_dword(int pos, int address, unsigned int data); - extern unsigned int __svgalib_pci_read_config_dword(int pos, int address); - extern unsigned long __svgalib_pci_read_aperture_len(int pos, int address); -Only in svgalib-1.9.21/src: vgapci.h.wip -Only in svgalib-1.9.21/threeDKit: 3dinit.o -Only in svgalib-1.9.21/threeDKit: 3dkit.o -Only in svgalib-1.9.21/threeDKit: lib3dkit.so.1.9.22 -Only in svgalib-1.9.21/threeDKit: quickmath.o -Only in svgalib-1.9.21/threeDKit: swtriangle.o -Only in svgalib-1.9.21/threeDKit: triangl.o -Only in svgalib-1.9.21/threeDKit: triangle.o -Only in svgalib-1.9.21/threeDKit: wrapsurf.o -Only in svgalib-1.9.21/threeDKit: wtriangle.o -Only in svgalib-1.9.21/utils: .depend -Only in svgalib-1.9.21/utils: convfont -Only in svgalib-1.9.21/utils: convfont.o -Only in svgalib-1.9.21/utils: dumpreg -Only in svgalib-1.9.21/utils: dumpreg.o -Only in svgalib-1.9.21/utils: gtfcalc -Only in svgalib-1.9.21/utils: restorefont -Only in svgalib-1.9.21/utils: restorefont.o -Only in svgalib-1.9.21/utils: restorepalette -Only in svgalib-1.9.21/utils: restorepalette.o -Only in svgalib-1.9.21/utils: restoretextmode -Only in svgalib-1.9.21/utils: restoretextmode.o +--- svgalib-1.9.21/src/vgamisc.c.wip 2005-08-16 13:42:55.000000000 +0200 ++++ svgalib-1.9.21/src/vgamisc.c 2005-08-16 13:42:55.000000000 +0200 +@@ -55,7 +55,7 @@ + + /* + * The way IS_LINEAR gets indicated is rather convoluted; if the driver +- * has EXT_INFO_AVAILABLE, setlinearaddressing will enable ++ * is CAPABLE_LINEAR, setlinearaddressing will enable + * the flag in __svgalib_linearset which gets set in the modeinfo by + * vga_getmodeinfo(). The driver must turn off the flag in + * __svgalib_linearset if linear addressing gets disabled (e.g. when +--- svgalib-1.9.21/src/drivers/r128.c.wip 2005-08-16 13:43:21.000000000 +0200 ++++ svgalib-1.9.21/src/drivers/r128.c 2005-08-16 13:47:09.000000000 +0200 +@@ -1033,7 +1033,9 @@ + ModeTiming *modetiming; + ModeInfo *modeinfo; + +- modeinfo = __svgalib_createModeInfoStructureForSvgalibMode(mode); ++ /* On radeon's 320x200x256 (INT13) only works with the real banked mem */ ++ if ((chiptype==Radeon) && (mode==G320x200x256) && __svgalib_emulatepage) ++ return 0; + + if (IS_IN_STANDARD_VGA_DRIVER(mode)) + return __svgalib_vga_driverspecs.modeavailable(mode); svgalib-1.9.22.diff: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.1 -r 1.2 svgalib-1.9.22.diff Index: svgalib-1.9.22.diff =================================================================== RCS file: /cvs/extras/rpms/svgalib/devel/svgalib-1.9.22.diff,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- svgalib-1.9.22.diff 5 Aug 2005 09:37:40 -0000 1.1 +++ svgalib-1.9.22.diff 16 Aug 2005 11:55:30 -0000 1.2 @@ -35,6 +35,19 @@ # NO_HELPER = y # uncomment this if your compiler fails on compiling the assembler in +diff -X xclude -ubBwrN svgalib-1.9.21/demos/accel.c svgalib-1.9.22/demos/accel.c +--- svgalib-1.9.21/demos/accel.c 2002-04-03 10:30:23.000000000 +0300 ++++ svgalib-1.9.22/demos/accel.c 2005-08-03 16:07:31.000000000 +0300 +@@ -924,7 +924,8 @@ + void QixDemo(int rop, char *txt) { + int current = 0, dx1, dy1, dx2, dy2, i, cols = 1, cx1, cx2, cy1, cy2; + int startclock, diffclock; +- unsigned long pixels = 0, numlines = 0; ++ unsigned long pixels = 0; ++ unsigned int numlines = 0; + struct { + unsigned short x1; + unsigned short y1; diff -X xclude -ubBwrN svgalib-1.9.21/demos/bg_test.c svgalib-1.9.22/demos/bg_test.c --- svgalib-1.9.21/demos/bg_test.c 2000-01-06 14:12:36.000000000 +0200 +++ svgalib-1.9.22/demos/bg_test.c 2005-07-16 22:59:22.000000000 +0300 @@ -55,6 +68,33 @@ printf("Test ended.\n"); return(0); } +diff -X xclude -ubBwrN svgalib-1.9.21/demos/memset.c svgalib-1.9.22/demos/memset.c +--- svgalib-1.9.21/demos/memset.c 2002-07-20 19:58:13.000000000 +0300 ++++ svgalib-1.9.22/demos/memset.c 2005-08-03 16:07:31.000000000 +0300 +@@ -26,7 +26,7 @@ + + #undef memset + +-#define op_t unsigned long int ++#define op_t unsigned int + #define OPSIZ 4 + + +diff -X xclude -ubBwrN svgalib-1.9.21/demos/spin.c svgalib-1.9.22/demos/spin.c +--- svgalib-1.9.21/demos/spin.c 2000-01-06 14:12:36.000000000 +0200 ++++ svgalib-1.9.22/demos/spin.c 2005-08-03 16:07:31.000000000 +0300 +@@ -78,9 +78,9 @@ + + #define HORIZONTAL 0 + +-typedef unsigned int WORD; ++typedef unsigned short WORD; + typedef unsigned char BYTE; +-typedef unsigned long DWORD; ++typedef unsigned int DWORD; + + typedef struct { + float x, y, z; diff -X xclude -ubBwrN svgalib-1.9.21/demos/testgl.c svgalib-1.9.22/demos/testgl.c --- svgalib-1.9.21/demos/testgl.c 2002-04-03 10:31:14.000000000 +0300 +++ svgalib-1.9.22/demos/testgl.c 2005-07-27 14:46:06.000000000 +0300 @@ -192,6 +232,61 @@ +.SH AUTHOR +This manual page was written by Guillem Jover . + +diff -X xclude -ubBwrN svgalib-1.9.21/gl/driver.c svgalib-1.9.22/gl/driver.c +--- svgalib-1.9.21/gl/driver.c 2000-04-18 12:45:18.000000000 +0300 ++++ svgalib-1.9.22/gl/driver.c 2005-08-03 16:07:31.000000000 +0300 +@@ -1135,7 +1135,7 @@ + { + char *vp; + ASSIGNVP32(x1, y, vp); +- __memsetlong(vp, c, x2 - x1 + 1); ++ __memset4(vp, c, x2 - x1 + 1); + } + + void __svgalib_driver32p_hline(int x1, int y, int x2, int c) +@@ -1148,11 +1148,11 @@ + SETWRITEPAGED(vp, rvp, chunksize, page); + l = (x2 - x1 + 1) * 4; + if (l <= chunksize) +- __memsetlong(rvp, c, l / 4); ++ __memset4(rvp, c, l / 4); + else { +- __memsetlong(rvp, c, chunksize / 4); ++ __memset4(rvp, c, chunksize / 4); + vga_setpage(page + 1); +- __memsetlong(VBUF, c, (l - chunksize) / 4); ++ __memset4(VBUF, c, (l - chunksize) / 4); + } + } + +@@ -1162,7 +1162,7 @@ + int i; + ASSIGNVP32(x, y, vp); + for (i = 0; i < h; i++) { +- __memsetlong(vp, c, w); ++ __memset4(vp, c, w); + vp += BYTEWIDTH; + } + } +@@ -1183,15 +1183,15 @@ + vga_setpage(page); + vp &= 0xffff; + } else { /* page break within line */ +- __memsetlong(VBUF + vp, c, (0x10000 - vp) / 4); ++ __memset4(VBUF + vp, c, (0x10000 - vp) / 4); + page++; + vga_setpage(page); +- __memsetlong(VBUF, c, ((vp + w * 4) & 0xffff) / 4); ++ __memset4(VBUF, c, ((vp + w * 4) & 0xffff) / 4); + vp = (vp + BYTEWIDTH) & 0xffff; + continue; + } + }; +- __memsetlong(VBUF + vp, c, w); ++ __memset4(VBUF + vp, c, w); + vp += BYTEWIDTH; + } + } diff -X xclude -ubBwrN svgalib-1.9.21/gl/grlib.c svgalib-1.9.22/gl/grlib.c --- svgalib-1.9.21/gl/grlib.c 2002-04-19 11:15:31.000000000 +0300 +++ svgalib-1.9.22/gl/grlib.c 2005-07-27 14:48:42.000000000 +0300 @@ -203,6 +298,60 @@ #include #include "inlstring.h" /* include inline string operations */ +diff -X xclude -ubBwrN svgalib-1.9.21/gl/inlstring.h svgalib-1.9.22/gl/inlstring.h +--- svgalib-1.9.21/gl/inlstring.h 2005-04-17 10:07:19.000000000 +0300 ++++ svgalib-1.9.22/gl/inlstring.h 2005-08-03 16:07:31.000000000 +0300 +@@ -11,9 +11,8 @@ + #define __memsetb(dst,c,n) memset((dst),(c),(n)) + #define __memset(dst,c,n) memset((dst),(c),(n)) + +-static inline void *__memsetlong(void *s, long c, size_t count) { +- long *p=s; +- int i; ++static inline void *__memset4(void *s, int c, size_t count) { ++ int i, *p=s; + for(i=0;i>8); \ + *((unsigned char *) (vp + 2)) = (c>>16); + +-#define insert_pixel_4 *((unsigned long *) vp) = c; ++#define insert_pixel_4 *((unsigned int *) vp) = c; + + bytesperrow = BYTEWIDTH; + +@@ -301,7 +301,7 @@ + *((unsigned char *) (vp + fp + 1)) = (c>>8); \ + *((unsigned char *) (vp + fp + 2)) = (c>>16); + +-#define insert_pixel_4 *((unsigned long *) (vp + fp)) = c; ++#define insert_pixel_4 *((unsigned int *) (vp + fp)) = c; + + + if (MODETYPE == CONTEXT_PAGED) { diff -X xclude -ubBwrN svgalib-1.9.21/gl/text.c svgalib-1.9.22/gl/text.c --- svgalib-1.9.21/gl/text.c 2000-03-08 21:04:38.000000000 +0200 +++ svgalib-1.9.22/gl/text.c 2005-07-02 18:41:38.000000000 +0300 @@ -303,9 +452,131 @@ endif ifdef DEBUG_ACCEL DEFINES += -DDEBUG_ACCEL +diff -X xclude -ubBwrN svgalib-1.9.21/src/clockchip/clockchip.h svgalib-1.9.22/src/clockchip/clockchip.h +--- svgalib-1.9.21/src/clockchip/clockchip.h 1997-06-22 18:46:22.000000000 +0300 ++++ svgalib-1.9.22/src/clockchip/clockchip.h 2005-08-03 16:07:31.000000000 +0300 +@@ -25,7 +25,7 @@ + void (*DAC_restoreState) (const unsigned char *regs); + void (*DAC_initializeState) (unsigned char *regs, int bpp, int colormode, + int pixelclock); +- long TextFrequency; ++ int TextFrequency; + int DAC_stateSize; + } ClockChipMethods; [...4259 lines suppressed...] + { +- return (long) x *x; ++ return (int) x *x; + } + + extern inline double fmax (double a, double b) +diff -X xclude -ubBwrN svgalib-1.9.21/threeDKit/tri.c svgalib-1.9.22/threeDKit/tri.c +--- svgalib-1.9.21/threeDKit/tri.c 2002-07-20 19:34:53.000000000 +0300 ++++ svgalib-1.9.22/threeDKit/tri.c 2005-08-03 16:07:32.000000000 +0300 +@@ -52,18 +52,18 @@ + void (*colhline_neg) (void); + + int dir; +- long X; ++ int X; + +- long nz; +- long g0, g1h = 0, g1l = 0; ++ int nz; ++ int g0, g1h = 0, g1l = 0; + #ifdef INTERP +- long c0; +- long c_y; ++ int c0; ++ int c_y; + #endif + #ifdef WRAP +- long X0, Y0; ++ int X0, Y0; + int bf = tri->bf; +- long xd_y, yd_y; ++ int xd_y, yd_y; + #endif + + dir = 1; +@@ -197,11 +197,11 @@ + + if (y2 == y0) + return; +- g0 = ((long) (x2 - x0) << SHLB) / (y2 - y0); ++ g0 = ((int) (x2 - x0) << SHLB) / (y2 - y0); + if (y1 != y0) +- g1h = ((long) (x1 - x0) << SHLB) / (y1 - y0); ++ g1h = ((int) (x1 - x0) << SHLB) / (y1 - y0); + if (y2 != y1) +- g1l = ((long) (x2 - x1) << SHLB) / (y2 - y1); ++ g1l = ((int) (x2 - x1) << SHLB) / (y2 - y1); + + dir = dir & 1; + +diff -X xclude -ubBwrN svgalib-1.9.21/threeDKit/triangl.c svgalib-1.9.22/threeDKit/triangl.c +--- svgalib-1.9.21/threeDKit/triangl.c 1997-10-03 20:34:37.000000000 +0200 ++++ svgalib-1.9.22/threeDKit/triangl.c 2005-08-03 16:07:32.000000000 +0300 +@@ -146,33 +146,33 @@ + + + static int px1, px2, py; +-static long c; ++static int c; + + #ifdef INTERP +-static long c_x; ++static int c_x; + #endif + + #ifdef WRAP +-static long xd, xd_x, yd, yd_x; ++static int xd, xd_x, yd, yd_x; + static unsigned char *dat; + #endif + +-static long dx0, dy0; ++static int dx0, dy0; + + #if defined(WRAP) && defined(INTERP) + + /* this must only occur once */ + +-long color_lookup[TRIANGLE_COLOR_LOOKUP_TABLE_SIZE]; +-static long *_color_lookup; ++int color_lookup[TRIANGLE_COLOR_LOOKUP_TABLE_SIZE]; ++static int *_color_lookup; + +-void gl_trisetcolorlookup (int i, long c) ++void gl_trisetcolorlookup (int i, int c) + { + if(i < TRIANGLE_COLOR_LOOKUP_TABLE_SIZE) + color_lookup[i] = c; + } + +-long gl_trigetcolorlookup (int i) ++int gl_trigetcolorlookup (int i) + { + if(i < TRIANGLE_COLOR_LOOKUP_TABLE_SIZE) + return color_lookup[i]; +@@ -189,8 +189,8 @@ + + #else + +-extern long color_lookup[TRIANGLE_COLOR_LOOKUP_TABLE_SIZE]; +-static long *_color_lookup; ++extern int color_lookup[TRIANGLE_COLOR_LOOKUP_TABLE_SIZE]; ++static int *_color_lookup; + extern void (*tri_drawpoint) (int, int, int); + static void (*_tri_drawpoint) (int, int, int); + +diff -X xclude -ubBwrN svgalib-1.9.21/threeDKit/triangle.h svgalib-1.9.22/threeDKit/triangle.h +--- svgalib-1.9.21/threeDKit/triangle.h 1997-06-06 00:52:43.000000000 +0300 ++++ svgalib-1.9.22/threeDKit/triangle.h 2005-08-03 16:07:32.000000000 +0300 +@@ -23,7 +23,7 @@ + + void gl_striangle (int x0, int y0, int x1, int y1, int x2, int y2, int color, int bf); + +-void gl_trisetcolorlookup (int i, long c); +-long gl_trigetcolorlookup (int i); ++void gl_trisetcolorlookup (int i, int c); ++int gl_trigetcolorlookup (int i); + + void gl_trisetdrawpoint (void (setpixelfunc) (int, int, int)); +diff -X xclude -ubBwrN svgalib-1.9.21/threeDKit/trisetpixel.c svgalib-1.9.22/threeDKit/trisetpixel.c +--- svgalib-1.9.21/threeDKit/trisetpixel.c 1997-10-03 20:34:41.000000000 +0200 ++++ svgalib-1.9.22/threeDKit/trisetpixel.c 2005-08-03 16:07:32.000000000 +0300 +@@ -219,7 +219,7 @@ + unsigned short offst; + int pg; + declarevp; +- long vp = 0; ++ int vp = 0; + if (__clip) { + if (y < __clipy1 || y > __clipy2) + return; +@@ -275,7 +275,7 @@ + unsigned short offst; + int pg; + declarevp; +- long vp = 0; ++ int vp = 0; + if (__clip) { + if (y < __clipy1 || y > __clipy2) + return; diff -X xclude -ubBwrN svgalib-1.9.21/threeDKit/wrapdemo.c svgalib-1.9.22/threeDKit/wrapdemo.c --- svgalib-1.9.21/threeDKit/wrapdemo.c 2000-02-19 11:16:02.000000000 +0200 -+++ svgalib-1.9.22/threeDKit/wrapdemo.c 2005-05-13 00:54:42.000000000 +0300 ++++ svgalib-1.9.22/threeDKit/wrapdemo.c 2005-08-03 16:07:32.000000000 +0300 +@@ -105,7 +105,7 @@ + void xchgxy (TD_Surface * surf) + { + int j; +- long t; ++ int t; + + for (j = 0; j < surf->l * surf->w; j++) { + t = surf->point[j].x; +@@ -169,7 +169,7 @@ + /* These two are scale factors for the screen: */ + /* xscale is now calculated so that the maximum volume (-2^15 to 2^15 or + -2^31 to 2^31) will just fit inside the screen width at this distance: */ +- ellip_demo->xscale = (long) ellip_demo->distance * EL_screen_width / (32768 * 2); ++ ellip_demo->xscale = (int) ellip_demo->distance * EL_screen_width / (32768 * 2); + ellip_demo->yscale = (float) ellip_demo->xscale * EL_SCREEN_ASPECT + * EL_screen_height / EL_screen_width; /*to get display aspect square */ + @@ -491,7 +491,7 @@ } @@ -6748,6 +9206,34 @@ { int i; int mode[7] = {5, 6, 7, 8, 10, 11, 12}; +diff -X xclude -ubBwrN svgalib-1.9.21/threeDKit/wrapsurf.c svgalib-1.9.22/threeDKit/wrapsurf.c +--- svgalib-1.9.21/threeDKit/wrapsurf.c 1997-10-03 20:34:52.000000000 +0200 ++++ svgalib-1.9.22/threeDKit/wrapsurf.c 2005-08-03 16:07:32.000000000 +0300 +@@ -90,15 +90,15 @@ + int, int, int, int, int, + TD_tridata *) = s->draw_wtriangle; + int mesh; +- long d1, d2, d3, d4, d; +- long x1, y1, c1; +- long x2, y2, c2; +- long x3, y3, c3; +- long x4, y4, c4; +- long u1, v1; +- long u2, v2; +- long u3, v3; +- long u4, v4; ++ int d1, d2, d3, d4, d; ++ int x1, y1, c1; ++ int x2, y2, c2; ++ int x3, y3, c3; ++ int x4, y4, c4; ++ int u1, v1; ++ int u2, v2; ++ int u3, v3; ++ int u4, v4; + int furthest, clockwise = 0; + TD_tridata tri; + diff -X xclude -ubBwrN svgalib-1.9.21/utils/convfont.c svgalib-1.9.22/utils/convfont.c --- svgalib-1.9.21/utils/convfont.c 1995-09-30 16:50:30.000000000 +0200 +++ svgalib-1.9.22/utils/convfont.c 2005-07-02 18:41:37.000000000 +0300 Index: svgalib.spec =================================================================== RCS file: /cvs/extras/rpms/svgalib/devel/svgalib.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- svgalib.spec 7 Aug 2005 07:49:52 -0000 1.4 +++ svgalib.spec 16 Aug 2005 11:55:30 -0000 1.5 @@ -1,6 +1,6 @@ Name: svgalib Version: 1.9.21 -Release: 4 +Release: 5 Exclusivearch: %{ix86} x86_64 Summary: Low-level fullscreen SVGA graphics library @@ -14,11 +14,8 @@ Patch2: svgalib-1.4.3-fhs.patch Patch3: svgalib-1.9.21-demos.patch Patch4: svgalib-1.9.21-wip.patch -Patch5: svgalib-1.9.21-wip2.patch -Patch6: svgalib-1.9.21-cfg.patch -Patch7: svgalib-1.9.21-x86_64.patch -Patch8: svgalib-1.9.21-ppc.patch -Patch9: svgalib-1.9.21-wip3.patch +Patch5: svgalib-1.9.21-cfg.patch +Patch6: svgalib-1.9.21-x86_64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Provides: libvga = %{version}-%{release} @@ -47,13 +44,10 @@ %patch2 -p1 -b .fhs %patch3 -p1 %patch4 -p1 -b .wip -%patch5 -p1 -b .wip2 -%patch6 -p1 -b .defaultcfg +%patch5 -p1 -b .defaultcfg %ifnarch %{ix86} -%patch7 -p1 -b .x86_64 +%patch6 -p1 -b .x86_64 %endif -#%patch8 -p1 -b .ppc -%patch9 -p1 -b .wip3 #the testlinear demo needs svgalib's internal libvga header, so copy it to the #demo dir @@ -135,6 +129,9 @@ %{_mandir}/man3/* %changelog +* Tue Aug 16 2005 Hans de Goede 1.9.21-5 +- Merge with upstream, drop merged patches, fix dark vga modes on radeon. + * Sun Aug 7 2005 Hans de Goede 1.9.21-4 - Add patch 9 which fixes 320x200x256(mode 5) on atleast radeons and probably others too. --- svgalib-1.9.21-ppc.patch DELETED --- --- svgalib-1.9.21-wip2.patch DELETED --- --- svgalib-1.9.21-wip3.patch DELETED --- From fedora-extras-commits at redhat.com Tue Aug 16 12:38:42 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Tue, 16 Aug 2005 08:38:42 -0400 Subject: rpms/abicheck/devel abicheck.spec,1.17,1.18 Message-ID: <200508161238.j7GCcg3V021104@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/abicheck/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21087 Modified Files: abicheck.spec Log Message: testing Index: abicheck.spec =================================================================== RCS file: /cvs/extras/rpms/abicheck/devel/abicheck.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- abicheck.spec 15 Aug 2005 20:27:51 -0000 1.17 +++ abicheck.spec 16 Aug 2005 12:38:40 -0000 1.18 @@ -47,8 +47,10 @@ %check cd test make private1 public1 -../abicheck ./private1 || : -../abicheck ./public1 || : +for a in $(seq 1 50); do ( + ../abicheck ./public1 || : + ../abicheck ./private1 | egrep 'PRIVATE:.*libc.*(__open|__nanosleep)' || : +); done cd - make test : From fedora-extras-commits at redhat.com Tue Aug 16 12:42:35 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Tue, 16 Aug 2005 08:42:35 -0400 Subject: rpms/i8kutils/devel i8kbuttons.init,1.3,1.4 i8kutils.spec,1.6,1.7 Message-ID: <200508161242.j7GCgZvj021202@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/i8kutils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21170/devel Modified Files: i8kbuttons.init i8kutils.spec Log Message: Enhancements and fixes. Index: i8kbuttons.init =================================================================== RCS file: /cvs/extras/rpms/i8kutils/devel/i8kbuttons.init,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- i8kbuttons.init 16 Nov 2004 17:50:53 -0000 1.3 +++ i8kbuttons.init 16 Aug 2005 12:42:33 -0000 1.4 @@ -16,25 +16,23 @@ . /etc/init.d/functions prog=i8kbuttons -aumix=/usr/bin/aumix -amount=4 +amixer=/usr/bin/amixer +amount="10%" RETVAL=0 # See how we were called. case "$1" in start) -# Original -# OPTIONS="--up '$aumix -v +$amount' --down '$aumix -v -$amount' --mute '$aumix -v 0'" - OPTIONS="--up '$aumix -v +$amount; $aumix -w +$amount' --down '$aumix -v -$amount; $aumix -w -$amount' --mute '$aumix -v 0; $aumix -w 0'" echo -n $"Starting $prog: " - /sbin/modprobe i8k - /sbin/initlog $INITLOG_ARGS -c "$prog $OPTIONS" & - RETVAL=$? - if [ $RETVAL -eq 0 ]; then - success - touch /var/lock/subsys/$prog + /sbin/modprobe i8k force=1 + if pidofproc $prog &>/dev/null; then + echo_failure + RETVAL=1 else - failure + $prog --up "$amixer -q set Master $amount+" --down "$amixer -q set Master $amount-" --mute "$amixer -q set Master 0" & + echo_success + touch /var/lock/subsys/$prog + RETVAL=0 fi echo ;; Index: i8kutils.spec =================================================================== RCS file: /cvs/extras/rpms/i8kutils/devel/i8kutils.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- i8kutils.spec 6 Apr 2005 22:12:02 -0000 1.6 +++ i8kutils.spec 16 Aug 2005 12:42:33 -0000 1.7 @@ -1,12 +1,9 @@ -# $Id$ - %define gkrellmpluginver 2.5 Summary: Dell laptop (Inspiron 8000 and others) SMM BIOS support tools Name: i8kutils Version: 1.25 -Release: 3 - +Release: 4%{?dist} License: GPL Group: System Environment/Base URL: http://people.debian.org/~dz/i8k/ @@ -14,12 +11,10 @@ Source1: http://www.coding-zone.com/i8krellm-%{gkrellmpluginver}.tar.gz Source2: i8kbuttons.init BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -Requires: gkrellm >= 2.0.0 +Requires: alsa-utils, gkrellm >= 2.0.0 Requires(post): /sbin/chkconfig Requires(preun): /sbin/chkconfig, /sbin/service BuildRequires: gkrellm-devel >= 2.0.0 -# Stock Red Hat / Fedora gkrellm-devel should require these -BuildRequires: gtk2-devel, pkgconfig # This package is only relevant on Dell laptops, thus i386 only ExclusiveArch: i386 @@ -30,8 +25,6 @@ for example cooling fans and volume buttons. Also provided is a cool and useful plugin for gkrellm. -Note that you need the "Inspiron 8000" option compiled into your kernel -(included in the main kernel tree since 2.4.14-pre8). %prep @@ -59,7 +52,8 @@ %{__cp} -a i8krellm.so %{buildroot}%{_libdir}/gkrellm2/plugins/ popd -%{__install} -D -m 755 %{SOURCE2} %{buildroot}%{_initrddir}/i8kbuttons +%{__install} -D -m 755 %{SOURCE2} \ + %{buildroot}%{_sysconfdir}/rc.d/init.d/i8kbuttons %post @@ -67,7 +61,7 @@ %preun if [ $1 -eq 0 ]; then - /sbin/service i8kbuttons stop >/dev/null 2>&1 + /sbin/service i8kbuttons stop &>/dev/null /sbin/chkconfig --del i8kbuttons fi @@ -81,14 +75,26 @@ %doc README.i8kutils i8kmon.conf %doc i8krellm-%{gkrellmpluginver}/AUTHORS i8krellm-%{gkrellmpluginver}/README %doc i8krellm-%{gkrellmpluginver}/Changelog -%{_initrddir}/i8kbuttons +%{_sysconfdir}/rc.d/init.d/i8kbuttons %{_bindir}/* %{_libdir}/gkrellm2/plugins/* %{_mandir}/man1/* %changelog -* Fri Apr 7 2005 Michael Schwendt +* Tue Aug 16 2005 Matthias Saou 1.25-4 +- Fix init script to use amixer instead of no longer provided aumix (#165555). +- Fix init script to not use obsolete initlog anymore. +- Use force=1 argument to i8k kernel module since many recent laptops (i.e. my + Inspiron 8600) aren't recognized by the module, but can use it nevertheless + to control the fans and get the Dell service tag. +- Disable the init script, which is only useful with the Dell specific buttons, + by default for the above reason (my media keys work fine with ACME/GNOME). +- Remove obsolete description bit. +- Remove obsolete build requires missing from old gkrellm-devel packages. +- Add alsa-utils requirement for amixer. + +* Fri Apr 7 2005 Michael Schwendt 1.25-3 - rebuilt * Tue Nov 16 2004 Matthias Saou 1.25-2 From fedora-extras-commits at redhat.com Tue Aug 16 12:42:35 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Tue, 16 Aug 2005 08:42:35 -0400 Subject: rpms/i8kutils/FC-4 i8kbuttons.init,1.3,1.4 i8kutils.spec,1.6,1.7 Message-ID: <200508161242.j7GCgZ64021209@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/i8kutils/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21170/FC-4 Modified Files: i8kbuttons.init i8kutils.spec Log Message: Enhancements and fixes. Index: i8kbuttons.init =================================================================== RCS file: /cvs/extras/rpms/i8kutils/FC-4/i8kbuttons.init,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- i8kbuttons.init 16 Nov 2004 17:50:53 -0000 1.3 +++ i8kbuttons.init 16 Aug 2005 12:42:33 -0000 1.4 @@ -16,25 +16,23 @@ . /etc/init.d/functions prog=i8kbuttons -aumix=/usr/bin/aumix -amount=4 +amixer=/usr/bin/amixer +amount="10%" RETVAL=0 # See how we were called. case "$1" in start) -# Original -# OPTIONS="--up '$aumix -v +$amount' --down '$aumix -v -$amount' --mute '$aumix -v 0'" - OPTIONS="--up '$aumix -v +$amount; $aumix -w +$amount' --down '$aumix -v -$amount; $aumix -w -$amount' --mute '$aumix -v 0; $aumix -w 0'" echo -n $"Starting $prog: " - /sbin/modprobe i8k - /sbin/initlog $INITLOG_ARGS -c "$prog $OPTIONS" & - RETVAL=$? - if [ $RETVAL -eq 0 ]; then - success - touch /var/lock/subsys/$prog + /sbin/modprobe i8k force=1 + if pidofproc $prog &>/dev/null; then + echo_failure + RETVAL=1 else - failure + $prog --up "$amixer -q set Master $amount+" --down "$amixer -q set Master $amount-" --mute "$amixer -q set Master 0" & + echo_success + touch /var/lock/subsys/$prog + RETVAL=0 fi echo ;; Index: i8kutils.spec =================================================================== RCS file: /cvs/extras/rpms/i8kutils/FC-4/i8kutils.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- i8kutils.spec 6 Apr 2005 22:12:02 -0000 1.6 +++ i8kutils.spec 16 Aug 2005 12:42:33 -0000 1.7 @@ -1,12 +1,9 @@ -# $Id$ - %define gkrellmpluginver 2.5 Summary: Dell laptop (Inspiron 8000 and others) SMM BIOS support tools Name: i8kutils Version: 1.25 -Release: 3 - +Release: 4%{?dist} License: GPL Group: System Environment/Base URL: http://people.debian.org/~dz/i8k/ @@ -14,12 +11,10 @@ Source1: http://www.coding-zone.com/i8krellm-%{gkrellmpluginver}.tar.gz Source2: i8kbuttons.init BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -Requires: gkrellm >= 2.0.0 +Requires: alsa-utils, gkrellm >= 2.0.0 Requires(post): /sbin/chkconfig Requires(preun): /sbin/chkconfig, /sbin/service BuildRequires: gkrellm-devel >= 2.0.0 -# Stock Red Hat / Fedora gkrellm-devel should require these -BuildRequires: gtk2-devel, pkgconfig # This package is only relevant on Dell laptops, thus i386 only ExclusiveArch: i386 @@ -30,8 +25,6 @@ for example cooling fans and volume buttons. Also provided is a cool and useful plugin for gkrellm. -Note that you need the "Inspiron 8000" option compiled into your kernel -(included in the main kernel tree since 2.4.14-pre8). %prep @@ -59,7 +52,8 @@ %{__cp} -a i8krellm.so %{buildroot}%{_libdir}/gkrellm2/plugins/ popd -%{__install} -D -m 755 %{SOURCE2} %{buildroot}%{_initrddir}/i8kbuttons +%{__install} -D -m 755 %{SOURCE2} \ + %{buildroot}%{_sysconfdir}/rc.d/init.d/i8kbuttons %post @@ -67,7 +61,7 @@ %preun if [ $1 -eq 0 ]; then - /sbin/service i8kbuttons stop >/dev/null 2>&1 + /sbin/service i8kbuttons stop &>/dev/null /sbin/chkconfig --del i8kbuttons fi @@ -81,14 +75,26 @@ %doc README.i8kutils i8kmon.conf %doc i8krellm-%{gkrellmpluginver}/AUTHORS i8krellm-%{gkrellmpluginver}/README %doc i8krellm-%{gkrellmpluginver}/Changelog -%{_initrddir}/i8kbuttons +%{_sysconfdir}/rc.d/init.d/i8kbuttons %{_bindir}/* %{_libdir}/gkrellm2/plugins/* %{_mandir}/man1/* %changelog -* Fri Apr 7 2005 Michael Schwendt +* Tue Aug 16 2005 Matthias Saou 1.25-4 +- Fix init script to use amixer instead of no longer provided aumix (#165555). +- Fix init script to not use obsolete initlog anymore. +- Use force=1 argument to i8k kernel module since many recent laptops (i.e. my + Inspiron 8600) aren't recognized by the module, but can use it nevertheless + to control the fans and get the Dell service tag. +- Disable the init script, which is only useful with the Dell specific buttons, + by default for the above reason (my media keys work fine with ACME/GNOME). +- Remove obsolete description bit. +- Remove obsolete build requires missing from old gkrellm-devel packages. +- Add alsa-utils requirement for amixer. + +* Fri Apr 7 2005 Michael Schwendt 1.25-3 - rebuilt * Tue Nov 16 2004 Matthias Saou 1.25-2 From fedora-extras-commits at redhat.com Tue Aug 16 12:42:43 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Tue, 16 Aug 2005 08:42:43 -0400 Subject: rpms/abicheck/devel abicheck.spec,1.18,1.19 Message-ID: <200508161242.j7GCghUM021232@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/abicheck/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21215 Modified Files: abicheck.spec Log Message: drop the testing lines - after last build attempt Index: abicheck.spec =================================================================== RCS file: /cvs/extras/rpms/abicheck/devel/abicheck.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- abicheck.spec 16 Aug 2005 12:38:40 -0000 1.18 +++ abicheck.spec 16 Aug 2005 12:42:41 -0000 1.19 @@ -46,14 +46,7 @@ %check cd test -make private1 public1 -for a in $(seq 1 50); do ( - ../abicheck ./public1 || : - ../abicheck ./private1 | egrep 'PRIVATE:.*libc.*(__open|__nanosleep)' || : -); done -cd - make test -: %clean From fedora-extras-commits at redhat.com Tue Aug 16 12:57:18 2005 From: fedora-extras-commits at redhat.com (Marc Maurer (uwog)) Date: Tue, 16 Aug 2005 08:57:18 -0400 Subject: owners owners.list,1.84,1.85 Message-ID: <200508161257.j7GCvIOR021378@cvs-int.fedora.redhat.com> Author: uwog Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21361 Modified Files: owners.list Log Message: Add link-grammar entry, and assign it to me Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.84 retrieving revision 1.85 diff -u -r1.84 -r1.85 --- owners.list 16 Aug 2005 03:35:54 -0000 1.84 +++ owners.list 16 Aug 2005 12:57:16 -0000 1.85 @@ -419,6 +419,7 @@ Fedora Extras|liferea|An RSS/RDF feed reader|bdpepple at ameritech.net|extras-qa at fedoraproject.org| Fedora Extras|lighttpd|Lightning fast webserver with light system requirements|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|lincvs|Graphical CVS Client|compton at pcompton.com|extras-qa at fedoraproject.org| +Fedora Extras|link-grammar|Library that can perform grammar checking|j.m.maurer at student.utwente.nl|extras-qa at fedoraproject.org| Fedora Extras|linphone|Phone anywhere in the whole world by using the Internet|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| Fedora Extras|linux_logo|The linux logo - a colorful console penguin logo|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|lirc|The Linux Infrared Remote Control package|ville.skytta at iki.fi|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Tue Aug 16 13:00:18 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Tue, 16 Aug 2005 09:00:18 -0400 Subject: rpms/abicheck/devel abicheck.spec,1.19,1.20 Message-ID: <200508161300.j7GD0ING021413@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/abicheck/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21396 Modified Files: abicheck.spec Log Message: get some ldd debug output Index: abicheck.spec =================================================================== RCS file: /cvs/extras/rpms/abicheck/devel/abicheck.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- abicheck.spec 16 Aug 2005 12:42:41 -0000 1.19 +++ abicheck.spec 16 Aug 2005 13:00:16 -0000 1.20 @@ -46,7 +46,18 @@ %check cd test +# most of this is debug stuff only +make private1 public1 +for a in $(seq 1 50); do ( + echo "-----" + ../abicheck ./public1 || : + LD_DEBUG=files,bindings ldd -r ./public1 || : + ../abicheck ./private1 | egrep 'PRIVATE:.*libc.*(__open|__nanosleep)' || : + LD_DEBUG=files,bindings ldd -r ./private1 || : +); done +cd - make test +: %clean From fedora-extras-commits at redhat.com Tue Aug 16 13:14:40 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Tue, 16 Aug 2005 09:14:40 -0400 Subject: rpms/liferea/FC-4 .cvsignore, 1.9, 1.10 liferea.spec, 1.14, 1.15 sources, 1.10, 1.11 Message-ID: <200508161314.j7GDEeec022672@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/liferea/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22651 Modified Files: .cvsignore liferea.spec sources Log Message: * Mon Aug 15 2005 Brian Pepple - 0.9.6-1 - Update to 0.9.6. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/liferea/FC-4/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 31 Jul 2005 14:50:50 -0000 1.9 +++ .cvsignore 16 Aug 2005 13:14:38 -0000 1.10 @@ -1 +1 @@ -liferea-0.9.5.tar.gz +liferea-0.9.6.tar.gz Index: liferea.spec =================================================================== RCS file: /cvs/extras/rpms/liferea/FC-4/liferea.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- liferea.spec 31 Jul 2005 14:50:50 -0000 1.14 +++ liferea.spec 16 Aug 2005 13:14:38 -0000 1.15 @@ -1,7 +1,7 @@ %define with_dbus 1 Name: liferea -Version: 0.9.5 +Version: 0.9.6 Release: 1%{?dist} Summary: An RSS/RDF feed reader @@ -92,6 +92,9 @@ %changelog +* Mon Aug 15 2005 Brian Pepple - 0.9.6-1 +- Update to 0.9.6. + * Sun Jul 31 2005 Brian Pepple - 0.9.5-1 - Update to 0.9.5. Index: sources =================================================================== RCS file: /cvs/extras/rpms/liferea/FC-4/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 31 Jul 2005 14:50:50 -0000 1.10 +++ sources 16 Aug 2005 13:14:38 -0000 1.11 @@ -1 +1 @@ -562c84cd394fd2faf7944990613117ca liferea-0.9.5.tar.gz +325398d66a0b4fba6b004a2d04950cb5 liferea-0.9.6.tar.gz From fedora-extras-commits at redhat.com Tue Aug 16 13:38:39 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Tue, 16 Aug 2005 09:38:39 -0400 Subject: rpms/abicheck/devel abicheck.spec,1.20,1.21 Message-ID: <200508161338.j7GDcdks022751@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/abicheck/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22734 Modified Files: abicheck.spec Log Message: ldd output on ppc is broken - bug #166055 Index: abicheck.spec =================================================================== RCS file: /cvs/extras/rpms/abicheck/devel/abicheck.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- abicheck.spec 16 Aug 2005 13:00:16 -0000 1.20 +++ abicheck.spec 16 Aug 2005 13:38:37 -0000 1.21 @@ -46,18 +46,7 @@ %check cd test -# most of this is debug stuff only -make private1 public1 -for a in $(seq 1 50); do ( - echo "-----" - ../abicheck ./public1 || : - LD_DEBUG=files,bindings ldd -r ./public1 || : - ../abicheck ./private1 | egrep 'PRIVATE:.*libc.*(__open|__nanosleep)' || : - LD_DEBUG=files,bindings ldd -r ./private1 || : -); done -cd - make test -: %clean From fedora-extras-commits at redhat.com Tue Aug 16 13:48:29 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Tue, 16 Aug 2005 09:48:29 -0400 Subject: rpms/moin/FC-4 moin-1.3.5-config.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 moin.spec, 1.2, 1.3 sources, 1.3, 1.4 moin-1.3.4-config.patch, 1.1, NONE Message-ID: <200508161348.j7GDmT8R022836@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/moin/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22812 Modified Files: .cvsignore moin.spec sources Added Files: moin-1.3.5-config.patch Removed Files: moin-1.3.4-config.patch Log Message: Update FC-4 banch to 1.3.5 too, as devel package works well and testing shows no breakage when upgrading from 1.3.4. moin-1.3.5-config.patch: --- NEW FILE moin-1.3.5-config.patch --- diff -Naupr moin-1.3.5.orig/MoinMoin/multiconfig.py moin-1.3.5/MoinMoin/multiconfig.py --- moin-1.3.5.orig/MoinMoin/multiconfig.py 2005-07-30 17:58:51.000000000 +0200 +++ moin-1.3.5/MoinMoin/multiconfig.py 2005-08-15 13:42:13.000000000 +0200 @@ -151,7 +151,7 @@ class DefaultConfig: FIXME: update according to MoinMoin:UpdateConfiguration """ - acl_enabled = 0 + acl_enabled = 1 # All acl_right lines must use unicode! acl_rights_default = u"Trusted:read,write,delete,revert Known:read,write,delete,revert All:read,write" acl_rights_before = u"" @@ -165,7 +165,7 @@ class DefaultConfig: attachments = None # {'dir': path, 'url': url-prefix} auth_http_enabled = 0 auth_http_insecure = 0 - bang_meta = 0 + bang_meta = 1 backtick_meta = 1 caching_formats = ['text_html'] changed_time_fmt = '%H:%M' @@ -274,13 +274,13 @@ class DefaultConfig: 'remember_last_visit': 0, 'show_fancy_links': 1, 'show_nonexist_qm': nonexist_qm, - 'show_page_trail': 1, + 'show_page_trail': 0, 'show_toolbar': 1, 'show_topbottom': 0, 'show_fancy_diff': 1, 'wikiname_add_spaces': 0, 'remember_me': 1, - 'want_trivial': 0, + 'want_trivial': 1, } # don't let the user change those # user_checkbox_disable = ['disabled', 'want_trivial'] diff -Naupr moin-1.3.5.orig/wiki/config/wikiconfig.py moin-1.3.5/wiki/config/wikiconfig.py --- moin-1.3.5.orig/wiki/config/wikiconfig.py 2005-06-26 17:43:05.000000000 +0200 +++ moin-1.3.5/wiki/config/wikiconfig.py 2005-08-15 13:43:18.000000000 +0200 @@ -54,14 +54,14 @@ class Config(DefaultConfig): # Where your mutable wiki pages are. You want to make regular # backups of this directory. - data_dir = './data/' + data_dir = '../data/' # Where read-only system and help page are. You might want to share # this directory between several wikis. When you update MoinMoin, # you can safely replace the underlay directory with a new one. This # directory is part of MoinMoin distribution, you don't have to # backup it. - data_underlay_dir = './underlay/' + data_underlay_dir = '../underlay/' # This must be '/wiki' for twisted and standalone. For CGI, it should # match your Apache Alias setting. @@ -115,6 +115,7 @@ class Config(DefaultConfig): u'%(page_front_page)s', u'RecentChanges', u'FindPage', + u'SiteNavigation', u'HelpContents', ] Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/moin/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 15 Jun 2005 11:10:07 -0000 1.3 +++ .cvsignore 16 Aug 2005 13:48:27 -0000 1.4 @@ -1 +1 @@ -moin-1.3.4.tar.gz +moin-1.3.5.tar.gz Index: moin.spec =================================================================== RCS file: /cvs/extras/rpms/moin/FC-4/moin.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- moin.spec 15 Jun 2005 11:10:07 -0000 1.2 +++ moin.spec 16 Aug 2005 13:48:27 -0000 1.3 @@ -1,13 +1,13 @@ Summary: MoinMoin is a Python clone of WikiWiki Name: moin -Version: 1.3.4 +Version: 1.3.5 Release: 1%{?dist} License: GPL Group: Applications/Internet URL: http://moinmoin.wikiwikiweb.de/ Source0: http://dl.sf.net/moin/moin-%{version}.tar.gz Source1: README-rpm -Patch: moin-1.3.4-config.patch +Patch: moin-1.3.5-config.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildArch: noarch BuildRequires: python @@ -40,13 +40,19 @@ %files %defattr(-,root,root,0755) -%doc README README-rpm CHANGES COPYING INSTALL.html UPDATE.html +%doc README README-rpm docs/CHANGES docs/INSTALL.html docs/UPDATE.html +%doc docs/licenses/ %{_bindir}/* %{_libdir}/python?.?/site-packages/MoinMoin/ %{_datadir}/moin/ %changelog +* Mon Aug 15 2005 Matthias Saou 1.3.5-1 +- Update to 1.3.5. +- Update the config patch. +- Update %%doc section (many moved to docs/). + * Wed Jun 15 2005 Matthias Saou 1.3.4-1 - Update to 1.3.4. - Update the config patch. Index: sources =================================================================== RCS file: /cvs/extras/rpms/moin/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 15 Jun 2005 11:10:07 -0000 1.3 +++ sources 16 Aug 2005 13:48:27 -0000 1.4 @@ -1 +1 @@ -9d72e2cc6382d6dc8408bf0f9ccb1398 moin-1.3.4.tar.gz +7194abf16cd6fe24c046013ce3a7c13d moin-1.3.5.tar.gz --- moin-1.3.4-config.patch DELETED --- From fedora-extras-commits at redhat.com Tue Aug 16 14:25:28 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Tue, 16 Aug 2005 10:25:28 -0400 Subject: rpms/moin/FC-4 moin.spec,1.3,1.4 Message-ID: <200508161425.j7GEPSTu024156@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/moin/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24139 Modified Files: moin.spec Log Message: Fix build on 64bit systems. Index: moin.spec =================================================================== RCS file: /cvs/extras/rpms/moin/FC-4/moin.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- moin.spec 16 Aug 2005 13:48:27 -0000 1.3 +++ moin.spec 16 Aug 2005 14:25:26 -0000 1.4 @@ -1,7 +1,7 @@ Summary: MoinMoin is a Python clone of WikiWiki Name: moin Version: 1.3.5 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Applications/Internet URL: http://moinmoin.wikiwikiweb.de/ @@ -43,11 +43,15 @@ %doc README README-rpm docs/CHANGES docs/INSTALL.html docs/UPDATE.html %doc docs/licenses/ %{_bindir}/* -%{_libdir}/python?.?/site-packages/MoinMoin/ +%{_prefix}/lib/python?.?/site-packages/MoinMoin/ %{_datadir}/moin/ %changelog +* Mon Aug 15 2005 Matthias Saou 1.3.5-2 +- Fix python modules path from _libdir to _prefix/lib so that build works on + 64bit systems too. + * Mon Aug 15 2005 Matthias Saou 1.3.5-1 - Update to 1.3.5. - Update the config patch. From fedora-extras-commits at redhat.com Tue Aug 16 14:44:56 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Tue, 16 Aug 2005 10:44:56 -0400 Subject: rpms/moin/devel moin.spec,1.3,1.4 Message-ID: <200508161444.j7GEiuDm024261@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/moin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24244 Modified Files: moin.spec Log Message: Fix build on 64bit systems. Index: moin.spec =================================================================== RCS file: /cvs/extras/rpms/moin/devel/moin.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- moin.spec 16 Aug 2005 07:35:18 -0000 1.3 +++ moin.spec 16 Aug 2005 14:44:54 -0000 1.4 @@ -1,7 +1,7 @@ Summary: MoinMoin is a Python clone of WikiWiki Name: moin Version: 1.3.5 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Applications/Internet URL: http://moinmoin.wikiwikiweb.de/ @@ -43,11 +43,15 @@ %doc README README-rpm docs/CHANGES docs/INSTALL.html docs/UPDATE.html %doc docs/licenses/ %{_bindir}/* -%{_libdir}/python?.?/site-packages/MoinMoin/ +%{_prefix}/lib/python?.?/site-packages/MoinMoin/ %{_datadir}/moin/ %changelog +* Mon Aug 15 2005 Matthias Saou 1.3.5-2 +- Fix python modules path from _libdir to _prefix/lib so that build works on + 64bit systems too. + * Mon Aug 15 2005 Matthias Saou 1.3.5-1 - Update to 1.3.5. - Update the config patch. From fedora-extras-commits at redhat.com Tue Aug 16 16:17:03 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Tue, 16 Aug 2005 12:17:03 -0400 Subject: rpms/OpenEXR/devel OpenEXR-1.2.2-forwardfriend.patch, NONE, 1.1 OpenEXR-1.2.2-zlib.patch, NONE, 1.1 OpenEXR.spec, 1.4, 1.5 Message-ID: <200508161617.j7GGH3G5026987@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/OpenEXR/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26925/devel Modified Files: OpenEXR.spec Added Files: OpenEXR-1.2.2-forwardfriend.patch OpenEXR-1.2.2-zlib.patch Log Message: #165729, #165916 OpenEXR-1.2.2-forwardfriend.patch: --- NEW FILE OpenEXR-1.2.2-forwardfriend.patch --- --- OpenEXR-1.2.2/exrmaketiled/Image.h.gcc401 2005-08-14 15:36:02.000000000 -0400 +++ OpenEXR-1.2.2/exrmaketiled/Image.h 2005-08-14 15:36:14.000000000 -0400 @@ -49,6 +49,7 @@ #include #include +class Image; class ImageChannel { OpenEXR-1.2.2-zlib.patch: --- NEW FILE OpenEXR-1.2.2-zlib.patch --- --- OpenEXR-1.2.2/OpenEXR.pc.in.zlib 2005-08-13 10:33:18.000000000 -0400 +++ OpenEXR-1.2.2/OpenEXR.pc.in 2005-08-13 10:33:30.000000000 -0400 @@ -7,5 +7,5 @@ Name: OpenEXR Description: OpenEXR image library Version: @OPENEXR_VERSION@ -Libs: -L${libdir} -lIlmImf -lImath -lHalf -lIex -lz +Libs: -L${libdir} -lIlmImf -lImath -lHalf -lIex Cflags: -I${OpenEXR_includedir} Index: OpenEXR.spec =================================================================== RCS file: /cvs/extras/rpms/OpenEXR/devel/OpenEXR.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- OpenEXR.spec 18 May 2005 14:47:15 -0000 1.4 +++ OpenEXR.spec 16 Aug 2005 16:17:01 -0000 1.5 @@ -1,12 +1,14 @@ Name: OpenEXR Version: 1.2.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A high dynamic-range (HDR) image file format Group: System Environment/Libraries License: BSD URL: http://www.openexr.com/ Source0: http://savannah.nongnu.org/download/openexr/OpenEXR-1.2.2.tar.gz +Patch: %{name}-1.2.2-zlib.patch +Patch1: %{name}-1.2.2-forwardfriend.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: fltk-devel >= 1.1 zlib-devel @@ -19,7 +21,7 @@ %package devel Summary: Headers and libraries for building apps that use OpenEXR Group: Development/Libraries -Requires: %{name} = %{version} zlib-devel +Requires: %{name} = %{version} %description devel This package contains headers and libraries required to build applications that @@ -27,9 +29,11 @@ %prep %setup -q +%patch -p1 -b .zlib +%patch1 -p1 -b .forwardfriend %build -%configure +%configure --disable-static make %{?_smp_mflags} %install @@ -59,14 +63,21 @@ %{_datadir}/aclocal/* %{_includedir}/OpenEXR %{_libdir}/*.a +%{_libdir}/*.so %{_libdir}/pkgconfig/* %changelog -* Wed May 18 2005 Ignacio Vazquez-Abrams 1.2.2-3.fc4 +* Tue Aug 16 2005 Ignacio Vazquez-Abrams 1.2.2-4 +- Removed -devel dep on zlib-devel (#165729) +- Added --disable-static to %%configure +- Fixed build with GCC 4.0.1 +- Added .so links to -devel + +* Wed May 18 2005 Ignacio Vazquez-Abrams 1.2.2-3 - Add zlib-devel to BR - Delete all .la files (#157652) -* Mon May 9 2005 Ignacio Vazquez-Abrams 1.2.2-2.fc4 +* Mon May 9 2005 Ignacio Vazquez-Abrams 1.2.2-2 - Add disttag * Sun May 8 2005 Ignacio Vazquez-Abrams 1.2.2-2 From fedora-extras-commits at redhat.com Tue Aug 16 16:16:57 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Tue, 16 Aug 2005 12:16:57 -0400 Subject: rpms/OpenEXR/FC-3 OpenEXR-1.2.2-zlib.patch, NONE, 1.1 OpenEXR.spec, 1.5, 1.6 Message-ID: <200508161617.j7GGHRHg026992@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/OpenEXR/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26925/FC-3 Modified Files: OpenEXR.spec Added Files: OpenEXR-1.2.2-zlib.patch Log Message: #165729, #165916 OpenEXR-1.2.2-zlib.patch: --- NEW FILE OpenEXR-1.2.2-zlib.patch --- --- OpenEXR-1.2.2/OpenEXR.pc.in.zlib 2005-08-13 10:33:18.000000000 -0400 +++ OpenEXR-1.2.2/OpenEXR.pc.in 2005-08-13 10:33:30.000000000 -0400 @@ -7,5 +7,5 @@ Name: OpenEXR Description: OpenEXR image library Version: @OPENEXR_VERSION@ -Libs: -L${libdir} -lIlmImf -lImath -lHalf -lIex -lz +Libs: -L${libdir} -lIlmImf -lImath -lHalf -lIex Cflags: -I${OpenEXR_includedir} Index: OpenEXR.spec =================================================================== RCS file: /cvs/extras/rpms/OpenEXR/FC-3/OpenEXR.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- OpenEXR.spec 18 May 2005 14:47:15 -0000 1.5 +++ OpenEXR.spec 16 Aug 2005 16:16:55 -0000 1.6 @@ -7,6 +7,7 @@ License: BSD URL: http://www.openexr.com/ Source0: http://savannah.nongnu.org/download/openexr/OpenEXR-1.2.2.tar.gz +Patch: %{name}-1.2.2-zlib.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: fltk-devel >= 1.1 zlib-devel @@ -19,7 +20,7 @@ %package devel Summary: Headers and libraries for building apps that use OpenEXR Group: Development/Libraries -Requires: %{name} = %{version} zlib-devel +Requires: %{name} = %{version} %description devel This package contains headers and libraries required to build applications that @@ -27,9 +28,10 @@ %prep %setup -q +%patch -p1 -b .zlib %build -%configure +%configure --disable-static make %{?_smp_mflags} %install @@ -59,9 +61,15 @@ %{_datadir}/aclocal/* %{_includedir}/OpenEXR %{_libdir}/*.a +%{_libdir}/*.so %{_libdir}/pkgconfig/* %changelog +* Tue Aug 16 2005 Ignacio Vazquez-Abrams 1.2.2-4 +- Removed -devel dep on zlib-devel (#165729) +- Added --disable-static to %%configure +- Added .so links to -devel + * Wed May 18 2005 Ignacio Vazquez-Abrams 1.2.2-3.fc3 - Add zlib-devel to BR - Delete all .la files (#157652) From fedora-extras-commits at redhat.com Tue Aug 16 16:16:57 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Tue, 16 Aug 2005 12:16:57 -0400 Subject: rpms/OpenEXR/FC-4 OpenEXR-1.2.2-forwardfriend.patch, NONE, 1.1 OpenEXR-1.2.2-zlib.patch, NONE, 1.1 OpenEXR.spec, 1.4, 1.5 Message-ID: <200508161617.j7GGHS6k026995@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/OpenEXR/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26925/FC-4 Modified Files: OpenEXR.spec Added Files: OpenEXR-1.2.2-forwardfriend.patch OpenEXR-1.2.2-zlib.patch Log Message: #165729, #165916 OpenEXR-1.2.2-forwardfriend.patch: --- NEW FILE OpenEXR-1.2.2-forwardfriend.patch --- --- OpenEXR-1.2.2/exrmaketiled/Image.h.gcc401 2005-08-14 15:36:02.000000000 -0400 +++ OpenEXR-1.2.2/exrmaketiled/Image.h 2005-08-14 15:36:14.000000000 -0400 @@ -49,6 +49,7 @@ #include #include +class Image; class ImageChannel { OpenEXR-1.2.2-zlib.patch: --- NEW FILE OpenEXR-1.2.2-zlib.patch --- --- OpenEXR-1.2.2/OpenEXR.pc.in.zlib 2005-08-13 10:33:18.000000000 -0400 +++ OpenEXR-1.2.2/OpenEXR.pc.in 2005-08-13 10:33:30.000000000 -0400 @@ -7,5 +7,5 @@ Name: OpenEXR Description: OpenEXR image library Version: @OPENEXR_VERSION@ -Libs: -L${libdir} -lIlmImf -lImath -lHalf -lIex -lz +Libs: -L${libdir} -lIlmImf -lImath -lHalf -lIex Cflags: -I${OpenEXR_includedir} Index: OpenEXR.spec =================================================================== RCS file: /cvs/extras/rpms/OpenEXR/FC-4/OpenEXR.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- OpenEXR.spec 18 May 2005 14:47:15 -0000 1.4 +++ OpenEXR.spec 16 Aug 2005 16:16:55 -0000 1.5 @@ -1,12 +1,14 @@ Name: OpenEXR Version: 1.2.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A high dynamic-range (HDR) image file format Group: System Environment/Libraries License: BSD URL: http://www.openexr.com/ Source0: http://savannah.nongnu.org/download/openexr/OpenEXR-1.2.2.tar.gz +Patch: %{name}-1.2.2-zlib.patch +Patch1: %{name}-1.2.2-forwardfriend.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: fltk-devel >= 1.1 zlib-devel @@ -19,7 +21,7 @@ %package devel Summary: Headers and libraries for building apps that use OpenEXR Group: Development/Libraries -Requires: %{name} = %{version} zlib-devel +Requires: %{name} = %{version} %description devel This package contains headers and libraries required to build applications that @@ -27,9 +29,11 @@ %prep %setup -q +%patch -p1 -b .zlib +%patch1 -p1 -b .forwardfriend %build -%configure +%configure --disable-static make %{?_smp_mflags} %install @@ -59,14 +63,21 @@ %{_datadir}/aclocal/* %{_includedir}/OpenEXR %{_libdir}/*.a +%{_libdir}/*.so %{_libdir}/pkgconfig/* %changelog -* Wed May 18 2005 Ignacio Vazquez-Abrams 1.2.2-3.fc4 +* Tue Aug 16 2005 Ignacio Vazquez-Abrams 1.2.2-4 +- Removed -devel dep on zlib-devel (#165729) +- Added --disable-static to %%configure +- Fixed build with GCC 4.0.1 +- Added .so links to -devel + +* Wed May 18 2005 Ignacio Vazquez-Abrams 1.2.2-3 - Add zlib-devel to BR - Delete all .la files (#157652) -* Mon May 9 2005 Ignacio Vazquez-Abrams 1.2.2-2.fc4 +* Mon May 9 2005 Ignacio Vazquez-Abrams 1.2.2-2 - Add disttag * Sun May 8 2005 Ignacio Vazquez-Abrams 1.2.2-2 From fedora-extras-commits at redhat.com Tue Aug 16 16:35:39 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Tue, 16 Aug 2005 12:35:39 -0400 Subject: rpms/perl-File-Find-Rule - New directory Message-ID: <200508161635.j7GGZdrv027111@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-File-Find-Rule In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27091/perl-File-Find-Rule Log Message: Directory /cvs/extras/rpms/perl-File-Find-Rule added to the repository From fedora-extras-commits at redhat.com Tue Aug 16 16:35:39 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Tue, 16 Aug 2005 12:35:39 -0400 Subject: rpms/perl-File-Find-Rule/devel - New directory Message-ID: <200508161635.j7GGZdUf027116@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-File-Find-Rule/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27091/perl-File-Find-Rule/devel Log Message: Directory /cvs/extras/rpms/perl-File-Find-Rule/devel added to the repository From fedora-extras-commits at redhat.com Tue Aug 16 16:36:06 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Tue, 16 Aug 2005 12:36:06 -0400 Subject: rpms/perl-File-Find-Rule Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200508161636.j7GGa6go027169@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-File-Find-Rule In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27138 Added Files: Makefile import.log Log Message: Setup of module perl-File-Find-Rule --- NEW FILE Makefile --- # Top level Makefile for module perl-File-Find-Rule all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Tue Aug 16 16:36:07 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Tue, 16 Aug 2005 12:36:07 -0400 Subject: rpms/perl-File-Find-Rule/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200508161636.j7GGa7Rj027174@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-File-Find-Rule/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27138/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-File-Find-Rule --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Tue Aug 16 16:37:08 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Tue, 16 Aug 2005 12:37:08 -0400 Subject: rpms/perl-File-Find-Rule import.log,1.1,1.2 Message-ID: <200508161637.j7GGbcnG027239@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-File-Find-Rule In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27205 Modified Files: import.log Log Message: auto-import perl-File-Find-Rule-0.28-2 on branch devel from perl-File-Find-Rule-0.28-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-File-Find-Rule/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 16 Aug 2005 16:36:04 -0000 1.1 +++ import.log 16 Aug 2005 16:37:06 -0000 1.2 @@ -0,0 +1 @@ +perl-File-Find-Rule-0_28-2:HEAD:perl-File-Find-Rule-0.28-2.src.rpm:1124210210 From fedora-extras-commits at redhat.com Tue Aug 16 16:37:08 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Tue, 16 Aug 2005 12:37:08 -0400 Subject: rpms/perl-File-Find-Rule/devel perl-File-Find-Rule.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200508161637.j7GGbc12027243@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-File-Find-Rule/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27205/devel Modified Files: .cvsignore sources Added Files: perl-File-Find-Rule.spec Log Message: auto-import perl-File-Find-Rule-0.28-2 on branch devel from perl-File-Find-Rule-0.28-2.src.rpm --- NEW FILE perl-File-Find-Rule.spec --- Name: perl-File-Find-Rule Version: 0.28 Release: 2%{?dist} Summary: Perl module implementing an alternative interface to File::Find License: Artistic or GPL Group: Development/Libraries URL: http://search.cpan.org/dist/File-Find-Rule/ Source0: http://www.cpan.org/modules/by-module/File/File-Find-Rule-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl BuildRequires: perl(Number::Compare) BuildRequires: perl(Text::Glob) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description File::Find::Rule is a friendlier interface to File::Find. It allows you to build rules which specify the desired files and directories. %prep %setup -q -n File-Find-Rule-%{version} %build perl Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type f -name '*.bs' -a -size 0 -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %clean rm -rf $RPM_BUILD_ROOT %check make test %files %defattr(-,root,root,-) %doc Changes README %{_bindir}/findrule %{_mandir}/man1/* %{perl_vendorlib}/File %{_mandir}/man3/* %changelog * Wed Aug 10 2005 Ralf Corsepius - 0.28-2 - FE re-submission. * Mon Mar 21 2005 Ralf Corsepius - 0.28-1 - FE submission. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-File-Find-Rule/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 16 Aug 2005 16:36:05 -0000 1.1 +++ .cvsignore 16 Aug 2005 16:37:06 -0000 1.2 @@ -0,0 +1 @@ +File-Find-Rule-0.28.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-File-Find-Rule/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 16 Aug 2005 16:36:05 -0000 1.1 +++ sources 16 Aug 2005 16:37:06 -0000 1.2 @@ -0,0 +1 @@ +b12a6f02cb316ca62bd2411564606d1f File-Find-Rule-0.28.tar.gz From fedora-extras-commits at redhat.com Tue Aug 16 16:40:30 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Tue, 16 Aug 2005 12:40:30 -0400 Subject: rpms/mock/devel mock.spec,1.7,1.8 Message-ID: <200508161640.j7GGeUBJ027332@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/mock/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27285/devel Modified Files: mock.spec Log Message: Fix build when %fedora isn't defined. Index: mock.spec =================================================================== RCS file: /cvs/extras/rpms/mock/devel/mock.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- mock.spec 4 Aug 2005 05:03:09 -0000 1.7 +++ mock.spec 16 Aug 2005 16:40:28 -0000 1.8 @@ -27,7 +27,7 @@ # make the default.cfg link cd $RPM_BUILD_ROOT/%{_sysconfdir}/%{name} -%if %{?fedora} +%if 0%{?fedora:1} if [ -f fedora-%{fedora}-%{_target_cpu}-core.cfg ]; then ln -s fedora-%{fedora}-%{_target_cpu}-core.cfg default.cfg fi @@ -65,6 +65,9 @@ %changelog +* Tue Aug 16 2005 Matthias Saou 0.4-2 +- Fix ?fedora check when not defined (would fail to parse). + * Thu Aug 4 2005 Seth Vidal - 0.4 - update urls From fedora-extras-commits at redhat.com Tue Aug 16 16:40:24 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Tue, 16 Aug 2005 12:40:24 -0400 Subject: rpms/mock/FC-3 mock.spec,1.7,1.8 Message-ID: <200508161640.j7GGesh2027335@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/mock/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27285/FC-3 Modified Files: mock.spec Log Message: Fix build when %fedora isn't defined. Index: mock.spec =================================================================== RCS file: /cvs/extras/rpms/mock/FC-3/mock.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- mock.spec 4 Aug 2005 05:02:06 -0000 1.7 +++ mock.spec 16 Aug 2005 16:40:22 -0000 1.8 @@ -27,7 +27,7 @@ # make the default.cfg link cd $RPM_BUILD_ROOT/%{_sysconfdir}/%{name} -%if %{?fedora} +%if 0%{?fedora:1} if [ -f fedora-%{fedora}-%{_target_cpu}-core.cfg ]; then ln -s fedora-%{fedora}-%{_target_cpu}-core.cfg default.cfg fi @@ -65,6 +65,9 @@ %changelog +* Tue Aug 16 2005 Matthias Saou 0.4-2 +- Fix ?fedora check when not defined (would fail to parse). + * Thu Aug 4 2005 Seth Vidal - 0.4 - update urls From fedora-extras-commits at redhat.com Tue Aug 16 16:40:25 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Tue, 16 Aug 2005 12:40:25 -0400 Subject: rpms/mock/FC-4 mock.spec,1.7,1.8 Message-ID: <200508161640.j7GGetrV027338@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/mock/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27285/FC-4 Modified Files: mock.spec Log Message: Fix build when %fedora isn't defined. Index: mock.spec =================================================================== RCS file: /cvs/extras/rpms/mock/FC-4/mock.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- mock.spec 4 Aug 2005 05:02:37 -0000 1.7 +++ mock.spec 16 Aug 2005 16:40:22 -0000 1.8 @@ -27,7 +27,7 @@ # make the default.cfg link cd $RPM_BUILD_ROOT/%{_sysconfdir}/%{name} -%if %{?fedora} +%if 0%{?fedora:1} if [ -f fedora-%{fedora}-%{_target_cpu}-core.cfg ]; then ln -s fedora-%{fedora}-%{_target_cpu}-core.cfg default.cfg fi @@ -65,6 +65,9 @@ %changelog +* Tue Aug 16 2005 Matthias Saou 0.4-2 +- Fix ?fedora check when not defined (would fail to parse). + * Thu Aug 4 2005 Seth Vidal - 0.4 - update urls From fedora-extras-commits at redhat.com Tue Aug 16 16:41:30 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Tue, 16 Aug 2005 12:41:30 -0400 Subject: rpms/perl-File-Find-Rule/devel perl-File-Find-Rule.spec,1.1,1.2 Message-ID: <200508161641.j7GGfUJi027361@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-File-Find-Rule/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27344 Modified Files: perl-File-Find-Rule.spec Log Message: Spec cleanup. Index: perl-File-Find-Rule.spec =================================================================== RCS file: /cvs/extras/rpms/perl-File-Find-Rule/devel/perl-File-Find-Rule.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-File-Find-Rule.spec 16 Aug 2005 16:37:06 -0000 1.1 +++ perl-File-Find-Rule.spec 16 Aug 2005 16:41:28 -0000 1.2 @@ -1,6 +1,6 @@ Name: perl-File-Find-Rule Version: 0.28 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Perl module implementing an alternative interface to File::Find License: Artistic or GPL Group: Development/Libraries @@ -23,14 +23,13 @@ %setup -q -n File-Find-Rule-%{version} %build -perl Makefile.PL INSTALLDIRS=vendor +%{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' -find $RPM_BUILD_ROOT -type f -name '*.bs' -a -size 0 -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* @@ -49,6 +48,9 @@ %{_mandir}/man3/* %changelog +* Tue Aug 16 2005 Ralf Corsepius - 0.28-3 +- Spec cleanup. + * Wed Aug 10 2005 Ralf Corsepius - 0.28-2 - FE re-submission. From fedora-extras-commits at redhat.com Tue Aug 16 16:55:35 2005 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Tue, 16 Aug 2005 12:55:35 -0400 Subject: rpms/perl-Number-Compare/devel perl-Number-Compare.spec,1.3,1.4 Message-ID: <200508161655.j7GGtZG3027516@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/perl-Number-Compare/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27494 Modified Files: perl-Number-Compare.spec Log Message: BR: perl redundant for Fedora Extras Index: perl-Number-Compare.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Number-Compare/devel/perl-Number-Compare.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-Number-Compare.spec 13 Aug 2005 03:22:31 -0000 1.3 +++ perl-Number-Compare.spec 16 Aug 2005 16:55:33 -0000 1.4 @@ -1,6 +1,6 @@ Name: perl-Number-Compare Version: 0.01 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Perl module for numeric comparisons License: Artistic or GPL Group: Development/Libraries @@ -9,7 +9,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: perl Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -47,6 +46,9 @@ %{_mandir}/man3/* %changelog +* Tue Aug 16 2005 Paul Howarth - 0.01-4 +- BR: perl redundant for Extras. + * Sat Aug 13 2005 Ralf Corsepius - 0.01-3 - Spec cleanup. From fedora-extras-commits at redhat.com Tue Aug 16 16:56:22 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Tue, 16 Aug 2005 12:56:22 -0400 Subject: rpms/perl-Text-Glob - New directory Message-ID: <200508161656.j7GGuMPU027539@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Text-Glob In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27525/perl-Text-Glob Log Message: Directory /cvs/extras/rpms/perl-Text-Glob added to the repository From fedora-extras-commits at redhat.com Tue Aug 16 17:09:00 2005 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Tue, 16 Aug 2005 13:09:00 -0400 Subject: rpms/nethack/devel nethack-3.4.3-makefile.patch, 1.1, 1.2 nethack.spec, 1.1, 1.2 Message-ID: <200508161709.j7GH908K028831@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/rpms/nethack/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28798 Modified Files: nethack-3.4.3-makefile.patch nethack.spec Log Message: - Fixed various issues mentioned in Bug #165361 nethack-3.4.3-makefile.patch: Index: nethack-3.4.3-makefile.patch =================================================================== RCS file: /cvs/extras/rpms/nethack/devel/nethack-3.4.3-makefile.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- nethack-3.4.3-makefile.patch 19 Jul 2005 17:53:54 -0000 1.1 +++ nethack-3.4.3-makefile.patch 16 Aug 2005 17:08:58 -0000 1.2 @@ -82,3 +82,17 @@ # these are the names of the output files from YACC/LEX. Under MS-DOS # and similar systems, they may differ +--- sys/unix/Makefile.doc.orig 2005-08-14 00:07:23.000000000 -0400 ++++ sys/unix/Makefile.doc 2005-08-14 00:07:31.000000000 -0400 +@@ -59,10 +59,7 @@ + + manpages: + -$(GAMEMANCREATE) $(MANDIR)/$(GAME).$(MANEXT) +- -$(LEVMANCREATE) $(MANDIR)/lev_comp.$(MANEXT) +- -$(DGNMANCREATE) $(MANDIR)/dgn_comp.$(MANEXT) +- -$(RCVRMANCREATE) $(MANDIR)/recover.$(MANEXT) +- -$(DLBMANCREATE) $(MANDIR)/dlb.$(MANEXT) ++ -$(RCVRMANCREATE) $(MANDIR)/nethack-recover.$(MANEXT) + + # manual creation for distribution + DISTRIB = Guidebook.txt nethack.txt lev_comp.txt dgn_comp.txt recover.txt dlb.txt Index: nethack.spec =================================================================== RCS file: /cvs/extras/rpms/nethack/devel/nethack.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- nethack.spec 19 Jul 2005 17:53:54 -0000 1.1 +++ nethack.spec 16 Aug 2005 17:08:58 -0000 1.2 @@ -1,16 +1,16 @@ -%define nhgamedir /usr/games/nethack +%define nhgamedir /usr/games/nethack-3.4.3 %define nhdatadir /var/games/nethack Name: nethack Version: 3.4.3 -Release: 1 -Summary: A rouge-like single player dungeon exploration game +Release: 1%{?dist} +Summary: A rogue-like single player dungeon exploration game Group: Amusements/Games License: NetHack General Public License URL: http://nethack.org Source0: http://dl.sf.net/%{name}/%{name}-343-src.tgz -Source2: %{name}.desktop +Source1: %{name}.desktop Patch0: %{name}-%{version}-makefile.patch Patch1: %{name}-%{version}-config.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -63,9 +63,9 @@ CHOWN=/bin/true \ CHGRP=/bin/true +rm $RPM_BUILD_ROOT%{nhgamedir}/license rm -rf $RPM_BUILD_ROOT%{nhgamedir}/save mv $RPM_BUILD_ROOT%{nhgamedir}/recover $RPM_BUILD_ROOT%{_bindir}/nethack-recover -chmod +x $RPM_BUILD_ROOT%{nhgamedir}/nethack install -d -m 0755 $RPM_BUILD_ROOT%{_mandir}/man6 make -C doc MANDIR=$RPM_BUILD_ROOT%{_mandir}/man6 manpages @@ -79,7 +79,7 @@ --add-category X-Fedora \ --add-category Application \ --add-category Game \ - %{SOURCE2} + %{SOURCE1} %clean @@ -93,7 +93,6 @@ %{_mandir}/man6/* %{_datadir}/pixmaps/nethack.xpm %{_datadir}/applications/fedora-nethack.desktop -%{nhgamedir}/license %{nhgamedir}/nhdat %{_bindir}/nethack %{_bindir}/nethack-recover From fedora-extras-commits at redhat.com Tue Aug 16 17:10:28 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Tue, 16 Aug 2005 13:10:28 -0400 Subject: rpms/perl-Text-Glob/devel - New directory Message-ID: <200508161710.j7GHASXR028907@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Text-Glob/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28891/devel Log Message: Directory /cvs/extras/rpms/perl-Text-Glob/devel added to the repository From fedora-extras-commits at redhat.com Tue Aug 16 17:16:24 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Tue, 16 Aug 2005 13:16:24 -0400 Subject: rpms/perl-Text-Glob/devel Makefile, NONE, 1.1 perl-Text-Glob.spec, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200508161716.j7GHGOMh029160@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Text-Glob/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29142 Added Files: Makefile perl-Text-Glob.spec sources Log Message: Manual import, because cvs-import has failed ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE perl-Text-Glob.spec --- Name: perl-Text-Glob Version: 0.06 Release: 2%{?dist} Summary: Perl module to match globbing patterns against text License: Artistic or GPL Group: Development/Libraries URL: http://search.cpan.org/dist/Text-Glob/ Source0: http://www.cpan.org/modules/by-module/Text/Text-Glob-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Text::Glob implements glob(3) style matching that can be used to match against text, rather than fetching names from a filesystem. If you want to do full file globbing use the File::Glob module instead. %prep %setup -q -n Text-Glob-%{version} %build perl Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type f -name '*.bs' -a -size 0 -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %clean rm -rf $RPM_BUILD_ROOT %check make test %files %defattr(-,root,root,-) %doc Changes %{perl_vendorlib}/Text %{_mandir}/man3/* %changelog * Wed Aug 10 2005 Ralf Corsepius - 0.06-2 - FE resubmission. * Fri Jul 01 2005 Ralf Corsepius - 0.06-1 - FE submission. --- NEW FILE sources --- 800d5a40b2f0c7514c58d736d21f616c Text-Glob-0.06.tar.gz From fedora-extras-commits at redhat.com Tue Aug 16 17:17:11 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Tue, 16 Aug 2005 13:17:11 -0400 Subject: rpms/perl-Text-Glob/devel .cvsignore,NONE,1.1 Message-ID: <200508161717.j7GHHBPW029238@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Text-Glob/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29222 Added Files: .cvsignore Log Message: Manual import, because cvs-import has failed --- NEW FILE .cvsignore --- Text-Glob-0.06.tar.gz From fedora-extras-commits at redhat.com Tue Aug 16 17:19:14 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Tue, 16 Aug 2005 13:19:14 -0400 Subject: rpms/perl-Text-Glob/devel perl-Text-Glob.spec,1.1,1.2 Message-ID: <200508161719.j7GHJEqT029261@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Text-Glob/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29244 Modified Files: perl-Text-Glob.spec Log Message: Spec cleanup Index: perl-Text-Glob.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Text-Glob/devel/perl-Text-Glob.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Text-Glob.spec 16 Aug 2005 17:16:21 -0000 1.1 +++ perl-Text-Glob.spec 16 Aug 2005 17:19:12 -0000 1.2 @@ -1,6 +1,6 @@ Name: perl-Text-Glob Version: 0.06 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Perl module to match globbing patterns against text License: Artistic or GPL Group: Development/Libraries @@ -21,14 +21,13 @@ %setup -q -n Text-Glob-%{version} %build -perl Makefile.PL INSTALLDIRS=vendor +%{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' -find $RPM_BUILD_ROOT -type f -name '*.bs' -a -size 0 -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* @@ -45,6 +44,9 @@ %{_mandir}/man3/* %changelog +* Wed Aug 10 2005 Ralf Corsepius - 0.06-3 +- Spec cleanup. + * Wed Aug 10 2005 Ralf Corsepius - 0.06-2 - FE resubmission. From fedora-extras-commits at redhat.com Tue Aug 16 17:37:44 2005 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Tue, 16 Aug 2005 13:37:44 -0400 Subject: owners owners.list,1.85,1.86 Message-ID: <200508161737.j7GHbiLN029396@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29379 Modified Files: owners.list Log Message: - fix typo in nethack description Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.85 retrieving revision 1.86 diff -u -r1.85 -r1.86 --- owners.list 16 Aug 2005 12:57:16 -0000 1.85 +++ owners.list 16 Aug 2005 17:37:42 -0000 1.86 @@ -475,7 +475,7 @@ Fedora Extras|ncview|A visual browser for netCDF format files|ed at eh3.com|extras-qa at fedoraproject.org| Fedora Extras|netcdf|Libraries for the Unidata network Common Data Form (NetCDF v3)|ed at eh3.com|extras-qa at fedoraproject.org| Fedora Extras|netdiag|Diagnostic program for Ethernet adapters under Linux|anvil at livna.org|extras-qa at fedoraproject.org| -Fedora Extras|nethack|A rouge-like single player dungeon exploration game|lmacken at redhat.com|extras-qa at fedoraproject.org| +Fedora Extras|nethack|A rogue-like single player dungeon exploration game|lmacken at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|nethack-falconseye|NetHack - Falcon's Eye|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|netmask|Utility for determining network masks|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|NetworkManager-vpnc|NetworkManager VPN integration for vpnc|davidz at redhat.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Tue Aug 16 17:54:03 2005 From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik)) Date: Tue, 16 Aug 2005 13:54:03 -0400 Subject: rpms/athcool/devel sources,1.2,1.3 Message-ID: <200508161754.j7GHs3Ma029450@cvs-int.fedora.redhat.com> Author: gajownik Update of /cvs/extras/rpms/athcool/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29433 Modified Files: sources Log Message: Update sources - package has the same version as prevoius one but includes updated COPYING file. Index: sources =================================================================== RCS file: /cvs/extras/rpms/athcool/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 11 Aug 2005 08:23:27 -0000 1.2 +++ sources 16 Aug 2005 17:54:01 -0000 1.3 @@ -1 +1 @@ -0fdcc3e32f8e795ff95747e640710ce4 athcool-0.3.11.tar.gz +4f550f9aaaa68a01d1e8ae31491e5406 athcool-0.3.11.tar.gz From fedora-extras-commits at redhat.com Tue Aug 16 18:16:32 2005 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Tue, 16 Aug 2005 14:16:32 -0400 Subject: rpms/perl-Number-Compare/FC-4 perl-Number-Compare.spec,1.3,1.4 Message-ID: <200508161816.j7GIGW6R030755@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/perl-Number-Compare/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30738 Modified Files: perl-Number-Compare.spec Log Message: resync with devel Index: perl-Number-Compare.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Number-Compare/FC-4/perl-Number-Compare.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-Number-Compare.spec 13 Aug 2005 03:22:31 -0000 1.3 +++ perl-Number-Compare.spec 16 Aug 2005 18:16:30 -0000 1.4 @@ -1,6 +1,6 @@ Name: perl-Number-Compare Version: 0.01 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Perl module for numeric comparisons License: Artistic or GPL Group: Development/Libraries @@ -9,7 +9,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: perl Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -47,6 +46,9 @@ %{_mandir}/man3/* %changelog +* Tue Aug 16 2005 Paul Howarth - 0.01-4 +- BR: perl redundant for Extras. + * Sat Aug 13 2005 Ralf Corsepius - 0.01-3 - Spec cleanup. From fedora-extras-commits at redhat.com Tue Aug 16 18:16:57 2005 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Tue, 16 Aug 2005 14:16:57 -0400 Subject: rpms/perl-Number-Compare/FC-3 perl-Number-Compare.spec,1.3,1.4 Message-ID: <200508161816.j7GIGvuD030782@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/perl-Number-Compare/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30763 Modified Files: perl-Number-Compare.spec Log Message: resync with devel Index: perl-Number-Compare.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Number-Compare/FC-3/perl-Number-Compare.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-Number-Compare.spec 13 Aug 2005 03:22:31 -0000 1.3 +++ perl-Number-Compare.spec 16 Aug 2005 18:16:55 -0000 1.4 @@ -1,6 +1,6 @@ Name: perl-Number-Compare Version: 0.01 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Perl module for numeric comparisons License: Artistic or GPL Group: Development/Libraries @@ -9,7 +9,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: perl Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -47,6 +46,9 @@ %{_mandir}/man3/* %changelog +* Tue Aug 16 2005 Paul Howarth - 0.01-4 +- BR: perl redundant for Extras. + * Sat Aug 13 2005 Ralf Corsepius - 0.01-3 - Spec cleanup. From fedora-extras-commits at redhat.com Tue Aug 16 20:51:33 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Tue, 16 Aug 2005 16:51:33 -0400 Subject: rpms/abicheck/devel abicheck-1.2-ldlinux.patch, NONE, 1.1 abicheck.spec, 1.21, 1.22 Message-ID: <200508162051.j7GKpXVb001274@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/abicheck/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1254 Modified Files: abicheck.spec Added Files: abicheck-1.2-ldlinux.patch Log Message: * Tue Aug 16 2005 Michael Schwendt - 1.2-9 - Patch abicheck to run dynamic linker directly instead of using ldd and receiving its intermixed lines. abicheck-1.2-ldlinux.patch: --- NEW FILE abicheck-1.2-ldlinux.patch --- diff -Nur abicheck-1.2-orig/abicheck.pl abicheck-1.2/abicheck.pl --- abicheck-1.2-orig/abicheck.pl 2003-08-26 21:57:51.000000000 +0200 +++ abicheck-1.2/abicheck.pl 2005-08-16 22:49:06.000000000 +0200 @@ -496,7 +496,7 @@ if ( ! $pid ) { # child here, go run ldd -r with debug env: - exec_ldd($file); + exec_ldd($file,$file0); exit 1; } @@ -1241,7 +1241,7 @@ # will read command output. # sub exec_ldd { - my ($file) = @_; + my ($file,$file0) = @_; open(STDERR, ">&STDOUT"); # need to close stdin on linux for some suid programs e.g. chsh (!) @@ -1251,10 +1251,27 @@ $ENV{LD_LIBRARY_PATH} = $ld_path; } - # currently, no difference between OSs - $ENV{LD_DEBUG} = "files,bindings"; - exec 'ldd', '-r', $file; - exit 1; # exec failed + my $ldlinux = ''; + open(DLFIND,"ldd $file0 |") or die "open: ldd: $!"; + while () { + /ld-linux/ and /(\S+)/ and $ldlinux = $1; + } + close(DLFIND); + if ( $ldlinux =~ /^$/ ) { + # currently, no difference between OSs + $ENV{LD_DEBUG} = "files,bindings"; + exec 'ldd', '-r', $file; + exit 1; # exec failed + } + else { + $ENV{LD_DEBUG} = "files,bindings"; + $ENV{LD_VERBOSE} = "yes"; + $ENV{LD_WARN} = "yes"; + $ENV{LD_BIND_NOW} = "yes"; + $ENV{LD_TRACE_LOADED_OBJECTS} = "1"; + exec $ldlinux, $file0; + exit 1; # exec failed + } } # Index: abicheck.spec =================================================================== RCS file: /cvs/extras/rpms/abicheck/devel/abicheck.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- abicheck.spec 16 Aug 2005 13:38:37 -0000 1.21 +++ abicheck.spec 16 Aug 2005 20:51:30 -0000 1.22 @@ -3,7 +3,7 @@ Summary: ABI checking tool Name: abicheck Version: 1.2 -Release: 8 +Release: 9 License: LGPL Group: Applications/File URL: http://abicheck.sourceforge.net/ @@ -13,6 +13,7 @@ Patch2: abicheck-1.2-bindings-fc4.patch Patch3: abicheck-1.2-libgcc.patch Patch4: abicheck-1.2-fortify-source-fc5.patch +Patch5: abicheck-1.2-ldlinux.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot Requires: binutils perl @@ -30,6 +31,7 @@ %patch2 -p1 -b .bindings-fc4 %patch3 -p1 -b .libgcc %patch4 -p1 -b .fortify-source-fc5 +%patch5 -p1 -b .ldlinux sed -i -e 's!/usr/lib/!%{_libdir}/!g' test/Makefile @@ -45,7 +47,6 @@ %check -cd test make test @@ -61,6 +62,10 @@ %changelog +* Tue Aug 16 2005 Michael Schwendt - 1.2-9 +- Patch abicheck to run dynamic linker directly instead of + using ldd and receiving its intermixed lines. + * Mon Aug 15 2005 Michael Schwendt - 1.2-8 - Add libgcc symbols. - Add more _FORTIFY_SOURCE symbols. From fedora-extras-commits at redhat.com Tue Aug 16 20:55:13 2005 From: fedora-extras-commits at redhat.com (Alexander Dalloz (adalloz)) Date: Tue, 16 Aug 2005 16:55:13 -0400 Subject: rpms/keychain/devel keychain.csh, 1.1, 1.2 keychain.sh, 1.1, 1.2 keychain.spec, 1.1, 1.2 Message-ID: <200508162055.j7GKtDCb001449@cvs-int.fedora.redhat.com> Author: adalloz Update of /cvs/extras/rpms/keychain/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1318/devel Modified Files: keychain.csh keychain.sh keychain.spec Log Message: added test functionality to keychain.{sh,csh} opt-in scripts problem reported by Ville Skytt?? for using `sudo -s' Index: keychain.csh =================================================================== RCS file: /cvs/extras/rpms/keychain/devel/keychain.csh,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- keychain.csh 5 Aug 2005 02:55:43 -0000 1.1 +++ keychain.csh 16 Aug 2005 20:55:11 -0000 1.2 @@ -1,7 +1,8 @@ # /etc/profile.d/keychain.csh - calling keychain the Fedora way # read in user's keychain settings or use defaults running keychain -if (-f $HOME/.keychainrc) then +set USERHOME = `getent passwd $USER | cut -d: -f6` +if ($HOME == $USERHOME && -f $HOME/.keychainrc) then eval `grep -v '^[:blank:]*#' $HOME/.keychainrc | \ sed 's|$[^=]*$=$[^=]*$|set \1 = \2|g' | sed 's|$|;|'` Index: keychain.sh =================================================================== RCS file: /cvs/extras/rpms/keychain/devel/keychain.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- keychain.sh 5 Aug 2005 02:55:43 -0000 1.1 +++ keychain.sh 16 Aug 2005 20:55:11 -0000 1.2 @@ -1,9 +1,10 @@ # /etc/profile.d/keychain.sh - calling keychain the Fedora way # read in user's keychain settings or use defaults running keychain -if [ -f $HOME/.keychainrc ]; then +USERHOME=`getent passwd $USER | cut -d: -f6` +if [ $HOME = $USERHOME -a -f $HOME/.keychainrc ]; then - source $HOME/.keychainrc + . $HOME/.keychainrc [ -n "$KCHOPTS" ] || KCHOPTS="--quiet" [ -n "$SSHKEYS" ] || SSHKEYS=`grep -l -e '[DRS]S[AH] PRIVATE KEY' \ Index: keychain.spec =================================================================== RCS file: /cvs/extras/rpms/keychain/devel/keychain.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- keychain.spec 5 Aug 2005 02:55:43 -0000 1.1 +++ keychain.spec 16 Aug 2005 20:55:11 -0000 1.2 @@ -1,7 +1,7 @@ Name: keychain Summary: Agent manager for OpenSSH, ssh.com, Sun SSH, and GnuPG Version: 2.5.5 -Release: 1 +Release: 2 License: GPL Group: Applications/Internet URL: http://www.gentoo.org/proj/en/keychain/ @@ -49,6 +49,10 @@ %config(noreplace) %{_sysconfdir}/profile.d/keychain.csh %changelog +* Tue Aug 16 2005 Alexander Dalloz - 2.5.5-2 +- Added test for homedir mismatch in opt-in scripts, covering + `sudo -s' (reported by Ville Skytt??). + * Fri Aug 05 2005 Alexander Dalloz - 2.5.5-1 - Updated to new upstream version - Removed keychain.pod from %%doc. From fedora-extras-commits at redhat.com Tue Aug 16 21:07:58 2005 From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields)) Date: Tue, 16 Aug 2005 17:07:58 -0400 Subject: web/html/docs/yum - New directory Message-ID: <200508162107.j7GL7w8u002664@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/fedora/web/html/docs/yum In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2645/yum Log Message: Directory /cvs/fedora/web/html/docs/yum added to the repository From fedora-extras-commits at redhat.com Tue Aug 16 21:08:20 2005 From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields)) Date: Tue, 16 Aug 2005 17:08:20 -0400 Subject: web/html/docs/yum/stylesheet-images - New directory Message-ID: <200508162108.j7GL8KmT002710@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/fedora/web/html/docs/yum/stylesheet-images In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2693/stylesheet-images Log Message: Directory /cvs/fedora/web/html/docs/yum/stylesheet-images added to the repository From fedora-extras-commits at redhat.com Tue Aug 16 21:11:26 2005 From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields)) Date: Tue, 16 Aug 2005 17:11:26 -0400 Subject: web/html/docs/yum fedora.css, NONE, 1.1 generated-index.php, NONE, 1.1 index.php, NONE, 1.1 ln-legalnotice.php, NONE, 1.1 sn-acknowledgements.php, NONE, 1.1 sn-managing-packages.php, NONE, 1.1 sn-searching-packages.php, NONE, 1.1 sn-software-management-concepts.php, NONE, 1.1 sn-software-management-tools.php, NONE, 1.1 sn-updating-your-system.php, NONE, 1.1 sn-using-repositories.php, NONE, 1.1 sn-yum-installing-frompackage.php, NONE, 1.1 sn-yum-maintenance.php, NONE, 1.1 sn-yum-proxy-server.php, NONE, 1.1 Message-ID: <200508162111.j7GLBQmR002789@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/fedora/web/html/docs/yum In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2748/yum Added Files: fedora.css generated-index.php index.php ln-legalnotice.php sn-acknowledgements.php sn-managing-packages.php sn-searching-packages.php sn-software-management-concepts.php sn-software-management-tools.php sn-updating-your-system.php sn-using-repositories.php sn-yum-installing-frompackage.php sn-yum-maintenance.php sn-yum-proxy-server.php Log Message: Added yum tutorial --- NEW FILE fedora.css --- /* CSS for Red Hat Linux Project docs from the Documentation Project Written by Tammy Fox and Garrett LeSage Copyright 2003 Tammy Fox, Garrett LeSage, and Red Hat, Inc. License: GPL */ li p { display: inline; } div.table table { width: 95%; background-color: #DCDCDC; color: #000000; border-spacing: 0; } div.table table th { border: 1px solid #A9A9A9; background-color: #A9A9A9; color: #000000; } div.table table td { border: 1px solid #A9A9A9; background-color: #DCDCDC; color: #000000; padding: 0.5em; margin-bottom: 0.5em; margin-top: 2px; } div.note table, div.tip table, div.important table, div.caution table, div.warning table { width: 95%; border: 2px solid #D0D0B0; background-color: #FAF9E0; color: #000000; /* padding inside table area */ padding: 0.5em; margin-bottom: 0.5em; margin-top: 0.5em; } .qandaset table { border-collapse: collapse; } .qandaset { } .qandaset tr.question { } .qandaset tr.question td { font-weight: bold; padding: 1em 1em 0; } .qandaset tr.answer td { padding: 0.25em 1em 1.5em; } .qandaset tr.question td, .qandaset tr.answer td { } hr { border: 0; border-bottom: 1px solid #ccc; } h1, h2, h3, h4 { font-family: luxi sans,sans-serif; color: #22437f; font-weight: bold; } h1 { font-size: 1.75em; } h2 { font-size: 1.25em; } h3 { font-size: 1.1em; } a:link { color: #900; } a:visited { color: #48468f; } a:hover { color: #f20; } code.screen, pre.screen { font-family: monospace; font-size: 1em; display: block; padding: 10px; border: 1px solid #bbb; background-color: #eee; color: #000; overflow: auto; border-radius: 2.5px; -moz-border-radius: 2.5px; margin: 0.5em 2em; } div.example { padding: 10px; border: 1px solid #bbb; margin: 0.5em 2em; } .procedure ol li { margin-bottom: 0.5em; } .procedure ol li li { /* prevent inheritance */ margin-bottom: 0em; } .itemizedlist ul li { margin-bottom: 0.5em; } .itemizedlist ul li li { /* prevent inheritance */ margin-bottom: 0em; } ***** Error reading new file: [Errno 2] No such file or directory: 'generated-index.php' ***** Error reading new file: [Errno 2] No such file or directory: 'index.php' ***** Error reading new file: [Errno 2] No such file or directory: 'ln-legalnotice.php' ***** Error reading new file: [Errno 2] No such file or directory: 'sn-acknowledgements.php' ***** Error reading new file: [Errno 2] No such file or directory: 'sn-managing-packages.php' ***** Error reading new file: [Errno 2] No such file or directory: 'sn-searching-packages.php' ***** Error reading new file: [Errno 2] No such file or directory: 'sn-software-management-concepts.php' ***** Error reading new file: [Errno 2] No such file or directory: 'sn-software-management-tools.php' ***** Error reading new file: [Errno 2] No such file or directory: 'sn-updating-your-system.php' ***** Error reading new file: [Errno 2] No such file or directory: 'sn-using-repositories.php' ***** Error reading new file: [Errno 2] No such file or directory: 'sn-yum-installing-frompackage.php' ***** Error reading new file: [Errno 2] No such file or directory: 'sn-yum-maintenance.php' ***** Error reading new file: [Errno 2] No such file or directory: 'sn-yum-proxy-server.php' From fedora-extras-commits at redhat.com Tue Aug 16 21:11:32 2005 From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields)) Date: Tue, 16 Aug 2005 17:11:32 -0400 Subject: web/html/docs/yum/stylesheet-images 1.png, NONE, 1.1 10.png, NONE, 1.1 11.png, NONE, 1.1 12.png, NONE, 1.1 13.png, NONE, 1.1 14.png, NONE, 1.1 15.png, NONE, 1.1 2.png, NONE, 1.1 3.png, NONE, 1.1 4.png, NONE, 1.1 5.png, NONE, 1.1 6.png, NONE, 1.1 7.png, NONE, 1.1 8.png, NONE, 1.1 9.png, NONE, 1.1 caution.png, NONE, 1.1 important.png, NONE, 1.1 note.png, NONE, 1.1 tip.png, NONE, 1.1 warning.png, NONE, 1.1 Message-ID: <200508162111.j7GLBWf6002828@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/fedora/web/html/docs/yum/stylesheet-images In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2748/yum/stylesheet-images Added Files: 1.png 10.png 11.png 12.png 13.png 14.png 15.png 2.png 3.png 4.png 5.png 6.png 7.png 8.png 9.png caution.png important.png note.png tip.png warning.png Log Message: Added yum tutorial From fedora-extras-commits at redhat.com Tue Aug 16 21:11:26 2005 From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields)) Date: Tue, 16 Aug 2005 17:11:26 -0400 Subject: web/html/docs index.php,1.2,1.3 Message-ID: <200508162111.j7GLBuFx002831@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/fedora/web/html/docs In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2748 Modified Files: index.php Log Message: Added yum tutorial Index: index.php =================================================================== RCS file: /cvs/fedora/web/html/docs/index.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- index.php 12 Jun 2005 10:31:20 -0000 1.2 +++ index.php 16 Aug 2005 21:11:24 -0000 1.3 @@ -28,6 +28,7 @@
Keeping Up to Date

Udev on Fedora

Understanding and Customizing the Apache HTTP SELinux Policy (Fedora Core 3)
+
Yum Software Management

From fedora-extras-commits at redhat.com Tue Aug 16 21:26:29 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Tue, 16 Aug 2005 17:26:29 -0400 Subject: rpms/plt-scheme/FC-4 plt-scheme.spec,1.3,1.4 Message-ID: <200508162126.j7GLQxQP003002@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/plt-scheme/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2985 Modified Files: plt-scheme.spec Log Message: correct post install procedure Index: plt-scheme.spec =================================================================== RCS file: /cvs/extras/rpms/plt-scheme/FC-4/plt-scheme.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- plt-scheme.spec 12 Aug 2005 00:14:57 -0000 1.3 +++ plt-scheme.spec 16 Aug 2005 21:26:27 -0000 1.4 @@ -1,6 +1,6 @@ Name: plt-scheme Version: 299.200 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Graphical environment for developing programs using Scheme Group: Development/Languages @@ -9,8 +9,8 @@ Source: http://download.plt-scheme.org/bundles/299.200/plt/plt-299.200-src-unix.tgz Source1: drscheme.png BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: XFree86-devel, libpng-devel, freetype-devel, fontconfig-devel -BuildRequires: desktop-file-utils +BuildRequires: XFree86-devel, libpng-devel, freetype-devel, fontconfig-devel, libjpeg-devel +BuildRequires: desktop-file-utils, sed Obsoletes: plt, drscheme Provides: plt-scheme, drscheme, mzscheme, mred, mrflow @@ -42,29 +42,34 @@ %build cd src -%configure --enable-gl --enable-xrender --disable-xft +%configure --enable-gl --enable-xrender --enable-xft make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_libdir}/plt -(cd src; make install prefix=$RPM_BUILD_ROOT%{_libdir}/plt) -(cd $RPM_BUILD_ROOT%{_libdir}/plt/bin; ./setup-plt) +pushd src +make install prefix=$RPM_BUILD_ROOT%{_libdir}/plt +popd + +for i in drscheme framework-test framework-test-engine games gmzc help-desk mzc mzpp mztext pdf-slatex planet setup-plt slatex slideshow swindle tex2page web-server web-server-monitor web-server-text +do + sed -i -e "s|PLTHOME=.*$|PLTHOME=/usr/lib/plt|" $RPM_BUILD_ROOT%{_libdir}/plt/bin/$i +done mkdir -p $RPM_BUILD_ROOT%{_bindir} -for i in $RPM_BUILD_ROOT%{_libdir}/plt/bin/{drscheme,help-desk,mzc,setup-plt,tex2page} +pushd $RPM_BUILD_ROOT%{_bindir} +for i in drscheme mred mzc mzscheme setup-plt do - perl -pi -e "s|PLTHOME=.*$|PLTHOME=/usr/lib/plt|" $i + ln -sf ../lib/plt/bin/$i . done -( - cd $RPM_BUILD_ROOT%{_bindir} - ln -sf ../lib/plt/bin/{drscheme,mred,mzc,mzscheme} . -) +popd + mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1 -cp -f $RPM_BUILD_ROOT%{_libdir}/plt/man/man1/* $RPM_BUILD_ROOT%{_mandir}/man1 +cp -p $RPM_BUILD_ROOT%{_libdir}/plt/man/man1/* $RPM_BUILD_ROOT%{_mandir}/man1 + rm -fr $RPM_BUILD_ROOT%{_libdir}/plt/man rm -fr $RPM_BUILD_ROOT%{_libdir}/plt/notes -rm -fr $RPM_BUILD_ROOT%{_libdir}/plt/install mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps cp %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/pixmaps @@ -93,6 +98,11 @@ %clean rm -rf $RPM_BUILD_ROOT + +%post +%{_libdir}/plt/install + + %files %defattr(-,root,root,-) %doc notes/* @@ -102,7 +112,11 @@ %{_datadir}/pixmaps/* %{_datadir}/applications/* + %changelog +* Tue Aug 16 2005 Gerard Milmeister - 299.200-2 +- Correct post install procedure + * Fri Aug 12 2005 Gerard Milmeister - 299.200-1 - New Version 299.200 From fedora-extras-commits at redhat.com Tue Aug 16 21:30:16 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Tue, 16 Aug 2005 17:30:16 -0400 Subject: rpms/plt-scheme/FC-3 plt-scheme.spec,1.2,1.3 Message-ID: <200508162130.j7GLUGWc003037@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/plt-scheme/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3020 Modified Files: plt-scheme.spec Log Message: correct post install procedure Index: plt-scheme.spec =================================================================== RCS file: /cvs/extras/rpms/plt-scheme/FC-3/plt-scheme.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- plt-scheme.spec 12 Aug 2005 00:16:28 -0000 1.2 +++ plt-scheme.spec 16 Aug 2005 21:30:14 -0000 1.3 @@ -1,6 +1,6 @@ Name: plt-scheme Version: 299.200 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Graphical environment for developing programs using Scheme Group: Development/Languages @@ -9,8 +9,8 @@ Source: http://download.plt-scheme.org/bundles/299.200/plt/plt-299.200-src-unix.tgz Source1: drscheme.png BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: XFree86-devel, libpng-devel, freetype-devel, fontconfig-devel -BuildRequires: desktop-file-utils +BuildRequires: XFree86-devel, libpng-devel, freetype-devel, fontconfig-devel, libjpeg-devel +BuildRequires: desktop-file-utils, sed Obsoletes: plt, drscheme Provides: plt-scheme, drscheme, mzscheme, mred, mrflow @@ -42,29 +42,34 @@ %build cd src -%configure --enable-gl --enable-xrender --disable-xft +%configure --enable-gl --enable-xrender --enable-xft make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_libdir}/plt -(cd src; make install prefix=$RPM_BUILD_ROOT%{_libdir}/plt) -(cd $RPM_BUILD_ROOT%{_libdir}/plt/bin; ./setup-plt) +pushd src +make install prefix=$RPM_BUILD_ROOT%{_libdir}/plt +popd + +for i in drscheme framework-test framework-test-engine games gmzc help-desk mzc mzpp mztext pdf-slatex planet setup-plt slatex slideshow swindle tex2page web-server web-server-monitor web-server-text +do + sed -i -e "s|PLTHOME=.*$|PLTHOME=/usr/lib/plt|" $RPM_BUILD_ROOT%{_libdir}/plt/bin/$i +done mkdir -p $RPM_BUILD_ROOT%{_bindir} -for i in $RPM_BUILD_ROOT%{_libdir}/plt/bin/{drscheme,help-desk,mzc,setup-plt,tex2page} +pushd $RPM_BUILD_ROOT%{_bindir} +for i in drscheme mred mzc mzscheme setup-plt do - perl -pi -e "s|PLTHOME=.*$|PLTHOME=/usr/lib/plt|" $i + ln -sf ../lib/plt/bin/$i . done -( - cd $RPM_BUILD_ROOT%{_bindir} - ln -sf ../lib/plt/bin/{drscheme,mred,mzc,mzscheme} . -) +popd + mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1 -cp -f $RPM_BUILD_ROOT%{_libdir}/plt/man/man1/* $RPM_BUILD_ROOT%{_mandir}/man1 +cp -p $RPM_BUILD_ROOT%{_libdir}/plt/man/man1/* $RPM_BUILD_ROOT%{_mandir}/man1 + rm -fr $RPM_BUILD_ROOT%{_libdir}/plt/man rm -fr $RPM_BUILD_ROOT%{_libdir}/plt/notes -rm -fr $RPM_BUILD_ROOT%{_libdir}/plt/install mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps cp %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/pixmaps @@ -93,6 +98,11 @@ %clean rm -rf $RPM_BUILD_ROOT + +%post +%{_libdir}/plt/install + + %files %defattr(-,root,root,-) %doc notes/* @@ -102,7 +112,11 @@ %{_datadir}/pixmaps/* %{_datadir}/applications/* + %changelog +* Tue Aug 16 2005 Gerard Milmeister - 299.200-2 +- Correct post install procedure + * Fri Aug 12 2005 Gerard Milmeister - 299.200-1 - New Version 299.200 From fedora-extras-commits at redhat.com Tue Aug 16 21:30:27 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Tue, 16 Aug 2005 17:30:27 -0400 Subject: rpms/plt-scheme/devel plt-scheme.spec,1.3,1.4 Message-ID: <200508162130.j7GLURb5003060@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/plt-scheme/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3043 Modified Files: plt-scheme.spec Log Message: correct post install procedure Index: plt-scheme.spec =================================================================== RCS file: /cvs/extras/rpms/plt-scheme/devel/plt-scheme.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- plt-scheme.spec 12 Aug 2005 00:17:38 -0000 1.3 +++ plt-scheme.spec 16 Aug 2005 21:30:25 -0000 1.4 @@ -1,6 +1,6 @@ Name: plt-scheme Version: 299.200 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Graphical environment for developing programs using Scheme Group: Development/Languages @@ -9,8 +9,8 @@ Source: http://download.plt-scheme.org/bundles/299.200/plt/plt-299.200-src-unix.tgz Source1: drscheme.png BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: XFree86-devel, libpng-devel, freetype-devel, fontconfig-devel -BuildRequires: desktop-file-utils +BuildRequires: XFree86-devel, libpng-devel, freetype-devel, fontconfig-devel, libjpeg-devel +BuildRequires: desktop-file-utils, sed Obsoletes: plt, drscheme Provides: plt-scheme, drscheme, mzscheme, mred, mrflow @@ -42,29 +42,34 @@ %build cd src -%configure --enable-gl --enable-xrender --disable-xft +%configure --enable-gl --enable-xrender --enable-xft make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_libdir}/plt -(cd src; make install prefix=$RPM_BUILD_ROOT%{_libdir}/plt) -(cd $RPM_BUILD_ROOT%{_libdir}/plt/bin; ./setup-plt) +pushd src +make install prefix=$RPM_BUILD_ROOT%{_libdir}/plt +popd + +for i in drscheme framework-test framework-test-engine games gmzc help-desk mzc mzpp mztext pdf-slatex planet setup-plt slatex slideshow swindle tex2page web-server web-server-monitor web-server-text +do + sed -i -e "s|PLTHOME=.*$|PLTHOME=/usr/lib/plt|" $RPM_BUILD_ROOT%{_libdir}/plt/bin/$i +done mkdir -p $RPM_BUILD_ROOT%{_bindir} -for i in $RPM_BUILD_ROOT%{_libdir}/plt/bin/{drscheme,help-desk,mzc,setup-plt,tex2page} +pushd $RPM_BUILD_ROOT%{_bindir} +for i in drscheme mred mzc mzscheme setup-plt do - perl -pi -e "s|PLTHOME=.*$|PLTHOME=/usr/lib/plt|" $i + ln -sf ../lib/plt/bin/$i . done -( - cd $RPM_BUILD_ROOT%{_bindir} - ln -sf ../lib/plt/bin/{drscheme,mred,mzc,mzscheme} . -) +popd + mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1 -cp -f $RPM_BUILD_ROOT%{_libdir}/plt/man/man1/* $RPM_BUILD_ROOT%{_mandir}/man1 +cp -p $RPM_BUILD_ROOT%{_libdir}/plt/man/man1/* $RPM_BUILD_ROOT%{_mandir}/man1 + rm -fr $RPM_BUILD_ROOT%{_libdir}/plt/man rm -fr $RPM_BUILD_ROOT%{_libdir}/plt/notes -rm -fr $RPM_BUILD_ROOT%{_libdir}/plt/install mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps cp %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/pixmaps @@ -93,6 +98,11 @@ %clean rm -rf $RPM_BUILD_ROOT + +%post +%{_libdir}/plt/install + + %files %defattr(-,root,root,-) %doc notes/* @@ -102,7 +112,11 @@ %{_datadir}/pixmaps/* %{_datadir}/applications/* + %changelog +* Tue Aug 16 2005 Gerard Milmeister - 299.200-2 +- Correct post install procedure + * Fri Aug 12 2005 Gerard Milmeister - 299.200-1 - New Version 299.200 From fedora-extras-commits at redhat.com Tue Aug 16 21:30:54 2005 From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields)) Date: Tue, 16 Aug 2005 17:30:54 -0400 Subject: web/html/docs/yum generated-index.php, 1.1, 1.2 index.php, 1.1, 1.2 ln-legalnotice.php, 1.1, 1.2 sn-acknowledgements.php, 1.1, 1.2 sn-managing-packages.php, 1.1, 1.2 sn-searching-packages.php, 1.1, 1.2 sn-software-management-concepts.php, 1.1, 1.2 sn-software-management-tools.php, 1.1, 1.2 sn-updating-your-system.php, 1.1, 1.2 sn-using-repositories.php, 1.1, 1.2 sn-yum-installing-frompackage.php, 1.1, 1.2 sn-yum-maintenance.php, 1.1, 1.2 sn-yum-proxy-server.php, 1.1, 1.2 Message-ID: <200508162130.j7GLUsGS003099@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/fedora/web/html/docs/yum In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3066 Modified Files: generated-index.php index.php ln-legalnotice.php sn-acknowledgements.php sn-managing-packages.php sn-searching-packages.php sn-software-management-concepts.php sn-software-management-tools.php sn-updating-your-system.php sn-using-repositories.php sn-yum-installing-frompackage.php sn-yum-maintenance.php sn-yum-proxy-server.php Log Message: New push to get bookid straightened to 1.0 Index: index.php =================================================================== RCS file: /cvs/fedora/web/html/docs/yum/index.php,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- index.php 16 Aug 2005 21:11:24 -0000 1.1 +++ index.php 16 Aug 2005 21:30:52 -0000 1.2 @@ -67,7 +67,7 @@ root password. The example terminal commands use su -c to provide this facility. -
1.4. Additional Resources
+
1.4. Additional Resources
The yum utility has features and options not discussed in this document. Read the man pages for yum(8) and @@ -76,7 +76,7 @@
man yum man yum.conf -
+
Other useful yum resources on the Internet include:
Index: ln-legalnotice.php =================================================================== RCS file: /cvs/fedora/web/html/docs/yum/ln-legalnotice.php,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ln-legalnotice.php 16 Aug 2005 21:11:24 -0000 1.1 +++ ln-legalnotice.php 16 Aug 2005 21:30:52 -0000 1.2 @@ -26,7 +26,7 @@ They all may be freely redistributed with documentation produced for the Fedora Project.
- yum-software-management-0.6.3 (2005-08-12) + yum-software-management-1.0 (2005-08-13)
Red Hat, Red Hat Network, the Red Hat "Shadow Man" logo, RPM, Maximum RPM, the RPM logo, Linux Library, PowerTools, Linux Undercover, RHmember, RHmember More, Rough Cuts, Index: sn-managing-packages.php =================================================================== RCS file: /cvs/fedora/web/html/docs/yum/sn-managing-packages.php,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sn-managing-packages.php 16 Aug 2005 21:11:24 -0000 1.1 +++ sn-managing-packages.php 16 Aug 2005 21:30:52 -0000 1.2 @@ -7,7 +7,7 @@ ?> -
4. Managing Software with yum
Prev Next
4. Managing Software with yum
+
4. Managing Software with yum
Prev Next
4. Managing Software with yum
Use the yum utility to modify the software on your system in three ways:
@@ -92,7 +92,7 @@ /var/cache/yum/, and use them elsewhere if you wish. If you remove a package from the cache, you do not affect the copy of the software installed on your system. -
4.1. Installing New Software with yum
+
4.1. Installing New Software with yum
To install the package tsclient, enter the command:
@@ -117,7 +117,7 @@ Settings->Server Settings->Services, or use the chkconfig and service command-line utilities. -
4.2. Updating Software with yum
+
4.2. Updating Software with yum
To update the tsclient package to the latest version, type:
@@ -144,7 +144,7 @@ To update all of the packages on your Fedora system, use the commands described in Section 6, “Updating Your System with yum”. -
4.3. Removing Software with yum
+
4.3. Removing Software with yum
To remove software, yum examines your system for both the specified software, and any software which claims it as a dependency. The transaction to remove the software Index: sn-searching-packages.php =================================================================== RCS file: /cvs/fedora/web/html/docs/yum/sn-searching-packages.php,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sn-searching-packages.php 16 Aug 2005 21:11:24 -0000 1.1 +++ sn-searching-packages.php 16 Aug 2005 21:30:52 -0000 1.2 @@ -7,7 +7,7 @@ ?> -
5. Searching for Packages with yum
Prev Next
5. Searching for Packages with yum
+
5. Searching for Packages with yum
Prev Next
5. Searching for Packages with yum
Use the search features of yum to find software that is available from the configured repositories, or already installed on your system. Searches automatically include both Index: sn-software-management-concepts.php =================================================================== RCS file: /cvs/fedora/web/html/docs/yum/sn-software-management-concepts.php,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sn-software-management-concepts.php 16 Aug 2005 21:11:24 -0000 1.1 +++ sn-software-management-concepts.php 16 Aug 2005 21:30:52 -0000 1.2 @@ -7,7 +7,7 @@ ?> -
2. Software Management Concepts
Prev Next
2. Software Management Concepts
2.1. About Packages
+
2. Software Management Concepts
Prev Next
2. Software Management Concepts
2.1. About Packages
Fedora software and documentation is supplied in the form of files called RPM packages. Each package is a compressed archive containing product information, program @@ -24,7 +24,7 @@ share a common keyring that stores all of the public keys for approved package sources. The system administrator configures these approved package sources. -
2.2. About Repositories
+
2.2. About Repositories
A repository is a prepared directory or web site that contains software packages and index files. Software management utilities such as yum @@ -56,7 +56,7 @@ their Fedora compatible packages. To learn how to configure your Fedora system to use third-party repositories, read Section 7, “Using Other Software Repositories”. -
+
You may also use the package groups provided by the Fedora repositories to manage related packages as sets. Some third-party repositories add packages to these @@ -81,7 +81,7 @@ Section 9, “Manually Installing Software” for details of using yum to install software from a package file. -
2.3. About Dependencies
+

2.3. About Dependencies

Some of the files installed on a Fedora distribution are libraries which may provide functions to multiple applications. When an application requires a specific @@ -98,7 +98,7 @@ application has requirements that conflict with existing software, yum aborts without making any changes to your system. -

2.4. Understanding Package Names

Each package file has a long name that indicates several key pieces of information. This is the full name of the tsclient package supplied with Fedora Core: Index: sn-software-management-tools.php =================================================================== RCS file: /cvs/fedora/web/html/docs/yum/sn-software-management-tools.php,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sn-software-management-tools.php 16 Aug 2005 21:11:24 -0000 1.1 +++ sn-software-management-tools.php 16 Aug 2005 21:30:52 -0000 1.2 @@ -7,7 +7,7 @@ ?> -

3. Software Management Tools in Fedora Core
Prev		Next

3. Software Management Tools in Fedora Core

3. Software Management Tools in Fedora Core
Prev		Next

3. Software Management Tools in Fedora Core

The yum utility is a complete software management system. Fedora Core also includes other several other applications that can supplement yum. Index: sn-updating-your-system.php =================================================================== RCS file: /cvs/fedora/web/html/docs/yum/sn-updating-your-system.php,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sn-updating-your-system.php 16 Aug 2005 21:11:24 -0000 1.1 +++ sn-updating-your-system.php 16 Aug 2005 21:30:52 -0000 1.2 @@ -7,7 +7,7 @@ ?> -

6. Updating Your System with `yum`
Prev		Next

6. Updating Your System with `yum`

6. Updating Your System with `yum`
Prev		Next

6. Updating Your System with `yum`

Use the update option to upgrade all of your Fedora system software to the latest version with one operation.

@@ -17,7 +17,7 @@

At the prompt, enter the root password. -

6.1. Automatically Updating Your System

The yum package supplied with Fedora Core includes scripts to perform full system updates every day. To activate automatic daily updates, enter this command: Index: sn-using-repositories.php =================================================================== RCS file: /cvs/fedora/web/html/docs/yum/sn-using-repositories.php,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sn-using-repositories.php 16 Aug 2005 21:11:24 -0000 1.1 +++ sn-using-repositories.php 16 Aug 2005 21:30:52 -0000 1.2 @@ -7,7 +7,7 @@ ?> -

7. Using Other Software Repositories
Prev		Next

7. Using Other Software Repositories

7. Using Other Software Repositories
Prev		Next

7. Using Other Software Repositories

Fedora systems automatically use the Fedora Project repositories. These include Fedora Extras, the default source of packages for software that is not included with Fedora Core. @@ -23,7 +23,7 @@ repository. Members of the community also maintain repositories to provide packages for Fedora systems. Third-party repositories provide information on their web sites. -

7.1. Adding a Repository as a Package Source

To add an extra repository, place a definition file in the /etc/yum.repos.d/ directory on your system. Package providers make the definition files for their @@ -56,7 +56,7 @@ configure up2date to use these channels. To do so, edit the /etc/sysconfig/rhn/sources file. -

7.2. Manually Authorizing Package Sources

To manually add a public key to your rpm keyring, use the import feature of the rpm utility. To import the file @@ -86,7 +86,7 @@

At the prompt, enter the root password. -

7.3. Understanding Repository Compatibility

The Fedora Extras repository provides packages which are built to the same standards as Fedora Core packages. Third-party packages should be compatible with these Fedora Project packages, unless the provider Index: sn-yum-installing-frompackage.php =================================================================== RCS file: /cvs/fedora/web/html/docs/yum/sn-yum-installing-frompackage.php,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sn-yum-installing-frompackage.php 16 Aug 2005 21:11:24 -0000 1.1 +++ sn-yum-installing-frompackage.php 16 Aug 2005 21:30:52 -0000 1.2 @@ -7,7 +7,7 @@ ?> -

9. Manually Installing Software
Prev		Next

9. Manually Installing Software

9. Manually Installing Software
Prev		Next

9. Manually Installing Software

Use repositories and the standard yum commands to install new software, unless the software is only available as a package. In these cases, use the localinstall Index: sn-yum-maintenance.php =================================================================== RCS file: /cvs/fedora/web/html/docs/yum/sn-yum-maintenance.php,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sn-yum-maintenance.php 16 Aug 2005 21:11:24 -0000 1.1 +++ sn-yum-maintenance.php 16 Aug 2005 21:30:52 -0000 1.2 @@ -14,7 +14,7 @@ definitions which you no longer require. You may also clear the files from the yum caches in order to recover disk space. -

8.1. Disabling or Removing Package Sources

Set enable=0 in a definition file to prevent yum from using that repository. The yum utility ignores any definition file with @@ -27,7 +27,7 @@

Delete the cache directory from /var/cache/yum/. -

8.2. Clearing the `yum` Caches

By default, yum retains the packages and package data files that it downloads, so they may be reused in future operations without being downloaded again. To purge the Index: sn-yum-proxy-server.php =================================================================== RCS file: /cvs/fedora/web/html/docs/yum/sn-yum-proxy-server.php,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sn-yum-proxy-server.php 16 Aug 2005 21:11:24 -0000 1.1 +++ sn-yum-proxy-server.php 16 Aug 2005 21:30:52 -0000 1.2 @@ -7,7 +7,7 @@ ?> -

10. Using `yum` with a Proxy Server
Prev		Next

10. Using `yum` with a Proxy Server

10. Using `yum` with a Proxy Server
Prev		Next

10. Using `yum` with a Proxy Server

You may access repositories through standard web proxy servers. If your system is connected to the Internet through a web proxy server, specify the proxy server details in From fedora-extras-commits at redhat.com Tue Aug 16 21:46:38 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Tue, 16 Aug 2005 17:46:38 -0400 Subject: rpms/plt-scheme/FC-4 plt-scheme.spec,1.4,1.5 Message-ID: <200508162146.j7GLkcwY003423@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/plt-scheme/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3406 Modified Files: plt-scheme.spec Log Message: added openssl-devel buildreq Index: plt-scheme.spec =================================================================== RCS file: /cvs/extras/rpms/plt-scheme/FC-4/plt-scheme.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- plt-scheme.spec 16 Aug 2005 21:26:27 -0000 1.4 +++ plt-scheme.spec 16 Aug 2005 21:46:36 -0000 1.5 @@ -1,6 +1,6 @@ Name: plt-scheme Version: 299.200 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Graphical environment for developing programs using Scheme Group: Development/Languages @@ -10,6 +10,7 @@ Source1: drscheme.png BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: XFree86-devel, libpng-devel, freetype-devel, fontconfig-devel, libjpeg-devel +BuildRequires: zlib-devel, openssl-devel BuildRequires: desktop-file-utils, sed Obsoletes: plt, drscheme Provides: plt-scheme, drscheme, mzscheme, mred, mrflow @@ -114,6 +115,9 @@ %changelog +* Tue Aug 16 2005 Gerard Milmeister - 299.200-3 +- Added openssl-devel buildreq + * Tue Aug 16 2005 Gerard Milmeister - 299.200-2 - Correct post install procedure From fedora-extras-commits at redhat.com Tue Aug 16 21:47:45 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Tue, 16 Aug 2005 17:47:45 -0400 Subject: rpms/plt-scheme/FC-3 plt-scheme.spec,1.3,1.4 Message-ID: <200508162148.j7GLmGP3003498@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/plt-scheme/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3472 Modified Files: plt-scheme.spec Log Message: added openssl-devel buildreq Index: plt-scheme.spec =================================================================== RCS file: /cvs/extras/rpms/plt-scheme/FC-3/plt-scheme.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- plt-scheme.spec 16 Aug 2005 21:30:14 -0000 1.3 +++ plt-scheme.spec 16 Aug 2005 21:47:42 -0000 1.4 @@ -1,6 +1,6 @@ Name: plt-scheme Version: 299.200 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Graphical environment for developing programs using Scheme Group: Development/Languages @@ -10,6 +10,7 @@ Source1: drscheme.png BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: XFree86-devel, libpng-devel, freetype-devel, fontconfig-devel, libjpeg-devel +BuildRequires: zlib-devel, openssl-devel BuildRequires: desktop-file-utils, sed Obsoletes: plt, drscheme Provides: plt-scheme, drscheme, mzscheme, mred, mrflow @@ -114,6 +115,9 @@ %changelog +* Tue Aug 16 2005 Gerard Milmeister - 299.200-3 +- Added openssl-devel buildreq + * Tue Aug 16 2005 Gerard Milmeister - 299.200-2 - Correct post install procedure From fedora-extras-commits at redhat.com Tue Aug 16 21:48:30 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Tue, 16 Aug 2005 17:48:30 -0400 Subject: rpms/plt-scheme/devel plt-scheme.spec,1.4,1.5 Message-ID: <200508162148.j7GLmUp4003524@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/plt-scheme/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3505 Modified Files: plt-scheme.spec Log Message: added openssl-devel buildreq Index: plt-scheme.spec =================================================================== RCS file: /cvs/extras/rpms/plt-scheme/devel/plt-scheme.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- plt-scheme.spec 16 Aug 2005 21:30:25 -0000 1.4 +++ plt-scheme.spec 16 Aug 2005 21:48:28 -0000 1.5 @@ -1,6 +1,6 @@ Name: plt-scheme Version: 299.200 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Graphical environment for developing programs using Scheme Group: Development/Languages @@ -10,6 +10,7 @@ Source1: drscheme.png BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: XFree86-devel, libpng-devel, freetype-devel, fontconfig-devel, libjpeg-devel +BuildRequires: zlib-devel, openssl-devel BuildRequires: desktop-file-utils, sed Obsoletes: plt, drscheme Provides: plt-scheme, drscheme, mzscheme, mred, mrflow @@ -114,6 +115,9 @@ %changelog +* Tue Aug 16 2005 Gerard Milmeister - 299.200-3 +- Added openssl-devel buildreq + * Tue Aug 16 2005 Gerard Milmeister - 299.200-2 - Correct post install procedure From fedora-extras-commits at redhat.com Tue Aug 16 22:06:15 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Tue, 16 Aug 2005 18:06:15 -0400 Subject: rpms/abicheck/devel abicheck.spec,1.22,1.23 Message-ID: <200508162207.j7GM72cF004919@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/abicheck/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4889 Modified Files: abicheck.spec Log Message: update default buildroot Index: abicheck.spec =================================================================== RCS file: /cvs/extras/rpms/abicheck/devel/abicheck.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- abicheck.spec 16 Aug 2005 20:51:30 -0000 1.22 +++ abicheck.spec 16 Aug 2005 22:05:50 -0000 1.23 @@ -14,7 +14,7 @@ Patch3: abicheck-1.2-libgcc.patch Patch4: abicheck-1.2-fortify-source-fc5.patch Patch5: abicheck-1.2-ldlinux.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n) Requires: binutils perl From fedora-extras-commits at redhat.com Tue Aug 16 22:12:45 2005 From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields)) Date: Tue, 16 Aug 2005 18:12:45 -0400 Subject: web/html/docs/updates/stylesheet-images - New directory Message-ID: <200508162212.j7GMCjKi005077@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/fedora/web/html/docs/updates/stylesheet-images In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5067/stylesheet-images Log Message: Directory /cvs/fedora/web/html/docs/updates/stylesheet-images added to the repository From fedora-extras-commits at redhat.com Tue Aug 16 22:20:13 2005 From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields)) Date: Tue, 16 Aug 2005 18:20:13 -0400 Subject: web/html/docs/updates generated-index.php, 1.1.1.1, 1.2 index.php, 1.1.1.1, 1.2 ln-legalnotice.php, 1.1.1.1, 1.2 refs.php, 1.1.1.1, 1.2 updating-sources.php, 1.1.1.1, 1.2 using-yum.php, 1.1.1.1, 1.2 Message-ID: <200508162220.j7GMKDOL005226@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/fedora/web/html/docs/updates In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5172 Modified Files: generated-index.php index.php ln-legalnotice.php refs.php updating-sources.php using-yum.php Log Message: Deprecated updates document Index: generated-index.php =================================================================== RCS file: /cvs/fedora/web/html/docs/updates/generated-index.php,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- generated-index.php 30 Mar 2005 17:47:23 -0000 1.1.1.1 +++ generated-index.php 16 Aug 2005 22:20:11 -0000 1.2 @@ -7,7 +7,7 @@ ?> -

Index
Prev?	?	?

Index

Prev?	Up	?
A.?References?	Home	?

Index
Prev

Index

Prev
A. References	Home

Keeping Up to Date
?	?	?Next

Keeping Up to Date

Dave Pawson

Revision History

Revision 0.1.1

22 March 200! 4

TammyFox

Style and copy edits

Revision 0.1.2

27 August 2004

TammyFox

More editing before committing to CVS

Revision 0.1.3

27 August 2004

PaulWFrields

Keeping Up to Date - DEPRECATED
		Next

Keeping Up to Date - DEPRECATED

Dave Pawson

Revision History
Re! vision 0.1.1	22 March 2004	TammyFox
Style and copy edits
Revision 0.1.2	27 August 2004	TammyFox
More editing before committing to CVS
Revision 0.1.3	27 August 2004	PaulWFrields
Style and grammar edits -

1. Background
2. Updating Sources
3. Using yum
A. References

1.?Background

Revision 0.1.4

16 August 2005

PaulWFrields

+ Document deprecated. Refer to "Yum Software Management" tutorial + instead at http://fedora.redhat.com/docs/yum/ +

1. Background
2. Updating Sources
3. Using yum
A. References
Index

1. Background

DEPRECATED DOCUMENT

+ This document is no longer supported by the Fedora Documentation Project. One or more of the + following situations may have occurred: +

+ Changes in Fedora may have made this document inaccurate. +
+ A more relevant document may be available. +
+ This document may have been subsumed in a different document. +

+ Refer to the revision history for more information. +

After installing Fedora Core, you should determine if your installation is up to date with the most recent package versions. If your CDs are more than a week or two old, then it's likely you need to update your system. This tutorial provides instructions for the command line tool - yum, which does not have a graphical interface. -

?	?	?Next
?	?	?2.?Updating Sources

+ yum, which does not have a graphical interface. +

		Next
		2. Updating Sources

Garrett LeSage created the admonition graphics (note, tip, important, - caution, and warning). They may be freely redistributed with documentation + caution, and warning). + Tommy Reynolds <Tommy.Reynolds at MegaCoder.com> created the callout graphics. + They all may be freely redistributed with documentation produced for the Fedora Project.

- updates-0.1.3 (2004-08-27) + updates-0.1.4 (2005-08-16)

Red Hat, Red Hat Network, the Red Hat "Shadow Man" logo, RPM, Maximum RPM, the RPM logo, Linux Library, PowerTools, Linux Undercover, RHmember, RHmember More, Rough Cuts, Index: refs.php =================================================================== RCS file: /cvs/fedora/web/html/docs/updates/refs.php,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- refs.php 30 Mar 2005 17:47:23 -0000 1.1.1.1 +++ refs.php 16 Aug 2005 22:20:11 -0000 1.2 @@ -7,14 +7,25 @@ ?> -

A.?References
Prev?	?	?Next

A.?References

- Fedora HOWTO available at http://www.fedora.us/wiki/FedoraHOWTO +

A. References
Prev		Next

A. References

DEPRECATED DOCUMENT

+ This document is no longer supported by the Fedora Documentation Project. One or more of the + following situations may have occurred: +

+ Changes in Fedora may have made this document inaccurate. +
+ A more relevant document may be available. +
+ This document may have been subsumed in a different document. +

+ Refer to the revision history for more information. +

+ Fedora HOWTO available at http://www.fedora.us/wiki/FedoraHOWTO — Not overly complete, but a start.
- Yum (Yellow dog Updater, Modified) HOWTO + Yum (Yellow dog Updater, Modified) HOWTO available at http://www.phy.duke.edu/~rgb/General/yum_HOWTO/yum_HOWTO/ — A more complete Yum HOWTO. -

Prev?	Up	?Next
3.?Using yum?	Home	?Index

Prev		Next
3. Using `yum`	Home	Index

2.?Updating Sources
Prev?	?	?Next

2.?Updating Sources

2. Updating Sources
Prev		Next

2. Updating Sources

DEPRECATED DOCUMENT

+ This document is no longer supported by the Fedora Documentation Project. One or more of the + following situations may have occurred: +

+ Changes in Fedora may have made this document inaccurate. +
+ A more relevant document may be available. +
+ This document may have been subsumed in a different document. +

+ Refer to the revision history for more information. +

The Fedora Project lists a number of Web resources which may be trusted and used for your updates. You may need more than one if you plan to download updates at busy times. You may encounter problems if alternatives are not - available. The baseurl entry in each of - the two sections of yum.conf refers to the main Fedora Project + available. The baseurl entry in each of + the two sections of yum.conf refers to the main Fedora Project website, http://fedora.redhat.com/releases/fedora-core-$releasever/, and it is very busy. If you perform your updates at the same time as many other users, your feed rates may be very slow, even @@ -23,80 +34,80 @@ lists many alternatives. Choose a few that are local to you, and copy the URLs into a text editor.

- Open the file /etc/yum.conf, which contains a list of + Open the file /etc/yum.conf, which contains a list of servers. Look for the section headed - [base]. A couple of variables are - available for use, indicated by the $ - prefix, including releasever and - basearch. Using these variables means you + [base]. A couple of variables are + available for use, indicated by the $ + prefix, including releasever and + basearch. Using these variables means you don't have to update this file for each new release of Fedora Core. Typically the - releasever might be - 1, indicating that - fedora-core-1 is a good place to look for - core updates. The variable basearch might - be i386, indicating you are using an + releasever might be + 1, indicating that + fedora-core-1 is a good place to look for + core updates. The variable basearch might + be i386, indicating you are using an Intel family processor. Note that you should not modify these variables; the system does it for you.

Next, check out each of your servers to ensure that when - yum is fetching the updates, it looks on the server for - the headers directory. For example, http://distro.ibiblio.org/pub/linux/distributions/fedora/linux/core/ + yum is fetching the updates, it looks on the server for + the headers directory. For example, http://distro.ibiblio.org/pub/linux/distributions/fedora/linux/core/ gives a URL, but if you follow that URL, you'll find that there is no - headers directory present. You will, however, notice - a directory entitled 1 which is useful, but only if - you are aware of the two blocks in yum.conf. The - first is [base] and the next is - [updates-released]. The former is the + headers directory present. You will, however, notice + a directory entitled 1 which is useful, but only if + you are aware of the two blocks in yum.conf. The + first is [base] and the next is + [updates-released]. The former is the basic Fedora "stock" distribution, while the latter holds updates. Go back to the ibiblio site and find the similarly marked directories: - updates and 1. Now you can + updates and 1. Now you can modify the server URLs that the Fedora Project provides to make them useful for - yum. + yum.

On http://distro.ibiblio.org/pub/linux/distributions/fedora/linux/core/1/i386/os/, - there is a directory called headers/. Scroll down + there is a directory called headers/. Scroll down until you find it. This is the directory that should be entered into the - [base] section — + [base] section — not the directory containing the headers themselves, - but the one that contains the headers/ directory. For + but the one that contains the headers/ directory. For example, the URL http://distro.ibiblio.org/pub/linux/distributions/fedora/linux/core/1/i386/os/ is entered in this example.

Now that you have a list of servers, add these to - yum.conf to enable yum to find - them. First, add the [base] section. The + yum.conf to enable yum to find + them. First, add the [base] section. The following example provides two feeds for a user in the UK. -

[base] name=Fedora Core $releasever - $basearch - +

[base] name=Fedora Core $releasever - $basearch -
 	  Base
 	  baseurl=http://zeniiia.linux.org.uk/pub/distributions/fedora/linux/core/updates/$releasever/i386 
 	  http://www.mirror.ac.uk/sites/download.fedora.redhat.com/pub/fedora/linux/core/$releasever/i386/os 
 	  http://mirror.linux.duke.edu/pub/fedora/linux/core/updates/$releasever/i386 
 	  ftp://sunsite.informatik.rwth-aachen.de/pub/Linux/fedora-core/$releasever/i386/os 
 	  http://download.fedora.redhat.com/pub/fedora/linux/core/$releasever/$basearch/os 
-	  #baseurl=http://fedora.redhat.com/releases/fedora-core-$releasever

Example?1.?Example [base] Section of - yum.conf

- The baseurl variable is set to a list of + #baseurl=http://fedora.redhat.com/releases/fedora-core-$releasever

Example 1. Example [base] Section of + yum.conf

+ The baseurl variable is set to a list of URLs for the stock distribution. For the - [updates-released] section, again use + [updates-released] section, again use your list of URLs, but this time, choose a directory that contains the RPM updates for Fedora Core. For example: -

[updates-released] name=Fedora Core $releasever - +

[updates-released] name=Fedora Core $releasever -
 	$basearch - Released Updates
 	baseurl=http://fedora.redhat.com/updates/released/fedora-core-$releasever 
-	http://distro.ibiblio.org/pub/linux/distributions/fedora/linux/core/updates/1/i386/

+ http://distro.ibiblio.org/pub/linux/distributions/fedora/linux/core/updates/1/i386/

Finally, there is another configuration file to edit: - /etc/sysconfig/rhn/sources. The default values for - yum are found here. Look for yum - fedora-core-1 and yum - updates-released. Just as with - yum.conf, these two can take multiple values, one on + /etc/sysconfig/rhn/sources. The default values for + yum are found here. Look for yum + fedora-core-1 and yum + updates-released. Just as with + yum.conf, these two can take multiple values, one on a line. For example: -

yum updates-released +

yum updates-released
 	http://zeniiia.linux.org.uk/pub/distributions/fedora/linux/core/updates/$releasever/i386 
 	http://download.fedora.redhat.com/pub/fedora/linux/core/updates/1/i386
 	http://mirrors.kernel.org/fedora/core/updates/1/i386 #Original line #yum
 	updates-released
-	http://download.fedora.redhat.com/pub/fedora/linux/core/updates/1/$ARCH/

+ http://download.fedora.redhat.com/pub/fedora/linux/core/updates/1/$ARCH/

The first line has been split for readability; there should be no split in the line in your configuration file. Leave the original line present, but commented out, in case you need to revert to it for some reason. @@ -107,18 +118,18 @@ site

Explore each one to find the right directory for the - [base] and - [updates-released] sections + [base] and + [updates-released] sections

Make a note of the URL for each one

- Add them to the [base] and - [updates-released] sections of - yum.conf + Add them to the [base] and + [updates-released] sections of + yum.conf

- Modify /etc/sysconfig/rhn/sources to include + Modify /etc/sysconfig/rhn/sources to include the alternative updates locations -

Prev?	Up	?Next
Keeping Up to Date?	Home	?3.?Using yum

Prev		Next
Keeping Up to Date - DEPRECATED	Home	3. Using `yum`

3.?Using yum
Prev?	?	?Next

3.?Using `yum`

- yum is a command line program. man yum provides the +

3. Using `yum`
Prev		Next

3. Using `yum`

DEPRECATED DOCUMENT

+ This document is no longer supported by the Fedora Documentation Project. One or more of the + following situations may have occurred: +

+ Changes in Fedora may have made this document inaccurate. +
+ A more relevant document may be available. +
+ This document may have been subsumed in a different document. +

+ Refer to the revision history for more information. +

+ yum is a command line program. man yum provides the local documentation. The basic operations are its setup, checking for updates, and finally, looking for and installing a specific package. @@ -18,29 +29,29 @@ take some time to complete. Consider doing this when network traffic is low.

- The setup command is yum check-update. This step loads onto your system + The setup command is yum check-update. This step loads onto your system the headers of the packages, which can be up to 30 or 40 megabytes of data. This is an operation that is necessary, but only needs to be done once. After this operation, this list is updated with each update you get.

- Next, get any needed updates. The command is yum - update. This command causes yum to + Next, get any needed updates. The command is yum + update. This command causes yum to compare the headers you downloaded above with those on the server and - offer to update your system. A simple y response is - enough to cause yum to fetch the updates, then to install them on your + offer to update your system. A simple y response is + enough to cause yum to fetch the updates, then to install them on your system.

- Finally, if you need to run command X, and - you try it, and it isn't installed, you can tell yum to get it for you and + Finally, if you need to run command X, and + you try it, and it isn't installed, you can tell yum to get it for you and install it. For example: -

yum install cvs

- yum connects to the server, finds the named package, retrieves it, and +

yum install cvs

+ yum connects to the server, finds the named package, retrieves it, and installs it automatically.

- Refer to Appendix?A, References for + Refer to Appendix A, References for references and another HOWTO on Yum. -

Prev?	Up	?Next
2.?Updating Sources?	Home	?A.?References

Prev		Next
2. Updating Sources	Home	A. References

Author: pfrields Update of /cvs/fedora/web/html/docs/updates/stylesheet-images In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5172/stylesheet-images Added Files: 1.png 10.png 11.png 12.png 13.png 14.png 15.png 2.png 3.png 4.png 5.png 6.png 7.png 8.png 9.png caution.png important.png note.png tip.png warning.png Log Message: Deprecated updates document From fedora-extras-commits at redhat.com Tue Aug 16 22:41:34 2005 From: fedora-extras-commits at redhat.com (Karsten Wade (kwade)) Date: Tue, 16 Aug 2005 18:41:34 -0400 Subject: web/html/docs/yum generated-index.php, 1.2, 1.3 index.php, 1.2, 1.3 ln-legalnotice.php, 1.2, 1.3 sn-acknowledgements.php, 1.2, 1.3 sn-managing-packages.php, 1.2, 1.3 sn-searching-packages.php, 1.2, 1.3 sn-software-management-concepts.php, 1.2, 1.3 sn-software-management-tools.php, 1.2, 1.3 sn-updating-your-system.php, 1.2, 1.3 sn-using-repositories.php, 1.2, 1.3 sn-yum-installing-frompackage.php, 1.2, 1.3 sn-yum-maintenance.php, 1.2, 1.3 sn-yum-proxy-server.php, 1.2, 1.3 Message-ID: <200508162241.j7GMfYN6005417@cvs-int.fedora.redhat.com> Author: kwade Update of /cvs/fedora/web/html/docs/yum In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5388 Modified Files: generated-index.php index.php ln-legalnotice.php sn-acknowledgements.php sn-managing-packages.php sn-searching-packages.php sn-software-management-concepts.php sn-software-management-tools.php sn-updating-your-system.php sn-using-repositories.php sn-yum-installing-frompackage.php sn-yum-maintenance.php sn-yum-proxy-server.php Log Message: Updating title to be less clunky. Index: generated-index.php =================================================================== RCS file: /cvs/fedora/web/html/docs/yum/generated-index.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- generated-index.php 16 Aug 2005 21:30:52 -0000 1.2 +++ generated-index.php 16 Aug 2005 22:41:32 -0000 1.3 @@ -7,7 +7,7 @@ ?> -

Index
Prev

Index

A

Add/Remove Applications utility, Software Management Tools in Fedora Core
Alert Icon, Software Management Tools in Fedora Core
automatic updating, Automatically Updating Your System

D

dependencies

defined, About Dependencies

F

Fedora Extras, Using Other Software Repositories

I

installing software (see software, installing)

from a package (see software, installing from a package)

P

package groups

defined, About Repositories

packages

defined, About Packages
hardware compatibility, Understanding Package Names
locating, Searching for Packages with yum
naming, Understanding Package Namessoftware compatibility, Understanding Repository Compatibility

proxy server, Using yum with a Proxy Server

public keys

adding, Manually Authorizing Package Sources

R

removing software, Removing Software with yum

repositories

adding to yum, Adding a Repository as a Package Source
compatibility, Understanding Repository Compatibility
defined, About Repositories
disabling in yum, Disabling or Removing Package Sources
finding, Using Other Software Repositories
removing from yum, Disabling or Removing Package Sources

S

searching

for packages, Searching for Packages with yum
for repositories, Using Other Software Repositories

software

installing, Installing New Software with yum
installing from a package, Manually Installing Software
removing, Removing Software with yum
updating, Updating Softwa! re wit um

U

up2date, Software Management Tools in Fedora Core

updating

full system, Updating Your System with yum
software packages, Updating Software with yum

Y

yum

cleaning caches, Clearing the yum Caches
documentation, Additional Resources
mailing lists, Additional Resources
man pages, Additional Resources
software management, Managing Software with yum
updating ! full system, Updating Your System with yum
using with a proxy server, Using yum with a Proxy Server
web sites, Additional Resources

Prev
11. Acknowledgements	Home

Index
Prev

Index

A

Add/Remove Applications utility, Software Management Tools in Fedora Core
Alert Icon, Software Management Tools in Fedora Core
automatic updating, Automatically Updating Your System

D

dependencies

defined, About Dependencies

F

Fedora Extras, Using Other Software Repositories

I

installing software (see software, installing)

from a package (see software, installing from a package)

P

package groups

defined, About Repositories

packages

defined, About Packages
hardware compatibility, Understanding Package Names
locating, Searching for Packages with yum
naming, Understanding Pac! kage N s
software compatibility, Understanding Repository Compatibility

proxy server, Using yum with a Proxy Server

public keys

adding, Manually Authorizing Package Sources

R

removing software, Removing Software with yum

repositories

adding to yum, Adding a Repository as a Package Source
compatibility, Understanding Repository Compatibility
defined, About Repositories
disabling in yum, Disabling or Removing Package Sources
finding, Using Other Software Repositories
removing from yum, Disabling or Removing Package Sources

S

searching

for packages, Searching for Packages with yum
for repositories, Using Other Software Repositories

software

installing, Installing New Software with yum
installing from a package, Manually Installing Software
removing, Removing Software with yum
updating, Upda! ting S ware with yum

U

up2date, Software Management Tools in Fedora Core

updating

full system, Updating Your System with yum
software packages, Updating Software with yum

Y

yum

cleaning caches, Clearing the yum Caches
documentation, Additional Resources
mailing lists, Additional Resources
man pages, Additional Resources
software management, Managing Software with yum
using with a proxy server, Using yum with a Proxy Server
web sites, Additional Resources

Prev	Up
11. Acknowledgements	Home

Software Management with `yum`
		Next

Software Management with `yum`

Stuart Ellis

Revision History

Revision 0.4 2005-06-01 StuartEllis

Managing Software with yum
		Next

Managing Software with `yum`

Stuart Ellis

Revision History!

Revision 0.4

2005-06-01

StuartEllis

Initial import into CVS.

@@ -23,61 +23,61 @@

Publish to official project page.

1.1. Purpose
1.2. Audience
1.3. Using This Document
1.4. Additional Resources

2.1. About Packages
2.2. About Repositories
2.3. About Dependencies
2.4. Understanding Package Names

4. Managing Software with yum

4.1. Installing New Software with yum
4.2. Updating Software with yum
4.! 3. Removing Software with yum!

5. Searching for Packages with yum

5.1. Searching by Package Name and Attributes
5.2. Advanced Searches
5.3. Understanding Matches

6. Updating Your System with yum

6.1. Automatically Updating Your System

7.1. Adding a Repository as a Package Source
7.2. Manually Authorizing Package Sources
7.3. Understanding Repository Compatibility

8. Maintaining yum

8.1. Disabling or Removing Package Sources
8.2. Clearing the yum Caches

10. Using yum with a Proxy Server

Index

1. Introduction

1.1. Purpose

1.1. Purpose
1.2. Audience
1.3. Using This Document
1.4. Additional Resources

2.1. About Packages
2.2. About Repositories!
2.3. About Dependencies
2.4. Understanding Package Names

4. Managing Software with yum

4.1. Installing New Software with yum
4.2. Updating Software with yum
4.3. Removing Software with yum

5. Searching for Pack! ages w yum

5.1. Searching by Package Name and Attributes
5.2. Advanced Searches
5.3. Understanding Matches

6. Updating Your System with yum

6.1. Automatically Updating Your System

7.1. Adding a Repository as a Package Source
7.2. Manually Authorizing Package Sources
7.3. Understanding Repository Compatibility

8. Maintaining yum

8.1. Disabling or Removing Package Sources
8.2. Clearing the yum Caches

10. Using yum with a Proxy Server